jidilist取值更改

This commit is contained in:
王兴凯 2026-06-09 11:17:07 +08:00
parent c1f3490c2c
commit e55be0b182
15 changed files with 67 additions and 721 deletions

View File

@ -2,7 +2,14 @@ import request from '@/utils/request';
//过鱼设施介绍 //过鱼设施介绍
export function vmsstbprptGetKendoList(data: any) { export function vmsstbprptGetKendoList(data: any) {
return request({ return request({
url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', url: '/vd/vmsstbprpt/GetKendoList',
method: 'post',
data
});
}
export function fpVmsstbprptGetKendoList(data: any) {
return request({
url: '/fp/vmsstbprpt/GetKendoList',
method: 'post', method: 'post',
data data
}); });
@ -10,7 +17,7 @@ export function vmsstbprptGetKendoList(data: any) {
//过鱼设施 //过鱼设施
export function buildGetKendoListCust(data: any) { export function buildGetKendoListCust(data: any) {
return request({ return request({
url: '/api/wmp-env-server/env/fp/build/GetKendoListCust', url: '/fp/build/GetKendoListCust',
method: 'post', method: 'post',
data data
}); });
@ -18,7 +25,7 @@ export function buildGetKendoListCust(data: any) {
//过鱼总量 //过鱼总量
export function yearGetYearFpStatistics(data: any) { export function yearGetYearFpStatistics(data: any) {
return request({ return request({
url: '/api/wmp-env-server/env/fp/run/qgc/year/GetYearFpStatistics', url: '/fp/run/qgc/year/GetYearFpStatistics',
method: 'get', method: 'get',
params:data params:data
}); });

View File

@ -7,9 +7,9 @@
<a-select v-model:value="formState.dataDimensionVal" placeholder="请选择" style="width: 120px" <a-select v-model:value="formState.dataDimensionVal" placeholder="请选择" style="width: 120px"
show-search :filter-option="filterBaseOption" option-filter-prop="label" show-search :filter-option="filterBaseOption" option-filter-prop="label"
@change="handleBaseChange"> @change="handleBaseChange">
<a-select-option v-for="item in baseList" :key="item.baseid" :value="item.baseid" <a-select-option v-for="item in baseList" :key="item.wbsCode" :value="item.wbsCode"
:label="item.basename"> :label="item.wbsName">
{{ item.basename }} {{ item.wbsName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
@ -115,7 +115,7 @@ dayjs.extend(isSameOrAfter)
// Props // Props
const props = defineProps<{ const props = defineProps<{
datas?: Array<{ baseid: string; basename: string }> // datas?: Array<{ wbsCode: string; wbsName: string }> //
type?: string // type?: string //
modalData?: string // modalData?: string //
dateValue?: string | Dayjs // dateValue?: string | Dayjs //

View File

@ -23,7 +23,7 @@
<!-- 环境质量满足度弹框 --> <!-- 环境质量满足度弹框 -->
<a-modal v-model:open="modalVisible" title="环境质量满足度" width="1536px" :footer="null" centered> <a-modal v-model:open="modalVisible" title="环境质量满足度" width="1536px" :footer="null" centered>
<EnvironmentalQualityTwoLayers :datas="(baseid == 'all' ? jiDiList : stationListForModal)" :type="select.value" <EnvironmentalQualityTwoLayers :datas="(baseid == 'all' ? JidiSelectEventStore.jidiData : stationListForModal)" :type="select.value"
:dateValue="datetimePicker.value" :dataDimensionVal="(clickedBarData?.selectedId || baseid)" :dateValue="datetimePicker.value" :dataDimensionVal="(clickedBarData?.selectedId || baseid)"
:buildType="tabs" :typeOne="fieldOne" :baseid="baseid" /> :buildType="tabs" :typeOne="fieldOne" :baseid="baseid" />
</a-modal> </a-modal>
@ -80,83 +80,6 @@ const datetimePicker = ref({
options: [], options: [],
}); });
const baseid = ref("") const baseid = ref("")
const jiDiList: any = ref([
{
"baseid": "all",
"basename": "当前全部",
"id": "9BFEC848-83EA-AD22-6DE2-10E969476693"
},
{
"baseid": "01",
"basename": "金沙江干流",
"id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA"
},
{
"baseid": "02",
"basename": "雅砻江干流",
"id": "C63D6020-995D-FE97-2F4A-F619A7142C79"
},
{
"baseid": "03",
"basename": "大渡河干流",
"id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3"
},
{
"baseid": "04",
"basename": "乌江干流",
"id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD"
},
{
"baseid": "05",
"basename": "长江上游干流",
"id": "E02C11E9-CEA5-A030-202F-3BFE84465D03"
},
{
"baseid": "10",
"basename": "湘西",
"id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D"
},
{
"baseid": "08",
"basename": "黄河上游干流",
"id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E"
},
{
"baseid": "09",
"basename": "黄河中游干流",
"id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6"
},
{
"baseid": "06",
"basename": "南盘江-红水河",
"id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203"
},
{
"baseid": "12",
"basename": "东北",
"id": "47F8EF06-924E-E161-FCAF-62A66BBF252D"
},
{
"baseid": "07",
"basename": "澜沧江干流",
"id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A"
},
{
"baseid": "13",
"basename": "怒江干流",
"id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4"
},
{
"baseid": "11",
"basename": "闽浙赣",
"id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A"
},
{
"baseid": "other",
"basename": "其他",
"id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC"
}
])
const fieldOne = ref('') const fieldOne = ref('')
// API // API
const parseApiResponse = (items: any[], currentValueForApi: string, lastYearValue: string) => { const parseApiResponse = (items: any[], currentValueForApi: string, lastYearValue: string) => {

View File

@ -76,86 +76,6 @@ const baseid = ref(''); // 当前选中的基地ID
const modalVisible = ref(false); // const modalVisible = ref(false); //
const clickDataInfo = ref<any>(null); // const clickDataInfo = ref<any>(null); //
const stationName = ref(''); // const stationName = ref(''); //
// ==================== () ====================
const jiDiList: any = ref([
{
"baseid": "all",
"basename": "当前全部",
"id": "9BFEC848-83EA-AD22-6DE2-10E969476693"
},
{
"baseid": "01",
"basename": "金沙江干流",
"id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA"
},
{
"baseid": "02",
"basename": "雅砻江干流",
"id": "C63D6020-995D-FE97-2F4A-F619A7142C79"
},
{
"baseid": "03",
"basename": "大渡河干流",
"id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3"
},
{
"baseid": "04",
"basename": "乌江干流",
"id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD"
},
{
"baseid": "05",
"basename": "长江上游干流",
"id": "E02C11E9-CEA5-A030-202F-3BFE84465D03"
},
{
"baseid": "10",
"basename": "湘西",
"id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D"
},
{
"baseid": "08",
"basename": "黄河上游干流",
"id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E"
},
{
"baseid": "09",
"basename": "黄河中游干流",
"id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6"
},
{
"baseid": "06",
"basename": "南盘江-红水河",
"id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203"
},
{
"baseid": "12",
"basename": "东北",
"id": "47F8EF06-924E-E161-FCAF-62A66BBF252D"
},
{
"baseid": "07",
"basename": "澜沧江干流",
"id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A"
},
{
"baseid": "13",
"basename": "怒江干流",
"id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4"
},
{
"baseid": "11",
"basename": "闽浙赣",
"id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A"
},
{
"baseid": "other",
"basename": "其他",
"id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC"
}
])
// ==================== ==================== // ==================== ====================
/** /**
@ -735,8 +655,8 @@ const getselsectData = async () => {
let treeData: any = [] let treeData: any = []
const dataMapNameArr: any = Object.entries(obj).map(([, v]) => v) const dataMapNameArr: any = Object.entries(obj).map(([, v]) => v)
treeData = dataMapNameArr?.sort((a: any, b: any) => { treeData = dataMapNameArr?.sort((a: any, b: any) => {
const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value);
const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value);
return indexA - indexB; return indexA - indexB;
}) })
console.log('treeData', treeData) console.log('treeData', treeData)

View File

@ -5,8 +5,8 @@
<a-form-item label="所属基地" name="dataDimensionVal"> <a-form-item label="所属基地" name="dataDimensionVal">
<a-select v-model:value="formState.dataDimensionVal" placeholder="请选择" style="width: 200px" <a-select v-model:value="formState.dataDimensionVal" placeholder="请选择" style="width: 200px"
@change="handleBaseChange"> @change="handleBaseChange">
<a-select-option v-for="item in baseList" :key="item.baseid" :value="item.baseid"> <a-select-option v-for="item in baseList" :key="item.wbsCode" :value="item.wbsCode">
{{ item.basename }} {{ item.wbsName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
@ -77,7 +77,7 @@ import { useModelStore } from "@/store/modules/model";
const modelStore = useModelStore(); const modelStore = useModelStore();
// Props // Props
const props = defineProps<{ const props = defineProps<{
datas?: Array<{ baseid: string; basename: string }> // datas?: Array<{ wbsCode: string; wbsName: string }> //
BID?: string // ID BID?: string // ID
data?: { name: string } // data?: { name: string } //
res?: { bldstt: string; hydrodtin: string } // res?: { bldstt: string; hydrodtin: string } //

View File

@ -23,7 +23,7 @@
<a-modal v-model:open="modalVisible" title="设施类型及接入情况" width="1536px" :footer="null" @cancel="handleModalClose"> <a-modal v-model:open="modalVisible" title="设施类型及接入情况" width="1536px" :footer="null" @cancel="handleModalClose">
<div class="modal-content"> <div class="modal-content">
<DiwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers ref="twoLayersRef" :datas="jiDiList" :BID="baseid" <DiwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers ref="twoLayersRef" :datas="JidiSelectEventStore.jidiData" :BID="baseid"
:data="selectedItem" :res="res"> :data="selectedItem" :res="res">
</DiwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers> </DiwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers>
</div> </div>
@ -58,83 +58,6 @@ const iconMap: Record<string, string> = {
'4': 'icon-dwsjhQita' '4': 'icon-dwsjhQita'
}; };
const jiDiList: any = ref([
{
"baseid": "all",
"basename": "当前全部",
"id": "9BFEC848-83EA-AD22-6DE2-10E969476693"
},
{
"baseid": "01",
"basename": "金沙江干流",
"id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA"
},
{
"baseid": "02",
"basename": "雅砻江干流",
"id": "C63D6020-995D-FE97-2F4A-F619A7142C79"
},
{
"baseid": "03",
"basename": "大渡河干流",
"id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3"
},
{
"baseid": "04",
"basename": "乌江干流",
"id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD"
},
{
"baseid": "05",
"basename": "长江上游干流",
"id": "E02C11E9-CEA5-A030-202F-3BFE84465D03"
},
{
"baseid": "10",
"basename": "湘西",
"id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D"
},
{
"baseid": "08",
"basename": "黄河上游干流",
"id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E"
},
{
"baseid": "09",
"basename": "黄河中游干流",
"id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6"
},
{
"baseid": "06",
"basename": "南盘江-红水河",
"id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203"
},
{
"baseid": "12",
"basename": "东北",
"id": "47F8EF06-924E-E161-FCAF-62A66BBF252D"
},
{
"baseid": "07",
"basename": "澜沧江干流",
"id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A"
},
{
"baseid": "13",
"basename": "怒江干流",
"id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4"
},
{
"baseid": "11",
"basename": "闽浙赣",
"id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A"
},
{
"baseid": "other",
"basename": "其他",
"id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC"
}
]);
const res = ref({ const res = ref({
hydrodtin: '', hydrodtin: '',
bldstt: '' bldstt: ''

View File

@ -46,7 +46,7 @@
import { ref, onMounted, onUnmounted, computed, watch } from 'vue'; import { ref, onMounted, onUnmounted, computed, watch } from 'vue';
import SidePanelItem from '@/components/SidePanelItem/index.vue'; import SidePanelItem from '@/components/SidePanelItem/index.vue';
import { useJidiSelectEventStore } from "@/store/modules/jidiSelectEvent"; import { useJidiSelectEventStore } from "@/store/modules/jidiSelectEvent";
import { vmsstbprptGetKendoList } from '@/api/gyss'; import { fpVmsstbprptGetKendoList } from '@/api/gyss';
import ArtsDetail from '@/components/carouselIntroduce/ArtsDetail.vue'; import ArtsDetail from '@/components/carouselIntroduce/ArtsDetail.vue';
import { Empty } from 'ant-design-vue'; import { Empty } from 'ant-design-vue';
@ -75,7 +75,7 @@ defineOptions({
const JidiSelectEventStore = useJidiSelectEventStore(); const JidiSelectEventStore = useJidiSelectEventStore();
const baseid = ref('all'); // 'all' const baseid = ref('all'); // 'all'
const baseUrl = import.meta.env.VITE_APP_PREVIEW_URL; const baseUrl = import.meta.env.VITE_APP_ATTACHMENT_URL;
// //
const modalVisible = ref(false); const modalVisible = ref(false);
const currentItem = ref<any>(null); const currentItem = ref<any>(null);
@ -259,7 +259,7 @@ const getCarouselData = async () => {
sort: [{ field: 'rstcdStepSort', dir: 'asc' }] sort: [{ field: 'rstcdStepSort', dir: 'asc' }]
}; };
const res = await vmsstbprptGetKendoList(params); const res = await fpVmsstbprptGetKendoList(params);
const data = res?.data?.data || []; const data = res?.data?.data || [];
if (data.length > 0) { if (data.length > 0) {

View File

@ -55,7 +55,7 @@
:dataDimensionVal="detailModalData.baseid" :dataDimensionVal="detailModalData.baseid"
:rvcd="detailModalData.rvcd" :rvcd="detailModalData.rvcd"
:stcd="detailModalData.stcd" :stcd="detailModalData.stcd"
:jdList="jiDiList" /> :jdList="JidiSelectEventStore.jidiData" />
</div> </div>
</a-modal> </a-modal>
</div> </div>
@ -98,86 +98,6 @@ const showChart = ref(true);
// //
const detailModalVisible = ref(false); const detailModalVisible = ref(false);
const detailModalData = ref<any>(null); const detailModalData = ref<any>(null);
//
const jiDiList: any = ref([
{
"baseid": "all",
"basename": "当前全部",
"id": "9BFEC848-83EA-AD22-6DE2-10E969476693"
},
{
"baseid": "01",
"basename": "金沙江干流",
"id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA"
},
{
"baseid": "02",
"basename": "雅砻江干流",
"id": "C63D6020-995D-FE97-2F4A-F619A7142C79"
},
{
"baseid": "03",
"basename": "大渡河干流",
"id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3"
},
{
"baseid": "04",
"basename": "乌江干流",
"id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD"
},
{
"baseid": "05",
"basename": "长江上游干流",
"id": "E02C11E9-CEA5-A030-202F-3BFE84465D03"
},
{
"baseid": "10",
"basename": "湘西",
"id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D"
},
{
"baseid": "08",
"basename": "黄河上游干流",
"id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E"
},
{
"baseid": "09",
"basename": "黄河中游干流",
"id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6"
},
{
"baseid": "06",
"basename": "南盘江-红水河",
"id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203"
},
{
"baseid": "12",
"basename": "东北",
"id": "47F8EF06-924E-E161-FCAF-62A66BBF252D"
},
{
"baseid": "07",
"basename": "澜沧江干流",
"id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A"
},
{
"baseid": "13",
"basename": "怒江干流",
"id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4"
},
{
"baseid": "11",
"basename": "闽浙赣",
"id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A"
},
{
"baseid": "other",
"basename": "其他",
"id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC"
}
]);
// - // -
const selectValue = ref(''); const selectValue = ref('');
const selectOptions = ref<any[]>([]); const selectOptions = ref<any[]>([]);
@ -445,8 +365,8 @@ const getSelectConfig = async () => {
if (dataOne.length > 0) { if (dataOne.length > 0) {
let dataMapNameMap: any = {} let dataMapNameMap: any = {}
let jiDiListMap: any = {} let jiDiListMap: any = {}
jiDiList.value.forEach((item: any) => { JidiSelectEventStore.jidiData.forEach((item: any) => {
jiDiListMap[item.baseid] = item.basename jiDiListMap[item.wbsCode] = item.wbsName
}) })
dataOne.map((item: any, index: number) => { dataOne.map((item: any, index: number) => {
@ -475,8 +395,8 @@ const getSelectConfig = async () => {
}) })
}) })
dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => { dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => {
const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value);
const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value);
return indexA - indexB; return indexA - indexB;
}) })

View File

@ -19,7 +19,7 @@
<div v-if="modalData" class="modal-content"> <div v-if="modalData" class="modal-content">
<MonthlyAverage <MonthlyAverage
:tm="modalData.date ? moment(modalData.date).format('YYYY-MM') + '-01 00:00:00' : moment().format('YYYY-MM') + '-01 23:59:59'" :tm="modalData.date ? moment(modalData.date).format('YYYY-MM') + '-01 00:00:00' : moment().format('YYYY-MM') + '-01 23:59:59'"
:dataDimensionVal="modalData.baseid" :rvcd='modalData.rvcd' :stcd="modalData.stcd" :jdList="jiDiList" /> :dataDimensionVal="modalData.baseid" :rvcd='modalData.rvcd' :stcd="modalData.stcd" :jdList="JidiSelectEventStore.jidiData" />
</div> </div>
</a-modal> </a-modal>
@ -69,85 +69,6 @@ const stationName = ref('');
// //
const zoomModalVisible = ref(false); const zoomModalVisible = ref(false);
//
const jiDiList: any = ref([
{
"baseid": "all",
"basename": "当前全部",
"id": "9BFEC848-83EA-AD22-6DE2-10E969476693"
},
{
"baseid": "01",
"basename": "金沙江干流",
"id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA"
},
{
"baseid": "02",
"basename": "雅砻江干流",
"id": "C63D6020-995D-FE97-2F4A-F619A7142C79"
},
{
"baseid": "03",
"basename": "大渡河干流",
"id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3"
},
{
"baseid": "04",
"basename": "乌江干流",
"id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD"
},
{
"baseid": "05",
"basename": "长江上游干流",
"id": "E02C11E9-CEA5-A030-202F-3BFE84465D03"
},
{
"baseid": "10",
"basename": "湘西",
"id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D"
},
{
"baseid": "08",
"basename": "黄河上游干流",
"id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E"
},
{
"baseid": "09",
"basename": "黄河中游干流",
"id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6"
},
{
"baseid": "06",
"basename": "南盘江-红水河",
"id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203"
},
{
"baseid": "12",
"basename": "东北",
"id": "47F8EF06-924E-E161-FCAF-62A66BBF252D"
},
{
"baseid": "07",
"basename": "澜沧江干流",
"id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A"
},
{
"baseid": "13",
"basename": "怒江干流",
"id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4"
},
{
"baseid": "11",
"basename": "闽浙赣",
"id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A"
},
{
"baseid": "other",
"basename": "其他",
"id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC"
}
]);
// //
const select = ref({ const select = ref({
show: true, show: true,
@ -238,8 +159,8 @@ const getSelectConfig = async () => {
if (dataOne.length > 0) { if (dataOne.length > 0) {
let dataMapNameMap: any = {} let dataMapNameMap: any = {}
let jiDiListMap: any = {} let jiDiListMap: any = {}
jiDiList.value.forEach((item: any) => { JidiSelectEventStore.jidiData.forEach((item: any) => {
jiDiListMap[item.baseid] = item.basename jiDiListMap[item.wbsCode] = item.wbsName
}) })
dataOne.map((item: any, index: number) => { dataOne.map((item: any, index: number) => {
@ -268,8 +189,8 @@ const getSelectConfig = async () => {
}) })
}) })
dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => { dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => {
const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value);
const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value);
return indexA - indexB; return indexA - indexB;
}) })
select.value.options = filterSelectOptions(dataMapNameArr) select.value.options = filterSelectOptions(dataMapNameArr)

View File

@ -5,8 +5,8 @@
<a-form-item label="基地名称" name="dataDimensionVal"> <a-form-item label="基地名称" name="dataDimensionVal">
<a-select v-model:value="formValue.dataDimensionVal" placeholder="请选择" style="width: 200px" <a-select v-model:value="formValue.dataDimensionVal" placeholder="请选择" style="width: 200px"
@change="handleBaseChange"> @change="handleBaseChange">
<a-select-option v-for="item in jdList" :key="item.baseid" :value="item.baseid"> <a-select-option v-for="item in jdList" :key="item.wbsCode" :value="item.wbsCode">
{{ item.basename }} {{ item.wbsName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>

View File

@ -69,7 +69,8 @@ import { ref, computed, watch, onMounted, nextTick } from 'vue';
import { msstbprptGetKendoList, fhGetKendoListCust } from '@/api/qxd'; import { msstbprptGetKendoList, fhGetKendoListCust } from '@/api/qxd';
import BasicTable from '@/components/BasicTable/index.vue'; import BasicTable from '@/components/BasicTable/index.vue';
import { useModelStore } from '@/store/modules/model'; import { useModelStore } from '@/store/modules/model';
import { useJidiSelectEventStore } from "@/store/modules/jidiSelectEvent";
const JidiSelectEventStore = useJidiSelectEventStore();
// ==================== Props ==================== // ==================== Props ====================
const props = defineProps<{ const props = defineProps<{
baseId?: string; baseId?: string;
@ -89,68 +90,7 @@ const tableRef = ref();
const stationOptions: any = ref([]); const stationOptions: any = ref([]);
// ==================== () ==================== // ==================== () ====================
const jiDiList: any = ref([ const jiDiList: any = ref([]);
{
value: 'all',
label: '当前全部'
},
{
value: '01',
label: '金沙江干流'
},
{
value: '02',
label: '雅砻江干流'
},
{
value: '03',
label: '大渡河干流'
},
{
value: '04',
label: '乌江干流'
},
{
value: '05',
label: '长江上游干流'
},
{
value: '10',
label: '湘西'
},
{
value: '08',
label: '黄河上游干流'
},
{
value: '09',
label: '黄河中游干流'
},
{
value: '06',
label: '南盘江-红水河'
},
{
value: '12',
label: '东北'
},
{
value: '07',
label: '澜沧江干流'
},
{
value: '13',
label: '怒江干流'
},
{
value: '11',
label: '闽浙赣'
},
{
value: 'other',
label: '其他'
}
]);
// //
const columns = [ const columns = [
{ {
@ -439,6 +379,12 @@ const handleViewDetail = (record: any, type: any) => {
onMounted(() => { onMounted(() => {
getselectTwo(); getselectTwo();
handleSearch(); handleSearch();
JidiSelectEventStore.jidiData.forEach(element => {
jiDiList.value.push({
label: element.wbsName,
value: element.wbsCode
})
});
}); });
</script> </script>

View File

@ -49,68 +49,7 @@ defineOptions({
// ==================== ==================== // ==================== ====================
const JidiSelectEventStore = useJidiSelectEventStore(); const JidiSelectEventStore = useJidiSelectEventStore();
// ==================== () ==================== // ==================== () ====================
const jiDiList: any = ref([ const jiDiList: any = ref([]);
{
value: 'all',
label: '当前全部'
},
{
value: '01',
label: '金沙江干流'
},
{
value: '02',
label: '雅砻江干流'
},
{
value: '03',
label: '大渡河干流'
},
{
value: '04',
label: '乌江干流'
},
{
value: '05',
label: '长江上游干流'
},
{
value: '10',
label: '湘西'
},
{
value: '08',
label: '黄河上游干流'
},
{
value: '09',
label: '黄河中游干流'
},
{
value: '06',
label: '南盘江-红水河'
},
{
value: '12',
label: '东北'
},
{
value: '07',
label: '澜沧江干流'
},
{
value: '13',
label: '怒江干流'
},
{
value: '11',
label: '闽浙赣'
},
{
value: 'other',
label: '其他'
}
]);
const select = ref({ const select = ref({
show: true, show: true,
value: 'all', value: 'all',
@ -420,6 +359,12 @@ const handlePanelChange1 = async data => {
// //
onMounted(() => { onMounted(() => {
// //
JidiSelectEventStore.jidiData.forEach(element => {
jiDiList.value.push({
label: element.wbsName,
value: element.wbsCode
})
});
}); });
// //

View File

@ -34,83 +34,7 @@ const showemit = ref(true)
// //
const modalVisible = ref(false) const modalVisible = ref(false)
const currentData = ref<any>({}) const currentData = ref<any>({})
const jiDiList: any = ref([
{
"baseid": "all",
"basename": "当前全部",
"id": "9BFEC848-83EA-AD22-6DE2-10E969476693"
},
{
"baseid": "01",
"basename": "金沙江干流",
"id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA"
},
{
"baseid": "02",
"basename": "雅砻江干流",
"id": "C63D6020-995D-FE97-2F4A-F619A7142C79"
},
{
"baseid": "03",
"basename": "大渡河干流",
"id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3"
},
{
"baseid": "04",
"basename": "乌江干流",
"id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD"
},
{
"baseid": "05",
"basename": "长江上游干流",
"id": "E02C11E9-CEA5-A030-202F-3BFE84465D03"
},
{
"baseid": "10",
"basename": "湘西",
"id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D"
},
{
"baseid": "08",
"basename": "黄河上游干流",
"id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E"
},
{
"baseid": "09",
"basename": "黄河中游干流",
"id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6"
},
{
"baseid": "06",
"basename": "南盘江-红水河",
"id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203"
},
{
"baseid": "12",
"basename": "东北",
"id": "47F8EF06-924E-E161-FCAF-62A66BBF252D"
},
{
"baseid": "07",
"basename": "澜沧江干流",
"id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A"
},
{
"baseid": "13",
"basename": "怒江干流",
"id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4"
},
{
"baseid": "11",
"basename": "闽浙赣",
"id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A"
},
{
"baseid": "other",
"basename": "其他",
"id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC"
}
]);
const chartRef = ref<HTMLElement | null>(null) const chartRef = ref<HTMLElement | null>(null)
let chartInstance: echarts.ECharts | null = null let chartInstance: echarts.ECharts | null = null
@ -258,10 +182,9 @@ const getselectData = async () => {
} }
}) })
// jiDiList
dataMapNameArr.sort((a, b) => { dataMapNameArr.sort((a, b) => {
const indexA = jiDiList.value.findIndex((item: any) => item.baseid === a.value) const indexA = JidiSelectEventStore.jidiData.findIndex((item: any) => item.wbsCode === a.value)
const indexB = jiDiList.value.findIndex((item: any) => item.baseid === b.value) const indexB = JidiSelectEventStore.jidiData.findIndex((item: any) => item.wbsCode === b.value)
return indexA - indexB return indexA - indexB
}) })

View File

@ -11,7 +11,7 @@ import { message } from 'ant-design-vue'
import { useModelStore } from '@/store/modules/model' import { useModelStore } from '@/store/modules/model'
import { handleTabs } from '@/components/MapModal/setting.config' import { handleTabs } from '@/components/MapModal/setting.config'
import { getKendoList, getKendoListCust, getIntroduce } from '@/api/shuidiankaifa' import { getKendoList, getKendoListCust, getIntroduce } from '@/api/shuidiankaifa'
import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
// ==================== ==================== // ==================== ====================
const USE_MOCK_DATA = true // 使 false const USE_MOCK_DATA = true // 使 false
@ -62,7 +62,7 @@ interface ModalData {
// modelStore MapModal // modelStore MapModal
const modelStore = useModelStore() const modelStore = useModelStore()
const JidiSelectEventStore = useJidiSelectEventStore();
// //
const qid = ref<string>('') const qid = ref<string>('')
const jiDiList = ref<any[]>([]) const jiDiList = ref<any[]>([])
@ -1190,17 +1190,12 @@ watch(
*/ */
onMounted(() => { onMounted(() => {
// //
jiDiList.value = [ JidiSelectEventStore.jidiData.forEach(element => {
{ baseid: 'all', basename: '全部基地' }, jiDiList.value.push({
{ baseid: 'cj', basename: '长江流域' }, label: element.wbsName,
{ baseid: 'hh', basename: '黄河流域' }, value: element.wbsCode
{ baseid: 'zj', basename: '珠江流域' }, })
{ baseid: 'hh2', basename: '淮河流域' }, });
{ baseid: 'hj', basename: '海河流域' },
{ baseid: 'sj', basename: '松花江流域' },
{ baseid: 'lj', basename: '辽河流域' },
{ baseid: 'other', basename: '其他' }
]
// "" // ""
if (!qid.value) { if (!qid.value) {

View File

@ -53,83 +53,6 @@ const prompts = computed(() => ({
show: true, show: true,
value: `注:最新数据时间为${dataOne.value || getCurrentHourTime()}`, value: `注:最新数据时间为${dataOne.value || getCurrentHourTime()}`,
})); }));
const jiDiList: any = ref([
{
"baseid": "all",
"basename": "当前全部",
"id": "9BFEC848-83EA-AD22-6DE2-10E969476693"
},
{
"baseid": "01",
"basename": "金沙江干流",
"id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA"
},
{
"baseid": "02",
"basename": "雅砻江干流",
"id": "C63D6020-995D-FE97-2F4A-F619A7142C79"
},
{
"baseid": "03",
"basename": "大渡河干流",
"id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3"
},
{
"baseid": "04",
"basename": "乌江干流",
"id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD"
},
{
"baseid": "05",
"basename": "长江上游干流",
"id": "E02C11E9-CEA5-A030-202F-3BFE84465D03"
},
{
"baseid": "10",
"basename": "湘西",
"id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D"
},
{
"baseid": "08",
"basename": "黄河上游干流",
"id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E"
},
{
"baseid": "09",
"basename": "黄河中游干流",
"id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6"
},
{
"baseid": "06",
"basename": "南盘江-红水河",
"id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203"
},
{
"baseid": "12",
"basename": "东北",
"id": "47F8EF06-924E-E161-FCAF-62A66BBF252D"
},
{
"baseid": "07",
"basename": "澜沧江干流",
"id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A"
},
{
"baseid": "13",
"basename": "怒江干流",
"id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4"
},
{
"baseid": "11",
"basename": "闽浙赣",
"id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A"
},
{
"baseid": "other",
"basename": "其他",
"id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC"
}
])
const showemit = ref(false) const showemit = ref(false)
const loading = ref(false) const loading = ref(false)
// const selectOptions: any = ref([]) // const selectOptions: any = ref([])
@ -462,8 +385,8 @@ const getSelectConfig = async () => {
if (dataOne.length > 0) { if (dataOne.length > 0) {
let dataMapNameMap: any = {} let dataMapNameMap: any = {}
let jiDiListMap: any = {} let jiDiListMap: any = {}
jiDiList.value.forEach((item: any) => { JidiSelectEventStore.jidiData.forEach((item: any) => {
jiDiListMap[item.baseid] = item.basename jiDiListMap[item.wbsCode] = item.wbsName
}) })
dataOne.map((item: any, index: number) => { dataOne.map((item: any, index: number) => {
@ -492,8 +415,8 @@ const getSelectConfig = async () => {
}) })
}) })
dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => { dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => {
const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value);
const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value);
return indexA - indexB; return indexA - indexB;
}) })
select.value.options = filterSelectOptions(dataMapNameArr) select.value.options = filterSelectOptions(dataMapNameArr)