UI

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']

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>
+              按 <img class="img-question" src="@/assets/images/question.png" alt="">查看快捷键的信息
-                按<span class="wrapper-mark">?</span>查看快捷键的信息
+
-              </div>
+              <img class="img-close" src="@/assets/images/close.png" alt="" @click="closeModal">
-              <div class="wrapper-close" @pointerdown="closeModal">
-                <div class="wrapper-icon" />
-              </div>
             </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;

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;
+  const { page } = pagination
-  pagination.pageSize = currentPageSize;
+  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>

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)
+  // emit('goDetail', item.id)
-    router.push({ name: 'message-detail', query: { id: item.id } })
+  { router.push({ name: 'message-detail', query: { id: item.id } }) }
 }
 
 async function clearMsgOne(id) {

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>