zk 1 anno fa
parent
commit
a221ca5ddd

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

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

+ 14 - 0
src/views/home/cpns/boatPanel/BoatDjld.vue

@@ -56,6 +56,8 @@
         <!--        <span class="speed" :class="{'selected': playSpeed===1.5}" @click="ChangePlaySpeed(1.5)">x1.5</span>-->
         <!--        <span class="speed" :class="{'selected': playSpeed===2}" @click="ChangePlaySpeed(2)">x2.0</span>-->
         <!--        <span class="speed" :class="{'selected': playSpeed===3}" @click="ChangePlaySpeed(3)">x3.0</span>-->
+        <span class="play-btn" :class="{'btn-disabled': playJaShi===1}" v-show="playState<2" @click="preview_moni(true)">模拟驾驶</span>
+        <span class="play-btn" :class="{'btn-disabled': playJaShi===0}" v-show="playState<2" @click="preview_moni(false)">关闭驾驶</span>
         <span class="play-btn" :class="{'btn-disabled': playState===-1}" v-show="playState<2"  @click="track_play(1)">轨迹点</span>
         <span class="play-btn"   v-show="playState<2" @click="track_play(2)">播放</span>
         <span class="play-btn" v-show="playState===2" @click="track_pause">暂停</span>
@@ -83,6 +85,7 @@ export default {
     ueCallBoatGuiji, ueCallSetBoatDriveSpeed, ueCallBoatDrive, ueCallBoatCloseDrive, ueCallBoatStop, ueCallBoatContinue, ueCallChangeTrackType
   } from '@/utils/UIInteractions'
   import { useDateFormat } from '@vueuse/core'
+  import {boatDriving} from "@/utils/map/Boat";
   
   const props = defineProps(['boat-info'])
 
@@ -97,6 +100,17 @@ export default {
     time2: ''
   })
 
