搜索半径bug修复

src/views/emergen_cyrescue/emergency_map/components/dialog.vue

@@ -26,6 +26,7 @@
       <feng-bi-ka-kou v-if="value.type === '3'" :id="value.id" :type="value.type"/>
       <!-- 报警点 -->
       <bao-jing v-if="value.type === '13'" :id="value.id" :type="value.type"/>
+      <send-message v-if="value.type === 'sendMessage'" :id="value.id" :type="value.type"/>
     </el-dialog>
   </div>
 </template>
@@ -41,9 +42,10 @@ import BiNanSuo from '../dialog/biNanSuo.vue'
 import PaiShuiJing from '../dialog/paiShuiJing.vue'
 import FengBiKaKou from '../dialog/fengBiKaKou.vue'
 import BaoJing from '../dialog/baoJing.vue'
+import SendMessage from '../dialog/sendMessage.vue'
 
 export default {
-  components: { WuZi, BiNanSuo, PaiShuiJing, FengBiKaKou, BaoJing, videoPlayPlat, windspeedstation, weatherstation, XfPoint, XfControl },
+  components: { SendMessage, WuZi, BiNanSuo, PaiShuiJing, FengBiKaKou, BaoJing, videoPlayPlat, windspeedstation, weatherstation, XfPoint, XfControl },
   props: {
     visible: {
       type: Boolean,

src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue

@@ -293,7 +293,11 @@ export default {
       REPORT_ID: null,
       FIRERESERVEPLAN_ID: null,
       CODE: null,
-      CORPIFNO_ID: JSON.parse(sessionStorage.getItem('user')).CORPIFNO_ID
+      CORPIFNO_ID: JSON.parse(sessionStorage.getItem('user')).CORPIFNO_ID,
+      firstPoint: {
+        x: null,
+        y: null
+      }
     }
   },
   mounted() {
@@ -322,15 +326,39 @@ export default {
   methods: {
     /** 地图初始化 */
     mapInit(e) {
+      this.firstPoint.x = e.x
+      this.firstPoint.y = e.y
       mapInstance = new window.BMapGL.Map('map') // 创建地图实例
       mapInstance.centerAndZoom(new window.BMapGL.Point(e.y, e.x), 15) // 创建点坐标
       mapInstance.enableScrollWheelZoom(true) // 开启鼠标滚轮缩放能力
+      var point = new window.BMapGL.Point(this.firstPoint.y, this.firstPoint.x) // 设置中心点坐标（例如北京天安门）
+      mapInstance.centerAndZoom(point, 15) // 设置中心点和缩放级别
+      mapInstance.enableScrollWheelZoom(true)
+      var circle = new window.BMapGL.Circle(point, this.range, {
+        strokeColor: 'blue',
+        strokeWeight: 2,
+        strokeOpacity: 0.5,
+        fillColor: 'blue',
+        fillOpacity: 0.2
+      })
+      mapInstance.addOverlay(circle)
     },
     setActive(item, index) {
       // 设置被选中项的索引
       this.activeIndex = index
       this.range = item
       mapInstance.clearOverlays()
+      var point = new window.BMapGL.Point(this.firstPoint.y, this.firstPoint.x) // 设置中心点坐标（例如北京天安门）
+      mapInstance.centerAndZoom(point, 15) // 设置中心点和缩放级别
+      mapInstance.enableScrollWheelZoom(true)
+      var circle = new window.BMapGL.Circle(point, item, { // 2000米半径
+        strokeColor: 'blue',
+        strokeWeight: 2,
+        strokeOpacity: 0.5,
+        fillColor: 'blue',
+        fillOpacity: 0.2
+      })
+      mapInstance.addOverlay(circle)
       this.initPoint({ code: this.CODE, reportId: this.REPORT_ID, range: this.range })
     },
     /** 扎点方法 */
@@ -454,6 +482,17 @@ export default {
     // 二级坐标点位点击事件
     subToggleCheck(sos, ind) {
       mapInstance.clearOverlays()
+      var point = new window.BMapGL.Point(this.firstPoint.y, this.firstPoint.x) // 设置中心点坐标（例如北京天安门）
+      mapInstance.centerAndZoom(point, 15) // 设置中心点和缩放级别
+      mapInstance.enableScrollWheelZoom(true)
+      var circle = new window.BMapGL.Circle(point, this.range, { // 2000米半径
+        strokeColor: 'blue',
+        strokeWeight: 2,
+        strokeOpacity: 0.5,
+        fillColor: 'blue',
+        fillOpacity: 0.2
+      })
+      mapInstance.addOverlay(circle)
       this.initPoint(sos)
       this.currSubControlPoint.forEach((item, idx) => {
         if (idx === ind) {
@@ -466,6 +505,8 @@ export default {
     // 接收子组件传递出来的指令发送的事件
     handlerOrderMessage() {
       this.infoDialog.visible = true
+      this.infoDialog.info = {}
+      this.infoDialog.title = '指令信息'
     },
     initInfo() {
       const loading = this.$loading({

src/views/emergen_cyrescue/emergency_map/components/sysChat.vue

@@ -36,7 +36,7 @@ export default {
   },
   methods: {
     sendOrderBtn() {
-      this.$emit('orderMessage')
+      this.$emit('orderMessage', '')
     },
     confirmReceipt(answer) {
       requestFN('/bi/emergency/readInstruct', { ID: answer.ID })

src/views/emergen_cyrescue/emergency_map/dialog/sendMessage.vue

@@ -0,0 +1,53 @@
+<template>
+  <div class="app-container print-work" style="width: 100%">
+    <el-form>
+      <el-form-item label="指令类型"/>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+
+export default {
+  props: {
+    id: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    type: {
+      type: String,
+      default() {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      config: config,
+      form: {
+
+      }
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    getData() {
+      requestFN(
+        '/major/registration/detailLog', { Id: this.id }
+      ).then((data) => {
+        if (data.result === 'success') {
+          this.form = data.msg
+        }
+      }).catch((e) => {
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>