浏览代码

接口改为直连 会议接口修改

王通 1 年之前
父节点
当前提交
f7d38c32ca
共有 7 个文件被更改,包括 66 次插入95 次删除
  1. 0 17
      src/api/afforestation.js
  2. 0 16
      src/api/animal.js
  3. 0 18
      src/api/disaster.js
  4. 16 5
      src/api/event.js
  5. 9 5
      src/api/leader.js
  6. 19 17
      src/views/eventdetailsdialog.vue
  7. 22 17
      src/views/firespread.vue

+ 0 - 17
src/api/afforestation.js

@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-
-// 获取
-export function getAfforestation(year) {
-  return request({
-    url: '/center-firecontrol/VisuAfforestationController/getAfforestation?year='+year,
-    method: 'get',
-  })
-}
-// 点击左侧人员列表获取轨迹
-export function getAfforestationArea(afforestationId) {
-  return request({
-    url: '/center-firecontrol/VisuAfforestationController/getAfforestationArea?afforestationId='+afforestationId,
-    method: 'get',
-  })
-}
-

+ 0 - 16
src/api/animal.js

@@ -1,16 +0,0 @@
-import request from '@/utils/request'
-
-// 获取初始化数据
-export function getInit() {
-  return request({
-    url: '/center-firecontrol/VisuForestAnimalController/init',
-    method: 'get',
-  })
-}
-// 点击左侧动物列表
-export function selectForestAnimalListByType(type) {
-  return request({
-    url: '/center-firecontrol/VisuForestAnimalController/selectForestAnimalListByType/'+type,
-    method: 'get',
-  })
-}

+ 0 - 18
src/api/disaster.js

@@ -1,18 +0,0 @@
-import request from '@/utils/request'
-
-// 获取初始化数据
-export function getInit(year) {
-  return request({
-    url: '/center-firecontrol/VisuForestFireLossController/init',
-    method: 'post',
-    data:{"year":year}
-  })
-}
-// 点击列表获取数据
-export function selectFireLoseByid(param) {
-  return request({
-    url: '/center-firecontrol/VisuForestFireLossController/selectFireLoseByid',
-    method: 'post',
-    data:param
-  })
-}

+ 16 - 5
src/api/event.js

@@ -4,26 +4,37 @@ import request from '@/utils/request'
 //根据类型获取事件
 export function getNearEvent(longitude, latitude, day, loading, eventTypeIdDl, eventTypeId) {
   return request({
-    url: '/center-firecontrol/VisuForestEventCenterController/getNearEvent?longitude=' + longitude + "&latitude=" + latitude + "&day=" + day + "&eventTypeIdDl=" + eventTypeIdDl + "&eventTypeId=" + eventTypeId,
-    method: 'get',
+    url: '/center-event/eventview/getNearEvent',
+    method: 'post',
     headers: {
       loading: loading
     },
+    data:{
+      longitude:longitude,
+      latitude:latitude,
+      day:day,
+      eventTypeIdDl: eventTypeIdDl.length==0?Cookies.get("eventDlType").split(','):eventTypeIdDl,
+      eventTypeId: eventTypeId.length==0?Cookies.get("eventXlType").split(','):eventTypeId
+  }
   })
 }
 
 //获取附近事件
 export function getNearEvent1(longitude, latitude ) {
   return request({
-    url: '/center-firecontrol/VisuForestEventCenterController/getNearEvent?longitude=' + longitude + "&latitude=" + latitude,
-    method: 'get',
+    url: '/center-event/eventview/getNearEvent',
+    method: 'post',
+    data:{
+      longitude:longitude,
+      latitude:latitude
+    }
   })
 }
 
 //获取附近摄像头
 export function getNearCamera(longitude, latitude) {
   return request({
-    url: '/center-firecontrol/VisuForestMonitorCenterController/getNearCamera?longitude=' + longitude + "&latitude=" + latitude + "&type=8",
+    url: '/center-monitor/camera/selectFjsxt/'+ longitude + "/" + latitude + "/8",
     method: 'get',
   })
 }

+ 9 - 5
src/api/leader.js

