diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index c3de4a6..bf8703b 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -69,8 +69,28 @@
                       </el-tooltip>
                     </template>
                   </template>
+<!--                  &lt;!&ndash;  插槽 自定义列表表头数据格式  &ndash;&gt;-->
+<!--                  <template #header v-if="column && column.slotHeaderName">-->
+<!--                    <span>{{column.label}}</span>-->
+<!--                    <el-tooltip trigger="click" effect="dark" placement="top">-->
+<!--                      <template #content>{{column.slotHeaderName}}</template>-->
+<!--                      <i class="el-icon-question"></i>-->
+<!--                    </el-tooltip>-->
+<!--                  </template>-->
+<!--                  &lt;!&ndash;  插槽 自定义列表内数据格式  &ndash;&gt;-->
+<!--                  <template #default="scope" v-if="column && column.slotName">-->
+<!--                    &lt;!&ndash; 传递行数据、行索引等信息到父组件的插槽 &ndash;&gt;-->
+<!--                    <slot-->
+<!--                      :name="column.slotName"-->
+<!--                      :valueKey="key"-->
+<!--                      :row="scope.row"-->
+<!--                      :rowIndex="scope.$index"-->
+<!--                      :column="column"-->
+<!--                      :scope="scope"-->
+<!--                    ></slot>-->
+<!--                  </template>-->
                 </el-table-column>
-            </template>
+              </template>
             <!--  表格行内按钮   -->
             <el-table-column v-if="config && config.tableButton && config.tableButton.line" :width="config.tableButton.line.length * 70 + `px`" label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
                 <template #default="scope">
diff --git a/src/router/index.js b/src/router/index.js
index 2a5434a..8dc985a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -298,7 +298,7 @@ export const dynamicRoutes = [
       }
     ]
   },
-  // 业务脚本管理
+  // 脚本管理
   {
     path: '/earnManage/businessScript/details',
     component: Layout,
@@ -309,7 +309,7 @@ export const dynamicRoutes = [
         path: ':id?',
         component: () => import('@/views/earnManage/businessScript/details'),
         name: 'BusinessScriptDetails',
-        meta: { title: '业务脚本信息', noCache: true ,activeMenu: '/earnManage/businessScript' }
+        meta: { title: '脚本信息', noCache: true ,activeMenu: '/earnManage/businessScript' }
       }
     ]
   },
diff --git a/src/views/earnManage/busValueCount/busValueCount.vue b/src/views/earnManage/busValueCount/busValueCount.vue
index ca8a6e8..1da40cf 100644
--- a/src/views/earnManage/busValueCount/busValueCount.vue
+++ b/src/views/earnManage/busValueCount/busValueCount.vue
@@ -68,16 +68,16 @@
         // 列显隐信息
         columns: {
           id: {label: `ID`},
-          taskName: {label: `任务名称`, minWidth: '250', visible: true},
+          taskName: {label: `任务名称`, minWidth: '150', visible: true},
           businessName: {label: `业务名称`, minWidth: '150', visible: true},
           resourceType: { label: `包含资源类型`, minWidth: '200', slotName: 'tempResType'},
           includedResources: { label: `包含资源`, minWidth: '300'},
           calculationType: {label: `计算类型`, minWidth:  '150'},
-          percentile95: {label: `95值(Mbit)`, minWidth: '200',visible: true},
-          monthlyAvgPercentile95: {label: `月均日95值(Mbit)`, minWidth: '200',visible: true},
+          percentile95: {label: `95值(Mbit)`, minWidth: '100',visible: true},
+          monthlyAvgPercentile95: {label: `月均日95值(Mbit)`, minWidth: '150',visible: true},
           // js: {label: `外部数据记录95值(Mbit)`, minWidth: '200'},
           timeRange: {label: `时间段`, minWidth: '200',visible: true},
-          taskStatus: {label: `任务状态`, minWidth: '150', slotName: 'tempStatus', visible: true},
+          taskStatus: {label: `任务状态`, minWidth: '80', slotName: 'tempStatus', visible: true},
           updateTime: {label: `修改时间`, minWidth: '150'},
           createTime: {label: `创建时间`, minWidth: '150'},
         },
