1

src/views/eventdetailsdialog.vue

@@ -24,6 +24,7 @@
             <!-- 左侧 -->
             <el-col :span="18" class="dia-left">
               <div class="sj-map-tool-select">
+<!--                复选框-->
                 <transition-group
                   appear
                   name="animate__animated animate__bounce"
@@ -2065,6 +2066,8 @@ import findUserByDept from "@/views/findUserByDept"; //责任人选择弹框
 import leftRightSwiperScroll from "@/components/leftRightSwiperScroll.vue"; //事件中心底部资源内容溢出组件
 import "animate.css"; //动画库
 import { getIconBg } from "@/api/components/sookaMapIcon"; //资源底色控制文件
+import request from "@/utils/request";
+
 import {
   fireControlViewPoint,
   fireControlViewList,
@@ -2096,7 +2099,6 @@ import { getDahuaVideoServer } from "@/api/dahua/dahua";
 import DHWs from "@/dahua/lib/DHWs";
 import { selectConfigKey } from "@/api/system/config";
 import Cookies from "js-cookie";
-import request from "@/utils/request";
 export default {
   dicts: ["task_source"],
   watch: {
@@ -2353,18 +2355,6 @@ export default {
     /** ----------------------------------摄像头预览结束------------------------------------- */
   },
   methods: {
-    //设置联动部门不可选择本部门
-    recursiveChildren(arrayList,deptId) {
-      arrayList.forEach((item, index) => {
-        if(item.id==deptId){
-          item.disabled="true";
-          return
-        }
-        if(item.children){
-          this.recursiveChildren(item.children,deptId)
-        }
-      });
-    },
     closedEventDiaTool() {
       document.addEventListener("click", (e) => {
         let b = document.getElementById("eventMapToolOnly");
@@ -2396,6 +2386,7 @@ export default {
     },
     // 获取消防左侧菜单列表
     fireControlViewList() {
+      console.log(11111)
       this.resourcesList = [];
       let _this = this;
       fireControlViewList("xiaofang").then(function (res) {
@@ -2586,7 +2577,7 @@ export default {
       // this.cancelEventShow();
       this.eventDialog = false;
 
-      this.$emit("showEventDialog", this.eventCode);
+      this.$emit('showEventDialog', this.eventCode);
     },
     showTVWallDiaLog() {
       this.initByCameras();
@@ -2849,6 +2840,18 @@ export default {
         }
       }
     },
+    //设置联动部门不可选择本部门
+    recursiveChildren(arrayList,deptId) {
+      arrayList.forEach((item, index) => {
+        if(item.id==deptId){
+          item.disabled="true";
+          return
+        }
+        if(item.children){
+          this.recursiveChildren(item.children,deptId)
+        }
+      });
+    },
     listResourceByWz(type) {
       if (this.resourcesListCheck.indexOf(type) > -1) {
         this.resourcesListCheck.splice(
@@ -2866,13 +2869,13 @@ export default {
           type: type,
           radius: this.radius,
         };
-// listResourceByWz(param).then((res) => {
+        // listResourceByWz(param).then((res) => {
         request({
           url: `/center-monitor/camera/findNearbyCameras/${param.longitude}/${param.latitude}/${param.radius}`,
           method: 'get'
         }).then(res => {
           if(res.data!=null&&res.data.length==0){
-            this.$message.warning("设定范围内无摄像头信息！")
+            this.$message.warning("设定范围内无该资源信息！")
           }
           if (res.data != null && res.data.length > 0) {
             this.resourcesListCheck.push(type);
@@ -3660,39 +3663,42 @@ export default {
         markersMapList.push(markersMap);
         if (res.data.centermonitorTCamera != null) {
           that.centermonitorTCamera = null;
-          that.centermonitorTCamera = res.data.centermonitorTCamera;
           that.cameraCode = res.data.centermonitorTCamera.id;
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: "camera",
-            bindPopupHtml: "",
-            click: "preview",
-            parameter: {
-              code: res.data.centermonitorTCamera.cameraCode,
-              type: res.data.centermonitorTCamera.cameraFactory,
-              name: res.data.centermonitorTCamera.cameraName,
-            },
-            keepBindPopup: false,
-            isAggregation: true,
-            radius: 0,
-          };
-          markersMap.bindPopupHtml =
-            '<div class="map-tip">' +
-            "<span>" +
-            '                  <div class="d-l-con">' +
-            '                  <div class="d-l-l-text">' +
-            "                  <h4>摄像头名称：" +
-            res.data.centermonitorTCamera.cameraName +
-            "</h4>" +
-            "                </div>" +
-            "                </div>" +
-            "                </span>" +
-            "<span>" +
-            "</div>";
-          markersMap.lng = res.data.centermonitorTCamera.longitude;
-          markersMap.lat = res.data.centermonitorTCamera.latitude;
-          markersMapList.push(markersMap);
+          if(res.data.centermonitorTCamera.longitude != null && res.data.centermonitorTCamera.latitude != null) {
+            that.centermonitorTCamera = res.data.centermonitorTCamera;
+
+            let markersMap = {
+              lng: 124.59,
+              lat: 43.02,
+              icon: "camera",
+              bindPopupHtml: "",
+              click: "preview",
+              parameter: {
+                code: res.data.centermonitorTCamera.cameraCode,
+                type: res.data.centermonitorTCamera.cameraFactory,
+                name: res.data.centermonitorTCamera.cameraName,
+              },
+              keepBindPopup: false,
+              isAggregation: true,
+              radius: 0,
+            };
+            markersMap.bindPopupHtml =
+              '<div class="map-tip">' +
+              "<span>" +
+              '                  <div class="d-l-con">' +
+              '                  <div class="d-l-l-text">' +
+              "                  <h4>摄像头名称：" +
+              res.data.centermonitorTCamera.cameraName +
+              "</h4>" +
+              "                </div>" +
+              "                </div>" +
+              "                </span>" +
+              "<span>" +
+              "</div>";
+            markersMap.lng = res.data.centermonitorTCamera.longitude;
+            markersMap.lat = res.data.centermonitorTCamera.latitude;
+            markersMapList.push(markersMap);
+          }
         }
         setTimeout(() => {
           that.$refs.supermapDialog.dynamicPlotting(); //弹出动态绘制窗口，防止截图位置改变
@@ -3784,39 +3790,43 @@ export default {
         markersMapList.push(markersMap);
         if (res.data.centermonitorTCamera != null) {
           that.centermonitorTCamera = null;
-          that.centermonitorTCamera = res.data.centermonitorTCamera;
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: "camera",
-            bindPopupHtml: "",
-            click: "preview",
-            parameter: {
-              code: res.data.centermonitorTCamera.cameraCode,
-              type: res.data.centermonitorTCamera.cameraFactory,
-              name: res.data.centermonitorTCamera.cameraName,
-            },
-            keepBindPopup: false,
-            isAggregation: true,
-            radius: 0,
-          };
-          markersMap.bindPopupHtml =
-            '<div class="map-tip">' +
-            "<span>" +
-            '                  <div class="d-l-con">' +
-            '                  <div class="d-l-l-text">' +
-            "                  <h4>摄像头名称：" +
-            res.data.centermonitorTCamera.cameraName +
-            "</h4>" +
-            "                </div>" +
-            "                </div>" +
-            "                </span>" +
-            "<span>" +
-            "</div>";
-          markersMap.lng = res.data.centermonitorTCamera.longitude;
-          markersMap.lat = res.data.centermonitorTCamera.latitude;
+          that.cameraCode = res.data.centermonitorTCamera.id;
+          if(res.data.centermonitorTCamera.longitude != null && res.data.centermonitorTCamera.latitude != null) {
+            that.centermonitorTCamera = res.data.centermonitorTCamera;
 
-          markersMapList.push(markersMap);
+            let markersMap = {
+              lng: 124.59,
+              lat: 43.02,
+              icon: "camera",
+              bindPopupHtml: "",
+              click: "preview",
+              parameter: {
+                code: res.data.centermonitorTCamera.cameraCode,
+                type: res.data.centermonitorTCamera.cameraFactory,
+                name: res.data.centermonitorTCamera.cameraName,
+              },
+              keepBindPopup: false,
+              isAggregation: true,
+              radius: 0,
+            };
+            markersMap.bindPopupHtml =
+              '<div class="map-tip">' +
+              "<span>" +
+              '                  <div class="d-l-con">' +
+              '                  <div class="d-l-l-text">' +
+              "                  <h4>摄像头名称：" +
+              res.data.centermonitorTCamera.cameraName +
+              "</h4>" +
+              "                </div>" +
+              "                </div>" +
+              "                </span>" +
+              "<span>" +
+              "</div>";
+            markersMap.lng = res.data.centermonitorTCamera.longitude;
+            markersMap.lat = res.data.centermonitorTCamera.latitude;
+
+            markersMapList.push(markersMap);
+          }
         }
         setTimeout(() => {
           that.$refs.supermapDialog.clearM(false);

src/views/firespread.vue

@@ -60,32 +60,32 @@
                   enter-active-class="animate__backInDown"
                   leave-active-class="animate__backOutUp"
                 >
-                <!-- 应急预案 -->
-                <div class="dia-left-top" v-show="mapToolCheckItem.includes('应急预案')"
-                     key="yingji" >
-                  <div class="dia-left-top-tit">应急预案</div>
-                  <div class="dia-left-top-carousel">
+                  <!-- 应急预案 -->
+                  <div class="dia-left-top" v-show="mapToolCheckItem.includes('应急预案')"
+                       key="yingji" >
+                    <div class="dia-left-top-tit">应急预案</div>
+                    <div class="dia-left-top-carousel">
 
-                    <el-carousel height="30px" direction="vertical" :interval="2000">
-                      <el-carousel-item v-if="visuForestCloudYuAnBo!=null">
-                        <el-tooltip class="item" effect="dark" :content="visuForestCloudYuAnBo.reserveName"
-                                    placement="top-start">
-                          <a :href="visuForestCloudYuAnBo.fileUrl"><span>
+                      <el-carousel height="30px" direction="vertical" :interval="2000">
+                        <el-carousel-item v-if="visuForestCloudYuAnBo!=null">
+                          <el-tooltip class="item" effect="dark" :content="visuForestCloudYuAnBo.reserveName"
+                                      placement="top-start">
+                            <a :href="visuForestCloudYuAnBo.fileUrl"><span>
                               <div
                                 style=" width: 50px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;word-break: keep-all;">
                                 {{ visuForestCloudYuAnBo.reserveName }}
                               </div>
                             </span></a>
-                        </el-tooltip>
-                      </el-carousel-item>
-                      <el-carousel-item v-else>
-                        <a href="#">暂未关联预案</a>
-                      </el-carousel-item>
-                    </el-carousel>
+                          </el-tooltip>
+                        </el-carousel-item>
+                        <el-carousel-item v-else>
+                          <a href="#">暂未关联预案</a>
+                        </el-carousel-item>
+                      </el-carousel>
+                    </div>
+                    <el-button size="mini" type="primary" class="yatz_button" @click="showUpdateYjYuAn">预案调整
+                    </el-button>
                   </div>
-                  <el-button size="mini" type="primary" class="yatz_button" @click="showUpdateYjYuAn">预案调整
-                  </el-button>
-                </div>
                 </transition-group>
                 <!-- 左侧资源 -->
                 <transition-group
@@ -94,45 +94,45 @@
                   enter-active-class="animate__backInUp"
                   leave-active-class="animate__backOutDown"
                 >
-                <div class="leftbar" style="width:fit-content !important;bottom:0rem;left: 1rem; top: unset;"  v-show="mapToolCheckItem.includes('资源与操作')"
-                     key="mapToolziyuan">
-                  <div class="forthis" style="width:1320px; display: flex;">
-                    <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">
-                      <div class="i-list-con"
-                           style="width: 100%;display: flex; align-items: center;justify-content: space-between">
+                  <div class="leftbar" style="width:fit-content !important;bottom:0rem;left: 1rem; top: unset;"  v-show="mapToolCheckItem.includes('资源与操作')"
+                       key="mapToolziyuan">
+                    <div class="forthis" style="width:1320px; display: flex;">
+                      <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">
+                        <div class="i-list-con"
+                             style="width: 100%;display: flex; align-items: center;justify-content: space-between">
 
-                        <div class="d-l-con-icon" style="width: fit-content;  flex-direction:row;flex-wrap: nowrap;"
-                             ref="thisWidthWH">
-                          <leftRightSwiperScroll  v-if="mapToolCheckItem.includes('资源与操作')">
-                            <div class="icon-con" style="width: fit-content !important;"
-                                 v-for="(item,index) in resourcesList1" @click="fireControlViewPoint(item.type)"
-                                 :key="index">
-                              <div class="iconfont icon icon-normal" :class="item.icon"
-                                   :style="'background:' + item.bg"></div>
-                              <div class="icon-text">
-                                <h5 style="white-space: nowrap;">{{ item.resourceName }}</h5>
+                          <div class="d-l-con-icon" style="width: fit-content;  flex-direction:row;flex-wrap: nowrap;"
+                               ref="thisWidthWH">
+                            <leftRightSwiperScroll  v-if="mapToolCheckItem.includes('资源与操作')">
+                              <div class="icon-con" style="width: fit-content !important;"
+                                   v-for="(item,index) in resourcesList1" @click="fireControlViewPoint(item.type)"
+                                   :key="index">
+                                <div class="iconfont icon icon-normal" :class="item.icon"
+                                     :style="'background:' + item.bg"></div>
+                                <div class="icon-text">
+                                  <h5 style="white-space: nowrap;">{{ item.resourceName }}</h5>
+                                </div>
                               </div>
-                            </div>
-                          </leftRightSwiperScroll>
-                        </div>
+                            </leftRightSwiperScroll>
+                          </div>
 
-                        <el-input type="number" v-model="radius" class="d-input-bottom" placeholder="请输入搜索半径" />
-                      </div>
-                    </dv-border-box-7>
+                          <el-input type="number" v-model="radius" class="d-input-bottom" placeholder="请输入搜索半径" />
+                        </div>
+                      </dv-border-box-7>
+                    </div>
+                  </div>
+                  <!-- 左侧资源end -->
+                  <!-- 应急预案end -->
+                  <div class="fire-m" style="bottom:5rem" v-show="mapToolCheckItem.includes('资源与操作')"
+                       key="ziyuan">
+                    <el-button
+                      size="small"
+                      icon="el-icon-s-grid"
+                      @click="showTVWallDiaLog()"
+                    >视频联动</el-button>
+                    <el-button size="small" icon="el-icon-upload" @click="showEventdetailsdialog()">动态标绘</el-button>
+                    <!--                  <el-button size="small" icon="el-icon-upload" @click="showheatPlotting()">火灾蔓延</el-button>-->
                   </div>
-                </div>
-                <!-- 左侧资源end -->
-                <!-- 应急预案end -->
-                <div class="fire-m" style="bottom:5rem" v-show="mapToolCheckItem.includes('资源与操作')"
-                     key="ziyuan">
-                  <el-button
-                    size="small"
-                    icon="el-icon-s-grid"
-                    @click="showTVWallDiaLog()"
-                  >视频联动</el-button>
-                  <el-button size="small" icon="el-icon-upload" @click="showEventdetailsdialog()">动态标绘</el-button>
-                  <!--                  <el-button size="small" icon="el-icon-upload" @click="showheatPlotting()">火灾蔓延</el-button>-->
-                </div>
                 </transition-group>
                 <!-- 地图 -->
                 <supermapDialog1 ref="supermapDialog1" style="position: absolute; top:0;left: 0;"
@@ -211,8 +211,8 @@
                               <div class="z-info-btm-grp-left">
                                 <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传
                                 </el-button>
-<!--                                <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传-->
-<!--                                </el-button>-->
+                                <!--                                <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传-->
+                                <!--                                </el-button>-->
                                 <el-button size="small" icon="el-icon-download" @click="showResponsibility()"
                                            v-if="eventStatusValue!='forest_event_status_1'&&eventStatusValue!='forest_event_status_7'">责任制
                                 </el-button>
@@ -1800,8 +1800,9 @@ import {
   joinConferences
 } from "@/api/meeting";
 import findUserByDept from '@/views/findUserByDept'
-import Cookies from "js-cookie";
-import request from "@/utils/request"; //责任人选择弹框
+import Cookies from "js-cookie"; //责任人选择弹框
+import request from "@/utils/request";
+
 export default {
   dicts: ['task_source'],
   watch: {
@@ -1821,6 +1822,7 @@ export default {
   },
   data() {
     return {
+      centermonitorTCamera:null,
       //地图tool开关
       mapToolShow: false,
       mapToolCheckAll: false,
@@ -2587,63 +2589,53 @@ export default {
               } else if (type == 'zdqy') {
                 markersMap.icon = 'sj-icon-keyAreas'
               } else if (type == 'sxt') {
-                if(res.data[i].cameraUse==1)
-                {
-                  if(res.data[i].workingStatus==0)
-                  {
-                    markersMap.icon='sj-icon-map-centerdata-slmonitor'
+                if (res.data[i].cameraUse == 1) {
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
                     markersMap.click='preview'
-                  }else
-                  {
-                    markersMap.icon='sj-icon-map-not-centerdata-slmonitor'
+                  } else {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
                     markersMap.click=''
                   }
-
-                } else  if (res.data[i].cameraUse == 2){
-                  if(res.data[i].workingStatus==0)
-                  {
-                    markersMap.icon = "camera";
-                    markersMap.click='preview'
-                  }else
-                  {
-                    markersMap.icon = "camera-not";
+                }
+                else if (res.data[i].cameraUse == 2) {
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'camera'
+                    markersMap.click=''
+                  } else {
+                    markersMap.icon = 'camera-not'
                     markersMap.click=''
                   }
-                }  else if (res.data[i].cameraUse == 3) {
-                  if(res.data[i].workingStatus==0)
-                  {
+                }
+                else if (res.data[i].cameraUse == 3) {
+                  if (res.data[i].workingStatus == '0') {
                     markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
                     markersMap.click='preview'
-                  }else
-                  {
+                  } else {
                     markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
                     markersMap.click=''
                   }
-
+                }
+                else if (res.data[i].cameraUse == 5) {
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                    markersMap.click='preview'
+                  } else {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-river_camera'
+                    markersMap.click=''
+                  }
                 }
                 else if (res.data[i].cameraUse == 4) {
-                  if(res.data[i].workingStatus==0)
-                  {
+                  if (res.data[i].workingStatus == '0') {
                     markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
                     markersMap.click='preview'
-                  }else
-                  {
+                  } else {
                     markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
                     markersMap.click=''
                   }
-
-                }
-                else if (res.data[i].cameraUse == 5) {
-                  if (res.data[i].workingStatus == 0) {
-                    markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
-                    markersMap.click = 'preview'
-                  } else  {
-                    markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
-                    markersMap.click = ''
-                  }
                 }
                 if (res.data[i].cameraCode != null) {
-                 // markersMap.click = 'preview'
+                  // markersMap.click = 'preview'
                   // markersMap.parameter = res.data[i].cameraCode
                   markersMap.parameter = {code:res.data[i].cameraCode,
                     type:res.data[i].cameraFactory?res.data[i].cameraFactory:1,name:res.data[i].cameraName}
@@ -3250,7 +3242,7 @@ export default {
       this.mapToolCheckItem = [];
       this.mapToolCheckAll=false
       this.mapToolShowBH=false,
-      this.dataStatus = null
+        this.dataStatus = null
       this.deptId = null
       console.log('关闭事件弹窗')
       this.eventLogList = []
@@ -3260,7 +3252,7 @@ export default {
       this.mapToolCheckItem = [];
       this.mapToolCheckAll=false
       this.mapToolShowBH=false,
-      this.getNewDataByDate(this.calendarDay)
+        this.getNewDataByDate(this.calendarDay)
       this.eventCode = eventCode
       let that = this
       //获取事件详情
@@ -3319,8 +3311,10 @@ export default {
         markersMapList.push(markersMap);
         if (res.data.centermonitorTCamera != null) {
           that.centermonitorTCamera = null;
-          that.centermonitorTCamera = res.data.centermonitorTCamera;
           that.cameraCode = res.data.centermonitorTCamera.id;
+          if(res.data.centermonitorTCamera.longitude != null && res.data.centermonitorTCamera.latitude != null) {
+            that.centermonitorTCamera = res.data.centermonitorTCamera;
+
           let markersMap = {
             lng: 124.59,
             lat: 43.02,
@@ -3356,15 +3350,15 @@ export default {
           markersMap.lng = res.data.centermonitorTCamera.longitude
           markersMap.lat = res.data.centermonitorTCamera.latitude
           markersMapList.push(markersMap)
-        }
+        }}
         setTimeout(() => {
           that.$refs.supermapDialog1.dropLocation10(
             res.data.catalogue.latitude,
             res.data.catalogue.longitude
           );
-            that.$refs.supermapDialog1.clearM(false);
-            that.$refs.supermapDialog1.clearM(true);
-            that.$refs.supermapDialog1.setMarkersRadius(markersMapList);
+          that.$refs.supermapDialog1.clearM(false);
+          that.$refs.supermapDialog1.clearM(true);
+          that.$refs.supermapDialog1.setMarkersRadius(markersMapList);
         }, 2000);
       })
     },
@@ -3427,7 +3421,12 @@ export default {
 
         markersMapList.push(markersMap)
         if (res.data.centermonitorTCamera != null) {
-          let markersMap = {
+          that.centermonitorTCamera = null;
+          that.cameraCode = res.data.centermonitorTCamera.id;
+          if(res.data.centermonitorTCamera.longitude != null && res.data.centermonitorTCamera.latitude != null) {
+            that.centermonitorTCamera = res.data.centermonitorTCamera;
+
+            let markersMap = {
             lng: 124.59,
             lat: 43.02,
             icon: 'camera',
@@ -3456,15 +3455,15 @@ export default {
           markersMap.lat = res.data.centermonitorTCamera.latitude
 
           markersMapList.push(markersMap)
-        }
+        }}
         setTimeout(() => {
           that.$refs.supermapDialog1.dropLocation10(
             res.data.catalogue.latitude,
             res.data.catalogue.longitude
           );
-            that.$refs.supermapDialog1.clearM(false);
-            that.$refs.supermapDialog1.clearM(true);
-            that.$refs.supermapDialog1.setMarkersRadius(markersMapList);
+          that.$refs.supermapDialog1.clearM(false);
+          that.$refs.supermapDialog1.clearM(true);
+          that.$refs.supermapDialog1.setMarkersRadius(markersMapList);
         }, 2000);
       })
     },