修改

src/api/forest.js

@@ -284,7 +284,7 @@ export function userFeginlist(param) {
 // 会议添加联系人并发送短信
 export function sendMessage(param) {
   return request({
-    url: '/center-message/SendMessageController/sendMeetingMsg',
+    url: '/center-message/centerMessageFeign/sendMeetingMsg',
     method: 'post',
     data:param
   })

src/components/supermap.vue

@@ -7,7 +7,7 @@
       leave-active-class="animate__backOutLeft"
     >
       <div id="toolbar" v-if="isdynamicPlotting" class="panel panel-primary" v-show="mapToolShowBH" key="mapFlash"
-           style="position:absolute;z-index: 9999;top:4rem;left: 1rem; border-radius: 4px; width: fit-content;height:635px;overflow-y:scroll;background:#040b1f">
+           data-html2canvas-ignore style="position:absolute;z-index: 9999;top:4rem;left: 1rem; border-radius: 4px; width: fit-content;height:635px;overflow-y:scroll;background:#040b1f">
         <div class="panel-heading" id="panelheading">
           <h5 style=" color: #2bacf7;font-size: 1rem;padding:.5rem;">鼠标标绘</h5>
         </div>

src/views/eventdetailsdialog.vue

@@ -2173,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,
@@ -2216,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,
@@ -2229,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,
@@ -2851,15 +2851,15 @@ export default {
                   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'
-                }
+                }  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
@@ -3740,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);
@@ -3770,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

@@ -2421,19 +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 == 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'
-                }
+                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
@@ -3246,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)
@@ -3271,7 +3273,7 @@ export default {
         let dataBase64 = canvas.toDataURL('image/png')
         this.uploadBase64(dataBase64)
       })
-      canvasBox.appendChild(toolbar)
+      // canvasBox.appendChild(toolbar)
     },
     uploadBase64(dataBase64) {
       //事件详情截图直接上传日志