diff --git a/.env.development b/.env.development index c1e8f12..3db8f45 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ VITE_WS_BASE_URL ='ws://220.185.188.222:8055/api/gisWs' # VITE_APP_BASE_URL = 'http://125.124.131.105:6811/api' # 成彬本地 -VITE_APP_BASE_URL = 'http://100.95.157.241:6061/api' -# VITE_APP_BASE_URL = 'http://100.95.236.218:6061/api' +# VITE_APP_BASE_URL = 'http://100.95.157.241:6061/api' +VITE_APP_BASE_URL = 'http://100.95.236.218:6061/api' # VITE_APP_BASE_URL = 'http://119.167.138.11:6061/video-service' # 智能体访问地址 diff --git a/src/store/modules/map.js b/src/store/modules/map.js index 7877d40..3ed1c93 100644 --- a/src/store/modules/map.js +++ b/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 diff --git a/src/views/business/alarm/list.vue b/src/views/business/alarm/list.vue index 0dcd27a..dedf890 100644 --- a/src/views/business/alarm/list.vue +++ b/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 diff --git a/src/views/business/identification/alarm/index.vue b/src/views/business/identification/alarm/index.vue index 33774d5..646b2fb 100644 --- a/src/views/business/identification/alarm/index.vue +++ b/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