From 428663af5cc766c8f0bdb4d94359b9407b260850 Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Sun, 14 Apr 2024 18:16:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=20feat:=20=E6=8C=89=E9=94=AE=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue       | 30 +++++++++++++++----
 .../worksheet/modal/CustomFieldModal.vue      | 26 ++++++++++++----
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 094d600..0816f04 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -16,7 +16,7 @@ import { useInfiniteScroll } from '@vueuse/core'
 import { format } from 'date-fns'
 import imagesloaded from 'imagesloaded'
 import { clone, cloneDeep, debounce, pickBy } from 'lodash-es'
-import { useDialog, useMessage } from 'naive-ui'
+import { useDialog, useMessage, useModal } from 'naive-ui'
 import {
   computed,
   onMounted,
@@ -90,6 +90,9 @@ let processItems: any[] = []
 const passDialog = ref(false)
 // 审核不通过弹窗状态 只做记录，不影响业务
 const rejectDialog = ref(false)
+const rejectDialogCom = ref < (null)
+// 关闭所有页面弹窗
+const modal = useModal()
 let keyPlastKeyTime = 0
 let keyXLastTime = 0
 // let keyPressTimer
@@ -282,15 +285,23 @@ function leaveTaskHandler() {
 function onEsc(event) {
   const eles = ['INPUT', 'TEXTAREA']
   const keys = ['KeyC', 'KeyP', 'KeyX']
+  console.log(event.code)
   const code = event.code
-  if (eles.includes(event.target.targName))
+  if (eles.includes(event.target.tagName))
     return
   if (!keys.includes(event.code))
     return
 
   if (event.code === 'KeyC') {
-    if (isFullScreen.value && !document.querySelector('.n-modal-container')) {
+    // 是否有弹窗存在
+    const modalClasss = [
+      document.querySelector('.n-modal'),
+      document.querySelector('.n-dialog'),
+    ]
+    const hasModal = modalClasss.some(i => i)
+    if (isFullScreen.value && !hasModal) {
       isFullScreen.value = false
+      return
     }
     else {
       const notPassModal = unref(notPassModalRef)! as any
@@ -299,6 +310,7 @@ function onEsc(event) {
       mainImageModal.closeModal(false)
       confrimModal.closeModal(false)
       notPassModal.closeModal(false)
+      dialog.destroyAll()
     }
   }
   // 审核通过、不通过 批量审核弹窗任意一个存在都不进行下面的操作
@@ -328,8 +340,8 @@ function onEsc(event) {
 
 function resizeImage() {
   const container = document.querySelector('.image-container')!
-  const containerWidth = container.offsetWidth
-  const containerHeight = container.offsetHeight
+  const containerWidth = container?.offsetWidth
+  const containerHeight = container?.offsetHeight
 }
 
 onUnmounted(() => {
@@ -539,6 +551,14 @@ function handleRejectdubiousfileyd(pictureid) {
     onPositiveClick: () => {
       dubiousfileyd(pictureid).then(() => {
         refreshHandler()
+        const packageid = workStore.getActiveId
+        if (isEmpty(packageid)) {
+          listData.value.length = 0
+          totalCount.value = 0
+          taskDetailInfo.value = {}
+          return
+        }
+        queryDetail(packageid)
       })
     },
     onNegativeClick: () => {},
diff --git a/src/views/worksheet/modal/CustomFieldModal.vue b/src/views/worksheet/modal/CustomFieldModal.vue
index 113014c..8ad9f54 100644
--- a/src/views/worksheet/modal/CustomFieldModal.vue
+++ b/src/views/worksheet/modal/CustomFieldModal.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { difference } from 'lodash-es'
-import { computed, defineEmits, defineProps, onMounted, ref, watch } from 'vue'
+import { computed, defineEmits, defineProps, onMounted, onUnmounted, ref, watch } from 'vue'
 import { VueDraggable } from 'vue-draggable-plus'
 import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
 import { workPackageMap } from '@/config/workorder'
@@ -36,6 +36,9 @@ const showOffList = computed(() => {
 const showFixList = computed(() => {
   return fixList.value.filter(i => i.name.includes(searchFixVal.value))
 })
+const showOnList = computed(() => {
+  return onList.value.filter(i => i.name.includes(searchFixVal.value))
+})
 const selectCount = computed(() => {
   return `显示字段(共${onList.value.length}个)`
 })
@@ -178,6 +181,9 @@ watch(
       searchKey.value = ''
       searchFixVal.value = ''
     }
+    else {
+      emit('showDialog', val)
+    }
   },
 )
 watch(
@@ -315,11 +321,21 @@ async function getData() {
     }
   })
 }
-
+function handleKeydown(event: KeyboardEvent) {
+  // 排除元素
+  const eles = ['INPUT', 'TEXTAREA']
+  if (eles.includes(event?.target?.tagName))
+    return
+  if (event.code === 'KeyC')
+    closeModal()
+}
 onMounted(async () => {
   getData()
+  document.addEventListener('keydown', handleKeydown)
+})
+onUnmounted(() => {
+  document.removeEventListener('keydown', handleKeydown)
 })
-
 const indeterminate = computed(() => {
   let baseNum = 0
   offList.value.map((v) => {
@@ -418,13 +434,13 @@ const indeterminate = computed(() => {
                   </div>
                 </div>
                 <VueDraggable
-                  v-model="onList"
+                  v-model="showOnList"
                   class="draggable-ul"
                   :animation="150"
                   group="shared"
                 >
                   <div
-                    v-for="item in onList"
+                    v-for="item in showOnList"
                     :key="item.id"
                     :class="{ fix: item.fix }"
                     class="cursor-move draggable-item"
-- 
2.39.3


From 98f1fda6db5a060f0ed2a586228f6e8f1870d8a9 Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Sun, 14 Apr 2024 19:08:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=A4=84=E7=90=86=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue        | 15 +++------------
 src/views/worksheet/modal/CustomFieldModal.vue |  8 ++++----
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 0816f04..3187a01 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -90,9 +90,6 @@ let processItems: any[] = []
 const passDialog = ref(false)
 // 审核不通过弹窗状态 只做记录，不影响业务
 const rejectDialog = ref(false)
-const rejectDialogCom = ref < (null)
-// 关闭所有页面弹窗
-const modal = useModal()
 let keyPlastKeyTime = 0
 let keyXLastTime = 0
 // let keyPressTimer
@@ -282,11 +279,12 @@ function overTaskHandelr(item: any) {
 function leaveTaskHandler() {
   overTask.value = null
 }
-function onEsc(event) {
+function onEsc(event: KeyboardEvent) {
   const eles = ['INPUT', 'TEXTAREA']
   const keys = ['KeyC', 'KeyP', 'KeyX']
-  console.log(event.code)
   const code = event.code
+  if (!(event.target instanceof Element))
+    return
   if (eles.includes(event.target.tagName))
     return
   if (!keys.includes(event.code))
@@ -338,19 +336,12 @@ function onEsc(event) {
   }
 }
 
-function resizeImage() {
-  const container = document.querySelector('.image-container')!
-  const containerWidth = container?.offsetWidth
-  const containerHeight = container?.offsetHeight
-}
-
 onUnmounted(() => {
   workStore.reset()
   document.removeEventListener('keydown', onEsc)
 })
 onMounted(() => {
   document.addEventListener('keydown', onEsc)
-  window.addEventListener('resize', resizeImage)
 })
 function immersionHandler() {
   // class="wrapper"
diff --git a/src/views/worksheet/modal/CustomFieldModal.vue b/src/views/worksheet/modal/CustomFieldModal.vue
index 8ad9f54..d77da8e 100644
--- a/src/views/worksheet/modal/CustomFieldModal.vue
+++ b/src/views/worksheet/modal/CustomFieldModal.vue
@@ -181,9 +181,6 @@ watch(
       searchKey.value = ''
       searchFixVal.value = ''
     }
-    else {
-      emit('showDialog', val)
-    }
   },
 )
 watch(
@@ -324,7 +321,10 @@ async function getData() {
 function handleKeydown(event: KeyboardEvent) {
   // 排除元素
   const eles = ['INPUT', 'TEXTAREA']
-  if (eles.includes(event?.target?.tagName))
+  if (!(event.target instanceof Element))
+    return
+
+  if (eles.includes(event.target.tagName))
     return
   if (event.code === 'KeyC')
     closeModal()
-- 
2.39.3