src/views/final/comp/NewFilterModal.vue

@@ -327,6 +327,7 @@ defineExpose({
                 :options="logicOptions"
               />
             </n-form-item>
+                   <div class="sssscroll">
             <n-form-item
               v-for="(item, index) in formValue.conditions"
               :key="index"
@@ -369,7 +370,7 @@ defineExpose({
                    <n-button
                 :style="noBorderInput"
                 icon-placement="right"
-                @click="removeCondition(index)"
+               @click="index==0?()=>{}:removeCondition(index)"
                 style="    padding: 0;
                    margin-left: 17px;"
               >
@@ -377,7 +378,7 @@ defineExpose({
                   <!-- <SvgIcon size="24" name="close" color="#F00"/>
                    -->
                   <svg
-                 
+                  :style="index==0?'cursor: not-allowed':''"
                     width="24px"
                     height="24px"
                     viewBox="0 0 64 64"
@@ -426,12 +427,14 @@ defineExpose({
     </div>
       </template>
             </n-form-item>
-          </n-form>
-        </div>
         <div class="wrapper-new" @click="createCondition">
            <SvgIcon size="16" name="addicon"  style="margin-top: 3px;"/>
-          <span style="margin-left: 8px;margin-bottom: 40px;">添加筛选条件</span>
+          <span style="margin-left: 8px;">添加筛选条件</span>
+        </div>
+                   </div>
+          </n-form>
         </div>
+      
       </div>
           <div class="bottomline"></div>
       <template #footer>
@@ -521,6 +524,39 @@ defineExpose({
     left: 0;
     bottom: 69.5px;
 }
+.sssscroll{
+    height: 145px;
+    overflow: auto;
+margin-bottom: 40px;
+}
+/* 定义滚动条的宽度及背景颜色 */
+  ::-webkit-scrollbar {
+ 
+    position: fixed;
+    width: 2px; /* for vertical scrollbars */
+    height: 10px; /* for horizontal scrollbars */
+    background: #f1f1f1;
+  }
+
+  /* 定义滚动条轨道的样式 */
+  ::-webkit-scrollbar-track {
+    
+    background-color: #e1e1e1;
+    border-radius: 10px; /* 圆角 */
+  }
+
+  /* 定义滚动条滑块的样式 */
+  ::-webkit-scrollbar-thumb {
+
+    background-color: #888;
+    border-radius: 10px; /* 圆角 */
+  }
+
+  /* 滑块hover时的样式 */
+  ::-webkit-scrollbar-thumb:hover {
+    
+    background-color: #555;
+  }
 ::v-deep(.n-form-item .n-form-item-label) {
   font-size: 14px;
   color: #666666;

src/views/home/aside/comp/modals/NewFilterModal.vue

@@ -379,6 +379,7 @@ if(formValue.name){
                 :options="logicOptions"
               />
             </n-form-item>
+              <div class="sssscroll">
             <n-form-item
               v-for="(item, index) in formValue.conditions"
               :key="index"
@@ -422,7 +423,7 @@ if(formValue.name){
               <n-button
                 :style="noBorderInput"
                 icon-placement="right"
-                @click="removeCondition(index)"
+                @click="index==0?()=>{}:removeCondition(index)"
                 style="    padding: 0;
                    margin-left: 17px;"
               >
@@ -430,7 +431,7 @@ if(formValue.name){
                   <!-- <SvgIcon size="24" name="close" color="#F00"/>
                    -->
                   <svg
-                 
+                  :style="index==0?'cursor: not-allowed':''"
                     width="24px"
                     height="24px"
                     viewBox="0 0 64 64"
@@ -479,12 +480,14 @@ if(formValue.name){
     </div>
       </template>
             </n-form-item>
-          </n-form>
+             <div class="wrapper-new" @click="createCondition">
-        </div>
-        <div class="wrapper-new" @click="createCondition">
          <SvgIcon size="16" name="addicon"  style="margin-top: 3px;"/>
           <span style="margin-left: 8px">添加筛选条件</span>
         </div>
+        </div>
+          </n-form>
+        </div>
+       
       </div>
       <div class="bottomline"></div>
       <template #footer>
@@ -600,6 +603,39 @@ if(formValue.name){
 .modal_wrapper {
   padding: 14px 14px 0 14px !important;
 }
+.sssscroll{
+    height: 145px;
+    overflow: auto;
+
+}
+/* 定义滚动条的宽度及背景颜色 */
+  ::-webkit-scrollbar {
+ 
+    position: fixed;
+    width: 2px; /* for vertical scrollbars */
+    height: 10px; /* for horizontal scrollbars */
+    background: #f1f1f1;
+  }
+
+  /* 定义滚动条轨道的样式 */
+  ::-webkit-scrollbar-track {
+    
+    background-color: #e1e1e1;
+    border-radius: 10px; /* 圆角 */
+  }
+
+  /* 定义滚动条滑块的样式 */
+  ::-webkit-scrollbar-thumb {
+
+    background-color: #888;
+    border-radius: 10px; /* 圆角 */
+  }
+
+  /* 滑块hover时的样式 */
+  ::-webkit-scrollbar-thumb:hover {
+    
+    background-color: #555;
+  }
 ::v-deep(.n-form-item .n-form-item-label) {
   font-size: 14px;
   color: #666666;

src/views/home/content/Content.vue

@@ -55,6 +55,7 @@ import {
 
 import bgLoading from '@/assets/images/bg-loading.png'
 
+const show=ref(false)
 const listData = ref<any[]>([])
 const timer = ref()
 const showClose = ref(false)
@@ -154,7 +155,9 @@ async function inittask() {
 useInfiniteScroll(
   el as any,
   () => {
+      if(configStore.asideValue!=null){
     loadMore()
+   }
   },
   { distance: 10, canLoadMore: () => canloadMore },
 )
@@ -221,6 +224,7 @@ watch(() => collapse.value, (newVal, oldVal) => {
 })
 
 const asideLoadMore = debounce(() => {
+ 
   reset()
   loadMore()
 }, 400)
@@ -229,6 +233,7 @@ watch(
   () => searchValue.value,
   async (newVal, oldVal) => {
     if (newVal) {
+     
       isInitSeaerch.value = true
       // pagination.pageNo = 0
       // const more = await featchList()
@@ -258,6 +263,7 @@ watch(
   async (newVal, oldVal) => {
     if (pagination.pageNo > 1 && newVal && !(Object.entries(newVal).toString() === Object.entries(oldVal).toString())) {
       // reset()
+
       asideLoadMore()
     }
   },
@@ -301,6 +307,7 @@ async function featchList(userSearchId?: string) {
         ...contentParams,
         ...params,
         ...sortObj,
+        ...configStore.asideValue,
         checkDuplicateNo: checkDuplicateNo.value,
         upUserName: searchValue,
       })
@@ -566,7 +573,8 @@ watch(timeRange, () => {
 watch(
   () => configStore.asideValue,
   (newVal, oldVal) => {
-    refreshHandler()
+   refreshHandler()
+  
   },
   { deep: true },
 )
@@ -785,6 +793,14 @@ function previewImageUrl(img1, img2) {
         nodes.next,
       ]
     };
+    function handleMouseEnter(){
+   
+    show.value=true
+    }
+    function handleMouseLeave(){
+ 
+show.value=false
+    }
 defineExpose({
   showLoginSuccessModal,
   closeLoginSuccessModal,listData
@@ -1068,11 +1084,20 @@ defineExpose({
                   <div class="img-name">
                     <n-tooltip trigger="hover">
                       <template #trigger>
-                        <span>{{ item.imgName }}</span>
+                    <div style="postion:relative">
+                     <div class="pppp" v-if="item.imgName.length>15">{{ item.imgName }}</div>
+                     
+                           <div class="img-name"
+                       
+                             >{{ item.imgName }}</div>
+                             <div></div>
+                    </div>
                       </template>
+                  
                       <span
                         style="font-size: 12px; margin-top: 4px; margin-bottom: 16px"
                       >{{ item.imgName }}</span>
+                    
                     </n-tooltip>
                   </div>
                   <div
@@ -1426,6 +1451,22 @@ defineExpose({
     grid-gap: 10px 15px;
 }
 }
+.pppp{
+  display: none;
+} 
+.img-name:hover{
+  .pppp{
+    display: block;
+     position: absolute;
+    background: #252525;
+    padding: 7px;
+    top: -26px;
+    left: 0;
+    font-size: 12px;
+    margin: auto 0;
+    z-index: 110;
+} 
+}
 /*::v-deep(.n-image-preview-toolbar .n-base-icon:nth-last-child(2)){
   display: none;
 }*/

src/views/login/index.vue

@@ -136,7 +136,7 @@ function close() {
 
   .img-logo {
     width: 7.5625rem;
-    height: 2.1875rem;
+   
   }
 
   .img-ai {

src/views/task/content/Content.vue

@@ -125,20 +125,24 @@ let processItems: any[] = []
 const isFullScreen = ref(false)
 
 const fullscreenStyles = computed<any>(() => ({
-  width: isFullScreen.value ? '99vw' : '',
+  width: isFullScreen.value ? '100vw' : '',
   height: isFullScreen.value ? '100vh' : '',
   position: isFullScreen.value ? 'fixed' : '',
   top: isFullScreen.value ? '0' : '',
   left: isFullScreen.value ? '0' : '',
   zIndex: isFullScreen.value ? '100' : '',
+   marginLeft: isFullScreen.value ? '0px' : '',
+    marginRight: isFullScreen.value ? '0px' : '',
 }))
 const fullscreenStylestwo = computed<any>(() => ({
-  width: isFullScreen.value ? '99vw' : '',
+  width: isFullScreen.value ? '100vw' : '',
   height: isFullScreen.value ? '100vh' : '',
   position: isFullScreen.value ? 'fixed' : '',
   top: isFullScreen.value ? '0' : '',
   left: isFullScreen.value ? '0' : '',
   zIndex: isFullScreen.value ? '160' : '',
+  marginLeft: isFullScreen.value ? '0px' : '',
+   marginRight: isFullScreen.value ? '0px' : '',
 }))
 
 function renderIcon(icon: Component) {

src/views/task/content/PictureTable.vue

@@ -29,7 +29,8 @@ defineProps({
     <tr>
       <th>图片大小</th>
       <td class="blue">
-        {{ (data?.pictureInfo?.imgSize / 1024).toFixed(2) }}kb
+        {{data?.pictureInfo?.imgSize}}
+        {{ data?.pictureInfo?.imgSize>0?(data?.pictureInfo?.imgSize / 1024).toFixed(2)+'KB':'' }}
       </td>
       <th>图片尺寸</th>
       <td class="blue">

src/views/task/modal/NewFilterModal.vue

@@ -319,6 +319,7 @@ defineExpose({
             :rules="rules"
             require-mark-placement="left"
           >
+         
             <n-form-item path="name" label="标题">
               <n-input
                 v-model:value="formValue.name"
@@ -342,6 +343,7 @@ defineExpose({
                 :options="logicOptions"
               />
             </n-form-item>
+            <div class="sssscroll">
             <n-form-item
               v-for="(item, index) in formValue.conditions"
               :key="index"
@@ -385,7 +387,7 @@ defineExpose({
                   <n-button
                 :style="noBorderInput"
                 icon-placement="right"
-                @click="removeCondition(index)"
+                 @click="index==0?()=>{}:removeCondition(index)"
                 style="    padding: 0;
                    margin-left: 17px;"
               >
@@ -393,7 +395,7 @@ defineExpose({
                   <!-- <SvgIcon size="24" name="close" color="#F00"/>
                    -->
                   <svg
-                 
+                  :style="index==0?'cursor: not-allowed':''"
                     width="24px"
                     height="24px"
                     viewBox="0 0 64 64"
@@ -442,12 +444,14 @@ defineExpose({
     </div>
       </template>
             </n-form-item>
-          </n-form>
-        </div>
         <div class="wrapper-new" @click="createCondition">
            <SvgIcon size="16" name="addicon"  style="margin-top: 3px;"/>
           <span style="margin-left: 8px">添加筛选条件</span>
         </div>    
+        </div> 
+          </n-form>
+        </div>
+      
       </div>
         <div class="bottomline"></div>
       <template #footer>
@@ -544,6 +548,39 @@ defineExpose({
 .modal_wrapper {
   padding: 14px 14px 0 14px !important;
 }
+.sssscroll{
+    height: 145px;
+    overflow: auto;
+
+}
+/* 定义滚动条的宽度及背景颜色 */
+  ::-webkit-scrollbar {
+ 
+    position: fixed;
+    width: 2px; /* for vertical scrollbars */
+    height: 10px; /* for horizontal scrollbars */
+    background: #f1f1f1;
+  }
+
+  /* 定义滚动条轨道的样式 */
+  ::-webkit-scrollbar-track {
+    
+    background-color: #e1e1e1;
+    border-radius: 10px; /* 圆角 */
+  }
+
+  /* 定义滚动条滑块的样式 */
+  ::-webkit-scrollbar-thumb {
+
+    background-color: #888;
+    border-radius: 10px; /* 圆角 */
+  }
+
+  /* 滑块hover时的样式 */
+  ::-webkit-scrollbar-thumb:hover {
+    
+    background-color: #555;
+  }
 ::v-deep(.n-form-item .n-form-item-label) {
   font-size: 14px;
   color: #666666;