From 3d5bdcd0c4fa44c60d584c425e11923c2ad33f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=B7=E5=86=89=E5=86=89?= <kangranran@dingxuantech.cn>
Date: Tue, 27 Jan 2026 18:19:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E8=A1=A8=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E6=BB=9A=E5=8A=A8=E6=9D=A1=E3=80=81=E5=9B=BE=E5=BD=A2?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                 |  2 +-
 src/components/echartsList/line.vue          | 28 ++++++++++++++------
 src/components/table/index.vue               |  2 +-
 src/views/earnManage/busValueCount/index.vue |  6 ++---
 src/views/earnManage/server/index.vue        |  6 ++---
 src/views/earnManage/switch/index.vue        |  6 ++---
 src/views/resource/serverRegister/table.vue  |  3 +++
 7 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 974eeaf..9cf31be 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -153,7 +153,7 @@ aside {
 //main-container全局样式
 .app-container {
   height: calc(100vh - 85px);
-  padding: 8px 20px 20px;
+  padding: 8px 20px 10px;
   overflow: auto;
 }
 .app-viewContent {
diff --git a/src/components/echartsList/line.vue b/src/components/echartsList/line.vue
index 9c6f9ca..ee3cfbe 100644
--- a/src/components/echartsList/line.vue
+++ b/src/components/echartsList/line.vue
@@ -166,9 +166,9 @@
             legend: legendData,
             tooltip: {
               trigger: 'axis',
-              confine: true, // 将tooltip限制在图表的区域内，防止超出屏幕[1,7](@ref)
-              enterable: true, // 关键配置：允许鼠标移入tooltip内部[1,2,7](@ref)
-              extraCssText: 'z-index: 2000;', // 设置一个较高的层级
+              confine: true, // 将tooltip限制在图表的区域内，防止超出屏幕
+              enterable: dataXY.tooltipFormatter ? true : false, // 关键配置：允许鼠标移入tooltip内部
+              extraCssText: dataXY.tooltipFormatter ? 'z-index: 2000;' : 'z-index: 2000;background-color: #ffffffb3;', // 设置一个较高的层级
               axisPointer: {
                 type: 'cross',
                 label: {
@@ -198,11 +198,11 @@
                 const date = params[0].name;
                 // 构建提示框HTML内容
                 let html = `<div><div>${date}</div>`;
-                if (params && params.length >= 7) {
-                  html = `<div style="max-height: 175px; overflow-y: auto;">
-                            <div>${date}</div>
-                          `;
-                }
+                // if (params && params.length >= 7) {
+                //   html = `<div style="max-height: 175px; overflow-y: auto;">
+                //             <div>${date}</div>
+                //           `;
+                // }
                 // 遍历所有系列
                 params.forEach(paramItem => {
                   if (dataXY.tooltipFormatter && dataXY.tooltipFormatter.customList) {
@@ -237,6 +237,18 @@
                             </div>
                             <span style="font-weight: bold; color: #2f3542;margin-left:20px;"> ${paramItem.value || paramItem.value === 0 ? paramItem.value : '-'}</span>
                         </div>`;
+                    // 目前应用与服务器管理挂载文件处
+                    if (dataXY && dataXY.otherModel) {
+                      html += `
+                            <div style="display: flex; justify-content: space-between; align-items: center; margin: 4px 0;">
+                            <div style="display: flex; align-items: center;">
+                                <span style="display: inline-block; width: 10px; height: 10px; border-radius: 50%;margin-right: 8px;"></span>
+                                <span style="color: #57606f;">${dataXY.otherModel.name} </span>
+                            </div>
+                            <span style="font-weight: bold; color: #2f3542;margin-left:20px;"> ${dataXY.otherModel.value[paramItem.dataIndex] || dataXY.otherModel.value[paramItem.dataIndex] === 0 ? dataXY.otherModel.value[paramItem.dataIndex] : '-'}</span>
+                        </div>
+                      `;
+                    }
                   }
                 });
                 return html += `</div>`;
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 0483d3a..2aaa32b 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="w100 h100">
+    <div class="w100">
         <!--  表格头部按钮  -->
         <el-row :gutter="10" style="margin: 0 0 8px 0;">
             <template v-if="config && config.tableButton && config.tableButton.top">
diff --git a/src/views/earnManage/busValueCount/index.vue b/src/views/earnManage/busValueCount/index.vue
index 96c1d41..b02329e 100644
--- a/src/views/earnManage/busValueCount/index.vue
+++ b/src/views/earnManage/busValueCount/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container" style="height: calc(100vh - 85px);">
-    <el-tabs style="height: calc(100% - 35px);" v-model="activeName">
+  <div class="app-container" style="padding-bottom: 5px;">
+    <el-tabs v-model="activeName">
       <el-tab-pane label="1000计算方式" name="1000">
         <busValueCount v-if="activeName === '1000'" :activeName="activeName"></busValueCount>
       </el-tab-pane>
@@ -35,7 +35,7 @@
 
 <style scoped>
   ::v-deep .el-tabs__content{
-    height: 100%;
+    /*height: 100%;*/
     overflow: auto;
     padding-bottom: 10px;
   }
diff --git a/src/views/earnManage/server/index.vue b/src/views/earnManage/server/index.vue
index 960e0a1..9cacb03 100644
--- a/src/views/earnManage/server/index.vue
+++ b/src/views/earnManage/server/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container" style="height: calc(100vh - 85px);">
-    <el-tabs style="height: calc(100% - 35px);" v-model="activeName">
+  <div class="app-container" style="padding-bottom: 5px;">
+    <el-tabs v-model="activeName">
       <el-tab-pane label="1000计算方式" name="1000">
         <ServerTabs v-if="activeName === '1000'" :activeName="activeName"></ServerTabs>
       </el-tab-pane>
@@ -35,7 +35,7 @@
 
 <style scoped>
   ::v-deep .el-tabs__content{
-    height: 100%;
+    /*height: 100%;*/
     overflow: auto;
     padding-bottom: 10px;
   }
diff --git a/src/views/earnManage/switch/index.vue b/src/views/earnManage/switch/index.vue
index f513aa8..2398440 100644
--- a/src/views/earnManage/switch/index.vue
+++ b/src/views/earnManage/switch/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container" style="height: calc(100vh - 85px);">
-    <el-tabs style="height: calc(100% - 35px);" v-model="activeName">
+  <div class="app-container" style="padding-bottom: 5px;">
+    <el-tabs v-model="activeName">
       <el-tab-pane label="1000计算方式" name="1000">
         <SwitchTabs v-if="activeName === '1000'" :activeName="activeName"></SwitchTabs>
       </el-tab-pane>
@@ -35,7 +35,7 @@
 
 <style scoped>
   ::v-deep .el-tabs__content{
-    height: 100%;
+    /*height: 100%;*/
     overflow: auto;
     padding-bottom: 10px;
   }
diff --git a/src/views/resource/serverRegister/table.vue b/src/views/resource/serverRegister/table.vue
index 28e0241..8f3e47b 100644
--- a/src/views/resource/serverRegister/table.vue
+++ b/src/views/resource/serverRegister/table.vue
@@ -209,17 +209,20 @@
             case 'testIoos':
               let params = {id: rowData.id, clientId: this.clientId, name: rowData.name, processType: 1};
               diskIssuanceOperat(params).then(res => {
+                this.$modal.msgSuccess("测试成功！");
                 this.$emit('diskTableData');
               });
               break;
             case 'uninstall':
               let paramsTow = {id: rowData.id, clientId: this.clientId, name: rowData.name, processType: 2};
               diskIssuanceOperat(paramsTow).then(res => {
+                this.$modal.msgSuccess("卸载成功！");
                 this.$emit('diskTableData');
               });
               break;
             case 'delete':
               delDiskName(rowData.id).then(res => {
+                this.$modal.msgSuccess("删除成功！");
                 this.$emit('diskTableData');
               });
               break;