业务需求bug修改

src/components/TVWall.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="电视墙" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
+    <el-dialog :title="title" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
                @close="cancelEventLocationShow()">
 	  <!--<div class="forthis" style="width: 22%; position: absolute;left: 0;z-index: 9999999999999;">-->
 	  	<!--&lt;!&ndash; <div class="this-title">-->
@@ -37,7 +37,7 @@ import { getDahuaVideoServer, getTVWallList } from '@/api/dahua/dahua'
 import { tvCameraList } from '@/api/haikang/haikang'
 import DHWs from '@/dahua/lib/DHWs'
 import { rotation } from '@/api/monitor'
-
+import Cookies from "js-cookie"
 
 /** ----------------------------------摄像头预览结束------------------------------------- */
 export default {
@@ -45,6 +45,7 @@ export default {
   components: {},
   data() {
     return {
+      title:['365','369','371','373','372','370'].includes(Cookies.get("deptId"))?"电视墙":"电视墙\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000您的所有操作痕迹已被后台记录，请谨慎操作。",
       tvListJson: [
         {
         'switchTab': '1',

src/components/TVWalls.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="电视墙" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
+    <el-dialog :title="title" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
                @close="cancelEventLocationShow()">
       <!--<div @click="findCameraByEventCoordinate()">视频联动</div>-->
       <!--<div class="forthis" style="width: 22%; position: absolute;left: 0;z-index: 9999999999999;">-->
@@ -34,13 +34,14 @@ import {getDahuaVideoServer, getTVWallList} from '@/api/dahua/dahua'
 import {tvCameraList} from '@/api/haikang/haikang'
 import {findCameraByEventCoordinate, rotation} from '@/api/monitor'
 import DHWs from '@/dahua/lib/DHWs'
-
+import Cookies from "js-cookie"
 /** ----------------------------------摄像头预览结束------------------------------------- */
 export default {
   dicts: ['event_source'],
   components: {},
   data() {
     return {
+      title:['365','369','371','373','372','370'].includes(Cookies.get("deptId"))?"电视墙":"电视墙\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000您的所有操作痕迹已被后台记录，请谨慎操作。",
       tvListJson: [
         {
           'switchTab': '1',

src/components/supermap-2.5d.vue

@@ -191,6 +191,10 @@
             "Cun_yitong@SiPing#1",
           ],
         ],
+        dianshiqiang:null,
+        longitude:null,
+        latitude:null,
+        userList:null,
       }
     },
     watch: {},
@@ -742,7 +746,87 @@
           });
 
         }, 3000);
-
+        that.viewer.selectedEntityChanged.addEventListener(function (entity) {
+          if (entity != undefined && Reflect.has(entity, 'layerID')) {
+            that.queryParams.name = entity.pickResult[entity.layerID][0].feature.properties.Name;
+            that.queryParams.mapData = entity.pickResult[entity.layerID][0].feature.properties.SmUserID;
+            that.queryParams.mapName = entity.pickResult[entity.layerID][0].feature.properties.layer;
+            getDeviceList(that.queryParams).then(res => {
+              const treeLabels = [{
+                "id": null,
+                "labelCode": "999",
+                "labelName": "电视墙",
+                "cameraType": null,
+                "parentLabelCode": ""
+              }];
+              const labelChannels = [];
+              for (let i in res.data) {
+                treeLabels.push({
+                  "id": null,
+                  "labelCode": res.data[i].cameraCode,
+                  "labelName": res.data[i].cameraName,
+                  "cameraType": "1",
+                  "parentLabelCode": "999"
+                })
+                labelChannels.push({
+                  "labelCode": res.data[i].cameraCode,
+                  "channelDates": [
+                    {
+                      "channelCode": res.data[i].cameraCode,
+                      "channelName": res.data[i].cameraName,
+                      "channelSn": null,
+                      "cameraType": "1",
+                      "online": "1",
+                      "cameraCode": "1"
+                    }
+                  ]
+                })
+              }
+              that.dianshiqiang = [
+                {
+                  "switchTab": "2",
+                  "treeLabels": treeLabels,
+                  "labelChannels": labelChannels
+                }
+              ]
+              that.longitude = res.data[0].longitude;
+              that.latitude = res.data[0].latitude;
+              that.userList = res.data[0].userList;
+              let html =
+                '<div class="map-tip">' +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>名称：" + res.data[0].name +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>";
+              for (let i in res.data[0].userList){
+                html += "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>" +res.data[0].userList[0].position+":"+res.data[0].userList[0].name+"</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>"+
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>电话：" + (res.data[0].userList[i].phone ? res.data[0].userList[i].phone : "")+"</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>";
+              }
+              html += "</div>";
+              that.bindPopupHtml = html;
+              that.mapshow = true
+            });
+          }
+        });
+      },
+      openTvwall(){
+        this.$emit('fatherMethod', this.dianshiqiang, this.longitude, this.latitude, this.userList);
       },
       /**
        * 地图落点

src/views/eventdetailsdialog.vue

@@ -253,7 +253,25 @@
                                 </el-button>
                               </div>
                               <div class="z-info-btm-input-btn"
-                                   v-else-if="eventStatusValue=='forest_event_status_5'&&statusFlag=='1'">
+                                   v-else-if="eventStatusValue=='forest_event_status_5'">
+                                <el-button size="small" v-if="isExamine=='1'"
+                                           icon="el-icon-success" style="text-align:left"
+                                           @click="updateCentereventTEventcatalogueStatus('shtg',true)">
+                                  审核通过
+                                </el-button>
+                                <el-button size="small" v-if="isExamine=='1'"
+                                           icon="el-icon-success" style="text-align:left"
+                                           @click="updateCentereventTEventcatalogueStatus('shbtg',true)">
+                                  审核不通过
+                                </el-button>
+                                <el-button size="small" v-else icon="el-icon-loading" style="text-align:left">
+                                  请等待复核，复核通过后方可归档。
+                                </el-button>
+                                <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
+                                </el-button>
+                              </div>
+                              <div class="z-info-btm-input-btn"
+                                   v-else-if="eventStatusValue=='forest_event_status_8'&&statusFlag=='1'">
                                 <el-button size="small"
                                            icon="el-icon-success" style="text-align:left" v-if="eventTypeXl == 101"
                                            @click="updateCentereventTEventcatalogueStatus('gd',false)">
@@ -1152,6 +1170,7 @@ export default {
   },
   data() {
     return {
+      isExamine: "0",//事件审核按钮权限  1 有  其他没有
       version:0,
       isLoading:false,
       showFindUserByDept: false,//责任人选择框
@@ -2244,6 +2263,7 @@ console.log(this.dutysystemTableData)
         that.statusFlag = res.data.catalogue.statusFlag
         that.dataStatus = res.data.catalogue.dataStatus
         that.deptId = res.data.catalogue.deptId
+        that.isExamine = 1
         that.eventId = res.data.catalogue.id
         that.longitude = res.data.catalogue.longitude
         that.latitude = res.data.catalogue.latitude
@@ -2333,6 +2353,7 @@ console.log(this.dutysystemTableData)
         that.dataStatus = res.data.catalogue.dataStatus
         that.deptId = res.data.catalogue.deptId
         that.eventId = res.data.catalogue.id
+        that.isExamine = 1
         that.latitude = res.data.catalogue.latitude
         that.longitude = res.data.catalogue.longitude
         that.eventName = res.data.catalogue.eventName

src/views/firespread.vue

@@ -223,6 +223,24 @@
                                 </el-button>
                               </div>
                               <div class="z-info-btm-input-btn"
+                                   v-else-if="eventStatusValue=='forest_event_status_5'">
+                                <el-button size="small" v-if="isExamine=='1'"
+                                           icon="el-icon-success" style="text-align:left"
+                                           @click="updateCentereventTEventcatalogueStatus('shtg',true)">
+                                  审核通过
+                                </el-button>
+                                <el-button size="small" v-if="isExamine=='1'"
+                                           icon="el-icon-success" style="text-align:left"
+                                           @click="updateCentereventTEventcatalogueStatus('shbtg',true)">
+                                  审核不通过
+                                </el-button>
+                                <el-button size="small" v-else icon="el-icon-loading" style="text-align:left">
+                                  请等待复核，复核通过后方可归档。
+                                </el-button>
+                                <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
+                                </el-button>
+                              </div>
+                              <div class="z-info-btm-input-btn"
                                    v-else-if="eventStatusValue=='forest_event_status_5'&&statusFlag=='1'">
                                 <el-button size="small"
                                            icon="el-icon-success" style="text-align:left" v-if="eventTypeXl == 101"
@@ -1804,6 +1822,7 @@ findUserByDept
   },
   data() {
     return {
+      isExamine:0,
       isLoading:false,
       //海康
       cameraTitle: '',
@@ -2921,6 +2940,7 @@ findUserByDept
         that.statusFlag = res.data.catalogue.statusFlag
         that.dataStatus = res.data.catalogue.dataStatus
         that.deptId = res.data.catalogue.deptId
+        that.isExamine = 1
         that.eventId = res.data.catalogue.id
         that.longitude = res.data.catalogue.longitude
         that.latitude = res.data.catalogue.latitude
@@ -3009,6 +3029,7 @@ findUserByDept
         that.dataStatus = res.data.catalogue.dataStatus
         that.deptId = res.data.catalogue.deptId
         that.eventId = res.data.catalogue.id
+        that.isExamine = 1
         that.latitude = res.data.catalogue.latitude
         that.longitude = res.data.catalogue.longitude
         that.eventName = res.data.catalogue.eventName