From 3e26b6795701ef301170272de55603def43f5673 Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Wed, 17 Apr 2024 09:56:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8D=A1=E7=89=87=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=8F=8A=E8=A1=A8=E6=A0=BC=E6=A8=A1=E5=BC=8F=E8=BF=9E=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=A1=E7=89=87=E6=A8=A1=E5=BC=8F=E5=8F=8A=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E7=AD=9B=E9=80=89=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/content/Content.vue     | 831 ++++++++++++------------
 src/views/final/content/ListContent.vue |  32 +-
 src/views/final/index.vue               |   7 +-
 3 files changed, 460 insertions(+), 410 deletions(-)

diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index fe84e8b..d3e9066 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1,6 +1,10 @@
 <script lang="ts" setup>
-import type { DataTableColumns, DataTableRowKey, PaginationProps } from 'naive-ui'
-import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
+import type {
+  DataTableColumns,
+  DataTableRowKey,
+  PaginationProps,
+} from "naive-ui";
+import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
 import {
   computed,
   defineEmits,
@@ -13,11 +17,11 @@ import {
   ref,
   unref,
   watch,
-} from 'vue'
-import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
-import { useRoute, useRouter } from 'vue-router'
-import dayjs from 'dayjs'
-import { cloneDeep } from 'lodash-es'
+} from "vue";
+import { rowPropKeys } from "naive-ui/es/legacy-grid/src/Row";
+import { useRoute, useRouter } from "vue-router";
+import dayjs from "dayjs";
+import { cloneDeep } from "lodash-es";
 import {
   CustomTabelModal,
   ImportExcelModal,
@@ -25,55 +29,55 @@ import {
   RepeatModal,
   RepeatTaskTableModal,
   StatusItem,
-} from '../comp'
-import { getFinalList } from '@/api/final'
-import { audit } from '@/api/task/task'
-import SvgIcon from '@/components/Icon/SvgIcon.vue'
-import type { RowData } from '@/config/final'
-import { findKey, headRules } from '@/config/final'
-import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
-import { useUser } from '@/store/modules/user'
-import { useFinal } from '@/store/modules/final'
-import { getViewportOffset } from '@/utils/domUtils'
-import { isBoolean } from '@/utils/is'
-import { useDictionary } from '@/store/modules/dictonary'
-import NotPassed from '@/components/Approval/NotPassed.vue'
-import type { ApprovalParam } from '/#/api'
-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'
-
-const emit = defineEmits(['changeShow'])
+} from "../comp";
+import { getFinalList } from "@/api/final";
+import { audit } from "@/api/task/task";
+import SvgIcon from "@/components/Icon/SvgIcon.vue";
+import type { RowData } from "@/config/final";
+import { findKey, headRules } from "@/config/final";
+import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
+import { useUser } from "@/store/modules/user";
+import { useFinal } from "@/store/modules/final";
+import { getViewportOffset } from "@/utils/domUtils";
+import { isBoolean } from "@/utils/is";
+import { useDictionary } from "@/store/modules/dictonary";
+import NotPassed from "@/components/Approval/NotPassed.vue";
+import type { ApprovalParam } from "/#/api";
+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";
+
+const emit = defineEmits(["changeShow"]);
 function changeContent() {
-  emit('changeShow')
+  emit("changeShow");
 }
-const checkedRowKeys = ref([])
-const dicStore = useDictionary()
-const izstatusList = ref([])
-const router = useRouter()
-const route = useRoute()
-const reviewType = 0
-const sortorder = ref('asc')
-const sortname = ref('states')
-const searchContent = route.query.searchContent as string
+const checkedRowKeys = ref([]);
+const dicStore = useDictionary();
+const izstatusList = ref([]);
+const router = useRouter();
+const route = useRoute();
+const reviewType = 0;
+const sortorder = ref("asc");
+const sortname = ref("states");
+const searchContent = route.query.searchContent as string;
 const actionsColumns = {
-  title: '操作',
-  key: 'actions',
+  title: "操作",
+  key: "actions",
   minWidth: 200,
   width: 200,
-  fixed: 'right',
+  fixed: "right",
   render(row) {
     return h(ListAction, {
       id: row.id,
       status: row.states,
       trigger: (action) => {
-        actionHandler(action, row)
+        actionHandler(action, row);
       },
-    })
+    });
   },
-}
-const columnsRef = ref<DataTableColumns<RowData>>([])
+};
+const columnsRef = ref<DataTableColumns<RowData>>([]);
 // const columns: DataTableColumns<RowData> = [
 //   {
 //     type: "selection",
