基因型数据完成

master
贾肃 4 months ago
parent 91c8148a9d
commit fafb606490
  1. 8
      src/api/basicData/breedingBaseApi.js
  2. 20
      src/views/index.vue
  3. 22
      src/views/system/base/baseRightControl.vue
  4. 24
      src/views/system/base/massifTable.vue
  5. 19
      src/views/tableTypeData/plantTableData/index.vue
  6. 4
      src/views/tableTypeData/rawData/index.vue
  7. 4
      src/views/tableTypeData/tabularData/index.vue

@ -51,3 +51,11 @@ export function breedingBaseDeleteById(params) {
params: params params: params
}) })
} }
// 查询种植季信息
export function selSeasonInfo(params) {
return request({
url: '/season_info/selSeasonInfo',
method: 'post',
data: params
})
}

@ -362,6 +362,8 @@
<script setup name="Index"> <script setup name="Index">
// //
import {selSeasonInfo} from "@/api/basicData/breedingBaseApi.js";
const baseStatistics = ref({ const baseStatistics = ref({
// //
baseNumber:4378, baseNumber:4378,
@ -408,18 +410,26 @@ const tableTypeData = ref({
geneData:4000, geneData:4000,
}) })
import * as echarts from 'echarts'; import * as echarts from 'echarts';
const plantingSeason = ref(2023) const plantingSeason = ref(1)
const plantingSeasonList = [ const plantingSeasonList = ref([])
{value:2023,label:'2023年种植季'},
{value:2024,label:'2024年种植季'},
]
// //
const meteorologicalCharts = ref(null) const meteorologicalCharts = ref(null)
// //
const soilCharts = ref(null) const soilCharts = ref(null)
// //
const tableCharts = 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(()=>{ onMounted(()=>{
initData()
const meteorologicalIntance = echarts.init(meteorologicalCharts.value, "macarons"); const meteorologicalIntance = echarts.init(meteorologicalCharts.value, "macarons");
meteorologicalIntance.setOption({ meteorologicalIntance.setOption({
color:['#567722'], color:['#567722'],

@ -1,11 +1,10 @@
<!--地图右侧控件--> <!--地图右侧控件-->
<script setup> <script setup>
const plantingSeason = ref(2023) import {selSeasonInfo} from "@/api/basicData/breedingBaseApi.js";
const plantingSeason = ref(1)
// //
const plantingSeasonList = [ const plantingSeasonList = ref([])
{value: 2023, label: '2023年种植季'},
{value: 2024, label: '2024年种植季'},
]
const router = useRouter() const router = useRouter()
const route = useRoute(); const route = useRoute();
const toMassifTable = () => { const toMassifTable = () => {
@ -14,6 +13,19 @@ const toMassifTable = () => {
const props = defineProps({ const props = defineProps({
isBaseMap:Boolean 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({ const control = defineModel({
default: { default: {
// //

@ -158,7 +158,8 @@
<script setup name="User"> <script setup name="User">
import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user"; import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
import MassifForm from "@/views/system/base/massifForm.vue"; 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 massifFormRef = ref(null)
const router = useRouter(); const router = useRouter();
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
@ -222,14 +223,11 @@ const data = reactive({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
userName: undefined, userName: undefined,
plantingSeason: 2023, plantingSeason: 1,
status: undefined, status: undefined,
deptId: undefined deptId: undefined
}, },
plantingSeasonList:[ plantingSeasonList:[],
{value: 2023, label: '2023年种植季'},
{value: 2024, label: '2024年种植季'},
],
// //
massifType: [ massifType: [
{label: '旱地', value: 1}, {label: '旱地', value: 1},
@ -248,7 +246,19 @@ const submitSuccess = (value) =>{
} }
const { queryParams, form, rules , const { queryParams, form, rules ,
plantingSeasonList,massifType,cropClass} = toRefs(data); 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() { function getList() {
loading.value = true; loading.value = true;

@ -1,4 +1,4 @@
<!--气象数据--> <!--植株型数据-->
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row :gutter="20"> <el-row :gutter="20">
@ -156,6 +156,7 @@
import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user"; import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
import LeftDrawer from "@/components/LeftDrawer/index.vue"; import LeftDrawer from "@/components/LeftDrawer/index.vue";
import TitleDivider from "@/components/titleDivider/index.vue"; import TitleDivider from "@/components/titleDivider/index.vue";
import {selSeasonInfo} from "@/api/basicData/breedingBaseApi.js";
const massifFormRef = ref(null) const massifFormRef = ref(null)
const router = useRouter(); const router = useRouter();
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
@ -172,6 +173,20 @@ const multiple = ref(true);
const total = ref(0); const total = ref(0);
const title = ref(""); const title = ref("");
const dateRange = 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([ const columns = ref([
{ key: 0, label: `植株编号`, visible: true }, { key: 0, label: `植株编号`, visible: true },
@ -192,7 +207,7 @@ const data = reactive({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
userName: undefined, userName: undefined,
plantingSeason: 2023, plantingSeason: 1,
status: undefined, status: undefined,
deptId: undefined deptId: undefined
}, },

@ -3,7 +3,9 @@
</script> </script>
<template> <template>
<div>
原始数据
</div>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">

@ -3,7 +3,9 @@
</script> </script>
<template> <template>
<div>
表型数据
</div>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">

Loading…
Cancel
Save