diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 78f1085..12d8850 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -139,7 +139,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 20px;
+  padding: 8px 20px 20px;
 }
 
 .components-container {
@@ -253,11 +253,31 @@ aside {
 .textAlignCenter {
   text-align: center;
 }
-.pageTopForm .el-form-item--medium .el-form-item__label {
-  width: 80px;
+// form属性下边距
+.el-form-item--small.el-form-item{
+  margin-bottom: 8px;
+}
+// table列表上方 form搜索条件 label
+.pageTopForm .el-form-item__label {
+  width: 68px!important;
   overflow: hidden;
   height: 36px;
 }
-.pageTopForm .el-form-item {
-  margin-left: 10px!important;
+// table列表上方 form搜索条件 label后面的选项框
+.pageTopForm .el-form-item__content {
+  margin-left: 68px!important;
+}
+// table列表上方 form搜索条件 选项框后设置距离
+.pageTopForm .el-form-item {
+  margin-left: 0px!important;
+  margin-right: 10px;
+}
+// 多选下拉 为选中后 选中图标设置到最前面留空间
+.el-select-dropdown.is-multiple .el-select-dropdown__item {
+  padding-left: 30px;
+}
+// 多选下拉 选中后 选中图标设置到最前面
+.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
+  left: 10px;
+  right: 0px;
 }
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 724412b..ba9463b 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -13,7 +13,7 @@
         <el-table v-loading="loading" :data="tableList" ref="selChangeList" highlight-selection-row @selection-change="handleSelectionChange">
             <el-table-column v-if="!(config && config.colHiddenCheck)" fixed type="selection" width="55" align="center" />
             <template v-for="(column, key, index) of columns">
-                <el-table-column v-if="column && column.visible" :label="column.label" :key="key" :prop="key" :width="column.width" :min-width="column.minWidth || '100px'" align="center" :show-overflow-tooltip="true">
+                <el-table-column v-if="column && column.visible" :label="column.label" :key="key" :prop="key" :width="column.width" :min-width="column.minWidth || '100px'" align="left" :show-overflow-tooltip="true">
                     <!--  插槽 自定义列表表头数据格式  -->
                   <template #header v-if="column && column.slotHeaderName">
                     <span>{{column.label}}</span>
@@ -40,9 +40,9 @@
             <el-table-column v-if="config && config.tableButton && config.tableButton.line" :width="config.tableButton.line.length * 60 + `px`" label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
                 <template #default="scope">
                   <template v-for="item of config.tableButton.line">
-                    <el-tooltip v-if="item && item.content" :content="item.content" placement="top">
-                      <el-button size="mini" link :type="item.type" :icon="item.icon" v-show="scope.row[item.showName] === item.showVal" @click="handleClick(item, scope.row)" :hasPermi="[item.hasPermi]">{{item.content}}</el-button>
-                    </el-tooltip>
+<!--                    <el-tooltip v-if="item && item.content" :content="item.content" placement="top">-->
+                      <el-button v-if="item && item.content" size="mini" link :type="item.type" :icon="item.icon" v-show="scope.row[item.showName] === item.showVal" @click="handleClick(item, scope.row)" :hasPermi="[item.hasPermi]">{{item.content}}</el-button>
+<!--                    </el-tooltip>-->
                   </template>
                 </template>
             </el-table-column>
diff --git a/src/views/disRevenue/earnManage/business/index.vue b/src/views/disRevenue/earnManage/business/index.vue
index 868b429..e8fd871 100644
--- a/src/views/disRevenue/earnManage/business/index.vue
+++ b/src/views/disRevenue/earnManage/business/index.vue
@@ -1,20 +1,21 @@
 <template>
   <div class="app-container pageTopForm">
-    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="130px">
-      <el-form-item label="业务名称" prop="businessName">
-        <el-col :span="4">
-          <el-input
-            v-model="queryParams.businessName"
-            placeholder="请输入业务名称"
-            clearable
-            style="width: 220px"
-            @keyup.enter="handleQuery"/>
-        </el-col>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="68px" class="demo-ruleForm">
+      <el-col :span="6">
+        <el-form-item label="业务名称" prop="businessName">
+            <el-input
+              v-model="queryParams.businessName"
+              placeholder="请输入业务名称"
+              clearable
+              @keyup.enter="handleQuery"/>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item class="lastBtnSty">
+          <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-col>
     </el-form>
     <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
       <template #tempBusinessName="{ row, column }">
@@ -175,3 +176,8 @@
     }
   }
 </script>
+<style scoped>
+  ::v-deep .lastBtnSty .el-form-item__content{
+    margin-left: 10px!important;
+  }
+</style>
diff --git a/src/views/disRevenue/earnManage/revenueMethod/index.vue b/src/views/disRevenue/earnManage/revenueMethod/index.vue
index 06eb248..8ce6ef2 100644
--- a/src/views/disRevenue/earnManage/revenueMethod/index.vue
+++ b/src/views/disRevenue/earnManage/revenueMethod/index.vue
@@ -1,36 +1,35 @@
 <template>
     <div class="app-container pageTopForm">
-        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="130px">
-            <el-form-item label="节点名称" prop="nodeName">
-                <el-col :span="4">
-                    <el-select
-                            v-model="queryParams.nodeName"
-                            placeholder="请选择节点名称"
-                            style="width: 220px"
-                            clearable>
-                        <el-option
-                                v-for="dict in dict.type.sys_normal_disable"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"/>
-                    </el-select>
-                </el-col>
-            </el-form-item>
-            <el-form-item label="硬件SN" prop="hardwareSn">
-                <el-col :span="4">
-                    <el-input
-                            v-model="queryParams.hardwareSn"
-                            placeholder="请输入硬件SN"
-                            clearable
-                            style="width: 220px"
-                            @keyup.enter="handleQuery"
-                    />
-                </el-col>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="130px">
+          <el-col :span="6">
+              <el-form-item label="节点名称" prop="nodeName">
+                  <el-select
+                      v-model="queryParams.nodeName"
+                      placeholder="请选择节点名称"
+                      clearable>
+                      <el-option
+                          v-for="dict in dict.type.sys_normal_disable"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"/>
+                  </el-select>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item label="硬件SN" prop="hardwareSn">
+                  <el-input
+                      v-model="queryParams.hardwareSn"
+                      placeholder="请输入硬件SN"
+                      clearable
+                      @keyup.enter="handleQuery"/>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="lastBtnSty">
+                <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
+          </el-col>
         </el-form>
         <!-- 表格数据 -->
       <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange"></TableList>
@@ -57,10 +56,10 @@
           columns: {
             id: {label: `ID`, visible: false},
             createTime: {label: `修改时间`, visible: true},
-            nodeName: {label: `节点名称`, visible: true},
+            nodeName: {label: `节点名称`, minWidth: '130',  visible: true},
             hardwareSn: {label: `硬件SN`},
-            changeContent: {label: `修改内容`, visible: true},
-            creatBy: {label: `修改人`, visible: true},
+            changeContent: {label: `修改内容`, minWidth: '350', visible: true},
+            creatBy: {label: `修改人`, width: '80', visible: true},
           },
           // 查询参数
           queryParams: {
@@ -131,4 +130,7 @@
 </script>
 
 <style scoped>
+  ::v-deep .lastBtnSty .el-form-item__content {
+    margin-left: 10px!important;
+  }
 </style>
diff --git a/src/views/disRevenue/earnManage/server/dialogView.vue b/src/views/disRevenue/earnManage/server/dialogView.vue
index 7dfe05d..4f7630d 100644
--- a/src/views/disRevenue/earnManage/server/dialogView.vue
+++ b/src/views/disRevenue/earnManage/server/dialogView.vue
@@ -3,7 +3,8 @@
     <div style="height: 90px;">
       <el-form ref="noticeRef" :model="form" label-width="80px">
         <el-form-item label="节点名称" prop="noticeType">
-          <el-select v-model="form.noticeType" multiple filterable allow-create default-first-option placeholder="请选择节点名称" @change="handleChange">
+          <!--  allow-create default-first-option： 搜索下拉框中没有的数据并展示查询 -->
+          <el-select v-model="form.noticeType" multiple filterable placeholder="请选择节点名称" @change="handleChange">
             <el-option
               v-for="item in selectChangeList"
               :key="item.value"
@@ -35,6 +36,7 @@
   import EchartsLine from "@/components/echartsList/line.vue";
   import EchartsBar from "@/components/echartsList/bar.vue";
   import {graPackage, graMonthly, graEffectiveMonthly, graEffectiveDaily, graEffectiveAvgMonthly, graDaily, graAvgMonthly} from "@/api/disRevenue/earnManage"
+  import {listAllResourList} from "@/api/disRevenue/resource";
   export default {
     name: 'DialogView',
     components: {Form, EchartsLine, EchartsBar},
@@ -77,12 +79,22 @@
         if (this.paramsData && this.paramsData.list) {
           this.processData(this.paramsData.list);
         }
+        if (this.paramsData && this.paramsData.resourceType) {
+          this.fnNodeName(this.paramsData.resourceType);
+        }
       }
     },
     destroyed() {
       localStorage.removeItem(this.storageKey);
     },
     methods: {
+      fnNodeName(type){
+        listAllResourList({resourceType: type}).then(val => {
+          this.selectChangeList = val && val.map(item => {
+            return Object.assign({label: item.resourceName, value: item.resourceName});
+          });
+        });
+      },
       // 下拉数据改变时触发
       handleChange(eventVal) {
         if (this.resourceType === '1') {
@@ -120,7 +132,6 @@
           }
         });
         if (nameArr && nameArr.length > 0) {
-          this.selectChangeList = nameListArr;
           if (nameListArr.length >=2) {
             this.form.noticeType = [nameListArr[0].label, nameListArr[1].label];
           } else {
diff --git a/src/views/disRevenue/earnManage/server/index.vue b/src/views/disRevenue/earnManage/server/index.vue
index e7f1299..9f89d65 100644
--- a/src/views/disRevenue/earnManage/server/index.vue
+++ b/src/views/disRevenue/earnManage/server/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="app-container pageTopForm">
-        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" label-width="80px" class="demo-ruleForm">
+        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="80px" class="demo-ruleForm">
           <el-col :span="8">
             <el-form-item label="节点名称" prop="nodeName">
               <el-input
@@ -25,8 +25,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-show="queryParams.bandwidthType === '1'">
-            <el-form-item label="95宽带值Mbps/日" title="95宽带值Mbps/日" prop="bandwidth95Daily">
+          <el-col :span="8" v-if="queryParams.bandwidthType === '1'">
+            <el-form-item label="95宽带值Mbps/日" title="95宽带值Mbps/日" prop="bandwidth95Daily" :rules="[{ required: true, message: `95宽带值Mbps/日为必填项`, trigger: 'change' }]">
                 <el-date-picker
                     v-model="queryParams.bandwidth95Daily"
                     type="daterange"
@@ -37,8 +37,8 @@
                     end-placeholder="结束日期"/>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-show="queryParams.bandwidthType === '2'">
-            <el-form-item label="95宽带值Mbps/月" prop="bandwidth95Monthly">
+          <el-col :span="8" v-if="queryParams.bandwidthType === '2'">
+            <el-form-item label="95宽带值Mbps/月" title="95宽带值Mbps/月" prop="bandwidth95Monthly" :rules="[{ required: true, message: `95宽带值Mbps/月为必填项`, trigger: 'change' }]">
                 <el-date-picker
                   v-model="queryParams.bandwidth95Monthly"
                   type="monthrange"
@@ -48,8 +48,8 @@
                   end-placeholder="结束月份"/>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-show="queryParams.bandwidthType === '3'">
-            <el-form-item label="包端带宽值Mbps/日" prop="packageBandwidthDaily">
+          <el-col :span="8" v-if="queryParams.bandwidthType === '3'">
+            <el-form-item label="包端带宽值Mbps/日" title="包端带宽值Mbps/日" prop="packageBandwidthDaily" :rules="[{ required: true, message: `包端带宽值Mbps/日为必填项`, trigger: 'change' }]">
               <el-date-picker
                 v-model="queryParams.packageBandwidthDaily"
                 type="daterange"
@@ -60,6 +60,54 @@
                 end-placeholder="结束日期"/>
             </el-form-item>
           </el-col>
+          <el-col :span="8" v-if="queryParams.bandwidthType === '4'">
+            <el-form-item label="月均日95值Mbps" title="月均日95值Mbps" prop="avgMonthlyBandwidth95" :rules="[{ required: true, message: `月均日95值Mbps为必填项`, trigger: 'change' }]">
+              <el-date-picker
+                v-model="queryParams.avgMonthlyBandwidth95"
+                type="monthrange"
+                format="yyyy-MM"
+                value-format="yyyy-MM"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="queryParams.bandwidthType === '5'">
+            <el-form-item label="有效95带宽值Mbps/日" title="有效95带宽值Mbps/日" prop="effectiveBandwidth95Daily" :rules="[{ required: true, message: `有效95带宽值Mbps/日为必填项`, trigger: 'change' }]">
+              <el-date-picker
+                v-model="queryParams.effectiveBandwidth95Daily"
+                type="daterange"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="queryParams.bandwidthType === '6'">
+            <el-form-item label="有效95带宽值Mbps/月" title="有效95带宽值Mbps/月" prop="effectiveBandwidth95Monthly" :rules="[{ required: true, message: `有效95带宽值Mbps/月为必填项`, trigger: 'change' }]">
+              <el-date-picker
+                v-model="queryParams.effectiveBandwidth95Monthly"
+                type="monthrange"
+                format="yyyy-MM"
+                value-format="yyyy-MM"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="queryParams.bandwidthType === '7'">
+            <el-form-item label="有效月均日95值Mbps" title="有效月均日95值Mbps" prop="effectiveAvgMonthlyBandwidth95" :rules="[{ required: true, message: `有效月均日95值Mbps为必填项`, trigger: 'change' }]">
+              <el-date-picker
+                v-model="queryParams.effectiveAvgMonthlyBandwidth95"
+                type="daterange"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="硬件SN" prop="hardwareSn">
               <el-input
@@ -106,20 +154,20 @@
           // 列显隐信息
           columns: {
             id: {label: `ID`},
-            nodeName: {label: `节点名称`, minWidth: '200', visible: true},
+            nodeName: {label: `节点名称`, minWidth: '250', visible: true},
             hardwareSn: {label: `硬件SN`, minWidth: '200'},
             uplinkSwitch: {label: `上联交换机`, minWidth: '150'},
             businessId: {label: `业务代码`, minWidth: '150'},
             businessName: {label: `业务名称`, minWidth: '150'},
-            bandwidth95Daily: {label: `95宽带值Mbps/日`, minWidth: '200', slotName: 'tempDay', slotHeaderName: '使用服务器的发送流量，发送流量值除以1000000', visible: true},
-            bandwidth95Monthly: {label: `95宽带值Mbps/月`, minWidth: '200', visible: true, slotName: 'tempMonth',
+            bandwidth95Daily: {label: `95宽带值Mbps/日`, minWidth: '200', slotName: 'tempDay', slotHeaderName: '使用服务器的发送流量，发送流量值除以1000000'},
+            bandwidth95Monthly: {label: `95宽带值Mbps/月`, minWidth: '200', slotName: 'tempMonth',
               slotHeaderName: '使用服务器的发送流量，发送流量值除以1000000；若服务器在一个自然月内有收益方式的变更，以最后一次变更的时间为开始到月末，进行该值的统计；若服务器收益方式为包端，则月底不用进行该值的计算。'},
-            packageBandwidthDaily: {label: `包端带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay', visible: true},
+            packageBandwidthDaily: {label: `包端带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay'},
             // customerName: {label: `设备业务客户`,visible: true},
             avgMonthlyBandwidth95: {label: `月均日95值Mbps`, minWidth: '200',slotName: 'tempDay'},
-            effectiveBandwidth95Daily: {label: `有效95带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay'},
-            effectiveBandwidth95Monthly: {label: `有效95带宽值Mbps/月`, minWidth: '200', slotName: 'tempMonth'},
-            effectiveAvgMonthlyBandwidth95: {label: `有效月均日95值Mbps`, minWidth: '200', slotName: 'tempDay'},
+            effectiveBandwidth95Daily: {label: `有效95带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay', visible: true},
+            effectiveBandwidth95Monthly: {label: `有效95带宽值Mbps/月`, minWidth: '200', slotName: 'tempMonth', visible: true},
+            effectiveAvgMonthlyBandwidth95: {label: `有效月均日95值Mbps`, minWidth: '200', slotName: 'tempDay', visible: true},
             createDatetime: {label: `创建时间`, minWidth: '150'},
           },
           config: {
@@ -148,20 +196,29 @@
             bandwidth95Daily: undefined,
             bandwidth95Monthly: undefined,
             packageBandwidthDaily: undefined,
+            avgMonthlyBandwidth95: undefined,
+            effectiveBandwidth95Daily: undefined,
+            effectiveBandwidth95Monthly: undefined,
+            effectiveAvgMonthlyBandwidth95: undefined,
           }
         }
       },
       created() {
-        // this.getList();
+        this.$nextTick(() => {
+          this.getList(1);
+        });
       },
       activated() {
-        this.getList();
+        this.$nextTick(() => {
+          this.getList();
+        });
       },
       methods: {
         /** 查询角色列表 */
-        getList() {
+        getList(num) {
           this.loading = true;
           let newParams = {...this.queryParams};
+          delete newParams['total'];
           newParams['resourceType'] = 1;
           if (newParams['bandwidth95Daily']) {
             newParams['startTime'] = newParams['bandwidth95Daily'][0];
@@ -178,6 +235,34 @@
             newParams['endTime'] = newParams['packageBandwidthDaily'][1];
             delete newParams['packageBandwidthDaily'];
           }
+          if (newParams['avgMonthlyBandwidth95']) {
+            newParams['startTime'] = newParams['avgMonthlyBandwidth95'][0];
+            newParams['endTime'] = newParams['avgMonthlyBandwidth95'][1];
+            delete newParams['avgMonthlyBandwidth95'];
+          }
+          if (newParams['effectiveBandwidth95Daily']) {
+            newParams['startTime'] = newParams['effectiveBandwidth95Daily'][0];
+            newParams['endTime'] = newParams['effectiveBandwidth95Daily'][1];
+            delete newParams['effectiveBandwidth95Daily'];
+          }
+          if (newParams['effectiveBandwidth95Monthly']) {
+            newParams['startTime'] = newParams['effectiveBandwidth95Monthly'][0];
+            newParams['endTime'] = newParams['effectiveBandwidth95Monthly'][1];
+            delete newParams['effectiveBandwidth95Monthly'];
+          }
+          if (newParams['effectiveAvgMonthlyBandwidth95']) {
+            newParams['startTime'] = newParams['effectiveAvgMonthlyBandwidth95'][0];
+            newParams['endTime'] = newParams['effectiveAvgMonthlyBandwidth95'][1];
+            delete newParams['effectiveAvgMonthlyBandwidth95'];
+          }
+          if (newParams && newParams.bandwidthType && !newParams['startTime']) {
+            this.$refs['queryRef'].validate((valid) => {
+              if (!valid) {
+                return false;
+              }
+            });
+            return;
+          }
           listBandWidth(newParams).then(response => {
             this.tableList = response.rows;
             this.queryParams.total = response.total;
@@ -187,6 +272,11 @@
 
         /** 搜索按钮操作 */
         handleQuery() {
+          this.$refs['queryRef'].validate((valid) => {
+            if (!valid) {
+              return false;
+            }
+          });
           this.queryParams.pageNum = 1;
           this.getList();
         },
@@ -203,7 +293,7 @@
           // 生成唯一 key（避免数据冲突）
           const storageKey = `temp_data_${Date.now()}`;
           // 1. 将数据存入 localStorage（需序列化）
-          localStorage.setItem(storageKey, JSON.stringify({list: list, dictList: dictTypeArr}));
+          localStorage.setItem(storageKey, JSON.stringify({list: list, dictList: dictTypeArr, resourceType: 1}));
           // 1. 用 Vue Router 解析目标路由的完整 URL
           const routeLocation = this.$router.resolve({
             name: 'DialogView',
@@ -280,6 +370,6 @@
 
 <style scoped>
   ::v-deep .lastBtnSty .el-form-item__content{
-    margin-left: unset!important;
+    margin-left: 10px!important;
   }
 </style>
diff --git a/src/views/disRevenue/earnManage/serverRevenue/index.vue b/src/views/disRevenue/earnManage/serverRevenue/index.vue
index c3e460d..09caf41 100644
--- a/src/views/disRevenue/earnManage/serverRevenue/index.vue
+++ b/src/views/disRevenue/earnManage/serverRevenue/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="app-container pageTopForm">
-        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="auto" class="demo-ruleForm">
-<!--          <el-col :span="7">-->
+        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="auto" class="demo-ruleForm">
+          <el-col :span="7">
               <el-form-item label="节点名称" prop="nodeName">
                   <el-select
                           v-model="queryParams.nodeName"
@@ -14,8 +14,8 @@
                               :value="item.value"/>
                   </el-select>
               </el-form-item>
-<!--          </el-col>-->
-<!--          <el-col :span="7">-->
+          </el-col>
+          <el-col :span="7">
             <el-form-item label="硬件SN" prop="hardwareSn">
                 <el-input
                         v-model="queryParams.hardwareSn"
@@ -24,13 +24,13 @@
                         @keyup.enter="handleQuery"
                 />
             </el-form-item>
-<!--          </el-col>-->
-<!--          <el-col :span="7">-->
+          </el-col>
+          <el-col :span="7">
             <el-form-item class="lastBtnSty">
-                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
-<!--          </el-col>-->
+          </el-col>
         </el-form>
         <!-- 表格数据 -->
         <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
@@ -103,13 +103,15 @@
           profitTypeList: [],
           // 列显隐信息
           columns: {
-            id: { label: `id`, visible: false },
+            id: { label: `id`, width: '50', visible: false },
             nodeName: { label: `节点名称`, minWidth: '200', visible: true },
-            hardwareSn: { label: `硬件SN`, visible: false},
-            revenueMethod: { label: `收益方式`, slotName: 'tempRevenue', visible: true },
+            hardwareSn: { label: `硬件SN`, minWidth: '200', visible: false},
+            businessName: { label: `业务名称`, minWidth: '150', visible: true},
+            businessCode: { label: `业务编码`, minWidth: '150', visible: false},
+            revenueMethod: { label: `收益方式`, slotName: 'tempRevenue',minWidth: '100', visible: true },
             trafficPort: { label: `流量网口`, minWidth: '250', visible: true },
-            bandwidth95: { label: `包端带宽值（Mbps）`, visible: true },
-            lastModifyTime: { label: `修改时间`, visible: true }
+            bandwidth95: { label: `包端带宽值（Mbps）`, minWidth: '150', visible: true },
+            lastModifyTime: { label: `修改时间`, minWidth: '160', visible: true }
           },
           config: {
             // searcherForm: [
@@ -187,7 +189,8 @@
             businessName: row.businessCode,
             revenueMethod: row.revenueMethod || '1',
             serverIp: row.serverIp,
-            packageBandwidth: row.packageBandwidth
+            packageBandwidth: row.packageBandwidth,
+            trafficPort: row.trafficPort
           };
           this.busiName();
           this.interFaceNameList();
@@ -226,6 +229,7 @@
           }
           updateRevenueConfig(this.formList).then(res => {
             this.open = false;
+            this.getList();
             this.$modal.msgSuccess("操作成功！");
           });
         },
@@ -267,6 +271,6 @@
 
 <style scoped>
   ::v-deep .lastBtnSty .el-form-item__content{
-    margin-left: unset!important;
+    margin-left: 10px!important;
   }
 </style>
diff --git a/src/views/disRevenue/earnManage/switch/index.vue b/src/views/disRevenue/earnManage/switch/index.vue
index 664550f..ac37b29 100644
--- a/src/views/disRevenue/earnManage/switch/index.vue
+++ b/src/views/disRevenue/earnManage/switch/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="app-container pageTopForm">
-      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" label-width="80px" class="demo-ruleForm">
+      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="80px" class="demo-ruleForm">
           <el-col :span="6">
             <el-form-item label="交换机名称" prop="uplinkSwitch">
                   <el-select
@@ -41,7 +41,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="服务器节点名称" prop="nodeName">
+            <el-form-item label="服务器节点名称" title="服务器节点名称" prop="nodeName">
               <el-select
                 v-model="queryParams.nodeName"
                 placeholder="请输入服务器节点名称"
@@ -68,8 +68,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="queryParams.bandwidthType === '1'">
-            <el-form-item label="95宽带值Mbps/日" prop="bandwidth95Daily">
+          <el-col :span="6" v-if="queryParams.bandwidthType === '1'">
+            <el-form-item label="95宽带值Mbps/日" title="95宽带值Mbps/日" prop="bandwidth95Daily" :rules="[{ required: true, message: `95宽带值Mbps/日为必填项`, trigger: 'change' }]">
               <el-date-picker
                 v-model="queryParams.bandwidth95Daily"
                 type="daterange"
@@ -80,8 +80,8 @@
                 end-placeholder="结束日期"/>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="queryParams.bandwidthType === '2'">
-            <el-form-item label="95宽带值Mbps/月" prop="bandwidth95Monthly">
+          <el-col :span="6" v-if="queryParams.bandwidthType === '2'">
+            <el-form-item label="95宽带值Mbps/月" title="95宽带值Mbps/月" prop="bandwidth95Monthly"  :rules="[{ required: true, message: `95宽带值Mbps/月为必填项`, trigger: 'change' }]">
               <el-date-picker
                 v-model="queryParams.bandwidth95Monthly"
                 type="monthrange"
@@ -91,10 +91,70 @@
                 end-placeholder="结束月份"/>
             </el-form-item>
           </el-col>
+          <el-col :span="8" v-if="queryParams.bandwidthType === '3'">
+            <el-form-item label="包端带宽值Mbps/日" title="包端带宽值Mbps/日" prop="packageBandwidthDaily" :rules="[{ required: true, message: `包端带宽值Mbps/日为必填项`, trigger: 'change' }]">
+              <el-date-picker
+                v-model="queryParams.packageBandwidthDaily"
+                type="daterange"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
+            </el-form-item>
+          </el-col>
+        <el-col :span="8" v-if="queryParams.bandwidthType === '4'">
+          <el-form-item label="月均日95值Mbps" title="月均日95值Mbps" prop="avgMonthlyBandwidth95" :rules="[{ required: true, message: `月均日95值Mbps为必填项`, trigger: 'change' }]">
+            <el-date-picker
+              v-model="queryParams.avgMonthlyBandwidth95"
+              type="monthrange"
+              format="yyyy-MM"
+              value-format="yyyy-MM"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="queryParams.bandwidthType === '5'">
+          <el-form-item label="有效95带宽值Mbps/日" title="有效95带宽值Mbps/日" prop="effectiveBandwidth95Daily" :rules="[{ required: true, message: `有效95带宽值Mbps/日为必填项`, trigger: 'change' }]">
+            <el-date-picker
+              v-model="queryParams.effectiveBandwidth95Daily"
+              type="daterange"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="queryParams.bandwidthType === '6'">
+          <el-form-item label="有效95带宽值Mbps/月" title="有效95带宽值Mbps/月" prop="effectiveBandwidth95Monthly" :rules="[{ required: true, message: `有效95带宽值Mbps/月为必填项`, trigger: 'change' }]">
+            <el-date-picker
+              v-model="queryParams.effectiveBandwidth95Monthly"
+              type="monthrange"
+              format="yyyy-MM"
+              value-format="yyyy-MM"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="queryParams.bandwidthType === '7'">
+          <el-form-item label="有效月均日95值Mbps" title="有效月均日95值Mbps" prop="effectiveAvgMonthlyBandwidth95" :rules="[{ required: true, message: `有效月均日95值Mbps为必填项`, trigger: 'change' }]">
+            <el-date-picker
+              v-model="queryParams.effectiveAvgMonthlyBandwidth95"
+              type="daterange"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+        </el-col>
           <el-col :span="6">
             <el-form-item class="lastBtnSty">
-                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -115,13 +175,13 @@
     </div>
 </template>
 
-<script setup>
+<script>
     import {listBandWidth, recalBandWidth} from "@/api/disRevenue/earnManage"
     import {listAllResourList,resNameBtType, postInterFaceName} from "@/api/disRevenue/resource"
     import EchartsLine from "@/components/echartsList/line.vue";
     import TableList from "@/components/table/index.vue";
     export default {
-      name: 'SwitchIndex',
+      name: 'Switch',
       dicts: ['sys_normal_disable','eps_bandwidth_type','rm_topology_type'],
       components: {TableList,EchartsLine},
       data() {
@@ -134,23 +194,23 @@
           nodeNameList:[],  // 服务器节点名称
           // 列显隐信息
           columns: {
-            id: { label: `ID`, visible: false },
-            uplinkSwitch: { label: `交换机名称`, visible: true },
-            hardwareSn: { label: `硬件SN`, visible: false },
-            interfaceName: { label: `接口名称`, visible: true },
-            interfaceLinkDeviceType: { label: `接口连接设备类型`, slotName: 'tempType',
+            id: { label: `ID`,width: '50', visible: false },
+            uplinkSwitch: { label: `交换机名称`, minWidth: '200', visible: true },
+            hardwareSn: { label: `硬件SN`, minWidth: '200', visible: false },
+            interfaceName: { label: `接口名称`, minWidth: '120',visible: true },
+            interfaceLinkDeviceType: { label: `接口连接设备类型`, slotName: 'tempType',minWidth: '180',
               slotHeaderName: '不同的类型统计方式不一样，当类型是服务器时，使用的是接口的接收流量，95带宽值Mbs/日和95带宽值Mbs/月统计的是交换机接口的接收流量；当类型是机房出口的时候，95带宽值Mbs/日和95带宽值Mbs/月统计的是交换机接口的发送流量', visible: true },
-            businessId: {label: `业务代码`},
-            businessName: {label: `业务名称`},
-            bandwidth95Daily: { label: `95宽带值Mbps/日`, width: '200', slotName: 'tempDay', visible: true },
-            bandwidth95Monthly: { label: `95宽带值Mbps/月`, width: '200', slotName: 'tempMonth', visible: true },
-            nodeName: { label: `服务器节点名称`},
-            avgMonthlyBandwidth95: {label: `月均日95值Mbps`, width: '200', slotName: 'tempDay'},
-            effectiveBandwidth95Daily: {label: `有效95带宽值Mbps/日`, width: '200', slotName: 'tempDay'},
-            effectiveBandwidth95Monthly: {label: `有效95带宽值Mbps/月`, width: '200', slotName: 'tempMonth',},
-            effectiveAvgMonthlyBandwidth95: {label: `有效月均日95值Mbps`, width: '200', slotName: 'tempDay'},
-            createTime: { label: `创建时间`, width: '150'},
-            lastModifyTime: { label: `修改时间`, width: '150'}
+            businessId: {label: `业务代码`,minWidth: '150'},
+            businessName: {label: `业务名称`,minWidth: '100'},
+            bandwidth95Daily: { label: `95宽带值Mbps/日`, minWidth: '200', slotName: 'tempDay', visible: true },
+            bandwidth95Monthly: { label: `95宽带值Mbps/月`, minWidth: '200', slotName: 'tempMonth', visible: true },
+            nodeName: { label: `服务器节点名称`, minWidth: '200'},
+            avgMonthlyBandwidth95: {label: `月均日95值Mbps`, minWidth: '200', slotName: 'tempDay'},
+            effectiveBandwidth95Daily: {label: `有效95带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay'},
+            effectiveBandwidth95Monthly: {label: `有效95带宽值Mbps/月`, minWidth: '200', slotName: 'tempMonth',},
+            effectiveAvgMonthlyBandwidth95: {label: `有效月均日95值Mbps`, minWidth: '200', slotName: 'tempDay'},
+            createTime: { label: `创建时间`, minWidth: '160'},
+            lastModifyTime: { label: `修改时间`, minWidth: '160'}
           },
           config: {
             // searcherForm: [
@@ -180,11 +240,16 @@
             bandwidthType:undefined,
             bandwidth95Daily:undefined,
             bandwidth95Monthly:undefined,
+            packageBandwidthDaily: undefined,
+            avgMonthlyBandwidth95: undefined,
+            effectiveBandwidth95Daily: undefined,
+            effectiveBandwidth95Monthly: undefined,
+            effectiveAvgMonthlyBandwidth95: undefined,
           }
         }
       },
       created() {
-        this.getList();
+        this.getList(1);
         this.fnSelectAllName();
       },
       activated() {
@@ -192,12 +257,54 @@
       },
       methods: {
         /** 查询角色列表 */
-        getList() {
+        getList(num) {
           this.loading = true;
           let newParams = {...this.queryParams};
+          delete newParams['total'];
           newParams['resourceType'] = 2;
-          newParams['bandwidth95Daily'] = newParams['bandwidth95Daily'] && newParams['bandwidth95Daily'].length >1 ? newParams['bandwidth95Daily'] : null;
-          newParams['bandwidth95Monthly'] = newParams['bandwidth95Monthly'] && newParams['bandwidth95Monthly'].length >1 ? newParams['bandwidth95Monthly'] : null;
+          if (newParams['bandwidth95Daily']) {
+            newParams['startTime'] = newParams['bandwidth95Daily'][0];
+            newParams['endTime'] = newParams['bandwidth95Daily'][1];
+            delete newParams['bandwidth95Daily'];
+          }
+          if (newParams['bandwidth95Monthly']) {
+            newParams['startTime'] = newParams['bandwidth95Monthly'][0];
+            newParams['endTime'] = newParams['bandwidth95Monthly'][1];
+            delete newParams['bandwidth95Monthly'];
+          }
+          if (newParams['packageBandwidthDaily']) {
+            newParams['startTime'] = newParams['packageBandwidthDaily'][0];
+            newParams['endTime'] = newParams['packageBandwidthDaily'][1];
+            delete newParams['packageBandwidthDaily'];
+          }
+          if (newParams['avgMonthlyBandwidth95']) {
+            newParams['startTime'] = newParams['avgMonthlyBandwidth95'][0];
+            newParams['endTime'] = newParams['avgMonthlyBandwidth95'][1];
+            delete newParams['avgMonthlyBandwidth95'];
+          }
+          if (newParams['effectiveBandwidth95Daily']) {
+            newParams['startTime'] = newParams['effectiveBandwidth95Daily'][0];
+            newParams['endTime'] = newParams['effectiveBandwidth95Daily'][1];
+            delete newParams['effectiveBandwidth95Daily'];
+          }
+          if (newParams['effectiveBandwidth95Monthly']) {
+            newParams['startTime'] = newParams['effectiveBandwidth95Monthly'][0];
+            newParams['endTime'] = newParams['effectiveBandwidth95Monthly'][1];
+            delete newParams['effectiveBandwidth95Monthly'];
+          }
+          if (newParams['effectiveAvgMonthlyBandwidth95']) {
+            newParams['startTime'] = newParams['effectiveAvgMonthlyBandwidth95'][0];
+            newParams['endTime'] = newParams['effectiveAvgMonthlyBandwidth95'][1];
+            delete newParams['effectiveAvgMonthlyBandwidth95'];
+          }
+          if (newParams && newParams.bandwidthType && !newParams['startTime']) {
+            this.$refs['queryRef'].validate((valid) => {
+              if (!valid) {
+                return false;
+              }
+            });
+            return;
+          }
           listBandWidth(newParams).then(response => {
             this.tableList = response.rows;
             this.queryParams.total = response.total;
@@ -231,6 +338,11 @@
         },
         /** 搜索按钮操作 */
         handleQuery() {
+          this.$refs['queryRef'].validate((valid) => {
+            if (!valid) {
+              return false;
+            }
+          });
           this.queryParams.pageNum = 1;
           this.getList()
         },
@@ -247,7 +359,7 @@
           // 生成唯一 key（避免数据冲突）
           const storageKey = `temp_data_${Date.now()}`;
           // 1. 将数据存入 localStorage（需序列化）
-          localStorage.setItem(storageKey, JSON.stringify({list: list, dictList: dictTypeArr}));
+          localStorage.setItem(storageKey, JSON.stringify({list: list, dictList: dictTypeArr, resourceType: 2}));
           // 1. 用 Vue Router 解析目标路由的完整 URL
           const routeLocation = this.$router.resolve({
             name: 'DialogView',
@@ -323,9 +435,14 @@
       }
     }
 </script>
-
-<style scoped>
-  ::v-deep .lastBtnSty .el-form-item__content{
-    margin-left: unset!important;
+<style>
+  ::v-deep .el-tooltip__popper.is-dark{
+    width: 350px!important; /* 固定宽度 */
+    white-space: normal!important; /* 允许换行（默认不换行） */
+  }
+</style>
+<style scoped>
+  ::v-deep .lastBtnSty .el-form-item__content{
+    margin-left: 10px!important;
   }
 </style>
diff --git a/src/views/disRevenue/resource/group/index.vue b/src/views/disRevenue/resource/group/index.vue
index 93de746..389eed8 100644
--- a/src/views/disRevenue/resource/group/index.vue
+++ b/src/views/disRevenue/resource/group/index.vue
@@ -1,20 +1,21 @@
 <template>
     <div class="app-container pageTopForm">
-        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="130px">
-            <el-form-item label="资源组名称" prop="groupName">
-                <el-col :span="4">
-                    <el-input
-                            v-model="queryParams.groupName"
-                            placeholder="请输入资源组名称"
-                            clearable
-                            style="width: 220px"
-                            @keyup.enter="handleQuery"/>
-                </el-col>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
+        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="130px">
+          <el-col :span="6">
+              <el-form-item label="资源组名称" prop="groupName">
+                  <el-input
+                        v-model="queryParams.groupName"
+                        placeholder="请输入资源组名称"
+                        clearable
+                        @keyup.enter="handleQuery"/>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item class="lastBtnSty">
+                  <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+              </el-form-item>
+          </el-col>
         </el-form>
         <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
 <!--            <template #tempTooltip="{ row, column }">-->
@@ -144,3 +145,8 @@
       }
     }
 </script>
+<style scoped>
+  ::v-deep .lastBtnSty .el-form-item__content{
+    margin-left: 10px!important;
+  }
+</style>
diff --git a/src/views/disRevenue/resource/monitorStategy/index.vue b/src/views/disRevenue/resource/monitorStategy/index.vue
index 482c7a1..e082bab 100644
--- a/src/views/disRevenue/resource/monitorStategy/index.vue
+++ b/src/views/disRevenue/resource/monitorStategy/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container pageTopForm">
-    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" label-width="auto">
+    <el-form :model="queryParams" ref="queryRef" size="small" v-show="showSearch" label-width="auto">
       <el-col :span="8">
         <el-form-item label="搜索" prop="switchName">
             <el-input
@@ -26,7 +26,7 @@
         </el-form-item>
       </el-col>
      <el-col :span="6">
-       <el-form-item>
+       <el-form-item class="lastBtnSty">
          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
        </el-form-item>
@@ -59,17 +59,17 @@
         },
         // 列显隐信息
         columns: {
-          id: { label: `ID`,},
-          switchName: { label: `策略名称`, visible: true },
-          switchSn: { label: `描述`,visible: false},
-          interfaceName: { label: `监关联资源组控项`, visible: true },
-          serverName: { label: `包含设备`},
-          connectedDeviceType: { label: `关联监控模版`, visible: true },
-          connected: { label: `策略内容`},
-          type: { label: `策略状态`, visible: true },
-          conType: { label: `下发策略时间`},
-          createTime: { label: `创建时间`},
-          updateTime:{ label: `修改时间`}
+          id: { label: `ID`,width: '50'},
+          switchName: { label: `策略名称`, minWidth: '250', visible: true },
+          switchSn: { label: `描述`,minWidth: '200',visible: false},
+          interfaceName: { label: `监关联资源组控项`,minWidth: '150', visible: true },
+          serverName: { label: `包含设备`,minWidth: '200'},
+          connectedDeviceType: { label: `关联监控模版`,minWidth: '150', visible: true },
+          connected: { label: `策略内容`,minWidth: '200'},
+          type: { label: `策略状态`, minWidth: '100', visible: true },
+          conType: { label: `下发策略时间`,minWidth: '160'},
+          createTime: { label: `创建时间`,minWidth: '160'},
+          updateTime:{ label: `修改时间`,minWidth: '160'}
         },
         config: {
           searcherForm: [
@@ -171,3 +171,8 @@
     }
   }
 </script>
+<style scoped>
+  ::v-deep .lastBtnSty .el-form-item__content{
+    margin-left: 10px!important;
+  }
+</style>
diff --git a/src/views/disRevenue/resource/monitorTemp/index.vue b/src/views/disRevenue/resource/monitorTemp/index.vue
index db6da5a..74c4cb7 100644
--- a/src/views/disRevenue/resource/monitorTemp/index.vue
+++ b/src/views/disRevenue/resource/monitorTemp/index.vue
@@ -1,21 +1,21 @@
 <template>
   <div class="app-container pageTopForm">
-    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="130px">
-      <el-form-item label="模版名称" prop="switchName">
-        <el-col :span="4">
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="130px">
+      <el-col :span="6">
+        <el-form-item label="模版名称" prop="switchName">
           <el-input
             v-model="queryParams.switchName"
             placeholder="请输入模版名称"
             clearable
-            style="width: 220px"
-            @keyup.enter="handleQuery"
-          />
-        </el-col>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
+            @keyup.enter="handleQuery"/>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item class="lastBtnSty">
+          <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-col>
     </el-form>
     <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
       <template #tempType="{ row, column }">
@@ -44,14 +44,14 @@
         },
         // 列显隐信息
         columns: {
-          id: { label: `ID`,},
-          switchName: { label: `模版名称`, visible: true },
-          switchSn: { label: `描述`,visible: false},
-          interfaceName: { label: `监控项`, visible: true },
-          connectedDeviceType: { label: `自动发现项`, visible: true },
-          serverName: { label: `包含资源`,},
-          createTime: { label: `创建时间`,},
-          updateTime:{ label: `修改时间`}
+          id: { label: `ID`,width: '50'},
+          switchName: { label: `模版名称`,minWidth: '150', visible: true },
+          switchSn: { label: `描述`,visible: false, minWidth: '200'},
+          interfaceName: { label: `监控项`, minWidth: '100', visible: true },
+          connectedDeviceType: { label: `自动发现项`, minWidth: '100', visible: true },
+          serverName: { label: `包含资源`, minWidth: '200'},
+          createTime: { label: `创建时间`, minWidth: '160'},
+          updateTime:{ label: `修改时间`, minWidth: '160'}
         },
         config: {
           searcherForm: [
@@ -152,3 +152,8 @@
     }
   }
 </script>
+<style scoped>
+  ::v-deep .lastBtnSty .el-form-item__content{
+    margin-left: 10px!important;
+  }
+</style>
diff --git a/src/views/disRevenue/resource/register/index.vue b/src/views/disRevenue/resource/register/index.vue
index 281bdf7..973756f 100644
--- a/src/views/disRevenue/resource/register/index.vue
+++ b/src/views/disRevenue/resource/register/index.vue
@@ -1,22 +1,21 @@
 <template>
     <div class="app-container pageTopForm">
-        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="auto">
-            <el-form-item label="名称" prop="nameKey">
-                <el-col>
-                    <el-input
-                            v-model="queryParams.resourceName"
-                            placeholder="请输入交换机名称/服务器名称"
-                            clearable
-                            size="mini"
-                            style="width: 220px"
-                            @keyup.enter="handleQuery"
-                    />
-                </el-col>
-            </el-form-item>
-            <el-form-item>
+        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="auto">
+          <el-col :span="6">
+              <el-form-item label="资源名称" prop="resourceName">
+                  <el-input
+                      v-model="queryParams.resourceName"
+                      placeholder="请输入交换机名称/服务器名称"
+                      clearable
+                      @keyup.enter="handleQuery"/>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="lastBtnSty">
                 <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
                 <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
+          </el-col>
         </el-form>
 
         <!-- 表格数据 -->
@@ -62,15 +61,15 @@
           meltiple: true,
           // 列显隐信息
           columns: {
-            id: { label: `ID`},
-            hardwareSn: { label: `硬件SN`,width: '120', visible: true },
-            resourceType: { label: `资源类型`, width: '120', slotName: 'tempType', visible: true },
-            resourceName: { label: `资源名称`, visible: true },
-            ipAddress: { label: `IP地址`, visible: true },
-            resourcePort: { label: `端口`, slotName: 'tempPort', visible: true },
-            protocol: { label: `协议`, width: '120', slotName: 'tempProtocol', visible: true },
-            registrationStatus: { label: `注册状态`, slotName: 'tempStatus', visible: true },
-            onlineStatus: { label: `在线状态`, slotName: 'tempOnlineStatus', visible: true }
+            id: { label: `ID`,width: '80'},
+            hardwareSn: { label: `硬件SN`,minWidth: '250', visible: true },
+            resourceType: { label: `资源类型`, minWidth: '100', slotName: 'tempType', visible: true },
+            resourceName: { label: `资源名称`, visible: true, minWidth: '200'},
+            ipAddress: { label: `IP地址`, minWidth: '200', visible: true },
+            resourcePort: { label: `端口`, slotName: 'tempPort', minWidth: '80', visible: true },
+            protocol: { label: `协议`, minWidth: '80', slotName: 'tempProtocol', visible: true },
+            registrationStatus: { label: `注册状态`, slotName: 'tempStatus', minWidth: '80', visible: true },
+            onlineStatus: { label: `在线状态`, slotName: 'tempOnlineStatus', minWidth: '80', visible: true }
           },
           config: {
             searcherForm: [
@@ -182,4 +181,7 @@
 </script>
 
 <style scoped>
+  ::v-deep .lastBtnSty .el-form-item__content{
+    margin-left: 10px!important;
+  }
 </style>
diff --git a/src/views/disRevenue/resource/resMonitor/index.vue b/src/views/disRevenue/resource/resMonitor/index.vue
index 4e486a6..3025c64 100644
--- a/src/views/disRevenue/resource/resMonitor/index.vue
+++ b/src/views/disRevenue/resource/resMonitor/index.vue
@@ -31,7 +31,7 @@
         </pane>
         <!--用户数据-->
         <pane size="84">
-          <el-form :model="queryParams" ref="queryRef" v-show="showSearch" label-width="80px">
+          <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="80px">
             <el-col :span="7">
               <el-form-item label="搜索" prop="switchName">
                 <el-input
@@ -72,8 +72,8 @@
             </el-col>
             <el-col :span="5">
               <el-form-item class="lastBtnSty">
-                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
               </el-form-item>
             </el-col>
           </el-form>
@@ -120,14 +120,14 @@
         },
         // 列显隐信息
         columns: {
-          id: { label: `ID`, visible: false },
-          switchSn: { label: `硬件SN`,visible: true},
-          switchName: { label: `资源名称`, visible: true },
-          interfaceName: { label: `ip地址`, visible: true },
-          connectedDeviceType: { label: `监控项`, slotName: 'tempType', visible: true },
-          serverName: { label: `自动发现项`, visible: true},
-          serverSn: { label: `CPU使用率%`,visible: true},
-          serverPort: { label: `内存使用率`, visible: true }
+          id: { label: `ID`, width: '50', visible: false },
+          switchSn: { label: `硬件SN`, minWidth: '200', visible: true},
+          switchName: { label: `资源名称`, minWidth: '250', visible: true },
+          interfaceName: { label: `ip地址`, minWidth: '100', visible: true },
+          connectedDeviceType: { label: `监控项`, minWidth: '100', slotName: 'tempType', visible: true },
+          serverName: { label: `自动发现项`, minWidth: '120', visible: true},
+          serverSn: { label: `CPU使用率%`, minWidth: '120', visible: true},
+          serverPort: { label: `内存使用率`,minWidth: '120', visible: true }
         },
         config: {
           searcherForm: [
@@ -270,6 +270,6 @@
 </script>
 <style scoped>
   ::v-deep .lastBtnSty .el-form-item__content{
-    margin-left: unset!important;
+    margin-left: 10px!important;
   }
 </style>
diff --git a/src/views/disRevenue/resource/topology/index.vue b/src/views/disRevenue/resource/topology/index.vue
index c789b8c..24226a2 100644
--- a/src/views/disRevenue/resource/topology/index.vue
+++ b/src/views/disRevenue/resource/topology/index.vue
@@ -1,21 +1,21 @@
 <template>
     <div class="app-container pageTopForm">
-        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="130px">
-            <el-form-item label="交换机名称" prop="switchName">
-                <el-col :span="4">
-                    <el-input
-                            v-model="queryParams.switchName"
-                            placeholder="请输入交互机名称"
-                            clearable
-                            style="width: 220px"
-                            @keyup.enter="handleQuery"
-                    />
-                </el-col>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
+        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="130px">
+          <el-col :span="6">
+              <el-form-item label="交换机名称" prop="switchName">
+                  <el-input
+                      v-model="queryParams.switchName"
+                      placeholder="请输入交互机名称"
+                      clearable
+                      @keyup.enter="handleQuery"/>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item class="lastBtnSty">
+                  <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+              </el-form-item>
+          </el-col>
         </el-form>
         <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
           <template #tempType="{ row, column }">
@@ -44,16 +44,16 @@
           },
           // 列显隐信息
           columns: {
-            id: { label: `ID`, visible: false },
-            switchName: { label: `交换机名称`, visible: true },
-            switchSn: { label: `交换机硬件SN`,visible: false},
-            interfaceName: { label: `接口名称`, visible: true },
-            connectedDeviceType: { label: `接口连接设备类型`, slotName: 'tempType', visible: true },
-            serverName: { label: `服务器名称`, visible: true},
-            serverSn: { label: `服务器硬件SN`,visible: false},
-            serverPort: { label: `服务器网口`, visible: true },
-            createTime: { label: `创建时间`,visible: false},
-            updateTime:{ label: `修改时间`,visible: false}
+            id: { label: `ID`, width: '50', visible: false },
+            switchName: { label: `交换机名称`, minWidth: '150', visible: true },
+            switchSn: { label: `交换机硬件SN`, minWidth: '200', visible: false},
+            interfaceName: { label: `接口名称`, minWidth: '100', visible: true },
+            connectedDeviceType: { label: `接口连接设备类型`, slotName: 'tempType', minWidth: '150',  visible: true },
+            serverName: { label: `服务器名称`, minWidth: '200', visible: true},
+            serverSn: { label: `服务器硬件SN`, minWidth: '200', visible: false},
+            serverPort: { label: `服务器网口`, minWidth: '250', visible: true },
+            createTime: { label: `创建时间`, minWidth: '150', visible: false},
+            updateTime:{ label: `修改时间`, minWidth: '150', visible: false}
           },
           config: {
             searcherForm: [
@@ -144,3 +144,8 @@
       }
     }
 </script>
+<style scoped>
+  ::v-deep .lastBtnSty .el-form-item__content{
+    margin-left: 10px!important;
+  }
+</style>