Merge branch 'visu_environment_01_siping_2.5d'

src/api/event.js

@@ -10,7 +10,23 @@ export function getNearEvent(longitude, latitude, day, loading, eventTypeIdDl, e
     },
   })
 }
-
+//根据类型获取事件
+export function getNearEvent_direct(longitude, latitude, day, loading, eventTypeIdDl, eventTypeId) {
+  return request({
+    url: '/center-event/eventview/getNearEvent',
+    method: 'post',
+    data: {
+      longitude: longitude,
+      latitude: latitude,
+      day: day,
+      eventTypeIdDl: eventTypeIdDl,
+      eventTypeId: eventTypeId,
+    },
+    headers: {
+      loading: loading
+    },
+  })
+}
 //获取附近事件
 export function getNearEvent1(longitude, latitude ) {
   return request({
@@ -27,3 +43,17 @@ export function getNearCamera(longitude,latitude) {
   })
 }
 
+export function getNearEvent1_direct(longitude, latitude ,vo) {
+  return request({
+    url: '/center-event/eventview/getNearEvent',
+    method: 'post',
+    data:{longitude:longitude,latitude:latitude,eventTypeId:vo.eventTypeId,eventTypeIdDl:vo.eventTypeIdDl,day:vo.day}
+  })
+}
+
+export function getNearCamera_monitor(longitude,latitude,type) {
+  return request({
+    url: `/center-monitor/camera/selectFjsxt/${longitude}/${latitude}/${type}`,
+    method: 'get',
+  })
+}

src/api/forest.js

@@ -39,6 +39,13 @@ export function getBaseInfo() {
     method: 'post',
   })
 }
