From 2793d06dc1478a8354a00b3ffdc4235f8e0a47b4 Mon Sep 17 00:00:00 2001 From: Zhufu <1176354795@qq.com> Date: Thu, 11 Jul 2024 14:31:42 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BC=8F=E6=A0=B7=E4=B9=A6PX=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auditinfo/AuditProgress/index.vue | 27 +++-- .../tiankongdi/auditinfo/MapList/index.vue | 60 ++++++---- .../tiankongdi/curbspotcity/MapList/index.vue | 104 +++++++++++++----- 3 files changed, 135 insertions(+), 56 deletions(-) diff --git a/src/views/demo/tiankongdi/auditinfo/AuditProgress/index.vue b/src/views/demo/tiankongdi/auditinfo/AuditProgress/index.vue index abdb51e8..e79e79e8 100644 --- a/src/views/demo/tiankongdi/auditinfo/AuditProgress/index.vue +++ b/src/views/demo/tiankongdi/auditinfo/AuditProgress/index.vue @@ -4,9 +4,8 @@
年份
图斑来源
批次
-
+
年份
-
+
图斑来源
-
+
批次
-
+
类型
-
-
图斑号
- +
+ +
-
- 查询 +
+ 查询
@@ -453,26 +453,48 @@ flex-direction: column; } .screen-div { - padding: 10px 10px 19px 10px; + padding: 22px 12px 19px 13px; display: flex; width: 590px; // margin-top: 10px; flex-wrap: wrap; // background: @component-background; .screen-item { - width: 33.3%; + // width: 33.3%; display: flex; - margin-bottom: 15px; + // margin-bottom: 15px; font-family: Alibaba PuHuiTi; font-weight: 500; font-size: 17px; color: #000000; + height: 39px; .screen-item-label { - width: 83px; - padding-left: 10px; + font-family: Alibaba PuHuiTi; + font-weight: 500; + font-size: 17px; + color: #000000; + line-height: 30px; display: flex; align-items: center; - // font-size: 15px; + margin-right: 9px; + } + :deep(.ant-select-selector){ + display: flex; + align-items: center; + font-family: HarmonyOS Sans; + font-weight: 500; + font-size: 19px; + color: #000000; + line-height: 30px; + height: 39px; + } + .item-input{ + font-family: Alibaba PuHuiTi; + font-weight: 400; + font-size: 19px; + color: #000000; + line-height: 30px; + width:223px; } } .screen-button-div { diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue index fe9176f4..19b849b2 100644 --- a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue +++ b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue @@ -11,80 +11,81 @@
-
+
年份
-
-
图斑来源
+
+
图斑来源
-
+
批次
-
+
标注
-
-
下发时间
+
+
下发时间
-
+
乡镇
-
+
查询 - +
@@ -537,25 +538,60 @@ const closeMolder = () => { padding: 10px; } .screen-div{ - padding: 10px; + padding: 10px 12px 20px 13px; display: flex; width:590px; flex-wrap: wrap; .screen-item{ - width: 33.3%; + // width: 33.3%; display: flex; - margin-bottom: 12px; - font-family: Alibaba PuHuiTi; - font-weight: 500; - font-size: 17px; - color: #000000; + height: 39px; + // margin-bottom: 12px; + // font-family: Alibaba PuHuiTi; + // font-weight: 500; + // font-size: 17px; + // color: #000000; .screen-item-label{ - width: 53px; - padding-left: 10px; + font-family: Alibaba PuHuiTi; + font-weight: 500; + font-size: 17px; + color: #000000; + line-height: 30px; + // width: 53px; + // padding-left: 10px; display: flex; align-items: center; + margin-right: 9px; // font-size: 15px; } + :deep(.ant-select-selector){ + display: flex; + align-items: center; + font-family: HarmonyOS Sans; + font-weight: 500; + font-size: 19px; + color: #000000; + line-height: 30px; + height: 39px; + box-shadow: 2px 3px 3px 1px rgba(13,13,13,0.05); + } + .item-input{ + width:223px; + font-family: Alibaba PuHuiTi; + font-weight: 500; + font-size: 17px; + color: #000000; + line-height: 30px; + } + .item-time-select{ + :deep(input){ + font-family: HarmonyOS Sans; + font-weight: 500; + font-size: 15px; + color: #000000; + line-height: 30px; + } + } } .screen-button-div{ display: flex; @@ -568,16 +604,24 @@ const closeMolder = () => { } .top-radio-button-div{ width:100%; - padding:33px 10px 8px 10px; + padding: 33px 12px 8px 13px; + :deep(.ant-radio-button-wrapper-checked){ + font-family: Alibaba PuHuiTi; + font-weight: 500 !important; + font-size: 20px; + color: #FFFFFF !important; + line-height: 40px; + } .radio-item{ width:50%; text-align: center; + height: 40px; + user-select: none; font-family: Alibaba PuHuiTi; font-weight: 400; font-size: 20px; - height: 40px; + color: #000000; line-height: 40px; - user-select: none; } } .sift-div{ From c45d79a4124d1453de2cbfd25e61d79ff74311c1 Mon Sep 17 00:00:00 2001 From: Zhufu <1176354795@qq.com> Date: Thu, 11 Jul 2024 14:35:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/demo/tiankongdi/auditinfo/AuditProgress/index.vue | 1 + src/views/demo/tiankongdi/auditinfo/MapList/index.vue | 4 +++- src/views/demo/tiankongdi/curbspotcity/MapList/index.vue | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/demo/tiankongdi/auditinfo/AuditProgress/index.vue b/src/views/demo/tiankongdi/auditinfo/AuditProgress/index.vue index e79e79e8..bc657fe8 100644 --- a/src/views/demo/tiankongdi/auditinfo/AuditProgress/index.vue +++ b/src/views/demo/tiankongdi/auditinfo/AuditProgress/index.vue @@ -159,6 +159,7 @@ color: #000000; line-height: 30px; height: 39px; + box-shadow: 2px 3px 3px 1px rgba(13,13,13,0.05); } } } diff --git a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue index 0eb1245d..571bd85a 100644 --- a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue +++ b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue @@ -39,7 +39,7 @@
- +
查询 @@ -487,6 +487,7 @@ color: #000000; line-height: 30px; height: 39px; + box-shadow: 2px 3px 3px 1px rgba(13,13,13,0.05); } .item-input{ font-family: Alibaba PuHuiTi; @@ -495,6 +496,7 @@ color: #000000; line-height: 30px; width:223px; + box-shadow: 2px 3px 3px 1px rgba(13,13,13,0.05); } } .screen-button-div { diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue index 19b849b2..ec78625b 100644 --- a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue +++ b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue @@ -582,8 +582,10 @@ const closeMolder = () => { font-size: 17px; color: #000000; line-height: 30px; + box-shadow: 2px 3px 3px 1px rgba(13,13,13,0.05); } .item-time-select{ + box-shadow: 2px 3px 3px 1px rgba(13,13,13,0.05); :deep(input){ font-family: HarmonyOS Sans; font-weight: 500; From 0eb5b916dca981a20dc0e15bc97faf2db0744557 Mon Sep 17 00:00:00 2001 From: Zhufu <1176354795@qq.com> Date: Thu, 11 Jul 2024 14:49:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tiankongdi/auditinfo/MapList/index.vue | 12 +++++++++++- .../tiankongdi/curbspotcity/MapList/index.vue | 18 +++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue index 571bd85a..e3844d38 100644 --- a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue +++ b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue @@ -42,7 +42,7 @@
- 查询 + 查询
@@ -498,6 +498,16 @@ width:223px; box-shadow: 2px 3px 3px 1px rgba(13,13,13,0.05); } + .item-button{ + font-family: Alibaba PuHuiTi; + font-weight: 400; + font-size: 19px; + color: #FFFFFF; + line-height: 30px; + height:39px; + width: 97px; + background:#086DEC; + } } .screen-button-div { display: flex; diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue index ec78625b..e552e6a5 100644 --- a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue +++ b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue @@ -79,13 +79,13 @@ @change="(value) => emits('mapListScreenChange',value.target.value,'mapNo')" />
-
+
查询 - +
@@ -594,6 +594,17 @@ const closeMolder = () => { line-height: 30px; } } + .item-button{ + font-family: Alibaba PuHuiTi; + font-weight: 400; + font-size: 19px; + color: #FFFFFF; + line-height: 30px; + height:39px; + width: 97px; + background: #086DEC; + // margin-left:12px; + } } .screen-button-div{ display: flex; @@ -613,6 +624,7 @@ const closeMolder = () => { font-size: 20px; color: #FFFFFF !important; line-height: 40px; + background: #086DEC; } .radio-item{ width:50%; From 9f2420cb81ed02b608efc261ef99f85c5d7eb05c Mon Sep 17 00:00:00 2001 From: Zhufu <1176354795@qq.com> Date: Thu, 11 Jul 2024 14:58:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/demo/tiankongdi/auditinfo/MapList/index.vue | 5 +++-- src/views/demo/tiankongdi/curbspotcity/MapList/index.vue | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue index e3844d38..841e6917 100644 --- a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue +++ b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue @@ -645,7 +645,8 @@ .data-list-info-div{ display: flex; justify-content: space-between; - padding-top: 10px; + margin-top: 10px; + height: 40px; .info-layout-div{ display:flex; align-items: center; @@ -664,7 +665,7 @@ width: 80px; border-radius: 7px; margin-right: 8px; - height: 30px; + height: 33px; justify-content: center; .info-label{ font-family: Alibaba PuHuiTi; diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue index e552e6a5..6015f8e4 100644 --- a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue +++ b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue @@ -751,7 +751,8 @@ const closeMolder = () => { .data-list-info-div{ display: flex; justify-content: space-between; - padding-top: 10px; + margin-top: 10px; + height: 40px; .info-layout-div{ display:flex; align-items: center; @@ -770,7 +771,7 @@ const closeMolder = () => { width: 80px; border-radius: 7px; margin-right: 8px; - height: 30px; + height: 33px; justify-content: center; .info-label{ font-family: Alibaba PuHuiTi; From f1b43159bc7bfe1a08ecef4ada26edb2df95b0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com> Date: Thu, 11 Jul 2024 15:34:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BB=8E=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=9A=82=E6=97=B6=E9=83=BD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=BA=E5=85=A8=E5=9F=9F=E5=B7=A1=E6=9F=A5?= =?UTF-8?q?=E7=9B=91=E7=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Application/src/AppLogo.vue | 6 +- src/enums/cacheEnum.ts | 1 + src/store/modules/user.ts | 10 ++- src/utils/cache/persistent.ts | 2 + .../demo/system/specialcolumn/Modal/index.vue | 19 +++- .../demo/system/specialcolumn/index.data.ts | 10 +++ src/views/demo/system/specialcolumn/index.vue | 87 +++---------------- .../tiankongdi/changearea/MapList/index.vue | 1 + src/views/subject/index.vue | 12 +-- 9 files changed, 62 insertions(+), 86 deletions(-) diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue index b06e4d08..1b4f70f9 100644 --- a/src/components/Application/src/AppLogo.vue +++ b/src/components/Application/src/AppLogo.vue @@ -6,7 +6,7 @@
- {{ title }} + {{ subjectLogoTitle ? subjectLogoTitle : title }}
@@ -19,6 +19,8 @@ import { PageEnum } from '@/enums/pageEnum'; import { useUserStore } from '@/store/modules/user'; import { getAppEnvConfig } from '@/utils/env'; + import { SUBJECT_LOGO_TITLE } from '@/enums/cacheEnum'; + import { getAuthCache } from '@/utils/auth'; const { VITE_GLOB_APP_LOGO } = getAppEnvConfig(); @@ -41,6 +43,8 @@ const { getCollapsedShowTitle } = useMenuSetting(); const userStore = useUserStore(); const { title } = useGlobSetting(); + const subjectLogoTitle = getAuthCache(SUBJECT_LOGO_TITLE); + const go = useGo(); const getAppLogoClass = computed(() => [ diff --git a/src/enums/cacheEnum.ts b/src/enums/cacheEnum.ts index 63d794cd..f4186d84 100644 --- a/src/enums/cacheEnum.ts +++ b/src/enums/cacheEnum.ts @@ -31,6 +31,7 @@ export const TABLE_SETTING_KEY = 'TABLE__SETTING__KEY__'; // 专题设置 export const SUBJECT_KEY = 'SUBJECT__'; +export const SUBJECT_LOGO_TITLE = 'SUBJECT_LOGO_TITLE__'; export enum CacheTypeEnum { SESSION, diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 2ef153bb..aad03655 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -4,7 +4,7 @@ import { defineStore } from 'pinia'; import { store } from '@/store'; import { RoleEnum } from '@/enums/roleEnum'; import { PageEnum } from '@/enums/pageEnum'; -import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY, SUBJECT_KEY } from '@/enums/cacheEnum'; +import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY, SUBJECT_KEY, SUBJECT_LOGO_TITLE } from '@/enums/cacheEnum'; import { getAuthCache, setAuthCache } from '@/utils/auth'; import { GetUserInfoModel, LoginParams } from '@/api/sys/model/userModel'; import { doLogout, getUserInfo, loginApi } from '@/api/sys/user'; @@ -25,6 +25,7 @@ interface UserState { sessionTimeout?: boolean; lastUpdateTime: number; subject?: string; + subjectLogoTitle?: string; } export const useUserStore = defineStore({ @@ -41,6 +42,7 @@ export const useUserStore = defineStore({ // Last fetch time lastUpdateTime: 0, subject: '', + subjectLogoTitle: '', }), getters: { getUserInfo(state): UserInfo { @@ -61,11 +63,15 @@ export const useUserStore = defineStore({ getSubject(state): string { return state.subject || getAuthCache(SUBJECT_KEY); }, + getSubjectLogoTitle(state): string { + return state.subjectLogoTitle || getAuthCache(SUBJECT_LOGO_TITLE); + }, }, actions: { - async setSubject(subject: string | undefined, link: string) { + async setSubject(subject: string | undefined, logoTitle: string | undefined, link: string) { this.subject = subject; setAuthCache(SUBJECT_KEY, subject); + setAuthCache(SUBJECT_LOGO_TITLE, logoTitle); if (subject != undefined) { const permissionStore = usePermissionStore(); await permissionStore.buildRoutesAction(); diff --git a/src/utils/cache/persistent.ts b/src/utils/cache/persistent.ts index f12b5337..a08d5b5a 100644 --- a/src/utils/cache/persistent.ts +++ b/src/utils/cache/persistent.ts @@ -6,6 +6,7 @@ import { createLocalStorage, createSessionStorage } from '@/utils/cache'; import { Memory } from './memory'; import { SUBJECT_KEY, + SUBJECT_LOGO_TITLE, TOKEN_KEY, USER_INFO_KEY, ROLES_KEY, @@ -22,6 +23,7 @@ import { pick, omit } from 'lodash-es'; interface BasicStore { [SUBJECT_KEY]: string | number | null | undefined; + [SUBJECT_LOGO_TITLE]: string | number | null | undefined; [TOKEN_KEY]: string | number | null | undefined; [USER_INFO_KEY]: UserInfo; [ROLES_KEY]: string[]; diff --git a/src/views/demo/system/specialcolumn/Modal/index.vue b/src/views/demo/system/specialcolumn/Modal/index.vue index 32f4e7ae..c3c2fca1 100644 --- a/src/views/demo/system/specialcolumn/Modal/index.vue +++ b/src/views/demo/system/specialcolumn/Modal/index.vue @@ -17,13 +17,23 @@ - + + + + 启用 停用 + + + - + - + @@ -95,7 +105,9 @@ const modalData = ref({ id: '' as string, title: '' as string, + logoTitle: '' as string, isShow: true as boolean, + isDevelop: false as boolean, isExternal: false as boolean, linkOrApi: '' as string, sort: 0 as number, @@ -119,6 +131,7 @@ getCategory(); }); + // 流程分类 async function getCategory() { categoryOptions.value = await getLoad({ code: 'FlowSort' }); } diff --git a/src/views/demo/system/specialcolumn/index.data.ts b/src/views/demo/system/specialcolumn/index.data.ts index 76bd30ba..b444ee93 100644 --- a/src/views/demo/system/specialcolumn/index.data.ts +++ b/src/views/demo/system/specialcolumn/index.data.ts @@ -17,6 +17,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'title', width: 200, }, + { + title: 'LOGO名称', + dataIndex: 'logoTitle', + width: 200, + }, { title: '类型', dataIndex: 'isExternal', @@ -32,6 +37,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'isShow', width: 200, }, + { + title: '是否开放', + dataIndex: 'isDevelop', + width: 200, + }, { title: '排序', dataIndex: 'sort', diff --git a/src/views/demo/system/specialcolumn/index.vue b/src/views/demo/system/specialcolumn/index.vue index 3991cba1..2f278591 100644 --- a/src/views/demo/system/specialcolumn/index.vue +++ b/src/views/demo/system/specialcolumn/index.vue @@ -1,5 +1,5 @@