Merge pull request 'feat: 修改按钮距离问题' (#255) from fix/updatesyspic into test

Reviewed-on: #255

src/views/task/content/Content.vue

@@ -128,31 +128,30 @@ useKeydown('right', forwardHandler)
 useKeydown('left', backHandler)
 useKeydown('p p', () => {
   const item = taskDetailInfo.value
-      if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
-        overTask.value = null
-        return
-      }
+  if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
+    overTask.value = null
+    return
+  }
 
-      if (validate([item]) == null && batch.value === false)
-        overTask.value = item
-      // 执行想要的操作
-      approvalHandler()
+  if (validate([item]) == null && batch.value === false)
+    overTask.value = item
+  // 执行想要的操作
+  approvalHandler()
 })
 useKeydown('x x', () => {
   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)
-        overTask.value = item
-      // 执行想要的操作
-      const modal = unref(notPassModalRef)! as any
-      modal.showModal([taskDetailInfo.value])
+  if (validate([item]) == null && batch.value === false)
+    overTask.value = item
+  // 执行想要的操作
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal([taskDetailInfo.value])
 })
 
-
 function setBatch(value: boolean) {
   // if (totalCount.value === 0)
   //   return
@@ -309,11 +308,11 @@ async function handleDragEnd(event, item) {
       setBatch(false)
       getTableData()
       getImgList()
-    
-    }else{
-       message.error(res.message)
     }
-  
+    else {
+      message.error(res.message)
+    }
+
     taskStore.setInFile(false)
     taskStore.setInFile(item.pictureId)
   }
