列表、日志 图片

src/views/eventdetailsdialog.vue

@@ -33,35 +33,35 @@
                 </div>
                 <!-- 应急预案end -->
                 <!-- 左侧资源 -->
-<!--                <div class="leftbar" style="width:fit-content !important;bottom:0rem;left: 1rem; top: unset;">-->
-<!--                  <div class="forthis">-->
-<!--                    <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">-->
-<!--                      <div class="i-list-con">-->
-<!--                        <div class="d-l-con-icon" style="flex-direction:row;flex-wrap: nowrap;">-->
-<!--                          <div class="icon-con" style="width: fit-content !important;"-->
-<!--                               v-for="(item,index) in resourcesList" @click="listResourceByWz(item.type)">-->
-<!--                            <div class="iconfont icon icon-normal" :class="item.icon"></div>-->
-<!--                            <div class="icon-text">-->
-<!--                              <h5>{{ item.resourceName }}</h5>-->
-<!--                            </div>-->
-<!--                          </div>-->
-<!--                          <el-input type="number" v-model="radius" style="width: 80px;" placeholder="请输入搜索半径"/>-->
-<!--                        </div>-->
-<!--                      </div>-->
-
-<!--                    </dv-border-box-7>-->
-<!--                  </div>-->
-
-<!--                </div>-->
+                <!--                <div class="leftbar" style="width:fit-content !important;bottom:0rem;left: 1rem; top: unset;">-->
+                <!--                  <div class="forthis">-->
+                <!--                    <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">-->
+                <!--                      <div class="i-list-con">-->
+                <!--                        <div class="d-l-con-icon" style="flex-direction:row;flex-wrap: nowrap;">-->
+                <!--                          <div class="icon-con" style="width: fit-content !important;"-->
+                <!--                               v-for="(item,index) in resourcesList" @click="listResourceByWz(item.type)">-->
+                <!--                            <div class="iconfont icon icon-normal" :class="item.icon"></div>-->
+                <!--                            <div class="icon-text">-->
+                <!--                              <h5>{{ item.resourceName }}</h5>-->
+                <!--                            </div>-->
+                <!--                          </div>-->
+                <!--                          <el-input type="number" v-model="radius" style="width: 80px;" placeholder="请输入搜索半径"/>-->
+                <!--                        </div>-->
+                <!--                      </div>-->
+
+                <!--                    </dv-border-box-7>-->
+                <!--                  </div>-->
+
+                <!--                </div>-->
                 <!-- 左侧资源end -->
                 <!-- 底部工具栏 -->
                 <!--   <div class="dia-left-btm-tool">
                    </div> -->
                 <!-- 底部工具栏end -->
-<!--                <div class="fire-m">-->
-<!--                  <el-button size="small" icon="el-icon-upload" @click="showheatPlotting()">火灾蔓延-->
-<!--                  </el-button>-->
-<!--                </div>-->
+                <!--                <div class="fire-m">-->
+                <!--                  <el-button size="small" icon="el-icon-upload" @click="showheatPlotting()">火灾蔓延-->
+                <!--                  </el-button>-->
+                <!--                </div>-->
                 <!-- 地图 -->
                 <supermapDialog ref="supermapDialog"
                                 style="position: absolute; top:0;left: 0;"
@@ -100,7 +100,8 @@
                                       {{ item.logContent }}
                                     </div>
                                     <div>
-                                      <router-link to="#" @click.native="clickFile(itemfile.fileUrl,itemfile.fileName,itemfile.fileType)"
+                                      <router-link to="#"
+                                                   @click.native="clickFile(itemfile.fileUrl,itemfile.fileName,itemfile.fileType)"
                                                    v-for="(itemfile,indexfile) in item.fileVOs">
                                         <el-image :src="itemfile.fileUrl" v-if="itemfile.fileType=='image'"
                                                   :preview-src-list="assetTypeAnImage(item.fileVOs)"
@@ -251,7 +252,7 @@
                class="top-dialog"
                @close="cancelEventConfirm()">
       <el-form label-width="80px">
-        <el-form-item label="火灾半径" v-if="eventStatusButton=='qs'">
+        <el-form-item label="火灾半径" v-if="eventStatusButton=='qs'&&eventType=='1'">
           <el-input type="number" v-model="sendHuoZaiBanJing" placeholder="请输入火灾半径"/>
         </el-form-item>
         <el-form-item :label="deptNameitem">
