From 5a35edad3883c7bc7c18aa0a59967799c788991a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=B7=E5=86=89=E5=86=89?= <kangranran@dingxuantech.cn>
Date: Mon, 8 Sep 2025 18:11:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=E3=80=81=E5=9B=BE=E5=BD=A2=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E9=BB=98=E8=AE=A4=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                  |  1 +
 src/components/echartsList/dateTimeSelect.vue | 51 +++++++++-------
 src/components/table/index.vue                | 58 ++++++++++++++++---
 src/utils/request.js                          | 24 +++++---
 src/views/agentCollect/cpuData/cpuData.vue    | 18 +++---
 src/views/agentCollect/diskData/diskData.vue  | 18 +++---
 .../agentCollect/dockerData/dockerData.vue    | 18 +++---
 .../agentCollect/memoryData/memoryData.vue    | 18 +++---
 .../mountPointData/mountPointData.vue         | 18 +++---
 .../agentCollect/systemData/systemData.vue    | 18 +++---
 .../disRevenue/earnManage/business/index.vue  | 18 +++---
 .../earnManage/revenueMethod/index.vue        | 18 +++---
 .../earnManage/server/dialogView.vue          | 50 +++++++++-------
 .../disRevenue/earnManage/server/index.vue    | 18 ++----
 .../earnManage/serverRevenue/index.vue        | 19 +++---
 .../disRevenue/earnManage/switch/index.vue    | 19 +++---
 src/views/disRevenue/resource/group/index.vue | 18 +++---
 .../resource/monitorStategy/index.vue         | 18 +++---
 .../disRevenue/resource/monitorTemp/index.vue | 18 +++---
 .../disRevenue/resource/register/index.vue    | 18 +++---
 .../disRevenue/resource/resMonitor/index.vue  | 13 +----
 .../disRevenue/resource/topology/index.vue    | 18 +++---
 src/views/index.vue                           | 10 ++--
 23 files changed, 276 insertions(+), 221 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 12d8850..ce960bd 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -139,6 +139,7 @@ aside {
 
 //main-container全局样式
 .app-container {
+  height: calc(100vh - 132px);
   padding: 8px 20px 20px;
 }
 
diff --git a/src/components/echartsList/dateTimeSelect.vue b/src/components/echartsList/dateTimeSelect.vue
index 36570a7..ceb8e75 100644
--- a/src/components/echartsList/dateTimeSelect.vue
+++ b/src/components/echartsList/dateTimeSelect.vue
@@ -88,30 +88,41 @@
         },
         // 获取前一个月的所有日期
         getDaysOfPreviousMonth(star, end) {
+          // 1. 获取当前日期（终点日期）
           const currentDate = new Date();
-          const currentYear = currentDate.getFullYear();
-          const currentMonth = currentDate.getMonth(); // 0-11 表示 1-12 月
+          const endYear = currentDate.getFullYear();
+          const endMonth = currentDate.getMonth(); // 0=1月，11=12月
+          const endDay = currentDate.getDate();     // 当前日（如8）
 
-          // 计算前一个月的年份和月份
-          const prevMonth = currentMonth - 1;
-          const prevYear = prevMonth >= 0 ? currentYear : currentYear - 1;
-          const prevMonthActual = prevMonth >= 0 ? prevMonth : 11; // 11 表示 12 月
+          // 2. 计算起点日期（当前日期的“上月同日”，处理边界：如3月31日→2月28/29日）
+          const startDate = new Date(endYear, endMonth, endDay);
+          // 核心：将当前日期的月份减1（得到上月同日，自动处理天数不足问题）
+          startDate.setMonth(startDate.getMonth() - 1);
 
-          // 获取第一天和最后一天
-          const firstDay = star ? new Date(star) : new Date(prevYear, prevMonthActual, 1);
-          const lastDay = end ? new Date(end) : new Date(prevYear, prevMonthActual + 1, 0); // 下个月首日减 1 天
+          // 3. 提取起点日期的年、月、日（用于循环判断）
+          const startYear = startDate.getFullYear();
+          const startMonth = startDate.getMonth();
+          const startDay = startDate.getDate();
 
-          // 生成所有日期
-          const oneMonthDays = [];
-          let currentDay = firstDay;
-          while (currentDay <= lastDay) {
-            // 格式化为 YYYY-MM-DD
-            const formattedDate = currentDay.toISOString().split('T')[0];
-            oneMonthDays.push(formattedDate);
-            currentDay = new Date(currentDay); // 避免引用同一对象
-            currentDay.setDate(currentDay.getDate() + 1);
+          // 4. 循环生成“起点~终点”的所有日期
+          const dateCollection = [];
+          // 临时日期：从起点日期开始递增
+          const tempDate = new Date(startYear, startMonth, startDay);
+
+          // 循环条件：临时日期 <= 当前日期（终点）
+          while (tempDate <= currentDate) {
+            // 格式化日期为“YYYY-MM-DD”（补零处理：如8月→08，5日→05）
+            const year = tempDate.getFullYear();
+            const month = String(tempDate.getMonth() + 1).padStart(2, '0');
+            const day = String(tempDate.getDate()).padStart(2, '0');
+            const formattedDate = `${year}-${month}-${day}`;
+
+            dateCollection.push(formattedDate);
+
+            // 临时日期加1天（进入下一天）
+            tempDate.setDate(tempDate.getDate() + 1);
           }
-          let timeArr = [oneMonthDays[0], oneMonthDays[oneMonthDays.length - 1]];
+          let timeArr = [dateCollection[0], dateCollection[dateCollection.length - 1]];
           this.$emit("dataChange", this.isActive, [], timeArr);
           // this.$emit("dataChange", this.isActive, oneMonthDays);
         },
@@ -120,7 +131,7 @@
           const threeMonths = [];
           const today = new Date(); // 当前日期
           const currentYear = today.getFullYear();
-          const currentMonth = today.getMonth(); // 月份从0开始（0=1月，11=12月）
+          const currentMonth = today.getMonth() + 1; // 月份从0开始（0=1月，11=12月）
           // 循环获取前3个月（i=0: 前1个月，i=1: 前2个月，i=2: 前3个月）
           for (let i = 1; i <= num; i++) {
             // 计算目标月份（当前月 - i）
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index ba9463b..1216120 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="w100 h100">
         <!--  表格头部按钮  -->
         <el-row :gutter="10" class="mb8">
             <template v-if="config && config.tableButton && config.tableButton.top">
@@ -10,7 +10,7 @@
             <right-toolbar v-if="!(config && config.colTopHiddenIcon)" :showSearch.sync="showSearch" @queryTable="renderList" :columns="columns"></right-toolbar>
         </el-row>
         <!-- 表格数据 -->
-        <el-table v-loading="loading" :data="tableList" ref="selChangeList" highlight-selection-row @selection-change="handleSelectionChange">
+        <el-table height="80%" 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="left" :show-overflow-tooltip="true">
@@ -47,7 +47,19 @@
                 </template>
             </el-table-column>
         </el-table>
-        <pagination v-show="queryParams.total > 0" :total="queryParams.total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="renderList" />
+        <pagination v-show="queryParams.total > 0" :layout="queryParams && queryParams.layout" :total="queryParams.total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="renderList" />
+
+        <el-dialog title="导出项" :visible.sync="dialogOpen" width="800px" append-to-body>
+          <el-checkbox-group v-model="checkColumns">
+            <template v-for="(item, key, index) of columns">
+              <el-checkbox v-if="key !== 'id'" :label="key" :key="key" style="width: 25%;margin-right: 0px;">{{item.label}}</el-checkbox>
+            </template>
+          </el-checkbox-group>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="diaColSubmit">确 定</el-button>
+            <el-button @click="diaColCancel">取 消</el-button>
+          </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -66,9 +78,10 @@
           queryParams: {
               type: Object,
               default: {
-                  total: 0,
-                  pageNum: 1,
-                  pageSize: 10,
+                total: 0,
+                pageNum: 1,
+                pageSize: 10,
+                layout: 'total, sizes, prev, pager, next, jumper'
               }
           },
           config: {
@@ -83,9 +96,11 @@
         return {
           loading: false,
           showSearch: true,
+          dialogOpen: false,
           ids: [],
           selectList: [],
           isProcessing: false,  // 防止事件循环的标志位
+          checkColumns: []
         }
       },
       // 监听showSearch的变化，并且把变化后的值传给父组件
@@ -98,8 +113,35 @@
       },
       methods: {
         // 所有方法都抛出到父组件里去
-        handleClick(item, row) {
-          this.$emit("fnClick", item, row, this.ids, this.selectList);
+        handleClick(result, row) {
+          if (result && result.fnCode) {
+            switch (result.fnCode) {
+              case 'export':
+                this.dialogOpen = true;
+                this.diaColumnCheck();
+                break;
+              default:
+                this.$emit("fnClick", result, row, this.ids, this.selectList);
+            }
+          }
+        },
+        // 导出弹窗 默认选中项
+        diaColumnCheck() {
+          this.checkColumns = [];
+          Object.keys(this.columns).forEach(item => {
+            if (item !== 'id' && this.columns[item] && this.columns[item].visible) {
+              this.checkColumns.push(item);
+            }
+          });
+        },
+        // 弹窗确认
+        diaColSubmit(){
+          this.$emit("fnClick", {fnCode: 'export'}, {properties: this.checkColumns});
+          this.dialogOpen = false;
+        },
+        // 弹窗取消
+        diaColCancel() {
+          this.dialogOpen = false;
         },
 
         /** 多选框选中数据 */
diff --git a/src/utils/request.js b/src/utils/request.js
index e8333d7..8266971 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -123,14 +123,24 @@ service.interceptors.response.use(res => {
 )
 
 // 通用下载方法
-export function download(url, params, filename, config) {
+export function download(url, params, filename, config, type) {
+  let typeParams = {};
+  if (type && type === 'json') {
+    typeParams = {
+      headers: { 'Content-Type': 'application/json' },
+      responseType: 'blob',
+      ...config
+    };
+  } else {
+    typeParams = {
+      transformRequest: [(params) => { return tansParams(params) }],
+      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      responseType: 'blob',
+      ...config
+    };
+  }
   downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
-  return service.post(url, params, {
-    transformRequest: [(params) => { return tansParams(params) }],
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    responseType: 'blob',
-    ...config
-  }).then(async (data) => {
+  return service.post(url, params, typeParams).then(async (data) => {
     const isBlob = blobValidate(data)
     if (isBlob) {
       const blob = new Blob([data])
diff --git a/src/views/agentCollect/cpuData/cpuData.vue b/src/views/agentCollect/cpuData/cpuData.vue
index edf5a09..6cae4da 100644
--- a/src/views/agentCollect/cpuData/cpuData.vue
+++ b/src/views/agentCollect/cpuData/cpuData.vue
@@ -130,15 +130,15 @@
               }).catch(() => {});
               break;
             case 'export':
-              let dataList = [];
-              Object.keys(this.columns).forEach(item => {
-                if (item.visible) {
-                  dataList.push(item.prop);
-                }
-              });
-              this.download("rocketmq/cpuInfo/export", {
-                properties: dataList
-              }, `CPU数据_${new Date().getTime()}.xlsx`);
+              // let dataList = [];
+              // Object.keys(this.columns).forEach(item => {
+              //   if (item.visible) {
+              //     dataList.push(item.prop);
+              //   }
+              // });
+              // this.download("rocketmq/cpuInfo/export", {properties: dataList}, `CPU数据_${new Date().getTime()}.xlsx`);
+              let paramsList = Object.assign({}, this.queryParams,rowData);
+              this.download("rocketmq/cpuInfo/export", paramsList, `CPU数据_${new Date().getTime()}.xlsx`, null, 'json');
               break;
             default:
           }
diff --git a/src/views/agentCollect/diskData/diskData.vue b/src/views/agentCollect/diskData/diskData.vue
index 7195a51..7fe24cc 100644
--- a/src/views/agentCollect/diskData/diskData.vue
+++ b/src/views/agentCollect/diskData/diskData.vue
@@ -127,15 +127,15 @@
               }).catch(() => {});
               break;
             case 'export':
-              let dataList = [];
-              Object.keys(this.columns).forEach(item => {
-                if (item.visible) {
-                  dataList.push(item.prop);
-                }
-              });
-              this.download("rocketmq/diskInfo/export", {
-                properties: dataList
-              }, `磁盘数据_${new Date().getTime()}.xlsx`);
+              // let dataList = [];
+              // Object.keys(this.columns).forEach(item => {
+              //   if (item.visible) {
+              //     dataList.push(item.prop);
+              //   }
+              // });
+              // this.download("rocketmq/diskInfo/export", {properties: dataList}, `磁盘数据_${new Date().getTime()}.xlsx`);
+              let paramsList = Object.assign({}, this.queryParams,rowData);
+              this.download("rocketmq/diskInfo/export", paramsList, `磁盘数据_${new Date().getTime()}.xlsx`, null, 'json');
               break;
             default:
           }
diff --git a/src/views/agentCollect/dockerData/dockerData.vue b/src/views/agentCollect/dockerData/dockerData.vue
index 3c3daec..155a0bc 100644
--- a/src/views/agentCollect/dockerData/dockerData.vue
+++ b/src/views/agentCollect/dockerData/dockerData.vue
@@ -124,15 +124,15 @@
               }).catch(() => {});
               break;
             case 'export':
-              let dataList = [];
-              Object.keys(this.columns).forEach(item => {
-                if (item.visible) {
-                  dataList.push(item.prop);
-                }
-              });
-              this.download("rocketmq/dockerInfo/export", {
-                properties: dataList
-              }, `容器数据_${new Date().getTime()}.xlsx`);
+              // let dataList = [];
+              // Object.keys(this.columns).forEach(item => {
+              //   if (item.visible) {
+              //     dataList.push(item.prop);
+              //   }
+              // });
+              // this.download("rocketmq/dockerInfo/export", {properties: dataList}, `容器数据_${new Date().getTime()}.xlsx`);
+              let paramsList = Object.assign({}, this.queryParams,rowData);
+              this.download("rocketmq/dockerInfo/export", paramsList, `容器数据_${new Date().getTime()}.xlsx`, null, 'json');
               break;
             default:
           }
diff --git a/src/views/agentCollect/memoryData/memoryData.vue b/src/views/agentCollect/memoryData/memoryData.vue
index b482008..41879ff 100644
--- a/src/views/agentCollect/memoryData/memoryData.vue
+++ b/src/views/agentCollect/memoryData/memoryData.vue
@@ -124,15 +124,15 @@
               }).catch(() => {});
               break;
             case 'export':
