From 327eb851fc2ce0eb9e4e1e318bb9f9b0cc890fa0 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Mon, 29 Apr 2024 11:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=AE=89=E5=85=A8=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E7=AE=A1=E7=90=86=E8=A7=86=E9=A2=91=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9C=A8=E7=BA=BF=E8=A7=86=E9=A2=91=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OutSourced/index.vue                         | 6 +++++-
 src/views/firefighting/fireInfoReport/components/list.vue   | 6 +++---
 src/views/keyprojects/outsourced/components/list.vue        | 3 ++-
 .../keyprojects/videomanager/components/video-list.vue      | 5 +++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/components/OutSourced/index.vue b/src/components/OutSourced/index.vue
index 03f6c24..3de26bf 100644
--- a/src/components/OutSourced/index.vue
+++ b/src/components/OutSourced/index.vue
@@ -68,7 +68,11 @@
       <el-table-column v-if="otherShow" prop="HIDDEN_COUNT" label="发现隐患数量" />
       <el-table-column v-if="otherShow" prop="PUNISH_COUNT" label="违约处罚次数" />
       <el-table-column v-if="otherShow" prop="AMOUT_SUM" label="违约处罚金额(元)" />
-      <el-table-column v-if="otherShow" prop="VIDEO_COUNT" label="包含视频监控数" />
+      <el-table-column v-if="otherShow" prop="VIDEO_COUNT" label="包含视频监控数(在线视频数)" width="200">
+        <template slot-scope="{row}">
+          <span>{{ row.VIDEO_COUNT }} (0)</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="100">
         <template slot-scope="{row}">
           <el-button type="success" icon="el-icon-view" size="mini" @click="goDetail(row.CORPINFO_ID)">查看</el-button>
diff --git a/src/views/firefighting/fireInfoReport/components/list.vue b/src/views/firefighting/fireInfoReport/components/list.vue
index 18c1cc3..4783dcf 100644
--- a/src/views/firefighting/fireInfoReport/components/list.vue
+++ b/src/views/firefighting/fireInfoReport/components/list.vue
@@ -40,11 +40,11 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="消防点位数" align="center">
+      <el-table-column label="消防点位数(已标点数)" align="center">
         <template slot-scope="{row}">
-          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FirePoint'})">
+          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FirePoint'})" style="display: inline-block">
             {{ row.xiaoFangDianWeiNum }}
-          </div>
+          </div>({{ row.xiaoFangDianWeiBiaoDianNum }})
         </template>
       </el-table-column>
       <el-table-column label="消防器材数" align="center">
diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue
index 4cabb66..2ee236b 100644
--- a/src/views/keyprojects/outsourced/components/list.vue
+++ b/src/views/keyprojects/outsourced/components/list.vue
@@ -145,12 +145,13 @@
         </template>
       </el-table-column>
       <el-table-column prop="OUTSOURCED_CREATOR_NAME" label="创建人" show-overflow-tooltip />
-      <el-table-column label="视频数量" show-overflow-tooltip>
+      <el-table-column label="视频数量(在线数)" show-overflow-tooltip width="150">
         <template slot-scope="{row}">
           <span v-if="row.VIDEO_COUNT != 0">
             <a style="color: #1e9fff;text-decoration:underline" @click="clickVideoDetail(row.OUTSOURCED_ID)">{{ row.VIDEO_COUNT }}</a>
           </span>
           <span v-else>{{ row.VIDEO_COUNT }}</span>
+          <span>({{ row.VIDEO_ONLINE_COUNT }})</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="400">
diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue
index 5d6ee3c..db0ad9e 100644
--- a/src/views/keyprojects/videomanager/components/video-list.vue
+++ b/src/views/keyprojects/videomanager/components/video-list.vue
@@ -50,6 +50,11 @@
           <span v-else>未定位</span>
         </template>
       </el-table-column>
+      <el-table-column prop="ONLINE_STATUS" label="是否在线" width="100">
+        <template slot-scope="{row}">
+          <span>{{ row.ONLINE_STATUS }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="left" width="500">
         <template slot-scope="{row}">
           <el-button :disabled="STATE == 2" type="success" icon="el-icon-caret-right" size="mini" @click="showVideo(row)">播放</el-button>