From 2d9bb1a8028304a64128edebf05316467577ab89 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 22 Mar 2024 16:12:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=82=AC=E6=B5=AE=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/content/ListContent.vue | 19 ++++++--------
 src/views/final/index.vue               |  5 ++--
 src/views/task/content/Content.vue      |  4 +++
 src/views/worksheet/content/Content.vue | 33 ++++++++++++++++---------
 4 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index 9e176fe..f01c4ac 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -2,7 +2,8 @@
 import { onMounted, ref } from "vue";
 
 const item = {
-  img: "/src/assets/images/test.png",
+  // img: "/src/assets/images/test.png",
+  img:'http://47.93.59.251/api/image/thumbnail_1752999610491604992.jpeg',
   checked: false,
   title: "YP4567890545",
   date: "2023-12-19 12:09:18",
@@ -10,7 +11,7 @@ const item = {
 const data = ref<any[]>([]);
 
 onMounted(() => {
-  for (let i = 0; i < 10; i++) {
+  for (let i = 0; i < 20; i++) {
     data.value.push(item as any);
   }
 });
@@ -36,7 +37,7 @@ onMounted(() => {
               :key="index"
               :style="index == 2 ? 'color:#02C984' : 'color:#507AFD'"
             >
-              待确认
+              {{ index==1?'待确认':'张思' }}
             </div>
           </div>
         </div>
@@ -85,8 +86,7 @@ onMounted(() => {
         .title,
         .date {
           font-size: 11px;
-          font-family: PingFang SC, PingFang SC-Medium;
-          font-weight: Medium;
+          font-weight: bolder;
           text-align: left;
           color: #323233;
           line-height: 16px;
@@ -101,8 +101,7 @@ onMounted(() => {
           width: 31px;
           height: 14px;
           font-size: 10px;
-          font-family: PingFang SC, PingFang SC-Regular;
-          font-weight: Regular;
+          font-weight: bolder;
           text-align: left;
           //   color: #507afd;
           line-height: 14px;
@@ -118,16 +117,14 @@ onMounted(() => {
       justify-content: flex-end;
       .resovle_action {
         font-size: 12px;
-        font-family: PingFang SC, PingFang SC-Medium;
-        font-weight: Medium;
+        font-weight: bolder;
         text-align: left;
         color: #507afd;
         line-height: 17px;
       }
       .reject_action {
         font-size: 12px;
-        font-family: PingFang SC, PingFang SC-Medium;
-        font-weight: Medium;
+        font-weight: bolder;
         text-align: left;
         color: #ff4e4f;
         line-height: 17px;
diff --git a/src/views/final/index.vue b/src/views/final/index.vue
index 9ef95fe..9e1e3b0 100644
--- a/src/views/final/index.vue
+++ b/src/views/final/index.vue
@@ -15,9 +15,10 @@ const showList = ref(false);
     <Aside />
 
     <!-- 内容 -->
-    <Content @changeShow="showList=true" v-if="!showList"/>
+    <Content @changeShow="showList=true" />
     <!-- 任务管理 -->
-    <ListContent v-else />
+    <!-- TODO:本地演示即可 上传注释注释 -->
+    <!-- <ListContent  /> -->
   </div>
 </template>
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index a51a341..0fab81f 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -310,6 +310,10 @@ const currentTaskId = computed(() => {
 
 function overTaskHandle() {
   const item = taskDetailInfo.value
+  if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
+    overTask.value = null;
+    return;
+  }
 
   if (validate([item]) == null && batch.value === false)
     overTask.value = item
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 2856fa2..8db7831 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -7,7 +7,7 @@ import imagesloaded from "imagesloaded";
 import ConfrimModal from "../modal/ConfrimModal.vue";
 import type { PictureSortParam, SetTFParam } from "/#/api";
 import { useWorkOrder } from "@/store/modules/workOrder";
-import { formatToDateHMS } from '@/utils/dateUtil'
+import { formatToDateHMS } from "@/utils/dateUtil";
 import {
   clearTF,
   getPackageTaskList,
@@ -341,6 +341,11 @@ async function clearMark() {
 }
 
 function overTaskHandelr(item: any) {
+  if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
+    overTask.value = null;
+    return;
+  }
+
   if (validate([item]) == null && batch.value === false) overTask.value = item;
 }
 
@@ -455,9 +460,9 @@ function previewHandler(event: MouseEvent) {
               />
             </div>
             <div class="time">
-          <SvgIcon color="#FFF" size="16" name="time" />
-          <span>{{ formatToDateHMS(taskDetailInfo.createdate || 0) }}</span>
-        </div>
+              <SvgIcon color="#FFF" size="16" name="time" />
+              <span>{{ formatToDateHMS(taskDetailInfo.createdate || 0) }}</span>
+            </div>
             <!-- 右下信息 -->
             <div class="info">
               <n-grid x-gap="16" y-gap="0" :cols="12">
@@ -579,6 +584,10 @@ function previewHandler(event: MouseEvent) {
               class="img-wrapper"
               :style="{ 'background-image': `url(${item.thumburl})` }"
             />
+            <div class="time">
+              <SvgIcon color="#FFF" size="16" name="time" />
+              <span>{{ formatToDateHMS(item.createdate || 0) }}</span>
+            </div>
             <div class="check">
               <n-checkbox
                 v-show="batch"
@@ -923,12 +932,12 @@ function previewHandler(event: MouseEvent) {
 }
 
 .time {
-        position: absolute;
-        z-index: 3;
-        left: 2%;
-        bottom: 2%;
-        color: #fff;
-        display: flex;
-        align-items: center;
-      }
+  position: absolute;
+  z-index: 3;
+  left: 5%;
+  bottom: 5%;
+  color: #fff;
+  display: flex;
+  align-items: center;
+}
 </style>