-              let dataList = [];
-              Object.keys(this.columns).forEach(item => {
-                if (item.visible) {
-                  dataList.push(item.prop);
-                }
-              });
-              this.download("rocketmq/memoryInfo/export", {
-                properties: dataList
-              }, `内存信息数据_${new Date().getTime()}.xlsx`);
+              // let dataList = [];
+              // Object.keys(this.columns).forEach(item => {
+              //   if (item.visible) {
+              //     dataList.push(item.prop);
+              //   }
+              // });
+              // this.download("rocketmq/memoryInfo/export", {properties: dataList}, `内存信息数据_${new Date().getTime()}.xlsx`);
+              let paramsList = Object.assign({}, this.queryParams,rowData);
+              this.download("rocketmq/memoryInfo/export", paramsList, `内存信息数据_${new Date().getTime()}.xlsx`, null, 'json');
               break;
             default:
           }
diff --git a/src/views/agentCollect/mountPointData/mountPointData.vue b/src/views/agentCollect/mountPointData/mountPointData.vue
index adca5dd..8e8cd83 100644
--- a/src/views/agentCollect/mountPointData/mountPointData.vue
+++ b/src/views/agentCollect/mountPointData/mountPointData.vue
@@ -123,15 +123,15 @@
               }).catch(() => {});
               break;
             case 'export':
