diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index 4bbacf0..f3ed6f7 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -41,6 +41,9 @@ import emitter from '@/utils/mitt' import { formatToDateHMS } from '@/utils/dateUtil' import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter' import DataHeader from '@/components/DataHeader/index.vue' +import console from 'console' + + const emit = defineEmits(['changeShow']) function changeContent() { @@ -482,6 +485,14 @@ async function query(page: number, pageSize: number, filterId?: any, taskName?: // 有过滤配置的时候优先使用过滤配置,不要使用左侧参数 let params = filterId ? { userSearchId: filterId } : asideParmas params = params?.izshowall ? {} : params + + console.log(111,"query函数被调用", { + sortorder: sortorder.value, + pageSize, + currPage: page, + sortname: sortname.value, + taskName, + }) const result = await getFinalList({ sortorder: sortorder.value, pageSize, @@ -499,7 +510,6 @@ async function query(page: number, pageSize: number, filterId?: any, taskName?: } async function handleSorterChange(value) { - console.log(value) let name = value.columnKey if (name === 'fromuptime') name = 'field11' @@ -582,8 +592,9 @@ const scrollX = computed(() => { return width }) - -query(pagination.page, pagination.pageSize) +onMounted(() => { + query(pagination.page, pagination.pageSize) +}) const customTabelRef = ref(null) const importExcelRef = ref(null) @@ -704,7 +715,7 @@ function resetHandler() { // TODO:需要支持重置 // const result = await resetApproval() }, - onNegativeClick: () => {}, + onNegativeClick: () => { }, }) } @@ -811,7 +822,7 @@ function doAudit(param: any) { } }) }, - onNegativeClick: () => {}, + onNegativeClick: () => { }, }) } @@ -856,11 +867,11 @@ async function refreshHandler(searchId?: any) { function filterTableData(keyword) { pagination.page = 1 pagination.pageSize = 10 - if (keyword) - // tableData.value = tableData.value.filter(item => item.id.includes(keyword)) + if (keyword) { query(pagination.page, pagination.pageSize, '', keyword) - else query(pagination.page, pagination.pageSize) + } else { query(pagination.page, pagination.pageSize) } } + defineExpose({ filterTableData, }) @@ -871,20 +882,10 @@ defineExpose({
任务管理列表 - +
- + 小结查重 @@ -903,29 +904,14 @@ defineExpose({ 取消 - + - +
- + @@ -1040,6 +1000,7 @@ defineExpose({ border-radius: 8px; cursor: pointer; } + .wrapper { display: flex; flex: 1; @@ -1185,12 +1146,15 @@ defineExpose({ background: #fff; } } + :deep(.n-data-table .n-data-table-td.n-data-table-td--fixed-right) { z-index: 100 !important; } + :deep(.n-data-table-th__title) { color: #333; } + :deep(.n-data-table .n-data-table-td) { color: #666; } diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue index 8a108a1..05278a0 100644 --- a/src/views/home/aside/comp/Search.vue +++ b/src/views/home/aside/comp/Search.vue @@ -1,5 +1,5 @@ @@ -2151,11 +2037,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") { .small-mark { width: 100%; height: 53px; - background: linear-gradient( - 180deg, - rgba(0, 0, 0, 0.01), - rgba(0, 0, 0, 0.44) 88% - ); + background: linear-gradient(180deg, rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 0.44) 88%); border-radius: 0px 8px 8px 8px; position: absolute; left: 0; diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index 0d531b2..e47ae9e 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -905,14 +905,14 @@ defineExpose({ .left { flex: 0.6; - background-size: auto 346px; - + // background-size: auto 346px; + background-size: cover; background-position: center; background-repeat: no-repeat; border-radius: 8px; position: relative; - width: 632px; - height: 346px; + // width: 632px; + // height: 346px; .preview { position: absolute;