From 087a43ad7e213d10b000508909e02ade5fb3e688 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 7 Apr 2024 10:34:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8C=89RP=E6=B7=BB=E5=8A=A0=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E4=BF=A1=E6=81=AF=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DataHeader/index.vue |  51 +-
 src/views/final/content/Content.vue | 731 ++++++++++++++--------------
 src/views/task/index.vue            |  26 +-
 src/views/worksheet/index.vue       |   2 +-
 4 files changed, 411 insertions(+), 399 deletions(-)

diff --git a/src/components/DataHeader/index.vue b/src/components/DataHeader/index.vue
index f204574..6c6b559 100644
--- a/src/components/DataHeader/index.vue
+++ b/src/components/DataHeader/index.vue
@@ -3,7 +3,7 @@
     <div v-for="(item, index) in data" :key="index" class="header_item">
       <img :src="item.link" />
       <div class="data_wrap">
-        <div class="data_title">{{ item.count }}</div>
+        <div class="data_title" :style="hasColor?`color:${item.color || ''}`:''">{{ item.count }}</div>
         <div class="data_content">{{ item.title }}</div>
       </div>
     </div>
@@ -12,36 +12,55 @@
 </template>
 
 <script lang="ts" setup>
+import { defineProps, onMounted } from "vue";
+
+defineProps({
+  hasColor: {
+    type: Boolean,
+    default: () => false,
+  },
+});
+const initRem = () => {
+  const designWidth = 1440;
+  const rempPx = 16;
+  const scale = window.innerWidth / designWidth;
+  document.documentElement.style.fontSize = scale * rempPx + "px";
+};
+onMounted(()=>{
+  initRem();
+})
 
 const data = [
   {
     link: "/src/assets/images/taskCount.png",
-    title: "任务包总数",
+    title: "任务总数",
     count: 6399,
   },
   {
     link: "/src/assets/images/nocheck.png",
-    title: "未标记",
+    title: "待审批",
     count: 6290,
   },
   {
     link: "/src/assets/images/check.png",
-    title: "已标记",
+    title: "已审批",
     count: 109,
   },
   {
     link: "/src/assets/images/status.png",
-    title: "真",
+    title: "通过",
     count: 3290,
+    color: "#03c984",
   },
   {
     link: "/src/assets/images/status.png",
-    title: "假",
+    title: "不通过",
     count: 3000,
+    color: "#ff8b8b",
   },
   {
     link: "/src/assets/images/pic.png",
-    title: "相似度100%图",
+    title: "图片重复数",
     count: 230,
   },
   {
@@ -58,37 +77,39 @@ const data = [
   flex-flow: row nowrap;
   align-items: center;
   justify-content: space-between;
-  padding: 20px 30px;
+  padding: 1rem 3.125rem;
   background: #fff;
+  margin-bottom: 1rem;
+
   .header_item {
     width: 10%;
     display: flex;
     flex-flow: row nowrap;
     align-items: center;
     justify-content: center;
-    img{
-      width: 50px;
-      height: 50px
+    img {
+      width: 3.125rem;
+      height: 3.125rem;
     }
     .data_wrap {
       .data_title {
-        font-size: 20px;
+        font-size: 1.25rem;
         font-family: HarmonyOS Sans SC, HarmonyOS Sans SC-Bold;
         font-weight: Bold;
         text-align: left;
         color: #202020;
-        line-height: 23px;
+        line-height: 1.4375rem;
         text-align: center;
         white-space: nowrap;
       }
       .data_content {
         opacity: 0.6;
-        font-size: 14px;
+        font-size: .875rem;
         font-family: PingFang SC, PingFang SC-Regular;
         font-weight: Regular;
         text-align: center;
         color: #202020;
-        line-height: 16px;
+        line-height: 1rem;
         text-align: center;
         white-space: nowrap;
       }
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index adb3866..bb9c945 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1,6 +1,6 @@
 <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,9 +13,9 @@ import {
   ref,
   unref,
   watch,
-} from 'vue'
-import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
-import { useRoute, useRouter } from 'vue-router'
+} from "vue";
+import { rowPropKeys } from "naive-ui/es/legacy-grid/src/Row";
+import { useRoute, useRouter } from "vue-router";
 import {
   CustomTabelModal,
   ImportExcelModal,
@@ -23,52 +23,53 @@ 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'
-
-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 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 actionsColumns = {
-  title: '操作',
-  key: 'actions',
+  title: "操作",
+  key: "actions",
   minWidth: 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",
@@ -168,54 +169,53 @@ 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,
-        })
+        });
       }
-    })
-  }
-  else {
+    });
+  } 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,
-      })
-    })
+      });
+    });
     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,
-      })
-    })
+      });
+    });
   }
   // TODO: 会导致排序问题 废弃
   // #region
@@ -249,209 +249,197 @@ 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,
-            'tertiary': true,
-            'text': true,
-            'size': 'small',
-            'text-color': '#507AFD',
-            'onClick': () => goDetail(row),
+            strong: true,
+            tertiary: true,
+            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.createdate || 0)
+        return formatToDateHMS(row.createdate || 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,
-      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 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)
+const deviceHeight = ref(600);
 
 onMounted(() => {
-  emitter.on('filter-final', refreshHandler)
-  getColumns()
+  emitter.on("filter-final", refreshHandler);
+  getColumns();
 
   nextTick(() => {
-    computeListHeight()
-  })
-})
+    computeListHeight();
+  });
+});
 
 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,35 +447,35 @@ 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()
