对标页面增加分页

src/api/performance.js

@@ -1,119 +1,120 @@
-import request from '@/tools/request'
+import request from "@/tools/request";
 
 //获取场站
 export function getStation(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/wpByCplist?companyids=${data.companyids}&type=${data.type || '-1'}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/wpByCplist?companyids=${data.companyids}&type=${
+      data.type || "-1"
+    }`,
+    method: "get",
+  });
 }
 
 //获取项目
 export function getProject(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/pjByWplist?wpids=${data.wpids}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/pjByWplist?wpids=${data.wpids}`,
+    method: "get",
+  });
 }
 
 //获取线路
 export function getLine(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/lnByPjlist?pjids=${data.pjids}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/lnByPjlist?pjids=${data.pjids}`,
+    method: "get",
+  });
 }
 
 //风机绩效榜
 export function performance(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/performance?companyid=${data.companyid}&getype=${data.getype}&sttype=${data.sttype}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&target=${data.target}&sort=${data.sort}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/performance?companyid=${data.companyid}&getype=${data.getype}&sttype=${data.sttype}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&target=${data.target}&sort=${data.sort}`,
+    method: "get",
+  });
 }
 
 //风机绩效榜明细
 export function performanceMX(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/performanceMX?companyid=${data.companyid}&getype=${data.getype}&sttype=${data.sttype}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&target=${data.target}&sort=${data.sort}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/performanceMX?companyid=${data.companyid}&getype=${data.getype}&sttype=${data.sttype}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&target=${data.target}&sort=${data.sort}`,
+    method: "get",
+  });
 }
 
 //场际对标
 export function cjdb(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/cjdb?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/cjdb?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    method: "get",
+  });
 }
 
 //对标详情
 export function details(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/details?id=${data.id}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/details?id=${data.id}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    method: "get",
+  });
 }
 
-//场际对标
+//场内对标
 export function cndb(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/cndb?companys=${data.companys}&type=${data.type}&wpid=${data.wpids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/cndb?companys=${data.companys}&type=${data.type}&wpid=${data.wpids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    method: "get",
+  });
 }
 
 //项目对标
 export function xmdb(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/xmdb?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&projectids=${data.projectids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/xmdb?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&projectids=${data.projectids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    method: "get",
+  });
 }
 
 //线路对标
 export function xldb(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/xldb?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/xldb?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    method: "get",
+  });
 }
 
 //五项损失率
 export function wxssl(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/wxssl?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/wxssl?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
+    method: "get",
+  });
 }
 
 //同环比
 export function thb(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/benchmarking/cndbthb?companys=${data.companys}&type=${data.type}&wpid=${data.wpids}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/benchmarking/cndbthb?companys=${data.companys}&type=${data.type}&wpid=${data.wpids}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    method: "get",
+  });
 }
 
 //值际对标
 export function zjdb(data) {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/pro-econ-benchmarking-between/zjwxssl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
-        method: 'get',
-    })
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `/pro-econ-benchmarking-between/zjwxssl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
+    method: "get",
+  });
 }
-

src/views/economicsOperation/benchmarkingManagement/intervalBenchmarking/index.vue

@@ -379,6 +379,16 @@
             </template>
           </el-table-column>
         </el-table>
+        <div class="pagination-class">
+          <el-pagination
+            @current-change="handlePageChange"
+            :current-page="page.currentPage"
+            :page-size="page.pagesize"
+            layout="total, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
       </div>
     </div>
     <div v-if="!displayDetail" class="echarts">
@@ -570,6 +580,16 @@
         >
         </el-table-column>
       </el-table>
+      <div class="pagination-class">
+        <el-pagination
+          @current-change="handlePageDChange"
+          :current-page="pageD.currentPage"
+          :page-size="pageD.pagesize"
+          layout="total, prev, pager, next, jumper"
+          :total="pageD.total"
+        >
+        </el-pagination>
+      </div>
     </div>
     <el-dialog
       class="dialogs"
