From 331b75636b8f7b27ab226e5d43f81db4f4ab18f6 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 01:28:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=A3=E6=95=A3=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home/main.ts                        | 13 ++++++++
 src/views/home/content/Content.vue          |  5 ---
 src/views/worksheet/aside/ListItem.vue      | 36 +++++++++++++++------
 src/views/worksheet/aside/WorkSheetList.vue | 30 +++++++++++++----
 4 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/src/api/home/main.ts b/src/api/home/main.ts
index bd661e2..5f70458 100644
--- a/src/api/home/main.ts
+++ b/src/api/home/main.ts
@@ -180,6 +180,19 @@ export async function oneClickCheck(params: Partial<CheckParam> = { search_histo
     params
   })
 }
+/**
+ * 解散任务包
+ * @param 
+ * @returns
+ */
+ export async function deletePackage(params) {
+
+  return http.request({
+    url: `/ocr/ocrTaskPackage/deletePackage`,
+    method: 'get',
+    params
+  })
+}
 /**
  * 任务完成——创建任务包前——获取图片列表
  * @param 
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 8ebdf46..52595ad 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -236,11 +236,6 @@ async function tasksLoadingCloseCallback() {
 	checkingTaskModal.showModal()
 }
 
-async function showLoginSuccessModal() {
-  const modal = LoginSuccessModalRef.value as any
-  // modal.showModal()
-}
-
 async function commitHandler(settingParam) {
   const params = {
     name: settingParam.packagename,
diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index f80514d..cb9350c 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
 import { format } from 'date-fns';
-import { computed, onMounted } from "vue";
+import { computed, onMounted, ref } from "vue";
 import type { PackageListItem } from "/#/workorder";
+
 defineOptions({ name: "ListItem" });
+const emit = defineEmits(['dismisClick'])
 
 const props = defineProps({
   selected: {
@@ -21,19 +23,22 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  mouseOverTask: {
+    type: Array,
+    default: () => [],
+  },
 });
-console.log(props.dicts, "dicts");
+const isDismissTask = ref(false)
 const svgName = computed(() => {
   return props.selected ? "taskpack-select" : "taskpack";
 });
-function getValueByLabel(label) {
-  const result = props.dicts.filter(item => item.name === label)
-  if (result.length === 0) {
-    return ""
-  } else {
-    return props.dicts.filter(item => item.name === label)[0].fieldDesc
-  }
+
+
+function handleDismissTask() {
+  isDismissTask.value = true
+  emit('dismisClick',  props.mouseOverTask.id)
 }
+
 onMounted(async () => {
 })
 </script>
@@ -46,9 +51,15 @@ onMounted(async () => {
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
             <n-ellipsis style="max-width: 180px">
-             {{ listItem.name }}
+              {{ listItem.name }}
             </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
+            <n-popover placement="bottom" trigger="hover" >
+              <template #trigger>
+                <span class="dismiss-task-pack"  v-show="mouseOverTask?.id" style="cursor: pointer;" @click.stop="handleDismissTask">...</span>
+              </template>
+              <span>解散任务包</span>
+            </n-popover>
           </span>
         </div>
       </div>
@@ -105,6 +116,11 @@ onMounted(async () => {
       margin-bottom: 6px
     }
 
+    .dismiss-task-pack {
+      position: absolute;
+      right: 15px;
+    }
+
     .list-item-header-name {
       width: 250px;
       font-size: 16px;
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 39cb0b7..4292eb4 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
+import { deletePackage } from '@/api/home/main'
 import NotPassed from '@/components/NotPassed.vue'
 import { useWorkOrder } from '@/store/modules/workOrder'
 import { isEmpty } from '@/utils'
 import { useInfiniteScroll } from '@vueuse/core'
-import { reactive, ref, unref, watch } from 'vue'
+import { useMessage } from 'naive-ui'
+import { reactive, ref, watch } from 'vue'
 import ApprovalModal from '../modal/ApprovalModal.vue'
 import ListItem from './ListItem.vue'
 import type { PackageListItem } from '/#/workorder'
@@ -33,11 +35,7 @@ const pagination = reactive({
 
 const approvalModalRef = ref(null)
 const notPassedRef: any = ref(null)
-
-function showModal(modalRef: any, id) {
-  const modal = unref(modalRef)! as any
-  modal.showModal(id)
-}
+const overTask = ref<any>(null);
 
 function selectHandler(id: string, index: number) {
   workStore.setActive(index)
@@ -125,7 +123,21 @@ async function search(word: string) {
     { distance: 10, canLoadMore: () => canloadMore.value },
   )
 }
-
+function overTaskHandelr(item: any) {
+  overTask.value = item
+}
+function leaveTaskHandler() {
+  overTask.value = null;
+}
+const message = useMessage()
+function dismisClick(packageId:string) {
+  deletePackage({packageId: packageId}).then((res) => {
+    if(res.code==="OK"){
+      message.success("解散任务包成功")
+      loadMore()
+    }
+  })
+}
 defineExpose({
   search,
 })
@@ -143,7 +155,11 @@ defineExpose({
         :list-item="item"
         :show-field-list="showFieldList"
         :dicts="dicts"
+        :mouse-over-task="overTask"
         @click="selectHandler(item.id, index)"
+        @mouseover="overTaskHandelr(item)"  
+        @mouseleave="leaveTaskHandler"
+        @dismisClick="dismisClick"
       />
     </div>
   </n-spin>