From 95812fe6fc4bdc39bfe24d440380e326b37a9fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E5=87=AF?= <2448379534@qq.com>
Date: Tue, 1 Sep 2026 09:12:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86=E5=AD=90?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F-bug=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/conventionalHydropower/Approval/index.vue  |  2 +-
 .../views/conventionalHydropower/BasicData/index.vue |  2 +-
 .../conventionalHydropower/FishResource/index.vue    |  3 ++-
 .../conventionalHydropower/aiBox/EditAiBoxModal.vue  | 12 ------------
 .../src/views/conventionalHydropower/aiBox/index.vue |  2 +-
 .../views/conventionalHydropower/aquaEco/index.vue   |  5 +++--
 .../fishSurvey/EditFishModal.vue                     | 12 +-----------
 .../conventionalHydropower/fishSurvey/index.vue      |  2 +-
 .../conventionalHydropower/guoYuSheShi/index.vue     |  2 +-
 .../luShengShengTaiDiaoCha/index.vue                 |  5 +++--
 .../views/conventionalHydropower/photoBase/index.vue |  2 +-
 .../views/conventionalHydropower/qiXiDi/index.vue    | 12 ++++++------
 .../conventionalHydropower/rescueStation/index.vue   |  4 ++--
 .../shengTaiLiuLiang/index.vue                       |  4 ++--
 .../conventionalHydropower/shiPinJianKong/index.vue  |  6 +++---
 .../shuiShengShengTaiDiaoCha/index.vue               |  5 +++--
 .../conventionalHydropower/shuiWenJianCe/index.vue   |  5 +++--
 .../conventionalHydropower/shuiZhiJianCe/index.vue   |  5 +++--
 .../views/conventionalHydropower/sonarCam/index.vue  |  5 +++--
 .../conventionalHydropower/spawnGround/index.vue     |  2 +-
 .../views/conventionalHydropower/tempMit/index.vue   |  5 +++--
 .../views/conventionalHydropower/terrEco/index.vue   |  5 +++--
 .../conventionalHydropower/yunXingGaoJing/index.vue  |  2 +-
 .../conventionalHydropower/zengZhiFangLiu/index.vue  |  2 +-
 .../conventionalHydropower/zhenXIZhiWuYuan/index.vue |  4 +---
 frontend-sjgl/src/views/monitorData/Export/index.vue |  2 +-
 .../monitorData/FishData/EditFishDataManualModal.vue |  4 ++--
 .../src/views/monitorData/FishData/index.vue         |  6 +++---
 .../src/views/monitorData/FishRelease/index.vue      |  2 +-
 .../src/views/monitorData/FlowData/index.vue         |  2 +-
 .../src/views/monitorData/FlowStation/index.vue      |  2 +-
 .../src/views/monitorData/SurfaceTemp/index.vue      |  2 +-
 .../src/views/monitorData/VerticalTemp/index.vue     |  2 +-
 .../src/views/monitorData/WaterData/index.vue        |  7 +++++--
 .../src/views/monitorData/fishSurveyData/index.vue   |  6 +++---
 .../conventionalHydropower/BasicData/index.vue       |  8 ++++----
 36 files changed, 73 insertions(+), 85 deletions(-)

