From b9720963c38fae89165d602cfe29c5c566b87205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=BE=E8=82=83?= <15833576927@163.com>
Date: Wed, 22 May 2024 16:25:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E5=9C=B0=E5=9C=B0=E5=9B=BE=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/baseSelection/index.vue     |  1 -
 src/views/basicData/breedingBase/index.vue |  6 +----
 src/views/system/base/mapMarkers.vue       | 31 ++++++++++++----------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/components/baseSelection/index.vue b/src/components/baseSelection/index.vue
index 1ef77e7..823348b 100644
--- a/src/components/baseSelection/index.vue
+++ b/src/components/baseSelection/index.vue
@@ -26,7 +26,6 @@ const clickBase = (item) => {
 const selBaseList = () => {
   loading.value = true
   selAllBreedingBase({}).then(res =>{
-    console.log(res);
     baseList.value = res.data
   }).finally(()=>{
     loading.value = false
diff --git a/src/views/basicData/breedingBase/index.vue b/src/views/basicData/breedingBase/index.vue
index 0acd309..579d2f5 100644
--- a/src/views/basicData/breedingBase/index.vue
+++ b/src/views/basicData/breedingBase/index.vue
@@ -47,11 +47,7 @@
         <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange" border>
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="基地/资源圃名称" align="center" key="baseName" prop="baseName" v-if="columns[0].visible" />
-          <el-table-column label="基地类型" align="center" key="baseType" prop="baseType" v-if="columns[1].visible" :show-overflow-tooltip="true" >
-            <template #default="scope">
-              <el-tag v-if="scope.row.baseType === 1" type="success">智能育种基地</el-tag>
-              <el-tag v-else-if="scope.row.baseType === 2" type="success">种质资源圃</el-tag>
-            </template>
+          <el-table-column label="基地类型" align="center" key="baseType" prop="baseTypeName" v-if="columns[1].visible" :show-overflow-tooltip="true" >
           </el-table-column>
           <el-table-column label="所属省份" align="center" key="administrativeDivisionName" prop="administrativeDivisionName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="地理位置" align="center" key="position" prop="dept.position" v-if="columns[3].visible" :show-overflow-tooltip="true" />
diff --git a/src/views/system/base/mapMarkers.vue b/src/views/system/base/mapMarkers.vue
index 10b88bc..7796332 100644
--- a/src/views/system/base/mapMarkers.vue
+++ b/src/views/system/base/mapMarkers.vue
@@ -2,6 +2,7 @@
 <script setup>
 import {ElAmap, useGeolocation, lazyAMapApiLoaderInstance} from "@vuemap/vue-amap";
 import BaseRightControl from "@/views/system/base/baseRightControl.vue";
+import {selAllBreedingBase} from "@/api/basicData/breedingBaseApi.js";
 
 const router = useRouter()
 const maxHeight = ref(window.innerHeight - 100);
@@ -10,18 +11,21 @@ const center = ref([
   107.5856025,
   22.484856
 ]);
-const baseList = ref([
-  {
-    baseId: 1,
-    position: [116.338461, 39.97947],
-    label: '测试',
-  },
-  {
-    baseId: 2,
-    position: [107.5856025, 22.484856],
-    label: '金光农场（广西农垦育种基地）',
-  },
-])
+const baseList = ref([])
+const selBaseList = () => {
+  selAllBreedingBase({}).then(res=>{
+    baseList.value = res.data.map(item =>{
+      return {
+        id: item.id,
+        position: [item.longitude, item.latitude],
+        label: item.baseName,
+      }
+    })
+  })
+}
+onMounted(()=>{
+  selBaseList()
+})
 const control = reactive({
   // 地图类型
   dataType: 1,
@@ -45,8 +49,7 @@ const control = reactive({
 const clickBase = ref(null)
 const clickMarker = (value) => {
   clickBase.value = value
-  router.push({path: '/system/base/massifMap/' + value.baseId})
-  console.log(value);
+  router.push({path: '/system/base/massifMap/' + value.id})
 }
 onBeforeMount(() => {
   // 获取当前定位