From 43fc39451f0b48729cfec09ded6689c32ad93de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E5=87=AF?= <2448379534@qq.com>
Date: Wed, 26 Aug 2026 18:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E6=B5=8B=E8=AF=95=E6=9B=B4?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/ConfirmModal/index.vue | 2 +-
.../src/components/MapModal/index.vue | 2 +-
.../components/OperationLogModal/index.vue | 22 +-
.../BasicData/BasicDataSearch.vue | 37 +-
.../BasicData/DeleteConfirmModal.vue | 3 +
.../BasicData/EditPowerModal.vue | 337 +++++-------------
.../BasicData/index.vue | 18 +-
.../FishResource/FishResourceSearch.vue | 2 +-
.../aiBox/AiBoxSearch.vue | 2 +-
.../aquaEco/OtweSearch.vue | 2 +-
.../fishSurvey/FishSearch.vue | 2 +-
.../guoYuSheShi/FpSearch.vue | 2 +-
.../luShengShengTaiDiaoCha/TeSearch.vue | 2 +-
.../qiXiDi/FhSearch.vue | 2 +-
.../rescueStation/VaSearch.vue | 2 +-
.../shengTaiLiuLiang/EditEqModal.vue | 19 +-
.../shengTaiLiuLiang/EqSearch.vue | 2 +-
.../shiPinJianKong/VdSearch.vue | 2 +-
.../shuiShengShengTaiDiaoCha/WeSearch.vue | 2 +-
.../shuiWenJianCe/WtSearch.vue | 2 +-
.../shuiWenJianCe/index.vue | 2 +-
.../shuiZhiJianCe/EditWqModal.vue | 95 +++--
.../shuiZhiJianCe/WqSearch.vue | 2 +-
.../shuiZhiJianCe/index.vue | 2 +-
.../sonarCam/SonarSearch.vue | 2 +-
.../tempMit/DwSearch.vue | 2 +-
.../conventionalHydropower/tempMit/index.vue | 4 +-
.../terrEco/OtteSearch.vue | 2 +-
.../zengZhiFangLiu/FbSearch.vue | 2 +-
.../zhenXIZhiWuYuan/VpSearch.vue | 2 +-
.../monitorData/FishData/FishDataSearch.vue | 2 +-
.../FishRelease/FishReleaseSearch.vue | 2 +-
.../views/monitorData/FishRelease/index.vue | 4 +-
.../monitorData/FlowData/FlowDataSearch.vue | 2 +-
.../src/views/monitorData/FlowData/index.vue | 2 +-
.../FlowStation/FlowStationSearch.vue | 2 +-
.../views/monitorData/FlowStation/index.vue | 2 +-
.../SurfaceTemp/SurfaceTempSearch.vue | 2 +-
.../views/monitorData/SurfaceTemp/index.vue | 2 +-
.../VerticalTemp/VerticalTempSearch.vue | 2 +-
.../views/monitorData/VerticalTemp/index.vue | 2 +-
.../monitorData/WaterData/WaterDataSearch.vue | 2 +-
.../src/views/monitorData/WaterData/index.vue | 2 +-
.../fishSurveyData/fishSurveyDataSearch.vue | 2 +-
frontend/.env.development | 2 +-
.../DZShuiZhiJianCeQuShiTu/index.vue | 78 ++--
.../BasicData/BasicDataSearch.vue | 16 +-
.../BasicData/EditPowerModal.vue | 278 +++++++--------
.../BasicData/index.vue | 15 +-
49 files changed, 464 insertions(+), 534 deletions(-)
diff --git a/frontend-sjgl/src/components/ConfirmModal/index.vue b/frontend-sjgl/src/components/ConfirmModal/index.vue
index a70641ed..993f91ae 100644
--- a/frontend-sjgl/src/components/ConfirmModal/index.vue
+++ b/frontend-sjgl/src/components/ConfirmModal/index.vue
@@ -27,7 +27,7 @@
v-model:value="sourceValue"
placeholder="请输入修改依据"
:rows="5"
- :maxlength="500"
+ :maxlength="160"
show-count
/>
diff --git a/frontend-sjgl/src/components/MapModal/index.vue b/frontend-sjgl/src/components/MapModal/index.vue
index 53d32d33..a169f0e0 100644
--- a/frontend-sjgl/src/components/MapModal/index.vue
+++ b/frontend-sjgl/src/components/MapModal/index.vue
@@ -869,7 +869,7 @@ watch(
params.sttp = params.sttpMap;
}
tabsConfig.value = handleTabs({ ...params });
- debugger
+
let value = tabsConfig.value.find((item: any) => item.default);
currentActiveKey.value = value?.key;
diff --git a/frontend-sjgl/src/components/OperationLogModal/index.vue b/frontend-sjgl/src/components/OperationLogModal/index.vue
index bfaf6643..35ea0838 100644
--- a/frontend-sjgl/src/components/OperationLogModal/index.vue
+++ b/frontend-sjgl/src/components/OperationLogModal/index.vue
@@ -25,6 +25,9 @@
:columns="columns"
:list-url="getOperationLogList"
:transform-data="customTransform"
+ :searchParams="{
+ sort: sort
+ }"
>
emit("update:open", val),
});
useDraggable(visible, { boundary: true, resetOnOpen: true });
-
+const sort = ref([{field: "operateTime", dir: "desc"}]
+);
const basicSearchRef = ref();
const tableRef = ref();
@@ -160,6 +164,14 @@ const columns = computed(() => [
sort: true,
},
+ {
+ key: "remark",
+ title: "操作详情",
+ dataIndex: "remark",
+ visible: true,
+ ellipsis: true,
+ width: 160,
+ },
{
key: "source",
title: "来源依据",
@@ -167,13 +179,7 @@ const columns = computed(() => [
visible: true,
ellipsis: true,
},
- {
- key: "remark",
- title: "备注",
- dataIndex: "remark",
- visible: true,
- ellipsis: true,
- },
+
{
key: "action",
title: "操作",
diff --git a/frontend-sjgl/src/views/conventionalHydropower/BasicData/BasicDataSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/BasicData/BasicDataSearch.vue
index c0781865..eb6be02d 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/BasicData/BasicDataSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/BasicData/BasicDataSearch.vue
@@ -21,7 +21,6 @@
v-model:value="ttpwr.max"
:min="0"
placeholder="最大装机"
- @change="handleChange"
/>
@@ -75,7 +74,7 @@
新增
- 查看修改
+ 查看操作日志
导出
自定义筛选列
{{ isHide ? '展开' : '隐藏' }}
@@ -246,12 +245,13 @@ const searchList: any = computed(() => [
}
]);
-const handleChange = (value: any) => {
- if (ttpwr.value.min > value) {
- message.warning('最小装机容量不能大于最大装机容量');
- ttpwr.value.max = null;
- }
-};
+// 最大装机失焦校验：最小装机不能大于最大装机
+// const handleBlur = () => {
+// if (ttpwr.value.min > ttpwr.value.max) {
+// message.warning('最小装机容量不能大于最大装机容量');
+// // ttpwr.value.max = null;
+// }
+// };
const handleRangeClick = (value: any) => {
jcdt.value = {
min: dayjs(value.value[0]).format('YYYY-MM-DD HH:mm:ss'),
@@ -266,6 +266,16 @@ const disabledEndDate = (current: Dayjs) => {
};
const onSearchFinish = (values: any) => {
+ // 查询前校验：最小装机不能大于最大装机
+ if (
+ ttpwr.value.min != null &&
+ ttpwr.value.max != null &&
+ ttpwr.value.min > ttpwr.value.max
+ ) {
+ message.warning('最小装机容量不能大于最大装机容量');
+ ttpwr.value.max = null;
+ return;
+ }
values.ttpwr = ttpwr.value;
if (jcdt.value?.min) {
values.jcdt.min = dayjs(jcdt.value.min).format('YYYY-MM-DD') + ' 00:00:00';
@@ -313,9 +323,18 @@ const handleReset = () => {
emit('reset', initSearchData);
};
+// 清空电站选择框（删除电站后调用）
+const clearStcd = () => {
+ if (basicSearchRef.value?.formData) {
+ basicSearchRef.value.formData.rstcd = '';
+ }
+ searchData.value = { ...searchData.value, rstcd: null };
+};
+
defineExpose({
btnLoading,
- searchData
+ searchData,
+ clearStcd
});
onMounted(() => {
diff --git a/frontend-sjgl/src/views/conventionalHydropower/BasicData/DeleteConfirmModal.vue b/frontend-sjgl/src/views/conventionalHydropower/BasicData/DeleteConfirmModal.vue
index 34de02d0..54d1bc4c 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/BasicData/DeleteConfirmModal.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/BasicData/DeleteConfirmModal.vue
@@ -10,9 +10,12 @@
diff --git a/frontend-sjgl/src/views/conventionalHydropower/BasicData/EditPowerModal.vue b/frontend-sjgl/src/views/conventionalHydropower/BasicData/EditPowerModal.vue
index fbf42cb6..ff32ac84 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/BasicData/EditPowerModal.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/BasicData/EditPowerModal.vue
@@ -10,7 +10,7 @@
水文
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
水库
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1158,7 +966,10 @@ const fieldLabelOverrides: Record = {
reachcd: '所在河段',
bldsttCode: '建设状态',
rgcp: '调节性能',
- dmtp: '坝型'
+ dmtp: '坝型',
+ addvcd: '所在位置',
+ hycd: '所属公司',
+ topHycd: '所属集团'
};
Object.assign(fieldLabelMap, fieldLabelOverrides);
@@ -1169,7 +980,17 @@ const selectOptionsMap: Record any[]> = {
addvcd: () => addvcdOptions.value,
bldsttCode: () => bldsttCodeOptions.value,
rgcp: () => rgcpNameOptions.value,
- dvtp: () => props.dvtpList || []
+ dvtp: () => props.dvtpList || [],
+ hycd: () =>
+ (props.hycdList || []).map(item => ({
+ value: item.hycd,
+ label: item.hynm
+ })),
+ topHycd: () =>
+ (props.topHynmList || []).map(item => ({
+ value: item.hycd,
+ label: item.hynm
+ }))
};
const resolveSelectLabel = (field: string, value: any): string => {
@@ -1300,7 +1121,7 @@ watch(
continue;
const isSelect = !!selectOptionsMap[key];
const oldDisplay = isSelect
- ? (originalLabels.value[key] ?? resolveSelectLabel(key, oldNorm))
+ ? originalLabels.value[key] ?? resolveSelectLabel(key, oldNorm)
: oldNorm === null
? '空'
: String(oldNorm);
@@ -1390,7 +1211,10 @@ const handleConfirmSubmit = async (source: string) => {
try {
let res: any;
// 将 select 字段的 label 名拼入 engInfo
- const appendSelectLabels = (engInfo: Record, fields: string[]) => {
+ const appendSelectLabels = (
+ engInfo: Record,
+ fields: string[]
+ ) => {
for (const field of fields) {
const labelField = selectLabelFieldMap[field];
if (labelField) {
@@ -1424,7 +1248,10 @@ const handleConfirmSubmit = async (source: string) => {
}
engInfo[item.field] = val;
});
- appendSelectLabels(engInfo, changeOrder.value.map(c => c.field));
+ appendSelectLabels(
+ engInfo,
+ changeOrder.value.map(c => c.field)
+ );
res = await updatePowerInfo({
engInfo,
source: source.trim()
diff --git a/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue b/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue
index 6af4926a..dcea8f0e 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue
@@ -153,9 +153,9 @@ const isEdit = ref(true);
const operationLogVisible = ref(false);
const dvtpList = ref([
- { label: '堤坝式', value: '0' },
- { label: '引水式', value: '1' },
- { label: '混合式', value: '2' }
+ { label: '堤坝式', value: '1' },
+ { label: '引水式', value: '2' },
+ { label: '混合式', value: '3' }
]);
// 日期列渲染函数
const dateRender = ({ text }: { text: string }) => {
@@ -163,6 +163,12 @@ const dateRender = ({ text }: { text: string }) => {
const date = dayjs(text);
return date.isValid() ? date.format('YYYY-MM-DD') : '-';
};
+// 装机容量列渲染函数：接口值为实际值×10，展示时除以10
+const ttpwrRender = ({ text }: { text: any }) => {
+ if (text === null || text === undefined || text === '-') return '-';
+ const num = Number(text);
+ return isNaN(num) ? text : (num / 10).toFixed(2);
+};
// 表格列元数据映射（列宽、排序、固定列、自定义渲染等）
const columnMetaMap: Record = {
@@ -230,7 +236,7 @@ const columnMetaMap: Record = {
ksqxyz: { width: 250, sort: true },
gemaxrq: { width: 190, sort: true },
mxgeqxyz: { width: 260, sort: true },
- ttpwr: { width: 120, sort: true, ellipsis: true },
+ ttpwr: { width: 120, sort: true, ellipsis: true, customRender: ttpwrRender },
gncnt: { width: 130, sort: true, ellipsis: true },
gntp: { width: 150, sort: true, ellipsis: true },
grntpwr: { width: 130, sort: true, ellipsis: true },
@@ -495,6 +501,10 @@ const handleEditSuccess = () => {
// 删除
const handleDelete = (record: any) => {
deleteModalRef.value?.open(record, () => {
+ const rvcd = searchRef.value?.searchData?.rvcd ?? 'all';
+ searchRef.value?.clearStcd?.(); // 清空电站选择框
+ currentSearchParams.value = { ...currentSearchParams.value, rstcd: null };
+ shuJuTianBaoStore.getEngOption(rvcd, 'rvcd');
initTable(currentSearchParams.value);
});
};
diff --git a/frontend-sjgl/src/views/conventionalHydropower/FishResource/FishResourceSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/FishResource/FishResourceSearch.vue
index c950541f..0ca980ef 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/FishResource/FishResourceSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/FishResource/FishResourceSearch.vue
@@ -11,7 +11,7 @@
>
新增
- 查看修改
+ 查看操作日志
导出
diff --git a/frontend-sjgl/src/views/conventionalHydropower/aiBox/AiBoxSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/aiBox/AiBoxSearch.vue
index 52575b27..fa4dfb88 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/aiBox/AiBoxSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/aiBox/AiBoxSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/aquaEco/OtweSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/aquaEco/OtweSearch.vue
index 84d34d37..7fc9c729 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/aquaEco/OtweSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/aquaEco/OtweSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/FishSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/FishSearch.vue
index d2eb5118..ea61816f 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/FishSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/FishSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/guoYuSheShi/FpSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/guoYuSheShi/FpSearch.vue
index 2a0715c2..33af776c 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/guoYuSheShi/FpSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/guoYuSheShi/FpSearch.vue
@@ -3,7 +3,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/luShengShengTaiDiaoCha/TeSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/luShengShengTaiDiaoCha/TeSearch.vue
index 531bedab..ad0c3c59 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/luShengShengTaiDiaoCha/TeSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/luShengShengTaiDiaoCha/TeSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/qiXiDi/FhSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/qiXiDi/FhSearch.vue
index 5ada932b..5dd06aaa 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/qiXiDi/FhSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/qiXiDi/FhSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/rescueStation/VaSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/rescueStation/VaSearch.vue
index 18dd6a09..196e6df4 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/rescueStation/VaSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/rescueStation/VaSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/EditEqModal.vue b/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/EditEqModal.vue
index 2ad26852..a9c516e9 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/EditEqModal.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/EditEqModal.vue
@@ -77,11 +77,11 @@
-
+
@@ -97,9 +97,16 @@
-
-
-
+
+
+
@@ -152,7 +159,7 @@ const fieldLabelMap: Record = {
stcd: '设施编码', stnm: '设施名称', sttp: '设施类型', stlc: '站址/位置',
baseId: '水电基地', rstcd: '所属电站', lgtd: '经度(°)', lttd: '纬度(°)',
elev: '高程(m)', swdt: '开工日期', jcdt: '建成日期', bldsttCode: '建设状态',
- inv: '投资(亿元)', flkjg: '放流孔结构形式', flkq: '最大泄放流量(m³/s)',
+ inv: '投资(亿元)', flkq: '最大泄放流量(m³/s)',
minFlow: '最小下泄生态流量(m³/s)', assessMethod: '考核方式', remark: '备注'
};
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/EqSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/EqSearch.vue
index f90b27e7..77559248 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/EqSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/EqSearch.vue
@@ -3,7 +3,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shiPinJianKong/VdSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/shiPinJianKong/VdSearch.vue
index ce613b07..2410b31d 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shiPinJianKong/VdSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shiPinJianKong/VdSearch.vue
@@ -3,7 +3,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shuiShengShengTaiDiaoCha/WeSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/shuiShengShengTaiDiaoCha/WeSearch.vue
index 8d76e111..96d91b65 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shuiShengShengTaiDiaoCha/WeSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shuiShengShengTaiDiaoCha/WeSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/WtSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/WtSearch.vue
index 724b3ddc..5b2ea528 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/WtSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/WtSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/index.vue b/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/index.vue
index d6c41c1e..c90bc8a9 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/index.vue
@@ -235,7 +235,7 @@ const handleAdd = () => {
editVisible.value = true;
};
-// 查看修改
+// 查看操作日志
const handleSeeEdit = () => {
operationLogVisible.value = true;
};
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/EditWqModal.vue b/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/EditWqModal.vue
index 1134facb..4ccc5298 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/EditWqModal.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/EditWqModal.vue
@@ -49,7 +49,8 @@
:key="item.value"
:label="item.label"
:value="item.value"
- >{{ item.label }}
+ >{{ item.label }}
@@ -64,12 +65,22 @@
-
+
-
+
@@ -86,7 +97,8 @@
:key="item.value"
:label="item.label"
:value="item.value"
- >{{ item.label }}
+ >{{ item.label }}
@@ -105,7 +117,8 @@
:key="item.value"
:label="item.label"
:value="item.value"
- >{{ item.label }}
+ >{{ item.label }}
@@ -120,6 +133,18 @@
/>
+
+
+
+ 人工
+ 自动
+
+
+
{{ item.label }}
-
-
-
-
-
-
- 人工
- 自动
+ >{{ item.label }}
@@ -325,7 +339,7 @@ watch(
continue;
const isSelect = !!selectOptionsMap[key];
const oldDisplay = isSelect
- ? (originalLabels.value[key] ?? resolveSelectLabel(key, oldNorm))
+ ? originalLabels.value[key] ?? resolveSelectLabel(key, oldNorm)
: oldNorm === null
? '空'
: String(oldNorm);
@@ -390,27 +404,27 @@ watch(
);
// 选项加载完成后重新解析原始显示名，避免 record 加载时选项未就绪导致存成 code
-watch(
- [baseNameOptions, engInfoOptions, sttpOptions, wwqtgOptions],
- () => {
- const original = originalRecord.value;
- if (!original || Object.keys(original).length === 0) return;
- const labels: Record = {};
- for (const key in original) {
- if (selectOptionsMap[key]) {
- labels[key] = resolveOriginalLabel(key);
- }
+watch([baseNameOptions, engInfoOptions, sttpOptions, wwqtgOptions], () => {
+ const original = originalRecord.value;
+ if (!original || Object.keys(original).length === 0) return;
+ const labels: Record = {};
+ for (const key in original) {
+ if (selectOptionsMap[key]) {
+ labels[key] = resolveOriginalLabel(key);
}
- originalLabels.value = labels;
}
-);
+ originalLabels.value = labels;
+});
const loadEngOptions = async (baseId?: string) => {
engLoading.value = true;
try {
const params = baseId ? { baseId } : {};
const res = await getEngInfoDropdown(params);
- engInfoOptions.value = (res.data || []).map((item: any) => ({ label: item.ennm, value: item.stcd }));
+ engInfoOptions.value = (res.data || []).map((item: any) => ({
+ label: item.ennm,
+ value: item.stcd
+ }));
} catch (error) {
console.error('获取电站列表失败:', error);
} finally {
@@ -451,14 +465,17 @@ const loadDropdownData = () => {
// 从 store 获取水电基地数据（computed 已自动响应，无需手动赋值）
};
-watch(() => formData.value?.baseId, (newBaseId) => {
- // record 加载时已在 record watch 中加载过电站选项，这里仅跳过清空
- if (isInitLoading.value) {
- return;
+watch(
+ () => formData.value?.baseId,
+ newBaseId => {
+ // record 加载时已在 record watch 中加载过电站选项，这里仅跳过清空
+ if (isInitLoading.value) {
+ return;
+ }
+ formData.value.rstcd = undefined;
+ loadEngOptions(newBaseId || undefined);
}
- formData.value.rstcd = undefined;
- loadEngOptions(newBaseId || undefined);
-});
+);
watch(
() => props.open,
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/WqSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/WqSearch.vue
index 9fb69b04..05924f08 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/WqSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/WqSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/index.vue b/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/index.vue
index c91e96dd..ec91deeb 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/index.vue
@@ -87,7 +87,7 @@ const columns = ref([
title: '水质站站码',
dataIndex: 'stcd',
visible: true,
- width: 150,
+ width: 180,
fixed: 'left',
ellipsis: true
},
diff --git a/frontend-sjgl/src/views/conventionalHydropower/sonarCam/SonarSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/sonarCam/SonarSearch.vue
index 969a3706..eb2abd22 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/sonarCam/SonarSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/sonarCam/SonarSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/tempMit/DwSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/tempMit/DwSearch.vue
index 077c7a38..03c30ab0 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/tempMit/DwSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/tempMit/DwSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/tempMit/index.vue b/frontend-sjgl/src/views/conventionalHydropower/tempMit/index.vue
index a19644ba..fcc56792 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/tempMit/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/tempMit/index.vue
@@ -99,7 +99,7 @@ const columns = ref([
title: '设施类型',
dataIndex: 'sttpName',
visible: true,
- width: 100,
+ width: 160,
ellipsis: true
},
{
@@ -107,7 +107,7 @@ const columns = ref([
title: '站址',
dataIndex: 'stlc',
visible: true,
- width: 160,
+ width: 180,
ellipsis: true
},
{
diff --git a/frontend-sjgl/src/views/conventionalHydropower/terrEco/OtteSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/terrEco/OtteSearch.vue
index deb12fa7..2e881430 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/terrEco/OtteSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/terrEco/OtteSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/zengZhiFangLiu/FbSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/zengZhiFangLiu/FbSearch.vue
index ad3f237c..32c193d4 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/zengZhiFangLiu/FbSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/zengZhiFangLiu/FbSearch.vue
@@ -10,7 +10,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/conventionalHydropower/zhenXIZhiWuYuan/VpSearch.vue b/frontend-sjgl/src/views/conventionalHydropower/zhenXIZhiWuYuan/VpSearch.vue
index 655cacf1..91c9b042 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/zhenXIZhiWuYuan/VpSearch.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/zhenXIZhiWuYuan/VpSearch.vue
@@ -3,7 +3,7 @@
{{ isHide ? '展开' : '隐藏' }}
新增
- 查看修改
+ 查看操作日志
diff --git a/frontend-sjgl/src/views/monitorData/FishData/FishDataSearch.vue b/frontend-sjgl/src/views/monitorData/FishData/FishDataSearch.vue
index c5de8cbd..ab6a8cda 100644
--- a/frontend-sjgl/src/views/monitorData/FishData/FishDataSearch.vue
+++ b/frontend-sjgl/src/views/monitorData/FishData/FishDataSearch.vue
@@ -57,7 +57,7 @@
- 查看修改
+ 查看操作日志
批量删除
diff --git a/frontend-sjgl/src/views/monitorData/FishRelease/FishReleaseSearch.vue b/frontend-sjgl/src/views/monitorData/FishRelease/FishReleaseSearch.vue
index 971248f4..fedfbe4d 100644
--- a/frontend-sjgl/src/views/monitorData/FishRelease/FishReleaseSearch.vue
+++ b/frontend-sjgl/src/views/monitorData/FishRelease/FishReleaseSearch.vue
@@ -59,7 +59,7 @@
- 查看修改
+ 查看操作日志
导出
diff --git a/frontend-sjgl/src/views/monitorData/FishRelease/index.vue b/frontend-sjgl/src/views/monitorData/FishRelease/index.vue
index 124ce0e7..a4b12cf6 100644
--- a/frontend-sjgl/src/views/monitorData/FishRelease/index.vue
+++ b/frontend-sjgl/src/views/monitorData/FishRelease/index.vue
@@ -80,7 +80,7 @@ const tableScrollY = ref(0);
const currentSearchParams = ref({});
const exportLoading = ref(false);
-// 查看修改（操作日志）
+// 查看操作日志（操作日志）
const operationLogVisible = ref(false);
// TODO: 操作日志表名待确认
const operationTableName = 'SD_RPIMNFISH_R';
@@ -236,7 +236,7 @@ const initTable = (values: any) => {
tableRef.value.getList(params);
};
-// 查看修改（操作日志）
+// 查看操作日志（操作日志）
const handleSeeEdit = () => {
operationLogVisible.value = true;
};
diff --git a/frontend-sjgl/src/views/monitorData/FlowData/FlowDataSearch.vue b/frontend-sjgl/src/views/monitorData/FlowData/FlowDataSearch.vue
index 56097142..66743c0c 100644
--- a/frontend-sjgl/src/views/monitorData/FlowData/FlowDataSearch.vue
+++ b/frontend-sjgl/src/views/monitorData/FlowData/FlowDataSearch.vue
@@ -63,7 +63,7 @@
- 查看修改
+ 查看操作日志
{
);
};
-// 查看修改（操作日志）
+// 查看操作日志（操作日志）
const handleSeeEdit = () => {
operationLogVisible.value = true;
};
diff --git a/frontend-sjgl/src/views/monitorData/FlowStation/FlowStationSearch.vue b/frontend-sjgl/src/views/monitorData/FlowStation/FlowStationSearch.vue
index 06e100d1..d4dca914 100644
--- a/frontend-sjgl/src/views/monitorData/FlowStation/FlowStationSearch.vue
+++ b/frontend-sjgl/src/views/monitorData/FlowStation/FlowStationSearch.vue
@@ -61,7 +61,7 @@
- 查看修改
+ 查看操作日志
{
);
};
-// 查看修改（操作日志）
+// 查看操作日志（操作日志）
const handleSeeEdit = () => {
operationLogVisible.value = true;
};
diff --git a/frontend-sjgl/src/views/monitorData/SurfaceTemp/SurfaceTempSearch.vue b/frontend-sjgl/src/views/monitorData/SurfaceTemp/SurfaceTempSearch.vue
index 626d5f86..5bb3b239 100644
--- a/frontend-sjgl/src/views/monitorData/SurfaceTemp/SurfaceTempSearch.vue
+++ b/frontend-sjgl/src/views/monitorData/SurfaceTemp/SurfaceTempSearch.vue
@@ -61,7 +61,7 @@
- 查看修改
+ 查看操作日志
{
);
};
-// 查看修改（操作日志）
+// 查看操作日志（操作日志）
const handleSeeEdit = () => {
operationLogVisible.value = true;
};
diff --git a/frontend-sjgl/src/views/monitorData/VerticalTemp/VerticalTempSearch.vue b/frontend-sjgl/src/views/monitorData/VerticalTemp/VerticalTempSearch.vue
index d7e3055c..96df6867 100644
--- a/frontend-sjgl/src/views/monitorData/VerticalTemp/VerticalTempSearch.vue
+++ b/frontend-sjgl/src/views/monitorData/VerticalTemp/VerticalTempSearch.vue
@@ -63,7 +63,7 @@
- 查看修改
+ 查看操作日志
批量删除
diff --git a/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue b/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue
index f8c5d3c5..7a28c4b1 100644
--- a/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue
+++ b/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue
@@ -501,7 +501,7 @@ const handleBatchDelete = () => {
);
};
-// 查看修改（操作日志）
+// 查看操作日志（操作日志）
const handleSeeEdit = () => {
operationLogVisible.value = true;
};
diff --git a/frontend-sjgl/src/views/monitorData/WaterData/WaterDataSearch.vue b/frontend-sjgl/src/views/monitorData/WaterData/WaterDataSearch.vue
index de77ae9e..b1520b54 100644
--- a/frontend-sjgl/src/views/monitorData/WaterData/WaterDataSearch.vue
+++ b/frontend-sjgl/src/views/monitorData/WaterData/WaterDataSearch.vue
@@ -63,7 +63,7 @@
- 查看修改
+ 查看操作日志
{
initTable(currentSearchParams.value);
};
-// 查看修改（操作日志）
+// 查看操作日志（操作日志）
const handleSeeEdit = () => {
operationLogVisible.value = true;
};
diff --git a/frontend-sjgl/src/views/monitorData/fishSurveyData/fishSurveyDataSearch.vue b/frontend-sjgl/src/views/monitorData/fishSurveyData/fishSurveyDataSearch.vue
index c09002b2..3c807f33 100644
--- a/frontend-sjgl/src/views/monitorData/fishSurveyData/fishSurveyDataSearch.vue
+++ b/frontend-sjgl/src/views/monitorData/fishSurveyData/fishSurveyDataSearch.vue
@@ -57,7 +57,7 @@
- 查看修改
+ 查看操作日志
批量删除
diff --git a/frontend/.env.development b/frontend/.env.development
index 069b745b..da81cc8d 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -14,7 +14,7 @@ VITE_APP_BASE_URL = 'http://localhost:8093'
VITE_APP_BASE_URL = 'http://10.84.111.235:8093'
# 李林
# VITE_APP_BASE_URL = 'http://10.84.111.25:8093'
-
+# VITE_APP_BASE_URL = 'http://10.84.111.211:8093'
## 开发环境 附件服务地址
VITE_APP_ATTACHMENT_URL = 'https://211.99.26.225:12125'
## 生产环境 附件服务地址
diff --git a/frontend/src/modules/dianzhanzhuantiMod/DZShuiZhiJianCeQuShiTu/index.vue b/frontend/src/modules/dianzhanzhuantiMod/DZShuiZhiJianCeQuShiTu/index.vue
index 5e3192fd..2ecf41b2 100644
--- a/frontend/src/modules/dianzhanzhuantiMod/DZShuiZhiJianCeQuShiTu/index.vue
+++ b/frontend/src/modules/dianzhanzhuantiMod/DZShuiZhiJianCeQuShiTu/index.vue
@@ -186,13 +186,13 @@ const moreSelectConfig = computed(() => ({
minWidth: '240px'
}));
-/** 日期范围选择器（isShow 控制整个组件显隐，隐藏时仍使用 tagValue 计算的默认区间） */
+/** 日期范围选择器：自动站按天(YYYY-MM-DD)，人工站按年(YYYY)；isShow 控制整个组件显隐，隐藏时仍使用 tagValue 计算的默认区间 */
const scopeDateConfig = computed(() => ({
show: moduleConfig.value?.isShow !== 0,
- value: [defaultDateRange.value[0], defaultDateRange.value[1]] as any,
- picker: 'date' as const,
- format: 'YYYY-MM-DD',
- width: '215px'
+ value: [dateRange.value[0], dateRange.value[1]] as any,
+ picker: (mway.value === '1' ? 'year' : 'date') as const,
+ format: mway.value === '1' ? 'YYYY' : 'YYYY-MM-DD',
+ width: mway.value === '1' ? '170px' : '215px'
}));
// ==================== 树数据转换 ====================
@@ -216,6 +216,7 @@ const buildOption = () => {
indicators.value.forEach((ind, index) => {
const name = ind.unit ? `${ind.name}(${ind.unit})` : ind.name;
+ const isManual = mway.value === '1';
legendData.push(name);
const selIdx = selected.value.indexOf(name);
@@ -253,16 +254,20 @@ const buildOption = () => {
seriesList.push({
name,
- type: 'line',
+ type: isManual ? 'bar' : 'line',
yAxisIndex: index,
- smooth: true,
- showSymbol: (params: any) => {
- const iv = Math.max(0, Math.ceil(xData.value.length / 9) - 1);
- return iv === 0 ? true : params.dataIndex % (iv + 1) === 0;
- },
- symbol: 'circle',
- symbolSize: 2,
- connectNulls: true,
+ ...(isManual
+ ? {}
+ : {
+ smooth: true,
+ showSymbol: (params: any) => {
+ const iv = Math.max(0, Math.ceil(xData.value.length / 9) - 1);
+ return iv === 0 ? true : params.dataIndex % (iv + 1) === 0;
+ },
+ symbol: 'circle',
+ symbolSize: 2,
+ connectNulls: true
+ }),
itemStyle: { color: yAxisColor },
data: echartsData.value[index] || []
});
@@ -299,7 +304,9 @@ const buildOption = () => {
if (!params?.length) return '';
const item = rawDataList.value[params[0].dataIndex];
const fullTime = item?.tm
- ? dayjs(item.tm).format('YYYY-MM-DD HH:mm')
+ ? dayjs(item.tm).format(
+ mway.value === '1' ? 'YYYY' : 'YYYY-MM-DD HH:mm'
+ )
: params[0].name;
let html = `${fullTime}
`;
params.forEach((p: any) => {
@@ -588,7 +595,9 @@ const fetchChartData = async () => {
}));
xData.value = dataSource.map((item: any) =>
- item.name ? dayjs(item.name).format('HH:mm') : '--'
+ item.name
+ ? dayjs(item.name).format(mway.value === '1' ? 'YYYY' : 'HH:mm')
+ : '--'
);
// 转置: echartsData[i] = 第i个指标的所有时间点数据
@@ -632,19 +641,25 @@ const fetchChartData = async () => {
// ==================== 事件处理 ====================
/** SidePanelItem @update-values */
-const onUpdateValues = (payload: any) => {
+const onUpdateValues = async (payload: any) => {
// 测站选择：以回传的 value 为准（避免空的 selectedNodeExtra 覆盖默认值）
if (payload.moreSelect) {
const node = payload.selectedNodeExtra || {};
+ const isSameStation = payload.moreSelect === selectValue.value?.id;
selectValue.value = {
value: node.title || selectValue.value?.value,
id: payload.moreSelect,
opt: node.title ? { ...node } : selectValue.value?.opt
};
- fetchChartData();
+ // 站点未变化（如 fetchStationList 默认选中后的双向同步回传）时不重复请求
+ if (!isSameStation) {
+ // 等待 moreSelect 选中值（v-model 双向同步）完成后再请求图表数据
+ await nextTick();
+ fetchChartData();
+ }
}
- // 日期范围
+ // 日期范围（人工站按年：起止自动扩展到整年）
if (
payload.scopeDate &&
Array.isArray(payload.scopeDate) &&
@@ -653,8 +668,18 @@ const onUpdateValues = (payload: any) => {
const d0 = dayjs(payload.scopeDate[0]);
const d1 = dayjs(payload.scopeDate[1]);
if (d0.isValid() && d1.isValid()) {
- dateRange.value = [d0, d1];
- fetchChartData();
+ const newRange: [Dayjs, Dayjs] =
+ mway.value === '1'
+ ? [d0.startOf('year'), d1.endOf('year')]
+ : [d0, d1];
+ // 区间未变化时不重复请求，避免双向同步造成的循环刷新
+ if (
+ !newRange[0].isSame(dateRange.value[0]) ||
+ !newRange[1].isSame(dateRange.value[1])
+ ) {
+ dateRange.value = newRange;
+ fetchChartData();
+ }
}
}
};
@@ -677,9 +702,18 @@ watch(stcd, newStcd => {
}
});
-/** 监听 mway → 刷新测站列表 + 重建图表 */
+/** 监听 mway → 重置日期范围 + 刷新测站列表 + 重建图表 */
watch(mway, () => {
destroyChart();
+ // 人工站默认最近 3 个整年，自动站恢复默认区间
+ if (mway.value === '1') {
+ dateRange.value = [
+ dayjs().subtract(2, 'year').startOf('year'),
+ dayjs().endOf('year')
+ ];
+ } else {
+ dateRange.value = [defaultDateRange.value[0], defaultDateRange.value[1]];
+ }
nextTick(() => {
fetchStationList();
});
diff --git a/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/BasicDataSearch.vue b/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/BasicDataSearch.vue
index 0ebe972b..f1535ef7 100644
--- a/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/BasicDataSearch.vue
+++ b/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/BasicDataSearch.vue
@@ -21,7 +21,6 @@
v-model:value="ttpwr.max"
:min="0"
placeholder="最大装机"
- @change="handleChange"
/>
@@ -242,12 +241,6 @@ const searchList: any = computed(() => [
}
]);
-const handleChange = (value: any) => {
- if (ttpwr.value.min > value) {
- message.warning('最小装机容量不能大于最大装机容量');
- ttpwr.value.max = null;
- }
-};
const handleRangeClick = (value: any) => {
jcdt.value = {
min: dayjs(value.value[0]).format('YYYY-MM-DD HH:mm:ss'),
@@ -262,6 +255,15 @@ const disabledEndDate = (current: Dayjs) => {
};
const onSearchFinish = (values: any) => {
+ if (
+ ttpwr.value.min != null &&
+ ttpwr.value.max != null &&
+ ttpwr.value.min > ttpwr.value.max
+ ) {
+ message.warning('最小装机容量不能大于最大装机容量');
+ ttpwr.value.max = null;
+ return;
+ }
values.ttpwr = ttpwr.value;
if (jcdt.value?.min) {
values.jcdt.min = dayjs(jcdt.value.min).format('YYYY-MM-DD') + ' 00:00:00';
diff --git a/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/EditPowerModal.vue b/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/EditPowerModal.vue
index ca91b39d..806eaa21 100644
--- a/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/EditPowerModal.vue
+++ b/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/EditPowerModal.vue
@@ -10,7 +10,7 @@
概述
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
水文
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
水库
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
下泄流量及相应下游水位
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -916,7 +916,7 @@
>工程效益指标
-
+
-
+
-
+
-
+
-
+
-
+
-
+
大坝
-
+
-
+
-
+
-
+
其他
-
+
-
+
-
+
-
+
diff --git a/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/index.vue b/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/index.vue
index ca347d85..c46c1e56 100644
--- a/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/index.vue
+++ b/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/index.vue
@@ -134,9 +134,9 @@ const hycdLoading = ref(false);
const isEdit = ref(true);
const dvtpList = ref([
- { label: '堤坝式', value: '0' },
- { label: '引水式', value: '1' },
- { label: '混合式', value: '2' }
+ { label: '堤坝式', value: '1' },
+ { label: '引水式', value: '2' },
+ { label: '混合式', value: '3' }
]);
// 日期列渲染函数
const dateRender = ({ text }: { text: string }) => {
@@ -144,7 +144,12 @@ const dateRender = ({ text }: { text: string }) => {
const date = dayjs(text);
return date.isValid() ? date.format('YYYY-MM-DD') : '-';
};
-
+// 装机容量列渲染函数：接口值为实际值×10，展示时除以10
+const ttpwrRender = ({ text }: { text: any }) => {
+ if (text === null || text === undefined || text === '-') return '-';
+ const num = Number(text);
+ return isNaN(num) ? text : (num / 10).toFixed(2);
+};
// 表格列元数据映射（列宽、排序、固定列、自定义渲染等）
const columnMetaMap: Record = {
stnm: { width: 150, fixed: 'left', sort: true, ellipsis: true },
@@ -211,7 +216,7 @@ const columnMetaMap: Record = {
ksqxyz: { width: 250, sort: true },
gemaxrq: { width: 190, sort: true },
mxgeqxyz: { width: 260, sort: true },
- ttpwr: { width: 120, sort: true, ellipsis: true },
+ ttpwr: { width: 120, sort: true, ellipsis: true,customRender: ttpwrRender },
gncnt: { width: 130, sort: true, ellipsis: true },
gntp: { width: 150, sort: true, ellipsis: true },
grntpwr: { width: 130, sort: true, ellipsis: true },