From 4bc95c1d6415da2f03a9d2338de989476ae3a4f3 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Fri, 22 Mar 2024 21:20:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/message/message.ts             | 13 +++++++++++++
 src/components/Search/Search.vue       |  3 ++-
 src/layout/components/Header/index.vue | 19 +++++++++++++-----
 src/store/modules/task.ts              |  5 +++++
 src/views/task/content/Content.vue     | 27 +++++++++++++++-----------
 types/task.d.ts                        |  1 +
 6 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/src/api/message/message.ts b/src/api/message/message.ts
index d6cd797..b8d95d1 100644
--- a/src/api/message/message.ts
+++ b/src/api/message/message.ts
@@ -55,3 +55,16 @@ export async function readAllMsg(params) {
 
   return res
 }
+
+/**
+ * 未读消息总数
+ * @returns
+ */
+export async function msgPolling() {
+  const res = await http.request({
+    url: `/ocr/msg/msgPolling`,
+    method: 'get',
+  })
+
+  return res
+}
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index ddb3f51..b628761 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -106,7 +106,7 @@ function highlightText(text, query) {
         </template>
       </n-input>
     </div>
-    <div v-show="showList" class="list_box">
+    <div v-show="showList && (historyList.length || resultList.length)" class="list_box">
       <div
         v-if="historyList.length"
         class="list_classfiy_item"
@@ -148,6 +148,7 @@ function highlightText(text, query) {
   position: absolute;
   top: 20%;
   left: 20%;
+  box-shadow: none!important;
   .ip_box{
     z-index: 0;
     position: relative;
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index c66a6c7..6fac42a 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -7,10 +7,12 @@ import RecycleModal from './RecycleModal.vue'
 import SearchModal from './SearchModal.vue'
 import ShortcutModal from './ShortcutModal.vue'
 import UserSettings from './UserSettings.vue'
-import { getMessageList } from '@/api/message/message'
+import { msgPolling } from '@/api/message/message'
 import { getImgUrl } from '@/utils/urlUtils'
 import { useUser } from '@/store/modules/user'
+import { useTaskStore } from '@/store/modules/task'
 
+const taskStore = useTaskStore()
 export default defineComponent({
   name: 'PageHeader',
   components: {
@@ -77,8 +79,12 @@ export default defineComponent({
       },
     )
 
-    const handleDragOver = (event) => {
-      event.dataTransfer.dropEffect = 'move'
+    const handleDragOver = (event, item) => {
+      taskStore.setInFile(true)
+    }
+
+    const handleDragLeave = (event, item) => {
+      taskStore.setInFile(false)
     }
 
     const dropdownSelect = (key) => {
@@ -139,7 +145,7 @@ export default defineComponent({
     }
 
     async function getMessage() {
-      const res = await getMessageList({ page: 1, size: 10, msgCategory: 1 })
+      const res = await msgPolling()
       if (res.data)
         iconList.value[4].icon = 'hasmessage'
       else
@@ -175,6 +181,8 @@ export default defineComponent({
       useInfo,
       getImgUrl,
       getMessage,
+      handleDragOver,
+      handleDragLeave,
     }
   },
 })
@@ -199,7 +207,8 @@ export default defineComponent({
         v-for="item in iconList"
         :key="item.icon"
         class="layout-header-trigger layout-header-trigger-min"
-        @dragover.prevent="handleDragOver"
+        @dragover.prevent="(e) => { handleDragOver(e, item) }"
+        @dragleave.prevent="(e) => { handleDragLeave(e, item) }"
       >
         <div class="back" @click="item.handle">
           <SvgIcon :name="item.icon" size="18" />
diff --git a/src/store/modules/task.ts b/src/store/modules/task.ts
index c9b1adb..bf83d27 100644
--- a/src/store/modules/task.ts
+++ b/src/store/modules/task.ts
@@ -11,17 +11,22 @@ export const useTaskStore = defineStore({
     approvalList: [],
     packageid: '',
     immersion: false,
+    inFile: false, // 是否进入文件夹
   }),
   getters: {
     getActiveId: (state: TaskState) => state.activeId,
     getPackageid: (state: TaskState) => state.packageid,
     getCurrentIndex: (state: TaskState) => state.currentIndex,
     getApprovalList: (state: TaskState) => state.approvalList,
+    getInFile: (state: TaskState) => state.inFile,
   },
   actions: {
     setApprovalList(list: any[]) {
       this.approvalList = list
     },
+    setInFile(flag: any) {
+      this.inFile = flag
+    },
     setActive(index: number, taskId?: string) {
       this.currentIndex = index
       const task = this.approvalList[index]
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index b9e9378..c5bc977 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -234,15 +234,20 @@ function backHandler() {
   taskStore.back()
 }
 
-function handleDragStart(event) {
-  console.log(888)
-  // event.dataTransfer.setData('text/plain', event.target.innerText)
-}
 async function handleDragEnd(event, item) {
   // 可以在这里添加拖拽结束后的逻辑
-  console.log(event)
-  console.log(item)
-  await dubiousfileyd({ taskchildid: item.id })
+  const flag = taskStore.getInFile
+  if (flag) {
+    const res = await dubiousfileyd({ taskchildid: item.id })
+    if (res.code === 'OK') {
+      message.success('加入成功')
+      getTableData()
+    }
+    else {
+      message.error(res.message)
+    }
+    taskStore.setInFile(false)
+  }
 }
 
 async function getTableData() {
@@ -322,8 +327,8 @@ const currentTaskId = computed(() => {
 function overTaskHandle() {
   const item = taskDetailInfo.value
   if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
-    overTask.value = null;
-    return;
+    overTask.value = null
+    return
   }
 
   if (validate([item]) == null && batch.value === false)
@@ -534,7 +539,6 @@ function getPercent(pictureid: string) {
                 draggable="true"
                 class="img-wrapper"
                 :style="{ 'background-image': `url(${item.thumburl})` }"
-                @dragstart="handleDragStart"
                 @dragend="(event) => { handleDragEnd(event, item) }"
               />
               <div class="check">
@@ -784,13 +788,14 @@ function getPercent(pictureid: string) {
         margin: 0px 16px 27px 0px;
 
         .img-wrapper {
-          width: 230px;
+          // width: 230px;
           height: 130px;
           overflow: hidden;
           background-size: cover;
           background-position: center;
           background-repeat: no-repeat;
           border-radius: 8px;
+          cursor: n-resize;
         }
 
         .check {
diff --git a/types/task.d.ts b/types/task.d.ts
index bd02c6b..4f3ee8d 100644
--- a/types/task.d.ts
+++ b/types/task.d.ts
@@ -11,6 +11,7 @@ export interface TaskState {
   currentIndex: number
   approvalList: any[]
   immersion: boolean
+  inFile: boolean
 }
 
 export interface TaskEntity {