-              let dataList = [];
-              Object.keys(this.columns).forEach(item => {
-                if (item.visible) {
-                  dataList.push(item.prop);
-                }
-              });
-              this.download("rocketmq/mountPointInfo/export", {
-                properties: dataList
-              }, `挂载点信息数据_${new Date().getTime()}.xlsx`);
+              // let dataList = [];
+              // Object.keys(this.columns).forEach(item => {
+              //   if (item.visible) {
+              //     dataList.push(item.prop);
+              //   }
+              // });
+              // this.download("rocketmq/mountPointInfo/export", {properties: dataList}, `挂载点信息数据_${new Date().getTime()}.xlsx`);
+              let paramsList = Object.assign({}, this.queryParams,rowData);
+              this.download("rocketmq/mountPointInfo/export", paramsList, `挂载点信息数据_${new Date().getTime()}.xlsx`, null, 'json');
               break;
             default:
           }
diff --git a/src/views/agentCollect/systemData/systemData.vue b/src/views/agentCollect/systemData/systemData.vue
index 06e2579..873bd92 100644
--- a/src/views/agentCollect/systemData/systemData.vue
+++ b/src/views/agentCollect/systemData/systemData.vue
@@ -129,15 +129,15 @@
               }).catch(() => {});
               break;
             case 'export':
