Merge branch 'visu_resources_01_siping_2.5d' of http://121.37.83.100:3000/sooka_onest/sooka_onest_forestfire_vue2_visualization into visu_resources_01_siping_2.5d

src/views/datacenter.vue

@@ -60,7 +60,7 @@
       <!-- 地图 -->
       <!--      <supermap ref="supermap" style="width: 100%;height: 100vh;" :mapDiv="'forestMap'" class="indexSupermapClass"-->
       <!--                :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false"></supermap>-->
-      <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>-->
       <!-- 右侧 -->
@@ -189,7 +189,7 @@ export default {
     // 根据名称筛选资源点位
     searchByName() {
       this.$modal.msgSuccess("正在查询，请稍后...");
-      this.fireControlViewPoint(this.searchType, this.searchName);
+      this.indentleftSetMarkers(this.searchType, this.searchName);
     },
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
     bottomMenuList() {

src/views/eventdetailsdialog.vue

@@ -158,7 +158,7 @@
                   </dv-border-box-7>
                 </div>
                 <div class="forthis2">
-                  <dv-border-box-7 backgroundColor="#040b1f" >
+                  <dv-border-box-7 backgroundColor="#040b1f"  >
                     <div class="i-list-con">
                       <div class="this-con h-25 no-padding">
                         <div class="z-info-list" style="margin-top: 0;">
@@ -1420,6 +1420,7 @@ export default {
     addLine: function() {//添加负责人行数
       var newValue = {
         id: '',//主键
+        userId: '',//用户主键
         dept: '',//部门名称
         depteventId: '',//事件部门关联责任人
         name: '',//姓名
@@ -1470,17 +1471,9 @@ export default {
       dutysystemList(param).then(res => {
         if (res.data != null && res.data.length > 0) {
           this.dutysystemTableData = res.data
+        }else {
+          this.dutysystemTableData = []
         }
-        // else {
-        //   this.dutysystemTableData = [{
-        //     id: '',//主键
-        //     dept: this.dutysystemDeptName,//部门名称
-        //     depteventId: this.depteventId,//事件部门关联责任人
-        //     name: '',//姓名
-        //     post: '',//岗位
-        //     telphone: ''//手机号
-        //   }]
-        // }
       })
     },
 
@@ -2397,7 +2390,7 @@ console.log(this.dutysystemTableData)
       })
     },
     refreshEventDialog(eventCode) {
-      //刷新--事件日志
+      //刷新--事件日志12
       getEventDetail({ eventCode: eventCode }).then(res => {
         this.eventLogList = res.data.eventlog
         this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案

src/views/findUserByDept.vue

@@ -95,8 +95,8 @@
         this.resUser = [];
         for (let i in selection){
           const res = {};
-          res.id = selection[i].userId;
-          res.userId=''
+          res.id = '';
+          res.userId = selection[i].userId;
           res.dept = '';
           res.depteventId = '';
           res.name = selection[i].nickName;

src/views/firespread.vue

@@ -138,7 +138,7 @@
                   </dv-border-box-7>
                 </div>
                 <div class="forthis2">
-                  <dv-border-box-7 backgroundColor="#040b1f"  >
+                  <dv-border-box-7 backgroundColor="#040b1f" :color="['#0c4b53', '#18caca']" >
                     <div class="i-list-con">
                       <div class="this-con h-25 no-padding">
                         <div class="z-info-list" style="margin-top: 0;">
@@ -2079,6 +2079,7 @@ export default {
     addLine: function() {//添加负责人行数
       var newValue = {
         id: '',//主键
+        userId: '',//用户主键
         dept: '',//部门名称
         depteventId: '',//事件部门关联责任人
         name: '',//姓名
@@ -2286,17 +2287,9 @@ export default {
       dutysystemList(param).then(res => {
         if (res.data != null && res.data.length > 0) {
           this.dutysystemTableData = res.data
+        }else {
+          this.dutysystemTableData = []
         }
-        // else {
-        //   this.dutysystemTableData = [{
-        //     id: '',//主键
-        //     dept: this.dutysystemDeptName,//部门名称
-        //     depteventId: this.depteventId,//事件部门关联责任人
-        //     name: '',//姓名
-        //     post: '',//岗位
-        //     telphone: ''//手机号
-        //   }]
-        // }
       })
     },
 
@@ -2950,14 +2943,12 @@ export default {
           markersMapList.push(markersMap)
         }
         setTimeout(() => {
-          that.$refs.supermapDialog1.dynamicPlotting()//弹出动态绘制窗口，防止截图位置改变
           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)
         }, 2000)
       })
-
     },
     refreshEvent(eventCode) {
       this.eventCode = eventCode
@@ -3047,7 +3038,7 @@ export default {
       })
     },
     refreshEventDialog(eventCode) {
-      //刷新--事件日志
+      //刷新--事件日志12
       getEventDetail({ eventCode: eventCode }).then(res => {
         this.eventLogList = res.data.eventlog
         this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案