+});
+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) {
-  const asideParmas = unref(finalStore.getAsideValue)
+  const asideParmas = unref(finalStore.getAsideValue);
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
-  const params = filterId ? { userSearchId: filterId } : asideParmas
+  const params = filterId ? { userSearchId: filterId } : asideParmas;
   const result = await getFinalList({
     sortorder: sortorder.value,
     pageSize,
@@ -495,229 +483,219 @@ 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) {
-  console.log(value)
-  let name = value.columnKey
-  if (name === 'fromuptime')
-    name = 'field11'
-
-  else if (name === 'similarityscore')
-    name = 'similarity_score'
-
-  else if (name === 'fromusername')
-    name = 'fromuserid'
-
-  sortname.value = name
-  sortorder.value = value.order === 'ascend' ? 'asc' : 'desc'
-  refreshHandler()
+  console.log(value);
+  let name = value.columnKey;
+  if (name === "fromuptime") name = "field11";
+  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";
+});
 
-query(pagination.page, pagination.pageSize)
+query(pagination.page, pagination.pageSize);
 
-const customTabelRef = ref(null)
-const importExcelRef = ref(null)
-const notPassModalRef = ref(null) // 不通过弹窗
-const repeatModalRef = ref(null)
-const repeatTaskTableModalRef = ref(null)
+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,
@@ -725,132 +703,130 @@ 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 }
+);
 
 function reset() {
-  pagination.page = 1
-  pagination.pageCount = 1
+  pagination.page = 1;
+  pagination.pageCount = 1;
 }
 
 async function refreshHandler(searchId?: any) {
-  reset()
-  query(pagination.page, pagination.pageSize, searchId)
+  reset();
+  query(pagination.page, pagination.pageSize, searchId);
 }
 
 function filterTableData(keyword) {
-  pagination.page = 1
-  pagination.pageSize = 10
+  pagination.page = 1;
+  pagination.pageSize = 10;
   if (keyword)
     // tableData.value = tableData.value.filter(item => item.id.includes(keyword))
-    query(pagination.page, pagination.pageSize, '', keyword)
-  else
-    query(pagination.page, pagination.pageSize)
+    query(pagination.page, pagination.pageSize, "", keyword);
+  else query(pagination.page, pagination.pageSize);
 }
 defineExpose({
   filterTableData,
-})
+});
 </script>
 
 <template>
@@ -867,9 +843,7 @@ defineExpose({
           name="summary"
           @click="showModal(repeatModalRef)"
         />
-        <NButton class="xjcc" text @click="showModal(repeatModalRef)">
-          小结查重
-        </NButton>
+        <NButton class="xjcc" text @click="showModal(repeatModalRef)"> 小结查重 </NButton>
 
         <div v-show="!showActions" style="display: flex; align-items: center">
           <div class="btn">
@@ -890,14 +864,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
@@ -915,21 +889,32 @@ 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>
       </div>
     </div>
+    <div class="header_data">
+      <DataHeader :hasColor="true" />
+    </div>
     <!-- <div class="wrapper-statistic">
       <div v-for="i in 7" :key="i" class="item">
         <div class="icon" />
diff --git a/src/views/task/index.vue b/src/views/task/index.vue
index 46dd531..5378cfd 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -1,22 +1,28 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
-import Aside from './aside/Aside.vue'
-import Content from './content/Content.vue'
+import { ref } from "vue";
+import Aside from "./aside/Aside.vue";
+import Content from "./content/Content.vue";
+import DataHeader from "@/components/DataHeader/index.vue";
 
-const asideRef: any = ref(null)
+const asideRef: any = ref(null);
 
 function setAsideItemName(text) {
-  asideRef.value.setAsideItemName(text)
+  asideRef.value.setAsideItemName(text);
 }
 </script>
 
 <template>
-  <div class="main">
-    <!-- 侧边 -->
-    <Aside ref="asideRef" />
+  <div style="width: 100%">
+    <div class="header">
+      <DataHeader />
+    </div>
+    <div class="main">
+      <!-- 侧边 -->
+      <Aside ref="asideRef" />
 
-    <!-- 内容 -->
-    <Content @set-aside-item-name="setAsideItemName" />
+      <!-- 内容 -->
+      <Content @set-aside-item-name="setAsideItemName" />
+    </div>
   </div>
 </template>
 
diff --git a/src/views/worksheet/index.vue b/src/views/worksheet/index.vue
index 5c8c3c2..a183336 100644
--- a/src/views/worksheet/index.vue
+++ b/src/views/worksheet/index.vue
@@ -15,7 +15,7 @@ const ApprovalOver = (packageId) => {
 <template>
   <div style="width: 100%">
     <div class="header">
-      <DataHeader v-show="false" />
+      <DataHeader />
     </div>
     <div class="main">
       <!-- 侧边 -->