diff --git a/hx-ai-intelligent/public/bulbLogo/bgsquare.png b/hx-ai-intelligent/public/bulbLogo/bgsquare.png new file mode 100644 index 0000000..3f9caec Binary files /dev/null and b/hx-ai-intelligent/public/bulbLogo/bgsquare.png differ diff --git a/hx-ai-intelligent/public/bulbLogo/组 22394.png b/hx-ai-intelligent/public/bulbLogo/组 22394.png new file mode 100644 index 0000000..5b38e7b Binary files /dev/null and b/hx-ai-intelligent/public/bulbLogo/组 22394.png differ diff --git a/hx-ai-intelligent/public/bulbLogo/组 22394@2x.png b/hx-ai-intelligent/public/bulbLogo/组 22394@2x.png new file mode 100644 index 0000000..1a49b5b Binary files /dev/null and b/hx-ai-intelligent/public/bulbLogo/组 22394@2x.png differ diff --git a/hx-ai-intelligent/public/bulbLogo/组 22396.png b/hx-ai-intelligent/public/bulbLogo/组 22396.png new file mode 100644 index 0000000..4da0f4c Binary files /dev/null and b/hx-ai-intelligent/public/bulbLogo/组 22396.png differ diff --git a/hx-ai-intelligent/public/bulbLogo/组 22396@2x.png b/hx-ai-intelligent/public/bulbLogo/组 22396@2x.png new file mode 100644 index 0000000..4faeaf3 Binary files /dev/null and b/hx-ai-intelligent/public/bulbLogo/组 22396@2x.png differ diff --git a/hx-ai-intelligent/public/bulbLogo/组 22400.png b/hx-ai-intelligent/public/bulbLogo/组 22400.png new file mode 100644 index 0000000..37a6bcf Binary files /dev/null and b/hx-ai-intelligent/public/bulbLogo/组 22400.png differ diff --git a/hx-ai-intelligent/public/bulbLogo/组 22400@2x.png b/hx-ai-intelligent/public/bulbLogo/组 22400@2x.png new file mode 100644 index 0000000..6d77bb7 Binary files /dev/null and b/hx-ai-intelligent/public/bulbLogo/组 22400@2x.png differ diff --git a/hx-ai-intelligent/public/bulbLogo/组 22419.png b/hx-ai-intelligent/public/bulbLogo/组 22419.png new file mode 100644 index 0000000..0dce490 Binary files /dev/null and b/hx-ai-intelligent/public/bulbLogo/组 22419.png differ diff --git a/hx-ai-intelligent/public/bulbLogo/组 22419@2x.png b/hx-ai-intelligent/public/bulbLogo/组 22419@2x.png new file mode 100644 index 0000000..a428eca Binary files /dev/null and b/hx-ai-intelligent/public/bulbLogo/组 22419@2x.png differ diff --git a/hx-ai-intelligent/public/bulbLogo/组 22549.png b/hx-ai-intelligent/public/bulbLogo/组 22549.png new file mode 100644 index 0000000..22a7c32 Binary files /dev/null and b/hx-ai-intelligent/public/bulbLogo/组 22549.png differ diff --git a/hx-ai-intelligent/src/main.ts b/hx-ai-intelligent/src/main.ts index 5eea1a2..40f0cc1 100644 --- a/hx-ai-intelligent/src/main.ts +++ b/hx-ai-intelligent/src/main.ts @@ -5,8 +5,6 @@ import { apiModule } from '/@/api'; import { appConfig } from '/@/config'; import './theme/global.less'; import { LeftOutlined } from '@ant-design/icons-vue'; -// import ElementPlus from 'element-plus' -// import 'element-plus/dist/index.css' const app = createApp(App); app.component('LeftOutlined', LeftOutlined); saasInit({ @@ -14,5 +12,4 @@ saasInit({ apiModule, appConfig, }); -// app.use(ElementPlus) app.mount('#app'); diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/bg.jpg b/hx-ai-intelligent/src/view/equipmentControl/image/bg.jpg new file mode 100644 index 0000000..92247b0 Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/bg.jpg differ diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue deleted file mode 100644 index 89fc361..0000000 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue +++ /dev/null @@ -1,584 +0,0 @@ - - - open - - - - - - - - 照明区域 - 计划启用 - - - - - {{ button.label }} - - - - - - 照明回路 - 计划启用 - - {{ selectionModeText }} - - 全选 - - - - - {{ button2.label }} - - - - - - 控制模式 - - - - - {{ button3.label }} - - - - - - 控制场景 - - - - - {{ button4.label }} - - - - - - 灯具参数 - - - 开启数量 - 亮度 - 色温 - 8/10 - 100lux - 4200k - - - 刷新 - 执行 - - - - - - - - - - 重启 - 删除 - - - - 添加 - - - - - - - - - - - 刷新 - - - - - - - - - - diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue index a6a1648..5bae907 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue @@ -1,590 +1,1507 @@ - Open - - - - - - - 照明区域 - 计划启用 - - - - - {{ button.label }} - - - - - - 照明回路 - 计划启用 - - {{ selectionModeText }} - - 全选 + + + + + + - - - - {{ button2.label }} - + + - - - - 控制模式 + + - - - - {{ button3.label }} - + + - - - - 控制场景 + + - - - - {{ button4.label }} - + + - - - - 灯具参数 + + - - 开启数量 - 亮度 - 色温 - 8/10 - 100lux - 4200k - - - 刷新 - 执行 - - - - - - - - {{ text || ' ' }} - - - - 重启 - 删除 + + + + 1F + 2F + 站台 + + + + + + + + + + 照明区域 + 计划启用 + + + + + {{ button.label }} + + + + + + 照明回路 + + + 全选 + 启用面板 + + + + + + {{ button2.label }} + + + + + + 控制模式 + + + + + + {{ button3.label }} + + + + + + + 控制场景 + + + + + + {{ button4.label }} + + + + + + 灯具参数 + + + 开启数量 + 亮度(lux) + 色温(k) + 8/10 + 100 + 4200 + + + 刷新 + 执行 + + + + + + + + + {{ text || " " }} + + + + + + 重启 + 删除 + - - - - 添加 - - - - - - - - {{ text || ' ' }} + + + 添加 + + + + + + + 序号 + 执行时间 + 操作内容 + 操作人 + + + + + {{ row.key }} + {{ row.data }} + {{ row.planname }} + {{ row.status }} + + + + + + + + 操作日志 - - - - - 刷新 - - - + + + + 站厅照明 1区 + + + + + + 控制模式 + + 手动 + 自动 + + + + 亮度 + + 100lux + + 30lux + + + + 控制场景 + + 手动 + + 自动 + + + + 色温 + + 4000k + + 3800k + + + + + + + 站厅照明 1区 + + + + + + 控制模式 + + 手动 + 自动 + + + + 亮度 + + 100lux + + 30lux + + + + 控制场景 + + 手动 + + 自动 + + + + 色温 + + 4000k + + 3800k + + + + + + + 站厅照明 1区 + + + + + + 控制模式 + + 手动 + 自动 + + + + 亮度 + + 100lux + + 30lux + + + + 控制场景 + + 手动 + + 自动 + + + + 色温 + + 4000k + + 3800k + + + + + + + 刷新 + + + + + + + + + + + + + + + + + - 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/, ''), },
开启数量
亮度
色温
8/10
100lux
4200k
亮度(lux)
色温(k)
100
4200