@@ -173,57 +177,56 @@ const columnsRef = ref<DataTableColumns<RowData>>([])
 async function getColumns() {
   columnsRef.value = [
     {
-      type: 'selection',
-      fixed: 'left',
+      type: "selection",
+      fixed: "left",
       width: 50,
       disabled(row: any) {
-        return row.states !== 2
+        return row.states !== 2;
       },
     },
-  ]
-
-  const userStore = useUser()
-  const userInfo = userStore.getUserInfo
-  let res
-  res = await getAllfieldList(reviewType) // 所有筛选项目
-  const allList = res.data
-  res = await getfieldList(reviewType, userInfo.id) // 当前用户选择的项目
-  const useList = res.data
-  const userFieldFixed = useList.userFieldFixed?.split(',')
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
+  ];
+
+  const userStore = useUser();
+  const userInfo = userStore.getUserInfo;
+  let res;
+  res = await getAllfieldList(reviewType); // 所有筛选项目
+  const allList = res.data;
+  res = await getfieldList(reviewType, userInfo.id); // 当前用户选择的项目
+  const useList = res.data;
+  const userFieldFixed = useList.userFieldFixed?.split(",");
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
   if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
     allList?.map((v) => {
       if (v.isrequired == 2) {
         columnsRef.value.push({
           title: v.fieldDesc,
-          fixed: 'left',
+          fixed: "left",
           key: v.name,
           width: 120,
-        })
+        });
       }
-      return v
-    })
-  }
-  else {
+      return v;
+    });
+  } else {
     userFieldFixed.map((v) => {
-      const item = allList.find(v2 => v2.name == v)
+      const item = allList.find((v2) => v2.name == v);
       columnsRef.value.push({
         title: item.fieldDesc,
         key: item.name,
-        fixed: 'left',
+        fixed: "left",
         width: 120,
-      })
-      return v
-    })
+      });
+      return v;
+    });
     userFieldUnFixed.map((v) => {
-      const item = allList.find(v2 => v2.name == v)
+      const item = allList.find((v2) => v2.name == v);
       columnsRef.value.push({
         title: item.fieldDesc,
         key: item.name,
         width: 120,
-      })
-      return v
-    })
+      });
+      return v;
+    });
   }
   // TODO: 会导致排序问题 废弃
   // #region
@@ -257,201 +260,185 @@ async function getColumns() {
   // });
   // #endregion
 
-  columnsRef.value.push(actionsColumns as any)
-  formatColumns()
+  columnsRef.value.push(actionsColumns as any);
+  formatColumns();
 }
 
 async function formatColumns() {
   // TODO处理特殊字段
 
-  let index
-  index = columnsRef.value.findIndex(v => v.title == '任务ID')
+  let index;
+  index = columnsRef.value.findIndex((v) => v.title == "任务ID");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '任务ID',
+      title: "任务ID",
       key: columnsRef.value[index].key, // "id"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states,
-        )
+          (item: any) => item.value == row.states
+        );
         return h(
           NButton,
           {
-            'strong': true,
+            strong: true,
             // 'tertiary': true,
-            'text': true,
-            'size': 'small',
-            'text-color': '#507AFD',
-            'onClick': () => goDetail(row),
+            text: true,
+            size: "small",
+            "text-color": "#507AFD",
+            onClick: () => goDetail(row),
           },
-          { default: () => row.fromtaskid },
-        )
+          { default: () => row.fromtaskid }
+        );
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '所属项目')
+  index = columnsRef.value.findIndex((v) => v.title == "所属项目");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '所属项目',
+      title: "所属项目",
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '任务名称')
+  index = columnsRef.value.findIndex((v) => v.title == "任务名称");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '任务名称',
+      title: "任务名称",
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '审批状态')
+  index = columnsRef.value.findIndex((v) => v.title == "审批状态");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '审批状态',
+      title: "审批状态",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 120,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states,
-        )
+          (item: any) => item.value == row.states
+        );
         return h(StatusItem, {
           id: row.id,
           status: row.states,
-          label: item ? item.label : '',
-        })
+          label: item ? item.label : "",
+        });
       },
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '图片相似度')
+  index = columnsRef.value.findIndex((v) => v.title == "图片相似度");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '图片相似度',
+      title: "图片相似度",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 150,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row: any) {
         return h(
-          'div',
+          "div",
           {
             id: row.id,
-            style: { color: row.similarityscore === 100 ? '#FF4E4F' : '' },
+            style: { color: row.similarityscore === 100 ? "#FF4E4F" : "" },
           },
-          { default: () => (row.similarityscore ? `${row.similarityscore}%` : '') },
-        )
+          {
+            default: () =>
+              row.similarityscore ? `${row.similarityscore}%` : "",
+          }
+        );
       },
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '提报时间')
+  index = columnsRef.value.findIndex((v) => v.title == "提报时间");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '提报时间',
+      title: "提报时间",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row: any) {
-        return formatToDateHMS(row.fromuptime || 0)
+        return formatToDateHMS(row.fromuptime || 0);
       },
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '提报人')
+  index = columnsRef.value.findIndex((v) => v.title == "提报人");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '提报人',
+      title: "提报人",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row: any) {
-        return row.fromusername
+        return row.fromusername;
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '更新时间')
+  index = columnsRef.value.findIndex((v) => v.title == "更新时间");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '更新时间',
+      title: "更新时间",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row: any) {
-        return row.updatetime ? formatToDateHMS(row.updatetime) : ''
+        return row.updatetime ? formatToDateHMS(row.updatetime) : "";
       },
