diff --git a/src/components/baseSelection/index.vue b/src/components/baseSelection/index.vue index 22bca04..7d7bf6e 100644 --- a/src/components/baseSelection/index.vue +++ b/src/components/baseSelection/index.vue @@ -9,6 +9,16 @@ const baseList = ref([ {id: 5, baseName: '种植资源圃1'}, {id: 6, baseName: '种植资源圃2'}, ]) +const route = useRoute(); +onMounted(()=>{ + if (route.query.baseId){ + baseList.value.forEach(item => { + if (item.id === Number(route.query.baseId)){ + clickBase(item) + } + }) + } +}) const currentBase = defineModel({type:Object,default:()=>({})}) const maxHeight = ref(window.innerHeight - 130); const settingsStore = useSettingsStore() diff --git a/src/views/system/base/baseRightControl.vue b/src/views/system/base/baseRightControl.vue index 90eb554..ea3225b 100644 --- a/src/views/system/base/baseRightControl.vue +++ b/src/views/system/base/baseRightControl.vue @@ -7,8 +7,9 @@ const plantingSeasonList = [ {value: 2024, label: '2024年种植季'}, ] const router = useRouter() +const route = useRoute(); const toBaseTable = () => { - router.push('/system/base/baseTable') + router.push({path:'/system/base/baseTable',query:route.params}) } const control = defineModel({ default: { diff --git a/src/views/system/base/baseTable.vue b/src/views/system/base/baseTable.vue index 5fc41b1..b2817ec 100644 --- a/src/views/system/base/baseTable.vue +++ b/src/views/system/base/baseTable.vue @@ -3,10 +3,16 @@ - + + + 当前基地:{{currentBase.baseName || '请选择基地'}} + 地块总数:{{currentBase.baseName || '请选择基地'}} + 地块面积:{{currentBase.area || '请选择基地'}} + 切换地图模式 + { + if (currentBase.value.id){ + router.push('/system/base/massifMap/'+currentBase.value.id) + }else{ + router.push('/system/base/mapMarkers') + } +} +