From 9272befdc894cf5f81f1d906709f07410d01a55d Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Wed, 22 May 2024 22:54:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=89=E5=8F=B7=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 11 ++++-
 src/components/Approval/NotPassed.vue         |  5 +-
 src/layout/components/Header/RecycleModal.vue | 49 ++++++++++++++++---
 src/views/final/comp/NewFilterModal.vue       |  2 +
 src/views/home/aside/comp/Search.vue          |  5 +-
 .../home/aside/comp/modals/NewFilterModal.vue |  4 ++
 src/views/home/content/Content.vue            |  9 +++-
 src/views/task/content/Content.vue            | 20 ++++++--
 src/views/task/modal/NewFilterModal.vue       | 26 ++++++++--
 .../worksheet/components/PictureWall.vue      |  1 +
 src/views/worksheet/content/Content.vue       | 14 +++++-
 11 files changed, 120 insertions(+), 26 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b817207..ce91cad 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -66,7 +66,7 @@ const getThemeOverrides = computed(() => {
   </NConfigProvider>
 </template>
 
-<style lang="less">
+<style lang="less" scoped>
 .n-checkbox .n-checkbox__label {
   color: #666666 !important;
   font-size: 14px !important;
@@ -107,6 +107,13 @@ const getThemeOverrides = computed(() => {
   //left: -60px;
 }
 ::v-deep( .n-form-item .n-form-item-feedback-wrapper .n-form-item-feedback.n-form-item-feedback--error){
-  display:none !important;
+ display: none;
+ >img{
+    display:none !important;
+  }
 }
+
+</style>
+<style scoped>
+
 </style>
diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue
index fe3b1c2..e54ffcd 100644
--- a/src/components/Approval/NotPassed.vue
+++ b/src/components/Approval/NotPassed.vue
@@ -110,7 +110,6 @@ async function handleSumbit(e: MouseEvent) {
         const failCauseItem = failCauseOptions.value.find(
           item => item.value === formData.failCauseId,
         )
-
         const param = {
           result: false,
           comment: showOther.value ? formData.comment : '',
@@ -120,7 +119,9 @@ async function handleSumbit(e: MouseEvent) {
           failCauseName: failCauseItem.label,
           flowTaskInfoList: list,
         }
-
+if(failCauseItem.label!='其他'){
+        param.comment=failCauseItem.label
+      }
         audit(param).then((res) => {
           const { code } = res
           if (code === 'OK') {
diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index d41bd9f..461634e 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -365,15 +365,22 @@ function upHandler(event: MouseEvent) {
 const gridHeight = computed(() => {
   // return viewMode.value !== 'masonry' ? '157px' : ''
   let height = ''
-  if (viewMode.value === 'masonry')
-    height = ''
+
+  if (viewMode.value === 'masonry'){
+  
+    height = ''}
   else if (viewMode.value === 'horizontalVersion')
-    height = '145px'
+  {
+  height = '145px'
+  } 
   else if (viewMode.value === 'verticalVersion')
-    height = '300px'
-  else if (viewMode.value === '3:4')
+ { 
+  height = '300px'
+  } else if (viewMode.value === '3:4')
+   { 
     height = '240px'
-
+   
+   }
   return height
 })
 
@@ -665,7 +672,9 @@ onBeforeMount(async () => {
   else if (screenWidth < 1792 && screenWidth > 1440)
     cols.value = 7
   else if (screenWidth <= 1440)
-    cols.value = 5
+ 
+       cols.value =6
+  
 })
 
 function previewHandler(index: number, event: MouseEvent, thumburl, imgUrl) {
@@ -764,7 +773,7 @@ watch(() => show.value, async (newVal) => {
             </div>
 
             <div ref="el" class="scroll" :style="{ height: maxHeight, marginTop: '16px' }">
-              <div v-if="viewMode != 'masonry'" class="grid" :style="{ 'grid-template-columns': `repeat(${cols}, 182px)` }">
+              <div v-if="viewMode != 'masonry'" class="grid" :style="{ 'grid-template-columns': `repeat(${cols}, 190px)` }">
                 <div
                   v-for="(item, index) in listData" :key="item.pictureId" :data-id="item.pictureId"
                   :class="{ 'grid-item-selected': isSelected(item.pictureId) }" :style="{ height: gridHeight }"
@@ -1132,4 +1141,28 @@ watch(() => show.value, async (newVal) => {
     object-fit: cover;
   }
 }
+@media (max-width: 1440px) {
+.wrapper-content .grid {
+
+    grid-gap: 0px 8px;
+}
+}
+@media (min-width: 1440px) {
+::v-deep(.vue-waterfall) {
+  overflow-x: hidden;
+  .vue-waterfall-column {
+    max-width: 190px;
+    margin-right: 8.5px;
+  }
+}
+}
+@media (max-width: 1930px) {
+::v-deep(.vue-waterfall) {
+  overflow-x: hidden;
+  .vue-waterfall-column {
+    max-width: 190px;
+    margin-right: 8.1px;
+    
+  }
+}}
 </style>
diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index 1988640..68a9802 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -356,6 +356,8 @@ defineExpose({
               </n-space>
               <n-select
                 v-else
+                 :max-tag-count="1"
+                 :multiple="item.type!='izyear'&&item.type!='izsimilarity'"
                 v-model:value="item.result"
                 filterable
                 style="margin-left: 8px"
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index d65a7de..3fe67d5 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -74,12 +74,13 @@ function searchName() {
 }
 
 function close() {
-  searchKeyword.value = ''
+  searchKeyword.value = ' '
   configStore.setSearchValue(searchKeyword.value)
   finalStore.setSearchValue(searchKeyword.value)
   if (searchContent)
     router.replace(route.path)
-  emit('close')
+searchKeyword.value = ''
+emit('close')
 }
 
 function initSerach() {
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index a947769..de0aece 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -98,6 +98,7 @@ const formValue = reactive<FormType>({
 
 function handleSumbit(e: MouseEvent) {
   e.preventDefault()
+  console.log(formRef.value)
   formRef.value?.validate((errors) => {
     if (errors)
       return
@@ -399,6 +400,7 @@ if(formValue.name){
                 placeholder="请选择"
                 :options="operatorOptions"
               />
+           
               <n-space v-if="item.type === 'izyear'">
                 <n-date-picker
                   v-model:value="item.result"
@@ -409,6 +411,8 @@ if(formValue.name){
               </n-space>
               <n-select
                 v-else
+                  :max-tag-count="1"
+                 :multiple="item.type!='izyear'&&item.type!='izsimilarity'"
                 v-model:value="item.result"
                 filterable
                 style="margin-left: 8px"
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index e287740..e442533 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -1179,7 +1179,7 @@ defineExpose({
 
     .grid{
       padding-top: 3px;
-      grid-gap: 10px 10px;
+      grid-gap: 10px 27px;
     }
 
     .img {
@@ -1418,7 +1418,12 @@ defineExpose({
   top: 20%;
   z-index: 10000000000000000000;
 }
-
+@media (max-width: 1440px) {
+.wrapper-content .grid {
+    padding-top: 3px;
+    grid-gap: 10px 15px;
+}
+}
 /*::v-deep(.n-image-preview-toolbar .n-base-icon:nth-last-child(2)){
   display: none;
 }*/
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index e287156..a98f51f 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -125,7 +125,7 @@ let processItems: any[] = []
 const isFullScreen = ref(false)
 
 const fullscreenStyles = computed<any>(() => ({
-  width: isFullScreen.value ? '100vw' : '',
+  width: isFullScreen.value ? '99vw' : '',
   height: isFullScreen.value ? '100vh' : '',
   position: isFullScreen.value ? 'fixed' : '',
   top: isFullScreen.value ? '0' : '',
@@ -133,7 +133,7 @@ const fullscreenStyles = computed<any>(() => ({
   zIndex: isFullScreen.value ? '100' : '',
 }))
 const fullscreenStylestwo = computed<any>(() => ({
-  width: isFullScreen.value ? '100vw' : '',
+  width: isFullScreen.value ? '99vw' : '',
   height: isFullScreen.value ? '100vh' : '',
   position: isFullScreen.value ? 'fixed' : '',
   top: isFullScreen.value ? '0' : '',
@@ -893,7 +893,7 @@ function handleMouseLeave(){
       <div
         v-show="!imgbigshow"
         :style="{
-          position: 'fixed',
+          position: 'absolute',
           zIndex: 169,
           background: 'rgb(80, 122, 253)',
           right: '16px',
@@ -906,7 +906,7 @@ function handleMouseLeave(){
    v-show="!imgbigshow"
         class="aside-collapse-btn"
         :style="{
-          position: 'fixed',
+        position:'absolute',
           right: '0px',
           top: '155px',
           cursor: 'pointer',
@@ -1074,6 +1074,7 @@ function handleMouseLeave(){
             : { flex: 0.5 }
         "
       >
+      <div></div>
         <div
           v-show="isFullScreen&&imgbigshow==false?true:isFullScreen&&huadong?true:false"
           class="aside-collapse-btn"
@@ -1422,6 +1423,7 @@ function handleMouseLeave(){
 
 <style lang="less" scoped>
 .fullscreen-container {
+  
   overflow-y: auto;
   /* 可添加其他样式 */
   width: 100vw;
@@ -2159,7 +2161,7 @@ function handleMouseLeave(){
 
     .img-wrapper {
       position: relative;
-      width: 230px;
+      width: 217px;
       height: 130px;
       overflow: hidden;
         background-size:cover;
@@ -2217,4 +2219,12 @@ function handleMouseLeave(){
     border-radius: 8px;
     text-align: center;
   }
+ @media (max-width: 1441px)  {
+    .wrapper-detail .right .item .img-wrapper{
+      width: 108px;
+    }
+    .allview .item .img-wrapper{
+      width: 215px;
+    }
+}
 </style>
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index 75bd85e..edd6a67 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -244,7 +244,14 @@ function leaveHandler() {
     },
   ]
 }
-
+function createTimeForNumber (type) {
+console.log(formValue.name)
+if(formValue.name){
+  return ``}
+  else{
+return  `请输入标题内容`
+  }
+}
 function edit(editFilter: any) {
   currentStatus.value = 'edit'
 
@@ -259,7 +266,17 @@ function edit(editFilter: any) {
     }
   })
 }
-
+watch(
+  () => formValue.name,
+  (newVal) => {
+console.log(formValue.name)
+if(formValue.name){
+  createTimeForNumber(0)
+}else{
+   createTimeForNumber(1)
+}
+  },
+)
 defineExpose({
   showModal,
   edit,
@@ -335,7 +352,7 @@ defineExpose({
                 filterable
                 placeholder="请选择筛选项名称"
                 :options="typeOptions"
-                @update="item.result = ''"
+                @change="item.result = ''"
               />
               <n-select
                 v-model:value="item.operator"
@@ -344,6 +361,7 @@ defineExpose({
                 placeholder="请选择"
                 :options="operatorOptions"
               />
+             
               <n-space v-if="item.type === 'izuptime'">
                 <n-date-picker
                   v-model:value="item.result"
@@ -354,6 +372,8 @@ defineExpose({
               </n-space>
               <n-select
                 v-else
+                  :max-tag-count="1"
+                  :multiple="item.type!='izyear'&&item.type!='izsimilarity'"
                 v-model:value="item.result"
                 filterable
                 style="margin-left: 8px"
diff --git a/src/views/worksheet/components/PictureWall.vue b/src/views/worksheet/components/PictureWall.vue
index 817f52e..fbf26b6 100644
--- a/src/views/worksheet/components/PictureWall.vue
+++ b/src/views/worksheet/components/PictureWall.vue
@@ -506,4 +506,5 @@ onUnmounted(() => {
   margin-top: 12px;
   margin-bottom: 12px;
 }
+
 </style>
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 23cf4d6..90b96e0 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -985,7 +985,7 @@ defineExpose({
           >
             <div
               class="img-wrapper"
-              :style="{ backgroundImage: `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl ? item.imgUrl : bgLoadingImg})` }"
+              :style="{width:isFullScreen?'225px':'235px', backgroundImage: `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl ? item.imgUrl : bgLoadingImg})` }"
             />
             <div class="time-wrapper">
               <div class="time">
@@ -1464,7 +1464,7 @@ defineExpose({
       position: relative;
 
       .img-wrapper {
-        width: 230px;
+        width: 224px;
         height: 130px;
         overflow: hidden;
         background-size: cover;
@@ -1612,6 +1612,16 @@ defineExpose({
   margin-top: 12px;
   margin-bottom: 12px;
 }
+ @media (min-width: 1440px)and (max-width: 1700px)  {
+    .wrapper-list .grid-item .img-wrapper{
+      width: 221px !important;
+    }
+ }
+     @media (min-width: 1800px)  {
+    .wrapper-list .grid-item .img-wrapper{
+      width: 225px !important;
+    }
+    }
 </style>
 
 <style>