地图层级修改

src/components/Map/index.vue

@@ -334,11 +334,8 @@ const initMonitor = () => {
     pageSize: 9999
   }
   dsVideoList(params).then(res => {
-      if (res.success) {
+  geography.monitor = res.data
-  geography.monitor = res.result.records
   addMonitorToMap()
-
-      }
     })
 }
 const initAisStation = () => {

src/components/Map/js/mock.js

@@ -402,8 +402,7 @@ const fences = [ {
     'lineColor': '#00FDF0FF',
     'lineWidth': '3',
     'longitude': '120.731175',
-    'positionInfo':
+    'positionInfo': '120.38200628800818,28.153871588450777;120.40161934924632,28.16665224935052;120.41526321793371,28.161013910606457;120.43146531199999,28.161013910606457;120.43999272992963,28.15838258420298;120.44681466427332,28.15199195078788;120.45448934040998,28.143721153079422;120.45917942027128,28.140713431912022;120.4655749837185,28.137329644652915;120.4813507068883,28.141841337246788;120.48945175392144,28.144097112287035;120.4992582845405,28.139585514701242;120.50991755695254,28.139209539658587;120.52697239281179,28.142969230705212;120.5401898906027,28.145600935920818;120.5517019048077,28.143721153079422;120.55937658094436,28.139585514701242;120.56193480632325,28.132441763265888;120.5610820645303,28.124169456077574;120.5610820645303,28.117024677005077;120.56577214439159,28.110255499765515;120.57685778770009,28.112135869634514;120.58495883473324,28.10912726202057;120.5930598817664,28.100853155967197;120.59860270342064,28.092578411842236;120.6037191541784,28.08467919733773;120.60116092879952,28.071512548408652;120.59945544521361,28.063988024404832;120.59860270342064,28.05081883965576;120.60116092879952,28.039529683128116;120.60840923403971,28.034261004599962;120.62247947362359,28.033131968492132;120.62844866617432,28.037271709637253;120.64763535651598,28.039906007435775;120.66000011251393,28.036142705120728;120.66767478865059,28.04705591914302;120.67065938492597,28.054581628489878;120.67449672299429,28.051947690132785;120.67236486851188,28.043292866963252;120.68430325361335,28.038777030563462;120.69965260588668,28.038777030563462;120.71500195816,28.038400702306493;120.72480848877908,28.037271709637253;120.74314243732776,28.031626568587686;120.75891816049757,28.02823934180657;120.77597299635681,28.021840955926812;120.78705863966533,28.013936542452893;120.79132234863015,28.003772872605627;120.79857065387033,27.99549065486699;120.80880355538586,27.98909032338784;120.83012210020993,27.98909032338784;120.85271975772343,27.997373032975464;120.87702289882287,27.99925537820563;120.89620958916451,27.995867133118892;120.91880724667803,27.98946682399441;120.94268401688097,27.98268961190924;120.95206417660356,27.95708296714755;120.93373022805487,27.966874460666574;120.92221821384989,27.97365266654279;120.91454353771323,27.97553542593344;120.89407773468211,27.979677380918556;120.8829920913736,27.98043044655396;120.86764273910028,27.978547772606063;120.84845604875862,27.976665065794414;120.84419233979382,27.974029221049765;120.86295265923899,27.964614964082905;120.88427120406304,27.950680356532175;120.90089966902582,27.93787399639349;120.91411716681674,27.92845658653934;120.90644249068008,27.899445808853542;120.88469757495953,27.914894074727723;120.87275918985806,27.92883329869066;120.85399887041288,27.94465402325662;120.83438580917475,27.95519988579228;120.82244742407327,27.964238376719482;120.81136178076476,27.971769874292207;120.8015552501457,27.9706401831697;120.77810485083923,27.973276110721436;120.77085654559905,27.97214643537107;120.75337533884331,27.980053914393565;120.7401578410524,27.987207800631985;120.73290953581223,28.006031548779006;120.72480848877908,28.01581859829085;120.71883929622834,28.020335398097348;120.71244373278111,28.022970110482113;120.6881405916817,28.022217342094482;120.67407035209781,28.025604758386503;120.66341107968577,28.028992068081955;120.64166616396524,28.02522838406238;120.62375858631303,28.024475631466153;120.60116092879952,28.031250215321077;120.58836980190509,28.038777030563462;120.58879617280158,28.049689977327688;120.58751706011213,28.062106811075683;120.58836980190509,28.071136334723224;120.59007528549101,28.077907979485328;120.5926335108699,28.08129364177948;120.58964891459453,28.09333068767149;120.58666431831915,28.101229265540294;120.58367972204378,28.10423809466379;120.57557867501066,28.107622926567224;120.56449303170214,28.10423809466379;120.55426013018659,28.11100765166906;120.55298101749715,28.117024677005077;120.55255464660067,28.125297535562492;120.55255464660067,28.129057714770116;120.5538337592901,28.13544971666095;120.55042279211827,28.13845758561478;120.5401898906027,28.13845758561478;120.53166247267309,28.13770562629301;120.5222823129505,28.13845758561478;120.51972408757162,28.136953661693376;120.50906481515958,28.13394575051819;120.50608021888421,28.132441763265888;120.49670005916163,28.131689761723855;120.4770869979235,28.13319375953069;120.46429587102905,28.13469773622831;120.45576845309942,28.13770562629301;120.45107837323813,28.141465370121423;120.44553555158389,28.146352839819542;120.43871361724018,28.15349566355806;120.4335971664824,28.156878940072858;120.42848071572463,28.158006675150574;120.42506974855277,28.1561271100874;120.41696870151965,28.156503025740147;120.4088676544865,28.15763076477806;120.39565015669558,28.15499935520908;120.38371177159411,28.14936040262422;120.38200628800818,28.153871588450777'
-'120.51471127064674,28.13957549396699;120.51890739842734,28.13587527906429;120.53762858391006,28.139006238454016;120.54795751383156,28.139006238454016;120.55247642067222,28.137867718353533;120.55538143221263,28.132459582652743;120.55376753691239,28.124489200957314;120.55441309503249,28.11566415847298;120.55893200187315,28.10797723934722;120.56667869931427,28.105984244460032;120.57345705957525,28.107123103215212;120.57958986171613,28.10655367534892;120.58604544291708,28.10342176805678;120.58927323351755,28.097157679200365;120.5931465822381,28.0834893071102;120.58991879163763,28.06924956919361;120.58895045445749,28.051019950559496;120.5931465822381,28.041903981997688;120.59766548907875,28.034781593968088;120.61186776772081,28.026803959632165;120.62058280234207,28.02651903318312;120.63123451132361,28.024524526921667;120.64511401090562,28.02651903318312;120.66093018484791,28.0282285805638;120.66835410322899,28.028798423656696;120.68126526563086,28.024524526921667;120.6948219861528,28.021675168156403;120.71160649727524,28.021675168156403;120.72839100839767,28.01141685220725;120.73742882207898,27.999162583129444;120.73871993831916,27.989187149187458;120.76163725158248,27.977215409958912;120.77616230928459,27.97265439781902;120.78713679732618,27.97265439781902;120.79262404134698,27.970088743745798;120.80876299434931,27.968948433462458;120.81747802897057,27.967808111127816;120.83038919137243,27.957259558282324;120.84168645847407,27.952127457120493;120.84555980719463,27.996312553354493;120.83200308667267,27.988332069036062;120.82135137769113,27.986051822143104;120.81102244776964,27.987762011834025;120.79456071570725,27.99488751020321;120.78326344860561,28.019680572148907;120.76099169346239,28.0282285805638;120.73290991523832,28.03079285072198;120.72128986907664,28.03563630542758;120.69256253273248,28.034781593968088;120.67448690536987,28.040479542114323;120.66254408014814,28.03791550279268;120.6580251733075,28.03592120773863;120.64479123184557,28.038200399068412;120.62736116260305,28.03734570797788;120.61735501174161,28.03307215068109;120.60831719806029,28.033926875719207;120.60057050061918,28.039055083369046;120.59831104719885,28.05757157564859;120.60057050061918,28.072952082651348;120.60250717497945,28.087191329724334;120.59540603565843,28.097442418444963;120.58539988479698,28.108831368678235;120.57474817581544,28.113101913313074;120.56764703649439,28.11139371586372;120.56086867623343,28.113956001835078;120.55731810657291,28.12904377736259;120.557963664693,28.14042937156471;120.5434386069909,28.145837104956886;120.53085022364908,28.144983270467232;120.51567960782688,28.14014474645503;120.51471127064674,28.13957549396699'
 } ]
 const detailFences = [ {
     'diaphaneity': '0.5',

src/components/Map/map-config.js

@@ -40,8 +40,8 @@ const baseLayerConfig = {
       maxAvailableZoom: 18,
       subdomains: [ '0', '1', '2', '3', '4', '5', '6', '7' ],
       urlTemplate:
-      'http://198.16.74.211:5000/{z}/{x}/{y}.png'
+      // 'http://198.16.74.211:5000/{z}/{x}/{y}.png'
-        // 'https://inner.qdlimap.cn:9443/gisAssistant/wmts/grid_tile/tianditu/img_w/{z}/{y}/{x}'
+        'https://inner.qdlimap.cn:9443/gisAssistant/wmts/grid_tile/tianditu/img_w/{z}/{y}/{x}'
     },
     tdt_tbo: {
       max: 18,
@@ -92,8 +92,8 @@ const getLocationSymbol = () => [
     }
   ]
 const baseConfig = {
-  center: [ 120.88, 28.01 ],
+  center: [ 120.68, 28.01 ],
-  zoom: 10,
+  zoom: 10.5,
   maxZoom: 20,
   minZoom: 5,
   attribution: '',

src/components/Map/window/uav.vue

@@ -60,6 +60,7 @@ const toggleFly = () => {
   dialog.visible = true
   dialog.url = ''
   setTimeout(() => {
+    if(data.value.droneSn) {
       const params = {
       status: 'stop',
       sn: data.value.droneSn,
@@ -72,6 +73,7 @@ const toggleFly = () => {
         }, 10000)
       }
     })
+    }
   }, 20000)
 }
 // 开启/关闭算法
@@ -161,7 +163,7 @@ const stopResize = () => {
   document.removeEventListener('mouseup', stopResize)
 }
 watch(() => data.value.sourceType, (val) => {
-  if(val === '2') {
+  if(val === '2' && data.value.droneSn) {
     toggleFly()
   }
 }, { immediate: true })
@@ -177,7 +179,7 @@ onUnmounted(() => {
 .content-wrapper{
   display: flex;
   position: relative;
-  height: 850px;
+  height: 100%;
   iframe{
     width: 100%;
     height: 100%;
@@ -196,10 +198,20 @@ onUnmounted(() => {
   //1音量的控制条
   video::-webkit-media-controls-volume-slider{display: none;}
   video::-webkit-media-controls-enclosuret{display: none;}
+  .uav-button{
+    width: fit-content;
+    cursor: pointer;
+    color: #00c0ff;
+    padding: 6px 10px;
+    background: rgba(22, 119, 255, 0.21);
+    border-radius: 2px 2px 2px 2px;
+    border: 1px solid #236ACE;
+    color: rgba(255, 255, 255, 0.9);
+  }
   .left-wrapper{
     // width: 60%;
     width: v-bind(leftWidth);
-    height: 700px;
+    height: 100%;
     display: flex;
     flex-direction: column;
     gap: 10px;
@@ -241,7 +253,7 @@ onUnmounted(() => {
   .right-wrapper{
     // width: 40%;
     width: v-bind(rightWidth);
-    height: 700px;
+    height: 100%;
     // position: absolute;
     // right: 0;
     flex: 1;

src/store/modules/map.js

@@ -28,7 +28,8 @@ const useMapStore = defineStore(
       },
       dialog: {
         visible: false,
-        type: '' // 弹窗类型 alarm/CCTV/UAV
+        type: '', // 弹窗类型 alarm/CCTV/UAV
+        data: {}
       },
       // 无人机信息
       uavs: {
@@ -57,9 +58,10 @@ const useMapStore = defineStore(
         this.hik.data = data
       },
       updateDialog(option) {
-        const { visible = false, type = '' } = option
+        const { visible = false, type = '', data } = option
         this.dialog.visible = visible
         this.dialog.type = type
+        this.dialog.data = data
       },
       updateUavData(option) {
         this.uavs.data = option

src/views/business/alarm/list.vue

@@ -118,7 +118,7 @@ const toggle = (index) => {
 const handle = (type, item) => {
   switch (type) {
     case 'more':
-      mapStore.updateDialog({ visible: true, type: 'alarm' })
+      mapStore.updateDialog({ visible: true, type: 'alarm', data: { isHasBoatName: current.value == 1 ? 1 : 2 } })
       break
     default:
       break

src/views/business/drone/cockpit.vue

@@ -22,10 +22,9 @@
 </template>
 <script setup>
 import { computed, nextTick, onMounted, ref } from 'vue'
-// import { useStore } from 'vuex'
+import useMapStore from '@/store/modules/map'
 const mapStore = useMapStore()
 const Detail = ref(null)
-// const store = useStore()
 const data = computed(() => mapStore.windowInfo.data)
 const ip = '198.16.74.210'
 

src/views/business/identification/alarm/index.vue

@@ -98,6 +98,9 @@ import { useRoute } from 'vue-router'
 import DialogComponent from '@/components/Dialog/screen.vue'
 import DetailComponent from './detail.vue'
 
+import useMapStore from '@/store/modules/map'
+const mapStore = useMapStore()
+
 const route = useRoute()
 const illegalTypes = [
   { value: '未封舱预警', label: '未封舱预警', prop: 'warning' },
@@ -523,6 +526,8 @@ const closeDetail = () => {
   initData()
 }
 onMounted(() => {
+  model.isHasBoatName = mapStore.dialog.data.isHasBoatName
+  console.log(model)
   if(Object.keys(route.query).length > 0 && route.query.type === 'alarm') {
     model.takeType = route.query.takeType
     illegalType.value = route.query.illegalType