diff --git a/frontend-sjgl/src/views/conventionalHydropower/Approval/index.vue b/frontend-sjgl/src/views/conventionalHydropower/Approval/index.vue
index 0b22fb32..157923d9 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/Approval/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/Approval/index.vue
@@ -322,7 +322,7 @@ const initTable = (values: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue b/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue
index 81090fc5..8cdd7ed5 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue
@@ -565,7 +565,7 @@ onMounted(() => {
   init();
   fetchColumnConfig();
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/FishResource/index.vue b/frontend-sjgl/src/views/conventionalHydropower/FishResource/index.vue
index b70cf893..b9a49ba3 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/FishResource/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/FishResource/index.vue
@@ -95,8 +95,9 @@
                 margin-top: 10px;
                 font-size: 18px;
                 color: rgba(0, 0, 0, 0.85);
-                max-height: 440px;
+                max-height: 350px;
                 overflow-y: scroll;
+                padding: 10px 10px;
               "
             >
               {{ fishResource.shapedesc }}
diff --git a/frontend-sjgl/src/views/conventionalHydropower/aiBox/EditAiBoxModal.vue b/frontend-sjgl/src/views/conventionalHydropower/aiBox/EditAiBoxModal.vue
index e25979bd..b75ff495 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/aiBox/EditAiBoxModal.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/aiBox/EditAiBoxModal.vue
@@ -217,17 +217,6 @@
             />
           </a-form-item>
         </a-col>
-        <a-col :span="24">
-          <a-form-item label="简介" name="introduce" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
-            <a-textarea
-              v-model:value="formData.introduce"
-              placeholder="请输入简介"
-              :maxlength="1000"
-              show-count
-              :rows="2"
-            />
-          </a-form-item>
-        </a-col>
         <a-col :span="24">
           <a-form-item label="备注" name="remark" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
             <a-textarea
@@ -322,7 +311,6 @@ const fieldLabelMap: Record<string, string> = {
   siminfo: 'SIM卡信息',
   lxr: '联系人',
   purpose: '用途',
-  introduce: '简介',
   remark: '备注'
 };
 
diff --git a/frontend-sjgl/src/views/conventionalHydropower/aiBox/index.vue b/frontend-sjgl/src/views/conventionalHydropower/aiBox/index.vue
index cd68a11a..137d782f 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/aiBox/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/aiBox/index.vue
@@ -281,7 +281,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/aquaEco/index.vue b/frontend-sjgl/src/views/conventionalHydropower/aquaEco/index.vue
index 673badc6..5d98e0fa 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/aquaEco/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/aquaEco/index.vue
@@ -158,7 +158,8 @@ const columns = ref<any[]>([
     title: '备注',
     dataIndex: 'remark',
     visible: true,
-    ellipsis: true
+    ellipsis: true,
+    width: 320
   },
   {
     key: 'action',
@@ -269,7 +270,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/EditFishModal.vue b/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/EditFishModal.vue
index cd70230c..85a45d82 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/EditFishModal.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/EditFishModal.vue
@@ -226,17 +226,7 @@
             />
           </a-form-item>
         </a-col>
-        <a-col :span="24">
-          <a-form-item label="简介" name="introduce" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
-            <a-textarea
-              v-model:value="formData.introduce"
-              placeholder="请输入简介"
-              :maxlength="1000"
-              show-count
-              :rows="2"
-            />
-          </a-form-item>
-        </a-col>
+       
         <a-col :span="24">
           <a-form-item label="备注" name="remark" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
             <a-textarea
diff --git a/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/index.vue b/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/index.vue
index 1d19f5f6..09e2207c 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/fishSurvey/index.vue
@@ -289,7 +289,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/guoYuSheShi/index.vue b/frontend-sjgl/src/views/conventionalHydropower/guoYuSheShi/index.vue
index 3c2dba9d..f49a6b9e 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/guoYuSheShi/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/guoYuSheShi/index.vue
@@ -83,7 +83,7 @@ const handleEditSuccess = () => { initTable(currentSearchParams.value); };
 const deleteFpFn = async (record: any, reason: string) => deleteFpInfo({ ids: [record.stcd], source: reason });
 const handleDelete = (record: any) => { deleteModalRef.value?.open(record, () => initTable(currentSearchParams.value)); };
 
-onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(); }); });
+onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(tableRef.value); }); });
 </script>
 
 <style scoped lang="scss">
