1

src/store/modules/user.js

@@ -77,6 +77,7 @@ const user = {
           commit('SET_USERID', user.id)
           commit('SET_AVATAR', avatar)
           Cookies.set('deptId',user.deptId)
+          Cookies.set('deptName',user.deptNames)
           resolve(res)
         }).catch(error => {
           reject(error)

src/views/eventdetailsdialog.vue

@@ -715,8 +715,7 @@
           v-if="
             eventStatusButton == 'wb' ||
             eventStatusButton == 'qs' ||
-            eventStatusButton == 'cf' ||
-            eventStatusButton == 'ld'
+            eventStatusButton == 'cf'
           "
           :label="deptNameitem"
         >
@@ -731,8 +730,7 @@
             v-if="
               eventStatusButton == 'wb' ||
               eventStatusButton == 'qs' ||
-              eventStatusButton == 'cf' ||
-              eventStatusButton == 'ld'
+              eventStatusButton == 'cf'
             "
           >
             <el-option
@@ -801,8 +799,8 @@
             :filter-node-method="filterNode"
             :accordion="true"
             empty-text="加载中，请稍候"
-            :props="defaultProps"
-          ></el-tree>
+            :props="defaultProps">
+          </el-tree>
           <!--            default-expand-all-->
         </el-form-item>
         <el-form-item label="关联预案" v-if="eventStatusButton == 'qs'">
@@ -2262,9 +2260,9 @@ export default {
       /** *****************事件流程***************************/
       showEventConfirm: false, //事件签收弹窗
       showGuanLianYuAnConfirm: false, //调整关联预案弹窗
-      centermonitorTCamera: null, //事件摄像头
       showEventConfirm_gd: false, //事件火险报告弹窗
       address: null, //事件上报地址
+      centermonitorTCamera: null, //事件摄像头
       eventStatusValue: null, //事件状态
       isExamine: "0", //事件审核 1通过  0不通过
       eventId: null, //事件ID
@@ -2632,55 +2630,55 @@ export default {
     },
     initByCameras() {
       // const params = Object.assign({})
-            // params.longitude = this.longitude;
-            // params.latitude = this.latitude;
-            // params.type = '8'
-            // initByCameras(params).then(res => {
-            //   this.$refs.TVWall.showTVWall1(this.longitude, this.latitude, res.data);
-            //   this.$refs.bottomMenu.showMeasure = false
-            //   this.$refs.bottomMenu.showChild = false
-            //   this.$refs.bottomMenu.showBanChild = false
-            //   this.$refs.bottomMenu.showChangChild = false
-            // })
-              let that = this
-              if(that.centermonitorTCamera == null){
-                this.$message.warning("当前事件无绑定摄像头")
-                return
-              }
-              let tvListJson = [{
-                        "switchTab": "2",
-                        "treeLabels": [{
-                          "id": null,
-                          "labelCode": "999",
-                          "labelName": "电视墙",
-                          "cameraType": null,
-                          "parentLabelCode": ""
-                        },
-                          {
-                            "id": "spcamera00010",
-                            "labelCode": that.centermonitorTCamera.cameraCode,
-                            "labelName": that.centermonitorTCamera.cameraName,
-                            "cameraType": that.centermonitorTCamera.cameraType,
-                            "parentLabelCode": "999"
-                          }
-                        ],
-                        "labelChannels": [{
-                          "labelCode": that.centermonitorTCamera.cameraCode,
-                          "channelDates": [{
-                            "channelCode": that.centermonitorTCamera.cameraCode,
-                            "channelName": that.centermonitorTCamera.cameraName,
-                            "channelSn": null,
-                            "cameraType": that.centermonitorTCamera.cameraType,
-                            "online": "1",
-                            "cameraCode": null
-                          }]
-                        }]
-                      }]
-              this.$refs.TVWall.showTVWall1(this.longitude, this.latitude, tvListJson);
-              this.$refs.bottomMenu.showMeasure = false
-              this.$refs.bottomMenu.showChild = false
-              this.$refs.bottomMenu.showBanChild = false
-              this.$refs.bottomMenu.showChangChild = false
+                  // params.longitude = this.longitude;
+                  // params.latitude = this.latitude;
+                  // params.type = '8'
+                  // initByCameras(params).then(res => {
+                  //   this.$refs.TVWall.showTVWall1(this.longitude, this.latitude, res.data);
+                  //   this.$refs.bottomMenu.showMeasure = false
+                  //   this.$refs.bottomMenu.showChild = false
+                  //   this.$refs.bottomMenu.showBanChild = false
+                  //   this.$refs.bottomMenu.showChangChild = false
+                  // })
+                    let that = this
+                    if(that.centermonitorTCamera == null){
+                      this.$message.warning("当前事件无绑定摄像头")
+                      return
+                    }
+                    let tvListJson = [{
+                              "switchTab": "2",
+                              "treeLabels": [{
+                                "id": null,
+                                "labelCode": "999",
+                                "labelName": "电视墙",
+                                "cameraType": null,
+                                "parentLabelCode": ""
+                              },
+                                {
+                                  "id": "spcamera00010",
+                                  "labelCode": that.centermonitorTCamera.cameraCode,
+                                  "labelName": that.centermonitorTCamera.cameraName,
+                                  "cameraType": that.centermonitorTCamera.cameraType,
+                                  "parentLabelCode": "999"
+                                }
+                              ],
+                              "labelChannels": [{
+                                "labelCode": that.centermonitorTCamera.cameraCode,
+                                "channelDates": [{
+                                  "channelCode": that.centermonitorTCamera.cameraCode,
+                                  "channelName": that.centermonitorTCamera.cameraName,
+                                  "channelSn": null,
+                                  "cameraType": that.centermonitorTCamera.cameraType,
+                                  "online": "1",
+                                  "cameraCode": null
+                                }]
+                              }]
+                            }]
+                    this.$refs.TVWall.showTVWall1(this.longitude, this.latitude, tvListJson);
+                    this.$refs.bottomMenu.showMeasure = false
+                    this.$refs.bottomMenu.showChild = false
+                    this.$refs.bottomMenu.showBanChild = false
+                    this.$refs.bottomMenu.showChangChild = false
     },
     showUpdateYjYuAn() {
       listYuAn().then((res) => {
@@ -3163,6 +3161,19 @@ export default {
         this.attachExamine.push(attachPath);
       });
     },
+
+//设置联动部门不可选择本部门
+    recursiveChildren(arrayList,deptId) {
+      arrayList.forEach((item, index) => {
+        if(item.id==deptId){
+          item.disabled="true";
+          return
+        }
+        if(item.children){
+          this.recursiveChildren(item.children,deptId)
+        }
+      });
+    },
     /**
      * eventStatusValue 事件状态
      * isSend 是否办理
@@ -3240,6 +3251,8 @@ export default {
           that.eventConfirmTitle = "事件联动";
           /** 查询部门树结构 */
           await deptTreeselect().then((response) => {
+            let deptId=Cookies.get("deptId")
+            that.recursiveChildren(response.data,deptId)
             that.deptOptionsLiandong = response.data;
           });
           that.showEventConfirm = true;
@@ -3280,15 +3293,11 @@ export default {
             that.$message.error(`请选择任务联动部门!`);
             return;
           }
-          if (
-            that.sendDeptId == "" ||
-            that.sendDeptId == null ||
-            that.sendDeptName == "" ||
-            that.sendDeptName == null
-          ) {
-            that.$message.error(`请选择任务发起部门!`);
-            return;
-          }
+          // if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName ==
+          //   null) {
+          //   that.$message.error(`请选择任务发起部门!`)
+          //   return
+          // }
           let eventState = "";
           listSJfl({
             parentId: that.eventType,
@@ -3300,8 +3309,8 @@ export default {
                 }
               }
               let param = {
-                sendDeptId: that.sendDeptId,
-                sendDept: that.sendDeptName,
+                sendDeptId: Cookies.get("deptId"),
+                sendDept: Cookies.get("deptName"),
                 eventCode: that.eventCode,
                 longitude: that.longitude,
                 latitude: that.latitude,

src/views/firespread.vue

@@ -938,12 +938,12 @@
           <el-input type="number" v-model="sendHuoZaiBanJing" placeholder="请输入火灾半径" />
         </el-form-item>
         <el-form-item
-          v-if="eventStatusButton=='wb'||eventStatusButton=='qs'||eventStatusButton=='cf'||eventStatusButton=='ld'"
+          v-if="eventStatusButton=='wb'||eventStatusButton=='qs'||eventStatusButton=='cf'"
           :label="deptNameitem">
           <!--          <treeselect v-model="deptId" :options="deptOptions" multiple :show-count="true"-->
           <!--                      placeholder="请选择签收部门"/>-->
           <el-select v-model="sendDeptName" clearable placeholder="请选择部门" class="m-r-1rem" @change="setValue"
-                     v-if="eventStatusButton=='wb'||eventStatusButton=='qs'||eventStatusButton=='cf'||eventStatusButton=='ld'">
+                     v-if="eventStatusButton=='wb'||eventStatusButton=='qs'||eventStatusButton=='cf'">
             <el-option v-for="item in deptOptions" :key="item.deptId" :label="item.deptName"
                        :value="{value:item.deptId,label:item.deptName}">
             </el-option>
@@ -1733,7 +1733,8 @@ import DHWs from '@/dahua/lib/DHWs'
 import {
   joinConferences
 } from "@/api/meeting";
-import findUserByDept from '@/views/findUserByDept' //责任人选择弹框
+import findUserByDept from '@/views/findUserByDept'
+import Cookies from "js-cookie"; //责任人选择弹框
 export default {
   dicts: ['task_source'],
   watch: {
@@ -2690,6 +2691,19 @@ export default {
         this.attachExamine.push(attachPath)
       });
     },
+
+//设置联动部门不可选择本部门
+    recursiveChildren(arrayList,deptId) {
+      arrayList.forEach((item, index) => {
+        if(item.id==deptId){
+          item.disabled="true";
+          return
+        }
+        if(item.children){
+          this.recursiveChildren(item.children,deptId)
+        }
+      });
+    },
     /**
      * eventStatusValue 事件状态
      * isSend 是否办理
@@ -2756,6 +2770,8 @@ export default {
           that.eventConfirmTitle = '事件联动'
           /** 查询部门树结构 */
           await deptTreeselect().then(response => {
+            let deptId=Cookies.get("deptId")
+            that.recursiveChildren(response.data,deptId)
             that.deptOptionsLiandong = response.data
           })
           that.showEventConfirm = true
@@ -2793,11 +2809,11 @@ export default {
             that.$message.error(`请选择任务联动部门!`)
             return
           }
-          if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName ==
-            null) {
-            that.$message.error(`请选择任务发起部门!`)
-            return
-          }
+          // if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName ==
+          //   null) {
+          //   that.$message.error(`请选择任务发起部门!`)
+          //   return
+          // }
           let eventState = "";
           listSJfl({
             parentId: that.eventType
@@ -2809,8 +2825,8 @@ export default {
                 }
               }
               let param = {
-                sendDeptId: that.sendDeptId,
-                sendDept: that.sendDeptName,
+                sendDeptId: Cookies.get("deptId"),
+                sendDept: Cookies.get("deptName"),
                 eventCode: that.eventCode,
                 longitude: that.longitude,
                 latitude: that.latitude,
@@ -2822,6 +2838,7 @@ export default {
                 eventState: eventState,
                 eventName: that.eventName
               }
+              debugger
               sendTask(param).then(res => {
                 if (res.code == 200) {
                   that.$message.success(`联动发起成功!`)

src/views/monitor.vue

@@ -1638,16 +1638,56 @@
               }
 
               if (res.data[i].cameraUse == 1) {
-                markersMap.icon = "sj-icon-map-centerdata-slmonitor";
+                if (res.data[i].workingStatus == 0) {
+                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                  markersMap.click = 'preview'
+                } else if (res.data.visuForestCloudCameraBOList[i].workingStatus == 1) {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
+                  markersMap.click = ''
+                }
+              
               } else if (res.data[i].cameraUse == 2) {
-                markersMap.icon = "camera";
+                if (res.data[i].workingStatus == 0) {
+                  markersMap.icon = "camera";
+                  markersMap.click = 'preview'
+                } else if (res.data[i].workingStatus == 1) {
+                  markersMap.icon = "camera-not";
+                  markersMap.click = ''
+                }
               } else if (res.data[i].cameraUse == 3) {
-                markersMap.icon = "sj-icon-map-centerdata-slmonitor-traffic";
+                if (res.data[i].workingStatus == 0) {
+                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                  markersMap.click = 'preview'
+                } else if (res.data[i].workingStatus == 1) {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                  markersMap.click = ''
+                }
+              
               } else if (res.data[i].cameraUse == 4) {
-                markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                if (res.data[i].workingStatus == 0) {
+                  markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                  markersMap.click = 'preview'
+                } else if (res.data[i].workingStatus == 1) {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+                  markersMap.click = ''
+                }
+              
               } else if (res.data[i].cameraUse == 5) {
-                markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                if (res.data[i].workingStatus == 0) {
+                  markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+                  markersMap.click = 'preview'
+                } else if (res.data[i].workingStatus == 1) {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
+                  markersMap.click = ''
+                }
+              }
+              
+              if (res.data.visuForestCloudCameraBOList[i].channelCode != null) {
+                markersMap.parameter = res.data.visuForestCloudCameraBOList[i]
+              } else {
+                markersMap.parameter = [];
               }
+              
               markersMap.lng = res.data[i].longitude;
               markersMap.lat = res.data[i].latitude;
               markersMap.radius = res.data[i].cameraRadius;
@@ -2009,4 +2049,4 @@
     height: 600px;
     border: 1px solid red;
   }
-</style>
+</style>