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 0000000..924aa8d Binary files /dev/null and b/hx-ai-intelligent/public/asset/image/headerIcon.png differ 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 @@
照明回路
- - - + +
- diff --git a/hx-op/public/asset/image/headerIcon.png b/hx-op/public/asset/image/headerIcon.png new file mode 100644 index 0000000..924aa8d Binary files /dev/null and b/hx-op/public/asset/image/headerIcon.png differ 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 @@