-              let dataList = [];
-              Object.keys(this.columns).forEach(item => {
-                if (item.visible) {
-                  dataList.push(item.prop);
-                }
-              });
-              this.download("rocketmq/systemInfo/export", {
-                properties: dataList
-              }, `系统信息数据_${new Date().getTime()}.xlsx`);
+              // let dataList = [];
+              // Object.keys(this.columns).forEach(item => {
+              //   if (item.visible) {
+              //     dataList.push(item.prop);
+              //   }
+              // });
+              // this.download("rocketmq/systemInfo/export", {properties: dataList}, `系统信息数据_${new Date().getTime()}.xlsx`);
+              let paramsList = Object.assign({}, this.queryParams,rowData);
+              this.download("rocketmq/systemInfo/export", paramsList, `系统信息数据_${new Date().getTime()}.xlsx`, null, 'json');
               break;
             default:
           }
diff --git a/src/views/disRevenue/earnManage/business/index.vue b/src/views/disRevenue/earnManage/business/index.vue
index e8fd871..d111056 100644
--- a/src/views/disRevenue/earnManage/business/index.vue
+++ b/src/views/disRevenue/earnManage/business/index.vue
@@ -158,15 +158,15 @@
               }).catch(() => {});
               break;
             case 'export':
-              let dataList = [];
-              Object.keys(this.columns).forEach(item => {
-                if (item.visible) {
-                  dataList.push(item.prop);
-                }
-              });
-              this.download("/system/Business/export", {
-                properties: dataList,
-              }, `业务管理_${new Date().getTime()}.xlsx`);
+              // let dataList = [];
+              // Object.keys(this.columns).forEach(item => {
+              //   if (item.visible) {
+              //     dataList.push(item.prop);
+              //   }
+              // });
+              // this.download("/system/Business/export", {properties: dataList,}, `业务管理_${new Date().getTime()}.xlsx`);
+              let paramsList = Object.assign({}, this.queryParams,rowData);
+              this.download("system/Business/export", paramsList, `业务管理_${new Date().getTime()}.xlsx`, null, 'json');
               break;
             default:
 
