From 458a93ede3029f3527a985eee46bed5a716a8fe2 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sun, 24 Mar 2024 10:59:16 +0800 Subject: [PATCH 01/14] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E7=AD=9B=E9=80=89=E5=AF=B9=E5=BA=94=E6=96=87=E5=AD=97?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/aside.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/aside.ts b/src/config/aside.ts index 6e339ea..73e4bf3 100644 --- a/src/config/aside.ts +++ b/src/config/aside.ts @@ -72,28 +72,28 @@ export const asideMap: Recordable = { inFilterList: false, }, izcustomtype: { - label: '客户类型', + label: '拜访客户类型', defaultValue: null, isDefaultFilter: false, key: 'izcustomtype', component: IzCustomtype, }, izcustomlevel: { - label: '客户级别', + label: '拜访客户级别', defaultValue: null, isDefaultFilter: false, key: 'izcustomlevel', component: IzCustomlevel, }, izcustomname: { - label: '客户名称', + label: '拜访客户名称', defaultValue: null, isDefaultFilter: false, key: 'izcustomname', component: IzCustomname, }, izprojecttype: { - label: '项目类型', + label: '拜访项目类型', defaultValue: null, isDefaultFilter: false, key: 'izprojecttype', @@ -114,7 +114,7 @@ export const asideMap: Recordable = { component: IztaskstatusVue, }, izvisitpro: { - label: '拜访省份', + label: '拜访省份/直辖市', defaultValue: null, isDefaultFilter: false, key: 'izvisitpro', From 53277ec183137b05c8803e2e4dfe0b275cc1ea7f Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sun, 24 Mar 2024 11:08:34 +0800 Subject: [PATCH 02/14] =?UTF-8?q?fix:=202582=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D=E3=80=91=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E4=B8=8B=E6=8B=89=E6=A1=86=E5=8A=A0=E4=B8=AA=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/AdvanceFilter.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index 55c1af3..70951f6 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/src/views/home/aside/comp/AdvanceFilter.vue @@ -356,11 +356,11 @@ const moveEnd = () => { height: 200px; overflow-x: hidden; overflow-y: auto; - scrollbar-width: none; /* firefox */ - -ms-overflow-style: none; /* IE 10+ */ + scrollbar-width: thin; /* firefox */ + -ms-overflow-style: thin; /* IE 10+ */ &::-webkit-scrollbar { - display: none; + display: thin; } li { From c92b34554c2dbeb9bf62c370786da2ddc98f3a47 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sun, 24 Mar 2024 12:30:38 +0800 Subject: [PATCH 03/14] =?UTF-8?q?fix:=202590=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E3=80=91=E7=82=B9=E5=87=BB=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E4=B8=8B=E6=8B=89=E5=90=8E=E9=80=89=E6=8B=A9=E6=9F=90?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=90=8E=EF=BC=8C=E9=A1=B6=E9=83=A8=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=90=8C=E6=A0=B7=E8=BF=9B=E8=A1=8C=E5=88=87=E6=8D=A2=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E9=80=89=E6=8B=A9=E7=9A=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/AdvanceFilter.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index 70951f6..e7f5ef0 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/src/views/home/aside/comp/AdvanceFilter.vue @@ -36,6 +36,7 @@ const pagination = reactive({ pageSize: 300, }); const keyword = ref(""); +const currentlySelectedAdvanced = ref("高级筛选"); onMounted(() => { // data.value = generateDefaultConfig() @@ -138,9 +139,22 @@ function generateFilterEntityList(data) { return filterEntityList; } +/** + * 提取服务器返回 HTML 中文字内容，进行拼接 + * @param {string} str 包含 HTML 标签的字符串，例如 "1" + * @returns {string} 返回拼接后的不包含 HTML 标签的字符串，例如 "11" + */ +function extractTextFromHTML(str) { + // 定义正则表达式匹配模式 + const regex = /<\/span>|(.*?)<\/span>/g; + // 使用正则表达式的 replace 方法进行匹配和替换 + const result = str.replace(regex, ''); + return result; +} function selectHandler(item: FilterEntity) { (popover.value as any).setShow(false); + currentlySelectedAdvanced.value = extractTextFromHTML(item.name) emit("select", item.id); } @@ -226,7 +240,7 @@ const moveEnd = () => { > From 3e25a756e2021d593809f1fdccc7ccea3f59467f Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sun, 24 Mar 2024 13:12:29 +0800 Subject: [PATCH 04/14] =?UTF-8?q?feat:=20=E6=9C=AA=E5=AE=8C=E6=88=90=20?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8E=92=E5=BA=8F=20=202594=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E3=80=91=E6=9C=89=E5=A4=9A=E6=9D=A1=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=97=B6=EF=BC=8C=E6=8E=92=E5=BA=8F=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E6=94=B6=E8=97=8F=E6=97=B6=E9=97=B4=E4=BB=8E=E6=97=A9?= =?UTF-8?q?=E5=88=B0=E6=99=9A=E6=8E=92=E5=88=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/AdvanceFilter.vue | 17 +++-------------- types/home.d.ts | 2 ++ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index e7f5ef0..9e8bf2c 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/src/views/home/aside/comp/AdvanceFilter.vue @@ -134,27 +134,16 @@ function generateFilterEntityList(data) { isDefaultFilter: false, filterList: list, reorder, + searchname }; }); return filterEntityList; } -/** - * 提取服务器返回 HTML 中文字内容，进行拼接 - * @param {string} str 包含 HTML 标签的字符串，例如 "1" - * @returns {string} 返回拼接后的不包含 HTML 标签的字符串，例如 "11" - */ -function extractTextFromHTML(str) { - // 定义正则表达式匹配模式 - const regex = /<\/span>|(.*?)<\/span>/g; - // 使用正则表达式的 replace 方法进行匹配和替换 - const result = str.replace(regex, ''); - return result; -} function selectHandler(item: FilterEntity) { (popover.value as any).setShow(false); - currentlySelectedAdvanced.value = extractTextFromHTML(item.name) + currentlySelectedAdvanced.value = item.searchname emit("select", item.id); } @@ -177,7 +166,7 @@ const inputHandler = debounce((word) => { } }); data.value = dataArr.sort( - (a, b) => Number((a as any).reorder) - Number((b as any).reorder) + (a, b) => Number(new Date(a.createtime)) - Number(new Date(b.createtime)) ); unData.value = unDataArr.sort( (a, b) => Number((a as any).reorder) - Number((b as any).reorder) diff --git a/types/home.d.ts b/types/home.d.ts index a960b57..92643d0 100644 --- a/types/home.d.ts +++ b/types/home.d.ts @@ -8,6 +8,8 @@ export interface Filter { export interface FilterEntity { id: string name: string // 过滤名称 + createtime: string // 创建时间 + searchname: string // 搜索名称 favorite: boolean// 是否收藏 isDefaultFilter: boolean// 默认筛选 filterList: Filter[] // 过滤项列表 From 6c0cc9e6f01c98fbfce791b37c2dcc45b7bc1abf Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sun, 24 Mar 2024 13:55:12 +0800 Subject: [PATCH 05/14] =?UTF-8?q?fix:=202595=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E3=80=91=E4=B8=8B=E6=8B=89=E6=98=BE=E7=A4=BA=E4=B8=8E?= =?UTF-8?q?RP=E8=AE=BE=E8=AE=A1=E5=9B=BE=E4=B8=8D=E7=AC=A6=EF=BC=8C?= =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E6=9D=A1=E4=BB=B6=E5=89=8D=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/AdvanceFilter.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index 9e8bf2c..b957d3a 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/src/views/home/aside/comp/AdvanceFilter.vue @@ -237,7 +237,7 @@ const moveEnd = () => {
+ +::v-deep(.n-input__separator) { + color: #999999 !important; + ; +} From 81ca2dbc90153e9515e2dde3173a8d3450a0a656 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sun, 24 Mar 2024 18:08:51 +0800 Subject: [PATCH 13/14] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/content/Content.vue | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index d210340..21de8e0 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -17,6 +17,7 @@ import { computed, nextTick, onMounted, onUnmounted, onUpdated, reactive, ref, u import GeneratePackageModal from './modal/GeneratePackageModal.vue' import LoginSuccessModal from './modal/LoginSuccessModal.vue' import PackageSettingsModal from './modal/PackageSettingsModal.vue' +import type { PictureSortParam } from "/#/api" const deviceHeight = ref(600) let _masonry: null | Masonry = null @@ -35,7 +36,10 @@ const LoginSuccessModalRef = ref(null) const loading = ref(false) const message = useMessage() const totalCount = ref(0) -const sortBy = ref<'asc' | 'desc'>('desc') +const sortBy: PictureSortParam = { + orderbyname: "asc", + orderbyvalue: "pictureResult", +}; const imageRef = ref() let canloadMore = true let filterId = null @@ -128,7 +132,7 @@ async function featchList() { const asideParams = unref(configStore.getAsideValue) const params = filterId ? { userSearchId: filterId } : asideParams - const result = await getPictureList({ ...pagination, ...contentParams, ...params, ordertype: sortBy.value }) + const result = await getPictureList({ ...pagination, ...contentParams, ...params, ...sortBy }) const { data, pageCount, total } = result totalCount.value = total canloadMore = pageCount >= pagination.pageNo && pageCount > 0 @@ -261,8 +265,9 @@ function getAvatar(url: string): string { return url ? getImgUrl(url) : avatar } -function sortHandler() { - sortBy.value = sortBy.value === 'asc' ? 'desc' : 'asc' +function sortHandler(orderby: "pictureResult" | "fromuptime") { + sortBy.orderbyvalue = orderby; + sortBy.orderbyname = sortBy.orderbyname === "asc" ? "desc" : "asc"; refreshHandler() } async function downloadImage(item) { @@ -338,10 +343,14 @@ function previewHandler(index: number,event: MouseEvent) {
- + +
+ 时间排序 + +
共 {{ totalCount }} 项 From 01dcb4319f24de5da2bcec1e38d84790d9f2e7d1 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sun, 24 Mar 2024 18:20:04 +0800 Subject: [PATCH 14/14] =?UTF-8?q?fix:=201440=20=E5=9B=BE=E7=89=87=E5=A2=99?= =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/content/Content.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 21de8e0..46e5ce1 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -68,7 +68,7 @@ const layout = debounce(() => { _masonry = new Masonry(masonryRef.value as any, { itemSelector: '.grid-item', - gutter: 18, + gutter: 17, columnWidth: 182, percentPosition: true, stagger: 10,