修改水上客运功能等

src/utils/map/ArcgisUtil.js

@@ -69,6 +69,7 @@ export function addBoats(boats){
             "data": boats.data
         }
     };
+    console.log('定位：'+JSON.stringify(params))
     bridge.Invoke(params);
 }
 

src/utils/map/Boat.js

@@ -35,6 +35,7 @@ export function locationBoat(mmsi){
                 boats.data.push(boat)
             }
         }
+        console.log('定位：'+JSON.stringify(boats))
         addBoats(boats)
     })
 }

src/views/home/Header.vue

@@ -131,7 +131,7 @@ export default {
             calculation('area')
           }
           else if (name == 'qc') {
-            clearMap()
+            clearMap({is_draw: true, is_search:true, layers: ['sketchLayer','bufferLayer','tempLayer','boatLayer','boatPathLayer']})
             i.click =  !i.click ;
             i.checkIoc = !i.checkIoc;
           }
@@ -140,11 +140,11 @@ export default {
           if (name == 'ss') {
             togglePageAside()
           }else if (name == 'cl') {
-            clearMap()
+            clearMap({is_draw: true, is_search:true, layers: ['sketchLayer','bufferLayer','tempLayer','boatLayer','boatPathLayer']})
           }else if (name == 'cm') {
-            clearMap()
+            clearMap({is_draw: true, is_search:true, layers: ['sketchLayer','bufferLayer','tempLayer','boatLayer','boatPathLayer']})
           }else if (name == 'qc') {
-            clearMap()
+            clearMap({is_draw: true, is_search:true, layers: ['sketchLayer','bufferLayer','tempLayer','boatLayer','boatPathLayer']})
           }
 
         }

src/views/home/Home.vue

@@ -23,8 +23,7 @@ import ComPage from '@/views/home/ComPage'
 import { asideShow } from '@/store/index'
 import Map from '@/views/map/Index.vue'
 import {ref} from 'vue'
-// import {setShip} from "@/utils/map/Boat";
-
+import {setBoat} from "@/utils/map/Boat";
 
 // 禁用鼠标右键
 document.oncontextmenu=new Function("event.returnValue=false;")
@@ -34,7 +33,7 @@ export default {
   name: 'HomePage',
   components: { HomeHeader, TabSwitch, RouterView, UeVideo, ComPage ,Map},
   mounted() {
-    // setShip()
+    setBoat()
   },
   setup() {
     const aside_hide = asideShow().isHide

src/views/jtaq/cpns/KeyBoatList.vue

@@ -30,12 +30,14 @@ export default {
   import { ref } from 'vue'
   import { ueCallPositionByType } from '@/utils/UIInteractions'
 
+  import {locationBoat} from "@/utils/map/Boat";
   const props = defineProps(['list-data', 'list-title'])
 
   const list = ref(null)
 
   function handleClick(item) {
-    ueCallPositionByType('boat',item.mmsi)
+    // ueCallPositionByType('boat',item.mmsi)
+    locationBoat(item.mmsi)
     setTimeout(() => {
       handleClose()
     }, 100);

src/views/map/Index.vue

@@ -41,7 +41,10 @@
         methods:{
             fullExtent(){fullExtent()},
             calculation(type){calculation(type)},
-            clearMap(){clearMap()},
+            clearMap(){
+                // clearMap()
+                clearMap({is_draw: false, is_search:true, layers: []})
+            },
             // 测试方法
             test(value){
                 switch (value) {

src/views/ssky/Index.vue

@@ -164,7 +164,7 @@ export default {
 
 
   import  {clearMap} from "@/utils/map/ArcgisUtil"
-  import  {pjylLine,djldLine} from "@/utils/map/WaterPassenger"
+  import  {pjylLine,djldLineAll} from "@/utils/map/WaterPassenger"
 
   const aside_hide = asideShow().isHide
 
@@ -425,10 +425,10 @@ export default {
   function handleLineClick() {
     lineSelected.value = !lineSelected.value
     if(lineSelected.value) {
-      // djldLine()
+      djldLine()
       // ueCallShowLine()
     } else {
-      // clearMap()
+      clearMap({is_draw: false, is_search:true, layers: []})
       // ueCallCloseLine()
     }
   }
@@ -452,9 +452,9 @@ export default {
     djldSelected.value = !djldSelected.value
     if(djldSelected.value) {
       // ueCallShowMt()
-      djldLine()
+      djldLineAll(true)
     } else {
-      clearMap()
+      djldLineAll(false)
 
     }
   }

src/views/ssky/cpns/BoatDockList.vue

@@ -40,9 +40,12 @@ export default {
   // import { useInfiniteScroll } from '@vueuse/core'
   import { ueCallPositionByType } from '@/utils/UIInteractions'
   import bus from '@/utils/bus';
-
+  import { ElMessage } from 'element-plus'
+  import 'element-plus/es/components/message/style/css'
   const props = defineProps(['list-data', 'list-title'])
 
+
+  import {locationBoat} from "@/utils/map/Boat";
   // const listSlice = reactive({value: []})
 
   // onMounted(() => {
@@ -73,28 +76,40 @@ export default {
   import  {onePjylPortLocation,oneDjldPortLocation} from "@/utils/map/WaterPassenger"
   import  {clearMap} from "@/utils/map/ArcgisUtil"
   function handleClick(item) {
-    clearMap()
+    clearMap({is_draw: true, is_search:true, layers: ['sketchLayer','bufferLayer','tempLayer','boatPathLayer']})
     let position_type; let position_name;
-    let datas={
-      portName:    item.pierName,
-      mapx:item.pierPoints[0].mapx,
-      mapy:item.pierPoints[0].mapy
+    let datas={}
+    if (props.listTitle!='游船信息')
+    {
+      if (item.pierPoints[0]==undefined)
+      {
+        ElMessage.warning('未找到定位点')
+      }
+       datas={
+        portName:    item.pierName,
+        mapx: item.pierPoints[0][0].x,
+        mapy:  item.pierPoints[0][0].y
+      }
     }
+
     switch(props.listTitle) {
       case '码头信息':
         position_type = 'lymt'
         position_name = item.pierName
-
-        onePjylPortLocation(datas)
+        console.log( '码头信息：'+datas.portName+'位置：x：'+datas.mapx+' y:'+datas.mapy+''+JSON.stringify(item))
+        onePjylPortLocation(datas,true)
         break
       case '渡口信息':
         position_type = 'mt'
         position_name = item.pierName
-        oneDjldPortLocation(datas)
+        console.log( '渡口信息：'+datas.portName+'位置：x:'+datas.mapx+' y:'+datas.mapy+''+JSON.stringify(item))
+        oneDjldPortLocation(datas,true)
         break
       default:
         position_type = 'boat'
         position_name = item.mmsi
+        locationBoat(item.mmsi)
+
     }
 
     // ueCallPositionByType(position_type, position_name)
@@ -104,7 +119,7 @@ export default {
   const emit = defineEmits(['closeBoatList'])
 
   function handleClose() {
-    clearMap()
+    clearMap({is_draw: false, is_search:true, layers: []})
     emit('closeBoatList')
   }