王通 1 tahun lalu
induk
melakukan
a7718dd2c5
3 mengubah file dengan 18 tambahan dan 226 penghapusan
  1. 2 1
      src/api/monitor.js
  2. 15 224
      src/views/eventdetailsdialog.vue
  3. 1 1
      src/views/monitor.vue

+ 2 - 1
src/api/monitor.js

@@ -1,10 +1,11 @@
 import request from '@/utils/request'
 
 // 获取左侧动态感知设备
-export function selectDeviceType() {
+export function selectDeviceType(deptId) {
   return request({
     url: '/center-environment/VisuForestMonitorCenterController/selectDeviceType',
     method: 'post',
+    data:{"deptId":deptId}
   })
 }
 // 根据设备类型查看列表

+ 15 - 224
src/views/eventdetailsdialog.vue

@@ -73,8 +73,8 @@
                 <!--   <div class="dia-left-btm-tool">
                    </div> -->
                 <!-- 底部工具栏end -->
-                <div class="fire-m" style="bottom:5rem">
-                  <el-button size="small" icon="el-icon-s-grid" @click="showTVWallDiaLog()" v-show="eventType==1">视频联动</el-button>
+                <div class="fire-m" style="bottom:5rem" v-show="eventType==1">
+                  <el-button size="small" icon="el-icon-s-grid" @click="showTVWallDiaLog()">视频联动</el-button>
                   <el-button size="small" icon="el-icon-upload" @click="showheatPlotting()" v-show="eventType==1">火灾蔓延
                   </el-button>
                 </div>
@@ -175,7 +175,7 @@
                             </div>
                             <div class="z-info-btm-input">
                               <el-input type="textarea" v-model="eventLog" :autosize="{ minRows: 7, maxRows: 7}"
-                                        :maxlength='500'     placeholder="请输入反馈信息">
+                                        :maxlength="500"  placeholder="请输入反馈信息">
                               </el-input>
                               <div class="z-info-btm-input-btn" v-if="eventStatusValue=='forest_event_status_1'">
                                 <div style="text-align:left">
@@ -283,7 +283,7 @@
                class="top-dialog" @close="cancelEventConfirm()">
       <el-form label-width="80px">
         <el-form-item label="火灾半径" v-if="eventStatusButton=='qs'&&eventTypeXl==null">
-          <el-input type="number" v-model="sendHuoZaiBanJing" :maxlength='50'  placeholder="请输入火灾半径" />
+          <el-input type="number" v-model="sendHuoZaiBanJing"  :maxlength="50"placeholder="请输入火灾半径" />
         </el-form-item>
         <el-form-item
           v-if="eventStatusButton=='wb'||eventStatusButton=='qs'||eventStatusButton=='cf'||eventStatusButton=='ld'"
@@ -309,11 +309,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="联动标题" v-if="eventStatusButton=='ld'">
-          <el-input v-model="sendTaskTitle" :maxlength='50'  placeholder="请输入联动标题" />
+          <el-input v-model="sendTaskTitle" :maxlength="50" placeholder="请输入联动标题" />
         </el-form-item>
         <el-form-item label="联动内容" v-if="eventStatusButton=='ld'">
-          <el-input type="textarea" v-model="sendTaskContent"  :maxlength='500' :autosize="{ minRows: 7, maxRows: 7}"
-                     placeholder="请输入联动内容">
+          <el-input type="textarea" v-model="sendTaskContent"  :maxlength="500" :autosize="{ minRows: 7, maxRows: 7}"
+                    placeholder="请输入联动内容">
           </el-input>
         </el-form-item>
         <el-form-item label="联动部门" v-if="eventStatusButton=='ld'">
@@ -1097,7 +1097,6 @@ import {
   selectConfigKey
 } from "@/api/system/config";
 import Cookies from 'js-cookie';
-import { getResource,getResourcePoint, } from '@/api/datacenter'
 export default {
   dicts: ['task_source'],
   watch: {
@@ -1626,7 +1625,7 @@ export default {
           type: type,
           radius: this.radius
         }
-        if (type != 'sxt'&&this.eventType==1) {
+        if (type != 'sxt') {
           fireControlViewPoint(param).then(res => {
             if (res.data != null && res.data.pointList.length > 0) {
               this.resourcesListCheck.push(type)
@@ -1683,183 +1682,11 @@ export default {
               }, 1000)
             }
           })
-        }else if(this.eventType!==1)
-        {
-          getResourcePoint(type,undefined).then((res) => {
-            this.resourcesListCheck.push(type)
-            const markersList=[]
-            if (res.data.resourceList != null && res.data.resourceList.length > 0) {
-              for (let i = 0; i < res.data.resourceList.length; i++) {
-                let markersMap = {
-                  lng: 124.59,
-                  lat: 43.02,
-                  icon: "marker",
-                  bindPopupHtml: "",
-                  click: "",
-                  keepBindPopup: false,
-                  isAggregation: false,
-                };
-                markersList.push(
-                  this.getMarkersMap(
-                    type,
-                    markersMap,
-                    res.data.resourceList[i]
-                  )
-                );
-                // that.markersList.push(markersMap)
-              }
-            }
-            console.log("this.markersList",markersList)
-            setTimeout(() => {
-              this.$refs.supermapDialog.setMarkersByType(markersList, type)
-            }, 3000);
-          });
         } else {
           this.listResourceByWz(type);
         }
       }
     },
-    getMarkersMap(resourceTable, markersMap, item) {
-      if (resourceTable == "centerdata_t_environment_key_enterprise") {
-        //重点企业
-        markersMap.icon = "sj-icon-map-centerdata-t-environment-key-enterprise";
-        markersMap.lng = item.longitude ? item.longitude : "";
-        markersMap.lat = item.latitude ? item.latitude : "";
-        markersMap.click = "sewageOutletClick";
-        markersMap.parameter = item;
-        markersMap.bindPopupHtml =
-          '<div class="map-tip">' +
-          "<span>" +
-          '                  <div class="d-l-con">' +
-          '                  <div class="d-l-l-text">' +
-          "                  <h4>经纬度:" +
-          (item.longitude ? item.longitude : "") +
-          "," +
-          (item.latitude ? item.latitude : "") +
-          "</h4>" +
-          "                </div>" +
-          "                </div>" +
-          "                </span>" +
-          "<span>" +
-          '                  <div class="d-l-con">' +
-          '                  <div class="d-l-l-text">' +
-          "                  <h4>企业名称:" +
-          (item.name ? item.name : "") +
-          "</h4>" +
-          "                </div>" +
-          "                </div>" +
-          "                </span>" +
-          "<span>" +
-          '                  <div class="d-l-con">' +
-          '                  <div class="d-l-l-text">' +
-          "                  <h4>地址:" +
-          (item.address ? item.address : "") +
-          "</h4>" +
-          "                </div>" +
-          "                </div>" +
-          "                </span>" +
-          "<span>" +
-          '                  <div class="d-l-con">' +
-          '                  <div class="d-l-l-text">' +
-          "                  <h4>企业联系人:" +
-          (item.contacts ? item.contacts : "") +
-          "</h4>" +
-          "                </div>" +
-          "                </div>" +
-          "                </span>" +
-          "<span>" +
-          '                  <div class="d-l-con">' +
-          '                  <div class="d-l-l-text">' +
-          "                  <h4>联系电话:" +
-          (item.contacts_phone ? item.contacts_phone : "") +
-          "</h4>" +
-          "                </div>" +
-          "                </div>" +
-          "                </span></div>";
-      } else if (resourceTable == "centerdata_t_environment_source_pollution") {
-        //污染源
-        markersMap.icon =
-          "sj-icon-map-centerdata-t-environment-source-pollution";
-        markersMap.lng = item.longitude ? item.longitude : "";
-        markersMap.lat = item.latitude ? item.latitude : "";
-        markersMap.click = "sewageOutletClick";
-        markersMap.parameter = item;
-        markersMap.bindPopupHtml =
-          '<div class="map-tip">' +
-          "<span>" +
-          '                  <div class="d-l-con">' +
-          '                  <div class="d-l-l-text">' +
-          "                  <h4>经纬度:" +
-          (item.longitude ? item.longitude : "") +
-          "," +
-          (item.latitude ? item.latitude : "") +
-          "</h4>" +
-          "                </div>" +
-          "                </div>" +
-          "                </span>" +
-          "<span>" +
-          '                  <div class="d-l-con">' +
-          '                  <div class="d-l-l-text">' +
-          "                  <h4>污染源名称:" +
-          (item.name ? item.name : "") +
-          "</h4>" +
-          "                </div>" +
-          "                </div>" +
-          "                </span>" +
-          "<span>" +
-          '                  <div class="d-l-con">' +
-          '                  <div class="d-l-l-text">' +
-          "                  <h4>地址:" +
-          (item.address ? item.address : "") +
-          "</h4>" +
-          "                </div>" +
-          "                </div>" +
-          "                </span>" +
-          "<span>" +
-          "</div>";
-      } else if (resourceTable == "centerdata_t_environment_sewage_outlet") {
-        //排污口
-        markersMap.icon = "sj-icon-map-centerdata_t_environment_sewage_outlet";
-        markersMap.lng = item.longitude ? item.longitude : "";
-        markersMap.lat = item.latitude ? item.latitude : "";
-        markersMap.click = "sewageOutletClick";
-        markersMap.parameter = item;
-        markersMap.bindPopupHtml =
-          '<div class="map-tip">' +
-          "<span>" +
-          '                  <div class="d-l-con">' +
-          '                  <div class="d-l-l-text">' +
-          "                  <h4>经纬度:" +
-          (item.longitude ? item.longitude : "") +
-          "," +
-          (item.latitude ? item.latitude : "") +
-          "</h4>" +
-          "                </div>" +
-          "                </div>" +
-          "                </span>" +
-          "<span>" +
-          '                  <div class="d-l-con">' +
-          '                  <div class="d-l-l-text">' +
-          "                  <h4>排污口名称:" +
-          (item.name ? item.name : "") +
-          "</h4>" +
-          "                </div>" +
-          "                </div>" +
-          "                </span>" +
-          "<span>" +
-          '                  <div class="d-l-con">' +
-          '                  <div class="d-l-l-text">' +
-          "                  <h4>地址:" +
-          (item.address ? item.address : "") +
-          "</h4>" +
-          "                </div>" +
-          "                </div>" +
-          "                </span>" +
-          "<span>" +
-          "</div>";
-      }
-      return markersMap;
-    },
     listResourceByWz(type) {
       if (this.resourcesListCheck.indexOf(type) > -1) {
         this.resourcesListCheck.splice(this.resourcesListCheck.indexOf(type), 1)
@@ -1979,6 +1806,8 @@ export default {
       this.sendEventType = null
       this.sendHuoZaiBanJing = 0
       this.sendGuanLianYuAn = null
+      // this.longitude = null
+      // this.latitude = null
       this.sendTaskTitle = null
       this.sendTaskSource = null
       this.sendTaskContent = null
@@ -2371,11 +2200,11 @@ export default {
           that.eventStatusButton = 'sh'
           if (that.eventDescription == '' || that.eventDescription == null) {
             that.$message.error(`请填写审核意见!`)
-            return true;
+            return
           }
           if (that.attachExamine.length == 0 || that.attachExamine == null) {
             that.$message.error(`请上传审核图片!`)
-            return true;
+            return
           }
           //事件处理流程--审核不通过
           let param = {
@@ -2501,7 +2330,7 @@ export default {
       this.eventLogList = []
     },
     showEventDialog(eventCode) {
-      this.resourcesList = [];
+      this.fireControlViewList()
       this.eventCode = eventCode
       let that = this
       //获取事件详情
@@ -2519,12 +2348,12 @@ export default {
         that.dataStatus = res.data.catalogue.dataStatus
         that.deptId = res.data.catalogue.deptId
         that.eventId = res.data.catalogue.id
+        that.isExamine = res.data.catalogue.isExamine
         that.longitude = res.data.catalogue.longitude
         that.latitude = res.data.catalogue.latitude
         that.eventName = res.data.catalogue.eventName
         that.version = res.data.catalogue.version
         that.eventTypeXl = res.data.catalogue.eventTypeXl
-        that.isExamine = res.data.catalogue.isExamine
         let markersMap = {
           lng: 124.59,
           lat: 43.02,
@@ -2589,13 +2418,6 @@ export default {
           markersMap.lat = res.data.centermonitorTCamera.latitude
           markersMapList.push(markersMap)
         }
-        if(that.eventType==1)
-        {
-          that.fireControlViewList()
-        }else
-        {
-          that.getResource()
-        }
         setTimeout(() => {
           that.$refs.supermapDialog.dynamicPlotting() //弹出动态绘制窗口,防止截图位置改变
           that.$refs.supermapDialog.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
@@ -2621,6 +2443,7 @@ export default {
         that.eventType = res.data.catalogue.eventType
         that.statusFlag = res.data.catalogue.statusFlag
         that.dataStatus = res.data.catalogue.dataStatus
+        that.isExamine = res.data.catalogue.isExamine
         that.deptId = res.data.catalogue.deptId
         that.eventId = res.data.catalogue.id
         that.latitude = res.data.catalogue.latitude
@@ -2628,7 +2451,6 @@ export default {
         that.eventName = res.data.catalogue.eventName
         that.version = res.data.catalogue.version
         that.eventTypeXl = res.data.catalogue.eventTypeXl
-        that.isExamine = res.data.catalogue.isExamine
         let markersMap = {
           lng: 124.59,
           lat: 43.02,
@@ -2711,37 +2533,6 @@ export default {
         this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo //应急预案
       })
     },
-    getResource() {
-      let that = this;
-      //获取左侧菜单列表
-      getResource().then((res) => {
-       // that.resourcesList = res.data;
-        //截取data.resourceTable字段中“_”分隔符最后一个作为关键字,重新拼接成前端需要的图标:class,格式sj-icon-xxxx,将其set回原数组
-        res.data.forEach(function (data, index) {
-          let icon ='sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-").replaceAll("@", "-");
-
-          let obj = {};
-          let resourceName = data.name.replaceAll("(个)", "");
-          obj.resourceName = resourceName;
-          obj.type = data.type;
-          obj.count = data.num;
-          obj.icon = icon;
-          that.resourcesList.push(obj)
-          that.$set(
-            that.resourcesList[index],
-            "icon",
-            icon
-          );
-          that.$set(that.resourcesList[index], "bg", getIconBg(icon));
-
-          // if(index < 5){
-          //   // that.fireControlViewPoint(data.type, 'undefined');
-          //   that.indentleftSetMarkers(data.type, '所有');
-          // }
-        });
-        //数据自动落点结束
-      });
-    },
     // 页面元素转图片
     toImage() {
       this.$message.success(`正在上传!请稍后...`)

+ 1 - 1
src/views/monitor.vue

@@ -1225,7 +1225,7 @@ export default {
     selectDeviceType() {
       //获取左侧动态感知设备
       let that = this;
-      selectDeviceType().then((res) => {
+      selectDeviceType(that.deptId).then((res) => {
         that.cameraMarkersList = [];
         that.visuForestCloudMapDeviceBOList =
           res.data.visuForestCloudMapDeviceBOList;