From 43c8a84aba2e03f2a7d54d4e1e260b231e52ef9a 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, 13 Jan 2026 18:52:57 +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=E5=88=97=E9=97=B4=E8=B7=9D=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E3=80=81PPPo=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/index.vue                |  27 +++--
 .../resource/serverRegister/PPPoEConfig.vue   |  14 ++-
 src/views/resource/serverRegister/index.vue   | 109 +++++++++---------
 3 files changed, 87 insertions(+), 63 deletions(-)

diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 66f368a..e2041e6 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -33,14 +33,14 @@
                       <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-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-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-left: 4px;margin-top: 2px;font-weight: 700;"></i>
+                        <i v-else class="el-icon-sort" style="color: #C0C4CC;margin-left: 0;margin-top: 2px;font-weight: 700;"></i>
                       </div>
                     </template>
 
@@ -74,14 +74,14 @@
                     <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-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-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-left: 4px;margin-top: 2px;font-weight: 700;"></i>
+                      <i v-else class="el-icon-sort" style="color: #C0C4CC;margin-top: 2px;font-weight: 700;"></i>
                     </div>
                   </template>
                   <!--  插槽 自定义列表内数据格式  -->
@@ -255,7 +255,7 @@
 
             // 加上按钮间距（假设每个按钮左右有5px间距）
             if (visibleButtonCount > 0) {
-              currentLineWidth += (visibleButtonCount - 1) * 10;
+              currentLineWidth += (visibleButtonCount - 1) * 5;
             }
             // 更新最大宽度
             if (currentLineWidth > maxTotalWidth) {
@@ -266,7 +266,7 @@
             maxTotalWidth = 20;
           }
           // 加上单元格内边距
-          return Math.max(maxTotalWidth + 40); // 最小宽度120px
+          return Math.max(maxTotalWidth + 30); // 最小宽度120px
         },
 
         // 计算单个按钮宽度（根据字符数）
@@ -542,9 +542,20 @@
     background-color: #ffb98c!important;
   }
   ::v-deep .el-table-column--selection .cell {
+    padding-left: 2px!important;
+    padding-right: 2px!important;
+  }
+  ::v-deep .el-table th.el-table__cell > .cell {
+    padding-left: 2px!important;
+    padding-right: 2px!important;
+  }
+  ::v-deep .el-table .cell {
     padding-left: 0px!important;
     padding-right: 0px!important;
   }
+  ::v-deep .el-button + .el-button {
+    margin-left: 5px!important;
+  }
 </style>
 <style>
   .my-custom-tooltip {
diff --git a/src/views/resource/serverRegister/PPPoEConfig.vue b/src/views/resource/serverRegister/PPPoEConfig.vue
index 1f54365..695fbc8 100644
--- a/src/views/resource/serverRegister/PPPoEConfig.vue
+++ b/src/views/resource/serverRegister/PPPoEConfig.vue
@@ -121,6 +121,7 @@
           outSpeed: { label: `上传速度(Mbps)`, minWidth: '120', visible: readonly},
           totalInSpeed: { label: `已接收流量(GB)`, minWidth: '120', visible: readonly},
           totalOutSpeed: { label: `已发送流量(GB)`, minWidth: '120', visible: readonly},
+          netRunTime: { label: `拨号时长`, minWidth: '80', visible: readonly},
           status: { label: `连通状态`, minWidth: '80', slotName: 'tempStatus', visible: readonly},
         };
         if (!readonly && this.ruleForm.pppoeConfigMode === '1') {
@@ -193,6 +194,9 @@
           } else {
             this.ruleForm = Object.assign({}, this.ruleForm, {typeName: 111});
             this.roleList = this.roleList.length > 0 ? this.roleList : [{targetIndexNum: 1, serialNumber: 1, vlanId: undefined, ipv4Address: undefined, ipv4MaskBits: undefined, ipv4Gateway: undefined, bandwidthResult: undefined}];
+            if (this.ruleForm && this.ruleForm.pppoeConfigMode == '2') {
+              this.roleList = this.roleList.length > 0 ? this.roleList : [];
+            }
             this.readonly = !this.readonly;
             this.fnFormList(this.readonly);
           }