-    }
+    };
   }
 }
 
-const deviceHeight = ref(600)
-
-onMounted(() => {
-  // query(pagination.page, pagination.pageSize);
-  emitter.on('filter-final', refreshHandler)
-  getColumns()
-
-  nextTick(() => {
-    computeListHeight()
-  })
-})
+const deviceHeight = ref(600);
 
 onBeforeMount(() => {
-  dicStore.fetchizstatusListt()
-})
+  dicStore.fetchizstatusListt();
+});
 
 watch(
   () => dicStore.izstatusList,
   (newval) => {
-    izstatusList.value = newval
-  },
-)
+    izstatusList.value = newval;
+  }
+);
 
 onUnmounted(() => {
-  emitter.off('filter-final', refreshHandler)
-})
+  emitter.off("filter-final", refreshHandler);
+});
 
-const tableRef = ref<InstanceType<typeof NDataTable>>()
-const rowKey = (row: RowData) => row.id
-const loading = ref(true)
-const total = ref(0)
+const tableRef = ref<InstanceType<typeof NDataTable>>();
+const rowKey = (row: RowData) => row.id;
+const loading = ref(true);
+const total = ref(0);
 const pagination = reactive({
   page: 1,
   pageCount: 10,
@@ -459,47 +446,59 @@ const pagination = reactive({
   showSizePicker: true,
   pageSizes: [
     {
-      label: '10 每页',
+      label: "10 每页",
       value: 10,
     },
     {
-      label: '15 每页',
+      label: "15 每页",
       value: 15,
     },
     {
-      label: '30 每页',
+      label: "30 每页",
       value: 30,
     },
     {
-      label: '50 每页',
+      label: "50 每页",
       value: 50,
     },
   ],
   showQuickJumper: true,
   prefix: () => `共 ${total.value} 条数据`,
-})
-const tableData = ref<Array<RowData>>([])
-const selectionIds = ref<DataTableRowKey[]>([])
-const dialog = useDialog()
-const message = useMessage()
-const finalStore = useFinal()
-
-async function query(page: number, pageSize: number, filterId?: any, taskName?: string) {
-  console.log('query', taskName)
-  const asideParmas = cloneDeep(unref(finalStore.getAsideValue))
+});
+const tableData = ref<Array<RowData>>([]);
+const selectionIds = ref<DataTableRowKey[]>([]);
+const dialog = useDialog();
+const message = useMessage();
+const finalStore = useFinal();
+
+async function query(
+  page: number,
+  pageSize: number,
+  filterId?: any,
+  taskName?: string
+) {
+  console.log("query", taskName);
+  const asideParmas = cloneDeep(unref(finalStore.getAsideValue));
+  console.log(asideParmas);
+
   if (asideParmas.izyear) {
-    asideParmas.izuptime = cloneDeep(asideParmas.izyear)
-    if (typeof asideParmas.izuptime == 'object') {
-      asideParmas.izuptime[0] = dayjs(asideParmas.izuptime[0]).format('YYYY/MM/DD')
-      asideParmas.izuptime[1] = dayjs(asideParmas.izuptime[1]).format('YYYY/MM/DD')
-      asideParmas.izuptime = asideParmas.izuptime.join('-')
-      delete asideParmas.izyear
+    asideParmas.izuptime = cloneDeep(asideParmas.izyear);
+    if (typeof asideParmas.izuptime == "object") {
+      asideParmas.izuptime[0] = dayjs(asideParmas.izuptime[0]).format(
+        "YYYY/MM/DD"
+      );
+      asideParmas.izuptime[1] = dayjs(asideParmas.izuptime[1]).format(
+        "YYYY/MM/DD"
+      );
+      asideParmas.izuptime = asideParmas.izuptime.join("-");
+      delete asideParmas.izyear;
     }
   }
+
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
-  let params = asideParmas
-  params = params?.izshowall ? {} : params
+  let params = asideParmas;
+  params = params?.izshowall ? {} : params;
 
   const result = await getFinalList({
     sortorder: sortorder.value,
@@ -508,238 +507,232 @@ async function query(page: number, pageSize: number, filterId?: any, taskName?:
     sortname: sortname.value,
     taskName,
     ...params,
-  })
-  const { data, pageCount, totalCount } = result
-  tableData.value = data
-  total.value = totalCount
-  pagination.page = page
-  pagination.pageCount = Math.ceil(totalCount / pageSize)
-  loading.value = false
+  });
+  const { data, pageCount, totalCount } = result;
+  tableData.value = data;
+  total.value = totalCount;
+  pagination.page = page;
+  pagination.pageCount = Math.ceil(totalCount / pageSize);
+  loading.value = false;
 }
 
 async function handleSorterChange(value) {
-  let name = value.columnKey
-  if (name === 'fromuptime')
-    name = 'submit_date_timestamp'
-  else if (name === 'similarityscore')
-    name = 'similarity_score'
-  else if (name === 'fromusername')
-    name = 'fromuserid'
-
-  sortname.value = name
-  sortorder.value = value.order === 'ascend' ? 'asc' : 'desc'
-  refreshHandler()
+  let name = value.columnKey;
+  if (name === "fromuptime") name = "submit_date_timestamp";
+  else if (name === "similarityscore") name = "similarity_score";
+  else if (name === "fromusername") name = "fromuserid";
+
+  sortname.value = name;
+  sortorder.value = value.order === "ascend" ? "asc" : "desc";
+  refreshHandler();
 }
 
 async function handlePageChange(currentPage) {
-  if (loading.value)
-    return
-  const { pageSize } = pagination
-  pagination.page = currentPage
-  await query(currentPage, pageSize)
+  if (loading.value) return;
+  const { pageSize } = pagination;
+  pagination.page = currentPage;
+  await query(currentPage, pageSize);
 }
 async function handlePageSizeChange(currentPageSize) {
-  if (loading.value)
-    return
+  if (loading.value) return;
 
-  const { page } = pagination
-  pagination.pageSize = currentPageSize
+  const { page } = pagination;
+  pagination.pageSize = currentPageSize;
 
-  await query(page, currentPageSize)
+  await query(page, currentPageSize);
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
-  selectionIds.value = rowKeys
+  selectionIds.value = rowKeys;
 }
 
 async function computeListHeight() {
-  const table = unref(tableRef)
-  if (!table)
-    return
-  const tableEl: any = table?.$el
-  const headEl = tableEl.querySelector('.n-data-table-thead ')
-  const { bottomIncludeBody } = getViewportOffset(headEl)
-  const headerH = 64
-  let paginationH = 2
-  const marginH = 60
+  const table = unref(tableRef);
+  if (!table) return;
+  const tableEl: any = table?.$el;
+  const headEl = tableEl.querySelector(".n-data-table-thead ");
+  const { bottomIncludeBody } = getViewportOffset(headEl);
+  const headerH = 64;
+  let paginationH = 2;
+  const marginH = 60;
   if (!isBoolean(unref(pagination))) {
     const paginationEl = tableEl.querySelector(
-      '.n-data-table__pagination',
-    ) as HTMLElement
+      ".n-data-table__pagination"
+    ) as HTMLElement;
     if (paginationEl) {
-      const offsetHeight = paginationEl.offsetHeight
-      paginationH += offsetHeight || 0
-    }
-    else {
-      paginationH += 28
+      const offsetHeight = paginationEl.offsetHeight;
+      paginationH += offsetHeight || 0;
+    } else {
+      paginationH += 28;
     }
   }
-  let height = bottomIncludeBody - (headerH + paginationH + marginH)
-  const maxHeight = 800
-  height = maxHeight && maxHeight < height ? maxHeight : height
-  deviceHeight.value = height
+  let height = bottomIncludeBody - (headerH + paginationH + marginH);
+  const maxHeight = 800;
+  height = maxHeight && maxHeight < height ? maxHeight : height;
+  deviceHeight.value = height;
 }
 
