From a4259cf2d9a4ce63081b7c6b05380fb2ddbc6a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E7=A7=80=E5=9C=86?= <1393343789@qq.com>
Date: Wed, 28 Sep 2022 16:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=B5=84=E6=BA=90=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=92=8C=E5=9C=B0=E5=9B=BE=E9=80=89=E4=B8=AD=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/supermap/advance-init.js            |  17 ++++--
 front/src/supermap/image/icon_camare.png      | Bin 0 -> 2050 bytes
 .../src/supermap/image/icon_camare_active.png | Bin 0 -> 2055 bytes
 front/src/views/home/infrastructurePage.vue   |  49 ++++++++++++++----
 .../views/home/videoSurveillance/index.vue    |  24 +++++++--
 5 files changed, 73 insertions(+), 17 deletions(-)
 create mode 100644 front/src/supermap/image/icon_camare.png
 create mode 100644 front/src/supermap/image/icon_camare_active.png

diff --git a/front/src/supermap/advance-init.js b/front/src/supermap/advance-init.js
index f0841cf8..1ce102db 100644
--- a/front/src/supermap/advance-init.js
+++ b/front/src/supermap/advance-init.js
@@ -1657,14 +1657,16 @@ export function MapFun(mapObj) {
     features,
     url,
     layerName,
-    createPopupFun
+    createPopupFun,
+    url2
   ) {
     console.log(
       '_addResourceOnMapWithoutSuperMapCluster===============>',
       features,
       url,
       layerName,
-      createPopupFun
+      createPopupFun,
+      url2
     )
     // 如果资源要素数量为0，则说明该种资源没有记录
     // if (features.length < 1) {
@@ -1685,14 +1687,19 @@ export function MapFun(mapObj) {
     let layers = null
     // 判断是否是聚合图层
     layers = createMarkerClusterLayer()
-    const icon = createDefaultFeatureStyle({
+    const icon1 = createDefaultFeatureStyle({
       img: url,
-      iconSize: [36, 36],
+      iconSize: [33, 33],
+    })
+    const icon2 = createDefaultFeatureStyle({
+      img: url2,
+      iconSize: [33, 33],
     })
     features.map((feature) => {
       var bounds = map.getBounds()
       // console.log("看看有没有坐标",feature.latLng);
       if ( feature.hasOwnProperty('latLng')) {
+        let icon = feature.active?icon2:icon1
         const marker = L.marker(feature.latLng, { icon })
         if (createPopupFun !== null) {
           marker.uuid = feature.uuid || ''
@@ -1728,6 +1735,8 @@ export function MapFun(mapObj) {
         }
         marker.on('click', e=>{
           console.log('点位数据', e)
+          
+          mybus.emit('pointMarkerClick', feature)
         })
         layers.addLayer(marker)
       }
diff --git a/front/src/supermap/image/icon_camare.png b/front/src/supermap/image/icon_camare.png
new file mode 100644
index 0000000000000000000000000000000000000000..40ee038bcb473ddc54d9523b62b0681c04d1f770
GIT binary patch
literal 2050
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
RpG^B#X8CY{TJJp>e*iaORR;h7

literal 0
HcmV?d00001

diff --git a/front/src/supermap/image/icon_camare_active.png b/front/src/supermap/image/icon_camare_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..1da7345964eb5dd8f81841b1e98e210cb8a88051
GIT binary patch
literal 2055
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
XD($E3f(k1~{jZr398RkXJfiwHU9?~_

literal 0
HcmV?d00001

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index e5ef35d3..3b6ab3c9 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -936,8 +936,26 @@
       mapSearchParam.value.gpsX = param.gpsX
       mapSearchParam.value.gpsY = param.gpsY
       mapSearchParam.value.radius = param.radius
+      selectedRowKeys.value = []  //清空选中的点位
+      selectedList.value = []
       getCamera()
     })
+    //点位点击
+    mybus.off('pointMarkerClick')
+    mybus.on('pointMarkerClick', (point) => {
+      console.log("pointMarkerClick->point", selectedList.value,point)
+      let check = false; //是否勾选
+      if(selectedList.value&&selectedList.value.length>0){
+        selectedList.value.forEach(ele=>{
+          if(ele.channelCode == point.data.channelCode){
+            check = true;
+          }
+        })
+      }
+      let pointData = new Proxy(point.data, point);
+      onSelectChange(pointData,!check,'','','proxy');
+    })
+    
   })
   const selectedList = ref([])
   const selectedRowKeys = ref([])
@@ -1739,9 +1757,10 @@
     pagination.value.pageSize = 10
     getCamera()
   }
-  const videoClean = () => {
-    selectedList.value = []
-    selectedRowKeys.value = []
+  const videoClean = () => { 
+    //视频预览弹窗关闭后不清除选中行
+    // selectedList.value = []
+    // selectedRowKeys.value = []
     videoList.value = []
     current.value = 1
   }
@@ -1926,8 +1945,9 @@
     },
   ])
   // const allClick = ref([])
-  const onSelectChange = (record, selected, selectedRows, nativeEvent) => {
+  const onSelectChange = (record, selected, selectedRows, nativeEvent,type) => {
     console.log('hahhahah', record, selected, selectedRows, nativeEvent)
+    record = JSON.parse(JSON.stringify(record));
     if (selected) {
       if (selectedRowKeys.value.length == 1000) {
         message.warning('最多只能添加1000个摄像头！')
@@ -1936,14 +1956,17 @@
         selectedRowKeys.value.push(record.channelCode || record.channelId)
       }
     } else {
-      selectedList.value = selectedList.value.filter(
-        (item) => item.idtCameraChannel !== record.idtCameraChannel
-      )
+      selectedList.value.forEach((ele,index)=>{
+        if(ele.channelCode == record.channelCode){
+          selectedList.value.splice(index,1)
+        }
+      })
       selectedRowKeys.value.splice(
         selectedRowKeys.value.indexOf(record.channelCode || record.channelId),
         1
       )
     }
+    mybus.emit('selectTablePoint',selectedList.value)
     console.log('已选中======================>', selectedList.value)
   }
   const onSelectAll = (selected, selectedRows, changeRows) => {
@@ -1955,9 +1978,14 @@
       if (selectedRowKeys.value.length > 1000) {
         message.warning('最多只能添加1000个摄像头！')
         changeRows.map((val) => {
-          selectedList.value = selectedList.value.filter(
-            (item) => item.idtCameraChannel !== val.idtCameraChannel
-          )
+          // selectedList.value = selectedList.value.filter(
+          //   (item) => item.idtCameraChannel !== val.idtCameraChannel
+          // )
+          selectedList.value.forEach((ele,index)=>{
+            if(ele.channelCode == record.channelCode){
+              selectedList.value.splice(index,1)
+            }
+          })
           selectedRowKeys.value.splice(
             selectedRowKeys.value.indexOf(val.channelCode || val.channelId),
             1
@@ -1976,6 +2004,7 @@
       })
     }
     console.log('heiheiheiehiehei', selected, selectedRows, changeRows)
+    mybus.emit('selectTablePoint',selectedList.value)
   }
 
   // 切换tab
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 333b6258..47002565 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -125,6 +125,7 @@
           gpsY: '',
           radius: '',
         },
+        pointAllData:[],
       }
     },
     components: {
@@ -158,6 +159,20 @@
         this.mapSearchParam.parentId = parentId
         this.getCameraByParentId()
       })
+      //表格勾选
+      mybus.off('selectTablePoint')
+      mybus.on('selectTablePoint', (pointlist) => {
+        console.log("mounted -> pointlist", pointlist)
+        for(let i=0;i<this.pointAllData.length;i++){
+          this.pointAllData[i].active = false
+          for(let j=0;j<pointlist.length;j++){
+            if(this.pointAllData[i].channelCode == pointlist[j].channelCode){
+              this.pointAllData[i].active = true
+            }
+          }
+        }
+        this.addResourceTomap('videoMap', this.pointAllData);
+      })
     },
     methods: {
       selectedAddress(item, index) {
@@ -244,6 +259,7 @@
           }
           getCameraByCondition(paramsFather).then((res) => {
             console.log('根据parent查询摄像头', res.data.data)
+            this.pointAllData = res.data.data
             this.addResourceTomap('videoMap', res.data.data)
           })
         }
@@ -357,12 +373,13 @@
             dataEvent.push({
               latLng: { lat: Number(item.gpsY), lng: Number(item.gpsX) },
               data: item,
+              active: item.active,
               type: 'videoSurveillance',
             })
           }
         })
         console.log('上图数据', dataEvent)
-        this.getMapPoint(dataEvent, 'videoSurveillance.png', type)
+        this.getMapPoint(dataEvent, 'icon_camare.png', type)
       },
       getMapPoint(data, img, type) {
         // this.hiMapFun.clearAllLayers();
@@ -372,7 +389,8 @@
           features,
           img,
           type,
-          createCameraDetailsPop
+          createCameraDetailsPop,
+          'icon_camare_active.png'
         )
       },
 
@@ -546,7 +564,7 @@
       position: absolute;
       bottom: 0.1rem;
       right: 0.1rem;
-      z-index: 1001;
+      z-index: 988;
       cursor: pointer;
     }
     .address-auto-complete-input {