From c94c04c1690bdbb9a0b979f921e793954223a25d Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Fri, 22 Mar 2024 01:15:54 +0800
Subject: [PATCH] UI

---
 components.d.ts                               |   1 +
 src/assets/images/close.png                   | Bin 0 -> 440 bytes
 src/assets/images/question.png                | Bin 0 -> 1543 bytes
 .../components/Header/ShortcutModal.vue       |  55 +++++++++++++++---
 src/views/final/content/Content.vue           |  29 ++++-----
 src/views/message/content/List.vue            |  13 +++--
 src/views/task/content/History.vue            |   2 +-
 7 files changed, 74 insertions(+), 26 deletions(-)
 create mode 100644 src/assets/images/close.png
 create mode 100644 src/assets/images/question.png

diff --git a/components.d.ts b/components.d.ts
index 1353fc5..1d346c9 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -9,6 +9,7 @@ declare module 'vue' {
   export interface GlobalComponents {
     Application: typeof import('./src/components/Application/Application.vue')['default']
     BasicModal: typeof import('./src/components/Modal/BasicModal.vue')['default']
+    DataHeader: typeof import('./src/components/DataHeader/index.vue')['default']
     NAvatar: typeof import('naive-ui')['NAvatar']
     NButton: typeof import('naive-ui')['NButton']
     NCard: typeof import('naive-ui')['NCard']
diff --git a/src/assets/images/close.png b/src/assets/images/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d15a37c72d4c650d49b2521493f8960cf8518b2
GIT binary patch
literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$a!Eu%RA@u(nA;7)FbqZAnK}y$!9WZFvt%YvQ6p7V8eiKtErsw)6Q5(}J;=#_
z!^!!j3mjd+UV&bLU<UqU2#w=-5s`<8TvJNVVA871=U6upxg)XE3M}Ar;ARq@Sct%@
zkTSYN0sa#<rBr1^1oH4%d(b4d;E^G#3QW|I0NQ+s_6-TNl8C}jT(AIJf&p(9U`epx
zT>?=FCcIm~E5U{j30Ngsz=s7;iB|9w0Zn4w2c~mWla0`{jMg@#N|sB_XuCK~K&ix1
zf(B0;LQ6WO5>)suupZptJfK#AHU~iX>`arO2-Md3uU|%yO$zx&yEkn8AF6-_%<`>8
z#x39h^0d)pTmli0NZXQ(S%3k+=p)OR1ek$YeZc~(fZ(wM-X|b|7Vudl+P5kY4WO+e
z+I>QMA4LRy?r9MopGfwVIibc<E3har{N!x~-;hw@o7@K?@Se6%1w0+^)us#VmFXtO
i>7(KMB<>X;WZ(@LaTq|VuUY{B0000<MNUMnLSTYofw;f`

literal 0
HcmV?d00001

diff --git a/src/assets/images/question.png b/src/assets/images/question.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ee959e7bfea8dad13038bbcbfebf9d97e6a17d1
GIT binary patch
literal 1543
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

literal 0
HcmV?d00001

diff --git a/src/layout/components/Header/ShortcutModal.vue b/src/layout/components/Header/ShortcutModal.vue
index 0ffd131..f14803d 100644
--- a/src/layout/components/Header/ShortcutModal.vue
+++ b/src/layout/components/Header/ShortcutModal.vue
@@ -32,12 +32,9 @@ defineExpose({
           <div class="wrapper-header">
             <span class="wrapper-left">全局快捷键</span>
             <div class="wrapper-right">
-              <div>
-                按<span class="wrapper-mark">?</span>查看快捷键的信息
-              </div>
-              <div class="wrapper-close" @pointerdown="closeModal">
-                <div class="wrapper-icon" />
-              </div>
+              按 <img class="img-question" src="@/assets/images/question.png" alt="">查看快捷键的信息
+
+              <img class="img-close" src="@/assets/images/close.png" alt="" @click="closeModal">
             </div>
           </div>
           <n-divider />
@@ -133,6 +130,8 @@ defineExpose({
             </table>
           </div>
         </div>
+        <n-divider />
+
         <template #footer>
           <div class="wrapper-footer">
             <n-button type="info" @click="closeModal">
@@ -149,9 +148,51 @@ defineExpose({
 </template>
 
 <style lang="less" scoped>
+.wrapper-footer{
+  margin-top: -20px;
+}
 .wrapper {
-  .title{
+
+  .wrapper-header{
+    padding: 14px;
+    padding-bottom: 0;
+  }
+
+  .img-question{
+    width: 16px;
+    height: 16px;
+    margin: 0 2px;
+  }
+
+  .img-close{
+    width: 16px;
+    height: 16px;
+    margin-left: 16px;
+    cursor: pointer;
+  }
+
+  .wrapper-right{
     font-size: 16px;
+    font-family: PingFang SC, PingFang SC-Regular;
+    font-weight: Regular;
+    text-align: left;
+    color: #666666;
+    line-height: 22px;
+    display: flex;
+    align-items: center
+  }
+
+  .wrapper-left{
+    font-size: 18px;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: 600;
+    text-align: left;
+    color: #333333;
+    line-height: 25px;
+  }
+
+  .title{
+    font-size: 14px;
     font-weight: 600;
     margin-bottom: 10px;
     padding-left: 30px;
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 98bdfc5..763a26d 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -3,6 +3,7 @@ import type { DataTableColumns, DataTableRowKey, PaginationProps } from 'naive-u
 import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
 import {
   computed,
+  defineEmits,
   h,
   nextTick,
   onBeforeMount,
@@ -12,7 +13,6 @@ import {
   ref,
   unref,
   watch,
-  defineEmits
 } from 'vue'
 import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
 import { useRoute, useRouter } from 'vue-router'
@@ -43,11 +43,10 @@ import { formatToDateHMS } from '@/utils/dateUtil'
 import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
 
 const emit = defineEmits(['changeShow'])
-const changeContent = ()=>{
+function changeContent() {
   emit('changeShow')
 }
 
-
 const dicStore = useDictionary()
 const izstatusList = ref([])
 const router = useRouter()
@@ -379,22 +378,22 @@ const pagination = reactive({
   page: 1,
   pageCount: 1,
   pageSize: 10,
-  showSizePicker:true,
+  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,
     },
   ],
@@ -432,12 +431,13 @@ async function handlePageChange(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[]) {
@@ -565,6 +565,7 @@ function actionHandler(action: any, row: any) {
   const { key } = action
   switch (key) {
     case 'view':
+      goDetail(row)
       break
     case 'reset':
       resetHandler()
@@ -754,7 +755,7 @@ async function refreshHandler(searchId?: any) {
     <div class="wrapper-header">
       <div class="wrapper-header-left">
         <span class="wrapper-header-font">任务管理列表</span>
-        <SvgIcon size="32" name="magnifying" @click="changeContent"/>
+        <SvgIcon size="32" name="magnifying" @click="changeContent" />
       </div>
       <div>
         <NButton class="xjcc" text @click="showModal(repeatModalRef)">
@@ -822,7 +823,7 @@ async function refreshHandler(searchId?: any) {
         :pagination="pagination"
         :row-key="rowKey"
         @update:page="handlePageChange"
-@update-page-size="handlePageSizeChange"
+        @update-page-size="handlePageSizeChange"
         @update:checked-row-keys="handleCheck"
       />
     </div>
diff --git a/src/views/message/content/List.vue b/src/views/message/content/List.vue
index 5e5a628..a13bace 100644
--- a/src/views/message/content/List.vue
+++ b/src/views/message/content/List.vue
@@ -76,13 +76,18 @@ function switchTab(type: number) {
   getList()
 }
 
+function goFinalDetail(row) {
+  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
+}
+
 function goDetail(item) {
-  if (tab.value === 1)
+  if (tab.value === 1) {
     clearMsgOne(item.id)
-
+    goFinalDetail(item)
+  }
   else
-    // emit('goDetail', item.id)
-    router.push({ name: 'message-detail', query: { id: item.id } })
+  // emit('goDetail', item.id)
+  { router.push({ name: 'message-detail', query: { id: item.id } }) }
 }
 
 async function clearMsgOne(id) {
diff --git a/src/views/task/content/History.vue b/src/views/task/content/History.vue
index 896a7b2..104c805 100644
--- a/src/views/task/content/History.vue
+++ b/src/views/task/content/History.vue
@@ -58,7 +58,7 @@ onMounted(() => {
             <div class="time-wrap">
               <div class="triangle" />
               <div class="time">
-                完成时间：{{ formatToDateHMS(props.data.createdate) }}
+                完成时间：{{ props.data.finishtime ? formatToDateHMS(props.data.finishtime) : '' }}
               </div>
             </div>
           </template>