-useWindowSizeFn(computeListHeight)
+useWindowSizeFn(computeListHeight);
 
 const maxHeight = computed(() => {
-  return tableData.value.length ? `${unref(deviceHeight)}px` : 'auto'
-})
+  return tableData.value.length ? `${unref(deviceHeight)}px` : "auto";
+});
 
 const scrollX = computed(() => {
-  const table = unref(tableRef)
-  if (!table)
-    return
-  const tableEl: any = table?.$el
-  const wrapper = tableEl.querySelector('.n-data-table-wrapper')
+  const table = unref(tableRef);
+  if (!table) return;
+  const tableEl: any = table?.$el;
+  const wrapper = tableEl.querySelector(".n-data-table-wrapper");
   // const arr = columnsRef.value.filter(item => !item.fixed)
-  let width = 0
+  let width = 0;
   columnsRef.value.forEach((item) => {
-    width += Number(item.width) || 200
-  })
+    width += Number(item.width) || 200;
+  });
 
-  return width
-})
-const customTabelRef = ref(null)
-const importExcelRef = ref(null)
-const notPassModalRef = ref(null) // 不通过弹窗
-const repeatModalRef = ref(null)
-const repeatTaskTableModalRef = ref(null)
+  return width;
+});
+const customTabelRef = ref(null);
+const importExcelRef = ref(null);
+const notPassModalRef = ref(null); // 不通过弹窗
+const repeatModalRef = ref(null);
+const repeatTaskTableModalRef = ref(null);
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any
-  modal.showModal()
+  const modal = unref(modalRef)! as any;
+  modal.showModal();
 }
 