@@ -267,7 +268,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="事件类型" v-if="eventStatusButton=='qs'">
+        <el-form-item label="事件类型" v-if="eventStatusButton=='qs'&&eventType=='1'">
           <el-select v-model="sendEventType" placeholder="请选择事件类型！" clearable>
             <el-option
               v-for="item in eventTypeList"
@@ -354,17 +355,20 @@
         </el-form-item>
         <el-button size="mini" type="primary" class="fr_button" @click="updateYjYuAn">确定
         </el-button>
-		<div style="clear: both;"></div>
+        <div style="clear: both;"></div>
       </el-form>
     </el-dialog>
-    <el-dialog title="责任制" :visible.sync="showResponsibilityDialog" v-if="showResponsibilityDialog" width="65%" @close="closeResponsibilityDialog()">
+    <el-dialog title="责任制" :visible.sync="showResponsibilityDialog" v-if="showResponsibilityDialog" width="65%"
+               @close="closeResponsibilityDialog()">
       <el-form label-width="1500px">
         <div class="bottom">
           <!-- 左侧菜单栏 -->
           <div class="bottomLeft">
             <div class="leftItem d-l-con padding-box nowrap" v-for="(item,index) in depteventList">
               <div class="bgt-info">
-                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}" @click="dutysystemSelect(item.deptId,item.deptName,item.id)">{{item.deptName}}</div>
+                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}"
+                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)">{{ item.deptName }}
+                </div>
               </div>
             </div>
           </div>
@@ -379,14 +383,14 @@
             <el-table
               :data="dutysystemTableData"
               style="width: 100%">
-              <el-table-column prop="id"  label="主键" v-if="false">
+              <el-table-column prop="id" label="主键" v-if="false">
                 <template slot-scope="scope" hidden>
-                  <el-input  v-model="scope.row.id" readonly  placeholder="主键" ></el-input>
+                  <el-input v-model="scope.row.id" readonly placeholder="主键"></el-input>
                 </template>
               </el-table-column>
-              <el-table-column prop="name" label="姓名" >
+              <el-table-column prop="name" label="姓名">
                 <template slot-scope="scope">
