Просмотр исходного кода

修改事件弹窗点击误报/重复关闭弹窗

JX.LI 2 лет назад
Родитель
Сommit
442f5799a1
3 измененных файлов с 60 добавлено и 3 удалено
  1. 50 1
      src/views/datacenter.vue
  2. 5 1
      src/views/eventdetailsdialog.vue
  3. 5 1
      src/views/firespread.vue

+ 50 - 1
src/views/datacenter.vue

@@ -45,7 +45,7 @@
         </div>
       </div>
       <!-- 地图 -->
-      <supermap ref="supermap" style="width: 100%;height: 100vh;" ></supermap>
+      <supermap ref="supermap" style="width: 100%;height: 100vh;" @sewageOutletClick="sewageOutletClick"></supermap>
       <!--      <button @click="showEventInfo1" style="position: absolute; right: 50%;top: 45%;z-index: 1000;">弹层事件演示用按钮-->
       <!--      </button>-->
       <vBottomMenu ref="bottomMenu"></vBottomMenu>
@@ -329,7 +329,56 @@ export default {
         that.$refs.supermap.setMarkers(that.markersList)
       })
     },
+      sewageOutletClick(data) {
+        console.log(data)
+        const params = Object.assign({});
+        params.longitude = data.longitude;
+        params.latitude = data.latitude;
+
+        const treeLabels = [{
+          id: null,
+          labelCode: "999",
+          labelName: "电视墙",
+          cameraType: null,
+          parentLabelCode: "",
+        }, ];
+        const labelChannels = [];
+        for (let i in data.cameraList) {
+          treeLabels.push({
+            id: null,
+            labelCode: data.cameraList[i].cameraCode,
+            labelName: data.cameraList[i].cameraName,
+            cameraType: "1",
+            parentLabelCode: "999",
+          });
+          labelChannels.push({
+            labelCode: data.cameraList[i].cameraCode,
+            channelDates: [{
+              channelCode: data.cameraList[i].cameraCode,
+              channelName: data.cameraList[i].cameraName,
+              channelSn: null,
+              cameraType: "1",
+              online: "1",
+              cameraCode: "1",
+            }, ],
+          });
+        }
+        const dianshiqiang = [{
+          switchTab: "2",
+          treeLabels: treeLabels,
+          labelChannels: labelChannels,
+        }, ];
+        if (data.cameraList.length > 0) {
+          this.$refs.TVWall.showTVWall1(
+            data.longitude,
+            data.latitude,
+            dianshiqiang
+          );
+        }
+      },
     getMarkersMap(resourceTable, markersMap, item){
+        markersMap.click = "sewageOutletClick"
+        markersMap.parameter = item
       if (resourceTable == 'centerdata_t_firecontrol_basic_linkage_force') { //基本联动力量
         markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-basic-linkage-force'
         markersMap.lng = item.longitude

+ 5 - 1
src/views/eventdetailsdialog.vue

@@ -2188,11 +2188,15 @@ console.log(this.dutysystemTableData)
           updateCentereventTEventcatalogueStatus(param).then(res => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
-              that.refreshEvent(that.eventCode)
               that.cancelEventConfirm_send()
               that.showEventConfirm = false
               that.$emit('getEventList', that.calendarDay,10,1)
               that.$emit('getSupermap', that.calendarDay)
+                if (eventStatus == "cf" || eventStatus == "wb") {
+                  this.eventDialog = false;
+                  return;
+                }
+              that.refreshEvent(that.eventCode)
             }
           })
         }

+ 5 - 1
src/views/firespread.vue

@@ -2833,11 +2833,15 @@ export default {
           updateCentereventTEventcatalogueStatus(param).then(res => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
-              that.refreshEvent(that.eventCode)
               that.cancelEventConfirm_send()
               that.showEventConfirm = false
               that.$emit('getEventList', that.calendarDay,10,1)
               that.$emit('getSupermap', that.calendarDay)
+                if (eventStatus == "cf" || eventStatus == "wb") {
+                  this.eventDialog = false;
+                  return;
+                }
+              that.refreshEvent(that.eventCode)
             }
           })
         }