From cd1b89a4fadfa9f484f548c2e4376b7212c7d640 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Tue, 7 May 2024 10:53:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=92=8C=E5=9C=B0=E5=9B=BE=E5=B1=95=E7=A4=BA=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E6=98=AF=E5=90=A6=E5=9C=A8=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../map/gangkou_index/point/ico31_offline.png | Bin 0 -> 1890 bytes
 .../map/gangkou_index/point/ico31_online.png  | Bin 0 -> 2093 bytes
 src/components/OutSourced/index.vue           |   2 +-
 .../videomanager/components/list.vue          |   6 +-
 src/views/map/components/bianjieruqin.vue     | 116 ++++++++++++------
 src/views/map/index.vue                       |   8 ++
 6 files changed, 94 insertions(+), 38 deletions(-)
 create mode 100644 src/assets/map/gangkou_index/point/ico31_offline.png
 create mode 100644 src/assets/map/gangkou_index/point/ico31_online.png

diff --git a/src/assets/map/gangkou_index/point/ico31_offline.png b/src/assets/map/gangkou_index/point/ico31_offline.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca6bed650b2e5cde92608c449cdc5e68cd390b1f
GIT binary patch
literal 1890
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

literal 0
HcmV?d00001

diff --git a/src/assets/map/gangkou_index/point/ico31_online.png b/src/assets/map/gangkou_index/point/ico31_online.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7e322297e2894f477899aebd7eb6c61754bfa74
GIT binary patch
literal 2093
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
Xde*FwyTl4X00000NkvXXu0mjf1MuCD

literal 0
HcmV?d00001

diff --git a/src/components/OutSourced/index.vue b/src/components/OutSourced/index.vue
index 3de26bf..da5f635 100644
--- a/src/components/OutSourced/index.vue
+++ b/src/components/OutSourced/index.vue
@@ -70,7 +70,7 @@
       <el-table-column v-if="otherShow" prop="AMOUT_SUM" label="违约处罚金额(元)" />
       <el-table-column v-if="otherShow" prop="VIDEO_COUNT" label="包含视频监控数(在线视频数)" width="200">
         <template slot-scope="{row}">
-          <span>{{ row.VIDEO_COUNT }} (0)</span>
+          <span>{{ row.VIDEO_COUNT }} ({{ row.ONLINE_COUNT }})</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="100">
diff --git a/src/views/keyprojects/videomanager/components/list.vue b/src/views/keyprojects/videomanager/components/list.vue
index eed2851..5b9035e 100644
--- a/src/views/keyprojects/videomanager/components/list.vue
+++ b/src/views/keyprojects/videomanager/components/list.vue
@@ -145,7 +145,11 @@
         </template>
       </el-table-column>
       <el-table-column prop="UNITS_NAME" label="施工相关方" width="250" show-overflow-tooltip />
-      <el-table-column prop="VIDEO_COUNT" label="视频个数" />
+      <el-table-column prop="VIDEO_COUNT" label="视频个数(在线数量)" >
+        <template slot-scope="{row}">
+          <span>{{ row.VIDEO_COUNT }}({{ row.VIDEO_ONLINE_COUNT }})</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="STATE" label="状态">
         <template slot-scope="{row}">
           <span v-if="row.STATE == -1">开工申请中</span>
diff --git a/src/views/map/components/bianjieruqin.vue b/src/views/map/components/bianjieruqin.vue
index 8fac441..27ad877 100644
--- a/src/views/map/components/bianjieruqin.vue
+++ b/src/views/map/components/bianjieruqin.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="shipin">
     <div class="block1">
-      <layout-title title="视频状态"/>
+      <layout-title title="视频定位"/>
       <div class="options">
         <div class="option">
           <div class="leftimg"/>
@@ -15,7 +15,7 @@
       </div>
     </div>
     <div class="block2">
-      <layout-title title="区域报警数"/>
+      <layout-title title="重点工程"/>
       <div class="options">
         <div v-for="(item,index) in block2OptionsList" :key="index" class="option">
           <div class="circular"><img :src="item.img" alt=""></div>
@@ -26,26 +26,25 @@
         </div>
       </div>
     </div>