-                  <el-input  v-model="scope.row.name" placeholder="姓名" ></el-input>
+                  <el-input v-model="scope.row.name" placeholder="姓名"></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="post" label="岗位">
@@ -1126,10 +1130,10 @@ export default {
       eventDialog: false,
       showResponsibilityDialog: false,//责任制弹窗
       depteventList: [],//责任制部门列表
-      iconCurrentIndex:'',
-      dutysystemDeptName:'',
-      depteventId:'',
-      dutysystemTableData:[],
+      iconCurrentIndex: '',
+      dutysystemDeptName: '',
+      depteventId: '',
+      dutysystemTableData: [],
       radius: 50,//资源搜索半径
       // resourcesList: [
       //   {
@@ -1193,66 +1197,66 @@ export default {
   },
   methods: {
     /************************************责任制-开始****************************************/
-    addLine:function(){//添加负责人行数
+    addLine: function() {//添加负责人行数
       var newValue = {
-        id:"",//主键
-        dept:"",//部门名称
-        depteventId:"",//事件部门关联责任人
-        name:"",//姓名
-        post:"",//岗位
-        telphone:"",//手机号
-      };
+        id: '',//主键
+        dept: '',//部门名称
+        depteventId: '',//事件部门关联责任人
+        name: '',//姓名
+        post: '',//岗位
+        telphone: ''//手机号
+      }
       //添加新的行数
-      this.dutysystemTableData.push(newValue);
+      this.dutysystemTableData.push(newValue)
     },
-    handleDelete:function(index,row){//删除负责人行数
-      if(row.id!=null&&row.id!=''){
+    handleDelete: function(index, row) {//删除负责人行数
+      if (row.id != null && row.id != '') {
         let param = { ids: row.id }
         dutysystemRemove(param).then(res => {
           this.$message.success(`删除成功!`)
-          this.dutysystemSelect(this.iconCurrentIndex,this.dutysystemDeptName,this.depteventId)
+          this.dutysystemSelect(this.iconCurrentIndex, this.dutysystemDeptName, this.depteventId)
         })
-      }else{
+      } else {
         this.dutysystemTableData.splice(index, 1)
       }
     },
-    handleSave:function(index,rowData){//保存负责人行数
-      rowData.dept=this.dutysystemDeptName
-      rowData.depteventId=this.depteventId
+    handleSave: function(index, rowData) {//保存负责人行数
+      rowData.dept = this.dutysystemDeptName
+      rowData.depteventId = this.depteventId
       dutysystemAdd(rowData).then(res => {
         this.$message.success(`保存成功!`)
-        this.dutysystemSelect(this.iconCurrentIndex,this.dutysystemDeptName,this.depteventId)
+        this.dutysystemSelect(this.iconCurrentIndex, this.dutysystemDeptName, this.depteventId)
       })
     },
-    dutysystemSelect:function(deptId,dutysystemDeptName,depteventId){//通过部门查询负责人信息
-      this.dutysystemDeptName=dutysystemDeptName
-      this.depteventId=depteventId
-      this.iconCurrentIndex=deptId
+    dutysystemSelect: function(deptId, dutysystemDeptName, depteventId) {//通过部门查询负责人信息
+      this.dutysystemDeptName = dutysystemDeptName
+      this.depteventId = depteventId
+      this.iconCurrentIndex = deptId
       let param = { depteventId: depteventId }
       dutysystemList(param).then(res => {
-        if(res.data!=null&&res.data.length>0){
-          this.dutysystemTableData=res.data
-        }else{
-          this.dutysystemTableData=[{
-            id:"",//主键
-            dept:this.dutysystemDeptName,//部门名称
-            depteventId:this.depteventId,//事件部门关联责任人
-            name:"",//姓名
-            post:"",//岗位
-            telphone:"",//手机号
+        if (res.data != null && res.data.length > 0) {
+          this.dutysystemTableData = res.data
+        } else {
+          this.dutysystemTableData = [{
+            id: '',//主键
+            dept: this.dutysystemDeptName,//部门名称
+            depteventId: this.depteventId,//事件部门关联责任人
+            name: '',//姓名
+            post: '',//岗位
+            telphone: ''//手机号
           }]
         }
       })
 
     },
-    showResponsibility () {//弹出责任制弹窗
-      let param={eventCode:this.eventCode}
+    showResponsibility() {//弹出责任制弹窗
+      let param = { eventCode: this.eventCode }
       centereventtdepteventList(param).then(res => {
-        this.depteventList=res.data
+        this.depteventList = res.data
         this.showResponsibilityDialog = true
       })
     },
-    closeResponsibilityDialog () {//责任制关闭
+    closeResponsibilityDialog() {//责任制关闭
       this.dutysystemTableData = []
       this.dutysystemDeptName = ''
       this.depteventId = ''
@@ -1260,10 +1264,10 @@ export default {
       this.showResponsibilityDialog = false
     },
     /************************************责任制-结束****************************************/
-    showheatPlotting(){
-      if(!this.$refs.supermapDialog.isheatPlotting){
-        this.$refs.supermapDialog.showheatPlotting(this.latitude,this.longitude)
-      }else{
+    showheatPlotting() {
+      if (!this.$refs.supermapDialog.isheatPlotting) {
+        this.$refs.supermapDialog.showheatPlotting(this.latitude, this.longitude)
+      } else {
         this.$refs.supermapDialog.isheatPlotting = false
       }
     },
@@ -1357,17 +1361,17 @@ export default {
       let imageList = []
       if (filePath != null && filePath.length > 0) {
         for (let i = 0; i < filePath.length; i++) {
-          if (filePath[i].fileType=='image') {
+          if (filePath[i].fileType == 'image') {
             imageList.push(filePath[i].fileUrl)
           }
         }
       }
       return imageList
     },
-    clickFile(fileUrl, fileName,fileType) {
-      if (fileType=='image') {
+    clickFile(fileUrl, fileName, fileType) {
+      if (fileType == 'image') {
         return
-      } else if (fileType=='video') {
+      } else if (fileType == 'video') {
         this.showTcPlayer = true
         setTimeout(() => {
           this.playVideo = fileUrl
@@ -1376,7 +1380,7 @@ export default {
         let a = document.createElement('a')
         a.download = fileName
         a.href = fileUrl
-        a.target="_blank"
+        a.target = '_blank'
         a.click()
       }
     },
@@ -1429,7 +1433,7 @@ export default {
     },
     cancelEventConfirm_mp4() {
       //关闭视频窗口
-      this.playVideo=''
+      this.playVideo = ''
       this.$refs.TcPlayer.destroyed()
     },
     resetTable1() {
@@ -1643,14 +1647,25 @@ export default {
 
         } else if (eventStatus == 'gd') {
           //事件处理流程--归档
-          let param = {
-            eventCode: this.eventCode,
-            eventStatus: eventStatus,
-            id: this.eventId,
-            czlx: '',
-            forestFireLoss: { eventId: this.eventCode, table1: this.table1 },
-            fireInformation: { eventId: this.eventCode, table2: this.table2 },
-            array: this.regionalFlagObj.array
+          let param = {}
+          if (this.eventType != '1') {
+            param = {
+              eventCode: this.eventCode,
+              eventStatus: eventStatus,
+              id: this.eventId,
+              czlx: '',
+              array: this.regionalFlagObj.array
+            }
+          } else {
+            param = {
+              eventCode: this.eventCode,
+              eventStatus: eventStatus,
+              id: this.eventId,
+              czlx: '',
+              forestFireLoss: { eventId: this.eventCode, table1: this.table1 },
+              fireInformation: { eventId: this.eventCode, table2: this.table2 },
+              array: this.regionalFlagObj.array
+            }
           }
           updateCentereventTEventcatalogueStatus(param).then(res => {
             if (res.code == 200) {
@@ -1658,7 +1673,7 @@ export default {
               this.refreshEvent(this.eventCode)
               this.cancelEventConfirm_send()
               this.showEventConfirm_gd = false
-              this.$emit('getEventList', this.calendarDay,this.bigEventTypeId,this.smallEventTypeId)
+              this.$emit('getEventList', this.calendarDay, this.bigEventTypeId, this.smallEventTypeId)
             }
           })
         } else {
@@ -1667,6 +1682,9 @@ export default {
               this.$message.error(`请选择部门!`)
               return
             }
+            if (this.eventType != '1') {
+              this.sendEventType = this.smallEventTypeId
+            }
           }
           //事件处理流程
           let param = {
@@ -1686,7 +1704,7 @@ export default {
               this.refreshEvent(this.eventCode)
               this.cancelEventConfirm_send()
               this.showEventConfirm = false
-              this.$emit('getEventList', this.calendarDay,this.bigEventTypeId,this.smallEventTypeId)
+              this.$emit('getEventList', this.calendarDay, this.bigEventTypeId, this.smallEventTypeId)
             }
           })
         }
@@ -1723,46 +1741,46 @@ export default {
         this.eventDialog = true
         this.eventLogList = res.data.eventlog//日志列表
         this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
-          this.address = res.data.catalogue.address
-          this.eventStatusValue = res.data.catalogue.eventStatusValue
-          this.eventType = res.data.catalogue.eventType
-          this.eventId = res.data.catalogue.id
-          this.longitude = res.data.catalogue.longitude
-          this.latitude = res.data.catalogue.latitude
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            parameter: '',
-            keepBindPopup: false,
-            isAggregation: false,
-            radius: 0
-          }
-          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
-            markersMap.icon = 'sj-icon-map-xinshangbao'
-          }
-          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount > 0) {
-            markersMap.icon = 'sj-icon-map-cuiban'
-          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_2') {
-            markersMap.icon = 'sj-icon-map-qianshou'
-          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_5') {
-            markersMap.icon = 'sj-icon-map-banjie'
-          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
-            markersMap.icon = 'sj-icon-map-guidang'
-          }
-          markersMap.lng = res.data.catalogue.longitude
-          markersMap.lat = res.data.catalogue.latitude
-          if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
-            markersMap.radius = res.data.eventdetail[0].fireRadius
-          }
-          setTimeout(() => {
-            that.$refs.supermapDialog.dynamicPlotting()//弹出动态绘制窗口，防止截图位置改变
-            that.$refs.supermapDialog.clearM(false)
-            that.$refs.supermapDialog.setMarkersRadius([markersMap])
-            that.$refs.supermapDialog.dropLocation(res.data.catalogue.latitude, res.data.catalogue.longitude)
-          }, 2000)
+        this.address = res.data.catalogue.address
+        this.eventStatusValue = res.data.catalogue.eventStatusValue
+        this.eventType = res.data.catalogue.eventType
+        this.eventId = res.data.catalogue.id
+        this.longitude = res.data.catalogue.longitude
+        this.latitude = res.data.catalogue.latitude
+        let markersMap = {
+          lng: 124.59,
+          lat: 43.02,
+          icon: 'marker',
+          bindPopupHtml: '',
+          click: '',
+          parameter: '',
+          keepBindPopup: false,
+          isAggregation: false,
+          radius: 0
+        }
+        if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
+          markersMap.icon = 'sj-icon-map-xinshangbao'
+        }
+        if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount > 0) {
+          markersMap.icon = 'sj-icon-map-cuiban'
+        } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_2') {
+          markersMap.icon = 'sj-icon-map-qianshou'
+        } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_5') {
+          markersMap.icon = 'sj-icon-map-banjie'
+        } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
+          markersMap.icon = 'sj-icon-map-guidang'
+        }
+        markersMap.lng = res.data.catalogue.longitude
+        markersMap.lat = res.data.catalogue.latitude
+        if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
+          markersMap.radius = res.data.eventdetail[0].fireRadius
+        }
+        setTimeout(() => {
+          that.$refs.supermapDialog.dynamicPlotting()//弹出动态绘制窗口，防止截图位置改变
+          that.$refs.supermapDialog.clearM(false)
+          that.$refs.supermapDialog.setMarkersRadius([markersMap])
+          that.$refs.supermapDialog.dropLocation(res.data.catalogue.latitude, res.data.catalogue.longitude)
+        }, 2000)
         if (res.data.centermonitorTCamera != null) {
           let markersMap = {
             lng: 124.59,
@@ -1801,49 +1819,49 @@ export default {
         this.eventDialog = true
         this.eventLogList = res.data.eventlog
         this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
-          this.address = res.data.catalogue.address
-          this.eventStatusValue = res.data.catalogue.eventStatusValue
-          this.eventType = res.data.catalogue.eventType
-          this.eventId = res.data.catalogue.id
-          this.latitude = res.data.catalogue.latitude
-          this.longitude = res.data.catalogue.longitude
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            parameter: '',
-            keepBindPopup: false,
-            isAggregation: false,
-            radius: 0
-          }
-          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
-            markersMap.icon = 'sj-icon-map-xinshangbao'
-          }
-          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount > 0) {
-            markersMap.icon = 'sj-icon-map-cuiban'
-          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_2') {
-            markersMap.icon = 'sj-icon-map-qianshou'
-          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_5') {
-            markersMap.icon = 'sj-icon-map-banjie'
-          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
-            markersMap.icon = 'sj-icon-map-guidang'
-          }
-          markersMap.lng = res.data.catalogue.longitude
-          markersMap.lat = res.data.catalogue.latitude
+        this.address = res.data.catalogue.address
+        this.eventStatusValue = res.data.catalogue.eventStatusValue
+        this.eventType = res.data.catalogue.eventType
+        this.eventId = res.data.catalogue.id
+        this.latitude = res.data.catalogue.latitude
+        this.longitude = res.data.catalogue.longitude
+        let markersMap = {
+          lng: 124.59,
+          lat: 43.02,
+          icon: 'marker',
+          bindPopupHtml: '',
+          click: '',
+          parameter: '',
+          keepBindPopup: false,
+          isAggregation: false,
+          radius: 0
+        }
+        if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
+          markersMap.icon = 'sj-icon-map-xinshangbao'
+        }
+        if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount > 0) {
+          markersMap.icon = 'sj-icon-map-cuiban'
+        } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_2') {
+          markersMap.icon = 'sj-icon-map-qianshou'
+        } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_5') {
+          markersMap.icon = 'sj-icon-map-banjie'
+        } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
+          markersMap.icon = 'sj-icon-map-guidang'
+        }
+        markersMap.lng = res.data.catalogue.longitude
+        markersMap.lat = res.data.catalogue.latitude
+        if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
+          markersMap.radius = res.data.eventdetail[0].fireRadius
+        }
+        setTimeout(() => {
+          that.$refs.supermapDialog.clearM(false)
           if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
-            markersMap.radius = res.data.eventdetail[0].fireRadius
+            that.$refs.supermapDialog.setMarkersRadius([markersMap])
+          } else {
+            that.$refs.supermapDialog.setMarkers([markersMap])
           }
-          setTimeout(() => {
-            that.$refs.supermapDialog.clearM(false)
-            if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
-              that.$refs.supermapDialog.setMarkersRadius([markersMap])
-            } else {
-              that.$refs.supermapDialog.setMarkers([markersMap])
-            }
-            that.$refs.supermapDialog.dropLocation(res.data.catalogue.latitude, res.data.catalogue.longitude)
-          }, 2000)
+          that.$refs.supermapDialog.dropLocation(res.data.catalogue.latitude, res.data.catalogue.longitude)
+        }, 2000)
       })
     },
     refreshEventDialog(eventCode) {
@@ -1960,9 +1978,9 @@ export default {
       //   })
       // })
       that.cameraVisible = true
-      getHaiKangVideoServer({cameraCode:cameraCode}).then(newResponse => {
-        that.cameraTitle = '摄像头-'+newResponse.data.cameraName
-        that.initPlugin(newResponse.data.appkey,newResponse.data.loginIp,newResponse.data.secret,newResponse.data.loginPort)
+      getHaiKangVideoServer({ cameraCode: cameraCode }).then(newResponse => {
+        that.cameraTitle = '摄像头-' + newResponse.data.cameraName
+        that.initPlugin(newResponse.data.appkey, newResponse.data.loginIp, newResponse.data.secret, newResponse.data.loginPort)
         setTimeout(function() {
           that.playhk(newResponse.data.channelCode)
         }, 5000)
@@ -1981,8 +1999,8 @@ export default {
 
     /** ----------------------------------海康摄像头预览开始------------------------------------- */
     // 创建播放实例
-    initPlugin(newappkey,newloginIp,newsecret,newloginPort) {
-      let that=this
+    initPlugin(newappkey, newloginIp, newsecret, newloginPort) {
+      let that = this
       that.oWebControl = new WebControl({
         szPluginContainer: 'playWnd',                       // 指定容器id
         iServicePortStart: 15900,                           // 指定起止端口号，建议使用该值
@@ -1997,7 +2015,7 @@ export default {
             })
 
             that.oWebControl.JS_CreateWnd('playWnd', 1020, 600).then(function() { //JS_CreateWnd创建视频播放窗口，宽高可设定
-              that.init(newappkey,newloginIp,newsecret,newloginPort)  // 创建播放实例成功后初始化
+              that.init(newappkey, newloginIp, newsecret, newloginPort)  // 创建播放实例成功后初始化
             })
           }, function() { // 启动插件服务失败
           })
@@ -2009,7 +2027,7 @@ export default {
           initCount++
           if (initCount < 3) {
             setTimeout(function() {
-              that.initPlugin(newappkey,newloginIp,newsecret,newloginPort)
+              that.initPlugin(newappkey, newloginIp, newsecret, newloginPort)
             }, 3000)
           } else {
             $('#playWnd').html('插件启动失败，请检查插件是否安装！<a href="./public/hk/VideoWebPlugin.exe">点击下载插件</a>')
@@ -2046,7 +2064,7 @@ export default {
       })
     },
     //初始化
-    init(newappkey,newloginIp,newsecret,newloginPort) {
+    init(newappkey, newloginIp, newsecret, newloginPort) {
       let that = this
       that.getPubKey(function() {
         ////////////////////////////////// 请自行修改以下变量值	////////////////////////////////////
@@ -2108,10 +2126,11 @@ export default {
       var encrypt = new JSEncrypt()
       encrypt.setPublicKey(this.pubKey)
       return encrypt.encrypt(value)
-    },
+    }
     /** ----------------------------------海康摄像头预览结束------------------------------------- */
   }
 }
+
 // 推送消息
 function cbIntegrationCallBack(oData) {
   console.log(JSON.stringify(oData.responseMsg))
@@ -2307,21 +2326,22 @@ table tr td input:hover {
 
 
 // 20220928
-.yatz_button{
-	padding: 0.5rem 0.5rem;
-	color: #409EFF;
-	background: none;
-	border-color: #409EFF;
+.yatz_button {
+  padding: 0.5rem 0.5rem;
+  color: #409EFF;
+  background: none;
+  border-color: #409EFF;
 }
-.yatz_button:hover{
-	color: #fff;
-	background: #409EFF;
-	border-color: #409EFF;
+
+.yatz_button:hover {
+  color: #fff;
+  background: #409EFF;
+  border-color: #409EFF;
 }
 
-.fr_button{
-	float:right;
-	padding: 0.5rem 1.5rem;
+.fr_button {
+  float: right;
+  padding: 0.5rem 1.5rem;
 }
 
 .bottom {