截图上传bug修复

src/views/eventdetailsdialog.vue

@@ -2059,8 +2059,6 @@
 
 <script>
 import html2canvas from "html2canvas"; //截图组件
-import request from "@/utils/request";
-
 import supermapDialog from "@/components/supermap"; //超图
 import TVWall from "@/components/TVWall.vue"; //电视墙弹窗
 import vBottomMenu from "@/components/vBottomMenu.vue"; //一体化公共底部菜单
@@ -2175,9 +2173,9 @@ export default {
       },
       table1: {
         reportUnit: null,
-        reportTimeY: null,
-        reportTimeM: null,
-        reportTimeD: null,
+        reportTimeY: new Date().getFullYear(),
+        reportTimeM: new Date().getMonth() + 1,
+        reportTimeD: new Date().getDate(),
         forestFireLossTotal: null,
         fireLossTotal: null,
         forestArea: null,
@@ -2218,11 +2216,11 @@ export default {
         fireSource: null,
         fireType: null,
         fireLevel: null,
-        areaTotal: null,
+        areaTotal: 0,
         forestLossAreaTotal: null,
         originalForestArea: null,
         artificialForestArea: null,
-        peopleTotal: null,
+        peopleTotal: 0,
         blazesTeamNumber: null,
         policeNumber: null,
         armyNumber: null,
@@ -2231,9 +2229,9 @@ export default {
         secondTool: null,
         waterGun: null,
         elseThings: null,
-        forestComposition: null,
-        forestToken: null,
-        porosities: null,
+        forestComposition: "无",
+        forestToken: "无",
+        porosities: "无",
         weather: null,
         temperature: null,
         fireInsuranceLevel: null,
@@ -2819,14 +2817,7 @@ export default {
           type: type,
           radius: this.radius,
         };
-        // listResourceByWz(param).then((res) => {
-        request({
-          url: `/center-monitor/camera/findNearbyCameras/${param.longitude}/${param.latitude}/${param.radius}`,
-          method: 'get'
-        }).then(res => {
-          if(res.data!=null&&res.data.length==0){
-            this.$message.warning("设定范围内无该资源信息！")
-          }
+        listResourceByWz(param).then((res) => {
           if (res.data != null && res.data.length > 0) {
             this.resourcesListCheck.push(type);
             var markersList = [];
@@ -2857,17 +2848,18 @@ export default {
                 markersMap.icon = "sj-icon-keyAreas";
               } else if (type == "sxt") {
                 if (res.data[i].cameraUse == 1) {
-                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
-                }
-                else if (res.data[i].cameraUse == 2) {
-                  markersMap.icon = 'camera'
-                }
-                else if (res.data[i].cameraUse == 3) {
-                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
-                }
-                else if (res.data[i].cameraUse == 5) {
-                  markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir'
-                }
+                  markersMap.icon = "sj-icon-map-centerdata-slmonitor";
+                } else if (res.data[i].cameraUse == 2) {
+                  markersMap.icon = "camera";
+                }  else if (res.data[i].cameraUse == 3) {
+                markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+              }
+              else if (res.data[i].cameraUse == 4) {
+                markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+              }
+              else if (res.data[i].cameraUse == 5) {
+                markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+              }
                 if (res.data[i].cameraCode != null) {
                   markersMap.click = "preview";
                   // markersMap.parameter = res.data[i].cameraCode
@@ -3748,15 +3740,16 @@ export default {
     toImage() {
       this.$message.success(`正在上传!请稍后...`);
       // 手动创建一个 canvas 标签
+      debugger
       const canvas = document.createElement("canvas");
       // 获取父标签，意思是这个标签内的 DOM 元素生成图片
       // imageTofile是给截图范围内的父级元素自定义的ref名称
       // let canvasBox = this.$refs.imageTofile
       let canvasBox = document.getElementById("forestWarmSuperMap");
-      let toolbar = document.getElementById("toolbar");
-      if (toolbar != null) {
-        canvasBox.removeChild(toolbar);
-      }
+      // let toolbar = document.getElementById("toolbar");
+      // if (toolbar != null) {
+      //   canvasBox.removeChild(toolbar);
+      // }
       // 获取父级的宽高
       const width = parseInt(window.getComputedStyle(canvasBox).width);
       const height = parseInt(window.getComputedStyle(canvasBox).height);
@@ -3778,7 +3771,7 @@ export default {
         let dataBase64 = canvas.toDataURL("image/png");
         this.uploadBase64(dataBase64);
       });
-      canvasBox.appendChild(toolbar);
+      // canvasBox.appendChild(toolbar);
     },
     uploadBase64(dataBase64) {
       //事件详情截图直接上传日志

src/views/firespread.vue

@@ -1734,8 +1734,6 @@ import {
   joinConferences
 } from "@/api/meeting";
 import findUserByDept from '@/views/findUserByDept' //责任人选择弹框
-import request from "@/utils/request";
-
 export default {
   dicts: ['task_source'],
   watch: {
@@ -2078,12 +2076,12 @@ export default {
           obj.type = data.type;
           obj.count = data.num;
           obj.icon = icon;
-          _this.resourcesList1.push(obj);
+          _this.resourcesList.push(obj);
           console.log("icon_" + (index + 1) + "=", icon);
           //每个图标对应固定颜色
-          _this.$set(_this.resourcesList1[index], "bg", getIconBg(icon));
+          _this.$set(_this.resourcesList[index], "bg", getIconBg(icon));
         });
-        _this.resourcesList1.push({
+        _this.resourcesList.push({
           resourceName: "摄像头",
           type: "sxt",
           count: "1",
@@ -2393,14 +2391,7 @@ export default {
           type: type,
           radius: this.radius
         }
-        // listResourceByWz(param).then((res) => {
-        request({
-          url: `/center-monitor/camera/findNearbyCameras/${param.longitude}/${param.latitude}/${param.radius}`,
-          method: 'get'
-        }).then(res => {
-          if(res.data!=null&&res.data.length==0){
-            this.$message.warning("设定范围内无该资源信息！")
-          }
+        listResourceByWz(param).then(res => {
           if (res.data != null && res.data.length > 0) {
             this.resourcesListCheck.push(type)
             var markersList = []
@@ -2430,18 +2421,21 @@ export default {
               } else if (type == 'zdqy') {
                 markersMap.icon = 'sj-icon-keyAreas'
               } else if (type == 'sxt') {
-                if (res.data[i].cameraUse == 1) {
-                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
-                }
-                else if (res.data[i].cameraUse == 2) {
-                  markersMap.icon = 'camera'
-                }
-                else if (res.data[i].cameraUse == 3) {
-                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
-                }
-                else if (res.data[i].cameraUse == 5) {
-                  markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir'
-                }
+                if(res.data[i].cameraUse==1)
+                {
+                  markersMap.icon='sj-icon-map-centerdata-slmonitor'
+                } else  if (res.data[i].cameraUse == 2){
+
+                  markersMap.icon='camera'
+                }  else if (res.data[i].cameraUse == 3) {
+                markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+              }
+              else if (res.data[i].cameraUse == 4) {
+                markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+              }
+              else if (res.data[i].cameraUse == 5) {
+                markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+              }
                 if (res.data[i].cameraCode != null) {
                   markersMap.click = 'preview'
                   // markersMap.parameter = res.data[i].cameraCode
@@ -3254,10 +3248,10 @@ export default {
       // imageTofile是给截图范围内的父级元素自定义的ref名称
       // let canvasBox = this.$refs.imageTofile
       let canvasBox = document.getElementById('forestWarmSuperMap')
-      let toolbar = document.getElementById('toolbar')
-      if (toolbar != null) {
-        canvasBox.removeChild(toolbar)
-      }
+      // let toolbar = document.getElementById('toolbar')
+      // if (toolbar != null) {
+      //   canvasBox.removeChild(toolbar)
+      // }
       // 获取父级的宽高
       const width = parseInt(window.getComputedStyle(canvasBox).width)
       const height = parseInt(window.getComputedStyle(canvasBox).height)
@@ -3279,7 +3273,7 @@ export default {
         let dataBase64 = canvas.toDataURL('image/png')
         this.uploadBase64(dataBase64)
       })
-      canvasBox.appendChild(toolbar)
+      // canvasBox.appendChild(toolbar)
     },
     uploadBase64(dataBase64) {
       //事件详情截图直接上传日志