Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220

This commit is contained in:
joshen
2025-06-15 13:19:16 +08:00

View File

@@ -8,13 +8,14 @@
:class="currentTab === index ? 'tabActive' : 'tabItem'"
@click="tabClick(index)"
>
<a-popover v-if="index==0" trigger="hover" placement="topLeft">
<!-- <a-popover v-if="index==0" trigger="hover" placement="topLeft">
<template #content>
此处数据展示全部单层项目数量列表展示条数与此处数量可能存在差异
</template>
{{ item.text }} ({{ item.num }})
</a-popover>
<span v-else>{{ item.text }} ({{ item.num }})</span>
{{ item.text }}
</a-popover>
<span v-else>{{ item.text }}</span>-->
<span>{{ item.text }}</span>
</div>
</div>
</div>
@@ -607,7 +608,7 @@ export default {
const reset = async () => {
reset_();
getTableData();
getTabData();
//getTabData();
};
const reset_ = () => {
// debugger;
@@ -671,7 +672,7 @@ export default {
? (state.allowClear = true)
: (state.allowClear = false);
getTableData();
getTabData();
//getTabData();
}
};
@@ -824,7 +825,7 @@ export default {
state.pageSize = 10;
state.tableDataTotal = 0;
getTableData();
getTabData();
//getTabData();
};
// cloumns 表头
const columns = ref([]);
@@ -2285,7 +2286,7 @@ export default {
state.tableSorts = [];
tableColSetReset();
getTableData();
getTabData();
//getTabData();
};
const tableColSetReset = () => {