diff --git a/src/views/disRevenue/earnManage/revenueMethod/index.vue b/src/views/disRevenue/earnManage/revenueMethod/index.vue
index 8ce6ef2..ca5682b 100644
--- a/src/views/disRevenue/earnManage/revenueMethod/index.vue
+++ b/src/views/disRevenue/earnManage/revenueMethod/index.vue
@@ -111,15 +111,15 @@
           if (result && result.fnCode) {
             switch (result.fnCode) {
               case 'export':
-                let dataList = [];
-                Object.keys(this.columns).forEach(item => {
-                  if (item.visible) {
-                    dataList.push(item.prop);
-                  }
-                });
-                this.download("/system/record/export", {
-                  properties: dataList,
-                }, `收益方式修改记录_${new Date().getTime()}.xlsx`);
+                // let dataList = [];
+                // Object.keys(this.columns).forEach(item => {
+                //   if (item.visible) {
+                //     dataList.push(item.prop);
+                //   }
+                // });
+                // this.download("/system/record/export", {properties: dataList,}, `收益方式修改记录_${new Date().getTime()}.xlsx`);
+                let paramsList = Object.assign({}, this.queryParams,rowData);
+                this.download("system/record/export", paramsList, `收益方式修改记录_${new Date().getTime()}.xlsx`, null, 'json');
                 break;
               default:
             }
diff --git a/src/views/disRevenue/earnManage/server/dialogView.vue b/src/views/disRevenue/earnManage/server/dialogView.vue
index 4f7630d..8b3d32e 100644
--- a/src/views/disRevenue/earnManage/server/dialogView.vue
+++ b/src/views/disRevenue/earnManage/server/dialogView.vue
@@ -258,36 +258,46 @@
       // 获取前一个月的所有日期
       getDaysOfPreviousMonth(star, end) {
         const currentDate = new Date();
-        const currentYear = currentDate.getFullYear();
-        const currentMonth = currentDate.getMonth(); // 0-11 表示 1-12 月
+        const endYear = currentDate.getFullYear();
+        const endMonth = currentDate.getMonth(); // 0=1月，11=12月
+        const endDay = currentDate.getDate();     // 当前日（如8）
 
-        // 计算前一个月的年份和月份
-        const prevMonth = currentMonth - 1;
-        const prevYear = prevMonth >= 0 ? currentYear : currentYear - 1;
-        const prevMonthActual = prevMonth >= 0 ? prevMonth : 11; // 11 表示 12 月
+        // 2. 计算起点日期（当前日期的“上月同日”，处理边界：如3月31日→2月28/29日）
+        const startDate = new Date(endYear, endMonth, endDay);
+        // 核心：将当前日期的月份减1（得到上月同日，自动处理天数不足问题）
+        startDate.setMonth(startDate.getMonth() - 1);
 
-        // 获取第一天和最后一天
-        const firstDay = star ? new Date(star) : new Date(prevYear, prevMonthActual, 1);
-        const lastDay = end ? new Date(end) : new Date(prevYear, prevMonthActual + 1, 0); // 下个月首日减 1 天
+        // 3. 提取起点日期的年、月、日（用于循环判断）
+        const startYear = startDate.getFullYear();
+        const startMonth = startDate.getMonth();
+        const startDay = startDate.getDate();
 
-        // 生成所有日期
-        const oneMonthDays = [];
-        let currentDay = firstDay;
-        while (currentDay <= lastDay) {
-          // 格式化为 YYYY-MM-DD
-          const formattedDate = currentDay.toISOString().split('T')[0];
-          oneMonthDays.push(formattedDate);
-          currentDay = new Date(currentDay); // 避免引用同一对象
-          currentDay.setDate(currentDay.getDate() + 1);
+        // 4. 循环生成“起点~终点”的所有日期
+        const dateCollection = [];
+        // 临时日期：从起点日期开始递增
+        const tempDate = new Date(startYear, startMonth, startDay);
+
+        // 循环条件：临时日期 <= 当前日期（终点）
+        while (tempDate <= currentDate) {
+          // 格式化日期为“YYYY-MM-DD”（补零处理：如8月→08，5日→05）
+          const year = tempDate.getFullYear();
+          const month = String(tempDate.getMonth() + 1).padStart(2, '0');
+          const day = String(tempDate.getDate()).padStart(2, '0');
+          const formattedDate = `${year}-${month}-${day}`;
+
+          dateCollection.push(formattedDate);
+
+          // 临时日期加1天（进入下一天）
+          tempDate.setDate(tempDate.getDate() + 1);
         }
-        return {startTime: oneMonthDays[0], endTime: oneMonthDays[oneMonthDays.length - 1]};
+        return {startTime: dateCollection[0], endTime: dateCollection[dateCollection.length - 1]};
       },
       // 获取前一年的月
       getLastMonths() {
         const threeMonths = [];
         const today = new Date(); // 当前日期
         const currentYear = today.getFullYear();
-        const currentMonth = today.getMonth(); // 月份从0开始（0=1月，11=12月）
+        const currentMonth = today.getMonth() + 1; // 月份从0开始（0=1月，11=12月）
         // 循环获取前3个月（i=0: 前1个月，i=1: 前2个月，i=2: 前3个月）
         for (let i = 1; i <= 12; i++) {
           // 计算目标月份（当前月 - i）
diff --git a/src/views/disRevenue/earnManage/server/index.vue b/src/views/disRevenue/earnManage/server/index.vue
index 9f89d65..cfdb53e 100644
--- a/src/views/disRevenue/earnManage/server/index.vue
+++ b/src/views/disRevenue/earnManage/server/index.vue
@@ -127,7 +127,7 @@
         </el-form>
 
         <!-- 表格数据 -->
-        <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
+        <TableList class="w100 h100" :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
           <template #tempDay="{ valueKey, row, column }">
             <span v-if="row && row[valueKey]">{{row[valueKey]}}/{{row.createTime}}</span>
           </template>
@@ -200,7 +200,7 @@
             effectiveBandwidth95Daily: undefined,
             effectiveBandwidth95Monthly: undefined,
             effectiveAvgMonthlyBandwidth95: undefined,
-          }
+          },
         }
       },
       created() {
@@ -349,21 +349,13 @@
                 }).catch(() => {});
                 break;
               case 'export':
