diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index a970c9d..220da83 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -36,6 +36,7 @@ "url": "https://gitee.com/y_project/RuoYi-Cloud.git" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@riophae/vue-treeselect": "0.4.0", "Vue-i18n": "npm:vue-i18n@^8.26.7", "axios": "0.24.0", diff --git a/ruoyi-ui/src/assets/board/GPS/bg.jpg b/ruoyi-ui/src/assets/board/GPS/bg.jpg new file mode 100644 index 0000000..9e7ab74 Binary files /dev/null and b/ruoyi-ui/src/assets/board/GPS/bg.jpg differ diff --git a/ruoyi-ui/src/assets/board/GPS/green.png b/ruoyi-ui/src/assets/board/GPS/green.png new file mode 100644 index 0000000..bb67576 Binary files /dev/null and b/ruoyi-ui/src/assets/board/GPS/green.png differ diff --git a/ruoyi-ui/src/assets/board/GPS/red.png b/ruoyi-ui/src/assets/board/GPS/red.png new file mode 100644 index 0000000..c89cb5a Binary files /dev/null and b/ruoyi-ui/src/assets/board/GPS/red.png differ diff --git a/ruoyi-ui/src/assets/board/standard/bg.jpg b/ruoyi-ui/src/assets/board/smartScene/bg.jpg similarity index 100% rename from ruoyi-ui/src/assets/board/standard/bg.jpg rename to ruoyi-ui/src/assets/board/smartScene/bg.jpg diff --git a/ruoyi-ui/src/assets/board/standard/device.png b/ruoyi-ui/src/assets/board/smartScene/device.png similarity index 100% rename from ruoyi-ui/src/assets/board/standard/device.png rename to ruoyi-ui/src/assets/board/smartScene/device.png diff --git a/ruoyi-ui/src/components/BoardTopNav/index.vue b/ruoyi-ui/src/components/BoardTopNav/index.vue new file mode 100644 index 0000000..963e374 --- /dev/null +++ b/ruoyi-ui/src/components/BoardTopNav/index.vue @@ -0,0 +1,80 @@ + + + + + + 监控主页 + + + + + + 智慧场景 + + + 黄金糕 + 狮子头 + 螺蛳粉 + 双皮奶 + 蚵仔煎 + + + + + + 设备监测 + + + + + 传感器汇总 + + + + + + + + diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index a72209a..fea469d 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -1,6 +1,6 @@ import Vue from 'vue' import less from 'less' - +import AMapLoader from "@amap/amap-jsapi-loader"; import Cookies from 'js-cookie' @@ -63,6 +63,14 @@ Vue.component('FileUpload', FileUpload) Vue.component('ImageUpload', ImageUpload) Vue.component('ImagePreview', ImagePreview) + +AMapLoader.load({ + 'key': '268909dc36fd438908a64ebe057bfb17', + 'version': '2.0', + 'plugins': ['AMap.Scale','AMap.GeoJSON'] +}).then((AMap) => { + Vue.use(AMap) +}) Vue.use(directive) Vue.use(plugins) Vue.use(VueMeta) diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 06fbac0..248170e 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -89,36 +89,36 @@ export const constantRoutes = [ ] }, - // { - // path: '/board1', - // component: () => import('@/views/board/index'), - // name: 'Index', - // meta: { title: '1', icon: 'dashboard', affix: true } - // }, - // { - // path: '/board2', - // component: () => import('@/views/board/equipmentMonitoring'), - // name: 'Index', - // meta: { title: '2', icon: 'dashboard', affix: true } - // }, - // { - // path: '/board3', - // component: () => import('@/views/board/GPS'), - // name: 'Index', - // meta: { title: '3', icon: 'dashboard', affix: true } - // }, - // { - // path: '/board4', - // component: () => import('@/views/board/senso'), - // name: 'Index', - // meta: { title: '4', icon: 'dashboard', affix: true } - // }, - // { - // path: '/board5', - // component: () => import('@/views/board/smartScene'), - // name: 'Index', - // meta: { title: '5', icon: 'dashboard', affix: true } - // }, + { + path: '/board1', + component: () => import('@/views/board/index'), + name: 'Index', + meta: { title: '1', icon: 'dashboard', affix: true } + }, + { + path: '/board2', + component: () => import('@/views/board/equipmentMonitoring'), + name: 'Index', + meta: { title: '2', icon: 'dashboard', affix: true } + }, + { + path: '/board3', + component: () => import('@/views/board/GPS'), + name: 'Index', + meta: { title: '3', icon: 'dashboard', affix: true } + }, + { + path: '/board4', + component: () => import('@/views/board/senso'), + name: 'Index', + meta: { title: '4', icon: 'dashboard', affix: true } + }, + { + path: '/board5', + component: () => import('@/views/board/smartScene'), + name: 'Index', + meta: { title: '5', icon: 'dashboard', affix: true } + }, ] // 动态路由,基于用户权限动态去加载 diff --git a/ruoyi-ui/src/views/board/GPS/index.vue b/ruoyi-ui/src/views/board/GPS/index.vue index e69de29..2d622c6 100644 --- a/ruoyi-ui/src/views/board/GPS/index.vue +++ b/ruoyi-ui/src/views/board/GPS/index.vue @@ -0,0 +1,385 @@ + + + + + + + + + 告警编号 + + + 告警类型 + + + 告警位置 + + + 操作 + + + + + + + {{ item.value1 }} + + + {{ item.value2 }} + + + {{ item.value3 }} + + + 处理 + + + + + + + 监控单元报警统计 + 告警信息 + 监控单元数量 + 设备数量 + 在线设备数量 + 20 + 20 + 20 + + + + + + + diff --git a/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue b/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue index e69de29..127c182 100644 --- a/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue +++ b/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/ruoyi-ui/src/views/board/index/index.vue b/ruoyi-ui/src/views/board/index/index.vue index cf2ca17..e986fc9 100644 --- a/ruoyi-ui/src/views/board/index/index.vue +++ b/ruoyi-ui/src/views/board/index/index.vue @@ -1,37 +1,7 @@ - - - - 监控主页 - - - - - - 智慧场景 - - - 黄金糕 - 狮子头 - 螺蛳粉 - 双皮奶 - 蚵仔煎 - - - - - - 设备监测 - - - - - 传感器汇总 - - - + 电流互感器 @@ -167,12 +137,14 @@
电流互感器