diff --git a/src/views/earnManage/businessIssued/businessIssued.vue b/src/views/earnManage/businessIssued/businessIssued.vue
index 69b23a5..c61b7fe 100644
--- a/src/views/earnManage/businessIssued/businessIssued.vue
+++ b/src/views/earnManage/businessIssued/businessIssued.vue
@@ -45,15 +45,15 @@
         },
         // 列显隐信息
         columns: {
-          id: {label: 'ID'},
+          id: {label: 'ID', width: '50'},
           taskName: { label: `任务名称`, minWidth: '120', visible: true},
           businessName: { label: `业务名称`, minWidth: '120', visible: true},
           scriptName: { label: `脚本名称`, minWidth: '120', visible: true},
           scriptParams: { label: `脚本参数`, minWidth: '120',},
-          deployDevice: { label: `部署设备`, minWidth: '120',},
+          deployDevice: { label: `部署设备`, minWidth: '120', customTooltip: true},
           submitBy: { label: `提交人`, minWidth: '120',},
-          reviewStatus: { label: `审核状态`, minWidth: '120', slotName: 'tempStatus', visible: true},
-          reviewTime: { label: `审核时间`, minWidth: '160'},
+          reviewStatus: { label: `审核状态`, minWidth: '100', slotName: 'tempStatus', visible: true},
+          reviewTime: { label: `审核时间`, minWidth: '120'},
           reviewComment: { label: `审核意见`, minWidth: '160'},
           createTime: { label: `创建时间`, minWidth: '160'},
           updateTime: { label: `修改时间`, minWidth: '160'},
diff --git a/src/views/earnManage/businessScript/businessScript.vue b/src/views/earnManage/businessScript/businessScript.vue
index 7ad580a..cd37f97 100644
--- a/src/views/earnManage/businessScript/businessScript.vue
+++ b/src/views/earnManage/businessScript/businessScript.vue
@@ -40,7 +40,7 @@
         },
         // 列显隐信息
         columns: {
-          id: {label: 'ID'},
+          id: {label: 'ID',width: '50'},
           scriptName: { label: `脚本名称`, visible: true},
           scriptPath: { label: `脚本文件地址`, visible: true},
           defaultParams: { label: `脚本默认参数`, visible: true},
@@ -143,7 +143,7 @@
               // });
               // this.download("/system/Business/export", {properties: dataList,}, `业务管理_${new Date().getTime()}.xlsx`);
               let paramsList = Object.assign({}, this.queryParams,rowData);
-              this.download("system/businessScript/export", paramsList, `业务脚本管理_${new Date().getTime()}.xlsx`, null, 'json');
+              this.download("system/businessScript/export", paramsList, `脚本管理_${new Date().getTime()}.xlsx`, null, 'json');
               break;
             default:
 
diff --git a/src/views/earnManage/revenueMethod/index.vue b/src/views/earnManage/revenueMethod/index.vue
index f98be7b..6ca0d69 100644
--- a/src/views/earnManage/revenueMethod/index.vue
+++ b/src/views/earnManage/revenueMethod/index.vue
@@ -55,7 +55,7 @@
 
           // 列显隐信息
           columns: {
-            id: {label: `ID`, visible: false},
+            id: {label: `ID`, width: '50', visible: false},
             updateTime: {label: `修改时间`, minWidth: '160', visible: true},
             clientId: {label: `ClientID`, minWidth: '300',  visible: true},
             hardwareSn: {label: `硬件SN`},
diff --git a/src/views/earnManage/server/serverTabs.vue b/src/views/earnManage/server/serverTabs.vue
index 75d3c0b..cf4d324 100644
--- a/src/views/earnManage/server/serverTabs.vue
+++ b/src/views/earnManage/server/serverTabs.vue
@@ -174,14 +174,14 @@
         showSearch: true,
         // 列显隐信息
         columns: {
-          id: {label: `ID`},
-          clientId: {label: `ClientID`, minWidth: '320', visible: true},
-          hardwareSn: {label: `硬件SN`, minWidth: '350'},
+          id: {label: `ID`, width: '50'},
+          clientId: {label: `ClientID`, minWidth: '280', visible: true},
+          hardwareSn: {label: `硬件SN`, minWidth: '150'},
           businessName: {label: `业务名称`, minWidth: '150', visible: true},
           businessId: {label: `业务代码`, minWidth: '150'},
-          bandwidth95Daily: {label: `95带宽值/日(Mbit)`, minWidth: '200', slotName: 'tempDay',visible: true},
-          bandwidth95Monthly: {label: `95带宽值/月(Mbit)`, minWidth: '200', slotName: 'tempMonth',visible: true},
-          avgMonthlyBandwidth95: {label: `月均日95值(Mbit)`, minWidth: '200',slotName: 'tempDay',visible: true},
+          bandwidth95Daily: {label: `95带宽值/日(Mbit)`, minWidth: '150', slotName: 'tempDay',visible: true},
+          bandwidth95Monthly: {label: `95带宽值/月(Mbit)`, minWidth: '150', slotName: 'tempMonth',visible: true},
+          avgMonthlyBandwidth95: {label: `月均日95值(Mbit)`, minWidth: '150',slotName: 'tempDay',visible: true},
           machineFlow: {label: `金山machineCode`, minWidth: '150',visible: true},
           uplinkSwitch: {label: `上联交换机`, minWidth: '150'},
           uplinkSwitchPort: {label: `上联交换机端口`, minWidth: '150'},
diff --git a/src/views/earnManage/switch/switchTabs.vue b/src/views/earnManage/switch/switchTabs.vue
index da8994a..e135db6 100644
--- a/src/views/earnManage/switch/switchTabs.vue
+++ b/src/views/earnManage/switch/switchTabs.vue
@@ -215,14 +215,14 @@
         // 列显隐信息
         columns: {
           id: { label: `ID`,width: '50', visible: false },
-          uplinkSwitch: { label: `交换机名称`, minWidth: '180', visible: true },
-          hardwareSn: { label: `硬件SN`, minWidth: '200'},
-          interfaceName: { label: `接口名称`, minWidth: '120',visible: true },
-          interfaceLinkDeviceType: { label: `接口连接设备类型`, slotName: 'tempType',minWidth: '180', visible: true },
-          interfaceRemark: {label: `接口备注`,minWidth: '150'},
-          bandwidth95Daily: { label: `95带宽值/日(Mbit)`, minWidth: '200', slotName: 'tempDay', visible: true },
-          bandwidth95Monthly: { label: `95带宽值/月(Mbit)`, minWidth: '200', slotName: 'tempMonth', visible: true},
-          avgMonthlyBandwidth95: {label: `月均日95值(Mbit`, minWidth: '200', slotName: 'tempDay', visible: true},
+          uplinkSwitch: { label: `交换机名称`, minWidth: '120', visible: true },
+          hardwareSn: { label: `硬件SN`, minWidth: '120'},
+          interfaceName: { label: `接口名称`, minWidth: '100',visible: true },
+          interfaceLinkDeviceType: { label: `接口连接设备类型`, slotName: 'tempType',minWidth: '130', visible: true },
+          interfaceRemark: {label: `接口备注`,minWidth: '120'},
+          bandwidth95Daily: { label: `95带宽值/日(Mbit)`, minWidth: '180', slotName: 'tempDay', visible: true },
+          bandwidth95Monthly: { label: `95带宽值/月(Mbit)`, minWidth: '180', slotName: 'tempMonth', visible: true},
+          avgMonthlyBandwidth95: {label: `月均日95值(Mbit`, minWidth: '180', slotName: 'tempDay', visible: true},
           clientId: {label: `ClientID`,minWidth: '320'},
           businessId: {label: `业务代码`,minWidth: '150'},
           businessName: {label: `业务名称`,minWidth: '100'},
@@ -230,8 +230,8 @@
           // effectiveBandwidth95Daily: {label: `有效95带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay', visible: true },
           // effectiveBandwidth95Monthly: {label: `有效95带宽值Mbps/月`, minWidth: '200', slotName: 'tempMonth',},
           // effectiveAvgMonthlyBandwidth95: {label: `有效月均日95值Mbps`, minWidth: '200', slotName: 'tempDay'},
-          createTime: { label: `创建时间`, minWidth: '160'},
-          lastModifyTime: { label: `修改时间`, minWidth: '160'}
+          createTime: { label: `创建时间`, minWidth: '120'},
+          lastModifyTime: { label: `修改时间`, minWidth: '120'}
         },
         config: {
           // searcherForm: [
diff --git a/src/views/resource/alarmLog/alarmLog.vue b/src/views/resource/alarmLog/alarmLog.vue
index 4860038..932417c 100644
--- a/src/views/resource/alarmLog/alarmLog.vue
+++ b/src/views/resource/alarmLog/alarmLog.vue
@@ -12,24 +12,10 @@
         </el-form-item>
       </el-col>
       <el-col :span="6">
-        <el-form-item label="资源名称" prop="bandwidthType">
+        <el-form-item label="告警类型" prop="type">
           <el-select
             v-model="queryParams.bandwidthType"
-            placeholder="请选择资源名称"
-            clearable>
-            <el-option
-              v-for="dict in dict.type.eps_bandwidth_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"/>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="状态" prop="type">
-          <el-select
-            v-model="queryParams.bandwidthType"
-            placeholder="请选择状态"
+            placeholder="请选择告警类型"
             clearable>
             <el-option
               v-for="dict in dict.type.eps_bandwidth_type"
@@ -74,11 +60,11 @@
         // 列显隐信息
         columns: {
           id: { label: `ID`,width: '50'},
-          switchName: { label: `资源名称`, minWidth: '250', visible: true },
-          switchSn: { label: `源IP`,minWidth: '200',visible: false},
-          createTime: { label: `发生时间`,minWidth: '160'},
-          interfaceName: { label: `内容`,minWidth: '250', visible: true },
-          serverName: { label: `状态`,minWidth: '100',visible: true },
+          clientId: { label: `告警设备`, minWidth: '250', visible: true },
+          managePublicIp: { label: `管理网-公网IP`,minWidth: '200',visible: true},
+          type: { label: `告警类型`,minWidth: '160',visible: true},
+          createTime: { label: `告警时间`,minWidth: '160',visible: true},
+          interfaceName: { label: `告警内容`,minWidth: '250', visible: true },
         },
         config: {
           tableButton: {
@@ -87,7 +73,6 @@
             ],
             line: [
               {content: '详情', fnCode: 'details', type: 'text', icon: 'el-icon-view', hasPermi: 'resource:alarmManage:details'},
-              {content: '处理', fnCode: 'handle', type: 'text', icon: 'el-icon-document-copy', hasPermi: 'resource:alarmManage:handle'},
             ]
           }
         }
@@ -135,8 +120,6 @@
                 }
               });
               break;