diff --git a/frontend-sjgl/src/views/conventionalHydropower/luShengShengTaiDiaoCha/index.vue b/frontend-sjgl/src/views/conventionalHydropower/luShengShengTaiDiaoCha/index.vue
index 590c6fa8..7695e51e 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/luShengShengTaiDiaoCha/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/luShengShengTaiDiaoCha/index.vue
@@ -144,7 +144,8 @@ const columns = ref<any[]>([
     title: '备注',
     dataIndex: 'remark',
     visible: true,
-    ellipsis: true
+    ellipsis: true,
+    width:280
   },
   {
     key: 'action',
@@ -259,7 +260,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/photoBase/index.vue b/frontend-sjgl/src/views/conventionalHydropower/photoBase/index.vue
index 1fe9b93f..5677998c 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/photoBase/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/photoBase/index.vue
@@ -265,7 +265,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/qiXiDi/index.vue b/frontend-sjgl/src/views/conventionalHydropower/qiXiDi/index.vue
index abf4a7ec..a33190fc 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/qiXiDi/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/qiXiDi/index.vue
@@ -63,14 +63,14 @@ const deleteModalRef = ref();
 const operationLogVisible = ref(false);
 
 const columns = ref<any[]>([
-   { key: 'stnm', title: '栖息地名称', dataIndex: 'stnm', visible: true, width: 260, ellipsis: true },
+   { key: 'stnm', title: '栖息地名称', dataIndex: 'stnm', visible: true, width: 300, ellipsis: true },
   { key: 'stcd', title: '栖息地站码', dataIndex: 'stcd', visible: true, width: 320,  ellipsis: true },
   { key: 'baseName', title: '水电基地', dataIndex: 'baseName', visible: true, width: 120, ellipsis: true },
   { key: 'ennm', title: '所属电站', dataIndex: 'ennm', visible: true, width: 150, ellipsis: true },
-  { key: 'bhdx', title: '保护对象', dataIndex: 'bhdx', visible: true, width: 240, ellipsis: true },
-  { key: 'bhhl', title: '保护河流', dataIndex: 'bhhl', visible: true, width: 140, ellipsis: true },
-  { key: 'bhhd', title: '保护河段', dataIndex: 'bhhd', visible: true, width: 240, ellipsis: true },
-  { key: 'bhfw', title: '保护范围', dataIndex: 'bhfw', visible: true, width: 240, ellipsis: true },
+  { key: 'bhdx', title: '保护对象', dataIndex: 'bhdx', visible: true, width: 300, ellipsis: true },
+  { key: 'bhhl', title: '保护河流', dataIndex: 'bhhl', visible: true, width: 200, ellipsis: true },
+  { key: 'bhhd', title: '保护河段', dataIndex: 'bhhd', visible: true, width: 280, ellipsis: true },
+  { key: 'bhfw', title: '保护范围', dataIndex: 'bhfw', visible: true, width: 280, ellipsis: true },
   { key: 'bhhxcd', title: '保护核心长度(km)', dataIndex: 'bhhxcd', visible: true, width: 140 },
   
   { key: 'bhcs', title: '保护措施', dataIndex: 'bhcs', visible: true, width: 120, ellipsis: true },
@@ -108,7 +108,7 @@ const deleteFhFn = async (record: any, reason: string) => deleteFhInfo({ ids: [r
 
 const handleDelete = (record: any) => { deleteModalRef.value?.open(record, () => initTable(currentSearchParams.value)); };
 
-onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(); }); });
+onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(tableRef.value); }); });
 </script>
 
 <style scoped lang="scss">
diff --git a/frontend-sjgl/src/views/conventionalHydropower/rescueStation/index.vue b/frontend-sjgl/src/views/conventionalHydropower/rescueStation/index.vue
index 8b3c1fc5..6f9ea3c8 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/rescueStation/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/rescueStation/index.vue
@@ -34,7 +34,7 @@ const columns = ref<any[]>([
   { key: 'place', title: '地点', dataIndex: 'place', visible: true, width: 120, ellipsis: true },
   { key: 'usflName', title: '是否启用', dataIndex: 'usflName', visible: true, width: 80, ellipsis: true },
   { key: 'jcdt', title: '建成日期', dataIndex: 'jcdt', visible: true, width: 110, customRender: ({ text }) => { if (!text || text === '-') return '-'; const date = dayjs(text); return date.isValid() ? date.format('YYYY-MM-DD') : '-'; } },
-  { key: 'remark', title: '备注', dataIndex: 'remark', visible: true, ellipsis: true },
+  { key: 'remark', title: '备注', dataIndex: 'remark', visible: true, ellipsis: true, width: 380 },
   { key: 'action', title: '操作', dataIndex: 'action', fixed: 'right', width: 120 }
 ]);
 const tableScrollX = computed(() => Math.max(columns.value.reduce((sum: number, col: any) => sum + (col.width || 180), 0), 600));