-const popover = ref<ComponentRef | null>(null)
+const popover = ref<ComponentRef | null>(null);
 
 function importHandler() {
-  (popover.value as any).setShow(false)
-  showModal(importExcelRef)
+  (popover.value as any).setShow(false);
+  showModal(importExcelRef);
 }
 
 function exportHandler() {
-  loading.value = true
-  import('@/utils/exportExcel').then((excel) => {
+  loading.value = true;
+  import("@/utils/exportExcel").then((excel) => {
     const tHeader = [
-      '任务Id',
-      '任务名称',
-      '审批节点',
-      '审批状态',
-      '图片相似度',
-      '提报时间',
-      '更新时间',
-    ]
+      "任务Id",
+      "任务名称",
+      "审批节点",
+      "审批状态",
+      "图片相似度",
+      "提报时间",
+      "更新时间",
+    ];
     const filterVal = [
-      'pictureid',
-      'name',
-      'approvalnode',
-      'approvalstatus',
-      'similarity',
-      'uptime',
-      'updatetime',
-    ]
-    const list = tableData.value
-    const data = formatJson(filterVal, list)
+      "pictureid",
+      "name",
+      "approvalnode",
+      "approvalstatus",
+      "similarity",
+      "uptime",
+      "updatetime",
+    ];
+    const list = tableData.value;
+    const data = formatJson(filterVal, list);
     excel.export_json_to_excel({
       header: tHeader,
       data,
-      filename: 'data',
+      filename: "data",
       autoWidth: true,
-      bookType: 'xlsx',
-    })
-    loading.value = false
-  })
+      bookType: "xlsx",
+    });
+    loading.value = false;
+  });
 }
 
 function formatJson(filterVal, jsonDataList) {
-  return jsonDataList.map(v =>
+  return jsonDataList.map((v) =>
     filterVal.map((j) => {
-      return v[j]
-    }),
-  )
+      return v[j];
+    })
+  );
 }
 
 function sucessHandler(excelData) {
   const data = excelData.content.map((item) => {
-    const obj = {}
+    const obj = {};
     Object.keys(item).forEach((key) => {
-      const k = findKey(columns, key)
-      obj[k] = item[key]
-    })
-    return obj
-  })
+      const k = findKey(columns, key);
+      obj[k] = item[key];
+    });
+    return obj;
+  });
 
