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 {