gitee
/
django-vue-admin
mirror of https://gitee.com/liqianglog/django-vue-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

!20 修复bug(服务监控)：主要调整前端样式； 

Merge pull request !20 from xt12321/dvadmin-xt12321
pull/20/MERGE
李强 2021-04-27 08:47:24 +08:00 committed by Gitee
parent 665895f477 8d296b4096
commit b0a586695c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dvadmin-ui/src/views/vadmin/monitor/server/components/InstrumentBoard.vue
View File

@ -77,7 +77,8 @@ export default {
// 使用率 // 使用率
ringRate() { ringRate() {
let ringRate = this.currentInstrumentBoardData.rate let ringRate = this.currentInstrumentBoardData.rate
return ringRate < 1 ? ringRate * 100 : ringRate ringRate = ringRate < 1 ? ringRate * 100 : ringRate
return parseFloat(ringRate.toFixed(4))
}, },
// 仪表盘id // 仪表盘id
ringGraphId() { ringGraphId() {

9
dvadmin-ui/src/views/vadmin/monitor/server/index.vue
View File

@ -74,7 +74,7 @@
<el-option <el-option
v-for="(item,index) in allServerInfo" v-for="(item,index) in allServerInfo"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name || item.ip"
:value="index" :value="index"
> >
</el-option> </el-option>
@ -288,7 +288,7 @@ export default {
this.allServerInfo = response.data this.allServerInfo = response.data
if (this.allServerInfo.length > 0) { if (this.allServerInfo.length > 0) {
this.currentServer = this.allServerInfo[serverIndex || this.currentServerIndex] this.currentServer = this.allServerInfo[serverIndex || this.currentServerIndex]
this.currentServerName = this.currentServer.name this.currentServerName = this.currentServer.name || this.currentServer.ip
} }
this.loading.close() this.loading.close()
}) })
@ -368,7 +368,7 @@ export default {
chooseServerInfo(index) { chooseServerInfo(index) {
this.currentServerIndex = index this.currentServerIndex = index
this.currentServer = this.allServerInfo[index] this.currentServer = this.allServerInfo[index]
this.currentServerName = this.currentServer.name this.currentServerName = this.currentServer.name || this.currentServer.ip
}, },
// 更改更新频率（周期）数值 // 更改更新频率（周期）数值
handleIntervalChange: debounce(function(value) { handleIntervalChange: debounce(function(value) {
@ -421,9 +421,10 @@ export default {
} }
.information-instrument-panel { .information-instrument-panel {
width: 20%;
display: inline-block; display: inline-block;
min-height: 300px; min-height: 300px;
min-width: 400px; min-width: 300px;
margin: 0 10px; margin: 0 10px;
} }