-  tableData.value = data
+  tableData.value = data;
 }
 
 function commitHandler(columns) {
-  columnsRef.value = [...columns, actionsColumns]
-  formatColumns()
+  columnsRef.value = [...columns, actionsColumns];
+  formatColumns();
 }
 
 function actionHandler(action: any, row: any) {
-  const { key } = action
+  const { key } = action;
   switch (key) {
-    case 'view':
-      goDetail(row)
-      break
-    case 'reset':
-      resetHandler()
-      break
-    case 'approval':
-      singleApproval(row)
-      break
-    case 'reject':
-      rejectHandler([row])
-      break
+    case "view":
+      goDetail(row);
+      break;
+    case "reset":
+      resetHandler();
+      break;
+    case "approval":
+      singleApproval(row);
+      break;
+    case "reject":
+      rejectHandler([row]);
+      break;
     default:
-      break
+      break;
   }
 }
 
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
-  if (items.length === 0)
-    return '至少选中一个任务'
-  return null
+  if (items.length === 0) return "至少选中一个任务";
+  return null;
 }
 
 function goDetail(row) {
-  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
+  router.push({
+    name: "final-detail",
+    query: { id: row.id, packageid: row.packageid },
+  });
 }
 
 function resetHandler() {
   dialog.info({
-    title: '确认提示',
-    content: '确认重置当前选中的任务的审批吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认重置当前选中的任务的审批吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: async () => {
       // TODO：需要支持重置
       // const result = await resetApproval()
     },
     onNegativeClick: () => {},
-  })
+  });
 }
 
 function getSelectItems() {
-  return tableData.value.filter(item => selectionIds.value.includes(item.id))
+  return tableData.value.filter((item) => selectionIds.value.includes(item.id));
 }
 
 const showActions = computed(() => {
-  return selectionIds.value.length
-})
+  return selectionIds.value.length;
+});
 
 // 单个审批通过
 function singleApproval(row) {
   const param = {
     result: true,
-    comment: '',
-    disposeType: '',
-    disposeTypeId: '',
-    failCauseId: '',
-    failCauseName: '',
+    comment: "",
+    disposeType: "",
+    disposeTypeId: "",
+    failCauseId: "",
+    failCauseName: "",
     flowTaskInfoList: [
       {
         formId: row.id,
@@ -747,146 +740,174 @@ function singleApproval(row) {
         taskName: row.fromTaskName,
       },
     ],
-  }
-  doAudit(param)
+  };
+  doAudit(param);
 }
 
 // 批量通过
 function batchApproval() {
-  const items: any = getSelectItems()
-  const msg = validate(items)
+  const items: any = getSelectItems();
+  const msg = validate(items);
 
   if (msg !== null) {
-    message.error(msg)
-    return
+    message.error(msg);
+    return;
   }
-  console.log(items)
-  const list: any = []
+  console.log(items);
+  const list: any = [];
   items.forEach((item) => {
     list.push({
       formId: item.id,
       taskId: item.taskId,
       taskName: item.fromtaskname,
-    })
-  })
+    });
+  });
 
   const param = {
     result: true,
-    comment: '',
-    disposeType: '',
-    disposeTypeId: '',
-    failCauseId: '',
-    failCauseName: '',
+    comment: "",
+    disposeType: "",
+    disposeTypeId: "",
+    failCauseId: "",
+    failCauseName: "",
     flowTaskInfoList: list,
-  }
+  };
 
