diff --git a/hx-ai-intelligent/public/asset/image/bulbLogo/21961.png b/hx-ai-intelligent/public/asset/image/bulbLogo/21961.png
new file mode 100644
index 0000000..450fb04
Binary files /dev/null and b/hx-ai-intelligent/public/asset/image/bulbLogo/21961.png differ
diff --git a/hx-ai-intelligent/public/asset/image/bulbLogo/21962.png b/hx-ai-intelligent/public/asset/image/bulbLogo/21962.png
new file mode 100644
index 0000000..dbe6ef1
Binary files /dev/null and b/hx-ai-intelligent/public/asset/image/bulbLogo/21962.png differ
diff --git a/hx-ai-intelligent/public/asset/image/bulbLogo/22496.png b/hx-ai-intelligent/public/asset/image/bulbLogo/22496.png
new file mode 100644
index 0000000..a8c9d87
Binary files /dev/null and b/hx-ai-intelligent/public/asset/image/bulbLogo/22496.png differ
diff --git a/hx-ai-intelligent/public/asset/image/bulbLogo/22546.png b/hx-ai-intelligent/public/asset/image/bulbLogo/22546.png
new file mode 100644
index 0000000..21e9a1e
Binary files /dev/null and b/hx-ai-intelligent/public/asset/image/bulbLogo/22546.png differ
diff --git a/hx-ai-intelligent/public/asset/image/bulbLogo/22553.png b/hx-ai-intelligent/public/asset/image/bulbLogo/22553.png
new file mode 100644
index 0000000..ac7ecc2
Binary files /dev/null and b/hx-ai-intelligent/public/asset/image/bulbLogo/22553.png differ
diff --git a/hx-ai-intelligent/public/asset/image/bulbLogo/22554.png b/hx-ai-intelligent/public/asset/image/bulbLogo/22554.png
new file mode 100644
index 0000000..ce9aa10
Binary files /dev/null and b/hx-ai-intelligent/public/asset/image/bulbLogo/22554.png differ
diff --git a/hx-ai-intelligent/src/config/app.config.ts b/hx-ai-intelligent/src/config/app.config.ts
index 299a815..6a1b5dd 100644
--- a/hx-ai-intelligent/src/config/app.config.ts
+++ b/hx-ai-intelligent/src/config/app.config.ts
@@ -19,7 +19,7 @@ const transform = (data, map) => {
export const appConfig = {
projectType: 'web',
baseApi: '/api',
- enablePermissions: true,
+ enablePermissions: false,
// themeColor: '#eee',
siderPosition: 'left',
baseHeader: '/parkingManage',
@@ -27,10 +27,10 @@ export const appConfig = {
themeConfig: {
bgImageUrl: `${import.meta.env.VITE_PUBLIC_PATH}/asset/image/login/background.png`,
},
- // userCustomRouterGuard: (to, from, next, whiteNameList, authorizationStore, appConfig) => {
- // console.log({ to, from, next, whiteNameList, authorizationStore, appConfig }, 'routeConfig');
- // next();
- // },
+ userCustomRouterGuard: (to, from, next, whiteNameList, authorizationStore, appConfig) => {
+ console.log({ to, from, next, whiteNameList, authorizationStore, appConfig }, 'routeConfig');
+ next();
+ },
// customUpdatePwd: () => import('/@/view/updatePassword/updatePassword.vue'),
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
index 6333ddf..72e3815 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
@@ -13,9 +13,53 @@
+
+
+
+
站厅照明 1区
+
+
+
+
+
+
+
+
+
控制模式
+
自动
+
+
亮度
+
1000lux
+
+
控制场景
+
舒适
+
+
色温
+
4200k
+
+
+ :body-style="{ background: 'rgba(0, 0, 0)', opacity: 0.8 }" :closable="false" id="Odrawer"
+ :maskStyle="{ 'background-color': 'rgba(0,0,0,0)' }">
@@ -76,7 +120,8 @@
@@ -129,184 +174,197 @@
灯具参数
-
开启数量
-
亮度(lux)
-
色温(k)
-
8/10
-
100
-
4200
+
+
+
+ 开启数量 |
+ 亮度(lux) |
+ 色温 |
+
+
+
+
+ {{ row.num }} |
+ {{ row.light }} |
+ {{ row.tempruter }} |
+
+
+
-
-
-
变更内容
+
-
-
-
-
-
{{ item.name }}
+
+
+
+
+
+
{{ item.name }}
+
+
-
-
-
-
-
+
{{ item.manual }}
+ color: rgba(255, 255, 255, 1);
+ font-size: 14px;
+ font-weight: 400;
+ margin-left: 12px;
+ margin-right: 8px;
+ ">手动
{{ item.automatic }}
+ color: rgba(255, 255, 255, 1);
+ font-size: 14px;
+ font-weight: 400;
+ margin-left: 8px;
+ margin-right: 40px;
+ ">自动
-
+
{{ item.brightness }}
+ color: rgba(255, 255, 255, 1);
+ font-size: 14px;
+ font-weight: 400;
+ margin-left: 12px;
+ margin-right: 8px;
+ ">100lux
{{ item.brightness2 }}
+ color: rgba(243, 97, 99, 1);
+ font-size: 14px;
+ font-weight: 400;
+ margin-left: 8px;
+ ">30lux
-
+
{{ item.manual2 }}
+ color: rgba(255, 255, 255, 1);
+ font-size: 14px;
+ font-weight: 400;
+ margin-left: 12px;
+ margin-right: 8px;
+ ">手动
{{ item.automatic2 }}
+ color: rgba(255, 255, 255, 1);
+ font-size: 14px;
+ font-weight: 400;
+ margin-left: 8px;
+ margin-right: 40px;
+ ">自动
-
+
{{ item.brightness3 }}
+ color: rgba(255, 255, 255, 1);
+ font-size: 14px;
+ font-weight: 400;
+ margin-left: 12px;
+ margin-right: 8px;
+ ">4000k
{{ item.brightness4 }}
+ color: rgba(255, 255, 255, 1);
+ font-size: 14px;
+ font-weight: 400;
+ margin-left: 8px;
+ ">3800k
+
-
@@ -314,9 +372,9 @@
-
-
-
+
+
+
序号 |
执行时间 |
计划名称 |
@@ -325,7 +383,7 @@
-
+
{{ row.key }} |
{{ row.data }} |
{{ row.planname }} |
@@ -351,7 +409,7 @@
- 重启
+ 重启
删除
|
@@ -361,20 +419,22 @@
:mask="false" :bodyStyle="{
opacity: 1,
background: ' rgba(0,0,0)',
- height: '792px',
- maxHeight: '792px',
boxSizing: 'borderBox',
display: 'flex',
flexDirection: 'column',
+ height: '100vh',
+ maxHeight: '100vh',
+ position: 'fixed',
+ right: '496px',
+ top: '0',
}">
+
+ 计划库
+
@@ -383,7 +443,7 @@
-
+
序号 |
执行时间 |
操作内容 |
@@ -391,7 +451,8 @@
-
+
{{ row.key }} |
{{ row.data }} |
{{ row.planname }} |
@@ -399,18 +460,21 @@
-
-
+
操作日志
@@ -418,18 +482,17 @@
-
+
{{ item.name }}
-
-
+
-
+
-
+
-
+
@@ -573,25 +640,36 @@
diff --git a/hx-ai-intelligent/vite.config.ts b/hx-ai-intelligent/vite.config.ts
index 7372520..2494632 100644
--- a/hx-ai-intelligent/vite.config.ts
+++ b/hx-ai-intelligent/vite.config.ts
@@ -12,7 +12,7 @@ const proxy = {
changeOrigin: true,
},
'/carbon-smart': {
- target: 'http://192.168.112.144:8224',
+ target: 'http://123.60.103.97:8224',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/carbon-smart/, ''),
},
diff --git a/hx-op/vite.config.ts b/hx-op/vite.config.ts
index 7372520..2494632 100644
--- a/hx-op/vite.config.ts
+++ b/hx-op/vite.config.ts
@@ -12,7 +12,7 @@ const proxy = {
changeOrigin: true,
},
'/carbon-smart': {
- target: 'http://192.168.112.144:8224',
+ target: 'http://123.60.103.97:8224',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/carbon-smart/, ''),
},