@@ -48,7 +48,7 @@ const handleEdit = (record: any) => { isAdd.value = false; editRecord.value = {
 const handleEditSuccess = () => { initTable(currentSearchParams.value); };
 const deleteVaFn = async (record: any, reason: string) => deleteVaInfo({ ids: [record.stcd], source: reason });
 const handleDelete = (record: any) => { deleteModalRef.value?.open(record, () => { initTable(currentSearchParams.value); }); };
-onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(); }); });
+onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(tableRef.value); }); });
 </script>
 <style scoped lang="scss">
 .body_one { position: relative; z-index: 900; pointer-events: all; }
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/index.vue b/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/index.vue
index f215f6c2..df998500 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/index.vue
@@ -52,7 +52,7 @@ const columns = ref<any[]>([
   { key: 'minFlow', title: '最小下泄流量(m³/s)', dataIndex: 'minFlow', visible: true, width: 150 },
    { key: 'swdt', title: '开工日期', dataIndex: 'swdt', visible: true, width: 110, customRender: ({ text }) => { if (!text || text === '-') return '-'; const date = dayjs(text); return date.isValid() ? date.format('YYYY-MM-DD') : '-'; } },
   { key: 'jcdt', title: '建成日期', dataIndex: 'jcdt', visible: true, width: 110, customRender: ({ text }) => { if (!text || text === '-') return '-'; const date = dayjs(text); return date.isValid() ? date.format('YYYY-MM-DD') : '-'; } },
-  { key: 'stlc', title: '站址/位置', dataIndex: 'stlc', visible: true,  ellipsis: true },
+  { key: 'stlc', title: '站址/位置', dataIndex: 'stlc', visible: true,  ellipsis: true, width: 300 },
   { key: 'action', title: '操作', dataIndex: 'action', fixed: 'right', width: 120 }
 ]);
 
@@ -80,7 +80,7 @@ const handleEditSuccess = () => { initTable(currentSearchParams.value); };
 const deleteEqFn = async (record: any, reason: string) => deleteEqInfo({ ids: [record.stcd], source: reason });
 const handleDelete = (record: any) => { deleteModalRef.value?.open(record, () => initTable(currentSearchParams.value)); };
 
-onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(); }); });
+onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(tableRef.value); }); });
 </script>
 
 <style scoped lang="scss">
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shiPinJianKong/index.vue b/frontend-sjgl/src/views/conventionalHydropower/shiPinJianKong/index.vue
index bf3fa773..65ceaf7f 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shiPinJianKong/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shiPinJianKong/index.vue
@@ -39,13 +39,13 @@ const operationLogVisible = ref(false);
 
 const columns = ref<any[]>([
   { key: 'stnm', title: '监控点名', dataIndex: 'stnm', visible: true, width: 200, ellipsis: true },
-  { key: 'stcd', title: '监控点编码', dataIndex: 'stcd', visible: true, width: 300, fixed: 'left', ellipsis: true },
+  { key: 'stcd', title: '监控点编码', dataIndex: 'stcd', visible: true, width: 280, fixed: 'left', ellipsis: true },
   { key: 'sttpName', title: '监控点类型', dataIndex: 'sttpName', visible: true, width: 140, ellipsis: true },
   { key: 'baseName', title: '水电基地', dataIndex: 'baseName', visible: true, width: 120, ellipsis: true },
   { key: 'ennm', title: '所属电站', dataIndex: 'ennm', visible: true, width: 100, ellipsis: true },
   { key: 'addvcdName', title: '所属行政区', dataIndex: 'addvcdName', visible: true, width: 120, ellipsis: true },
   
-  { key: 'stlc', title: '监控点地址', dataIndex: 'stlc', visible: true,  ellipsis: true },
+  { key: 'stlc', title: '监控点地址', dataIndex: 'stlc', visible: true,  ellipsis: true , width: 280},
   { key: 'action', title: '操作', dataIndex: 'action', fixed: 'right', width: 120 }
 ]);
 
