From 14a7c158bce7b539468874a71726629b25d9fc24 Mon Sep 17 00:00:00 2001 From: L <2813036942@qq.com> Date: Thu, 6 Jun 2024 11:57:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=85=A7=E6=98=8E=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/main.ts | 3 + hx-ai-intelligent/src/router/organizationManage.ts | 19 + .../organizationManage/lightingManage/index.vue | 566 +++++++++++++++++++++ hx-ai-intelligent/vite.config.ts | 2 +- package.json | 1 + 5 files changed, 590 insertions(+), 1 deletion(-) create mode 100644 hx-ai-intelligent/src/view/organizationManage/lightingManage/index.vue diff --git a/hx-ai-intelligent/src/main.ts b/hx-ai-intelligent/src/main.ts index 40f0cc1..4603c03 100644 --- a/hx-ai-intelligent/src/main.ts +++ b/hx-ai-intelligent/src/main.ts @@ -5,6 +5,8 @@ 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({ @@ -12,4 +14,5 @@ saasInit({ apiModule, appConfig, }); +app.use(ElementPlus) app.mount('#app'); diff --git a/hx-ai-intelligent/src/router/organizationManage.ts b/hx-ai-intelligent/src/router/organizationManage.ts index 23c8f2d..5a911c5 100644 --- a/hx-ai-intelligent/src/router/organizationManage.ts +++ b/hx-ai-intelligent/src/router/organizationManage.ts @@ -62,6 +62,25 @@ const organizationManage = { }, ], }, + { + path: 'lightManage', + name: 'LightManage', + meta: { title: '智能照明', hideChildren: true, icon: 'dicizhishou' }, + component: Base, + redirect: { name: 'lightManageIndex' }, + children: [ + { + path: 'index', + name: 'lightManageIndex', + component: () => import('/@/view/organizationManage/lightingManage/index.vue'), + meta: { + title: '部门/权限', + keepAlive: true, + // backApi: [], + }, + }, + ], + }, ], }; export default organizationManage; diff --git a/hx-ai-intelligent/src/view/organizationManage/lightingManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/lightingManage/index.vue new file mode 100644 index 0000000..a0552bf --- /dev/null +++ b/hx-ai-intelligent/src/view/organizationManage/lightingManage/index.vue @@ -0,0 +1,566 @@ + + + + + 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/package.json b/package.json index a3ffc4f..e5f1eea 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "dayjs": "^1.11.2", "echarts": "^5.3.2", "echarts-gl": "^2.0.9", + "element-plus": "^2.7.4", "element-resize-detector": "^1.2.4", "exceljs": "^4.3.0", "file-saver": "^2.0.5", From e7e2d52dff811dae59fcc90b72ecc2c70b37191c Mon Sep 17 00:00:00 2001 From: lushihan <2813036942@qq.com> Date: Thu, 6 Jun 2024 14:37:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E7=85=A7=E6=98=8E=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/router/equipmentControl.ts | 29 ++ hx-ai-intelligent/src/router/organizationManage.ts | 20 +- .../view/equipmentControl/lightingManage/index.vue | 566 +++++++++++++++++++++ .../organizationManage/lightingManage/index.vue | 566 --------------------- 4 files changed, 596 insertions(+), 585 deletions(-) create mode 100644 hx-ai-intelligent/src/router/equipmentControl.ts create mode 100644 hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue delete mode 100644 hx-ai-intelligent/src/view/organizationManage/lightingManage/index.vue diff --git a/hx-ai-intelligent/src/router/equipmentControl.ts b/hx-ai-intelligent/src/router/equipmentControl.ts new file mode 100644 index 0000000..5aaa6b6 --- /dev/null +++ b/hx-ai-intelligent/src/router/equipmentControl.ts @@ -0,0 +1,29 @@ +const Base = () => import('/nerv-lib/saas/view/system/layout/content.vue'); +const equipmentControl = { + path: '/equipmentControl', + name: 'EquipmentControl', + meta: { title: '设备群控', icon: 'dicizhishou', index: 4 }, + redirect: { name: 'homeIndex' }, + children: [ + { + path: 'lightManage', + name: 'LightManage', + meta: { title: '智能照明', hideChildren: true, icon: 'dicizhishou' }, + component: Base, + redirect: { name: 'lightManageIndex' }, + children: [ + { + path: 'index', + name: 'lightManageIndex', + component: () => import('/@/view/equipmentControl/lightingManage/index.vue'), + meta: { + title: '部门/权限', + keepAlive: true, + // backApi: [], + }, + }, + ], + }, + ], +}; +export default equipmentControl; diff --git a/hx-ai-intelligent/src/router/organizationManage.ts b/hx-ai-intelligent/src/router/organizationManage.ts index 5a911c5..3d118dd 100644 --- a/hx-ai-intelligent/src/router/organizationManage.ts +++ b/hx-ai-intelligent/src/router/organizationManage.ts @@ -62,25 +62,7 @@ const organizationManage = { }, ], }, - { - path: 'lightManage', - name: 'LightManage', - meta: { title: '智能照明', hideChildren: true, icon: 'dicizhishou' }, - component: Base, - redirect: { name: 'lightManageIndex' }, - children: [ - { - path: 'index', - name: 'lightManageIndex', - component: () => import('/@/view/organizationManage/lightingManage/index.vue'), - meta: { - title: '部门/权限', - keepAlive: true, - // backApi: [], - }, - }, - ], - }, + ], }; export default organizationManage; diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue new file mode 100644 index 0000000..a0552bf --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue @@ -0,0 +1,566 @@ + + + + + diff --git a/hx-ai-intelligent/src/view/organizationManage/lightingManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/lightingManage/index.vue deleted file mode 100644 index a0552bf..0000000 --- a/hx-ai-intelligent/src/view/organizationManage/lightingManage/index.vue +++ /dev/null @@ -1,566 +0,0 @@ - - - - - From 0bfbf391e2a50dd229a869190d7bc653003eec6e Mon Sep 17 00:00:00 2001 From: lushihan <2813036942@qq.com> Date: Thu, 6 Jun 2024 16:49:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E7=81=AF=E5=85=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/main.ts | 6 +- hx-ai-intelligent/src/router/equipmentControl.ts | 4 +- .../view/equipmentControl/lightingManage/index.vue | 1 + .../equipmentControl/lightingManage/indexs.vue | 586 +++++++++++++++++++++ 4 files changed, 592 insertions(+), 5 deletions(-) create mode 100644 hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue diff --git a/hx-ai-intelligent/src/main.ts b/hx-ai-intelligent/src/main.ts index 4603c03..5eea1a2 100644 --- a/hx-ai-intelligent/src/main.ts +++ b/hx-ai-intelligent/src/main.ts @@ -5,8 +5,8 @@ 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' +// import ElementPlus from 'element-plus' +// import 'element-plus/dist/index.css' const app = createApp(App); app.component('LeftOutlined', LeftOutlined); saasInit({ @@ -14,5 +14,5 @@ saasInit({ apiModule, appConfig, }); -app.use(ElementPlus) +// app.use(ElementPlus) app.mount('#app'); diff --git a/hx-ai-intelligent/src/router/equipmentControl.ts b/hx-ai-intelligent/src/router/equipmentControl.ts index 5aaa6b6..9bedcc5 100644 --- a/hx-ai-intelligent/src/router/equipmentControl.ts +++ b/hx-ai-intelligent/src/router/equipmentControl.ts @@ -15,9 +15,9 @@ const equipmentControl = { { path: 'index', name: 'lightManageIndex', - component: () => import('/@/view/equipmentControl/lightingManage/index.vue'), + component: () => import('/@/view/equipmentControl/lightingManage/indexs.vue'), meta: { - title: '部门/权限', + title: '智能照明', keepAlive: true, // backApi: [], }, diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue index a0552bf..5698958 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue @@ -3,6 +3,7 @@ open + diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue new file mode 100644 index 0000000..da5f92d --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue @@ -0,0 +1,586 @@ + + + + + \ No newline at end of file