@@ -3,17 +3,21 @@ import request from '@/utils/request'
 // 获取左侧
 export function getRy() {
   return request({
-    url: '/center-firecontrol/VisuForestCloudMapController/getRy',
-    method: 'post',
-    data:{}
+    url: '/center-data/fireControlView/getRYList',
+    method: 'get'
+
   })
 }
 
 // 获取左侧人员列表
 export function getForestLeader(linJob,linType) {
   return request({
-    url: '/center-firecontrol/VisuForestLeaderController/getPersonList?linJob='+linJob+"&linType="+linType,
-    method: 'get',
+    url: '/center-data/personnelpatrol/getResourcesLeader',
+    method: 'post',
+    data:{
+      linJob:linjob,
+      linType:linType
+    }
   })
 }
 

+ 19 - 17
src/views/eventdetailsdialog.vue

@@ -4068,23 +4068,25 @@ export default {
     Meeting() {
       //弹出发送会议短信弹窗
       let that = this;
-      that.$alert(
-        "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='http://172.18.1.37:15001/CLOUDMeeting_Win.exe'>点击此处</a>进行下载",
-        "该功能需要使用云会议客户端",
-        {
-          confirmButtonText: "确定",
-          dangerouslyUseHTMLString: true,
-          callback: (action) => {
-            let param = {
-              eventCode: that.eventCode,
-            };
-            centereventtdepteventList(param).then((res) => {
-              that.depteventList = res.data;
-              that.showMeetingMsgDialog = true;
-            });
-          },
-        }
-      );
+      selectConfigKey('meeting_plugin_url').then(response => {
+        that.$alert(
+          "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='"+response.data+"'>点击此处</a >进行下载",
+          "该功能需要使用云会议客户端",
+          {
+            confirmButtonText: "确定",
+            dangerouslyUseHTMLString: true,
+            callback: (action) => {
+              let param = {
+                eventCode: that.eventCode,
+              };
+              centereventtdepteventList(param).then((res) => {
+                that.depteventList = res.data;
+                that.showMeetingMsgDialog = true;
+              });
+            },
+          }
+        );
+      })
     },
     /** ----------------------------------视频会议结束------------------------------------- */
   },

+ 22 - 17
src/views/firespread.vue

@@ -1135,7 +1135,8 @@ import {
   joinConferences
 } from "@/api/meeting";
 import findUserByDept from '@/views/findUserByDept'
-import Cookies from "js-cookie"; //责任人选择弹框
+import Cookies from "js-cookie";
+import { selectConfigKey } from '@/api/system/config' //责任人选择弹框
 export default {
   dicts: ['task_source'],
   watch: {
@@ -3006,24 +3007,28 @@ export default {
         }
       })
     },
-    Meeting() { //弹出发送会议短信弹窗
+    Meeting() {
+      //弹出发送会议短信弹窗
       let that = this;
-      that.$alert(
-        "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='http://172.18.1.37:15001/CLOUDMeeting_Win.exe'>点击此处</a>进行下载",
-        '该功能需要使用云会议客户端', {
-          confirmButtonText: '确定',
-          dangerouslyUseHTMLString: true,
-          callback: action => {
-            let param = {
-              eventCode: that.eventCode
-            }
-            centereventtdepteventList(param).then(res => {
-              that.depteventList = res.data
-              that.showMeetingMsgDialog = true
-              that.initDutysystemTableData();
-            })
+      selectConfigKey('meeting_plugin_url').then(response => {
+        that.$alert(
+          "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='"+response.data+"'>点击此处</a >进行下载",
+          "该功能需要使用云会议客户端",
+          {
+            confirmButtonText: "确定",
+            dangerouslyUseHTMLString: true,
+            callback: (action) => {
+              let param = {
+                eventCode: that.eventCode,
+              };
+              centereventtdepteventList(param).then((res) => {
+                that.depteventList = res.data;
+                that.showMeetingMsgDialog = true;
+              });
+            },
           }
-        });
+        );
+      })
     },
     /** ----------------------------------视频会议结束------------------------------------- */
     /** ----------------------------------海康摄像头预览结束------------------------------------- */