28383

packages/monitor/components/locateDialog.vue

@@ -55,7 +55,6 @@ export default {
         plugins: ['AMap.PlaceSearch', 'AMap.Marker', 'AMap.Geolocation'],
       }).then(AMap => {
         this.AMap = AMap
-        console.log(this.latlng)
         this.map = new AMap.Map('amap', {
           zoom: 14,
           center: this.latlng ? [this.latlng.lng, this.latlng.lat] : ''

project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue

@@ -25,13 +25,14 @@
         </el-form-item>
       </el-form>
     </ai-dialog>
-    <locate-dialog v-model="locate" :ins="instance" @confirm="v=>handleLocate(selected,v)"/>
-    <ai-area custom-clicker :input-clicker="false" v-model="selected.areaId" :instance="instance" ref="BindArea"
+    <locate-dialog v-model="locate" :ins="instance" :latlng="latlng" @confirm="v=>handleLocate(selected,v)"/>
+    <ai-area custom-clicker :input-clicker="false" v-model="selected.areaId" :hideLevel="disabledLevel" :instance="instance" ref="BindArea"
              @change="handleSubmit(selected)"/>
   </section>
 </template>
 
 <script>
+  import { mapState } from 'vuex'
   import DeviceSlider from "../components/deviceSlider";
   import LocateDialog from "../components/locateDialog";
 
@@ -56,7 +57,9 @@ export default {
         let per = this.splitOps.find(e => e.value == this.splitScreen)?.per || "100%"
         return {width: per, height: per}
       },
+      ...mapState(['user'])
     },
+
     data() {
       return {
         slider: true,
@@ -65,12 +68,22 @@ export default {
         monitors: [],
         dialog: false,
         locate: false,
-      selected: {},
+        selected: {
+          areaId: ''
+        },
+        latlng: null,
+        disabledLevel: 0,
         rules: {
           name: [{required: true, message: "请填写 设备名称"}]
         }
       }
     },
+
+    created () {
+      this.selected.areaId = this.user.info.areaId
+      this.disabledLevel = this.user.info.areaList.length
+    },
+
     methods: {
       handleFullscreen() {
         this.fullscreen = !this.fullscreen
@@ -119,7 +132,6 @@ export default {
                 <el-dropdown class="menuBtn" onCommand={e => this.handleSliderOption(e, data)}>
                   <i class="iconfont iconMore"/>
                   <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="changeStatus">设为公开</el-dropdown-item>
                     <el-dropdown-item command="edit">修改名称</el-dropdown-item>
                     <el-dropdown-item command="area">行政地区</el-dropdown-item>
                     <el-dropdown-item command="locate">地图标绘</el-dropdown-item>
@@ -144,16 +156,11 @@ export default {
         } else if (command == "area") {//绑定areaId
           this.$refs.BindArea?.chooseArea()
         } else if (command == "locate") {//地图标绘
+          this.latlng = data.lat && data.lng ? {
+            lat: data.lat,
+            lng: data.lng
+          } : ''
           this.locate = true
-      } else {
-        this.$confirm('确定设为公开？').then(() => {
-          console.log(data)
-          // this.instance.post(`/app/appeveryvillagecode/delete?ids=${this.selected.id}`).then(res => {
-          //   if (res.code == 0) {
-          //     this.getList()
-          //   }
-          // })
-        })
         }
       },
       handleSubmit(row) {

project/shandong10086/apps/shandong/monitor/components/locateDialog.vue

@@ -30,9 +30,7 @@ export default {
     prop: "visible",
     event: "visible",
   },
-  props: {
-    visible: Boolean
-  },
+  props: ['latlng', 'visible'],
   data() {
     return {
       dialog: false,
@@ -57,13 +55,21 @@ export default {
         plugins: ['AMap.PlaceSearch', 'AMap.Marker', 'AMap.Geolocation'],
       }).then(AMap => {
         this.AMap = AMap
+        console.log(this.latlng)
         this.map = new AMap.Map('amap', {
           zoom: 14,
+          center: this.latlng ? [this.latlng.lng, this.latlng.lat] : ''
         }).on('click', res => {
           this.map.clearMap()
           this.selected = {location: res.lnglat}
           this.poi?.searchNearBy('', res.lnglat, 100)
         });
+        if (this.latlng) {
+          let marker = new AMap.Marker({
+            position: [this.latlng.lng, this.latlng.lat]
+          })
+          this.map.add(marker)
+        }
         this.poi = new AMap.PlaceSearch().on('complete', ({poiList}) => {
           this.map.clearMap()
           if (poiList?.length > 0) {