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

src/views/bigdata/bigdata.vue

@@ -162,6 +162,10 @@
 						name: '交通云图',
 						path: '/forest',
 					},
+          {
+            name: '监控中心',
+            path: '/monitor',
+          },
 					{
 						name: '路长制',
 						path: '/leader',

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//应急预案

src/views/resources.vue

@@ -86,7 +86,7 @@
       <supermap
         ref="supermap"
         style="width: 100%; height: 100vh"
-        @showResourcesDialog="showResourcesDialog"
+        @sewageOutletClick="sewageOutletClick"
       >
       </supermap>
       <vBottomMenu ref="bottomMenu"></vBottomMenu>
@@ -110,21 +110,18 @@
 </template>
 
 <script>
-import {
-  getResourcesCount,
-  selectResources,
-  selectResourcesByLabel,
-} from "@/api/resources";
-import supermap from "@/components/supermap-2.5d"; //超图
-import vheader from "@/components/v-header.vue"; //一体化共用头部
-import vBottomMenu from "@/components/vBottomMenu.vue"; //一体化公共底部菜单
-import eventLocation from "@/components/eventLocation.vue"; //事件定位弹窗
-import TVWall from "@/components/TVWall.vue"; //电视墙弹窗
-import { getIconBg } from "@/api/components/sookaMapIcon"; //资源底色控制文件
-import resourcesdialog from "@/views/resourcesdialog.vue"; //事件详情弹窗
-/** ----------------------------------摄像头预览开始------------------------------------- */
-import { getHaiKangVideoServer } from "@/api/haikang/haikang";
-/** ----------------------------------摄像头预览结束------------------------------------- */
+  import {getResourcesCount, selectResources, selectResourcesByLabel,} from "@/api/resources";
+  import supermap from "@/components/supermap-2.5d"; //超图
+  import vheader from "@/components/v-header.vue"; //一体化共用头部
+  import vBottomMenu from "@/components/vBottomMenu.vue"; //一体化公共底部菜单
+  import eventLocation from "@/components/eventLocation.vue"; //事件定位弹窗
+  import TVWall from "@/components/TVWall.vue"; //电视墙弹窗
+  import {getIconBg} from "@/api/components/sookaMapIcon"; //资源底色控制文件
+  import resourcesdialog from "@/views/resourcesdialog.vue"; //事件详情弹窗
+  /** ----------------------------------摄像头预览开始------------------------------------- */
+  import {getHaiKangVideoServer} from "@/api/haikang/haikang";
+
+  /** ----------------------------------摄像头预览结束------------------------------------- */
 export default {
   components: {
     resourcesdialog,
@@ -284,6 +281,58 @@ export default {
       //资源信息弹出
       this.$refs.resourcesdialog.showResourcesDialog(param);
     },
+    sewageOutletClick(data) {
+      const params = Object.assign({});
+      params.longitude = data.longitude;
+      params.latitude = data.latitude;
+
+      const treeLabels = [
+        {
+          id: null,
+          labelCode: "999",
+          labelName: "电视墙",
+          cameraType: null,
+          parentLabelCode: "",
+        },
+      ];
+      const labelChannels = [];
+      for (let i in data.cameraList) {
+        treeLabels.push({
+          id: null,
+          labelCode: data.cameraList[i].cameraCode,
+          labelName: data.cameraList[i].cameraName,
+          cameraType: "1",
+          parentLabelCode: "999",
+        });
+        labelChannels.push({
+          labelCode: data.cameraList[i].cameraCode,
+          channelDates: [
+            {
+              channelCode: data.cameraList[i].cameraCode,
+              channelName: data.cameraList[i].cameraName,
+              channelSn: null,
+              cameraType: "1",
+              online: "1",
+              cameraCode: "1",
+            },
+          ],
+        });
+      }
+      const dianshiqiang = [
+        {
+          switchTab: "2",
+          treeLabels: treeLabels,
+          labelChannels: labelChannels,
+        },
+      ];
+      if (data.cameraList.length > 0) {
+        this.$refs.TVWall.showTVWall1(
+          data.longitude,
+          data.latitude,
+          dianshiqiang
+        );
+      }
+    },
     initMarkers(list, type) {
       console.log("list=", list);
       if (list != null && list.length > 0) {
@@ -293,8 +342,8 @@ export default {
             lat: 43.02,
             icon: "marker",
             bindPopupHtml: "",
-            click: "",
-            parameter: "",
+            click: "sewageOutletClick",
+            parameter: list[i],
             keepBindPopup: false,
             isAggregation: false,
           };
@@ -302,10 +351,6 @@ export default {
             markersMap.isAggregation = true;
           }
           //根据标签确定资源的图标
-          // markersMap.icon = 'traffic-resources-' + type;
-          // alert(type+"=type")
-          // alert(this.resourcesList[i].label+"=this.resourcesList[i].label")
-          markersMap.icon = "traffic-resources-" + this.resourcesList[i].label;
           markersMap.icon =
             "traffic-resources-" +
             (type
@@ -313,13 +358,6 @@ export default {
                 ? "warning_sign"
                 : type
               : this.resourcesList[i].label);
-          markersMap.parameter =
-            this.resourcesList[i].id + "," + this.resourcesList[i].label;
-          markersMap.parameter =
-            this.resourcesList[i].id +
-            "," +
-            (type ? type : this.resourcesList[i].label);
-          markersMap.click = "";
           markersMap.lng = list[i].longitude;
           markersMap.lat = list[i].latitude;
           //POP的通用部分