From 40a806329ce08d5f50795cf965ef773aa48fdd3e Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 15 四月 2022 09:37:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
---
web_src/src/components/PushVideoList.vue | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index 5fa162b..4c803da 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -35,30 +35,26 @@
<devicePlayer ref="devicePlayer"></devicePlayer>
<addStreamTOGB ref="addStreamTOGB"></addStreamTOGB>
<el-table ref="pushListTable" :data="pushList" border style="width: 100%" :height="winHeight" @selection-change="handleSelectionChange" :row-key="(row)=> row.app + row.stream">
- <el-table-column
- align="center"
- type="selection"
- :reserve-selection="true"
- width="55">
+ <el-table-column align="center" type="selection" :reserve-selection="true" width="55">
</el-table-column>
- <el-table-column prop="name" label="鍚嶇О" width="180" align="center">
+ <el-table-column prop="name" label="鍚嶇О" align="center">
</el-table-column>
- <el-table-column prop="app" label="APP" width="180" align="center">
+ <el-table-column prop="app" label="APP" align="center">
</el-table-column>
- <el-table-column prop="stream" label="娴両D" width="240" align="center">
+ <el-table-column prop="stream" label="娴両D" align="center">
</el-table-column>
- <el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="150" align="center">
+ <el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="200" align="center">
</el-table-column>
- <el-table-column prop="mediaServerId" label="娴佸獟浣�" width="150" align="center">
+ <el-table-column prop="mediaServerId" label="娴佸獟浣�" width="200" align="center">
</el-table-column>
- <el-table-column label="寮�濮嬫椂闂�" align="center" >
+ <el-table-column label="寮�濮嬫椂闂�" align="center" width="200">
<template slot-scope="scope">
<el-button-group>
{{dateFormat(parseInt(scope.row.createStamp))}}
</el-button-group>
</template>
</el-table-column>
- <el-table-column label="姝ｅ湪鎺ㄦ祦" align="center" >
+ <el-table-column label="姝ｅ湪鎺ㄦ祦" align="center" width="100">
<template slot-scope="scope">
{{(scope.row.status == false && scope.row.gbId == null) || scope.row.status ?'鏄�':'鍚�'}}
</template>
@@ -233,7 +229,7 @@
dateFormat: function(/** timestamp=0 **/) {
let ts = arguments[0] || 0;
let t,y,m,d,h,i,s;
- t = ts ? new Date(ts*1000) : new Date();
+ t = ts ? new Date(ts) : new Date();
y = t.getFullYear();
m = t.getMonth()+1;
d = t.getDate();
--
Gitblit v1.8.0