提交最新代码，查询列索引，总条数

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"
   ]
-}
+}

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">
                 </Pagination>
               </div>
@@ -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;
+            })
           }
         })
       }

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,