diff --git a/frontend/src/components/MapModal/components/BasicInfo.vue b/frontend/src/components/MapModal/components/BasicInfo.vue index 0f9c2b51..52af4e0e 100644 --- a/frontend/src/components/MapModal/components/BasicInfo.vue +++ b/frontend/src/components/MapModal/components/BasicInfo.vue @@ -156,11 +156,19 @@ const columnsConfig = ref([ columns: wtPointColumns }, { - type: 'fh_wq_point', + type: 'WTRV', + columns: wtPointColumns + }, + { + type: 'WQFB', columns: FhWpPointColumns }, { - type: 'fh_point', + type: 'WQ', + columns: FhWpPointColumns + }, + { + type: 'FH', columns: FhPointColumns }, { @@ -204,7 +212,7 @@ const columnsConfig = ref([ columns: StinfoAiVidoPointColumns }, { - type: 'dw_point', + type: 'DW_2', columns: DwPointColumns }, { diff --git a/frontend/src/components/MapModal/components/WaterTemperatureRep.vue b/frontend/src/components/MapModal/components/WaterTemperatureRep.vue index e4d99557..63fca633 100644 --- a/frontend/src/components/MapModal/components/WaterTemperatureRep.vue +++ b/frontend/src/components/MapModal/components/WaterTemperatureRep.vue @@ -37,16 +37,16 @@ - {{ record.wt - record.beforeWt > 0 ? '+' : '' - }}{{ (record.wt - record.beforeWt).toFixed(2) }} + {{ Number(record.wt) - Number(record.beforeWt) > 0 ? '+' : '' + }}{{ (Number(record.wt) - Number(record.beforeWt)).toFixed(2) }} - diff --git a/frontend/src/components/MapModal/setting.config.ts b/frontend/src/components/MapModal/setting.config.ts index 5ea8234c..5662b413 100644 --- a/frontend/src/components/MapModal/setting.config.ts +++ b/frontend/src/components/MapModal/setting.config.ts @@ -309,7 +309,7 @@ const FPTabs: Array = name: '基础信息', key: 'basicInfo', type: 'basic', - url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo', + url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo' // code: 'gyss.tabs.jcxx' }, // { @@ -683,15 +683,15 @@ const WQFBTabs: Array = [ url: '/video/dataStcdFrame/getVideoMonitorList' } ]; -// const WQTabs: Array = [ -// ...WQFBTabs, -// { -// name: '实时视频', -// key: 'videoInfo', -// type: 'video', -// url: '/video/dataStcdFrame/getVideoMonitorList' -// } -// ] +const WQTabs: Array = [ + ...WQFBTabs, + { + name: '实时视频', + key: 'videoInfo', + type: 'video', + url: '/video/dataStcdFrame/getVideoMonitorList' + } +]; // const WQDTATabs: Array = [ // { // name: '基础信息', @@ -758,20 +758,21 @@ const WTTabs: Array = [ code: 'swjc.tabs.ylfzsyxfx' } ]; -// //垂向水温 √ -// const WTTabs1: Array = [ -// { -// name: '基础信息', -// key: 'basicInfo', -// type: 'basic', -// url: '/bbi/siteBipc/getSiteBasicInfo' -// }, -// { -// name: '监测数据', -// key: 'VerticalWaterTemperature', -// type: 'VerticalWaterTemperature' -// } -// ] +//垂向水温 √ +const WTTabs1: Array = [ + { + name: '基础信息', + key: 'basicInfo', + type: 'basic', + url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo' + }, + { + name: '监测数据', + key: 'VerticalWaterTemperature', + type: 'VerticalWaterTemperature', + default: true // 默认显示 + } +]; // //低温水减缓设施 const DWTabs: Array = [ @@ -1026,7 +1027,7 @@ const videoTabs: Array = [ key: 'basicInfo', type: 'basic', url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo', - default: true, // 默认显示 + default: true // 默认显示 }, { name: '实时视频', @@ -1209,17 +1210,22 @@ const handleTabs = (modaldata: any) => { } else { return ENGTabs; } - case 'WT_POINT': - return WTTabs; - case 'FH_WQ_POINT': - return WQFBTabs; - case 'FH_POINT': - if (modaldata.show) { - return FHTabs; + case 'WT': + case 'WTRV': + if (modaldata.enfc == '1') { + return WTTabs1; } else { - let FHTabsTwo = FHTabs.slice(0, 1); - return FHTabsTwo; + return WTTabs; } + case 'WQFB': + return WQFBTabs; + case 'WQ': + const _tabs = [...WQTabs]; + if (modaldata?.dtinType == 2 || modaldata?.dtinType == 1) + _tabs.splice(2, 1); //国家站 人工站把视频tab去除 + return _tabs; + case 'FH': + return FHTabs; case 'FH_ZQ_POINT': return FLOWTabs; case 'FP_POINT': @@ -1240,14 +1246,14 @@ const handleTabs = (modaldata: any) => { return DZGJ; case 'FPRD_POINT': return DEVICETABS; - case 'DW_POINT': - return DWTabs; - case 'DW_5': - return DEVICETABS; - case 'DW_6': - return DEVICETABS; - case 'DW_1': - return DEVICETABS; + // case 'DW_POINT': + // return DWTabs; + // case 'DW_5': + // return DEVICETABS; + // case 'DW_6': + // return DEVICETABS; + // case 'DW_1': + // return DEVICETABS; // if (modaldata?.eqtp == 'QEC') { // const { page } = Utility.parseQueryString() @@ -1264,13 +1270,13 @@ const handleTabs = (modaldata: any) => { // return DZGJ // case 'EQ': // return EQTabs - // case 'DW': - // case 'DW_1': - // case 'DW_2': - // case 'DW_3': - // case 'DW_4': - // case 'DW_5': - // return DWTabs + case 'DW': + case 'DW_1': + case 'DW_2': + case 'DW_3': + case 'DW_4': + case 'DW_5': + return DWTabs; // case 'FP': //todo,后续再删除多余代码 // case 'FP_1': //todo,后续再删除多余代码 // // case "FP_2": //todo,后续再删除多余代码 @@ -1364,12 +1370,7 @@ const handleTabs = (modaldata: any) => { // return VPTabs // case 'VA': // return VATabs - // case 'WQFB': - // return WQFBTabs - // case 'WQ': - // const _tabs = [...WQTabs] - // if (modaldata?.dtinType == 2 || modaldata?.dtinType == 1) _tabs.splice(2, 1)//国家站 人工站把视频tab去除 - // return _tabs + // case 'WQDTA': // return WQDTATabs // case 'LL': diff --git a/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue b/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue index 9457f9d4..7174a72e 100644 --- a/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue +++ b/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue @@ -77,13 +77,11 @@ - + - - - 查看详情 - - + + 查看详情 + @@ -286,7 +284,8 @@ const columns = [ title: '操作', key: 'action', width: 100, - fixed: 'right' + fixed: 'right', + slots: { customRender: 'action' } } ] diff --git a/frontend/src/modules/chuixiangshuiwenChangeMod/index.vue b/frontend/src/modules/chuixiangshuiwenChangeMod/index.vue index 55cb6c85..7e2d98eb 100644 --- a/frontend/src/modules/chuixiangshuiwenChangeMod/index.vue +++ b/frontend/src/modules/chuixiangshuiwenChangeMod/index.vue @@ -491,7 +491,8 @@ const initChart = () => { console.log('水温:', temperature); console.log('深度:', depth); modelStore.modalVisible = true; - modelStore.params.sttp = "wt_point"; + modelStore.params.sttp = "WT"; + modelStore.params.enfc = '1'; modelStore.title = stnm + "详情信息"; // modelStore.isBasicEdit = true; modelStore.params.stcd = stcd; diff --git a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue index a387724e..e7a6ac04 100644 --- a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue +++ b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue @@ -47,19 +47,17 @@ :ref="(el) => setTableRef(el, item.key)" :scrollY="360" :columns="columns" :list-url="vmsstbprptGetKendoList" :search-params="{ sort: sort }" :transform-data="customTransform"> - - - - - {{ record.stnm }} - - - - - - {{ record.ennm || '-' }} - - + + + + {{ record.stnm }} + + + + + + {{ record.ennm || '-' }} + @@ -155,7 +153,8 @@ const columns = [ dataIndex: 'stnm', key: 'stnm', width: 150, - ellipsis: true + ellipsis: true, + slots: { customRender: 'ennm' } }, { title: '接入状态', @@ -238,7 +237,9 @@ const columns = [ dataIndex: 'ennm', key: 'ennm', width: 150, - ellipsis: true + ellipsis: true, + slots: { customRender: 'ennm' } + }, { title: '关联基地', @@ -441,7 +442,7 @@ const handleSearch = () => { const typefenbian = (type: string) => { if (type == '2') { - return 'dw_point' + return 'DW_2' } else if (type == '5') { return 'DW_5' } else if (type == '6') { @@ -519,10 +520,10 @@ const resetSearchState = () => { formState.hydrodtin = props.res?.hydrodtin || '' formState.bldstt = props.res?.bldstt || '' formState.stnm = '' - + // 重置activeTab为当前设施类型对应的key activeTab.value = currentDwtp.value - + // 清空表格引用 tableRefs.value = {} } diff --git a/frontend/src/modules/guoyujiance/components/FPVDDetailMD.vue b/frontend/src/modules/guoyujiance/components/FPVDDetailMD.vue index 4a0d8f9a..da69aa5d 100644 --- a/frontend/src/modules/guoyujiance/components/FPVDDetailMD.vue +++ b/frontend/src/modules/guoyujiance/components/FPVDDetailMD.vue @@ -3,12 +3,10 @@ - - - - 查看详情 - - + + + 查看详情 + @@ -49,7 +47,8 @@ const columns = ref([ title: '操作', width: 100, align: 'center' as const, - fixed: 'right' as const + fixed: 'right' as const, + slots: { customRender: 'action' } } ]) const tableRef = ref() diff --git a/frontend/src/modules/guoyusheshijiansheqingkuang/ModalPage/index.vue b/frontend/src/modules/guoyusheshijiansheqingkuang/ModalPage/index.vue index a835268f..914cf08f 100644 --- a/frontend/src/modules/guoyusheshijiansheqingkuang/ModalPage/index.vue +++ b/frontend/src/modules/guoyusheshijiansheqingkuang/ModalPage/index.vue @@ -1,381 +1,382 @@ - - - - - - - - - - - - - - - - - - 查询 - - 重置 - - - + + + + + + + + + + + + + + + + 查询 + + 重置 + + + - - - + + + - - - - - - {{ record.ennm }} - - - - - 查看详情 - - - - - - - + + + + + {{ record.ennm }} + + + + + 查看详情 + + + + diff --git a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue index a4475aec..d3fd8bbd 100644 --- a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue +++ b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue @@ -1,73 +1,36 @@ - + - - + + {{ item.basename }} - - + + {{ item.label }} - - + + {{ item.label }} - + @@ -82,18 +45,10 @@ - - - - 查看详情 - + + + 查看详情 @@ -299,10 +254,10 @@ const fetchLyData = async () => { }, formValue.dataDimensionVal != 'all' ? { - field: 'fullPath', - operator: 'startswith', - value: formValue.dataDimensionVal - } + field: 'fullPath', + operator: 'startswith', + value: formValue.dataDimensionVal + } : null ].filter(Boolean) }, @@ -356,15 +311,15 @@ const fetchDmData = async () => { { field: 'mway', operator: 'eq', value: 2 }, formValue.dataDimensionVal == 'all' ? { - field: 'rvcd', - operator: 'contains', - value: formValue.rvcd - } + field: 'rvcd', + operator: 'contains', + value: formValue.rvcd + } : { - field: 'baseId', - operator: 'contains', - value: formValue.dataDimensionVal - } + field: 'baseId', + operator: 'contains', + value: formValue.dataDimensionVal + } ] }, select: ['stcd', 'stnm', 'lgtd', 'lttd', 'rstcdStepSort'], @@ -802,7 +757,8 @@ const columns = [ key: 'action', width: 100, align: 'center' as const, - fixed: 'right' as const + fixed: 'right' as const, + slots: { customRender: 'action' } } ]; @@ -859,7 +815,7 @@ const handleViewDetail = (record: any) => { } }); modelStore.modalVisible = true; - modelStore.params.sttp = 'wt_point'; + modelStore.params.sttp = 'WT'; modelStore.title = stnm + '详情信息'; modelStore.params.stcd = formValue.stcd; }; diff --git a/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue b/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue index 21e1760d..6c04ace9 100644 --- a/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue +++ b/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue @@ -50,17 +50,15 @@ :search-params="searchParams" :transform-data="customTransform" > - - - - {{ record.ennm }} - - - - - 查看详情 - - + + + {{ record.ennm }} + + + + + 查看详情 + @@ -174,7 +172,8 @@ const columns = [ title: '所属电站', dataIndex: 'ennm', width: '150px', - sorter: true + sorter: true, + slots: { customRender: 'ennm' } }, { key: 'fhstnm', @@ -237,7 +236,8 @@ const columns = [ key: 'action', width: 100, align: 'center' as const, - fixed: 'right' as const + fixed: 'right' as const, + slots: { customRender: 'action' } } ]; // 1. 定义排序状态 @@ -412,13 +412,13 @@ const handleViewDetail = (record: any, type: any) => { } else { if (tabIndex.value == 'FH') { modelStore.modalVisible = true; - modelStore.params.sttp = 'fh_point'; + modelStore.params.sttp = 'FH'; modelStore.title = record.stnm + ' 详情信息'; modelStore.params.stcd = record.stcd; modelStore.params.show = false; } else if (tabIndex.value == 'WTRV') { modelStore.modalVisible = true; - modelStore.params.sttp = 'wt_point'; + modelStore.params.sttp = 'WT'; modelStore.title = record.stnm + ' 详情信息'; modelStore.params.stcd = record.stcd; } else if (tabIndex.value == 'ZQ') { diff --git a/frontend/src/modules/qixidijchuXx/index.vue b/frontend/src/modules/qixidijchuXx/index.vue index 5f0b8e1d..74e92a9f 100644 --- a/frontend/src/modules/qixidijchuXx/index.vue +++ b/frontend/src/modules/qixidijchuXx/index.vue @@ -1,450 +1,462 @@ - - - - - - - - - {{ formatValue(record.fhstnm) }} - - - - - - - {{ formatValue(record[column.dataIndex]) }} - - - - - - + + + + + + + + + {{ formatValue(record.fhstnm) }} + + + + + + + {{ formatValue(record[column.dataIndex]) }} + + + + + + \ No newline at end of file + diff --git a/frontend/src/modules/qixidishuiwenbianhua/index.vue b/frontend/src/modules/qixidishuiwenbianhua/index.vue index 18fa31a3..9550aefa 100644 --- a/frontend/src/modules/qixidishuiwenbianhua/index.vue +++ b/frontend/src/modules/qixidishuiwenbianhua/index.vue @@ -328,7 +328,7 @@ const handleDataPointClick = (params: any) => { 索引: dataIndex }); modelStore.modalVisible = true; - modelStore.params.sttp = "wt_point"; + modelStore.params.sttp = "WT"; modelStore.title = '水温监测'; modelStore.params.stcd = dataItem.stcd; modelStore.showStcdSelector = true diff --git a/frontend/src/modules/shuiWenNianNeiFenBu/TwoLayers/yaerAverage.vue b/frontend/src/modules/shuiWenNianNeiFenBu/TwoLayers/yaerAverage.vue index 2ffe00b2..9a1adb39 100644 --- a/frontend/src/modules/shuiWenNianNeiFenBu/TwoLayers/yaerAverage.vue +++ b/frontend/src/modules/shuiWenNianNeiFenBu/TwoLayers/yaerAverage.vue @@ -1,382 +1,413 @@ - - - - - - - {{ item.wbsName }} - - - + + + + + + + {{ item.wbsName }} + + + - - - - {{ item.label }} - - - + + + + {{ item.label }} + + + - - - + + + - - - 查询 - - 导出 - - - - - - - - 查看详情 - - - - - + + + 查询 + + 导出 + + + + + + + 查看详情 + + + diff --git a/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/shuiwenjiancegongzuoEJ.vue b/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/shuiwenjiancegongzuoEJ.vue index 4a804d05..b736fad9 100644 --- a/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/shuiwenjiancegongzuoEJ.vue +++ b/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/shuiwenjiancegongzuoEJ.vue @@ -9,25 +9,11 @@ 选择水电站: - - + + 查询 @@ -531,9 +517,12 @@ const handleTableChange = (pag: any) => { const handleViewDetail = (record: any) => { if (record) { modelStore.modalVisible = true; - modelStore.params.sttp = "wt_point"; + modelStore.params.sttp = "WT"; modelStore.title = record.stnm + "详情信息"; // modelStore.isBasicEdit = true; + if (tabIndex.value == "27") { + modelStore.params.enfc = "1"; + } modelStore.params.stcd = record.stcd; } diff --git a/frontend/src/modules/shuizhijiancegongzuoQK/shuiwenjiancegongzuoEJ.vue b/frontend/src/modules/shuizhijiancegongzuoQK/shuiwenjiancegongzuoEJ.vue index b6213636..9c790179 100644 --- a/frontend/src/modules/shuizhijiancegongzuoQK/shuiwenjiancegongzuoEJ.vue +++ b/frontend/src/modules/shuizhijiancegongzuoQK/shuiwenjiancegongzuoEJ.vue @@ -586,7 +586,7 @@ const handleTableChange = (pag: any) => { const handleViewDetail = (record: any) => { if (record) { modelStore.modalVisible = true; - modelStore.params.sttp = "fh_wq_point"; + modelStore.params.sttp = "WQFB"; modelStore.title = record.stnm + "详情信息"; // modelStore.isBasicEdit = true; modelStore.params.stcd = record.stcd; diff --git a/frontend/src/modules/waterQuality/index.vue b/frontend/src/modules/waterQuality/index.vue index 27a2fdcf..fd509a41 100644 --- a/frontend/src/modules/waterQuality/index.vue +++ b/frontend/src/modules/waterQuality/index.vue @@ -723,7 +723,7 @@ const handleDataPointClick = (params: any) => { if (stationData && stationData.stcd) { modelStore.modalVisible = true; - modelStore.params.sttp = "fh_wq_point"; + modelStore.params.sttp = "WQFB"; modelStore.title = stationData.stnm + "详情信息"; // modelStore.isBasicEdit = true; modelStore.params.stcd = stationData.stcd; diff --git a/frontend/src/modules/yanchengshuiwenChangeMod/index.vue b/frontend/src/modules/yanchengshuiwenChangeMod/index.vue index e2152a82..2b0380e2 100644 --- a/frontend/src/modules/yanchengshuiwenChangeMod/index.vue +++ b/frontend/src/modules/yanchengshuiwenChangeMod/index.vue @@ -325,7 +325,7 @@ const initChart = () => { console.log('stnm:', params.data.stnm); console.log('temperature:', params.data.value); modelStore.modalVisible = true; - modelStore.params.sttp = "wt_point"; + modelStore.params.sttp = "WT"; modelStore.title = params.data.stnm + "详情信息"; // modelStore.isBasicEdit = true; modelStore.params.stcd = params.data.stcd; diff --git a/frontend/src/store/modules/model.ts b/frontend/src/store/modules/model.ts index f01b390e..24524f18 100644 --- a/frontend/src/store/modules/model.ts +++ b/frontend/src/store/modules/model.ts @@ -15,11 +15,13 @@ export const useModelStore = defineStore('model', () => { stcd: any; date: any; show: any; + enfc:any; }>({ sttp: 'eng', stcd: '', date: '', - show: true + show: true, + enfc:'0', }); return { params, diff --git a/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue b/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue index 5943d213..d5501a51 100644 --- a/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue +++ b/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue @@ -33,19 +33,19 @@ const showMapModal = () => { }; const showMapModal1 = () => { modelStore.modalVisible = true; - modelStore.params.sttp = "wt_point"; + modelStore.params.sttp = "WT"; modelStore.title = "水温 详情信息"; modelStore.isBasicEdit = true; }; const showMapModal2 = () => { modelStore.modalVisible = true; - modelStore.params.sttp = "fh_wq_point"; + modelStore.params.sttp = "WQFB"; modelStore.title = "水质 详情信息"; modelStore.isBasicEdit = true; }; const showMapModal3 = () => { modelStore.modalVisible = true; - modelStore.params.sttp = "fh_point"; + modelStore.params.sttp = "FH"; modelStore.title = "栖息地 详情信息"; modelStore.isBasicEdit = true; };// @@ -112,7 +112,7 @@ const showMapModal13 = () => { }; const showMapModal14 = () => { modelStore.modalVisible = true; - modelStore.params.sttp = "dw_point"; + modelStore.params.sttp = "DW_2"; modelStore.title = "低温水减缓设施-叠梁门 详情信息"; modelStore.isBasicEdit = true; }; diff --git a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/index.vue b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/index.vue index 2a5704ef..05a5f9ae 100644 --- a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/index.vue +++ b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/index.vue @@ -16,16 +16,12 @@ :search-params="{}" :transform-data="customTransform" > - - - - 查看 - - + + + 查看 + @@ -196,7 +192,8 @@ const columns = computed(() => { dataIndex: 'action', fixed: 'right', width: 100, - align: 'center' + align: 'center', + slots: { customRender: 'action' } } ]; }); @@ -308,12 +305,12 @@ const handleSearchFinish = (values: any) => { dataType: 'string', value: values.rstcd }, - values.rvcd !== "all" && { - field: "rvcd", - operator: "eq", - dataType: "string", - value: values.rvcd, - }, + values.rvcd !== 'all' && { + field: 'rvcd', + operator: 'eq', + dataType: 'string', + value: values.rvcd + } ].filter(Boolean); const filter = { diff --git a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue index 56894dda..52940870 100644 --- a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue +++ b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue @@ -27,78 +27,72 @@ @selection-change="handleSelectionChange" > - - - - 提交 - 编辑 - 编辑 - 删除 - 查看 - 审批 - 驳回 - - + + + 提交 + 编辑 + 编辑 + 删除 + 查看 + 审批 + 驳回 + @@ -388,7 +382,8 @@ const columns = computed(() => { dataIndex: 'action', fixed: 'right', width: 200, - align: 'center' + align: 'center', + slots: { customRender: 'action' } } ]; }); @@ -613,8 +608,8 @@ const handleModalOk = () => { // message.warning("请检查流域,流域填写有误!"); // return; // } - if (fileTableData.value[i].warnings.includes("rvcd")) { - message.warning("请检查流域,流域填写有误!"); + if (fileTableData.value[i].warnings.includes('rvcd')) { + message.warning('请检查流域,流域填写有误!'); return; } if (fileTableData.value[i].warnings.includes('rstcd')) { @@ -880,12 +875,12 @@ const handleSearchFinish = (values: any) => { dataType: 'string', value: values.rstcd }, - values.rvcd !== "all" && { - field: "rvcd", - operator: "eq", - dataType: "string", - value: values.rvcd, - }, + values.rvcd !== 'all' && { + field: 'rvcd', + operator: 'eq', + dataType: 'string', + value: values.rvcd + } // values.baseId !== "all" && { // field: "baseId", // operator: "eq", diff --git a/frontend/src/views/system/map/components/ConfigManagement/index.vue b/frontend/src/views/system/map/components/ConfigManagement/index.vue index ac4bbc6f..84d71955 100644 --- a/frontend/src/views/system/map/components/ConfigManagement/index.vue +++ b/frontend/src/views/system/map/components/ConfigManagement/index.vue @@ -13,22 +13,24 @@ :list-url="getAllConfigTree" :search-params="searchParams" > - - - - 编辑 - 删除 - - + + + 编辑 + 删除 +