TRKJ/profitManage1.2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

硬盘设备监控列表添加硬盘健康度字段、优化图形监控数据加载未联动更新问题

Browse Source
This commit is contained in:
康冉冉
2026-02-06 17:49:48 +08:00
parent 9aeb26b267
commit c9457a3c7f
5 changed files with 80 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/styles/index.scss
+3 -6
View File
@@ -337,12 +337,9 @@ aside {
.vue-treeselect__multi-value-label {
font-size: 13px;
}
// 日期时间选择器 防止时间选择器靠右侧 导致时间选择被覆盖
.custom-datepicker {
//position: fixed !important;
//top: 50% !important;
left: 53% !important;
//transform: translate(-50%, -50%) !important;
// 图表日期时间选择器 防止时间选择器靠右侧 导致时间选择被覆盖
.custom-datepicker .el-time-panel {
left: -35px!important;
}
// 提示信息--应用于Agent更新、mtr探测策略--提交时
.el-message--warning {
src/components/echartsList/dateTimeSelect.vue
+31 -32
View File
@@ -218,49 +218,48 @@
}
</script>
<style scoped>
::v-deep .el-range-editor .el-range-input {
vertical-align: super!important;
}
::v-deep .el-date-editor .el-range-separator {
vertical-align: super!important;
}
::v-deep .timeIconSty .el-range__close-icon {
margin-top: -38px;
margin-right: -14px;
}
::v-deep .el-range-editor .el-range-input {
vertical-align: super!important;
}
::v-deep .el-date-editor .el-range-separator {
vertical-align: super!important;
}
::v-deep .timeIconSty .el-range__close-icon {
margin-top: -38px;
margin-right: -14px;
}
.ultabs {
width: 500px;
float: right;
position: relative;
z-index: 9;
}
.ultabs ul li {
user-select: none;
cursor: pointer;
list-style: none;
display: inline-block;
width: 70px;
text-align: center;
height: 38px;
line-height: 38px;
user-select: none;
cursor: pointer;
list-style: none;
display: inline-block;
width: 70px;
text-align: center;
height: 38px;
line-height: 38px;
}
/*.ultabs ul li:nth-child样式做了更改*/
.ultabs ul li {
border-radius: 4px;
border: 1px solid #CCCCCC;
margin: 0 5px;
border-radius: 4px;
border: 1px solid #CCCCCC;
margin: 0 5px;
}
.activesbgs {
color: #FFF;
background: #5D78FF;
cursor: pointer;
list-style: none;
display: inline-block;
width: 70px;
text-align: center;
height: 40px !important;
line-height: 40px !important;
border: 1px solid #5D78FF;
color: #FFF;
background: #5D78FF;
cursor: pointer;
list-style: none;
display: inline-block;
width: 70px;
text-align: center;
height: 40px !important;
line-height: 40px !important;
border: 1px solid #5D78FF;
}
</style>
src/views/resource/serverRegister/monitorChart.vue
+23 -12
View File
@@ -505,10 +505,12 @@
this.fnSwitchNetNames(); // 第二模块名称
setTimeout(() => {
this.fnDiskNames(); // 第三模块名称
setTimeout(() => {
this.fnDockerNames(); // 第四模块名称
this.secondChartList = {... this.tabsListData};
this.$modal.closeLoading();
setTimeout(async () => {
// 第四模块名称
if (await this.fnDockerNames()) {
this.secondChartList = {... this.tabsListData};
this.$modal.closeLoading();
}
},500);
},500);
// this.getPointDetailsData(this.currTimeList, Object.keys(tabNameList)[0]);
@@ -517,9 +519,13 @@
setTimeout(() => {
this.fnDiskNames(); // 第三模块名称
setTimeout(() => {
this.fnDockerNames(); // 第四模块名称
this.secondChartList = {... this.tabsListData};
this.$modal.closeLoading();
setTimeout(async () => {
// 第四模块名称
if (await this.fnDockerNames()) {
this.secondChartList = {... this.tabsListData};
this.$modal.closeLoading();
}
},500);
},500);
},500);
}
@@ -527,10 +533,12 @@
this.fnSwitchNetNames();
setTimeout(() => {
this.fnDiskNames(); // 第三模块名称
setTimeout(() => {
this.fnDockerNames(); // 第四模块名称
this.secondChartList = {... this.tabsListData};
this.$modal.closeLoading();
setTimeout(async () => {
// 第四模块名称
if (await this.fnDockerNames()) {
this.secondChartList = {... this.tabsListData};
this.$modal.closeLoading();
}
},500);
},500);
// this.$modal.closeLoading();
@@ -958,7 +966,7 @@
// 第四模块 容器 ---所有名称 dockerAllNames, dockerDetails, cpuUtilEcharts, dockerMemEcharts, dockerSpeedEcharts
fnDockerNames (){
dockerAllNames({clientId: this.paramsData.clientId}).then(res => {
return dockerAllNames({clientId: this.paramsData.clientId}).then(res => {
if (res && res.data.length > 0) {
let tabNameList = {};
res && res.data.forEach(async(item,index) => {
@@ -973,6 +981,9 @@
// this.getDockerDetailsData(this.currTimeList, res.data[0].id);
}
}
return true;
}).catch(() => {
return true;
});
},
// 基本信息
src/views/resource/serverRegister/table.vue
+1 -1
View File
@@ -178,7 +178,7 @@
usedSpace: {label: `已用空间(GB)`, minWidth: '100',visible: true},
readSpeed: {label: `读速率(MB/s)`, minWidth: '90',visible: true},
writeSpeed: {label: `写速率(MB/s)`, minWidth: '90',visible: true},
// health: {label: `硬盘健康度`, minWidth: '90',visible: true},
healthInfo: {label: `硬盘健康度`, minWidth: '90',visible: true},
readIops: {label: `读IOPS`, minWidth: '60',visible: true},
writeIops: {label: `写IOPS`, minWidth: '60',visible: true},
status: {label: `状态`, minWidth: '50', slotName: 'tempDiskStatus', visible: true},
src/views/resource/switchRegister/monitorChart.vue
+22 -13
View File
@@ -316,10 +316,12 @@
this.fnMpuNameList(); // 第三模块名称
setTimeout(() => {
this.fnPwrNameList(); // 第四模块名称
setTimeout(() => {
this.fnFanNameList(); // 第五模块名称
this.secondChartList = {...this.tabsListData};
this.$modal.closeLoading();
setTimeout(async() => {
// 第五模块名称
if (await this.fnFanNameList()) {
this.secondChartList = {...this.tabsListData};
this.$modal.closeLoading();
}
},500);
},500);
},500);
@@ -330,10 +332,12 @@
this.fnMpuNameList(); // 第三模块名称
setTimeout(() => {
this.fnPwrNameList(); // 第四模块名称
setTimeout(() => {
this.fnFanNameList(); // 第五模块名称
this.secondChartList = {...this.tabsListData};
this.$modal.closeLoading();
setTimeout(async() => {
// 第五模块名称
if (await this.fnFanNameList()) {
this.secondChartList = {...this.tabsListData};
this.$modal.closeLoading();
}
},500);
},500);
},500);
@@ -344,10 +348,12 @@
this.fnMpuNameList(); // 第三模块名称
setTimeout(() => {
this.fnPwrNameList(); // 第四模块名称
setTimeout(() => {
this.fnFanNameList(); // 第五模块名称
this.secondChartList = {...this.tabsListData};
this.$modal.closeLoading();
setTimeout(async() => {
// 第五模块名称
if (await this.fnFanNameList()) {
this.secondChartList = {...this.tabsListData};
this.$modal.closeLoading();
}
},500);
},500);
},500);
@@ -801,7 +807,7 @@
// 风扇的所有名称 fanAllName, fanMsg
fnFanNameList(val) {
fanAllName({clientId: this.paramsData.clientId}).then(res => {
return fanAllName({clientId: this.paramsData.clientId}).then(res => {
let tabNameList = {};
if (res && res.data && res.data.length > 0) {
res && res.data.forEach(async(item,index) => {
@@ -816,6 +822,9 @@
// this.getFanDetailsData(this.currTimeList, tabNameList[Object.keys(tabNameList)[0]].title, Object.keys(tabNameList)[0]);
}
}
return true;
}).catch(() => {
return true;
});
},
// 基本信息