-            case 'handle':
-              break;
             case 'delete':
               this.$modal.confirm('是否确认删除数据项？').then(function() {
                 return delMonitorTemp(selectChange)
diff --git a/src/views/resource/serverRegister/index.vue b/src/views/resource/serverRegister/index.vue
index 82fd604..2774a72 100644
--- a/src/views/resource/serverRegister/index.vue
+++ b/src/views/resource/serverRegister/index.vue
@@ -169,31 +169,31 @@
           columns: {
             id: { label: `ID`,width: '50'},
             clientId: { label: `clientID`, minWidth: '320', slotName: 'tempCopy'},
-            hardwareSn: { label: `设备SN`,minWidth: '200'},
-            ip1Isp: { label: `IP1-运营商`, visible: true, minWidth: '90'},
-            ip1Province: { label: `IP1-省`, visible: true, minWidth: '80'},
-            ip1City: { label: `IP1-市`, minWidth: '80'},
+            hardwareSn: { label: `设备SN`,minWidth: '120'},
+            ip1Isp: { label: `IP1-运营商`, visible: true, minWidth: '85'},
+            ip1Province: { label: `IP1-省`, visible: true, minWidth: '60'},
+            ip1City: { label: `IP1-市`, minWidth: '60'},
             ip1PublicIp:{ label: `IP1-业务公网`,visible: true,minWidth: '120'},
             ip1InterfaceName: { label: `IP1-接口名称`, minWidth: '100'},
-            ip1MacAddress: { label: `IP1-mac地址`, minWidth: '150'},
+            ip1MacAddress: { label: `IP1-mac地址`, minWidth: '120'},
             ip1InterfaceType: { label: `IP1-接口类型`, minWidth: '100'},
             ip1Ipv4Address: { label: `IP1-IPv4地址`, minWidth: '120'},
             ip1Gateway: { label: `IP1-网关`, minWidth: '120'},
             ip2Isp: { label: `IP2-运营商`, minWidth: '90'},
-            ip2Province: { label: `IP2-省`,minWidth: '80'},
-            ip2City: { label: `IP2-市`, minWidth: '80'},
+            ip2Province: { label: `IP2-省`,minWidth: '60'},
+            ip2City: { label: `IP2-市`, minWidth: '60'},
             ip2PublicIp:{ label: `IP2-业务公网`,minWidth: '120'},
             ip2InterfaceName: { label: `IP2-接口名称`, minWidth: '100'},
-            ip2MacAddress: { label: `IP2-mac地址`, minWidth: '150'},
+            ip2MacAddress: { label: `IP2-mac地址`, minWidth: '120'},
             ip2InterfaceType: { label: `IP2-接口类型`, minWidth: '100'},
             ip2Ipv4Address: { label: `IP2-IPv4地址`, minWidth: '120'},
             ip2Gateway: { label: `IP2-网关`, minWidth: '120'},
             ip3Isp: { label: `IP3-运营商`, minWidth: '90'},
-            ip3Province: { label: `IP3-省`, minWidth: '80'},
-            ip3City: { label: `IP3-市`, minWidth: '80'},
+            ip3Province: { label: `IP3-省`, minWidth: '60'},
+            ip3City: { label: `IP3-市`, minWidth: '60'},
             ip3PublicIp:{ label: `IP3-业务公网`,minWidth: '120'},
             ip3InterfaceName: { label: `IP3-接口名称`, minWidth: '100'},
-            ip3MacAddress: { label: `IP3-mac地址`, minWidth: '150'},
+            ip3MacAddress: { label: `IP3-mac地址`, minWidth: '120'},
             ip3InterfaceType: { label: `IP3-接口类型`, minWidth: '100'},
             ip3Ipv4Address: { label: `IP3-IPv4地址`, minWidth: '120'},
             ip3Gateway: { label: `IP3-网关`, minWidth: '120'},
diff --git a/src/views/resource/switchRegister/index.vue b/src/views/resource/switchRegister/index.vue
index 3789eef..e262b7e 100644
--- a/src/views/resource/switchRegister/index.vue
+++ b/src/views/resource/switchRegister/index.vue
@@ -38,6 +38,18 @@
         <template #tempType="{ row, column }">
           <dict-tag :options="dict.type.rm_register_resource_type" :value="row.resourceType"/>
         </template>
+        <!--    读写权限    -->
+        <template #tempReadWrite="{ row, column }">
+          <dict-tag :options="dict.type.rm_register_permission" :value="row.readWritePermission"/>
+        </template>
+        <!--    加密方式    -->
+        <template #tempEncry="{ row, column }">
+          <dict-tag :options="dict.type.rm_register_encryption" :value="row.encryptionMethod"/>
+        </template>
+        <!--    读写权限    -->
+        <template #tempSecurity="{ row, column }">
+          <dict-tag :options="dict.type.rm_register_security_level" :value="row.securityLevel"/>
+        </template>
         <!--   端口     -->
         <template #tempPort="{ row, column }">
           <dict-tag :options="dict.type.rm_register_port" :value="row.resourcePort"/>
@@ -70,7 +82,7 @@
     export default {
       name: 'SwitchRegister',
       components: {TableList, MonitorStrategy},
-      dicts: ['rm_register_resource_type', 'rm_register_protocol', 'rm_register_status', 'rm_register_port', 'rm_register_online_state'],
+      dicts: ['rm_register_resource_type', 'rm_register_protocol', 'rm_register_status', 'rm_register_port', 'rm_register_online_state', 'rm_register_permission', 'rm_register_encryption', 'rm_register_security_level'],
       data() {
         return {
           open: false,
@@ -82,23 +94,23 @@
           meltiple: true,
           // 列显隐信息
           columns: {
-            id: { label: `ID`,width: '80'},
-            switchName: { label: `交换机名称`, visible: true, minWidth: '200'},
+            id: { label: `ID`,width: '50'},
+            switchName: { label: `交换机名称`, visible: true, minWidth: '150'},
             hardwareSn: { label: `硬件SN`,minWidth: '250'},
             resourceType: { label: `交换机类型`, minWidth: '100', slotName: 'tempType'},
             snmpAddress: { label: `SNMP采集地址`, visible: true, minWidth: '150'},
-            snmpPort: { label: `SNMP采集端口`, visible: true, minWidth: '150'},
-            onlineStatus: { label: `在线状态`, slotName: 'tempOnlineStatus', minWidth: '120', visible: true },
+            snmpPort: { label: `SNMP采集端口`, visible: true, minWidth: '120'},
+            onlineStatus: { label: `在线状态`, slotName: 'tempOnlineStatus', minWidth: '80', visible: true },
             upTime:{ label: `上机时间`,minWidth: '160'},
             updateTime:{ label: `修改时间`,minWidth: '160'},
             createTime:{ label: `创建时间`,minWidth: '160'},
-            heartbeatCount: { label: `交换机心跳检测次数`, minWidth: '180'},
-            heartbeatInterval: { label: `交换机心跳检测周期`, minWidth: '180'},
-            heartbeatOid: { label: `交换机心跳检测OID`, minWidth: '180'},
-            protocol: { label: `SNMP版本`, minWidth: '150'},
-            readWritePermission: { label: `读写权限`, minWidth: '120'},
-            securityLevel: { label: `安全级别`, minWidth: '120'},
-            encryptionMethod: { label: `加密方式`, minWidth: '120'},
+            heartbeatCount: { label: `交换机心跳检测次数`, minWidth: '140'},
+            heartbeatInterval: { label: `交换机心跳检测周期`, minWidth: '140'},
+            heartbeatOid: { label: `交换机心跳检测OID`, minWidth: '140'},
+            protocol: { label: `SNMP版本`, minWidth: '100', slotName: 'tempProtocol'},
+            readWritePermission: { label: `读写权限`, minWidth: '80', slotName: 'tempReadWrite'},
+            securityLevel: { label: `安全级别`, minWidth: '80', slotName: 'tempSecurity'},
+            encryptionMethod: { label: `加密方式`, minWidth: '80', slotName: 'tempEncry'},
             communityName: { label: `团体名称`, minWidth: '120'},
             resourceUserName: { label: `用户名`, minWidth: '100'},
             resourcePwd: { label: `密码`, minWidth: '100'}