Browse Source

修复一大堆bug

王通 2 years ago
parent
commit
49c62b8d89
3 changed files with 7 additions and 4 deletions
  1. 1 1
      src/api/bigdata.js
  2. 2 2
      src/api/monitor.js
  3. 4 1
      src/views/firespread.vue

+ 1 - 1
src/api/bigdata.js

@@ -49,7 +49,7 @@ export function selectDeviceType() {
   return request({
     url: '/center-monitor/camera/selectDeviceType',
     method: 'post',
-    data:{}
+    data:{type:9}
   })
 }
 //起火原因

+ 2 - 2
src/api/monitor.js

@@ -76,9 +76,9 @@ export function getDlblistBydeptId(deptId) {
 export function getMonitorDeviceAndDataList(deptId) {
   let url = "";
   if(deptId!=null){
-    url= '/center-monitor/device/getMonitorDeviceAndDataList?deptId=' + deptId;
+    url= '/center-monitor/device/getMonitorDeviceAndDataList?deptId=' + deptId+"&type=9";
   }else{
-    url= '/center-monitor/device/getMonitorDeviceAndDataList';
+    url= '/center-monitor/device/getMonitorDeviceAndDataList?type=9';
   }
   return request({
     url: url,

+ 4 - 1
src/views/firespread.vue

@@ -3080,7 +3080,10 @@ findUserByDept
       // let canvasBox = this.$refs.imageTofile
       let canvasBox = document.getElementById('forestWarmSuperMap')
       let toolbar = document.getElementById('toolbar')
-      canvasBox.removeChild(toolbar)
+      if(toolbar!=null)
+      {
+        canvasBox.removeChild(toolbar)
+      }
       // 获取父级的宽高
       const width = parseInt(window.getComputedStyle(canvasBox).width)
       const height = parseInt(window.getComputedStyle(canvasBox).height)