Merge branch 'test' into fix/styleProblem

src/store/modules/asideConfig.ts

@@ -34,7 +34,7 @@ export const useAsideConfigStore = defineStore({
       return this.customConfig
     },
     getAsideValue(): any {
-      return this.asideValue
+      return this.asideValue || {}
     },
     getSearchValue(): any {
       return this.searchValue

src/views/final/comp/RepeatTaskTableModal.vue

@@ -64,12 +64,12 @@ const columns: DataTableColumns<RowData> = [
     title: '任务ID',
     key: 'id',
     fixed: 'left',
-    width: 180,
+    width: 200,
     ellipsis: {
       tooltip: true,
     },
     render(row: any) {
-      return row.fromtaskname
+      return row.fromtaskid
     },
   },
   {

src/views/final/content/Content.vue

@@ -248,9 +248,7 @@ async function getColumns() {
   // #endregion
 
   columnsRef.value.push(actionsColumns as any)
-  console.log(columnsRef.value, 'columnsRef111')
   formatColumns()
-  console.log(columnsRef.value, 'columnsRef222')
 }
 
 async function formatColumns() {
@@ -278,7 +276,7 @@ async function formatColumns() {
             'text-color': '#507AFD',
             'onClick': () => goDetail(row),
           },
-          { default: () => row.fromtaskname },
+          { default: () => row.fromtaskid },
         )
       },
     }
@@ -463,7 +461,7 @@ const dialog = useDialog()
 const message = useMessage()
 const finalStore = useFinal()
 
-async function query(page: number, pageSize: number, filterId?: any) {
+async function query(page: number, pageSize: number, filterId?: any,taskName?:string) {
   const asideParmas = unref(finalStore.getAsideValue)
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   const params = filterId ? { userSearchId: filterId } : asideParmas
@@ -472,6 +470,7 @@ async function query(page: number, pageSize: number, filterId?: any) {
     pageSize,
     currPage: page,
     sortname: 'states',
+    taskName:taskName,
     ...params,
   })
   const { data, pageCount, totalCount } = result
@@ -570,7 +569,7 @@ function exportHandler() {
       '更新时间',
     ]
     const filterVal = [
-      'id',
+      'pictureid',
       'name',
       'approvalnode',
       'approvalstatus',
@@ -801,8 +800,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))
+    // tableData.value = tableData.value.filter(item => item.id.includes(keyword))
+    query(pagination.page, pagination.pageSize,'',keyword)
   else
     query(pagination.page, pagination.pageSize)
 }

src/views/final/index.vue

@@ -5,9 +5,10 @@ import Content from './content/Content.vue'
 import ListContent from './content/ListContent.vue'
 
 const showList = ref(false);
-const contentRef = ref(null);
+const contentRef:any = ref(null);
 const inputChange = (keyword)=>{
   contentRef.value.filterTableData(keyword)
+  
 }
 
 </script>

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

@@ -54,6 +54,7 @@ function selectHandler(item: SearchEntity) {
 // 模糊搜索
 const searchName = () => {
   configStore.setSearchValue(searchKeyword.value);
+  emit('inputChange',searchKeyword.value);
 }
 
 const close = () => {

src/views/home/content/Content.vue

@@ -387,7 +387,7 @@ async function commitHandler(settingParam) {
   modal.showModal();
   createPackage(params).then((res) => {
     if (res.code === "OK") {
-      message.success(res.data);
+      message.success(res.message);
       packageIdRef.value = res.data.id;
       modal.closeModal();
       finishModal.showModal();

src/views/home/content/modal/CheckingTaskModal.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { defineOptions, ref } from 'vue';
+import { defineOptions, onMounted, ref, onBeforeUnmount } from 'vue';
 import { useRouter } from 'vue-router';
 
 defineOptions({ name: 'ShortcutModal' })
@@ -36,16 +36,27 @@ function cancel() {
   closeModal()
   emit('cancel', true)
 }
-
+const time = ref();
+onMounted(() => {
+ time.value = setInterval(() => {
+//  console.log("00000000-----------");
+ show.value && refresh();
+}, 5000);
+});
+onBeforeUnmount(() => { 
+  clearInterval(time.value);
+ time.value = null;
+});
 defineExpose({
   showModal,
   closeModal
 })
 </script>
 
-<template>
+<template>  
   <div class="removeMask">
-    <n-modal v-model:show="show" :show-mask="false" :mask-closable="false" transform-origin="center" style="position: fixed;right: 0;bottom: 0;">
+    <!-- <n-modal v-model:show="show" :show-mask="false" :mask-closable="false" transform-origin="center" style="position: fixed;right: 0;bottom: 0;"> -->
+      <div v-if="show" style="position: fixed;right: 0;bottom: 0; float: left; z-index: 999;" >
       <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true" style="padding: 8px 8px 0 8px;">
         <div class="wrapper">
           <div class="title">查重进度</div>
@@ -63,7 +74,8 @@ defineExpose({
           </div>
         </div>
       </n-card>
-    </n-modal>
+    </div>
+    <!-- </n-modal> -->
   </div>
 </template>