feat: 解决逻辑冲突问题

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
 })
-
+onMounted(() => {
-query(pagination.page, pagination.pageSize)
+  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)
+  if (keyword) {
-    // tableData.value = tableData.value.filter(item => item.id.includes(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({
     <div class="wrapper-header">
       <div class="wrapper-header-left">
         <span class="wrapper-header-font">任务管理列表</span>
-        <SvgIcon
+        <SvgIcon style="cursor: pointer" size="16" name="list-mode" @click="changeContent" />
-          style="cursor: pointer"
-          size="16"
-          name="list-mode"
-          @click="changeContent"
-        />
       </div>
       <div>
-        <SvgIcon
+        <SvgIcon style="margin-right: 6px" size="13" name="summary" @click="showModal(repeatModalRef)" />
-          style="margin-right: 6px"
-          size="13"
-          name="summary"
-          @click="showModal(repeatModalRef)"
-        />
         <NButton class="xjcc" text @click="showModal(repeatModalRef)">
           小结查重
         </NButton>
@@ -903,29 +904,14 @@ defineExpose({
             取消
           </NButton>
 
-          <img
+          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt=""
-            class="btn-approval btn-left"
+            @click.stop="batchReject">
-            src="@/assets/images/task/btn-not-pass.png"
-            alt=""
-            @click.stop="batchReject"
-          >
           <SvgIcon size="24" name="vs" />
-          <img
+          <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
-            class="btn-approval"
-            src="@/assets/images/task/btn-pass.png"
-            alt=""
-            @click.stop="batchApproval"
-          >
         </div>
 
-        <n-popover
+        <n-popover ref="popover" :style="{ padding: '0px' }" style="width: 148px" :show-arrow="false"
-          ref="popover"
+          placement="bottom-start" trigger="click">
-          :style="{ padding: '0px' }"
-          style="width: 148px"
-          :show-arrow="false"
-          placement="bottom-start"
-          trigger="click"
-        >
           <template #trigger>
             <div class="icon-wrap">
               <SvgIcon size="20" name="more-blue" />
@@ -965,46 +951,20 @@ defineExpose({
       </div>
     </div> -->
     <div class="wrapper-settings">
-      <SvgIcon
+      <SvgIcon style="cursor: pointer" size="18" name="column" @click="showModal(customTabelRef)" />
-        style="cursor: pointer"
-        size="18"
-        name="column"
-        @click="showModal(customTabelRef)"
-      />
     </div>
     <div class="wrapper-content">
-      <NDataTable
+      <NDataTable id="table" ref="tableRef" v-model:checked-row-keys="checkedRowKeys" remote :columns="columnsRef"
-        id="table"
+        :scroll-x="scrollX" :max-height="maxHeight" :data="tableData" :loading="loading" :pagination="pagination"
-        ref="tableRef"
+        :row-key="rowKey" @update:page="handlePageChange" @update-page-size="handlePageSizeChange"
-        v-model:checked-row-keys="checkedRowKeys"
+        @update:checked-row-keys="handleCheck" @update:sorter="handleSorterChange" />
-        remote
-        :columns="columnsRef"
-        :scroll-x="scrollX"
-        :max-height="maxHeight"
-        :data="tableData"
-        :loading="loading"
-        :pagination="pagination"
-        :row-key="rowKey"
-        @update:page="handlePageChange"
-        @update-page-size="handlePageSizeChange"
-        @update:checked-row-keys="handleCheck"
-        @update:sorter="handleSorterChange"
-      />
     </div>
 
     <CustomTabelModal ref="customTabelRef" @commit="commitHandler" />
-    <ImportExcelModal
+    <ImportExcelModal ref="importExcelRef" :on-success="sucessHandler" :header-config="headRules" />
-      ref="importExcelRef"
-      :on-success="sucessHandler"
-      :header-config="headRules"
-    />
     <NotPassed ref="notPassModalRef" @success="reload" />
 
-    <RepeatModal
+    <RepeatModal ref="repeatModalRef" @reject="repeatBatchReject" @viewrepeat="showModal(repeatTaskTableModalRef)" />
-      ref="repeatModalRef"
-      @reject="repeatBatchReject"
-      @viewrepeat="showModal(repeatTaskTableModalRef)"
-    />
     <RepeatTaskTableModal ref="repeatTaskTableModalRef" />
   </div>
 </template>
@@ -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;
 }

src/views/home/aside/comp/Search.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { nextTick, onMounted, ref } from 'vue'
+import { nextTick, onMounted, ref, watch } from 'vue'
 import { debounce } from 'lodash-es'
 import { asideMap } from '@/config/aside'
 import type { SearchEntity } from '/#/home'
@@ -62,12 +62,17 @@ const searchName = () => {
   emit('inputChange', searchKeyword.value);
 }
 
+
+
+
 const close = () => {
   searchKeyword.value = "";
   configStore.setSearchValue(searchKeyword.value);
   emit('close');
 }
 
+
+
 const initSerach = () => {
   if (searchContent) {
     emit('showSearch')
@@ -81,7 +86,6 @@ const initSerach = () => {
 onMounted(() => {
   initSerach()
 })
-
 </script>
 
 <template>