-  doAudit(param)
+  doAudit(param);
 }
 
 // 小结批量不通过
 function repeatBatchReject(items) {
-  console.log(items)
-  rejectHandler(items)
+  console.log(items);
+  rejectHandler(items);
 }
 
 // 批量不通过
 function batchReject() {
-  const items: any = getSelectItems()
-  rejectHandler(items)
+  const items: any = getSelectItems();
+  rejectHandler(items);
 }
 
 // 审核不通过
 function rejectHandler(list) {
-  const msg = validate(list)
+  const msg = validate(list);
   if (msg !== null) {
-    message.error(msg)
-    return
+    message.error(msg);
+    return;
   }
 
-  const modal = unref(notPassModalRef)! as any
-  modal.showModal(list)
+  const modal = unref(notPassModalRef)! as any;
+  modal.showModal(list);
 }
 
 // 审核通过
 function doAudit(param: any) {
   dialog.info({
-    title: '确认提示',
-    content: '确认给该任务审批为【通过】吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认给该任务审批为【通过】吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: () => {
       audit(param).then((res) => {
-        const { code } = res
-        if (code === 'OK') {
-          message.success(res.message)
-          reload()
-        }
-        else {
-          message.error(res.message)
+        const { code } = res;
+        if (code === "OK") {
+          message.success(res.message);
+          reload();
+        } else {
+          message.error(res.message);
         }
-      })
+      });
     },
     onNegativeClick: () => {},
-  })
+  });
 }
 
 function switchBatch() {
-  selectionIds.value = []
-  checkedRowKeys.value = []
+  selectionIds.value = [];
+  checkedRowKeys.value = [];
 }
 
 function reload() {
-  selectionIds.value = []
-  checkedRowKeys.value = []
+  selectionIds.value = [];
+  checkedRowKeys.value = [];
 
-  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
-  query(page!, pageSize!)
+  const { page, pageSize } = unref(
+    tableRef.value?.pagination
+  ) as PaginationProps;
+  query(page!, pageSize!);
 }
 
 watch(
   () => finalStore.asideValue,
   (newVal, oldVal) => {
-    refreshHandler()
+    refreshHandler();
   },
-  { deep: true },
-)
+  { deep: true }
+);
 
 watch(
   () => finalStore.listKey,
   (newVal, oldVal) => {
-    refreshHandler()
-  },
-)
+    refreshHandler();
+  }
+);
 
 function reset() {
-  pagination.page = 1
-  pagination.pageCount = 1
+  pagination.page = 1;
+  pagination.pageCount = 1;
 }
 
 async function refreshHandler(searchId?: any) {
-  reset()
-  let searchKeyword = ''
+  reset();
+  let searchKeyword = "";
   if (searchContent) {
-    const id_param = searchContent.match(/-\d+-/)
-    if (id_param)
-      searchKeyword = id_param[0].slice(1, -1)
+    const id_param = searchContent.match(/-\d+-/);
+    if (id_param) searchKeyword = id_param[0].slice(1, -1);
   }
-  console.log('refreshHandler', searchKeyword)
-  query(pagination.page, pagination.pageSize, searchId, searchKeyword)
+  console.log("refreshHandler", searchKeyword);
+  query(pagination.page, pagination.pageSize, searchId, searchKeyword);
 }
 
 function filterTableData(keyword) {
-  pagination.page = 1
-  pagination.pageSize = 10
-  if (keyword)
-    query(pagination.page, pagination.pageSize, '', keyword)
-  else
-    query(pagination.page, pagination.pageSize)
+  pagination.page = 1;
+  pagination.pageSize = 10;
+  if (keyword) query(pagination.page, pagination.pageSize, "", keyword);
+  else query(pagination.page, pagination.pageSize);
 }
-
+async function initData(pageSize, page) {
+  const result = await getFinalList({
+    sortorder: sortorder.value,
+    pageSize,
+    currPage: page,
+    sortname: sortname.value,
+  });
+   const { data, pageCount, totalCount } = result;
+  tableData.value = data;
+  total.value = totalCount;
+  pagination.page = page;
+  pagination.pageCount = Math.ceil(totalCount / pageSize);
+  loading.value = false;
+}
+onMounted(() => {
+  // query(pagination.page, pagination.pageSize);
+  const asideParmas = cloneDeep(unref(finalStore.getAsideValue));
+  console.log(asideParmas);
+  emitter.on("filter-final", refreshHandler);
+  getColumns();
+  if (asideParmas == null) {
+    initData(10, 1);
+  } else {
+    reset();
+    filterTableData()
+  }
+  //alert(1)
+  nextTick(() => {
+    computeListHeight();
+  });
+});
 defineExpose({
   filterTableData,
-})
+});
 </script>
 
 <template>
