From 8f245c0395c4e4c41f655c69a1cff0d676263514 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, 3 Mar 2026 17:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E6=97=A595=E5=88=A9=E7=94=A8?=
 =?UTF-8?q?=E7=8E=87=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、服务器管理列表中日95利用率字段添加排序功能
2、优化列表中列的数据太长导致的文本提示框信息超出屏幕问题
---
 src/components/table/index.vue              | 70 ++++++++++-----------
 src/views/resource/serverRegister/index.vue |  4 +-
 vue.config.js                               |  3 +-
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 9ff757d..a893118 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -26,38 +26,38 @@
               </template>
             </el-table-column>
             <template v-for="(column, key, index) of columns">
-                <!--      customTooltip:true 走  自定义tooltip 展示    -->
-                <template v-if="column.customTooltip">
-                  <el-table-column v-if="column && column.visible" :label="column.label" :key="key" :prop="key" :sortable="column.sortable" :width="column.width" :min-width="column.minWidth || '100px'" align="left">
-                    <template #header="{ column }" v-if="column.sortable">
-                      <div style="display: flex; align-items: center;">
-                        <span>{{ column.label }}</span>
-                        <template v-if="column.order === 'ascending'">
-                          <i class="el-icon-sort-down" style="margin-left: -2px;margin-top: 2px;font-weight: 700;color: #c0c4cc;"></i>
-                          <i class="el-icon-sort-up" style="color: #409EFF; margin-left: -8px;margin-top: 2px;font-weight: 700;"></i>
-                        </template>
-                        <template v-else-if="column.order === 'descending'">
-                          <i class="el-icon-sort-down" style="color: #409EFF;margin-left: -2px;margin-top: 2px;font-weight: 700;"></i>
-                          <i class="el-icon-sort-up" style="margin-left: -8px;margin-top: 2px;font-weight: 700;color: #c0c4cc;"></i>
-                        </template>
-                        <i v-else class="el-icon-sort" style="color: #C0C4CC;margin-top: 2px;font-weight: 700;"></i>
-                      </div>
-                    </template>
+              <!--      customTooltip:true 走  自定义tooltip 展示    -->
+              <template v-if="column.customTooltip">
+                <el-table-column v-if="column && column.visible" :label="column.label" :key="key" :prop="key" :sortable="column.sortable" :width="column.width" :min-width="column.minWidth || '100px'" align="left">
+                  <template #header="{ column }" v-if="column.sortable">
+                    <div style="display: flex; align-items: center;">
+                      <span>{{ column.label }}</span>
+                      <template v-if="column.order === 'ascending'">
+                        <i class="el-icon-sort-down" style="margin-left: -2px;margin-top: 2px;font-weight: 700;color: #c0c4cc;"></i>
+                        <i class="el-icon-sort-up" style="color: #409EFF; margin-left: -8px;margin-top: 2px;font-weight: 700;"></i>
+                      </template>
+                      <template v-else-if="column.order === 'descending'">
+                        <i class="el-icon-sort-down" style="color: #409EFF;margin-left: -2px;margin-top: 2px;font-weight: 700;"></i>
+                        <i class="el-icon-sort-up" style="margin-left: -8px;margin-top: 2px;font-weight: 700;color: #c0c4cc;"></i>
+                      </template>
+                      <i v-else class="el-icon-sort" style="color: #C0C4CC;margin-top: 2px;font-weight: 700;"></i>
+                    </div>
+                  </template>
 
-                    <template #default="scope">
-                      <el-tooltip
-                        :disabled="!isCellOverflow(scope.row[key], `cell-${key}-${scope.row.id}`)"
-                        placement="top"
-                        effect="dark"
-                        popper-class="my-custom-tooltip">
-                        <div slot="content" v-html="formatCellContent(scope.row[key])"></div>
-                        <div :ref="`cell-${key}-${scope.row.id}`" class="cell-content">
-                          {{ scope.row[key] }}
-                        </div>
-                      </el-tooltip>
-                    </template>
-                  </el-table-column>
-                </template>
+                  <template #default="scope">
+                    <el-tooltip
+                      :disabled="!isCellOverflow(scope.row[key], `cell-${key}-${scope.row.id}`)"
+                      placement="top"
+                      effect="dark"
+                      popper-class="my-custom-tooltip">
+                      <div slot="content" v-html="formatCellContent(scope.row[key])"></div>
+                      <div :ref="`cell-${key}-${scope.row.id}`" class="cell-content">
+                        {{ scope.row[key] }}
+                      </div>
+                    </el-tooltip>
+                  </template>
+                </el-table-column>
+              </template>
               <!--        原tooltip展示逻辑     -->
               <template v-else>
                 <el-table-column v-if="column && column.visible" :label="column.label" :key="key" :prop="key" :sortable="column.sortable" :width="column.width" :min-width="column.minWidth || '100px'" align="left" :show-overflow-tooltip="true">
@@ -497,9 +497,9 @@
         handleSortChange({column, prop, order}) {
           let sortType = 3;
           if (order === 'ascending') {
-            sortType = 1;
+            sortType = this.columns[prop]['ascending'];
           } else if (order === 'descending') {
-            sortType = 2;
+            sortType = this.columns[prop]['descending'];
           }
           this.$emit("fnClick", {fnCode: 'sortTable'}, {sortType: sortType});
         },
@@ -564,11 +564,11 @@
   }
 </style>
 <style>
-  .my-custom-tooltip {
+  .my-custom-tooltip > div {
     box-sizing: border-box !important;
     max-height: 300px !important; /* 设置最大高度 */
     overflow-y: auto !important; /* 内容超出时显示垂直滚动条 */
     line-height: 1.5 !important; /* 设置行高，提升可读性 */
-    padding: 8px 12px !important; /* 设置内边距 */
+    /*padding: 8px 12px !important; !* 设置内边距 *!*/
   }
 </style>
diff --git a/src/views/resource/serverRegister/index.vue b/src/views/resource/serverRegister/index.vue
index 28d0aad..d90c415 100644
--- a/src/views/resource/serverRegister/index.vue
+++ b/src/views/resource/serverRegister/index.vue
@@ -246,8 +246,8 @@
             ip1Province: { label: `省1`, minWidth: '50',visible: true,  disabled: true},
             ip1PublicIp:{ label: `IP1`,minWidth: '100',visible: true, disabled: true},
             businessName: { label: `业务名称`, minWidth: '90', visible: true, disabled: true},
-            bandwidthResult: { label: `昨日95值`, minWidth: '75', visible: true, disabled: true, sortable: 'custom'},
-            bandwidthRate: { label: `日95利用率`, minWidth: '75', visible: true, disabled: true},
+            bandwidthResult: { label: `昨日95值`, minWidth: '75', visible: true, disabled: true, sortable: 'custom', ascending: 1, descending: 2},
+            bandwidthRate: { label: `日95利用率`, minWidth: '90', visible: true, disabled: true, sortable: 'custom', ascending: 5, descending: 6},
             reportedBandwidth: { label: `上报带宽值`, minWidth: '70', slotName: 'tempHandle', visible: true, disabled: true},
             outboundRate: { label: `出省流量占比`, minWidth: '90', slotName: 'tempOutbound', visible: true, disabled: true},
             onlineStatus: { label: `在线状态`, slotName: 'tempOnlineStatus', minWidth: '60', visible: true, disabled: true},
diff --git a/vue.config.js b/vue.config.js
index 98b7f60..90e5784 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -33,7 +33,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy  http://192.168.9.141:8080
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.9.141:8080`,
+        // target: `http://192.168.9.138:8080`,
+        target: `http://172.16.15.51:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''