-    <div class="block3">
-      <layout-title title="报警记录"/>
-      <div class="content">
-
-        <div class="table">
-          <div class="tr">
-            <div class="td">防区</div>
-            <div class="td">摄像头名称</div>
-            <div class="td">时间</div>
-          </div>
-          <div class="scroll">
-            <div v-for="(item,index) in block3List" :key="index" class="tr">
-              <div class="td line1">{{ item.region }}</div>
-              <div class="td">{{ item.name }}</div>
-              <div class="td">{{ item.time }}</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
+    <!--    <div class="block3">-->
+    <!--      <layout-title title="报警记录"/>-->
+    <!--      <div class="content">-->
+    <!--        <div class="table">-->
+    <!--          <div class="tr">-->
+    <!--            <div class="td">防区</div>-->
+    <!--            <div class="td">摄像头名称</div>-->
+    <!--            <div class="td">时间</div>-->
+    <!--          </div>-->
+    <!--          <div class="scroll">-->
+    <!--            <div v-for="(item,index) in block3List" :key="index" class="tr">-->
+    <!--              <div class="td line1">{{ item.region }}</div>-->
+    <!--              <div class="td">{{ item.name }}</div>-->
+    <!--              <div class="td">{{ item.time }}</div>-->
+    <!--            </div>-->
+    <!--          </div>-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -79,17 +78,25 @@ export default {
         {
           lable: '视频总数',
           count: 0
+        },
+        {
+          lable: '在线数量',
+          count: 0
+        },
+        {
+          lable: '离线数量',
+          count: 0
         }
       ],
       block2OptionsList: [
         {
-          img: require('../../../assets/map/bianjie/img1.png'),
-          label: '码头',
+          img: require('../../../assets/map/gangkou_index/point/ico15.png'),
+          label: '重点工程总数',
           count: 0
         },
         {
-          img: require('../../../assets/map/bianjie/img2.png'),
-          label: '油罐区域',
+          img: require('../../../assets/map/gangkou_index/point/ico30.png'),
+          label: '重点工程开工数量',
           count: 0
         }
       ],
@@ -163,33 +170,70 @@ export default {
     this.initgetTable()
   },
   methods: {
+    // 初始化总摄像头数
+    // initCount() {
+    //   requestFN(
+    //     '/map/mapPlatformelectronic/listAll',
+    //     {
+    //       CORPINFO_ID: this.corpInfoId,
+    //       AREA: this.area
+    //     }
+    //   ).then((data) => {
+    //     this.block1OptionsList[0].count = data.allForMap
+    //   })
+    // },
     // 初始化总摄像头数
     initCount() {
       requestFN(
-        '/map/mapPlatformelectronic/listAll',
+        '/map/keyProject/listAllLocation',
         {
           CORPINFO_ID: this.corpInfoId,
-          AREA: this.area
+          AREA: this.area,
+          TYPE: 'VIDEO',
+          GANGKOU: this.gangkou
         }
       ).then((data) => {
-        this.block1OptionsList[0].count = data.allForMap
+        this.block1OptionsList[0].count = data.varList.length
+        data.varList.forEach((item) => {
+          if (item.ONLINE_STATUS === '0') {
+            this.block1OptionsList[1].count++
+          } else {
+            this.block1OptionsList[2].count++
+          }
+        })
       })
     },
 
+    // 初始化港口摄像头数
+    // initgetTable() {
+    //   requestFN(
+    //     '/map/mapPlatformelectronic/listAllByArea',
+    //     {
+    //       CORPINFO_ID: this.corpInfoId,
+    //       AREA: this.area
+    //     }
+    //   ).then((data) => {
+    //     data.varList.forEach(item => {
+    //       if (item.SUOSHUQUYU === '2') {
+    //         this.block2OptionsList[0].count = item.co
+    //       } else if (item.SUOSHUQUYU === '1') {
+    //         this.block2OptionsList[1].count = item.co
+    //       }
+    //     })
+    //   })
+    // }
     // 初始化港口摄像头数
     initgetTable() {
       requestFN(
-        '/map/mapPlatformelectronic/listAllByArea',
+        '/outsourced/listForCount',
         {
-          CORPINFO_ID: this.corpInfoId,
-          AREA: this.area
+          CORPINFO_ID: this.corpInfoId
         }
       ).then((data) => {
+        this.block2OptionsList[0].count = data.varList.length
         data.varList.forEach(item => {
-          if (item.SUOSHUQUYU === '2') {
-            this.block2OptionsList[0].count = item.co
-          } else if (item.SUOSHUQUYU === '1') {
-            this.block2OptionsList[1].count = item.co
+          if (item.STATE == 1) {
+            this.block2OptionsList[1].count++
           }
         })
       })
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 7e6fa69..4f6f9fd 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -2127,6 +2127,14 @@ export default {
                 point.name = varList[i].MAP_POINT_NAME
                 point.infoname = varList[i].MAP_POINT_NAME
               }
+              // 摄像头是否在线
+              if (point.icon_type.indexOf('6_1') > -1) {
+                if (varList[i].ONLINE_STATUS === '0') {
+                  point.icon_type = point.icon_type + '_online'
+                } else {
+                  point.icon_type = point.icon_type + '_offline'
+                }
+              }
               points.push(point)
             }
             if (this.gangkouActive === '00004' && urlType === 'carPosition') {