+export function getTodayEvents_direct(param) {
+  return request({
+    url: '/center-event/eventview/selectTodayEvents',
+    method: 'post',
+    data: param
+  })
+}
 // 左侧获取事件信息统计
 export function getTodayEvents(param) {
   return request({
@@ -47,7 +54,23 @@ export function getTodayEvents(param) {
     data: param
   })
 }
-
+export function getWeather_direct(param) {
+  return request({
+    url: '/center-data/weatherinformation/getWeather',
+    method: 'post',
+    data: param
+  })
+}
+export function getDeptEventCount_direct(param,loading) {
+  return request({
+    url: '/center-event/eventview/selectDeptEventCount',
+    method: 'post',
+    data: param,
+    headers: {
+      loading: loading
+    },
+  })
+}
 // 左侧获取事件部门数量
 export function getDeptEventCount(param) {
   return request({
@@ -71,7 +94,17 @@ export function selectMessageById(messageId) {
     method: 'get'
   })
 }
-
+// 右侧获取事件列表
+export function getEventList_direct(param,loading) {
+  return request({
+    url: '/center-event/eventview/selectEventList',
+    method: 'post',
+    data: param,
+    headers: {
+      loading: loading
+    },
+  })
+}
 // 右侧获取事件列表
 export function getEventList(param) {
   return request({
@@ -88,7 +121,21 @@ export function getExposureStage(param) {
     data: param
   })
 }
-
+//右侧获取曝光台
+export function getExposureStage_direct(param) {
+  return request({
+    url: '/center-event/eventview/selectExposureStage',
+    method: 'post',
+    data: param
+  })
+}
+export function getEventDetail_direct(param) {
+  return request({
+    url: '/center-event/eventview/getEventDetail',
+    method: 'post',
+    data: param
+  })
+}
 // 获取事件详情
 export function getEventDetail(param) {
   return request({
@@ -98,6 +145,14 @@ export function getEventDetail(param) {
   })
 }
 // 获取日历颜色状态
+export function getEventByCalendar_direct(param) {
+  return request({
+    url: '/center-event/eventview/selectEventByCalendar',
+    method: 'post',
+    data: param
+  })
+}
+// 获取日历颜色状态
 export function getEventByCalendar(param) {
   return request({
     url: '/center-environment/VisuForestCloudMapController/getEventByCalendar',
@@ -106,6 +161,17 @@ export function getEventByCalendar(param) {
   })
 }
 // 获取事件分类
+export function getEventByEventType_direct(param,loading) {
+  return request({
+    url: '/center-event/eventview/getEventByEventType',
+    method: 'post',
+    data: param,
+    headers: {
+      loading: loading
+    },
+  })
+}
+// 获取事件分类
 export function getEventByEventType(param) {
   return request({
     url: '/center-environment/VisuForestCloudMapController/getEventByEventType',
@@ -113,6 +179,13 @@ export function getEventByEventType(param) {
     data: param
   })
 }
+export function getEventByReportorOrder_direct(param) {
+  return request({
+    url: '/center-event/eventview/getEventByReportorOrder',
+    method: 'post',
+    data: param
+  })
+}
 // 获取上报排名
 export function getEventByReportorOrder(param) {
   return request({
@@ -145,6 +218,12 @@ export function updateCentereventTEventcatalogueStatus(param) {
     data: param
   })
 }
+export function listSJfl_direct(param) {
+  return request({
+    url: '/center-event/eventtype/getCentereventTEventtypeByParentId?parentId='+param.parentId,
+    method: 'get',
+  })
+}
 // 事件处理流程-事件类型
 export function listSJfl(param) {
   return request({
@@ -160,6 +239,19 @@ export function listYuAn() {
     method: 'post'
   })
 }
+export function listYuAn_direct(param) {
+  return request({
+    url: '/center-data/reserve/listYuAnFegin',
+    method: 'post',
+    data:param
+  })
+}
+export function selectByeventCode_direct(eventCode) {
+  return request({
+    url: '/center-event/centereventtdeptevent/selectByEventCode?eventCode='+eventCode,
+    method: 'get'
+  })
+}
 // 事件处理流程-签收部门
 export function selectByeventCode(eventCode) {
   return request({
@@ -229,6 +321,13 @@ export function refusedTask(param) {
     data:param
   })
 }
+export function updateYjYuAn_direct(param) {
+  return request({
+    url: '/center-event/centereventtfireevent',
+    method: 'put',
+    data:param
+  })
+}
 // 事件调整关联预案
 export function updateYjYuAn(param) {
   return request({
@@ -245,6 +344,12 @@ export function uploadBase64(param) {
     data:param
   })
 }
+export function centereventtdepteventList_direct(param) {
+  return request({
+    url: `/center-event/centereventtdeptevent/getAllCentereventDeptEvent?eventCode=${param.eventCode}`,
+    method: 'get',
+  })
+}
 // 通过事件code查询事件责任部门
 export function centereventtdepteventList(param) {
   return request({
@@ -278,7 +383,25 @@ export function dutysystemRemove(param) {
     params:param
   })
 }
-
+export function dutysystemAdd_direct(param) {
+  return request({
+    url: '/center-event/dutysystem/addOrUpdateAll',
+    method: 'post',
+    data:param
+  })
+}
+export function dutysystemList_direct(param) {
+  return request({
+    url: `/center-event/dutysystem/getAllCentereventTDutySystem?depteventId=${param.depteventId}`,
+    method: 'get',
+  })
+}
+export function dutysystemRemove_direct(ids) {
+  return request({
+    url: `/center-event/dutysystem/${ids}`,
+    method: 'delete',
+  })
+}
 // 通过部门id获取责任人
 export function userFeginlist(param) {
   return request({
@@ -296,6 +419,14 @@ export function sendMessage(param) {
     data:param
   })
 }
+export function eventHandling_direct(id,eventCode) {
+  return request({
+    url: '/center-event/eventcatalogue/eventHandling',
+    method: 'post',
+    data: {id:id,eventCode:eventCode,dataStatus:"1"}
+  })
+}
+
 // 事件处置
 export function eventHandling(id,eventCode) {
   return request({
@@ -326,6 +457,13 @@ export function getLatestNotice() {
     params: {},
   })
 }
+export function selectByMenuId(data) {
+  return request({
+    url: '/system/menuEventType/selectByMenuId',
+    method: 'post',
+    data: data
+  })
+}
 // 获取绑定的事件类型
 export function getMenuEventType() {
   return request({
@@ -341,3 +479,10 @@ export function getEventPush(param) {
     data: param
   })
 }
+export function getEventPush_direct(param) {
+  return request({
+    url: '/center-event/eventview/eventPush',
+    method: 'post',
+    data: param
+  })
+}

src/api/haikang/haikang.js

@@ -15,3 +15,10 @@ export function tvCameraList() {
     method: 'get',
   })
 }
+export function tvCameraList_direct() {
+  return request({
+    url: '/center-monitor/HaiKangController/cameraTVHaiKangList',
+    method: 'post',
+    data:{"type":4}
+  })
+}

src/api/leader.js

@@ -7,6 +7,12 @@ export function getRy() {
     method: 'post',
     data:{}
   })
+}export function getRy_direct() {
+  return request({
+    url: '/center-data/environmentView/getRyList',
+    method: 'post',
+    data:{}
+  })
 }
 
 // 获取左侧人员列表
@@ -17,6 +23,17 @@ export function getForestLeader(linJob, linType) {
   })
 }
 
+export function getForestLeader_direct(linJob, linType) {
+  return request({
+    url: '/center-data/environmentView/getEnvironmentLeader',
+    method: 'post',
+    data:{
+      environmentJob:linJob,
+      linType:linType
+    }
+  })
+}
+
 // 巡林任务
 export function getPlanList(userId) {
   return request({

src/api/monitor.js

@@ -8,6 +8,14 @@ export function selectDeviceType(deptId) {
     data:{"deptId":deptId}
   })
 }
+export function selectCameraByDeptId_direct(deptId) {
+  return request({
+    url: '/center-monitor/camera/selectCameraByDeptId',
+    method: 'post',
+    data: {"deptId":deptId,"type":4}
+  })
+}
+
 // 根据设备类型查看列表
 export function selectCameraByDeptId(deptId) {
   return request({
@@ -23,6 +31,15 @@ export function selectKeyAreaList() {
     method: 'get',
   })
 }
+export function selectKeyAreaList_direct() {
+  return request({
+    url: '/center-data/importarea/listImportareaFegin',
+    method: 'post',
+    data:{
+      areaType:4
+    }
+  })
+}
 // 获取重点区域
 export function getRegionalFlag(id) {
   return request({
@@ -60,6 +77,12 @@ export function getCamerasByDeptId(deptId) {
     method: 'get',
   })
 }
+export function getCamerasByDeptId_direct(deptId,deptProtype) {
+  return request({
+    url: `/center-monitor/TVWallController/getCamerasByDeptId?deptId=${deptId}&deptProtype=${deptProtype}`,
+    method: 'get',
+  })
+}
 //根据部门id查询部门及部门以下的数据，没有则默认查询所有
 export function getSensorListByDeptId(deptId) {
   return request({
@@ -124,7 +147,18 @@ export function getDlblistBydeptId(deptId) {
     method: 'get',
   })
 }
-
+export function getDlblistBydeptId_direct(deptId) {
+  let url = "";
+  if(deptId!=null){
+    url= '/center-monitor/broadcast/getDlblistBydeptId?deptId=' + deptId+'&type=4';
+  }else{
+    url= '/center-monitor/broadcast/getDlblistBydeptId/getDlblistBydeptId?type=4';
+  }
+  return request({
+    url: url,
+    method: 'get',
+  })
+}
 //根据部门id查询部门及部门以下的数据，没有则默认查询所有
 export function getMonitorDeviceAndDataList(deptId) {
   let url = "";

src/components/eventLocation.vue

@@ -138,8 +138,9 @@
 <script>
 import {
   getNearEvent1,
-  getNearCamera
+  getNearCamera, getNearEvent1_direct,getNearCamera_monitor
 } from '@/api/event'
+
 import {
   getHaiKangVideoServer
 } from '@/api/haikang/haikang'
@@ -152,6 +153,7 @@ import {
 } from '@/api/dahua/dahua'
 import DHWs from '@/dahua/lib/DHWs'
 import TVWall from "@/components/TVWall.vue";
+import {selectByMenuId} from "@/api/forest";
 /** ----------------------------------摄像头预览结束------------------------------------- */
 export default {
   dicts: ['event_source'],
@@ -315,12 +317,14 @@ export default {
           function() {  // 断开与插件服务连接失败
           })
       }
+      this.cameraList=[]
+      this.eventList=[]
     },
     showEventDialog(eventCode) {
       //事件信息弹出
       this.$refs.eventdetailsdialog.showEventDialog(eventCode)
     },
-    getNearEvent() {
+    async getNearEvent() {
       if (this.longitude == null || this.longitude == '' || this.latitude == null || this.latitude == '') {
         this.$modal.msgError('请输入经纬度！')
         return
@@ -341,7 +345,18 @@ export default {
         isAggregation: false
       }]
       let that = this
-      getNearEvent1(that.longitude, that.latitude).then(res => {
+      let res = await selectByMenuId({ menuId: 5 });
+      let vo = {};
+      let eventType = [];
+      let eventTypeDl = [];
+      res.data.forEach(item => {
+        eventType.push(item.eventTypeXl);
+        eventTypeDl.push(item.eventTypeDl);
+      });
+      vo.eventTypeId = eventType;
+      vo.eventTypeIdDl = eventType;
+      vo.day = that.getCurrentDataStr();
+      getNearEvent1_direct(that.longitude, that.latitude,vo).then(res => {
         that.markersList = []
         that.eventList = res.data
         if (that.eventList != null && that.eventList.length > 0) {
@@ -454,7 +469,7 @@ export default {
         }
         that.cameraMarkersList = []
         that.cameraList = []
-        getNearCamera(that.longitude, that.latitude).then(res => {
+        getNearCamera_monitor(that.longitude, that.latitude,4).then(res => {
           //根据设备类型查看列表
           that.cameraList = res.data
 
@@ -562,7 +577,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>网络运营商：' + (res.data[i].operatorType == "1" ? "联通" : (res.data[i].operatorType == "2" ? "移动":"电信")) + '</h4>' +
+                '                  <h4>网络运营商：' + (res.data[i].operatorType == "1" ? "联通" : (res.data[i].operatorType == "2" ? "移动":(res.data[i].operatorType == "3" ? "电信":"无"))) + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +

src/components/supermap-2.5d.vue

@@ -826,7 +826,7 @@ export default {
               html += "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                "                  <h4>" + res.data[0].userList[i].position + ":" + res.data[0].userList[i].name + "</h4>" +
+                "                  <h4>" + res.data[0].userList[i].position + "：" + res.data[0].userList[i].name + "</h4>" +
                 "                </div>" +
                 "                </div>" +
                 "                </span>" +

src/views/datacenter.vue

@@ -486,7 +486,7 @@ export default {
         // "</h4>" +
         // "                </div>" +
         // "                </div>" +
-        // "                </span>" 
+        // "                </span>"
         // +
         "<span>" +
         '                  <div class="d-l-con">' +
@@ -514,6 +514,10 @@ export default {
       params.longitude = data.longitude;
       params.latitude = data.latitude;
 
+      let result = await fireControlViewPointSearchInfo(data.indexName,data.id)
+      this.detailInfo = result.data.detail
+      this.cameraList = result.data.cameras
+
       const treeLabels = [
         {
           id: null,
@@ -524,22 +528,22 @@ export default {
         },
       ];
       const labelChannels = [];
-      for (let i in data.cameraList) {
+      for (let i in result.data.cameras) {
         treeLabels.push({
           id: null,
-          labelCode: data.cameraList[i].cameraCode,
-          labelName: data.cameraList[i].cameraName,
-          cameraType: data.cameraList[i].cameraType,
+          labelCode: result.data.cameras[i].cameraCode,
+          labelName: result.data.cameras[i].cameraName,
+          cameraType: result.data.cameras[i].cameraType,
           parentLabelCode: "999",
         });
         labelChannels.push({
-          labelCode: data.cameraList[i].cameraCode,
+          labelCode: result.data.cameras[i].cameraCode,
           channelDates: [
             {
-              channelCode: data.cameraList[i].cameraCode,
-              channelName: data.cameraList[i].cameraName,
+              channelCode: result.data.cameras[i].cameraCode,
+              channelName: result.data.cameras[i].cameraName,
               channelSn: null,
-              cameraType: data.cameraList[i].cameraType,
+              cameraType: result.data.cameras[i].cameraType,
               online: "1",
               cameraCode: "1",
             },
@@ -553,9 +557,6 @@ export default {
           labelChannels: labelChannels,
         },
       ];
-      let result = await fireControlViewPointSearchInfo(data.indexName,data.id)
-      this.detailInfo = result.data.detail
-      this.cameraList = result.data.cameras
       if (result.data.cameras.length != null) {
         this.$refs.TVWall.showTVWall1(
           data.longitude,

src/views/eventdetailsdialog.vue

@@ -962,12 +962,8 @@
               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 class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}" :title="item.deptName"
+                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)"> {{ item.deptName.length > 10 ? item.deptName.slice(0, 10) + "..." : item.deptName }}
                 </div>
               </div>
             </div>
@@ -1075,12 +1071,8 @@
               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 class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}" :title="item.deptName"
+                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)"> {{ item.deptName.length > 10 ? item.deptName.slice(0, 10) + "..." : item.deptName }}
                 </div>
               </div>
             </div>
@@ -2073,6 +2065,7 @@ import {
   listSJfl,
   listYuAn,
   selectByeventCode,
+  eventHandling_direct,
   updateCentereventTEventcatalogueStatus,
   sendTask,
   listResourceByWz,
@@ -2087,7 +2080,12 @@ import {
   eventExamine,
   eventHandling,
   initByCameras,
-  getSelectNearHorn
+  getSelectNearHorn,
+  dutysystemRemove_direct,
+  getEventDetail_direct,
+  dutysystemAdd_direct,
+  dutysystemList_direct,
+  centereventtdepteventList_direct, listYuAn_direct, updateYjYuAn_direct, listSJfl_direct, selectByeventCode_direct
 } from "@/api/forest";
 import { joinConferences } from "@/api/meeting";
 import { treeselectAll as deptTreeselect } from "@/api/system/dept";
@@ -2462,7 +2460,7 @@ export default {
         let param = {
           ids: row.id,
         };
-        dutysystemRemove(param).then((res) => {
+        dutysystemRemove_direct(param.ids).then((res) => {
           this.$message.success(`删除成功!`);
           this.dutysystemSelect(
             this.iconCurrentIndex,
@@ -2478,7 +2476,7 @@ export default {
       //保存负责人行数
       rowData.dept = this.dutysystemDeptName;
       rowData.depteventId = this.depteventId;
-      dutysystemAdd(rowData).then((res) => {
+      dutysystemAdd_direct(rowData).then((res) => {
         this.$message.success(`保存成功!`);
         this.dutysystemSelect(
           this.iconCurrentIndex,
@@ -2495,7 +2493,7 @@ export default {
       let param = {
         depteventId: depteventId,
       };
-      dutysystemList(param).then((res) => {
+      dutysystemList_direct(param).then((res) => {
         if (res.data != null && res.data.length > 0) {
           this.dutysystemTableData = res.data;
         } else {
@@ -2511,7 +2509,7 @@ export default {
       let param = {
         eventCode: this.eventCode,
       };
-      centereventtdepteventList(param).then((res) => {
+      centereventtdepteventList_direct(param).then((res) => {
         this.depteventList = res.data;
         this.showResponsibilityDialog = true;
       });
@@ -2561,7 +2559,7 @@ export default {
         eventCode: this.eventCode,
         eventName: this.eventName,
       };
-      dutysystemAdd(param).then((res) => {
+      dutysystemAdd_direct(param).then((res) => {
         this.$message.success(`保存成功!`);
         this.dutysystemSelect(
           this.iconCurrentIndex,
@@ -2687,7 +2685,7 @@ export default {
       this.$refs.bottomMenu.showChangChild = false
     },
     showUpdateYjYuAn() {
-      listYuAn().then((res) => {
+      listYuAn_direct({}).then((res) => {
         //关联预案列表
         if (res.code == 200) {
           this.guanLianYuAnList = res.data;
@@ -2714,7 +2712,7 @@ export default {
           this.$message.error(`请选择预案信息！`);
           return;
         }
-        updateYjYuAn(param).then((res) => {
+        updateYjYuAn_direct(param).then((res) => {
           //事件调整关联预案
           if (res.code == 200) {
             this.$message.success(`预案调整成功!`);
@@ -2801,7 +2799,7 @@ export default {
                   // "</h4>" +
                   // "                </div>" +
                   // "                </div>" +
-                  // "                </span>" 
+                  // "                </span>"
                   // +
                   "<span>" +
                   '                  <div class="d-l-con">' +
@@ -3250,20 +3248,20 @@ export default {
           if (that.eventTypeXl != null) {
             that.sendEventType = that.eventTypeXl;
           } else {
-            await listSJfl(param).then((res) => {
+            await listSJfl_direct(param).then((res) => {
               //事件类型
               if (res.code == 200) {
                 that.eventTypeList = res.data;
               }
             });
           }
-          await listYuAn().then((res) => {
+          await listYuAn_direct({}).then((res) => {
             //关联预案
             if (res.code == 200) {
               that.guanLianYuAnList = res.data;
             }
           });
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -3277,7 +3275,7 @@ export default {
         } else if (eventStatus == "wb") {
           //误报
           that.eventConfirmTitle = "事件误报";
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -3288,7 +3286,7 @@ export default {
         } else if (eventStatus == "cf") {
           //重复
           that.eventConfirmTitle = "事件重复";
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -3298,7 +3296,7 @@ export default {
           that.showEventConfirm = true;
         } else if (eventStatus == "ld") {
           //联动
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -3356,7 +3354,7 @@ export default {
           //   return
           // }
           let eventState = "";
-          listSJfl({
+          listSJfl_direct({
             parentId: that.eventType,
           }).then((res) => {
             if (res.code == 200) {
@@ -3532,7 +3530,7 @@ export default {
             that.eventDescription = "";
           });
         } else if (eventStatus == "cz") {
-          eventHandling(that.eventId, that.eventCode).then((res) => {
+          eventHandling_direct(that.eventId, that.eventCode).then((res) => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`);
               that.refreshEvent(that.eventCode);
@@ -3645,7 +3643,7 @@ export default {
       this.eventCode = eventCode;
       let that = this;
       //获取事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode,
       }).then((res) => {
         let markersMapList = [];
@@ -3769,7 +3767,7 @@ export default {
       this.eventCode = eventCode;
       let that = this;
       //刷新--事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode,
       }).then((res) => {
         let markersMapList = [];
@@ -3891,7 +3889,7 @@ export default {
     },
     refreshEventDialog(eventCode) {
       //刷新--事件日志12
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode,
       }).then((res) => {
         this.eventLogList = res.data.eventlog;

src/views/firespread.vue

@@ -360,8 +360,8 @@
           <div class="bottomLeft">
             <div class="leftItem d-l-con padding-box nowrap" style="white-space: 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 class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}" :title="item.deptName"
+                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)"> {{ item.deptName.length > 10 ? item.deptName.slice(0, 10) + "..." : item.deptName }}
                 </div>
               </div>
             </div>
@@ -425,8 +425,8 @@
           <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 class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}" :title="item.deptName"
+                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)"> {{ item.deptName.length > 10 ? item.deptName.slice(0, 10) + "..." : item.deptName }}
                 </div>
               </div>
             </div>
@@ -1116,7 +1116,11 @@ import {
   fireControlViewList,
   fireControlViewPoint,
   sendMessage,
-  getSelectNearHorn
+  getSelectNearHorn,
+  dutysystemRemove_direct,
+  dutysystemAdd_direct,
+  dutysystemList_direct,
+  centereventtdepteventList_direct, listYuAn_direct, updateYjYuAn_direct, getEventDetail_direct
 } from '@/api/forest'
 import {
   treeselectAll as deptTreeselect
@@ -1715,7 +1719,7 @@ export default {
                   // "</h4>" +
                   // "                </div>" +
                   // "                </div>" +
-                  // "                </span>" 
+                  // "                </span>"
                   // +
                   "<span>" +
                   '                  <div class="d-l-con">' +
@@ -1815,7 +1819,7 @@ export default {
         let param = {
           ids: row.id
         }
-        dutysystemRemove(param).then(res => {
+        dutysystemRemove_direct(param.ids).then(res => {
           this.$message.success(`删除成功!`)
           this.dutysystemSelect(this.iconCurrentIndex, this.dutysystemDeptName, this.depteventId)
         })
@@ -1826,7 +1830,7 @@ export default {
     handleSave: function(index, rowData) { //保存负责人行数
       rowData.dept = this.dutysystemDeptName
       rowData.depteventId = this.depteventId
-      dutysystemAdd(rowData).then(res => {
+      dutysystemAdd_direct(rowData).then(res => {
         this.$message.success(`保存成功!`)
         this.dutysystemSelect(this.iconCurrentIndex, this.dutysystemDeptName, this.depteventId)
       })
@@ -1841,7 +1845,7 @@ export default {
       let param = {
         depteventId: depteventId
       }
-      dutysystemList(param).then(res => {
+      dutysystemList_direct(param).then(res => {
         if (res.data != null && res.data.length > 0) {
           this.dutysystemTableData = res.data
         } else {
@@ -1854,7 +1858,7 @@ export default {
       let param = {
         eventCode: this.eventCode
       }
-      centereventtdepteventList(param).then(res => {
+      centereventtdepteventList_direct(param).then(res => {
         this.depteventList = res.data
         this.showResponsibilityDialog = true
       })
@@ -1889,7 +1893,7 @@ export default {
         eventCode: this.eventCode,
         eventName: this.eventName
       }
-      dutysystemAdd(param).then(res => {
+      dutysystemAdd_direct(param).then(res => {
         this.$message.success(`保存成功!`)
         this.dutysystemSelect(this.iconCurrentIndex, this.dutysystemDeptName, this.depteventId);
         this.closeResponsibilityDialog();
@@ -1905,7 +1909,7 @@ export default {
       this.$refs.supermapDialog1.showheatPlotting(this.latitude, this.longitude, this.windSpeed, this.windDirection)
     },
     showUpdateYjYuAn() {
-      listYuAn().then(res => {
+      listYuAn_direct({}).then(res => {
         //关联预案列表
         if (res.code == 200) {
           this.guanLianYuAnList = res.data
@@ -1922,7 +1926,7 @@ export default {
           eventCode: this.eventCode,
           reserve: this.sendGuanLianYuAn
         }
-        updateYjYuAn(param).then(res => {
+        updateYjYuAn_direct(param).then(res => {
           //事件调整关联预案
           if (res.code == 200) {
             this.$message.success(`预案调整成功!`)
@@ -2285,7 +2289,7 @@ export default {
               }
             });
           }
-          await listYuAn().then((res) => {
+          await listYuAn_direct({}).then((res) => {
             //关联预案
             if (res.code == 200) {
               that.guanLianYuAnList = res.data;
@@ -2674,7 +2678,7 @@ export default {
       this.eventCode = eventCode;
       let that = this;
       //获取事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode,
       }).then((res) => {
         let markersMapList = [];
@@ -2798,7 +2802,7 @@ export default {
       this.eventCode = eventCode;
       let that = this;
       //刷新--事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode,
       }).then((res) => {
         let markersMapList = [];
@@ -2920,7 +2924,7 @@ export default {
     },
     refreshEventDialog(eventCode) {
       //刷新--事件日志12
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode
       }).then(res => {
         this.eventLogList = res.data.eventlog

src/views/leader.vue

@@ -200,7 +200,7 @@ import {
   getPlanList,
   getRecordList,
   getPointList,
-  getRy,
+  getRy, getRy_direct, getForestLeader_direct,
 } from "@/api/leader";
 
 import supermap from "@/components/supermap-2.5d"; //超图
@@ -383,7 +383,7 @@ export default {
       this.listCurrentIndex1 = "";
       this.listCurrentIndex2 = "";
       //获取左侧菜单列表
-      getRy().then((res) => {
+      getRy_direct().then((res) => {
         that.visuForestCloudRYBO = res.data.user;
         // that.zrs = res.data.visuForestCloudRyZxBO.zrs;
         that.zxrs = 0
@@ -401,7 +401,7 @@ export default {
       this.iconCurrentIndex1 = linJob;
       this.peopleList = [];
       this.peopleList2 = [];
-      getForestLeader(linJob, linType).then((res) => {
+      getForestLeader_direct(linJob, linType).then((res) => {
         this.peopleList = res.data;
         this.peopleList2 = res.data;
       });

src/views/monitor.vue

@@ -223,6 +223,10 @@ import {
   getRegionalFlag,
   getCamerasByDeptId,
   getMonitorDeviceAndDataList,
+  getCamerasByDeptId_direct,
+  getDlblistBydeptId_direct,
+  selectKeyAreaList_direct,
+  selectCameraByDeptId_direct,
 } from "@/api/monitor";
 import { treeselect } from "@/api/system/dept";
 import supermap from "@/components/supermap-2.5d"; //超图
@@ -802,36 +806,6 @@ export default {
         this.$refs.supermap.setMarkers(markersList);
       }, 2000);
     },
-
-    // setcgqValue: function() {
-    //   let that = this
-    //   for (let i = 0; i < that.visuForestCloudCameraBOListSearch.length; i++) {
-    //     var color = "green";
-    //     var value = Math.random();
-    //     var up = "▲";
-    //     var down = "▼";
-    //     if (value > 0.5) {
-    //       color = "red";
-    //       value = value + "" + up;
-    //     } else {
-    //       value = value + "" + down;
-    //     }
-    //     that.cgqData.push("<span style='color:" + color + "'>" + value + "</span>")
-    //   }
-    //   setInterval(function() {
-    //     var color = "green";
-    //     var value = Math.random();
-    //     var up = "▲";
-    //     var down = "▼";
-    //     if (value > 0.5) {
-    //       color = "red";
-    //       value = value + "" + up;
-    //     } else {
-    //       value = value + "" + down;
-    //     }
-    //     that.cgqData = "<span style='color:" + color + "'>" + value + "</span>";
-    //   }, 1000)
-    // },
     /* 电视墙替换开始 */
     showTVWall(channelCode, channelName,type) {
       let tvListJson = [
@@ -902,7 +876,8 @@ export default {
       // this.findCameraByDept(data.id)
       if (that.localMark == "she") {
         that.selectCameraByDeptId(data.id);
-        getCamerasByDeptId(data.id).then((res) => {
+        let deptProtype = '2';
+        getCamerasByDeptId_direct(data.id,deptProtype).then((res) => {
           that.$refs.TVWalls.showTVWall(res.data, {
             longitude: data.deptLongitude,
             latitude: data.deptLatitude,
@@ -960,7 +935,7 @@ export default {
     getDlblistBydeptId(deptId) {
       let that = this;
       let markersList = [];
-      getDlblistBydeptId(deptId)
+      getDlblistBydeptId_direct(deptId)
         .then(function (res) {
           that.loudspeakerNum = res.data.length;
           that.visuForestCloudCameraBOListSearch = [];
@@ -1058,7 +1033,7 @@ export default {
     getDlblistBydeptIds(deptId) {
       let that = this;
 
-      getDlblistBydeptId(deptId)
+      getDlblistBydeptId_direct(deptId)
         .then(function (res) {
           that.loudspeakerNum = res.data.length;
         })
@@ -1150,7 +1125,7 @@ export default {
       this.keyAreaList = [];
       //获取重点区域列表
       let that = this;
-      selectKeyAreaList().then((res) => {
+      selectKeyAreaList_direct().then((res) => {
         that.keyAreaList = res.data;
       });
     },
@@ -1387,13 +1362,7 @@ export default {
               "<span>" +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              "                  <h4>网络运营商：" +
-              (res.data.visuForestCloudCameraBOList[i].operatorType == "1"
-                ? "联通"
-                : res.data.visuForestCloudCameraBOList[i].operatorType == "2"
-                ? "移动"
-                : "电信") +
-              "</h4>" +
+              '                  <h4>网络运营商：' + (res.data.visuForestCloudCameraBOList[i].operatorType == "1" ? "联通" : (res.data.visuForestCloudCameraBOList[i].operatorType == "2" ? "移动":(res.data.visuForestCloudCameraBOList[i].operatorType == "3" ? "电信":"无"))) + '</h4>' +
               "                </div>" +
               "                </div>" +
               "                </span>" +
@@ -1447,7 +1416,7 @@ export default {
       let that = this;
       that.cameraMarkersList = [];
       that.visuForestCloudCameraBOList = [];
-      selectCameraByDeptId(depId).then((res) => {
+      selectCameraByDeptId_direct(depId).then((res) => {
         //根据设备类型查看列表
         that.visuForestCloudCameraBOList = res.data;
         that.visuForestCloudCameraBOListSearch = res.data;
@@ -1558,13 +1527,7 @@ export default {
               "<span>" +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              "                  <h4>网络运营商：" +
-              (res.data[i].operatorType == "1"
-                ? "联通"
-                : res.data[i].operatorType == "2"
-                ? "移动"
-                : "电信") +
-              "</h4>" +
+              '                  <h4>网络运营商：' + (res.data[i].operatorType == "1" ? "联通" : (res.data[i].operatorType == "2" ? "移动":(res.data[i].operatorType == "3" ? "电信":"无"))) + '</h4>' +
               "                </div>" +
               "                </div>" +
               "                </span>" +