Bläddra i källkod

修改水上客运功能

zk 1 år sedan
förälder
incheckning
dac6867eba

+ 1 - 3
src/utils/UIInteractions.js

@@ -301,9 +301,7 @@ export function ueCallCloseVideoFusion() {    // 视频融合关闭
 }
 
 export function ueCallBoatRealtime() {    // 实施船舶开启
-  callUIInteractionFormat({
-    "ActionName":"boat_realtime"
-  })
+  callUIInteractionFormat()
 }
 
 export function ueCallClearBoatTime() {    // 实施船舶关闭

+ 2 - 2
src/utils/map/ArcgisUtil.js

@@ -9,8 +9,8 @@ let drawGeometry
 export function initBridge(){
     bridge = new CityGis.Bridge({
         id: "i_map",
-        // url: "http://10.83.68.108:8090/mapVue/#/map", //政务网
-        url: "http://localhost:8081/#/map", //政务网
+        url: "http://10.83.68.108:8090/mapVue/#/map", //政务网
+        // url: "http://localhost:8081/#/map", //政务网
         onReady: function(){
             console.log("地图创建完成");
         }

+ 2 - 2
src/views/home/Home.vue

@@ -23,7 +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 {setShip} from "@/utils/map/Boat";
 
 
 // 禁用鼠标右键
@@ -34,7 +34,7 @@ export default {
   name: 'HomePage',
   components: { HomeHeader, TabSwitch, RouterView, UeVideo, ComPage ,Map},
   mounted() {
-    setShip()
+    // setShip()
   },
   setup() {
     const aside_hide = asideShow().isHide

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

@@ -92,7 +92,7 @@
     }
 
     #tool_div {
-        display: block;
+        display: none;
         background-color: #cccccc;
         z-index: 10;
         position: absolute;

+ 16 - 6
src/views/ssky/Index.vue

@@ -162,6 +162,10 @@ export default {
   import LdkllLineDetail from './cpns/LdkllLineDetail.vue'
   import { asideShow } from '@/store/index'
 
+
+  import  {clearMap} from "@/utils/map/ArcgisUtil"
+  import  {pjylLine,djldLine} from "@/utils/map/WaterPassenger"
+
   const aside_hide = asideShow().isHide
 
   const ylzyData = reactive({
@@ -421,9 +425,11 @@ export default {
   function handleLineClick() {
     lineSelected.value = !lineSelected.value
     if(lineSelected.value) {
-      ueCallShowLine()
+      // djldLine()
+      // ueCallShowLine()
     } else {
-      ueCallCloseLine()
+      // clearMap()
+      // ueCallCloseLine()
     }
   }
 
@@ -432,9 +438,11 @@ export default {
   function handlePjylClick() {
     pjylSelected.value = !pjylSelected.value
     if(pjylSelected.value) {
-      ueCallShowLymt()
+      pjylLine(true)
+      // ueCallShowLymt()
     } else {
-      ueCallCloseLymt()
+      pjylLine(false)
+      // ueCallCloseLymt()
     }
   }
 
@@ -443,9 +451,11 @@ export default {
   function handleDjldClick() {
     djldSelected.value = !djldSelected.value
     if(djldSelected.value) {
-      ueCallShowMt()
+      // ueCallShowMt()
+      djldLine()
     } else {
-      ueCallCloseMt()
+      clearMap()
+
     }
   }
 

+ 14 - 2
src/views/ssky/cpns/BoatDockList.vue

@@ -70,29 +70,41 @@ export default {
   //   },
   //   { distance: 10 }
   // )
-
+  import  {onePjylPortLocation,oneDjldPortLocation} from "@/utils/map/WaterPassenger"
+  import  {clearMap} from "@/utils/map/ArcgisUtil"
   function handleClick(item) {
+    clearMap()
     let position_type; let position_name;
+    let datas={
+      portName:    item.pierName,
+      mapx:item.pierPoints[0].mapx,
+      mapy:item.pierPoints[0].mapy
+    }
     switch(props.listTitle) {
       case '码头信息':
         position_type = 'lymt'
         position_name = item.pierName
+
+        onePjylPortLocation(datas)
         break
       case '渡口信息':
         position_type = 'mt'
         position_name = item.pierName
+        oneDjldPortLocation(datas)
         break
       default:
         position_type = 'boat'
         position_name = item.mmsi
     }
-    ueCallPositionByType(position_type, position_name)
+
+    // ueCallPositionByType(position_type, position_name)
     // bus.emit('ueRec_BoatClick', { mmsi: item.mmsi, where: 'HPJ'})
   }
 
   const emit = defineEmits(['closeBoatList'])
 
   function handleClose() {
+    clearMap()
     emit('closeBoatList')
   }