diff --git a/src/App.vue b/src/App.vue index 00546ad..3fa67ec 100644 --- a/src/App.vue +++ b/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; +} diff --git a/src/assets/icons/baseImg.svg b/src/assets/icons/baseImg.svg new file mode 100644 index 0000000..c33d00e --- /dev/null +++ b/src/assets/icons/baseImg.svg @@ -0,0 +1,19 @@ + + + 形状 2 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/images/baseImg.png b/src/assets/images/baseImg.png new file mode 100644 index 0000000..c5a4f7b Binary files /dev/null and b/src/assets/images/baseImg.png differ diff --git a/src/config/aside.ts b/src/config/aside.ts index b46b1a7..7b6b5b7 100644 --- a/src/config/aside.ts +++ b/src/config/aside.ts @@ -50,7 +50,7 @@ export const asideMap: Recordable = { component: SimilarityVue, }, izyear: { - label: '*年份', + label: '年份', defaultValue: null, isDefaultFilter: true, key: 'izyear', diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index 6d85152..67fc318 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/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; diff --git a/src/views/home/aside/comp/items/Time.vue b/src/views/home/aside/comp/items/Time.vue index c52d678..f6a0374 100644 --- a/src/views/home/aside/comp/items/Time.vue +++ b/src/views/home/aside/comp/items/Time.vue @@ -56,7 +56,7 @@ onMounted(() => { - + @@ -78,5 +78,16 @@ onMounted(() => { ::v-deep(.n-input__separator) { color: #999999 !important; - ; -} +} +::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; +} + + diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue index c58dbb5..4c93bbe 100644 --- a/src/views/home/aside/comp/modals/NewFilterModal.vue +++ b/src/views/home/aside/comp/modals/NewFilterModal.vue @@ -324,8 +324,8 @@ defineExpose({
- - + + ([]); -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); +};