From c9457a3c7faa0bb58ce42e343a29815f79eb2920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E5=86=89=E5=86=89?= Date: Fri, 6 Feb 2026 17:49:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AC=E7=9B=98=E8=AE=BE=E5=A4=87=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=A1=AC=E7=9B=98?= =?UTF-8?q?=E5=81=A5=E5=BA=B7=E5=BA=A6=E5=AD=97=E6=AE=B5=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=9B=BE=E5=BD=A2=E7=9B=91=E6=8E=A7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=9C=AA=E8=81=94=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 9 +-- src/components/echartsList/dateTimeSelect.vue | 63 +++++++++---------- .../resource/serverRegister/monitorChart.vue | 35 +++++++---- src/views/resource/serverRegister/table.vue | 2 +- .../resource/switchRegister/monitorChart.vue | 35 +++++++---- 5 files changed, 80 insertions(+), 64 deletions(-) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 9cf31be..2359b1c 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -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 { diff --git a/src/components/echartsList/dateTimeSelect.vue b/src/components/echartsList/dateTimeSelect.vue index 94beeac..ec9f493 100644 --- a/src/components/echartsList/dateTimeSelect.vue +++ b/src/components/echartsList/dateTimeSelect.vue @@ -218,49 +218,48 @@ } diff --git a/src/views/resource/serverRegister/monitorChart.vue b/src/views/resource/serverRegister/monitorChart.vue index 365b4a2..9982f0a 100644 --- a/src/views/resource/serverRegister/monitorChart.vue +++ b/src/views/resource/serverRegister/monitorChart.vue @@ -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; }); }, // 基本信息 diff --git a/src/views/resource/serverRegister/table.vue b/src/views/resource/serverRegister/table.vue index 0740094..0521fc0 100644 --- a/src/views/resource/serverRegister/table.vue +++ b/src/views/resource/serverRegister/table.vue @@ -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}, diff --git a/src/views/resource/switchRegister/monitorChart.vue b/src/views/resource/switchRegister/monitorChart.vue index 75bfc40..9735b83 100644 --- a/src/views/resource/switchRegister/monitorChart.vue +++ b/src/views/resource/switchRegister/monitorChart.vue @@ -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; }); }, // 基本信息