From fea7abd47636237124b48c2d890d822fa05e3630 Mon Sep 17 00:00:00 2001 From: xuziqiang <1344691446@qq.com> Date: Fri, 21 Jun 2024 15:19:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../public/asset/image/headerIcon.png | Bin 0 -> 5629 bytes hx-ai-intelligent/src/App.vue | 94 +- hx-ai-intelligent/src/config/app.config.ts | 13 +- hx-ai-intelligent/src/icon/shebeiguanli.svg | 4 + hx-ai-intelligent/src/icon/shebeiqunkong.svg | 4 + hx-ai-intelligent/src/icon/shouye.svg | 4 + hx-ai-intelligent/src/icon/trigger.svg | 6 - hx-ai-intelligent/src/icon/zuzhiguanli.svg | 4 + hx-ai-intelligent/src/router/equipmentControl.ts | 4 +- hx-ai-intelligent/src/router/equipmentManage.ts | 8 +- hx-ai-intelligent/src/router/home.ts | 4 +- hx-ai-intelligent/src/router/organizationManage.ts | 6 +- hx-ai-intelligent/src/theme/global.less | 4 +- .../equipmentControl/lightingManage/index.less | 1904 +++++------ .../equipmentControl/lightingManage/indexs.vue | 3307 ++++++++++---------- hx-op/public/asset/image/headerIcon.png | Bin 0 -> 5629 bytes hx-op/src/App.vue | 95 +- hx-op/src/config/app.config.ts | 1 + lib/component/table/table-header.vue | 17 +- lib/component/table/table.vue | 4 +- lib/saas/asset/icon/close.svg | 9 + lib/saas/asset/icon/fastBackward.svg | 8 + lib/saas/asset/icon/trigger.svg | 6 +- lib/saas/theme/global-antd.less | 33 +- lib/saas/theme/global.less | 6 +- lib/saas/theme/variable.less | 20 +- lib/saas/view/system/application.vue | 28 +- lib/saas/view/system/layout/breadcrumb.vue | 8 +- lib/saas/view/system/layout/header.vue | 58 +- lib/saas/view/system/layout/sider.vue | 104 +- lib/saas/view/system/layout/tag/index.vue | 4 +- lib/saas/view/system/layout/tags.vue | 64 +- 32 files changed, 3016 insertions(+), 2815 deletions(-) create mode 100644 hx-ai-intelligent/public/asset/image/headerIcon.png create mode 100644 hx-ai-intelligent/src/icon/shebeiguanli.svg create mode 100644 hx-ai-intelligent/src/icon/shebeiqunkong.svg create mode 100644 hx-ai-intelligent/src/icon/shouye.svg delete mode 100644 hx-ai-intelligent/src/icon/trigger.svg create mode 100644 hx-ai-intelligent/src/icon/zuzhiguanli.svg create mode 100644 hx-op/public/asset/image/headerIcon.png create mode 100644 lib/saas/asset/icon/close.svg create mode 100644 lib/saas/asset/icon/fastBackward.svg diff --git a/hx-ai-intelligent/public/asset/image/headerIcon.png b/hx-ai-intelligent/public/asset/image/headerIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..924aa8deffd3fec970801935eb1946560b085733 GIT binary patch literal 5629 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 XYtjZi(b!n900000NkvXXu0mjfH}}(m literal 0 HcmV?d00001 diff --git a/hx-ai-intelligent/src/App.vue b/hx-ai-intelligent/src/App.vue index e6f5b2e..7fca9e2 100644 --- a/hx-ai-intelligent/src/App.vue +++ b/hx-ai-intelligent/src/App.vue @@ -44,7 +44,7 @@ - - diff --git a/hx-ai-intelligent/src/config/app.config.ts b/hx-ai-intelligent/src/config/app.config.ts index f5feb8a..91d483e 100644 --- a/hx-ai-intelligent/src/config/app.config.ts +++ b/hx-ai-intelligent/src/config/app.config.ts @@ -26,6 +26,7 @@ export const appConfig = { baseRouter: '/parkingManage/parkingLotManage', themeConfig: { bgImageUrl: `${import.meta.env.VITE_PUBLIC_PATH}/asset/image/login/background.png`, + logoLessUrl: `${import.meta.env.VITE_PUBLIC_PATH}/asset/image/headerIcon.png`, }, // userCustomRouterGuard: (to, from, next, whiteNameList, authorizationStore, appConfig) => { // console.log({ to, from, next, whiteNameList, authorizationStore, appConfig }, 'routeConfig'); @@ -37,8 +38,9 @@ export const appConfig = { headerSlotConfig: { component: 'NsSelectApi', componentProps: { - style: { width: '200px' }, + style: { width: '200px', color: '#2778FF', marginRight: '10px' }, api: '/carbon-smart/user/login/logInInfo', + size: 'large', defaultValue: selectDefaultValue, // autoSelectFirst: true, placeholder: '请选择', @@ -107,15 +109,6 @@ export const appConfig = { // toRouterName: 'NoticeManageIndex', // }, resourceInfo: { - // application: { - // version: '1.1.74', - // label: '停车业务平台', - // dataScope: { - // scopeMode: 0, - // scopeType: '', - // dataTips: '', - // }, - // }, api: permission.add, }, }; diff --git a/hx-ai-intelligent/src/icon/shebeiguanli.svg b/hx-ai-intelligent/src/icon/shebeiguanli.svg new file mode 100644 index 0000000..cf0a1e2 --- /dev/null +++ b/hx-ai-intelligent/src/icon/shebeiguanli.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/icon/shebeiqunkong.svg b/hx-ai-intelligent/src/icon/shebeiqunkong.svg new file mode 100644 index 0000000..c069283 --- /dev/null +++ b/hx-ai-intelligent/src/icon/shebeiqunkong.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/icon/shouye.svg b/hx-ai-intelligent/src/icon/shouye.svg new file mode 100644 index 0000000..cae6f40 --- /dev/null +++ b/hx-ai-intelligent/src/icon/shouye.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/icon/trigger.svg b/hx-ai-intelligent/src/icon/trigger.svg deleted file mode 100644 index 2f0acf3..0000000 --- a/hx-ai-intelligent/src/icon/trigger.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/hx-ai-intelligent/src/icon/zuzhiguanli.svg b/hx-ai-intelligent/src/icon/zuzhiguanli.svg new file mode 100644 index 0000000..d65cf2d --- /dev/null +++ b/hx-ai-intelligent/src/icon/zuzhiguanli.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/router/equipmentControl.ts b/hx-ai-intelligent/src/router/equipmentControl.ts index a951a58..3ed5421 100644 --- a/hx-ai-intelligent/src/router/equipmentControl.ts +++ b/hx-ai-intelligent/src/router/equipmentControl.ts @@ -2,13 +2,13 @@ const Base = () => import('/nerv-lib/saas/view/system/layout/content.vue'); const equipmentControl = { path: '/equipmentControl', name: 'EquipmentControl', - meta: { title: '设备群控', icon: 'dicizhishou', index: 4 }, + meta: { title: '设备群控', icon: 'shebeiqunkong', index: 4 }, redirect: { name: 'LightManage' }, children: [ { path: 'lightManage', name: 'LightManage', - meta: { title: '智能照明', hideChildren: true, icon: 'dicizhishou' }, + meta: { title: '智能照明', hideChildren: true, icon: 'shebeiqunkong' }, component: Base, redirect: { name: 'lightManageIndex' }, children: [ diff --git a/hx-ai-intelligent/src/router/equipmentManage.ts b/hx-ai-intelligent/src/router/equipmentManage.ts index 6fde6d1..7433199 100644 --- a/hx-ai-intelligent/src/router/equipmentManage.ts +++ b/hx-ai-intelligent/src/router/equipmentManage.ts @@ -2,13 +2,13 @@ const Base = () => import('/nerv-lib/saas/view/system/layout/content.vue'); const equipment = { path: '/equipmentManage', name: 'EquipmentManage', - meta: { title: '设备管理', icon: 'dicizhishou', index: 1 }, + meta: { title: '设备管理', icon: 'shebeiguanli', index: 1 }, redirect: { name: 'Ledger' }, children: [ { path: 'ledger', name: 'Ledger', - meta: { title: '设备台账', hideChildren: true, icon: 'dicizhishou' }, + meta: { title: '设备台账', hideChildren: true, icon: 'shebeiguanli' }, component: Base, redirect: { name: 'LedgerIndex' }, children: [ @@ -28,7 +28,7 @@ const equipment = { { path: 'group', name: 'Group', - meta: { title: '分组管理', hideChildren: true, icon: 'dicizhishou' }, + meta: { title: '分组管理', hideChildren: true, icon: 'shebeiguanli' }, component: Base, redirect: { name: 'GroupIndex' }, children: [ @@ -47,7 +47,7 @@ const equipment = { { path: 'energyMapping', name: 'EnergyMapping', - meta: { title: '能耗映射', hideChildren: true, icon: 'dicizhishou' }, + meta: { title: '能耗映射', hideChildren: true, icon: 'shebeiguanli' }, component: Base, redirect: { name: 'EnergyMappingIndex' }, children: [ diff --git a/hx-ai-intelligent/src/router/home.ts b/hx-ai-intelligent/src/router/home.ts index 5174a9d..4ef3db5 100644 --- a/hx-ai-intelligent/src/router/home.ts +++ b/hx-ai-intelligent/src/router/home.ts @@ -2,13 +2,13 @@ const Base = () => import('/nerv-lib/saas/view/system/layout/content.vue'); const home = { path: '/home', name: 'home', - meta: { title: '首页', icon: 'dicizhishou', index: 0, hideChildren: true }, + meta: { title: '首页', icon: 'shouye', index: 0, hideChildren: true }, redirect: { name: 'homeIndex' }, children: [ { path: 'index', name: 'homeIndex', - meta: { title: '首页', hideChildren: true, icon: 'dicizhishou' }, + meta: { title: '首页', hideChildren: true, icon: 'shouye' }, component: () => import('/@/view/developing.vue'), // redirect: { name: 'homeIndex' }, // children: [ diff --git a/hx-ai-intelligent/src/router/organizationManage.ts b/hx-ai-intelligent/src/router/organizationManage.ts index 02de016..a1f3ad4 100644 --- a/hx-ai-intelligent/src/router/organizationManage.ts +++ b/hx-ai-intelligent/src/router/organizationManage.ts @@ -2,13 +2,13 @@ const Base = () => import('/nerv-lib/saas/view/system/layout/content.vue'); const organizationManage = { path: '/organizationManage', name: 'organizationManage', - meta: { title: '组织管理', icon: 'dicizhishou', index: 99 }, + meta: { title: '组织管理', icon: 'zuzhiguanli', index: 99 }, redirect: { name: 'UserManage' }, children: [ { path: 'userManage', name: 'UserManage', - meta: { title: '用户管理', hideChildren: true, icon: 'dicizhishou' }, + meta: { title: '用户管理', hideChildren: true, icon: 'zuzhiguanli' }, component: Base, redirect: { name: 'userManageIndex' }, children: [ @@ -66,7 +66,7 @@ const organizationManage = { { path: 'authorityManage', name: 'AuthorityManage', - meta: { title: '部门/权限', hideChildren: true, icon: 'dicizhishou' }, + meta: { title: '部门/权限', hideChildren: true, icon: 'zuzhiguanli' }, component: Base, redirect: { name: 'AuthorityManageIndex' }, children: [ diff --git a/hx-ai-intelligent/src/theme/global.less b/hx-ai-intelligent/src/theme/global.less index 714d672..97f7887 100644 --- a/hx-ai-intelligent/src/theme/global.less +++ b/hx-ai-intelligent/src/theme/global.less @@ -111,13 +111,13 @@ .ant-menu-title-content { svg { - color: #A1ABC2; + // color: #A1ABC2; } } .ant-menu-item-selected { svg { - color: #D0DBF5; + // color: #D0DBF5; } } diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.less b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.less index 4c452e1..5d707a0 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.less +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.less @@ -1,952 +1,952 @@ - \ No newline at end of file +// \ No newline at end of file diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue index 681031d..e1840d1 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue @@ -3,7 +3,11 @@
-
+
@@ -15,46 +19,93 @@
- - 站厅照明 1区 - + + 站厅照明 1区 +
- - 控制模式 + + 控制模式 自动 - + :style="{ + color: 'rgba(255, 255, 255, 1)', + fontSize: '16px', + fontWeight: '700', + marginRight: '20px', + }" + >自动 + 亮度 1000lux - - 控制场景 + :style="{ + color: 'rgba(255, 255, 255, 1)', + fontSize: '16px', + fontWeight: '700', + marginLeft: '20px', + }" + >1000lux + + 控制场景 舒适 - + :style="{ + color: 'rgba(255, 255, 255, 1)', + fontSize: '16px', + fontWeight: '700', + marginRight: '20px', + }" + >舒适 + 色温 4200k + :style="{ + color: 'rgba(255, 255, 255, 1)', + fontSize: '16px', + fontWeight: '700', + marginLeft: '20px', + }" + >4200k
-
@@ -64,28 +115,41 @@
照明区域 -
@@ -96,24 +160,33 @@
照明回路
- - - + +
+ rgba(255, 129, 3, 1) 100% + ); + } + } + + :deep(.ant-modal-content) { + width: 555px; + height: 792px; + } + + :deep(.ant-modal-body) { + width: 555px; + max-height: 792px !important; + box-sizing: border-box; + } + + .text-change { + text-align: center; + color: rgba(255, 255, 255, 1); + font-size: 20px; + } + + .excuno { + width: 150px; + height: 40px; + margin-top: 30px; + } + + .excuok { + width: 150px; + height: 40px; + margin-top: 30px; + } + + .excubtn { + display: flex; + justify-content: space-between; + } + + .addok { + width: 74px; + height: 40px; + opacity: 1; + border-radius: 4px; + background: rgba(67, 136, 251, 1); + border: rgba(67, 136, 251, 1); + font-size: 14px; + font-weight: 400; + color: rgba(255, 255, 255, 1); + margin-top: 440px; + margin-left: 350px; + } + + .zmhlbtn { + position: relative; + } + .anticon-stop { + position: absolute; + right: 3px; + bottom: 3px; + } + + .istrindex { + background: rgba(67, 136, 251, 1); + } + + :deep(.ant-modal-mask.ant-modal-content) { + height: 100vh; + position: fixed; + right: 496px; + top: 0%; + } + :deep(.ant-modal-content) { + position: fixed; + bottom: 20px; + right: 500px; + } + diff --git a/hx-op/public/asset/image/headerIcon.png b/hx-op/public/asset/image/headerIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..924aa8deffd3fec970801935eb1946560b085733 GIT binary patch literal 5629 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 XYtjZi(b!n900000NkvXXu0mjfH}}(m literal 0 HcmV?d00001 diff --git a/hx-op/src/App.vue b/hx-op/src/App.vue index bd1f9b4..86b9210 100644 --- a/hx-op/src/App.vue +++ b/hx-op/src/App.vue @@ -25,45 +25,52 @@ - - diff --git a/hx-op/src/config/app.config.ts b/hx-op/src/config/app.config.ts index 1c26493..b5bd1b2 100644 --- a/hx-op/src/config/app.config.ts +++ b/hx-op/src/config/app.config.ts @@ -20,6 +20,7 @@ export const appConfig = { baseHeader: '/parkingManage', baseRouter: '/parkingManage/parkingLotManage', themeConfig: { + logoLessUrl: `${import.meta.env.VITE_PUBLIC_PATH}/asset/image/headerIcon.png`, bgImageUrl: `${import.meta.env.VITE_PUBLIC_PATH}/asset/image/login/background.png`, }, // userCustomRouterGuard: (to, from, next, whiteNameList, authorizationStore, appConfig) => { diff --git a/lib/component/table/table-header.vue b/lib/component/table/table-header.vue index cd7fdbd..3bdc3f7 100644 --- a/lib/component/table/table-header.vue +++ b/lib/component/table/table-header.vue @@ -2,7 +2,7 @@ +
+
{{ configStore.projectName }}
+
-
- {{ projectName ? projectName : enterpriseName }} +
+
-
{{ '返回门户' }}
@@ -80,7 +82,7 @@
- + + {{ $refs.getComputedStyle }} @@ -37,27 +38,31 @@ target="_blank" rel="noopener noreferrer"> {{ newOpen.name }} - + +
{{ - sitem.meta.title - }} + :key="sitem.name"> + + {{ sitem.meta.title }} + +
@@ -70,9 +75,9 @@ role="img" style="margin-left: 8px" class="anticon" - v-show="ditem.meta.icon" - > + v-show="ditem.meta.icon"> + + {{ ditem.meta.title }}
{{ - fiveFloorItem?.meta?.title ? fiveFloorItem?.meta?.title : '' - }} + v-if="fiveFloorItem.meta?.type !== 'op'"> + + {{ fiveFloorItem?.meta?.title ? fiveFloorItem?.meta?.title : '' }} + +
@@ -113,7 +118,6 @@ {{ item.meta.title }} - @@ -128,7 +132,7 @@ diff --git a/lib/saas/view/system/layout/tag/index.vue b/lib/saas/view/system/layout/tag/index.vue index 1f2ccec..f21206b 100644 --- a/lib/saas/view/system/layout/tag/index.vue +++ b/lib/saas/view/system/layout/tag/index.vue @@ -266,7 +266,7 @@ display: flex; align-items: center; position: fixed; - top: 48px; + top: @layout-header-height; z-index: 505; } #iframeApplication .ns-tabs { @@ -281,7 +281,7 @@ display: flex; align-items: center; position: fixed; - top: 48px; + top: @layout-header-height; z-index: 505; } :deep(.ant-tabs-nav) { diff --git a/lib/saas/view/system/layout/tags.vue b/lib/saas/view/system/layout/tags.vue index 2e8236b..8059027 100644 --- a/lib/saas/view/system/layout/tags.vue +++ b/lib/saas/view/system/layout/tags.vue @@ -1,7 +1,9 @@