@@ -331,11 +330,10 @@ async function addSuspicious() {
       setBatch(false)
       getTableData()
       getImgList()
-         const searchParams = new URLSearchParams(window.location.search);
-  const type = searchParams.get('type'); 
-      if(type){
-   router.push({ name: 'final', query: { type: type} }) 
-      }
+      const searchParams = new URLSearchParams(window.location.search)
+      const type = searchParams.get('type')
+      if (type)
+        router.push({ name: 'final', query: { type } })
     }
     else {
       message.error(res.message)
@@ -363,8 +361,8 @@ async function getTableData() {
   fieldList.forEach((v) => {
     if (userFieldList.includes(v.name)) {
       let locationobj = { address: '' }
-      
-      if (v.name == 'location'&& taskDetailInfo.value.ocrPicture[v.name]!=null&& taskDetailInfo.value.ocrPicture[v.name]!="null") {
+
+      if (v.name == 'location' && taskDetailInfo.value.ocrPicture[v.name] != null && taskDetailInfo.value.ocrPicture[v.name] != 'null') {
         locationobj = JSON.parse(
           taskDetailInfo.value.ocrPicture ? taskDetailInfo.value.ocrPicture[v.name] : {},
         )
@@ -427,7 +425,7 @@ function showActionsModal() {
 
 onUnmounted(() => {
   taskStore.reset()
-   window.removeEventListener('scroll', checkBottom)
+  window.removeEventListener('scroll', checkBottom)
 })
 
 function immersionHandler() {
@@ -436,7 +434,8 @@ function immersionHandler() {
   toggleFullScreen()
 }
 useKeydown('k k', () => {
-  if (isFullScreen.value) return
+  if (isFullScreen.value)
+    return
   isFullScreen.value = true
   fetchData()
   window.addEventListener('scroll', checkBottom)
@@ -499,13 +498,13 @@ function reloadList(param, text) {
 }
 
 function goBack() {
-   const searchParams = new URLSearchParams(window.location.search);
-  const type = searchParams.get('type');
-  if(type){
- router.push({ name: 'final', query: { type: type} }) 
-  }else{
-  router.back()
-  }
+  const searchParams = new URLSearchParams(window.location.search)
+  const type = searchParams.get('type')
+  if (type)
+    router.push({ name: 'final', query: { type } })
+
+  else
+    router.back()
 }
 
 function switchBatch() {
@@ -627,8 +626,8 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
   sortBy.orderType = sortBy.orderType === 'asc' ? 'desc' : 'asc'
   refreshHandler()
 }
-function nodrage(){
-    message.error("已审批无法移入可疑文件夹中!")
+function nodrage() {
+  message.error('已审批无法移入可疑文件夹中!')
 }
 </script>
 
@@ -960,8 +959,8 @@ function nodrage(){
                 class="item"
                 draggable="true"
                 @dragend="
-                item.historyStates === 1?  handleDragEnd(event, item):nodrage()
-             
+                  item.historyStates === 1 ? handleDragEnd(event, item) : nodrage()
+
                 "
               >
                 <div
@@ -1184,9 +1183,9 @@ function nodrage(){
             class="item"
             draggable="true"
             @dragend="
-            
-              item.historyStates === 1?  handleDragEnd(event, item):nodrage()
-            
+
+              item.historyStates === 1 ? handleDragEnd(event, item) : nodrage()
+
             "
           >
             <div
@@ -1565,6 +1564,7 @@ function nodrage(){
         left: 0;
         bottom: 0;
         z-index: 0;
+        border-radius: 0 0 8px 8px;
       }
 
       .mark {

src/views/task/modal/BatchModal.vue

@@ -492,7 +492,7 @@ onUpdated(() => {
           </div>
 
           <div class="wrapper-content">
-            <div class="wrapper-content-form wrapper-m32">
+            <div class="wrapper-content-form wrapper-m32" style="margin-bottom: 16px;">
               <div>
                 <!-- <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click" @change="onChange">
                   <div class="wrapper-content-form-dropdown">
@@ -523,7 +523,7 @@ onUpdated(() => {
                 </div>
               </div>
               <div>
-                <div v-show="!showActions" style="margin-bottom: 16px;" class="wrapper-content-form-button" @click="switchBatch()">
+                <div v-show="!showActions" class="wrapper-content-form-button" @click="switchBatch()">
                   <SvgIcon style="margin-right: 6px;" size="22" name="batch" />
                   批量审批
                 </div>
@@ -640,6 +640,7 @@ onUpdated(() => {
   left: 0;
   bottom: 0;
   z-index: 0;
+  border-radius: 0 0 8px 8px;
 }
 
 .tag-status{

src/views/worksheet/aside/ListItem.vue

@@ -161,7 +161,7 @@ onMounted(async () => {})
         </li>
       </ul>
     </div>
-    <template v-if="showFieldList?.length > 5">
+    <template v-if="showFieldList?.length > 6">
       <div class="absolute bottom-0 py-[8px] pl-[36px] text-[#666] item-action">
         <span class="cursor-pointer" @click.stop="showFull = !showFull">
           <SvgIcon v-if="showFull" style="margin-left: 6px" name="expand" size="16" />

src/views/worksheet/content/Content.vue

@@ -148,7 +148,7 @@ async function loadMore() {
 
   const more = await featchList()
   listData.value.push(...more)
-  console.log("listData.value11111111111111111", listData.value);
+  console.log('listData.value11111111111111111', listData.value)
 }
 
 async function featchList() {
@@ -579,7 +579,7 @@ defineExpose({
 <template>
   <div class="wrapper fullscreen-container" :style="fullscreenStyles">
     <div class="wrapper-header">
-      <div class="left" >
+      <div class="left">
         <span class="font">{{ packageName }}</span>
         <SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
         <SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
@@ -598,10 +598,10 @@ defineExpose({
               style="cursor: pointer"
               @click="immersionHandler"
             />
-            <n-tooltip  
-              v-else 
+            <n-tooltip
+              v-else
               placement="bottom"
-              >
+            >
               <template #trigger>
                 <SvgIcon
                   size="20"
@@ -642,16 +642,16 @@ defineExpose({
             :style="{
               'background-image': `url(${taskDetailInfo?.imgurl})`,
               'flex': imgbigshow ? '0.6' : '0.98',
-              'height':imgbigshow?' 100%':'80vh'
+              'height': imgbigshow ? ' 100%' : '80vh',
             }"
-           
+
             @mouseover="showAction"
             @mouseleave="leaveTaskHandler"
           >
             <div class="footer-times">
               <div class="time" style="margin-bottom: 4px">
                 <SvgIcon color="#FFF" size="16" name="camera" />
-                 <span class="time-value">{{
+                <span class="time-value">{{
                   taskDetailInfo?.photoDateTimestamp
                     ? format(taskDetailInfo?.photoDateTimestamp, "yyyy-MM-dd HH:mm:ss")
                     : "- -"
@@ -753,45 +753,43 @@ defineExpose({
                 @click.stop="handleRejectdubiousfileyd(taskDetailInfo.id)"
               />
             </div>
-               <!-- 缩放线 -->
-          <div
-            v-show="isFullScreen"
-            :style="{
-              position: 'absolute',
-              zIndex: 169,
-              background: 'rgb(80, 122, 253)',
-           right: imgbigshow ? '-23px':'0',
-              marginTop: '5px',
-              width: '2px',
-              height: imgbigshow?'340px':'79vh',
-            }"
-          />
-          <div
-            v-show="isFullScreen"
-            class="aside-collapse-btn"
-            :style="{
-              position: 'absolute',
-              right: imgbigshow ? '-40px':'-16px',
-              top: '73px',
-              cursor: 'pointer',
-              zIndex: 170,
-            }"
-          >
-            <SvgIcon
-              :name="imgbigshow ? 'expand-cir' : 'collapse-cir'"
-              size="40"
-              @click="changeimgbigshow"
+            <!-- 缩放线 -->
+            <div
+              v-show="isFullScreen"
+              :style="{
+                position: 'absolute',
+                zIndex: 169,
+                background: 'rgb(80, 122, 253)',
+                right: imgbigshow ? '-23px' : '0',
+                marginTop: '5px',
+                width: '2px',
+                height: imgbigshow ? '340px' : '79vh',
+              }"
             />
+            <div
+              v-show="isFullScreen"
+              class="aside-collapse-btn"
+              :style="{
+                position: 'absolute',
+                right: imgbigshow ? '-40px' : '-16px',
+                top: '73px',
+                cursor: 'pointer',
+                zIndex: 170,
+              }"
+            >
+              <SvgIcon
+                :name="imgbigshow ? 'expand-cir' : 'collapse-cir'"
+                size="40"
+                @click="changeimgbigshow"
+              />
+            </div>
           </div>
-          </div>
-
-       
 
           <PictureInfo v-show="imgbigshow" :task-detail-info="taskDetailInfo" />
         </div>
         <div
 
-        v-if="imgbigshow"
+          v-if="imgbigshow"
           style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0"
         >
           <div>
@@ -848,7 +846,7 @@ defineExpose({
             </div>
           </div>
         </div>
-        <div class="wrapper-list" v-if="imgbigshow">
+        <div v-if="imgbigshow" class="wrapper-list">
           <div
             v-for="(item, index) in listData"
             :key="index"
@@ -860,7 +858,7 @@ defineExpose({
           >
             <div
               class="img-wrapper"
-              :style="{ backgroundImage: `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl ? item.imgUrl: bgLoadingImg})` }"
+              :style="{ backgroundImage: `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl ? item.imgUrl : bgLoadingImg})` }"
             />
             <div class="time-wrapper">
               <div class="time">
@@ -919,7 +917,7 @@ defineExpose({
                 @click.stop="singleRejectHandler(item)"
               />
               <SvgIcon
-          v-if="[1].includes(item.historyStates)"
+                v-if="[1].includes(item.historyStates)"
                 style="cursor: pointer; margin-left: 30px"
                 name="t9"
                 @click.stop="handleRejectdubiousfileyd(item.pictureid)"
@@ -1045,7 +1043,7 @@ defineExpose({
   &-detail {
     display: flex;
     height: 350px;
-
+    border-radius: 8px;
     .left {
       flex: 0.6;
       // background-size: auto 346px;
@@ -1109,7 +1107,7 @@ defineExpose({
           rgba(0, 0, 0, 0.01),
           rgba(0, 0, 0, 0.71) 100%
         );
-        border-radius: 0px 8px 8px 0px;
+        border-radius: 0px 8px 8px 8px;
         position: absolute;
         bottom: 0;
         padding-left: 17px;