src/App.vue

@@ -83,4 +83,11 @@ const getThemeOverrides = computed(() => {
 ::v-deep(.n-base-clear > .n-base-clear__clear){
   color: #c9c9c9 !important;
 }
+.n-form-item.n-form-item--top-labelled .n-form-item-label{
+  flex-direction: row-reverse !important;
+  justify-content: flex-end !important;
+}
+.n-form-item .n-form-item-label .n-form-item-label__asterisk{
+  transform:rotate(-90deg) !important;
+}
 </style>

src/assets/icons/baseImg.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="37px" viewBox="0 0 48 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>形状 2</title>
+    <g id="index" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="index_图片加载中" transform="translate(-893.000000, -298.000000)" fill="#F0F0F0" fill-rule="nonzero">
+            <g id="编组-24" transform="translate(410.000000, 62.000000)">
+                <g id="编组-27" transform="translate(16.000000, 132.000000)">
+                    <g id="编组-18备份-2" transform="translate(400.000000, 0.000000)">
+                        <g id="形状-3" transform="translate(67.000000, 104.000000)">
+                            <g id="形状-2" transform="translate(0.000000, 0.462637)">
+                                <path d="M12.8421882,20.0575479 C12.1281936,19.0374348 10.9742024,19.0374348 10.2622078,20.0575479 L0.346282996,34.2309071 C-0.367711589,35.249016 0.0582851799,36.0747264 1.29427581,36.0747264 L46.7139313,36.0747264 C47.9519219,36.0747264 48.3659188,35.2510201 47.6479242,34.2349153 L31.9400434,12.0389379 C31.2160489,11.0168206 30.0540576,11.0208289 29.3340631,12.0389379 L18.2181474,27.7454729 L12.8401882,20.0575479 L12.8421882,20.0575479 Z M6.54623594,4.5093408 C6.54623594,7.00050109 8.50022111,9.0186816 10.9102029,9.0186816 C13.3201846,9.0186816 15.2721698,7.00050109 15.2721698,4.5093408 C15.2721698,2.01818051 13.3221846,0 10.9122029,0 C8.50222115,0 6.54823594,2.01818051 6.54823594,4.5093408 L6.54623594,4.5093408 Z" id="形状"></path>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/config/aside.ts

@@ -50,7 +50,7 @@ export const asideMap: Recordable<AsideEntity> = {
     component: SimilarityVue,
   },
   izyear: {
-    label: '*年份',
+    label: '年份',
     defaultValue: null,
     isDefaultFilter: true,
     key: 'izyear',

src/views/home/aside/comp/AdvanceFilter.vue

@@ -418,6 +418,8 @@ defineExpose({
   width: 100%;
   padding: 12px 16px;
   border-bottom: 1px solid #e8e8e8;
+  z-index: 10;
+  background: #ffffff;
 
   &-left {
     display: flex;

src/views/home/aside/comp/items/Time.vue

@@ -56,7 +56,7 @@ onMounted(() => {
     <n-collapse :default-expanded-names="['1']" arrow-placement="right">
       <n-collapse-item :title="label" name="1">
         <n-space>
-          <n-date-picker v-model:value="time" type="daterange" clearable @update:value="onChange">
+          <n-date-picker v-model:value="time" type="daterange" :clearable="false" @update:value="onChange">
             <template #separator>
               至
             </template>
@@ -78,5 +78,16 @@ onMounted(() => {
 
 ::v-deep(.n-input__separator) {
   color: #999999 !important;
-  ;
+}
-}</style>
+::v-deep(.n-collapse .n-collapse-item:not(.n-collapse-item--disabled).n-collapse-item--trigger-area-main .n-collapse-item__header .n-collapse-item__header-main){
+  margin-left: 10px;
+}
+::v-deep(.n-collapse .n-collapse-item:not(.n-collapse-item--disabled).n-collapse-item--trigger-area-main .n-collapse-item__header .n-collapse-item__header-main::before){
+  content: '*';
+  position: absolute;
+  left: 0;
+  top: 2px;
+  color: red;
+}
+
+</style>

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

@@ -324,8 +324,8 @@ defineExpose({
           </div>
         </div>
         <div class="wrapper-form">
-          <n-form ref="formRef" :model="formValue" :rules="rules">
+          <n-form ref="formRef" :model="formValue" :rules="rules" >
-            <n-form-item path="name" label="标题">
+            <n-form-item path="name" label="标题" mergedRequireMarkPlacement="left">
               <!-- j -->
               <n-input
                 v-model:value="formValue.name"
@@ -513,6 +513,7 @@ defineExpose({
   &-info {
     font-weight: bold;
     position: relative;
+    background: #f8f8f8;
 
     &:before {
       background-color: #1980ff;

src/views/home/content/Content.vue

@@ -46,6 +46,8 @@ import PackageSettingsModal from "./modal/PackageSettingsModal.vue";
 import QueryRepeatedTasksModal from "./modal/QueryRepeatedTasksModal.vue";
 import type { PictureSortParam } from "/#/api";
 import defaultAvatar from "@/assets/icons/avatar.svg";
+import baseImg from "@/assets/images/baseImg.png";
+import axios from "axios";
 
 const deviceHeight = ref(600);
 let _masonry: null | Masonry = null;
@@ -186,13 +188,13 @@ watch(
 
 const listData = ref<any[]>([]);
 
-async function featchList(userSearchId?:string) {
+async function featchList(userSearchId?: string) {
   loading.value = true;
   try {
     const contentParams = {
       search_month: timeRange.value,
       search_history: 0,
-      userSearchId
+      userSearchId,
     };
 
     pagination.pageNo += 1;
@@ -246,6 +248,7 @@ async function featchList(userSearchId?:string) {
         uphead: item.uphead,
         similar: item.similarityscore || -1,
         imgName: item.imgname,
+        loadOver: false,
       };
     });
 
@@ -284,8 +287,8 @@ const gridHeight = computed(() => {
 async function oneCheck() {
   const asideVal = cloneDeep(configStore.getAsideValue);
   asideVal.upUserName = searchValue.value;
-  console.log('searchValue', asideVal, searchValue.value)
+  console.log("searchValue", asideVal, searchValue.value);
-  
+
   if (asideVal.izyear && asideVal.izyear.length == 2) {
     asideVal.izyear =
       dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") +
@@ -613,6 +616,11 @@ const dropdownOptions = ref([
     icon: renderIcon(EyeOutlineIcon),
   },
 ]);
+
+const loadImgOver = (item) => {
+  console.log("loadImgOver", item);
+  setTimeout(() => (item.loadOver = true), 2000);
+};
 </script>
 
 <template>
@@ -708,8 +716,19 @@ const dropdownOptions = ref([
                 :src="item.thumburl"
                 ref="imageRef"
               />
+              <!-- @load="loadImgOver(item)" -->
+              <!-- <n-image
+                class="img"
+                :class="{
+                  'img-fit': viewMode === 'horizontalVersion',
+                  'img-full': viewMode === '3:4' || viewMode === 'verticalVersion',
+                }"
+                :src="baseImg"
+                v-show="!item.loadOver"
+              /> -->
+
               <div class="percent" v-if="item.similar != -1">
-                <SvgIcon size="42" :name="item.similar==100?'error_tag':'tag'" />
+                <SvgIcon size="42" :name="item.similar == 100 ? 'error_tag' : 'tag'" />
                 <div class="val">
                   {{ `${item.similar}%` }}
                 </div>

src/views/home/content/modal/LoginSuccessModal.vue

@@ -93,10 +93,11 @@ defineExpose({
   width: 510px;
   height: 361px;
   box-shadow: none !important;
+  margin-left: 30px !important;
 }
 .wrapper {
   position: absolute;
-  left: calc(50% - 350px);
+  left: calc(50% - 286px);
   .wrapper-hearder {
     margin-top: 80px;
     margin-left:18px;