-                let dataList = [];
-                Object.keys(this.columns).forEach(item => {
-                  if (item.visible) {
-                    dataList.push(item.prop);
-                  }
-                });
-                this.download("system/bandwidth/export", {
-                  properties: dataList,
-                  resourceType: 1
-                }, `服务器带宽收益_${new Date().getTime()}.xlsx`);
+                let paramsList = Object.assign(this.queryParams,rowData, {resourceType: 1});
+                this.download("system/bandwidth/export", paramsList, `服务器带宽收益_${new Date().getTime()}.xlsx`, null, 'json');
                 break;
               default:
             }
           }
-        }
+        },
       }
     }
 </script>
diff --git a/src/views/disRevenue/earnManage/serverRevenue/index.vue b/src/views/disRevenue/earnManage/serverRevenue/index.vue
index 09caf41..c2d902e 100644
--- a/src/views/disRevenue/earnManage/serverRevenue/index.vue
+++ b/src/views/disRevenue/earnManage/serverRevenue/index.vue
@@ -250,16 +250,15 @@
                 this.handleUpdate(rowData);
                 break;
               case 'export':
-                let dataList = [];
-                Object.keys(this.columns).forEach(item => {
-                  if (item.visible) {
-                    dataList.push(item.prop);
-                  }
-                });
-                this.download("system/revenueConfig/export", {
-                  properties: dataList,
-                  resourceType: 1
-                }, `服务器收益方式配置_${new Date().getTime()}.xlsx`);
+                // let dataList = [];
+                // Object.keys(this.columns).forEach(item => {
+                //   if (item.visible) {
+                //     dataList.push(item.prop);
+                //   }
+                // });
+                // this.download("system/revenueConfig/export", {properties: dataList, resourceType: 1}, `服务器收益方式配置_${new Date().getTime()}.xlsx`);
+                let paramsList = Object.assign(this.queryParams,rowData, {resourceType: 1});
+                this.download("system/revenueConfig/export", paramsList, `服务器收益方式配置_${new Date().getTime()}.xlsx`, null, 'json');
                 break;
               default:
             }
diff --git a/src/views/disRevenue/earnManage/switch/index.vue b/src/views/disRevenue/earnManage/switch/index.vue
index ac37b29..e212790 100644
--- a/src/views/disRevenue/earnManage/switch/index.vue
+++ b/src/views/disRevenue/earnManage/switch/index.vue
@@ -417,16 +417,15 @@
                 }).catch(() => {});
                 break;
               case 'export':
-                let dataList = [];
-                Object.keys(this.columns).forEach(item => {
-                  if (item.visible) {
-                    dataList.push(item.prop);
-                  }
-                });
-                this.download("system/bandwidth/export", {
-                  properties: dataList,
-                  resourceType: 2
-                }, `交换机带宽收益_${new Date().getTime()}.xlsx`);
+                // let dataList = [];
+                // Object.keys(this.columns).forEach(item => {
+                //   if (item.visible) {
+                //     dataList.push(item.prop);
+                //   }
+                // });
+                // this.download("system/bandwidth/export", {properties: dataList, resourceType: 2}, `交换机带宽收益_${new Date().getTime()}.xlsx`);
+                let paramsList = Object.assign(this.queryParams,rowData, {resourceType: 2});
+                this.download("system/bandwidth/export", paramsList, `交换机带宽收益_${new Date().getTime()}.xlsx`, null, 'json');
                 break;
               default:
             }
