diff --git a/frontend/.env.development b/frontend/.env.development index 95ce05a0..6d37ed54 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -7,7 +7,7 @@ VITE_APP_TITLE = '水电水利建设项目全过程环境管理信息平台' VITE_APP_PORT = 3000 VITE_APP_BASE_API = '/dev-api' # 本地环境 -VITE_APP_BASE_URL = 'http://localhost:8093' +# VITE_APP_BASE_URL = 'http://10.84.121.122:8093' # 测试环境 # VITE_APP_BASE_URL = 'http://172.16.21.142:8093' # VITE_APP_BASE_URL = 'http://172.16.21.142:8096' diff --git a/frontend/src/api/home/index.ts b/frontend/src/api/home/index.ts index 0ead2e2c..6c3732c4 100644 --- a/frontend/src/api/home/index.ts +++ b/frontend/src/api/home/index.ts @@ -8,3 +8,102 @@ export function getBaseWbsb(data: any) { data: data }); } + +// 水电开发及环境监测 - 获取列表数据 +export function getVmsstbprptKendoList(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', + method: 'post', + data: data + }); +} + +// 环保设施建设情况 +export function environmentalProtectionConstruction(data: any) { + return request({ + url: '/api/wmp-env-server/env/operat/GetKendoListCust', + method: 'post', + data: data + }); +} + +// 环保设施弹框表格 +export function envOpdGetKendoListCust(data: any) { + return request({ + url: '/api/wmp-env-server/env/oped/GetKendoListCust', + method: 'post', + data: data + }); +} + +// 获取基地列表 +export function getBaseList(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/wbsb/GetKendoList', + method: 'post', + data: data + }); +} + +// 获取设施介绍列表 +export function getMsstbprptKendoList(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/msstbprpt/GetKendoList', + method: 'post', + data: data + }); +} + +// 环保自动监测工作开展情况 +export function baseEvnmAutoMonitorGetKendoListCust(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/evnmAutoMonitor/GetKendoListCust', + method: 'post', + data: data + }); +} + +// 环保自动监测弹窗列表 +export function vmsstbprptGetKendoList(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', + method: 'post', + data: data + }); +} + +// 获取基本信息 +export function baseMsstbprptGetKendoList(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/msstbprpt/GetKendoList', + method: 'post', + data: data + }); +} + +// 降水量实时数据 +export function getBaseStbprpDataPPTNR(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/stbprpData/GetKendoListCust?tbCode=PPTN_R', + method: 'post', + data: data + }); +} + +// 气温气压实时数据 +export function getBaseStbprpDataTMPR(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/stbprpData/GetKendoListCust?tbCode=TMP_R', + method: 'post', + data: data + }); +} + +// 风速风向实时数据 +export function getBaseStbprpDataWNDR(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/stbprpData/GetKendoListCust?tbCode=WND_R', + method: 'post', + data: data + }); +} diff --git a/frontend/src/api/mapModal/index.ts b/frontend/src/api/mapModal/index.ts index 31323d1b..d3b701ed 100644 --- a/frontend/src/api/mapModal/index.ts +++ b/frontend/src/api/mapModal/index.ts @@ -547,7 +547,7 @@ export function getFlowDischargeYear(data: any) { } export function getFlowDischargeList(code: string, data: any) { return request({ - url: `/apo/dec-lygk-base-server/base/stbprpData/GetKendoListCust?tbCode=${code}`, + url: `/api/dec-lygk-base-server/base/stbprpData/GetKendoListCust?tbCode=${code}`, method: 'post', data }); diff --git a/frontend/src/api/stdc/index.ts b/frontend/src/api/stdc/index.ts index ce9c8d6e..db86bca5 100644 --- a/frontend/src/api/stdc/index.ts +++ b/frontend/src/api/stdc/index.ts @@ -3,16 +3,16 @@ import request from '@/utils/request'; //水生生态调查情况-下拉选择框 export function wbsbGetKendoList(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/wbsb/GetKendoList', + url: '/eq/wbsb/GetKendoList', method: 'post', data }); } -// 水生生态调查情况-获取默认年份 +// 水生生态调查情况-获取默认年份 export function getDftYear(data: any) { return request({ - url: '/api/wmp-env-server/env/we/fisht/year/qgc/GetKendoListCust', + url: '/wte/we/fisht/year/qgc/GetKendoListCust', method: 'post', data }); @@ -21,7 +21,7 @@ export function getDftYear(data: any) { // 水生生态调查情况-获取统计数据 export function getWeFisht(data: any) { return request({ - url: '/api/wmp-env-server/env/we/fisht/statics/GetKendoListCust', + url: '/wte/we/fisht/statics/GetKendoListCust', method: 'post', data }); @@ -30,7 +30,7 @@ export function getWeFisht(data: any) { // 水生生态调查概况-表格数据接口 export function getWeStaticsSecond(data: any) { return request({ - url: '/api/wmp-env-server/env/we/fisht/statics/getWeStaticsSecond', + url: '/wte/we/fisht/statics/getWeStaticsSecond', method: 'post', data }); @@ -39,7 +39,7 @@ export function getWeStaticsSecond(data: any) { // 沿程鱼类变化-图表数据接口 export function fishChanges2(data: any) { return request({ - url: '/api/wmp-env-server/env/we/fisht/stat/GetKendoListCust', + url: '/wte/we/fisht/stat/GetKendoListCust', method: 'post', data }); @@ -48,7 +48,7 @@ export function fishChanges2(data: any) { // 沿程鱼类变化-详情表格接口 export function fishDetail(data: any) { return request({ - url: '/api/wmp-env-server/env/we/fisht/detail/GetKendoListCust', + url: '/wte/we/fisht/detail/GetKendoListCust', method: 'post', data }); @@ -57,7 +57,7 @@ export function fishDetail(data: any) { // 沿程鱼类变化-Tab数量统计接口 export function getTabNum(data: any) { return request({ - url: '/api/wmp-env-server/env/we/fisht/statTab/GetKendoListCust', + url: '/wte/we/fisht/statTab/GetKendoListCust', method: 'post', data }); @@ -66,11 +66,11 @@ export function getTabNum(data: any) { // 沿程鱼类变化-获取断面列表 export function getStcdList(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/vmsstbprpt/noWqDtinType0Auth/GetKendoList', + url: '/eq/base/vmsstbprpt/GetKendoList', method: 'post', data: { filter: data, - orders: JSON.stringify({ siteStepSort: 'asc' }) + orders: { siteStepSort: 'asc' } } }); } @@ -78,7 +78,16 @@ export function getStcdList(data: any) { // 沿程鱼类变化-基地模式详情表格接口 export function fishQgcDetail(data: any) { return request({ - url: '/api/wmp-env-server/env/we/fisht/qgcDetail/GetKendoListCust', + url: '/wte/we/fisht/qgcDetail/GetKendoListCust', + method: 'post', + data + }); +} + +// 水生生态调查-鱼类列表统计 +export function getFishListStat(data: any) { + return request({ + url: '/wte/we/fishList/stat/qgc/GetKendoListCust', method: 'post', data }); @@ -87,7 +96,7 @@ export function fishQgcDetail(data: any) { // 陆生生态监测情况-获取统计数据 export function getEvnmAutoMonitor(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/evnmAutoMonitor/GetKendoListCust', + url: '/wte/base/evnmAutoMonitor/GetKendoListCust', method: 'post', data }); @@ -96,7 +105,7 @@ export function getEvnmAutoMonitor(data: any) { // 陆生生态监测-红外相机信息表格 export function getVmsstbprptList(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', + url: '/wte/vmsstbprpt/GetKendoList', method: 'post', data }); @@ -105,7 +114,7 @@ export function getVmsstbprptList(data: any) { // 陆生生态监测-重点陆生动物表格 export function getTetSpecList(data: any) { return request({ - url: '/api/wmp-env-server/te/tet/spec/GetKendoListCust', + url: '/wte/te/tet/spec/GetKendoListCust', method: 'post', data }); @@ -114,7 +123,7 @@ export function getTetSpecList(data: any) { // 野生动物监测-获取运行数据 export function getWvaData(data: any) { return request({ - url: '/api/wmp-env-server/env/wva/GetKendoListCust', + url: '/wte/wva/GetKendoListCust', method: 'post', data }); @@ -123,7 +132,7 @@ export function getWvaData(data: any) { // 野生动物监测-获取默认数据 export function getWvaDftData(data: any) { return request({ - url: '/api/wmp-env-server/env/wva/default/GetKendoListCust', + url: '/wte/wva/default/GetKendoListCust', method: 'post', data }); @@ -132,7 +141,25 @@ export function getWvaDftData(data: any) { // 野生动物监测-获取默认年份列表 export function getWvaDftTm(data: any) { return request({ - url: '/api/wmp-env-server/env/wva/year/GetKendoListCust', + url: '/wte/wva/year/GetKendoListCust', + method: 'post', + data + }); +} + +// 水生生态调查对比-获取断面和批次列表 +export function getFishtKendoList(data: any) { + return request({ + url: '/wte/we/fisht/GetKendoListCust', + method: 'post', + data + }); +} + +// 水生生态调查对比-获取对比柱状图数据 +export function getCompareBar(data: any) { + return request({ + url: '/wte/we/compareBar/GetKendoListCust', method: 'post', data }); diff --git a/frontend/src/api/stll/index.ts b/frontend/src/api/stll/index.ts index 58db464a..bfa8ced7 100644 --- a/frontend/src/api/stll/index.ts +++ b/frontend/src/api/stll/index.ts @@ -39,6 +39,13 @@ export function vmsstbprptGetKendoList(queryParams: any) { data: queryParams }); } +export function vmsstbprptGetKendoList1(queryParams: any) { + return request({ + url: '/eq/vmsstbprpt/GetKendoList', + method: 'post', + data: queryParams + }); +} //生态流量达标情况 export function eqqecRateCount(queryParams: any) { return request({ diff --git a/frontend/src/api/yldc/index.ts b/frontend/src/api/yldc/index.ts index 4643b2f1..3282a2ac 100644 --- a/frontend/src/api/yldc/index.ts +++ b/frontend/src/api/yldc/index.ts @@ -15,6 +15,13 @@ export function msstbprptGetKendoList(data: any) { data }); } +export function VDmsstbprptGetKendoList(data: any) { + return request({ + url: '/vd/msstbprpt/GetKendoList', + method: 'post', + data + }); +} //获取鱼类介绍 export function fishDicGetKendoList(data: any) { return request({ diff --git a/frontend/src/api/zngj/index.ts b/frontend/src/api/zngj/index.ts new file mode 100644 index 00000000..c7b1bc6b --- /dev/null +++ b/frontend/src/api/zngj/index.ts @@ -0,0 +1,91 @@ +import request from '@/utils/request'; + +// AI识别大坝环境-获取统计数据(Tab数量) +export function getAisbdbyxList(data: any) { + return request({ + url: '/api/wmp-env-server/env/ai/com/qgcDmRun/GetKendoListCust', + method: 'post', + data + }); +} + +// AI识别大坝环境-获取饼图+表格数据 +export function getAiChartTable(data: any) { + return request({ + url: '/api/wmp-env-server/env/ai/com/GetKendoListCust', + method: 'post', + data + }); +} + +// AI识别大坝环境-获取电站列表 +export function getAiRstcd(data: any) { + return request({ + url: '/api/wmp-env-server/env/ai/com/qgc/aiRstcd/GetKendoListCust', + method: 'post', + data + }); +} + +// AI识别过鱼设施运行-获取统计数据 +export function getAiGyssList(data: any) { + return request({ + url: '/api/wmp-env-server/env/ai/com/qgcProtect/GetKendoListCust', + method: 'post', + data + }); +} + +// 生态流量低于限值告警-获取统计数据 +export function getStllGaojingList(data: any) { + return request({ + url: '/api/wmp-env-server/env/warn/stcd/eng/GetKendoListCust', + method: 'post', + data + }); +} + +// 生态流量低于限值告警-获取表格详情数据 +export function getStllGaojingDetail(data: any) { + return request({ + url: '/api/wmp-env-server/env/warn/stcd/GetKendoListCust', + method: 'post', + data + }); +} + +// 水质监测数据告警-获取统计数据 +export function getShuizhiGaojingList(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/msstbprpt/GetKendoList', + method: 'post', + data + }); +} + +// AI识别大坝环境-获取漂浮物/清漂日历数据 +export function getAiPfwRecord(data: any) { + return request({ + url: '/api/wmp-env-server/env/ai/com/qgc/aiPfwRecord/GetKendoListCust', + method: 'post', + data + }); +} + +// AI识别大坝环境-获取叠梁门日历数据 +export function getAiRecord(data: any) { + return request({ + url: '/api/wmp-env-server/env/ai/com/qgc/aiRecord/GetKendoListCust', + method: 'post', + data + }); +} + +// AI识别大坝环境-获取日历详情视频数据 +export function getAiFile(data: any) { + return request({ + url: '/api/wmp-env-server/env/ai/com/qgc/aiFile/GetKendoListCust', + method: 'post', + data + }); +} diff --git a/frontend/src/assets/svg/diwenshuijianhuan.svg b/frontend/src/assets/svg/diwenshuijianhuan.svg new file mode 100644 index 00000000..334378b6 --- /dev/null +++ b/frontend/src/assets/svg/diwenshuijianhuan.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/frontend/src/assets/svg/guojiashuiwenzhan.svg b/frontend/src/assets/svg/guojiashuiwenzhan.svg new file mode 100644 index 00000000..ac788c8e --- /dev/null +++ b/frontend/src/assets/svg/guojiashuiwenzhan.svg @@ -0,0 +1,16 @@ + + + guojiashuiwenzhan + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/src/assets/svg/guojiashuizhizhan.svg b/frontend/src/assets/svg/guojiashuizhizhan.svg new file mode 100644 index 00000000..8244b65f --- /dev/null +++ b/frontend/src/assets/svg/guojiashuizhizhan.svg @@ -0,0 +1,13 @@ + + + guojiashuizhizhan + + + + + + + + + + \ No newline at end of file diff --git a/frontend/src/assets/svg/liuliangjiancezhan.svg b/frontend/src/assets/svg/liuliangjiancezhan.svg new file mode 100644 index 00000000..8575ff7b --- /dev/null +++ b/frontend/src/assets/svg/liuliangjiancezhan.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/frontend/src/assets/svg/qixiangzhan.svg b/frontend/src/assets/svg/qixiangzhan.svg new file mode 100644 index 00000000..35374b96 --- /dev/null +++ b/frontend/src/assets/svg/qixiangzhan.svg @@ -0,0 +1,16 @@ + + + qixiangzhan + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/src/assets/svg/qixidi.svg b/frontend/src/assets/svg/qixidi.svg new file mode 100644 index 00000000..ea3b599c --- /dev/null +++ b/frontend/src/assets/svg/qixidi.svg @@ -0,0 +1,9 @@ + + + qixidi + + + + + + \ No newline at end of file diff --git a/frontend/src/assets/svg/shipinjiankongshebei.svg b/frontend/src/assets/svg/shipinjiankongshebei.svg new file mode 100644 index 00000000..74cbd7ce --- /dev/null +++ b/frontend/src/assets/svg/shipinjiankongshebei.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/frontend/src/assets/svg/shuizhijiancezhan.svg b/frontend/src/assets/svg/shuizhijiancezhan.svg new file mode 100644 index 00000000..0925a2c4 --- /dev/null +++ b/frontend/src/assets/svg/shuizhijiancezhan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/svg/zengzhizhanshuizhizhan.svg b/frontend/src/assets/svg/zengzhizhanshuizhizhan.svg new file mode 100644 index 00000000..7632b476 --- /dev/null +++ b/frontend/src/assets/svg/zengzhizhanshuizhizhan.svg @@ -0,0 +1,9 @@ + + + zengzhizhanshuizhizhan + + + + + + \ No newline at end of file diff --git a/frontend/src/assets/svg/zijianshuiwenzhan.svg b/frontend/src/assets/svg/zijianshuiwenzhan.svg new file mode 100644 index 00000000..9114c677 --- /dev/null +++ b/frontend/src/assets/svg/zijianshuiwenzhan.svg @@ -0,0 +1,16 @@ + + + zijianshuiwenzhan + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/src/components/MapModal/column.config.ts b/frontend/src/components/MapModal/column.config.ts index e4e1b39d..f40cef4d 100644 --- a/frontend/src/components/MapModal/column.config.ts +++ b/frontend/src/components/MapModal/column.config.ts @@ -3288,6 +3288,45 @@ const DwSixPointColumns: Array = [ url: '' } ]; +//DW +const DwPointColumnsyuan: Array = [ + { + name: '基本属性', + visible: false, + ruleTips: '', + type: '', + url: '' + }, + { + name: '设施名称', + filed: 'stnm', + visible: true, + type: 'input', + url: '' + }, + + { + name: '站址', + filed: 'stlc', + visible: true, + type: 'select', + url: '' + }, + { + name: '所属流域', + filed: 'hbrvcdName', + visible: true, + type: 'select', + url: '' + }, + { + name: '所属电站', + filed: 'ennm', + visible: true, + type: 'select', + url: '' + }, +]; //夹岩双层取水 const DwOnePointColumns: Array = [ { @@ -4145,8 +4184,7 @@ const EQPointColumns7: Array = [ visible: true, type: 'select', url: '' - }, - + } ]; //阶段属性 const basicFilterColumns: Array = [ @@ -4831,6 +4869,58 @@ const tableColumns5: Array = [ setting: {} } ]; +//气象监测 +const MMColumns: Array = [ + { + name: '基本属性', + visible: false, + ruleTips: '', + type: '', + url: '' + }, { + name: '测站名称', + filed: 'stnm', + visible: true, + type: 'input', + url: '' + }, + { + name: '测站类型', + filed: 'sttpName', + visible: true, + type: 'select', + url: '' + }, + { + name: '站址', + filed: 'addvcdName', + visible: true, + type: 'input', + url: '' + }, + { + name: '所属流域', + filed: 'hbrvcdName', + visible: true, + type: 'select', + url: '' + }, + { + name: '所在水系', + filed: 'addvcdName', + visible: true, + type: 'input', + url: '' + }, + { + name: '建成日期', + filed: 'jcdt', + visible: true, + type: 'date', + format: 'YYYY-MM-DD', + url: '' + }, +]; //生态流量 const EcologicalFlowColumns: Array = []; @@ -4873,6 +4963,7 @@ export { DwFivePointColumns, DwSixPointColumns, DwOnePointColumns, + DwPointColumnsyuan, EQPointColumns2, EQPointColumns5, EQPointColumns3, @@ -4886,5 +4977,6 @@ export { tableColumns2, tableColumns3, tableColumns4, - tableColumns5 + tableColumns5, + MMColumns }; diff --git a/frontend/src/components/MapModal/components/BasicInfo.vue b/frontend/src/components/MapModal/components/BasicInfo.vue index fcdaa8ef..c66884fa 100644 --- a/frontend/src/components/MapModal/components/BasicInfo.vue +++ b/frontend/src/components/MapModal/components/BasicInfo.vue @@ -142,6 +142,8 @@ import { DwFivePointColumns, DwSixPointColumns, DwOnePointColumns, + DwPointColumnsyuan, + MMColumns, StinfoAiVidoPointColumns } from '../column.config'; import { useModelStore } from '@/store/modules/model'; @@ -318,6 +320,14 @@ const columnsConfig = ref([ { type: 'ZQ', columns: FhZQPointColumns + }, + { + type: 'DW', + columns: DwPointColumnsyuan + }, + { + type:'MM', + columns:MMColumns } //DW_1 diff --git a/frontend/src/components/MapModal/setting.config.ts b/frontend/src/components/MapModal/setting.config.ts index aeea96a7..a8231528 100644 --- a/frontend/src/components/MapModal/setting.config.ts +++ b/frontend/src/components/MapModal/setting.config.ts @@ -199,14 +199,14 @@ const ENGEQTabs: Array = [ ].filter(Boolean); // // 水电站生态流量 - 江局单独看 √ -// const ENGEQTabsJuangJu: Array = [ -// { -// name: '生态流量', -// key: 'EcologicalFlow', -// type: 'EcologicalFlow' -// }, - -// ].filter(Boolean) +const ENGEQTabsJuangJu: Array = [ + { + name: '生态流量', + key: 'EcologicalFlow', + type: 'EcologicalFlow', + default: true + } +].filter(Boolean); // //生态流量泄放设施 √ const EQTabs: Array = [ { @@ -310,9 +310,8 @@ const FPTabs1: Array = [ name: '基础信息', key: 'basicInfo', type: 'basic', - default: true, // 默认显示 - url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo', - + default: true, // 默认显示 + url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo' }, { name: '实时视频', @@ -956,15 +955,23 @@ const CommonTabs: any = [ } ]; -// // 气象站 -// const WeatherTabs: any = [ -// { -// name: '基础信息', -// key: 'basicInfo', -// type: 'basic', -// url: '/bbi/siteBipc/getSiteBasicInfo' -// } -// ] +// 气象站 +const WeatherTabs: any = [ + { + name: '基础信息', + key: 'basicInfo', + type: 'basic', + url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo', + default: true // 默认显示 + }, + { + name: '监测数据', + key: '', + type: '', + url: '' + }, + +] // const WaterQualityMonitoring: any = [ // { @@ -1033,6 +1040,8 @@ const handleTabs = (modaldata: any) => { const sttp = modaldata?.sttp ? modaldata?.sttp.toUpperCase() : ''; console.log('sttp', sttp); switch (sttp) { + case 'ENGJJ': + return ENGEQTabsJuangJu; case 'ENG': if (modaldata?.eqtp == 'QEC') { return ENGEQTabs; @@ -1223,8 +1232,8 @@ const handleTabs = (modaldata: any) => { // } // case 'WE': // return WETabs - // case 'MM': - // return WeatherTabs + case 'MM': + return WeatherTabs // case 'WARN': // return WaterQualityMonitoring // case 'AI': diff --git a/frontend/src/components/SidePanelItem/index.vue b/frontend/src/components/SidePanelItem/index.vue index abbfc6d5..e8dd8708 100644 --- a/frontend/src/components/SidePanelItem/index.vue +++ b/frontend/src/components/SidePanelItem/index.vue @@ -47,7 +47,6 @@
-
@@ -78,7 +77,7 @@ >
-
+
@@ -190,6 +189,7 @@ interface SelectConfig { value?: string | undefined; options?: SelectProps['options']; width?: string; + minWidth?: string; } // 定义组件名(便于调试和递归) @@ -248,7 +248,8 @@ const props = defineProps({ show: false, value: undefined, options: [], - width: '' + width: '', + minWidth: '' }) }, moreSelect: { @@ -661,7 +662,7 @@ const handleTreeSelect = (selectedKeys: string | string[], info: any) => { } moreSelectValue.value = selectedValue; - // + // // 保存选中节点的额外属性(如 lgtd、lttd 等) if (info && typeof info === 'object') { selectedNodeExtra.value = { @@ -690,7 +691,6 @@ const handleTreeExpand = (keys: string[]) => { // 下拉选择框事件处理 const handleChange = (value: string) => { - // Handle change }; diff --git a/frontend/src/components/developStatusChart/index.vue b/frontend/src/components/developStatusChart/index.vue index 5b0fd9fb..235a8a25 100644 --- a/frontend/src/components/developStatusChart/index.vue +++ b/frontend/src/components/developStatusChart/index.vue @@ -1,49 +1,29 @@ - + \ No newline at end of file + diff --git a/frontend/src/components/engEnvironmentData/index.vue b/frontend/src/components/engEnvironmentData/index.vue index f95868b1..77bc1cd0 100644 --- a/frontend/src/components/engEnvironmentData/index.vue +++ b/frontend/src/components/engEnvironmentData/index.vue @@ -1,9 +1,6 @@ \ No newline at end of file + const baseFilters: any[] = [ + { field: 'sttpCode', operator: 'eq', dataType: 'string', value: 'ENG' }, + { field: 'bldsttCcode', operator: 'in', dataType: 'string', value: ['1', '2'] } + ]; + if (baseid.value !== 'all') { + baseFilters.unshift({ field: 'baseId', operator: 'eq', dataType: 'string', value: baseid.value }); + } + + const params1 = { + filter: { + logic: 'and', + filters: [ + ...baseFilters, + { field: 'prsc', operator: 'in', dataType: 'string', value: ['1', '2', '3'] } + ] + } + }; + + const params2 = { + filter: { + logic: 'and', + filters: [ + ...baseFilters, + { field: 'runState', operator: 'eq', dataType: 'number', value: 4 }, + { field: 'dtin', operator: 'eq', dataType: 'number', value: 1 } + ] + } + }; + + const params3 = { + filter: { + logic: 'and', + filters: [ + ...baseFilters, + { field: 'prsc', operator: 'in', dataType: 'string', value: ['1', '2', '3'] }, + { field: 'dtinEnv', operator: 'in', dataType: 'string', value: ['2'] } + ] + } + }; + + try { + dataLoading.value = true; + const [res1, res2, res3] = await Promise.all([ + getVmsstbprptKendoList(params1), + getVmsstbprptKendoList(params2), + getVmsstbprptKendoList(params3) + ]); + + const record = { one: 0, two: 0, three: 0 }; + const responses = [res1, res2, res3]; + responses.forEach((res, index) => { + const total = res?.data?.total ?? 0; + switch (index) { + case 0: + record.one = total; + break; + case 1: + record.two = total; + break; + case 2: + record.three = total; + break; + } + }); + data.value = record; + // debugger + } catch (error) { + console.error('EngEnvironmentData getData error:', error); + } finally { + dataLoading.value = false; + } +}; + +const handleItemClick = (name: string) => { + emit('item-click', { name }); +}; + +watch( + () => JidiSelectEventStore.selectedItem, + newVal => { + if (newVal && newVal.wbsCode) { + baseid.value = newVal.wbsCode; + getData(); + } + }, + { deep: true, immediate: true } +); + diff --git a/frontend/src/modules/alongFishMod/TwoLayers/Yanchengyulei.vue b/frontend/src/modules/alongFishMod/TwoLayers/Yanchengyulei.vue index 8d7f6e9f..6b43cfe6 100644 --- a/frontend/src/modules/alongFishMod/TwoLayers/Yanchengyulei.vue +++ b/frontend/src/modules/alongFishMod/TwoLayers/Yanchengyulei.vue @@ -3,15 +3,22 @@
- - + + + > + + {{ opt.label }} + + @@ -20,21 +27,35 @@ v-model:value="formState.rvcd" placeholder="请选择" style="width: 150px" - :options="lyOptions" @change="handleRvcdChange" - /> + > + + {{ opt.label }} + + - + @@ -57,11 +78,20 @@ - - + +
- + -