@@ -278,6 +282,14 @@
             case 'pppoeConfigMode':
               if (dataVal === '1') {
                 this.formList[0].controls.pppoeInterface['hidden'] = false;
+                let newModel = JSON.parse(JSON.stringify(this.modelVal));
+                newModel[0].subList.map((item,index) => {
+                  item['targetIndexNum'] = index + 1;
+                  if (index !== 0) {
+                    item['showNum'] = '1';
+                  }
+                });
+                this.roleList = newModel[0].subList.length > 0 ? newModel[0].subList : [{targetIndexNum: 1, serialNumber: 1, vlanId: undefined, ipv4Address: undefined, ipv4MaskBits: undefined, ipv4Gateway: undefined, bandwidthResult: undefined}];
                 this.config = {
                   colHiddenCheck: true, colTopHiddenIcon: true,
                     tableButton: {
@@ -288,7 +300,7 @@
                   }
                 };
               } else if (dataVal === '2') {
-                if (this.modelVal[0].pppoeConfigMode.toString() === '2') {
+                if (this.modelVal[0].pppoeConfigMode && this.modelVal[0].pppoeConfigMode.toString() === '2') {
                   let newModel = JSON.parse(JSON.stringify(this.modelVal));
                   newModel[0].subList.map((item,index) => {
                     item['targetIndexNum'] = index + 1;
diff --git a/src/views/resource/serverRegister/index.vue b/src/views/resource/serverRegister/index.vue
index a24f5d5..e50e20c 100644
--- a/src/views/resource/serverRegister/index.vue
+++ b/src/views/resource/serverRegister/index.vue
@@ -91,7 +91,8 @@
         <!-- 表格数据 -->
       <TableList ref="tabRef" :columns="columns" :config="config" :modelIdent="this.$options.name" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getHightLight" @value-change="handleValueChange">
         <template #tempCopy="{ row, column}">
-          {{row.clientId}}<el-link :underline="false" icon="el-icon-document-copy" title="复制" v-clipboard:copy="row.clientId" v-clipboard:success="clipboardSuccess" style="margin-left: 10px;color: #409EFF;"></el-link>
+          <span class="disInlineBlock" :style="`max-width: calc(100% - 19px);overflow: hidden;white-space: nowrap;text-overflow: ellipsis;vertical-align: middle;`">{{row.clientId}}</span>
+          <el-link :underline="false" icon="el-icon-document-copy" title="复制" v-clipboard:copy="row.clientId" v-clipboard:success="clipboardSuccess" style="margin-left: 5px;color: #409EFF;"></el-link>
         </template>
         <!--    多公网IP状态    -->
         <template #tempMultipubStatus="{ row, column }">
@@ -227,66 +228,66 @@
           meltiple: true,
           // 列显隐信息
           columns: {
-            id: { label: `ID`,width: '50'},
-            clientId: { label: `clientID`, minWidth: '300', slotName: 'tempCopy',visible: true, disabled: true},
-            ip1Isp: { label: `运营商1`, minWidth: '70',visible: true, disabled: true},
-            ip1Province: { label: `省1`, minWidth: '65',visible: true,  disabled: true},
-            ip1PublicIp:{ label: `业务公网1`,minWidth: '120',visible: true, disabled: true},
-            businessName: { label: `业务名称`, minWidth: '100', visible: true, disabled: true},
-            bandwidthResult: { label: `昨日95值`, minWidth: '95', visible: true, disabled: true, sortable: 'custom'},
-            bandwidthRate: { label: `日95利用率`, minWidth: '95', visible: true, disabled: true},
-            reportedBandwidth: { label: `上报带宽值`, minWidth: '90', slotName: 'tempHandle', visible: true, disabled: true},
-            onlineStatus: { label: `在线状态`, slotName: 'tempOnlineStatus', minWidth: '75', visible: true, disabled: true},
+            id: { label: `ID`,width: '45'},
+            clientId: { label: `clientID`, minWidth: '270', slotName: 'tempCopy',visible: true, disabled: true},
+            ip1Isp: { label: `运营商1`, minWidth: '55',visible: true, disabled: true},
+            ip1Province: { label: `省1`, minWidth: '50',visible: true,  disabled: true},
+            ip1PublicIp:{ label: `业务公网1`,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},
+            reportedBandwidth: { label: `上报带宽值`, minWidth: '70', slotName: 'tempHandle', visible: true, disabled: true},
+            onlineStatus: { label: `在线状态`, slotName: 'tempOnlineStatus', minWidth: '60', visible: true, disabled: true},
             hardwareSn: { label: `设备SN`,minWidth: '120'},
-            ip1City: { label: `市1`, minWidth: '65'},
-            ip1InterfaceName: { label: `接口名称1`, minWidth: '80'},
+            ip1City: { label: `市1`, minWidth: '50'},
+            ip1InterfaceName: { label: `接口名称1`, minWidth: '70'},
             ip1MacAddress: { label: `mac地址1`, minWidth: '120'},
-            ip1InterfaceType: { label: `接口类型1`, minWidth: '80'},
-            ip1Ipv4Address: { label: `IPv4地址1`, minWidth: '120'},
-            ip1Gateway: { label: `网关1`, minWidth: '120'},
-            ip1Ipv6Address: { label: `IPv6全球单播地址1`, minWidth: '135'},
-            ip2Isp: { label: `运营商2`, minWidth: '70'},
-            ip2Province: { label: `省2`,minWidth: '65'},
-            ip2City: { label: `市2`, minWidth: '65'},
-            ip2PublicIp:{ label: `业务公网2`,minWidth: '120'},
-            ip2InterfaceName: { label: `接口名称2`, minWidth: '100'},
+            ip1InterfaceType: { label: `接口类型1`, minWidth: '70'},
+            ip1Ipv4Address: { label: `IPv4地址1`, minWidth: '110'},
+            ip1Gateway: { label: `网关1`, minWidth: '100'},
+            ip1Ipv6Address: { label: `IPv6全球单播地址1`, minWidth: '120'},
+            ip2Isp: { label: `运营商2`, minWidth: '55'},
+            ip2Province: { label: `省2`,minWidth: '50'},
+            ip2City: { label: `市2`, minWidth: '50'},
+            ip2PublicIp:{ label: `业务公网2`,minWidth: '100'},
+            ip2InterfaceName: { label: `接口名称2`, minWidth: '70'},
             ip2MacAddress: { label: `mac地址2`, minWidth: '120'},
-            ip2InterfaceType: { label: `接口类型2`, minWidth: '80'},
-            ip2Ipv4Address: { label: `IPv4地址2`, minWidth: '120'},
-            ip2Gateway: { label: `网关2`, minWidth: '120'},
-            ip2Ipv6Address: { label: `IPv6全球单播地址2`, minWidth: '135'},
-            ip3Isp: { label: `运营商3`, minWidth: '70'},
-            ip3Province: { label: `省3`, minWidth: '65'},
-            ip3City: { label: `市3`, minWidth: '65'},
-            ip3PublicIp:{ label: `业务公网3`,minWidth: '120'},
-            ip3InterfaceName: { label: `接口名称3`, minWidth: '80'},
+            ip2InterfaceType: { label: `接口类型2`, minWidth: '70'},
+            ip2Ipv4Address: { label: `IPv4地址2`, minWidth: '110'},
+            ip2Gateway: { label: `网关2`, minWidth: '100'},
+            ip2Ipv6Address: { label: `IPv6全球单播地址2`, minWidth: '120'},
+            ip3Isp: { label: `运营商3`, minWidth: '55'},
+            ip3Province: { label: `省3`, minWidth: '50'},
+            ip3City: { label: `市3`, minWidth: '50'},
+            ip3PublicIp:{ label: `业务公网3`,minWidth: '100'},
+            ip3InterfaceName: { label: `接口名称3`, minWidth: '70'},
             ip3MacAddress: { label: `mac地址3`, minWidth: '120'},
-            ip3InterfaceType: { label: `接口类型3`, minWidth: '80'},
-            ip3Ipv4Address: { label: `IPv4地址3`, minWidth: '120'},
-            ip3Gateway: { label: `网关3`, minWidth: '120'},
-            ip3Ipv6Address: { label: `IPv6全球单播地址3`, minWidth: '135'},
-            mgmtIsp: { label: `管理网-运营商`, minWidth: '110'},
-            mgmtProvince: { label: `管理网-省`,minWidth: '80'},
-            mgmtCity: { label: `管理网-市`, minWidth: '80'},
+            ip3InterfaceType: { label: `接口类型3`, minWidth: '70'},
+            ip3Ipv4Address: { label: `IPv4地址3`, minWidth: '110'},
+            ip3Gateway: { label: `网关3`, minWidth: '100'},
+            ip3Ipv6Address: { label: `IPv6全球单播地址3`, minWidth: '120'},
+            mgmtIsp: { label: `管理网-运营商`, minWidth: '95'},
+            mgmtProvince: { label: `管理网-省`,minWidth: '65'},
+            mgmtCity: { label: `管理网-市`, minWidth: '65'},
             mgmtPublicIp:{ label: `管理网-业务公网`,minWidth: '120'},
-            mgmtInterfaceName: { label: `管理网-接口名称`, minWidth: '120'},
-            mgmtMacAddress: { label: `管理网-mac地址`, minWidth: '150'},
-            mgmtInterfaceType: { label: `管理网-接口类型`, minWidth: '120'},
+            mgmtInterfaceName: { label: `管理网-接口名称`, minWidth: '110'},
+            mgmtMacAddress: { label: `管理网-mac地址`, minWidth: '120'},
+            mgmtInterfaceType: { label: `管理网-接口类型`, minWidth: '110'},
             mgmtIpv4Address: { label: `管理网-IPv4地址`, minWidth: '120'},
-            mgmtGateway: { label: `管理网-网关`, minWidth: '120'},
-            mgmtIpv6Address: { label: `管理网-IPv6全球单播地址`, minWidth: '170'},
+            mgmtGateway: { label: `管理网-网关`, minWidth: '90'},
+            mgmtIpv6Address: { label: `管理网-IPv6全球单播地址`, minWidth: '160'},
             remark: { label: `标签`, minWidth: '150', slotName: 'tempRemark'},
-            heartbeatInterval: { label: `心跳时间间隔`, minWidth: '100'},
-            heartbeatCount: { label: `心跳次数`, minWidth: '80'},
-            registrationStatus: { label: `注册状态`, slotName: 'tempStatus', minWidth: '80', visible: true},
-            logicalNodeId: { label: `逻辑节点标识`, minWidth: '120', visible: true},
-            multiPublicIpStatus: { label: `多公网IP状态`, slotName: 'tempMultipubStatus', minWidth: '120', visible: true },
-            createTime:{ label: `注册时间`,minWidth: '160'},
-            onboardTime:{ label: `上机时间`,minWidth: '160'},
-            agentVersion:{ label: `agent版本`,minWidth: '90'},
-            machineCode:{ label: `金山machineCode`,minWidth: '160'},
-            cpuUtil:{ label: `CPU使用率`,minWidth: '160'},
-            memUtil:{ label: `内存使用率`,minWidth: '160'},
+            heartbeatInterval: { label: `心跳时间间隔`, minWidth: '90'},
+            heartbeatCount: { label: `心跳次数`, minWidth: '60'},
+            registrationStatus: { label: `注册状态`, slotName: 'tempStatus', minWidth: '60', visible: true},
+            logicalNodeId: { label: `逻辑节点标识`, minWidth: '90', visible: true},
+            multiPublicIpStatus: { label: `多公网IP状态`, slotName: 'tempMultipubStatus', minWidth: '90', visible: true },
+            createTime:{ label: `注册时间`,minWidth: '140'},
+            onboardTime:{ label: `上机时间`,minWidth: '140'},
+            agentVersion:{ label: `agent版本`,minWidth: '80'},
+            machineCode:{ label: `金山machineCode`,minWidth: '120'},
+            cpuUtil:{ label: `CPU使用率`,minWidth: '80'},
+            memUtil:{ label: `内存使用率`,minWidth: '80'},
           },
           config: {
             tableButton: {