From fafb6064903b706b20dde8179bb0534000d7b209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=BE=E8=82=83?= <15833576927@163.com>
Date: Thu, 30 May 2024 17:52:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E5=9B=A0=E5=9E=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicData/breedingBaseApi.js          |  8 +++++++
 src/views/index.vue                           | 20 ++++++++++++----
 src/views/system/base/baseRightControl.vue    | 22 +++++++++++++----
 src/views/system/base/massifTable.vue         | 24 +++++++++++++------
 .../tableTypeData/plantTableData/index.vue    | 19 +++++++++++++--
 src/views/tableTypeData/rawData/index.vue     |  4 +++-
 src/views/tableTypeData/tabularData/index.vue |  4 +++-
 7 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/src/api/basicData/breedingBaseApi.js b/src/api/basicData/breedingBaseApi.js
index f04be93..34ac3a7 100644
--- a/src/api/basicData/breedingBaseApi.js
+++ b/src/api/basicData/breedingBaseApi.js
@@ -51,3 +51,11 @@ export function breedingBaseDeleteById(params) {
     params: params
   })
 }
+// 查询种植季信息
+export function selSeasonInfo(params) {
+  return request({
+    url: '/season_info/selSeasonInfo',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/views/index.vue b/src/views/index.vue
index 48c14ef..3531e4e 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -362,6 +362,8 @@
 
 <script setup name="Index">
 //基地统计数据
+import {selSeasonInfo} from "@/api/basicData/breedingBaseApi.js";
+
 const baseStatistics = ref({
   // 基地数量
   baseNumber:4378,
@@ -408,18 +410,26 @@ const tableTypeData = ref({
   geneData:4000,
 })
 import * as echarts from 'echarts';
-const plantingSeason = ref(2023)
-const plantingSeasonList = [
-	{value:2023,label:'2023年种植季'},
-	{value:2024,label:'2024年种植季'},
-]
+const plantingSeason = ref(1)
+const plantingSeasonList = ref([])
 // 气象图表
 const meteorologicalCharts = ref(null)
 // 土壤图表
 const soilCharts = ref(null)
 // 表型图表
 const tableCharts = ref(null)
+const initData = () => {
+  selSeasonInfo({}).then(res =>{
+    plantingSeasonList.value = res.data.map(item =>{
+      return {
+        label:item.seasonName,
+        value:item.id
+      }
+    })
+  })
+}
 onMounted(()=>{
+  initData()
 	const meteorologicalIntance = echarts.init(meteorologicalCharts.value, "macarons");
 	meteorologicalIntance.setOption({
 		color:['#567722'],
diff --git a/src/views/system/base/baseRightControl.vue b/src/views/system/base/baseRightControl.vue
index 4dbda44..ebe002c 100644
--- a/src/views/system/base/baseRightControl.vue
+++ b/src/views/system/base/baseRightControl.vue
@@ -1,11 +1,10 @@
 <!--地图右侧控件-->
 <script setup>
-const plantingSeason = ref(2023)
+import {selSeasonInfo} from "@/api/basicData/breedingBaseApi.js";
+
+const plantingSeason = ref(1)
 // 种植季选项
-const plantingSeasonList = [
-  {value: 2023, label: '2023年种植季'},
-  {value: 2024, label: '2024年种植季'},
-]
+const plantingSeasonList = ref([])
 const router = useRouter()
 const route = useRoute();
 const toMassifTable = () => {
@@ -14,6 +13,19 @@ const toMassifTable = () => {
 const props = defineProps({
   isBaseMap:Boolean
 })
+const initData = () => {
+  selSeasonInfo({}).then(res =>{
+    plantingSeasonList.value = res.data.map(item =>{
+      return {
+        label:item.seasonName,
+        value:item.id
+      }
+    })
+  })
+}
+onMounted(()=>{
+  initData()
+})
 const control = defineModel({
   default: {
     // 地图类型
diff --git a/src/views/system/base/massifTable.vue b/src/views/system/base/massifTable.vue
index 15dbf6c..c5fb068 100644
--- a/src/views/system/base/massifTable.vue
+++ b/src/views/system/base/massifTable.vue
@@ -158,7 +158,8 @@
 <script setup name="User">
 import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
 import MassifForm from "@/views/system/base/massifForm.vue";
-import {ElMessageBox} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {selSeasonInfo} from "@/api/basicData/breedingBaseApi.js";
 const massifFormRef = ref(null)
 const router = useRouter();
 const { proxy } = getCurrentInstance();
@@ -222,14 +223,11 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     userName: undefined,
-    plantingSeason: 2023,
+    plantingSeason: 1,
     status: undefined,
     deptId: undefined
   },
-  plantingSeasonList:[
-    {value: 2023, label: '2023年种植季'},
-    {value: 2024, label: '2024年种植季'},
-  ],
+  plantingSeasonList:[],
   // 地块性质
   massifType: [
     {label: '旱地', value: 1},
@@ -248,7 +246,19 @@ const submitSuccess = (value) =>{
 }
 const { queryParams, form, rules ,
   plantingSeasonList,massifType,cropClass} = toRefs(data);
-
+const initData = () => {
+  selSeasonInfo({}).then(res =>{
+    data.plantingSeasonList = res.data.map(item =>{
+      return {
+        label:item.seasonName,
+        value:item.id
+      }
+    })
+  })
+}
+onMounted(()=>{
+  initData()
+})
 /** 查询用户列表 */
 function getList() {
   loading.value = true;
diff --git a/src/views/tableTypeData/plantTableData/index.vue b/src/views/tableTypeData/plantTableData/index.vue
index 3c9b25d..ae67098 100644
--- a/src/views/tableTypeData/plantTableData/index.vue
+++ b/src/views/tableTypeData/plantTableData/index.vue
@@ -1,4 +1,4 @@
-<!--气象数据-->
+<!--植株型数据-->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
@@ -156,6 +156,7 @@
 import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
 import LeftDrawer from "@/components/LeftDrawer/index.vue";
 import TitleDivider from "@/components/titleDivider/index.vue";
+import {selSeasonInfo} from "@/api/basicData/breedingBaseApi.js";
 const massifFormRef = ref(null)
 const router = useRouter();
 const { proxy } = getCurrentInstance();
@@ -172,6 +173,20 @@ const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 const dateRange = ref([]);
+const plantingSeasonList = ref([]);
+const initData = () => {
+  selSeasonInfo({}).then(res =>{
+    plantingSeasonList.value = res.data.map(item =>{
+      return {
+        label:item.seasonName,
+        value:item.id
+      }
+    })
+  })
+}
+onMounted(()=>{
+  initData()
+})
 // 列显隐信息
 const columns = ref([
   { key: 0, label: `植株编号`, visible: true },
@@ -192,7 +207,7 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     userName: undefined,
-    plantingSeason: 2023,
+    plantingSeason: 1,
     status: undefined,
     deptId: undefined
   },
diff --git a/src/views/tableTypeData/rawData/index.vue b/src/views/tableTypeData/rawData/index.vue
index 0f9effd..278cc68 100644
--- a/src/views/tableTypeData/rawData/index.vue
+++ b/src/views/tableTypeData/rawData/index.vue
@@ -3,7 +3,9 @@
 </script>
 
 <template>
-
+<div>
+  原始数据
+</div>
 </template>
 
 <style scoped lang="scss">
diff --git a/src/views/tableTypeData/tabularData/index.vue b/src/views/tableTypeData/tabularData/index.vue
index 0f9effd..a9b0227 100644
--- a/src/views/tableTypeData/tabularData/index.vue
+++ b/src/views/tableTypeData/tabularData/index.vue
@@ -3,7 +3,9 @@
 </script>
 
 <template>
-
+<div>
+  表型数据
+</div>
 </template>
 
 <style scoped lang="scss">