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 @@
     }
 </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>
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;
         });
       },
       // 基本信息