数据管理子系统-bug更改
This commit is contained in:
parent
d4882f469c
commit
95812fe6fc
@ -322,7 +322,7 @@ const initTable = (values: any) => {
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -565,7 +565,7 @@ onMounted(() => {
|
||||
init();
|
||||
fetchColumnConfig();
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -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 }}
|
||||
|
||||
@ -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: '备注'
|
||||
};
|
||||
|
||||
|
||||
@ -281,7 +281,7 @@ const handleDelete = (record: any) => {
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -289,7 +289,7 @@ const handleDelete = (record: any) => {
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -265,7 +265,7 @@ const handleDelete = (record: any) => {
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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; }
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -281,7 +281,7 @@ const handleDelete = (record: any) => {
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -241,7 +241,7 @@ const handleDelete = (record: any) => {
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -256,7 +256,7 @@ const handleDetailSuccess = () => {
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -608,7 +608,7 @@ const handleSeeEdit = () => {
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -393,7 +393,7 @@ const initTable = (values: any) => {
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -357,7 +357,7 @@ const initTable = (values: any) => {
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -674,7 +674,7 @@ let resizeObserver: ResizeObserver | null = null;
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
tableScrollY.value = calcTableScrollY();
|
||||
tableScrollY.value = calcTableScrollY(tableRef.value);
|
||||
|
||||
// 初始化图表
|
||||
if (chartRef.value && !chartInstance) {
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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 },
|
||||
@ -196,7 +196,7 @@ const columnMetaMap: Record<string, any> = {
|
||||
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 },
|
||||
|
||||
Loading…
Reference in New Issue
Block a user