From 38ce135998e323d8b5415ef85ab8248b9f42c442 Mon Sep 17 00:00:00 2001 From: yyl <279235553@qq.com> Date: Mon, 22 Jan 2024 10:19:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=80=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=88=97=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=EF=BC=8C=E6=80=BB=E6=9D=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/package.json | 3 ++- .../maintenanceOperations/statisticalAnalysis/index.vue | 6 +++++- ruoyi-ui/vue.config.js | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 3f9bfe8e..d359e330 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -49,6 +49,7 @@ "crypto-js": "4.0.0", "dayjs": "^1.11.7", "debounce": "^1.2.0", + "deepmerge": "^4.3.1", "dplayer": "^1.26.0", "echarts": "^5.2.2", "echarts-liquidfill": "^3.1.0", @@ -152,4 +153,4 @@ "> 1%", "last 2 versions" ] -} \ No newline at end of file +} diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue index 66bac610..9505dea3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue @@ -148,7 +148,7 @@ width="'100%'" :page-size="pageSize" :current-page.sync="pageIndex" - layout="prev, pager, next" + layout="total, sizes, prev, pager, next" :total="pageTotal"> @@ -545,6 +545,10 @@ import * as echarts from "echarts"; this.pageSize = pageSize; this.pageTotal = res.total; this.tableData = res.rows; + + this.tableData.forEach((it,index)=>{ + it.nem = (pageIndex - 1 ) * ( pageSize ) + index + 1; + }) } }) } diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 36f2acec..a8ed9c57 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -44,7 +44,7 @@ module.exports = { // target: `http://10.168.77.209:8080`, // 刘朋 // target: `http://10.168.66.196:8080`, //刘文阁 // target: `http://10.168.56.206:8087`, //孟 - target: `http://10.168.65.156:8087`, + target: `http://10.168.73.36:8087`, // target: `http://10.0.81.202:8087`, //现场后台 // target: `http://10.0.81.204:8087`, //现场后台 刘文阁 changeOrigin: true,