From a818dfebe4b121772d7aa116e433f1dbb1b3cb79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=BE=E8=82=83?= <15833576927@163.com>
Date: Tue, 21 May 2024 09:42:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=9C=B0=E5=9B=BE=E3=80=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A8=A1=E5=BC=8F=E6=97=B6=E6=90=BA=E5=B8=A6?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E5=9F=BA=E5=9C=B0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/baseSelection/index.vue     | 10 ++++++++
 src/views/system/base/baseRightControl.vue |  3 ++-
 src/views/system/base/baseTable.vue        | 27 ++++++++++++++++++++--
 3 files changed, 37 insertions(+), 3 deletions(-)

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 @@
     <el-row :gutter="20">
       <!--育种基地/资源圃选择-->
       <el-col :span="4" :xs="24">
-        <base-selection></base-selection>
+        <base-selection v-model="currentBase"></base-selection>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
+        <el-row class="base-title">
+          <el-col :span="6" class="current-base-name">当前基地：{{currentBase.baseName || '请选择基地'}}</el-col>
+          <el-col :span="6" class="current-base-total"><i-pound theme="filled" size="16" fill="#333"/>地块总数：{{currentBase.baseName || '请选择基地'}}</el-col>
+          <el-col :span="6" class="current-base-area"><i-chart-line-area size="16" fill="#333"/>地块面积：{{currentBase.area || '请选择基地'}}</el-col>
+          <el-col :span="6" class="handoff-model" @click="toBaseMap"><el-button type="text">切换地图模式</el-button></el-col>
+        </el-row>
         <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="用户名称" prop="userName">
             <el-input
@@ -315,7 +321,7 @@ import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser,
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
-
+const currentBase = ref({})
 const userList = ref([]);
 const open = ref(false);
 const loading = ref(false);
@@ -579,4 +585,21 @@ function submitForm() {
     }
   });
 };
+// 切换地图模式
+const toBaseMap = () => {
+  if (currentBase.value.id){
+    router.push('/system/base/massifMap/'+currentBase.value.id)
+  }else{
+    router.push('/system/base/mapMarkers')
+  }
+}
 </script>
+<style scoped lang="scss">
+.base-title{
+  margin: 10px 0;
+  .handoff-model{
+    padding-right: 20px;
+    text-align: right;
+  }
+}
+</style>