@@ -931,14 +952,14 @@ defineExpose({
             src="@/assets/images/task/btn-not-pass.png"
             alt=""
             @click.stop="batchReject"
-          >
+          />
           <SvgIcon size="24" name="vs" />
           <img
             class="btn-approval"
             src="@/assets/images/task/btn-pass.png"
             alt=""
             @click.stop="batchApproval"
-          >
+          />
         </div>
 
         <n-popover
@@ -956,16 +977,26 @@ defineExpose({
           </template>
           <ul class="wrapper-header-action">
             <li @click="importHandler">
-              <SvgIcon size="20" name="import" /><span style="margin-left: 5px">批量导入数据</span>
+              <SvgIcon size="20" name="import" /><span style="margin-left: 5px"
+                >批量导入数据</span
+              >
             </li>
             <li @click="exportHandler">
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出待审数据</span>
+              <SvgIcon size="20" name="download" /><span
+                style="margin-left: 5px"
+                >导出待审数据</span
+              >
             </li>
             <li>
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出全部数据</span>
+              <SvgIcon size="20" name="download" /><span
+                style="margin-left: 5px"
+                >导出全部数据</span
+              >
             </li>
             <li>
-              <SvgIcon size="20" name="look" /><span style="margin-left: 5px">查看导入记录</span>
+              <SvgIcon size="20" name="look" /><span style="margin-left: 5px"
+                >查看导入记录</span
+              >
             </li>
           </ul>
         </n-popover>
diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index 962f1dc..8c588aa 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onMounted, ref, reactive, unref, computed } from "vue";
+import { onMounted, ref, reactive, unref, computed,watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import testImg from "@/assets/images/test.png";
 import { chunk } from "lodash-es";
@@ -100,7 +100,7 @@ async function initData(
     currPage: page,
     sortname: sortname.value,
     taskName,
-    isFail: true,
+
     ...params,
   });
   const { data, pageCount, totalCount } = result;
@@ -114,8 +114,8 @@ async function initData(
   loading.value = false;
   tableData.value.map((item) => {
     item.showcheck = false;
-    if (isValidTimestamp(item.createdate)) {
-      item.createdate = formatToDateHMS(item.createdate);
+    if (isValidTimestamp(item.fromuptime)) {
+      item.fromuptime = formatToDateHMS(item.fromuptime);
     }
   });
 
@@ -176,8 +176,8 @@ async function query(
   pagination.pageCount = Math.ceil(totalCount / pageSize);
   loading.value = false;
   tableData.value.map((item) => {
-    if (isValidTimestamp(item.createdate)) {
-      item.createdate = formatToDateHMS(item.createdate);
+    if (isValidTimestamp(item.fromuptime)) {
+      item.fromuptime = formatToDateHMS(item.fromuptime);
     }
   });
 
@@ -415,6 +415,17 @@ function changesort(sortnamex) {
 initData(1, 20);
 num=1
 }
+watch(
+  () => finalStore.asideValue,
+  (newVal, oldVal) => {
+   initData(1, 20);
+  },
+  { deep: true }
+);
+
+defineExpose({
+  initData,
+});
 </script>
 
 <template>
@@ -538,7 +549,7 @@ num=1
         />
       </div>
     </div>
-    <div class="cotnet_wrapeer" @scroll="checkBottom" ref="scrollContainer">
+    <div :class="tableData.length>16?'cotnet_wrapeer':'cotnet_wrapeertwo'" @scroll="checkBottom" ref="scrollContainer">
       <div
         class="data_wrapper"
         v-for="(sitem, sindex) in tableData"
@@ -593,7 +604,7 @@ num=1
               </div>
               <div class="date">
                 <n-ellipsis style="max-width: 100%"
-                  >{{ item.createdate }}
+                  >{{ item.fromuptime }}
                 </n-ellipsis>
               </div>
               <div class="tag_box">
@@ -924,6 +935,11 @@ num=1
     height: 67vh;
     //padding-right: 10px; /* 右侧内边距 */
     overflow: hidden; /* 默认隐藏滚动条 */
+  }  .cotnet_wrapeertwo {
+    width: 100%;
+    height: 67vh;
+    //padding-right: 10px; /* 右侧内边距 */
+    overflow: hidden; /* 默认隐藏滚动条 */
   }
   .cotnet_wrapeer:hover {
     overflow: auto;
diff --git a/src/views/final/index.vue b/src/views/final/index.vue
index 59432f2..52f4440 100644
--- a/src/views/final/index.vue
+++ b/src/views/final/index.vue
@@ -11,8 +11,11 @@ defineOptions({
 })
 const showList = ref(true)
 const contentRef: any = ref(null)
+const ListRef: any = ref(null)
 function inputChange(keyword) {
+ 
   contentRef.value.filterTableData(keyword)
+   ListRef.value.initData(keyword)
 }
 </script>
 
@@ -23,10 +26,10 @@ function inputChange(keyword) {
 
     <!-- 任务管理 -->
     <!-- TODO:本地演示即可 上传注释注释 -->
-    <ListContent v-show="showList" @change-show="showList = false" />
+    <ListContent v-if="showList" ref="ListRef" @change-show="showList = false" />
 
     <!-- 内容 -->
-    <Content v-show="!showList" ref="contentRef" @change-show="showList = true" />
+    <Content v-if="!showList" ref="contentRef" @change-show="showList = true" />
 
     <!-- 机器人 -->
     <Robot />
-- 
2.39.3