@@ -618,6 +638,16 @@ export default {
   },
   data() {
     return {
+      page: {
+        pagesize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      pageD: {
+        pagesize: 18,
+        currentPage: 1,
+        total: 0,
+      },
       company: "",
       companyOptions: [],
       stationObj: [],
@@ -646,6 +676,7 @@ export default {
       analyisDialog: [],
       screenHeight: window.innerHeight,
       echartsHeight: "55vh",
+      detailRow: {},
     };
   },
   created() {
@@ -677,6 +708,14 @@ export default {
     };
   },
   methods: {
+    handlePageChange(val) {
+      this.page.currentPage = val;
+      this.gerCjdb();
+    },
+    handlePageDChange(val) {
+      this.pageD.currentPage = val;
+      this.goDetail();
+    },
     tabClick(val) {
       this.tabIndex = val;
       this.getStation(this.company);
@@ -713,6 +752,8 @@ export default {
         beginDate: this.starTime,
         endDate: this.endTime,
         wpids: this.stationObj.join(","),
+        pageSize: this.page.pagesize,
+        pageNum: this.page.currentPage,
         target: "",
         sort: "",
       }).then(({ data: res }) => {
@@ -740,9 +781,10 @@ export default {
               children: [],
             },
           ];
-          this.tableData = res.data;
+          this.tableData = res.data.resultList;
+          this.page.total = res.data.total;
           let lossPower = [];
-          res.data.forEach((item) => {
+          res.data.resultList.forEach((item) => {
             let obj = {
               name: item.name,
               value: item.zssdl,
@@ -782,16 +824,23 @@ export default {
       this.chooseList = arr;
     },
     goDetail(row) {
-      this.displayDetail = true;
+      if (!this.displayDetail) {
+        this.displayDetail = true;
+        this.detailRow = row;
+      }
+
       details({
-        id: row.id,
+        id: this.detailRow.id,
         beginDate: this.starTime,
         endDate: this.endTime,
+        pageSize: this.pageD.pagesize,
+        pageNum: this.pageD.currentPage,
         target: "",
         sort: "",
       }).then(({ data: res }) => {
         if (res.data) {
-          this.detailTable = res.data;
+          this.detailTable = res.data.resultList;
+          this.pageD.total = res.data.total;
         }
       });
     },
@@ -1000,6 +1049,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.pagination-class {
+  text-align: right;
+}
 .parcel-box {
   padding: 0 15px;
 }
@@ -1110,7 +1162,7 @@ export default {
   width: 100%;
   background-color: rgba(0, 0, 0, 0.45);
   padding: 5px;
-  margin-bottom: 19px;
+  padding-bottom: 33px;
   border-radius: 5px;
 }
 .line {

src/views/economicsOperation/benchmarkingManagement/projectBenchmarking/index.vue

@@ -396,6 +396,16 @@
             </template>
           </el-table-column>
         </el-table>
+        <div class="pagination-class">
+          <el-pagination
+            @current-change="handlePageChange"
+            :current-page="page.currentPage"
+            :page-size="page.pagesize"
+            layout="total, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
       </div>
     </div>
     <div class="echarts" v-if="!displayDetail">
@@ -433,7 +443,7 @@
         :data="detailTable"
         ref="multipleTable"
         size="mini"
-        height="88vh"
+        height="78vh"
         :cell-style="{ padding: '0px' }"
         :row-style="{ height: '0' }"
         stripe
@@ -611,6 +621,16 @@
         >
         </el-table-column>
       </el-table>
+      <div class="pagination-class">
+        <el-pagination
+          @current-change="handlePageDChange"
+          :current-page="pageD.currentPage"
+          :page-size="pageD.pagesize"
+          layout="total, prev, pager, next, jumper"
+          :total="pageD.total"
+        >
+        </el-pagination>
+      </div>
     </div>
 
     <el-dialog
@@ -652,7 +672,7 @@ import PieChart from "../../homePage/components/pieChart.vue";
 import BarCharts from "../../homePage/components/barCharts.vue";
 import dayinfo from "../compontent/dayinfo.vue";
 export default {
-  name: "intervalBenchmarking", //场际对标
+  name: "projectBenchmarking", //项目对标
   components: {
     PieChart,
     BarCharts,
@@ -660,6 +680,16 @@ export default {
   },
   data() {
     return {
+      page: {
+        pagesize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      pageD: {
+        pagesize: 18,
+        currentPage: 1,
+        total: 0,
+      },
       company: "",
       companyOptions: [],
       stationObj: [],
@@ -690,6 +720,7 @@ export default {
       analyisDialog: [],
       screenHeight: window.innerHeight,
       echartsHeight: "55vh",
+      detailRow: {},
     };
   },
   created() {
@@ -721,6 +752,14 @@ export default {
     };
   },
   methods: {
+    handlePageChange(val) {
+      this.page.currentPage = val;
+      this.gerCndb();
+    },
+    handlePageDChange(val) {
+      this.pageD.currentPage = val;
+      this.goDetail();
+    },
     tabClick(val) {
       this.tabIndex = val;
       this.stationList = [];
@@ -756,8 +795,10 @@ export default {
       }).then(({ data: res }) => {
         if (res.data.length) {
           this.projectList = res.data;
-          this.getXmdb();
+        } else {
+          this.projectList = [];
         }
+        this.getXmdb();
       });
     },
     getXmdb() {
@@ -768,6 +809,8 @@ export default {
         endDate: this.endTime,
         wpids: this.stationObj.join(","),
         projectids: this.projectObj.join(","),
+        pageSize: this.page.pagesize,
+        pageNum: this.page.currentPage,
         target: "",
         sort: "",
       }).then(({ data: res }) => {
@@ -795,9 +838,10 @@ export default {
               children: [],
             },
           ];
-          this.tableData = res.data;
+          this.tableData = res.data.resultList;
+          this.page.total = res.data.total;
           let lossPower = [];
-          res.data.forEach((item) => {
+          res.data.resultList.forEach((item) => {
             let obj = {
               name: item.name,
               value: item.zssdl,
@@ -816,6 +860,9 @@ export default {
       });
     },
     handleStationChange(val) {
+      if (!val.length) {
+        this.projectObj = [];
+      }
       //   this.projectObj = [];
       this.getProject(val);
     },
@@ -842,16 +889,22 @@ export default {
       this.chooseList = arr;
     },
     goDetail(row) {
-      this.displayDetail = true;
+      if (!this.displayDetail) {
+        this.displayDetail = true;
+        this.detailRow = row;
+      }
       details({
-        id: row.id,
+        id: this.detailRow.id,
         beginDate: this.starTime,
         endDate: this.endTime,
+        pageSize: this.pageD.pagesize,
+        pageNum: this.pageD.currentPage,
         target: "",
         sort: "",
       }).then(({ data: res }) => {
         if (res.data) {
-          this.detailTable = res.data;
+          this.detailTable = res.data.resultList;
+          this.pageD.total = res.data.total;
         }
       });
     },
@@ -1041,6 +1094,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.pagination-class {
+  text-align: right;
+}
 .parcel-box {
   padding: 0 15px;
 }
@@ -1149,7 +1205,7 @@ export default {
   width: 100%;
   background-color: rgba(0, 0, 0, 0.45);
   padding: 5px;
-  margin-bottom: 19px;
+  padding-bottom: 33px;
   border-radius: 5px;
 }
 .line {

src/views/economicsOperation/benchmarkingManagement/siteBenchmarking/index.vue

@@ -371,6 +371,16 @@
             </template>
           </el-table-column>
         </el-table>
+        <div class="pagination-class">
+          <el-pagination
+            @current-change="handlePageChange"
+            :current-page="page.currentPage"
+            :page-size="page.pagesize"
+            layout="total, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
       </div>
     </div>
     <div class="echarts" v-if="!displayDetail">
@@ -408,7 +418,7 @@
         :data="detailTable"
         ref="multipleTable"
         size="mini"
-        height="88vh"
+        height="78vh"
         :cell-style="{ padding: '0px' }"
         :row-style="{ height: '0' }"
         stripe
@@ -586,14 +596,16 @@
         >
         </el-table-column>
       </el-table>
-      <el-pagination
-        @current-change="handlePageChange"
-        :current-page="page.currentPage"
-        :page-size="page.pagesize"
-        layout="total, prev, pager, next, jumper"
-        :total="page.total"
-      >
-      </el-pagination>
+      <div class="pagination-class">
+        <el-pagination
+          @current-change="handlePageDChange"
+          :current-page="pageD.currentPage"
+          :page-size="pageD.pagesize"
+          layout="total, prev, pager, next, jumper"
+          :total="pageD.total"
+        >
+        </el-pagination>
+      </div>
     </div>
     <el-dialog
       class="dialogs"
@@ -936,6 +948,11 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      pageD: {
+        pagesize: 18,
+        currentPage: 1,
+        total: 0,
+      },
       company: "",
       companyOptions: [],
       stationObj: "",
@@ -963,7 +980,7 @@ export default {
       tabs: [],
       analyisDialog: [],
       screenHeight: window.innerHeight,
-      echartsHeight: "55vh",
+      echartsHeight: "53vh",
       //同环比
       thbVisible: false,
       thbData: [],
@@ -989,9 +1006,9 @@ export default {
   },
   mounted() {
     if (this.screenHeight > 1100) {
-      this.echartsHeight = "58vh";
+      this.echartsHeight = "56vh";
     } else {
-      this.echartsHeight = "55vh";
+      this.echartsHeight = "53vh";
     }
     window.onresize = () => {
       return (() => {
@@ -1003,14 +1020,20 @@ export default {
   methods: {
     handlePageChange(val) {
       this.page.currentPage = val;
+      this.gerCndb();
+    },
+    handlePageDChange(val) {
+      this.pageD.currentPage = val;
       this.goDetail();
     },
     funthb() {
       thb({
         companys: this.company,
         type: this.tabIndex,
-        beginDate: this.starTime,
-        endDate: this.endTime,
+        // beginDate: this.starTime,
+        // endDate: this.endTime,
+        pageNum: 1,
+        pageSize: 10,
         wpids: this.stationObj,
       }).then(({ data: res }) => {
         if (res.data) {
@@ -1057,6 +1080,8 @@ export default {
         beginDate: this.starTime,
         endDate: this.endTime,
         wpids: this.stationObj,
+        pageSize: this.page.pagesize,
+        pageNum: this.page.currentPage,
         target: "",
         sort: "",
       }).then(({ data: res }) => {
@@ -1084,10 +1109,10 @@ export default {
               children: [],
             },
           ];
-          this.tableData = res.data;
-
+          this.tableData = res.data.resultList;
+          this.page.total = res.data.total;
           let lossPower = [];
-          res.data.forEach((item) => {
+          res.data.resultList.forEach((item) => {
             let obj = {
               name: item.date,
               value: item.zssdl,
@@ -1130,16 +1155,17 @@ export default {
     goDetail(row) {
       this.displayDetail = true;
       details({
-        id: row.id,
+        id: this.stationObj,
         beginDate: this.starTime,
         endDate: this.endTime,
-        pagesize: this.page.pagesize,
-        pagenum: this.page.currentPage,
+        pageSize: this.pageD.pagesize,
+        pageNum: this.pageD.currentPage,
         target: "",
         sort: "",
       }).then(({ data: res }) => {
         if (res.data) {
-          this.detailTable = res.data;
+          this.detailTable = res.data.resultList;
+          this.pageD.total = res.data.total;
         }
       });
     },
@@ -1348,6 +1374,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.pagination-class {
+  text-align: right;
+}
 .parcel-box {
   padding: 0 15px;
 }
@@ -1461,7 +1490,7 @@ export default {
   width: 100%;
   background-color: rgba(0, 0, 0, 0.45);
   padding: 5px;
-  margin-bottom: 19px;
+  padding-bottom: 33px;
   border-radius: 5px;
 }
 

src/views/economicsOperation/benchmarkingManagement/wiringBenchmarking/index.vue

@@ -412,6 +412,16 @@
             </template>
           </el-table-column>
         </el-table>
+        <div class="pagination-class">
+          <el-pagination
+            @current-change="handlePageChange"
+            :current-page="page.currentPage"
+            :page-size="page.pagesize"
+            layout="total, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
       </div>
     </div>
     <div class="echarts" v-if="!displayDetail">
@@ -450,7 +460,7 @@
         :data="detailTable"
         ref="multipleTable"
         size="mini"
-        height="88vh"
+        height="78vh"
         :cell-style="{ padding: '0px' }"
         :row-style="{ height: '0' }"
         stripe
@@ -628,6 +638,16 @@
         >
         </el-table-column>
       </el-table>
+      <div class="pagination-class">
+        <el-pagination
+          @current-change="handlePageDChange"
+          :current-page="pageD.currentPage"
+          :page-size="pageD.pagesize"
+          layout="total, prev, pager, next, jumper"
+          :total="pageD.total"
+        >
+        </el-pagination>
+      </div>
     </div>
 
     <el-dialog
@@ -675,7 +695,7 @@ import PieChart from "../../homePage/components/pieChart.vue";
 import BarCharts from "../../homePage/components/barCharts.vue";
 import dayinfo from "../compontent/dayinfo.vue";
 export default {
-  name: "intervalBenchmarking", //场际对标
+  name: "wiringBenchmarking", //线路对标
   components: {
     PieChart,
     BarCharts,
@@ -683,6 +703,16 @@ export default {
   },
   data() {
     return {
+      page: {
+        pagesize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      pageD: {
+        pagesize: 18,
+        currentPage: 1,
+        total: 0,
+      },
       company: "",
       companyOptions: [],
       stationObj: [],
@@ -715,6 +745,7 @@ export default {
       analyisDialog: [],
       screenHeight: window.innerHeight,
       echartsHeight: "53vh",
+      detailRow: {},
     };
   },
   created() {
@@ -746,6 +777,14 @@ export default {
     };
   },
   methods: {
+    handlePageChange(val) {
+      this.page.currentPage = val;
+      this.gerXldb();
+    },
+    handlePageDChange(val) {
+      this.pageD.currentPage = val;
+      this.goDetail();
+    },
     tabClick(val) {
       this.tabIndex = val;
       this.stationList = [];
@@ -805,6 +844,8 @@ export default {
         wpids: this.stationObj.join(","),
         projectids: this.projectObj.join(","),
         lineids: this.lineObj.join(","),
+        pageSize: this.page.pagesize,
+        pageNum: this.page.currentPage,
         target: "",
         sort: "",
       }).then(({ data: res }) => {
@@ -832,9 +873,10 @@ export default {
               children: [],
             },
           ];
-          this.tableData = res.data;
+          this.tableData = res.data.resultList;
+          this.page.total = res.data.total;
           let lossPower = [];
-          res.data.forEach((item) => {
+          res.data.resultList.forEach((item) => {
             let obj = {
               name: item.name,
               value: item.zssdl,
@@ -882,16 +924,23 @@ export default {
       this.chooseList = arr;
     },
     goDetail(row) {
-      this.displayDetail = true;
+      if (!this.displayDetail) {
+        this.displayDetail = true;
+        this.detailRow = row;
+      }
+
       details({
-        id: row.id,
+        id: this.detailRow.id,
         beginDate: this.starTime,
         endDate: this.endTime,
+        pageSize: this.pageD.pagesize,
+        pageNum: this.pageD.currentPage,
         target: "",
         sort: "",
       }).then(({ data: res }) => {
         if (res.data) {
-          this.detailTable = res.data;
+          this.detailTable = res.data.resultList;
+          this.pageD.total = res.data.total;
         }
       });
     },
@@ -1100,6 +1149,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.pagination-class {
+  text-align: right;
+}
 .parcel-box {
   padding: 0 15px;
 }
@@ -1211,7 +1263,7 @@ export default {
   width: 100%;
   background-color: rgba(0, 0, 0, 0.45);
   padding: 5px;
-  margin-bottom: 19px;
+  padding-bottom: 33px;
   border-radius: 5px;
 }
 .line {

src/views/layout/Header.vue

@@ -243,8 +243,9 @@ export default {
     // 跳转到管理系统
     goToAdmin() {
       let jiami = encrypt(getCookie("jiami")).replace(/\+/g, " ");
-    //   console.log(decrypt(jiami), jiami);
-      let url = `http://10.81.3.127:8083/#/check?username=${getCookie(
+      console.log(jiami);
+      let url = `http://192.168.1.117:80/#/check?username=${getCookie(
+        //   let url = `http://10.81.3.127:8083/#/check?username=${getCookie(
         "username"
       )}&jiami=${jiami}`;
       window.open(url);