Sfoglia il codice sorgente

上一页下一页

王通 2 anni fa
parent
commit
f3b90531f5
2 ha cambiato i file con 14 aggiunte e 8 eliminazioni
  1. 6 6
      src/views/eventdetailsdialog.vue
  2. 8 2
      src/views/firespread.vue

+ 6 - 6
src/views/eventdetailsdialog.vue

@@ -22,10 +22,10 @@
                         <!-- <el-tooltip class="item" effect="dark" :content="visuForestCloudYuAnBo.reserveName" placement="top-start">
                           <a :href="visuForestCloudYuAnBo.fileUrl" ><span><div style=" width: 50px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;word-break: keep-all;">{{ visuForestCloudYuAnBo.reserveName }}</div></span></a>
                         </el-tooltip> -->
-                        <el-tooltip 
-                        placement="top" 
-                        popper-class="js-tps" 
-                        :visible-arrow="visuForestCloudYuAnBo.reserveName.length>6" 
+                        <el-tooltip
+                        placement="top"
+                        popper-class="js-tps"
+                        :visible-arrow="visuForestCloudYuAnBo.reserveName.length>6"
                   >
                   <div slot="content" class="leader-info-container">
                     <div class="leader-info-list-con" v-show="visuForestCloudYuAnBo.reserveName.length>6">
@@ -1307,7 +1307,7 @@ export default {
       dutysystemDeptName: '',
       depteventId: '',
       dutysystemTableData: [],
-      radius: 50,//资源搜索半径
+      radius: 5000,//资源搜索半径
       resourcesList: [
         {
           resourceName: '取水口',
@@ -1607,7 +1607,7 @@ export default {
         // 消防资源落点
         let param = { longitude: this.longitude, latitude: this.latitude, type: type, radius: this.radius }
         if (type != 'sxt') {
-          fireControlViewPoint(type).then(res => {
+          fireControlViewPoint(param).then(res => {
             if (res.data != null && res.data.pointList.length > 0) {
               this.resourcesListCheck.push(type)
               var markersList = []

+ 8 - 2
src/views/firespread.vue

@@ -1228,7 +1228,7 @@ export default {
       dutysystemDeptName: '',
       depteventId: '',
       dutysystemTableData: [],
-      radius: 50,//资源搜索半径
+      radius: 5000,//资源搜索半径
       // resourcesList: [
       //   {
       //     resourceName: '取水口',
@@ -1366,7 +1366,7 @@ export default {
         // 消防资源落点
         let param = { longitude: this.longitude, latitude: this.latitude, type: type, radius: this.radius }
         if (type != 'sxt') {
-          fireControlViewPoint(type).then(res => {
+          fireControlViewPoint(param).then(res => {
             if (res.data != null && res.data.pointList.length > 0) {
               this.resourcesListCheck.push(type)
               var markersList = []
@@ -2072,6 +2072,7 @@ export default {
         setTimeout(() => {
           that.$refs.supermapDialog1.dynamicPlotting()//弹出动态绘制窗口,防止截图位置改变
           that.$refs.supermapDialog1.clearM(false)
+          that.$refs.supermapDialog1.clearM(true)
           that.$refs.supermapDialog1.setMarkersRadius([markersMap])
           that.$refs.supermapDialog1.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
         }, 2000)
@@ -2101,6 +2102,8 @@ export default {
           markersMap.lng = res.data.centermonitorTCamera.longitude
           markersMap.lat = res.data.centermonitorTCamera.latitude
           setTimeout(() => {
+            that.$refs.supermapDialog1.clearM(false)
+            that.$refs.supermapDialog1.clearM(true)
             that.$refs.supermapDialog1.setMarkers([markersMap])
 
           }, 2000)
@@ -2164,6 +2167,7 @@ export default {
         }
         setTimeout(() => {
           that.$refs.supermapDialog1.clearM(false)
+          that.$refs.supermapDialog1.clearM(true)
           if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
             that.$refs.supermapDialog1.setMarkersRadius([markersMap])
           } else {
@@ -2196,6 +2200,8 @@ export default {
           markersMap.lng = res.data.centermonitorTCamera.longitude
           markersMap.lat = res.data.centermonitorTCamera.latitude
           setTimeout(() => {
+            that.$refs.supermapDialog1.clearM(false)
+            that.$refs.supermapDialog1.clearM(true)
             that.$refs.supermapDialog1.setMarkers([markersMap])
           }, 2000)
         }