From 8bd5a00d87e87e4052f760022d2c0f5d2b3545fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Wed, 30 Oct 2024 18:13:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/public/index.html | 10 ++ ruoyi-ui/src/api/board/index.js | 2 +- ruoyi-ui/src/lang/index.js | 8 +- ruoyi-ui/src/layout/boardIndex.vue | 14 ++ ruoyi-ui/src/layout/components/AppMain.vue | 11 ++ ruoyi-ui/src/store/modules/app.js | 2 +- ruoyi-ui/src/store/modules/user.js | 4 + ruoyi-ui/src/views/board/GPS/index.vue | 37 ++--- ruoyi-ui/src/views/board/equipment/index.vue | 12 +- .../views/board/equipmentMonitoring/index.vue | 4 +- ruoyi-ui/src/views/board/index/index.vue | 141 ++++++++++++++---- .../electronicFence/editElectronicFence.vue | 21 ++- ruoyi-ui/src/views/login.vue | 17 ++- ruoyi-ui/vue.config.js | 3 +- 14 files changed, 220 insertions(+), 66 deletions(-) diff --git a/ruoyi-ui/public/index.html b/ruoyi-ui/public/index.html index 925455c..681de41 100644 --- a/ruoyi-ui/public/index.html +++ b/ruoyi-ui/public/index.html @@ -193,6 +193,15 @@ color: #FFF; opacity: 0.5; } + .reference{ + /*position: fixed;*/ + /*bottom: 0;*/ + /*left: 50%;*/ + /*transform: translateX(-50%);*/ + /*color: #000;*/ + /*font-size: 14px;*/ + /*line-height: 40px;*/ + } @@ -204,5 +213,6 @@
正在加载系统资源，请耐心等待
+ diff --git a/ruoyi-ui/src/api/board/index.js b/ruoyi-ui/src/api/board/index.js index e8ea968..95391d2 100644 --- a/ruoyi-ui/src/api/board/index.js +++ b/ruoyi-ui/src/api/board/index.js @@ -40,7 +40,7 @@ export function getAlarmInfos(query) { export function getDeviceOperations(query) { return request({ // baseURL:'/monitoring-api', - url: '/business/monitorPlatform/getDeviceOperations/0', + url: '/business/monitorPlatform/getDeviceOperations/'+query, method: 'get', }) } diff --git a/ruoyi-ui/src/lang/index.js b/ruoyi-ui/src/lang/index.js index 8e6c7a3..e175a11 100644 --- a/ruoyi-ui/src/lang/index.js +++ b/ruoyi-ui/src/lang/index.js @@ -10,13 +10,13 @@ import zhLocale from './zh_CN' Vue.use(VueI18n) const messages = { - en_US: { - ...enLocale, - ...elementEnLocale - }, zh_CN: { ...zhLocale, ...elementZhLocale + }, + en_US: { + ...enLocale, + ...elementEnLocale } } diff --git a/ruoyi-ui/src/layout/boardIndex.vue b/ruoyi-ui/src/layout/boardIndex.vue index 59174d1..e210603 100644 --- a/ruoyi-ui/src/layout/boardIndex.vue +++ b/ruoyi-ui/src/layout/boardIndex.vue @@ -5,6 +5,7 @@
+
粤ICP备10240187号-3
@@ -20,3 +21,16 @@ export default { }, } + diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue index a25c562..33acda6 100644 --- a/ruoyi-ui/src/layout/components/AppMain.vue +++ b/ruoyi-ui/src/layout/components/AppMain.vue @@ -6,6 +6,7 @@ +
粤ICP备10240187号-3
@@ -27,6 +28,16 @@ export default {