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); }); }); 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); }); }); 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 @@ /> - - - - - = { 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); }); }); 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([ 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); }); }); 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 @@ /> - - - - - + { onMounted(() => { nextTick(() => { - tableScrollY.value = calcTableScrollY(); + tableScrollY.value = calcTableScrollY(tableRef.value); }); }); 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); }); });