diff --git a/src/views/disRevenue/resource/group/index.vue b/src/views/disRevenue/resource/group/index.vue
index 389eed8..345207f 100644
--- a/src/views/disRevenue/resource/group/index.vue
+++ b/src/views/disRevenue/resource/group/index.vue
@@ -127,15 +127,15 @@
                           }).catch(() => {});
                         break;
                     case 'export':
-                      let dataList = [];
-                      Object.keys(this.columns).forEach(item => {
-                        if (item.visible) {
-                          dataList.push(item.prop);
-                        }
-                      });
-                      this.download("/system/group/export", {
-                          properties: dataList,
-                        }, `资源分组_${new Date().getTime()}.xlsx`);
+                      // let dataList = [];
+                      // Object.keys(this.columns).forEach(item => {
+                      //   if (item.visible) {
+                      //     dataList.push(item.prop);
+                      //   }
+                      // });
+                      // this.download("/system/group/export", {properties: dataList,}, `资源分组_${new Date().getTime()}.xlsx`);
+                      let paramsList = Object.assign({}, this.queryParams,rowData);
+                      this.download("system/group/export", paramsList, `资源分组_${new Date().getTime()}.xlsx`, null, 'json');
                         break;
                     default:
 
diff --git a/src/views/disRevenue/resource/monitorStategy/index.vue b/src/views/disRevenue/resource/monitorStategy/index.vue
index e082bab..766d22c 100644
--- a/src/views/disRevenue/resource/monitorStategy/index.vue
+++ b/src/views/disRevenue/resource/monitorStategy/index.vue
@@ -154,15 +154,15 @@
               }).catch(() => {});
               break;
             case 'export':
-              let dataList = [];
-              Object.keys(this.columns).forEach(item => {
-                if (item.visible) {
-                  dataList.push(item.prop);
-                }
-              });
-              this.download("/system/monitorStategy/export", {
-                properties: dataList,
-              }, `拓扑管理_${new Date().getTime()}.xlsx`);
+              // let dataList = [];
+              // Object.keys(this.columns).forEach(item => {
+              //   if (item.visible) {
+              //     dataList.push(item.prop);
+              //   }
+              // });
+              // this.download("/system/monitorStategy/export", {properties: dataList,}, `拓扑管理_${new Date().getTime()}.xlsx`);
+              let paramsList = Object.assign({}, this.queryParams,rowData);
+              this.download("system/monitorStategy/export", paramsList, `资源监控策略_${new Date().getTime()}.xlsx`, null, 'json');
               break;
             default:
           }
diff --git a/src/views/disRevenue/resource/monitorTemp/index.vue b/src/views/disRevenue/resource/monitorTemp/index.vue
index 74c4cb7..f99ee88 100644
--- a/src/views/disRevenue/resource/monitorTemp/index.vue
+++ b/src/views/disRevenue/resource/monitorTemp/index.vue
@@ -135,15 +135,15 @@
               }).catch(() => {});
               break;
             case 'export':
-              let dataList = [];
-              Object.keys(this.columns).forEach(item => {
-                if (item.visible) {
-                  dataList.push(item.prop);
-                }
-              });
-              this.download("/system/monitorTemp/export", {
-                properties: dataList,
-              }, `拓扑管理_${new Date().getTime()}.xlsx`);
+              // let dataList = [];
+              // Object.keys(this.columns).forEach(item => {
+              //   if (item.visible) {
+              //     dataList.push(item.prop);
+              //   }
+              // });
+              // this.download("/system/monitorTemp/export", {properties: dataList}, `拓扑管理_${new Date().getTime()}.xlsx`);
+              let paramsList = Object.assign({}, this.queryParams,rowData);
+              this.download("system/monitorTemp/export", paramsList, `监控模版_${new Date().getTime()}.xlsx`, null, 'json');
               break;
             default:
           }
diff --git a/src/views/disRevenue/resource/register/index.vue b/src/views/disRevenue/resource/register/index.vue
index 973756f..6838aa9 100644
--- a/src/views/disRevenue/resource/register/index.vue
+++ b/src/views/disRevenue/resource/register/index.vue
@@ -161,15 +161,15 @@
                   });
                   break;
               case 'export':
-                let dataList = [];
-                Object.keys(this.columns).forEach(item => {
-                  if (item.visible) {
-                    dataList.push(item.prop);
-                  }
-                });
-                this.download("/system/registration/export", {
-                  properties: dataList,
-                }, `资源管理_${new Date().getTime()}.xlsx`);
+                // let dataList = [];
+                // Object.keys(this.columns).forEach(item => {
+                //   if (item.visible) {
+                //     dataList.push(item.prop);
+                //   }
+                // });
+                // this.download("/system/registration/export", {properties: dataList,}, `资源管理_${new Date().getTime()}.xlsx`);
+                let paramsList = Object.assign({}, this.queryParams,rowData);
+                this.download("system/registration/export", paramsList, `资源注册_${new Date().getTime()}.xlsx`, null, 'json');
                 break;
               default:
 
