diff --git a/.env.production b/.env.production index b46735d..0fcf7f0 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,4 @@ VITE_APP_ENV = 'production' VITE_APP_TITLE = 'vue-vite-project-admin' VITE_APP_PORT = 8089 -VITE_APP_BASE_API = 'http://localhost:8012/' +VITE_APP_BASE_API = 'http://board.heatiot.cn:8001/prod-api/' diff --git a/src/api/device/index.ts b/src/api/device/index.ts index b87a86f..370673d 100644 --- a/src/api/device/index.ts +++ b/src/api/device/index.ts @@ -2,6 +2,16 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; import { deviceVo } from './types'; +/** + * 获取左侧菜单 + */ +export function getMenuData(): AxiosPromise<[]> { + return request({ + url: '/bi/configuration/getMenuData', + method: 'get' + }); +} + /** * 获取用户部门 */ diff --git a/src/api/device/types.ts b/src/api/device/types.ts index 8acc06b..7208fe2 100644 --- a/src/api/device/types.ts +++ b/src/api/device/types.ts @@ -25,10 +25,18 @@ export interface menuVo { * 设备列表 */ export interface deviceVo { - deviceUUID: string; - deviceName: string; - partionCounts: number; - orgCode: number; - sourceType: string; - ifControl: number; + name: string; + label: string; + header_main?: headerVo[]; + header_valve?: headerVo[]; + header_pump?: headerVo[]; +} +export interface headerVo { + id: string; + name: string; + label: string; + value: string; + type: string; + ctrlFlag: string; + paramUnit: string; } diff --git a/src/assets/icons/baoxue-rijian.svg b/src/assets/icons/baoxue-rijian.svg index 18d3305..29bab77 100644 --- a/src/assets/icons/baoxue-rijian.svg +++ b/src/assets/icons/baoxue-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/baoyu-rijian.svg b/src/assets/icons/baoyu-rijian.svg index aa857d8..4702c77 100644 --- a/src/assets/icons/baoyu-rijian.svg +++ b/src/assets/icons/baoyu-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/dabaoyu-rijian.svg b/src/assets/icons/dabaoyu-rijian.svg index 1583f1d..1279ec6 100644 --- a/src/assets/icons/dabaoyu-rijian.svg +++ b/src/assets/icons/dabaoyu-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/daxue-rijian.svg b/src/assets/icons/daxue-rijian.svg index 48ce53b..5e1e75a 100644 --- a/src/assets/icons/daxue-rijian.svg +++ b/src/assets/icons/daxue-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/dayu-rijian.svg b/src/assets/icons/dayu-rijian.svg index ea17eb8..03fa565 100644 --- a/src/assets/icons/dayu-rijian.svg +++ b/src/assets/icons/dayu-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/dongyu-rijian.svg b/src/assets/icons/dongyu-rijian.svg index 8df5aef..e09cafa 100644 --- a/src/assets/icons/dongyu-rijian.svg +++ b/src/assets/icons/dongyu-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/duoyun-rijian.svg b/src/assets/icons/duoyun-rijian.svg index f1230f5..3c829b4 100644 --- a/src/assets/icons/duoyun-rijian.svg +++ b/src/assets/icons/duoyun-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/duoyun-wanjian.svg b/src/assets/icons/duoyun-wanjian.svg index 2398ee1..91b6584 100644 --- a/src/assets/icons/duoyun-wanjian.svg +++ b/src/assets/icons/duoyun-wanjian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/fuchen-rijian.svg b/src/assets/icons/fuchen-rijian.svg index 4fb8ebd..0479673 100644 --- a/src/assets/icons/fuchen-rijian.svg +++ b/src/assets/icons/fuchen-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/leizhenyu-rijian.svg b/src/assets/icons/leizhenyu-rijian.svg index 506ec44..d962ed9 100644 --- a/src/assets/icons/leizhenyu-rijian.svg +++ b/src/assets/icons/leizhenyu-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/leizhenyujiabingbao.svg b/src/assets/icons/leizhenyujiabingbao.svg index e297e1b..08a80c4 100644 --- a/src/assets/icons/leizhenyujiabingbao.svg +++ b/src/assets/icons/leizhenyujiabingbao.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/qiangshachenbao.svg b/src/assets/icons/qiangshachenbao.svg index fdc8332..b8f60f3 100644 --- a/src/assets/icons/qiangshachenbao.svg +++ b/src/assets/icons/qiangshachenbao.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/qing-rijian.svg b/src/assets/icons/qing-rijian.svg index 6d36ec0..4bb1a1a 100644 --- a/src/assets/icons/qing-rijian.svg +++ b/src/assets/icons/qing-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/qing-wanjian.svg b/src/assets/icons/qing-wanjian.svg index 33a33bc..06432bc 100644 --- a/src/assets/icons/qing-wanjian.svg +++ b/src/assets/icons/qing-wanjian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/shachenbao-rijian.svg b/src/assets/icons/shachenbao-rijian.svg index 2040b17..497f129 100644 --- a/src/assets/icons/shachenbao-rijian.svg +++ b/src/assets/icons/shachenbao-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/tedabaoyu.svg b/src/assets/icons/tedabaoyu.svg index f25a549..a6d57be 100644 --- a/src/assets/icons/tedabaoyu.svg +++ b/src/assets/icons/tedabaoyu.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/wu-rijian.svg b/src/assets/icons/wu-rijian.svg index 6374246..1a05285 100644 --- a/src/assets/icons/wu-rijian.svg +++ b/src/assets/icons/wu-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/xiaoxue-rijian.svg b/src/assets/icons/xiaoxue-rijian.svg index 892de45..88ac796 100644 --- a/src/assets/icons/xiaoxue-rijian.svg +++ b/src/assets/icons/xiaoxue-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/xiaoyu-rijian.svg b/src/assets/icons/xiaoyu-rijian.svg index 3f7a614..32a3035 100644 --- a/src/assets/icons/xiaoyu-rijian.svg +++ b/src/assets/icons/xiaoyu-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/yangsha-rijian.svg b/src/assets/icons/yangsha-rijian.svg index 330feb9..a7dfa3f 100644 --- a/src/assets/icons/yangsha-rijian.svg +++ b/src/assets/icons/yangsha-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/yin-rijian.svg b/src/assets/icons/yin-rijian.svg index bce6db2..88eb148 100644 --- a/src/assets/icons/yin-rijian.svg +++ b/src/assets/icons/yin-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/yujiaxue-rijian.svg b/src/assets/icons/yujiaxue-rijian.svg index 7760851..7c7205a 100644 --- a/src/assets/icons/yujiaxue-rijian.svg +++ b/src/assets/icons/yujiaxue-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/zhenxue-rijian.svg b/src/assets/icons/zhenxue-rijian.svg index be836e6..b445b29 100644 --- a/src/assets/icons/zhenxue-rijian.svg +++ b/src/assets/icons/zhenxue-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/zhenxue-wanjian.svg b/src/assets/icons/zhenxue-wanjian.svg index cbeba5a..879a2b2 100644 --- a/src/assets/icons/zhenxue-wanjian.svg +++ b/src/assets/icons/zhenxue-wanjian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/zhenyu-rijian.svg b/src/assets/icons/zhenyu-rijian.svg index 14750eb..3d2eceb 100644 --- a/src/assets/icons/zhenyu-rijian.svg +++ b/src/assets/icons/zhenyu-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/zhenyu-wanjian.svg b/src/assets/icons/zhenyu-wanjian.svg index 961a0f8..6249ff3 100644 --- a/src/assets/icons/zhenyu-wanjian.svg +++ b/src/assets/icons/zhenyu-wanjian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/zhongxue-rijian.svg b/src/assets/icons/zhongxue-rijian.svg index 31b405b..eb391ce 100644 --- a/src/assets/icons/zhongxue-rijian.svg +++ b/src/assets/icons/zhongxue-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/zhongyu-rijian.svg b/src/assets/icons/zhongyu-rijian.svg index 5bf1c12..8cb1609 100644 --- a/src/assets/icons/zhongyu-rijian.svg +++ b/src/assets/icons/zhongyu-rijian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/images/20230908-091531.png b/src/assets/images/20230908-091531.png new file mode 100644 index 0000000..73560b3 Binary files /dev/null and b/src/assets/images/20230908-091531.png differ diff --git a/src/assets/images/col_icon.png b/src/assets/images/col_icon.png new file mode 100644 index 0000000..78ee7a1 Binary files /dev/null and b/src/assets/images/col_icon.png differ diff --git a/src/assets/images/info_bg.png b/src/assets/images/info_bg.png new file mode 100644 index 0000000..8a27ead Binary files /dev/null and b/src/assets/images/info_bg.png differ diff --git a/src/assets/images/panelBtn_bg.png b/src/assets/images/panelBtn_bg.png new file mode 100644 index 0000000..13ebed1 Binary files /dev/null and b/src/assets/images/panelBtn_bg.png differ diff --git a/src/assets/images/panel_icon.png b/src/assets/images/panel_icon.png new file mode 100644 index 0000000..96c6750 Binary files /dev/null and b/src/assets/images/panel_icon.png differ diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 3d7b207..82663b7 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -32,9 +32,16 @@ declare module '@vue/runtime-core' { Hamburger: typeof import('./../components/Hamburger/index.vue')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default'] + NAvatar: typeof import('naive-ui')['NAvatar'] + NBadge: typeof import('naive-ui')['NBadge'] NButton: typeof import('naive-ui')['NButton'] + NCollapse: typeof import('naive-ui')['NCollapse'] + NCollapseItem: typeof import('naive-ui')['NCollapseItem'] + NDrawer: typeof import('naive-ui')['NDrawer'] + NDrawerContent: typeof import('naive-ui')['NDrawerContent'] NIcon: typeof import('naive-ui')['NIcon'] NMenu: typeof import('naive-ui')['NMenu'] + NScrollbar: typeof import('naive-ui')['NScrollbar'] NSpin: typeof import('naive-ui')['NSpin'] NTooltip: typeof import('naive-ui')['NTooltip'] Pagination: typeof import('./../components/Pagination/index.vue')['default'] diff --git a/src/views/monitoring/components/header.vue b/src/views/monitoring/components/header.vue index add1a8d..e8e7cb5 100644 --- a/src/views/monitoring/components/header.vue +++ b/src/views/monitoring/components/header.vue @@ -38,17 +38,41 @@ 返回首页 + + + 报警 + + + + + 啊呀呀呀呀 + + + diff --git a/src/views/monitoring/devicemanage/components/main.vue b/src/views/monitoring/devicemanage/components/main.vue index b07f8a1..fbd97ec 100644 --- a/src/views/monitoring/devicemanage/components/main.vue +++ b/src/views/monitoring/devicemanage/components/main.vue @@ -147,68 +147,53 @@
--> -
-
+
+
+ + 阀门控制 +
+
+ + + + +
+ {{ res.label }}: {{ res.value }}{{ + res.paramUnit }} +
+
+
+
+ + + + +
+ {{ res.label }}: {{ res.value }}{{ + res.paramUnit }} +
+
+
+
+
+
{{ item.label }}
{{ res.label }}:{{ res.value }} {{ res.paramUnit }} - -
-
@@ -221,8 +206,9 @@ {{ res.paramUnit }}
- + --> +
暂无设备信息!