@@ -73,7 +73,7 @@ const handleEditSuccess = () => { initTable(currentSearchParams.value); };
 const deleteVdFn = async (record: any, reason: string) => deleteVdInfo({ ids: [record.stcd], source: reason });
 const handleDelete = (record: any) => { deleteModalRef.value?.open(record, () => initTable(currentSearchParams.value)); };
 
-onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(); }); });
+onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(tableRef.value); }); });
 </script>
 
 <style scoped lang="scss">
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shuiShengShengTaiDiaoCha/index.vue b/frontend-sjgl/src/views/conventionalHydropower/shuiShengShengTaiDiaoCha/index.vue
index c4158161..7715ffb0 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shuiShengShengTaiDiaoCha/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shuiShengShengTaiDiaoCha/index.vue
@@ -136,7 +136,7 @@ const columns = ref<any[]>([
     title: '站址',
     dataIndex: 'stlc',
     visible: true,
-    width: 240,
+    width: 300,
     ellipsis: true
   },
   {
@@ -144,6 +144,7 @@ const columns = ref<any[]>([
     title: '备注',
     dataIndex: 'remark',
     visible: true,
+    width: 300,
     ellipsis: true
   },
   {
@@ -259,7 +260,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/index.vue b/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/index.vue
index c90bc8a9..b13acfea 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/index.vue
@@ -149,7 +149,8 @@ const columns = ref<any[]>([
     title: '站址',
     dataIndex: 'stlc',
     visible: true,
-    ellipsis: true
+    ellipsis: true,
+    width: 320
   },
  
  
@@ -268,7 +269,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/index.vue b/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/index.vue
index ec91deeb..32077281 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/index.vue
@@ -159,7 +159,8 @@ const columns = ref<any[]>([
     title: '站址',
     dataIndex: 'stlc',
     visible: true,
-    ellipsis: true
+    ellipsis: true,
+     width: 280
   },
   {
     key: 'action',
@@ -250,7 +251,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/sonarCam/index.vue b/frontend-sjgl/src/views/conventionalHydropower/sonarCam/index.vue
index 1a13ae87..ee899cae 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/sonarCam/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/sonarCam/index.vue
@@ -158,7 +158,8 @@ const columns = ref<any[]>([
     title: '备注',
     dataIndex: 'remark',
     visible: true,
-    ellipsis: true
+    ellipsis: true,
+     width: 300,
   },
   {
     key: 'action',
@@ -269,7 +270,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/spawnGround/index.vue b/frontend-sjgl/src/views/conventionalHydropower/spawnGround/index.vue
index 8ee14689..f1fb86f1 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/spawnGround/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/spawnGround/index.vue
@@ -281,7 +281,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/tempMit/index.vue b/frontend-sjgl/src/views/conventionalHydropower/tempMit/index.vue
index fcc56792..faca9f37 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/tempMit/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/tempMit/index.vue
@@ -159,7 +159,8 @@ const columns = ref<any[]>([
     title: '备注',
     dataIndex: 'remark',
     visible: true,
-    ellipsis: true
+    ellipsis: true,
+    width: 280,
   },
   {
     key: 'action',
@@ -274,7 +275,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/terrEco/index.vue b/frontend-sjgl/src/views/conventionalHydropower/terrEco/index.vue
index 33b8266b..cee768db 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/terrEco/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/terrEco/index.vue
@@ -159,7 +159,8 @@ const columns = ref<any[]>([
     title: '备注',
     dataIndex: 'remark',
     visible: true,
-    ellipsis: true
+    ellipsis: true,
+     width: 320
   },
   {
     key: 'action',
@@ -274,7 +275,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/yunXingGaoJing/index.vue b/frontend-sjgl/src/views/conventionalHydropower/yunXingGaoJing/index.vue
index 8554be30..aab512bc 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/yunXingGaoJing/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/yunXingGaoJing/index.vue
@@ -241,7 +241,7 @@ const handleDelete = (record: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/conventionalHydropower/zengZhiFangLiu/index.vue b/frontend-sjgl/src/views/conventionalHydropower/zengZhiFangLiu/index.vue
index a508259d..7acc1f45 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/zengZhiFangLiu/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/zengZhiFangLiu/index.vue
@@ -90,7 +90,7 @@ const handleEditSuccess = () => { initTable(currentSearchParams.value); };
 const deleteFbFn = async (record: any, reason: string) => deleteFbInfo({ ids: [record.stcd], source: reason });
 const handleDelete = (record: any) => { deleteModalRef.value?.open(record, () => initTable(currentSearchParams.value)); };
 
-onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(); }); });
+onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(tableRef.value); }); });
 </script>
 
 <style scoped lang="scss">
diff --git a/frontend-sjgl/src/views/conventionalHydropower/zhenXIZhiWuYuan/index.vue b/frontend-sjgl/src/views/conventionalHydropower/zhenXIZhiWuYuan/index.vue
index e214dc8d..7e6310db 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/zhenXIZhiWuYuan/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/zhenXIZhiWuYuan/index.vue
@@ -43,8 +43,6 @@ const columns = ref<any[]>([
   { key: 'stcd', title: '植物园编码', dataIndex: 'stcd', visible: true, width: 150, fixed: 'left', ellipsis: true },
   { key: 'baseName', title: '水电基地', dataIndex: 'baseName', visible: true, width: 120, ellipsis: true },
   { key: 'ennm', title: '所属电站', dataIndex: 'ennm', visible: true, width: 150, ellipsis: true },
- 
-
   { key: 'area', title: '面积(km²)', dataIndex: 'area', visible: true, width: 120 },
   { key: 'inv', title: '投资(亿元)', dataIndex: 'inv', visible: true, width: 120 },
    { key: 'swdt', title: '开工日期', dataIndex: 'swdt', visible: true, width: 110, customRender: ({ text }) => { if (!text || text === '-') return '-'; const date = dayjs(text); return date.isValid() ? date.format('YYYY-MM-DD') : '-'; } },
@@ -78,7 +76,7 @@ const handleEditSuccess = () => { initTable(currentSearchParams.value); };
 const deleteVpFn = async (record: any, reason: string) => deleteVpInfo({ ids: [record.stcd], source: reason });
 const handleDelete = (record: any) => { deleteModalRef.value?.open(record, () => initTable(currentSearchParams.value)); };
 
-onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(); }); });
+onMounted(() => { nextTick(() => { tableScrollY.value = calcTableScrollY(tableRef.value); }); });
 </script>
 
 <style scoped lang="scss">
diff --git a/frontend-sjgl/src/views/monitorData/Export/index.vue b/frontend-sjgl/src/views/monitorData/Export/index.vue
index f19795c6..d9a70e05 100644
--- a/frontend-sjgl/src/views/monitorData/Export/index.vue
+++ b/frontend-sjgl/src/views/monitorData/Export/index.vue
@@ -454,7 +454,7 @@ const getExstatus = async (taskId, exportParams) => {
       getExstatus(taskId, exportParams);
     }, 5000);
   } else if (res1.status == 'DONE') {
-    const blob = await qgcExportdownload({ taskId: taskId, ...exportParams });
+    const { data: blob } = await qgcExportdownload({ taskId: taskId, ...exportParams });
     // 触发浏览器下载
     const url = window.URL.createObjectURL(blob);
     const a = document.createElement('a');
diff --git a/frontend-sjgl/src/views/monitorData/FishData/EditFishDataManualModal.vue b/frontend-sjgl/src/views/monitorData/FishData/EditFishDataManualModal.vue
index 138355df..a8b46546 100644
--- a/frontend-sjgl/src/views/monitorData/FishData/EditFishDataManualModal.vue
+++ b/frontend-sjgl/src/views/monitorData/FishData/EditFishDataManualModal.vue
@@ -171,7 +171,7 @@
           <a-form-item
             label="图片"
             name="picpth"
-            :label-col="{ span: 3 }"
+            :label-col="{ span: 4 }"
             :wrapper-col="{ span: 21 }"
           >
             <a-upload
@@ -196,7 +196,7 @@
           <a-form-item
             label="视频"
             name="vdpth"
-            :label-col="{ span: 3 }"
+            :label-col="{ span: 4 }"
             :wrapper-col="{ span: 21 }"
           >
             <a-upload
diff --git a/frontend-sjgl/src/views/monitorData/FishData/index.vue b/frontend-sjgl/src/views/monitorData/FishData/index.vue
index 4473c69a..9d45c953 100644
--- a/frontend-sjgl/src/views/monitorData/FishData/index.vue
+++ b/frontend-sjgl/src/views/monitorData/FishData/index.vue
@@ -148,7 +148,7 @@ const deleteLabel = computed(() =>
   isManual.value ? '过鱼人工数据' : '过鱼自动数据'
 );
 const operationTableName = computed(() =>
-  isManual.value ? 'SD_FPSS_R' : 'SD_FPSS_A'
+  isManual.value ? 'SD_FPSS_R' : 'SD_FPSSRL_R'
 );
 
 // 多选相关
@@ -557,7 +557,7 @@ const exportBtn = () => {
 
 const initTable = (values: any) => {
   console.log(values);
-  const filters = [
+  const filters: any[] = [
     values.rvcd && values.rvcd !== 'all'
       ? {
           field: 'rvcd',
@@ -689,7 +689,7 @@ const handleSeeEdit = () => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/monitorData/FishRelease/index.vue b/frontend-sjgl/src/views/monitorData/FishRelease/index.vue
index a4b12cf6..bcd2e0d9 100644
--- a/frontend-sjgl/src/views/monitorData/FishRelease/index.vue
+++ b/frontend-sjgl/src/views/monitorData/FishRelease/index.vue
@@ -256,7 +256,7 @@ const handleDetailSuccess = () => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/monitorData/FlowData/index.vue b/frontend-sjgl/src/views/monitorData/FlowData/index.vue
index 169c4870..edadcbfc 100644
--- a/frontend-sjgl/src/views/monitorData/FlowData/index.vue
+++ b/frontend-sjgl/src/views/monitorData/FlowData/index.vue
@@ -608,7 +608,7 @@ const handleSeeEdit = () => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/monitorData/FlowStation/index.vue b/frontend-sjgl/src/views/monitorData/FlowStation/index.vue
index 530557f3..65146d4f 100644
--- a/frontend-sjgl/src/views/monitorData/FlowStation/index.vue
+++ b/frontend-sjgl/src/views/monitorData/FlowStation/index.vue
@@ -393,7 +393,7 @@ const initTable = (values: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/monitorData/SurfaceTemp/index.vue b/frontend-sjgl/src/views/monitorData/SurfaceTemp/index.vue
index c69c3cbf..61173ad0 100644
--- a/frontend-sjgl/src/views/monitorData/SurfaceTemp/index.vue
+++ b/frontend-sjgl/src/views/monitorData/SurfaceTemp/index.vue
@@ -357,7 +357,7 @@ const initTable = (values: any) => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue b/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue
index 7a28c4b1..8b1fa036 100644
--- a/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue
+++ b/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue
@@ -674,7 +674,7 @@ let resizeObserver: ResizeObserver | null = null;
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
 
     // 初始化图表
     if (chartRef.value && !chartInstance) {
diff --git a/frontend-sjgl/src/views/monitorData/WaterData/index.vue b/frontend-sjgl/src/views/monitorData/WaterData/index.vue
index 7189a871..4f280089 100644
--- a/frontend-sjgl/src/views/monitorData/WaterData/index.vue
+++ b/frontend-sjgl/src/views/monitorData/WaterData/index.vue
@@ -17,7 +17,7 @@
     <BasicTable
       ref="tableRef"
       :enable-row-selection="currentSearchParams.timeScale === 'tm'"
-      row-key="stcd"
+      :row-key="getRowKey"
       :scrollX="tableScrollX"
       :scrollY="tableScrollY"
       :columns="Columns"
@@ -122,6 +122,9 @@ const tableScrollY = ref<string | number>(0);
 const currentSearchParams = ref<any>({});
 const exportLoading = ref(false);
 
+// 行唯一标识：stcd + tm 组合，避免仅用 stcd 导致同站多时段数据行冲突
+const getRowKey = (record: any) => `${record.stcd}_${record.tm}`;
+
 // 编辑相关
 const editVisible = ref(false);
 const editRecord = ref<any>(null);
@@ -510,7 +513,7 @@ const handleSeeEdit = () => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend-sjgl/src/views/monitorData/fishSurveyData/index.vue b/frontend-sjgl/src/views/monitorData/fishSurveyData/index.vue
index 3c91c891..e8030d91 100644
--- a/frontend-sjgl/src/views/monitorData/fishSurveyData/index.vue
+++ b/frontend-sjgl/src/views/monitorData/fishSurveyData/index.vue
@@ -236,7 +236,7 @@ const columnsAuto: any[] = [
     title: '鱼速度(m/s)',
     dataIndex: 'fishspeed',
     sort: true,
-    width: 80,
+    width: 120,
     customRender: ({ text }: any) => {
       const num = parseFloat(text);
       return isNaN(num) ? '-' : num.toFixed(2);
@@ -389,7 +389,7 @@ const exportBtn = () => {
 
 const initTable = (values: any) => {
   console.log(values);
-  const filters = [
+  const filters :any= [
     values.rvcd && values.rvcd !== 'all'
       ? {
           field: 'rvcd',
@@ -515,7 +515,7 @@ const handleSeeEdit = () => {
 
 onMounted(() => {
   nextTick(() => {
-    tableScrollY.value = calcTableScrollY();
+    tableScrollY.value = calcTableScrollY(tableRef.value);
   });
 });
 </script>
diff --git a/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/index.vue b/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/index.vue
index b8e8160f..1b714c0d 100644
--- a/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/index.vue
+++ b/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/BasicData/index.vue
@@ -129,11 +129,11 @@ const columnMetaMap: Record<string, any> = {
   addvcdName: { width: 150, sort: true, ellipsis: true },
   stlc:     { width: 200, sort: true, ellipsis: true },
   baseName: { width: 120, ellipsis: true },
-  jcdt:     { width: 120, sort: true, ellipsis: true, customRender: dateRender },
+  jcdt:     { width: 180, sort: true, ellipsis: true, customRender: dateRender },
   piodt:    { width: 160, sort: true, ellipsis: true, customRender: dateRender },
   aiodt:    { width: 150, sort: true, ellipsis: true, customRender: dateRender },
   bldsttCcodeName: { width: 100, sort: true, ellipsis: true },
-  hynm:     { width: 150, sort: true, ellipsis: true },
+  hynm:     { width: 240, sort: true, ellipsis: true },
   topHynm:  { width: 150, sort: true, ellipsis: true },
   nrupar:   { width: 180, sort: true },
   dstcrvr:  { width: 150, sort: true },
@@ -189,14 +189,14 @@ const columnMetaMap: Record<string, any> = {
   ksqxyz:   { width: 250, sort: true },
   gemaxrq:  { width: 190, sort: true },
   mxgeqxyz: { width: 260, sort: true },
-  ttpwr:    { width: 120, sort: true, ellipsis: true,customRender: ttpwrRender },
+  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 },
   yrge:     { width: 200, sort: true },
   ushr:     { width: 150, sort: true },
   k:        { width: 150, sort: true, ellipsis: true },
-  dmtp:     { width: 100, sort: true, ellipsis: true },
+  dmtp:     { width: 150, sort: true, ellipsis: true },
   dmcrel:   { width: 130, sort: true },
   mxdmhg:   { width: 120, sort: true },
   dmlen:    { width: 130, sort: true },