diff --git a/src/views/disRevenue/resource/resMonitor/index.vue b/src/views/disRevenue/resource/resMonitor/index.vue
index 3025c64..39c0a2f 100644
--- a/src/views/disRevenue/resource/resMonitor/index.vue
+++ b/src/views/disRevenue/resource/resMonitor/index.vue
@@ -77,7 +77,7 @@
               </el-form-item>
             </el-col>
           </el-form>
-          <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
+          <TableList style="height: calc(100vh - 302px);" :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
             <template #tempType="{ row, column }">
               <dict-tag :options="dict.type.rm_topology_type" :value="row.connectedDeviceType"/>
             </template>
@@ -250,17 +250,6 @@
                 this.$modal.msgSuccess("删除成功")
               }).catch(() => {});
               break;
-            case 'export':
-              let dataList = [];
-              Object.keys(this.columns).forEach(item => {
-                if (item.visible) {
-                  dataList.push(item.prop);
-                }
-              });
-              this.download("/system/management/export", {
-                properties: dataList,
-              }, `拓扑管理_${new Date().getTime()}.xlsx`);
-              break;
             default:
           }
         }
diff --git a/src/views/disRevenue/resource/topology/index.vue b/src/views/disRevenue/resource/topology/index.vue
index 24226a2..bbbb557 100644
--- a/src/views/disRevenue/resource/topology/index.vue
+++ b/src/views/disRevenue/resource/topology/index.vue
@@ -127,15 +127,15 @@
                 }).catch(() => {});
                 break;
               case 'export':
-                let dataList = [];
-                Object.keys(this.columns).forEach(item => {
-                  if (item.visible) {
-                    dataList.push(item.prop);
-                  }
-                });
-                this.download("/system/management/export", {
-                  properties: dataList,
-                }, `拓扑管理_${new Date().getTime()}.xlsx`);
+                // let dataList = [];
+                // Object.keys(this.columns).forEach(item => {
+                //   if (item.visible) {
+                //     dataList.push(item.prop);
+                //   }
+                // });
+                // this.download("/system/management/export", {properties: dataList,}, `拓扑管理_${new Date().getTime()}.xlsx`);
+                let paramsList = Object.assign({}, this.queryParams,rowData);
+                this.download("system/management/export", paramsList, `拓扑管理_${new Date().getTime()}.xlsx`, null, 'json');
                 break;
               default:
             }
diff --git a/src/views/index.vue b/src/views/index.vue
index f0d3de4..1c880d4 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -32,7 +32,7 @@
           <span @click="routerLine(1)" style="float: right;font-size: 12px; color: #0d52d9;cursor: pointer;">更多 >></span>
         </div>
         <div style="height: 90%;overflow: scroll;" class="newSty">
-          <TableList :config="{colHiddenCheck: true, colTopHiddenIcon: true}" :columns="serverColumns" :queryParams="serQueryParams" :tableList="serTableList"></TableList>
+          <TableList style="height: 95%" class="w100" :config="{colHiddenCheck: true, colTopHiddenIcon: true}" :columns="serverColumns" :queryParams="serQueryParams" :tableList="serTableList" @fnRenderList="serverTableList"></TableList>
         </div>
       </div>
       <div class="disInlineBlock h100 p10" style="width: 49.5%;border: 1px solid #d8dce6;border-radius: 10px;vertical-align: middle;">
@@ -41,7 +41,7 @@
           <span @click="routerLine(2)" style="float: right;font-size: 12px; color: #0d52d9;cursor: pointer;">更多 >></span>
         </div>
         <div style="height: 90%;overflow: scroll;" class="newSty">
-          <TableList :config="{colHiddenCheck: true, colTopHiddenIcon: true}" :columns="resMonitorColumns" :queryParams="resQueryParams" :tableList="resTableList"></TableList>
+          <TableList style="height: 95%" class="w100" :config="{colHiddenCheck: true, colTopHiddenIcon: true}" :columns="resMonitorColumns" :queryParams="resQueryParams" :tableList="resTableList" @fnRenderList="resMonitorTableList"></TableList>
         </div>
       </div>
     </div>
@@ -113,7 +113,8 @@ export default {
       serQueryParams: {
         pageNum: 1,
         pageSize: 5,
-        total: 0
+        total: 0,
+        layout: 'pager'
       },
       // 列显隐信息
       resMonitorColumns: {
@@ -127,7 +128,8 @@ export default {
       resQueryParams: {
         pageNum: 1,
         pageSize: 6,
-        total: 0
+        total: 0,
+        layout: 'pager'
       }
     }
   },