+  const playJaShi = ref(0)
+  function preview_moni(type)
+  {
+    if (type)
+    {
+      playJaShi.value=1
+    }else {
+      playJaShi.value=0
+    }
+    boatDriving(type)
+  }
   bus.on('ueRec_boatGuiji', (data) => {
     if(data.isOk=='true') {
       playState.value=0

+ 15 - 1
src/views/home/cpns/boatPanel/BoatGeneral.vue

@@ -99,6 +99,8 @@
 <!--        <span class="speed" :class="{'selected': playSpeed===1.5}" @click="ChangePlaySpeed(1.5)">x1.5</span>-->
 <!--        <span class="speed" :class="{'selected': playSpeed===2}" @click="ChangePlaySpeed(2)">x2.0</span>-->
 <!--        <span class="speed" :class="{'selected': playSpeed===3}" @click="ChangePlaySpeed(3)">x3.0</span>-->
+        <span class="play-btn" :class="{'btn-disabled': playJaShi===1}" v-show="playState<2" @click="preview_moni(true)">模拟驾驶</span>
+        <span class="play-btn" :class="{'btn-disabled': playJaShi===0}" v-show="playState<2" @click="preview_moni(false)">关闭驾驶</span>
         <span class="play-btn" :class="{'btn-disabled': playState===-1}" v-show="playState<2" @click="track_play(1)">轨迹点</span>
         <span class="play-btn"   v-show="playState<2" @click="track_play(2)">播放</span>
         <span class="play-btn" v-show="playState===2" @click="track_pause">暂停</span>
@@ -133,7 +135,7 @@ export default {
   import {GetBoatNum} from '@/apis/boats'
 
 
-  import {playBoatPath,playBoatHistoryPath} from '@/utils/map/Boat'
+  import {playBoatPath, playBoatHistoryPath, boatDriving} from '@/utils/map/Boat'
 
   const tableData = reactive({value: []})
 
@@ -151,6 +153,18 @@ export default {
     time1: '',
     time2: ''
   })
+  const playJaShi = ref(0)
+
+  function preview_moni(type)
+  {
+    if (type)
+    {
+      playJaShi.value=1
+    }else {
+      playJaShi.value=0
+    }
+    boatDriving(type)
+  }
 
   bus.on('ueRec_boatGuiji', (data) => {
     if(data.isOk=='true') {

+ 14 - 0
src/views/home/cpns/boatPanel/BoatKkjk.vue

@@ -87,6 +87,8 @@
         <!--        <span class="speed" :class="{'selected': playSpeed===1.5}" @click="ChangePlaySpeed(1.5)">x1.5</span>-->
         <!--        <span class="speed" :class="{'selected': playSpeed===2}" @click="ChangePlaySpeed(2)">x2.0</span>-->
         <!--        <span class="speed" :class="{'selected': playSpeed===3}" @click="ChangePlaySpeed(3)">x3.0</span>-->
+        <span class="play-btn" :class="{'btn-disabled': playJaShi===1}" v-show="playState<2" @click="preview_moni(true)">模拟驾驶</span>
+        <span class="play-btn" :class="{'btn-disabled': playJaShi===0}" v-show="playState<2" @click="preview_moni(false)">关闭驾驶</span>
         <span class="play-btn" :class="{'btn-disabled': playState===-1}" v-show="playState<2"  @click="track_play(1)">轨迹点</span>
         <span class="play-btn"   v-show="playState<2" @click="track_play(2)">播放</span>
         <span class="play-btn" v-show="playState===2" @click="track_pause">暂停</span>
@@ -130,6 +132,7 @@ export default {
   import bus from '@/utils/bus'
   import { ueCallBoatGuiji, ueCallSetBoatDriveSpeed, ueCallBoatDrive, ueCallBoatCloseDrive, ueCallBoatStop, ueCallBoatContinue, ueCallChangeTrackType } from '@/utils/UIInteractions'
   import { useDateFormat } from '@vueuse/core'
+  import {boatDriving} from "@/utils/map/Boat";
 
   const props = defineProps(['boat-info'])
 
@@ -146,6 +149,17 @@ export default {
     RFID: false,
   })
 
+  const playJaShi = ref(0)
+  function preview_moni(type)
+  {
+    if (type)
+    {
+      playJaShi.value=1
+    }else {
+      playJaShi.value=0
+    }
+    boatDriving(type)
+  }
   watch(()=>props.boatInfo, (val) => {
     nextTick(() => {
       warningData.value.forEach(i => {

+ 15 - 0
src/views/home/cpns/boatPanel/BoatPjyl.vue

@@ -66,6 +66,8 @@
             <!--        <span class="speed" :class="{'selected': playSpeed===1.5}" @click="ChangePlaySpeed(1.5)">x1.5</span>-->
             <!--        <span class="speed" :class="{'selected': playSpeed===2}" @click="ChangePlaySpeed(2)">x2.0</span>-->
             <!--        <span class="speed" :class="{'selected': playSpeed===3}" @click="ChangePlaySpeed(3)">x3.0</span>-->
+            <span class="play-btn" :class="{'btn-disabled': playJaShi===1}" v-show="playState<2" @click="preview_moni(true)">模拟驾驶</span>
+            <span class="play-btn" :class="{'btn-disabled': playJaShi===0}" v-show="playState<2" @click="preview_moni(false)">关闭驾驶</span>
             <span class="play-btn" :class="{'btn-disabled': playState===-1}" v-show="playState<2"  @click="track_play(1)">轨迹点</span>
             <span class="play-btn"    v-show="playState<2" @click="track_play(2)">播放</span>
             <span class="play-btn" v-show="playState===2" @click="track_pause">暂停</span>
@@ -127,6 +129,7 @@ export default {
   import { GetLshb } from '../../../../apis/ssky'
   import 'element-plus/es/components/date-picker/style/css'
   import bus from '@/utils/bus'
+  import {boatDriving} from '@/utils/map/Boat'
   import { 
     ueCallBoatGuiji, ueCallSetBoatDriveSpeed, ueCallBoatDrive, ueCallBoatCloseDrive, ueCallBoatStop, ueCallBoatContinue,
     ueCallInitAll, ueCallFindJinghua, ueCallRunJinghua, ueCallRunOpJinghua, ueCallFindZhuanhang, ueCallRunZhuanhang, ueCallRunOpZhuanhang,
@@ -157,9 +160,21 @@ export default {
       ElMessage({type: 'warning',message:'此船舶该时段未查到轨迹点'})
     }
   })
+  const playJaShi = ref(0)
 
+  function preview_moni(type)
+  {
+    if (type)
+    {
+      playJaShi.value=1
+    }else {
+      playJaShi.value=0
+    }
+    boatDriving(type)
+  }
   const bottomType = ref('playback')
 
+
   bus.on('ueRec_pujiangInit', (data) => {
     if(data.isOk=='true') {
       previewState.value=0

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

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