Browse Source

提交企业定位

zk 1 year ago
parent
commit
a94fb2263e

+ 3 - 1
src/views/home/Header.vue

@@ -71,9 +71,10 @@ export default {
   import {ElMessage} from "element-plus";
 
   // 地图方法
-  import {fullExtent, calculation, clearMap, setCamera} from "@/utils/map/ArcgisUtil"
+  import {fullExtent, calculation, clearMap, setCamera} from "@/utils/map/ArcgisUtil";
   import {setCenter} from "@/utils/map/Common";
 
+  import {locationUnit} from "@/utils/map/OperationSupervision";
 
 
   const vidoShow = ref(false)
@@ -171,6 +172,7 @@ export default {
             togglePageAside()
           }else
           {
+            locationUnit(null,false)
             bus.emit('toggle_sxdx', false)
             bus.emit('hiddenWater')
           }

+ 1 - 1
src/views/map/BaseMapArea.vue

@@ -67,7 +67,7 @@
     position: absolute;
     bottom: 5vh;
     right: 30vh;
-    z-index: 9;
+    z-index: 0;
     background: rgba(255,255,255,0);
     transition: width 0.5s;
     width: $width;

+ 3 - 0
src/views/yyjg/Index.vue

@@ -185,6 +185,7 @@ export default {
   } from '@/utils/UIInteractions'
   import { useRafFn } from '@vueuse/core'
   import { asideShow } from '@/store/index'
+  import {locationUnit} from "@/utils/map/OperationSupervision";
 
   const aside_hide = asideShow().isHide
 
@@ -236,6 +237,7 @@ export default {
 
   const entInfoListShow = ref(false)
   function handleCloseEntList() {
+    locationUnit(null,false)
     entInfoListShow.value=false
     if(!entInfoShow.value) {
       // ue_closeUnitVedio()
@@ -244,6 +246,7 @@ export default {
   }
 
   function handleCloseEntInfo() {
+    locationUnit(null,false)
     entInfoShow.value=false
     if(!entInfoListShow.value) {
       // ue_closeUnitVedio()

+ 12 - 0
src/views/yyjg/cpns/EntInfoList.vue

@@ -34,6 +34,8 @@ export default {
 
   import { onMounted, reactive, ref, watch } from 'vue'
   // import { useInfiniteScroll } from '@vueuse/core'
+  import {locationUnit} from "@/utils/map/OperationSupervision";
+
 
   const props = defineProps({
     listData: Array,
@@ -94,7 +96,17 @@ export default {
 
   function handleEntClick(item,index) {
     // console.log('listitem:',item)
+    console.log('信息操作:'+item)
     if(props.hasDetail) {
+
+      let data={
+        name:item.unitName,
+        certNumber:item.certNumber,
+        mapx:item.shape.x,
+        mapy:item.shape.y
+
+      }
+      locationUnit(data,true)
       emit('pickedEnt', item)
       currentIndex.value = index
     }