From 039fbf7e243d4bf0f46b44e7dae2a5d36e978056 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 14:32:53 +0800
Subject: [PATCH] Merge branch 'talk' into main-dev
---
web_src/src/components/console.vue | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/web_src/src/components/console.vue b/web_src/src/components/console.vue
index 352989f..2f5bb55 100644
--- a/web_src/src/components/console.vue
+++ b/web_src/src/components/console.vue
@@ -52,6 +52,7 @@
</div>
</el-col>
</el-row>
+ <configInfo ref="configInfo"></configInfo>
</div>
</template>
@@ -63,6 +64,7 @@
import consoleNodeLoad from './console/ConsoleNodeLoad.vue'
import consoleDisk from './console/ConsoleDisk.vue'
import consoleResource from './console/ConsoleResource.vue'
+import configInfo from './dialog/configInfo.vue'
import echarts from 'echarts';
@@ -77,10 +79,11 @@
consoleNodeLoad,
consoleDisk,
consoleResource,
+ configInfo,
},
data() {
return {
- timer: null
+ timer: null,
};
},
created() {
@@ -98,17 +101,20 @@
window.clearTimeout(this.timer);
}
this.timer = setTimeout(()=>{
- this.getSystemInfo();
- this.getLoad();
- this.timer = null;
- this.loopForSystemInfo()
- this.getResourceInfo()
+ if (this.$route.path === "/console") {
+ this.getSystemInfo();
+ this.getLoad();
+ this.timer = null;
+ this.loopForSystemInfo()
+ this.getResourceInfo()
+ }
+
}, 2000)
},
getSystemInfo: function (){
this.$axios({
method: 'get',
- url: `/api/server/system/info`,
+ url: `./api/server/system/info`,
}).then( (res)=> {
if (res.data.code === 0) {
this.$refs.consoleCPU.setData(res.data.data.cpu)
@@ -122,7 +128,7 @@
getLoad: function (){
this.$axios({
method: 'get',
- url: `/api/server/media_server/load`,
+ url: `./api/server/media_server/load`,
}).then( (res)=> {
if (res.data.code === 0) {
this.$refs.consoleNodeLoad.setData(res.data.data)
@@ -133,7 +139,7 @@
getResourceInfo: function (){
this.$axios({
method: 'get',
- url: `/api/server/resource/info`,
+ url: `./api/server/resource/info`,
}).then( (res)=> {
if (res.data.code === 0) {
this.$refs.consoleResource.setData(res.data.data)
@@ -143,6 +149,18 @@
},
showInfo: function (){
+ this.$axios({
+ method: 'get',
+ url: `./api/server/system/configInfo`,
+ }).then( (res)=> {
+ console.log(res)
+ if (res.data.code === 0) {
+ console.log(2222)
+ console.log(this.$refs.configInfo)
+ this.$refs.configInfo.openDialog(res.data.data)
+ }
+ }).catch( (error)=> {
+ });
}
}
--
Gitblit v1.8.0