diff --git a/hx-ai-intelligent/src/main.ts b/hx-ai-intelligent/src/main.ts index 40f0cc1..5eea1a2 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/equipmentControl.ts b/hx-ai-intelligent/src/router/equipmentControl.ts new file mode 100644 index 0000000..9bedcc5 --- /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/indexs.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 9c28777..363e6e0 100644 --- a/hx-ai-intelligent/src/router/organizationManage.ts +++ b/hx-ai-intelligent/src/router/organizationManage.ts @@ -97,6 +97,7 @@ const organizationManage = { }, ], }, + ], }; 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..5698958 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.vue @@ -0,0 +1,567 @@ + + + + + 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 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",