数据报表添加排序

src/views/reportData/photostatis/index.vue

@@ -105,6 +105,7 @@
         style="width: 100%"
         :height="tableheight"
         fit
+        :default-sort="{ order: 'descending' }"
       >
         <template slot="empty">
           <el-empty :image-size="160" description="暂无数据"></el-empty>
@@ -115,14 +116,21 @@
           </template>
         </el-table-column>
         <!-- <el-table-column prop="id" label="ID" width="80px"> </el-table-column> -->
-        <el-table-column prop="dyName" label="电压等级"> </el-table-column>
-        <el-table-column prop="lineName" label="线路名称" show-overflow-tooltip>
+        <el-table-column prop="dyName" label="电压等级" sortable>
+        </el-table-column>
+        <el-table-column
+          prop="lineName"
+          label="线路名称"
+          show-overflow-tooltip
+          sortable
+        >
         </el-table-column>
         <el-table-column
           prop="towerName"
           label="杆塔名称"
           min-width="180"
           show-overflow-tooltip
+          sortable
         >
         </el-table-column>
         <el-table-column
@@ -130,6 +138,7 @@
           label="装置id"
           min-width="140"
           show-overflow-tooltip
+          sortable
         >
           <template slot-scope="scope">
             <el-link
@@ -140,13 +149,19 @@
             ></template
           >
         </el-table-column>
-        <el-table-column prop="protocolName" label="规约" show-overflow-tooltip>
+        <el-table-column
+          prop="protocolName"
+          label="规约"
+          show-overflow-tooltip
+          sortable
+        >
         </el-table-column>
         <el-table-column
           prop="lastHeartbeat"
           label="最后心跳时间"
           min-width="130"
           show-overflow-tooltip
+          sortable
         >
           <template slot-scope="scope">
             <el-link
@@ -168,6 +183,7 @@
           label="当天第一张照片时间"
           min-width="130"
           show-overflow-tooltip
+          sortable
         >
           <template slot-scope="scope">
             {{ scope.row.photoInfo.firstPhotoTime }}
@@ -178,30 +194,39 @@
           label="照片最后接收时间"
           min-width="130"
           show-overflow-tooltip
+          sortable
         >
           <template slot-scope="scope">
             {{ scope.row.photoInfo.lastRecvTime }}
           </template>
         </el-table-column>
-        <el-table-column prop="rebootCount" label="重启次数"> </el-table-column>
+        <el-table-column prop="rebootCount" label="重启次数" sortable>
+        </el-table-column>
         <el-table-column
           prop="workingStatus.bootTime"
           label="最后重启时间"
           min-width="130"
           show-overflow-tooltip
+          sortable
         >
           <template slot-scope="scope">
-            {{
+            {{ formatLastHeartbeat(scope.row.workingStatus.bootTime) }}
+            <!-- {{
               scope.row.workingStatus.bootTime == null ||
               scope.row.workingStatus.bootTime == 0
                 ? ""
                 : $moment(scope.row.workingStatus.bootTime * 1000).format(
                     "YYYY-MM-DD HH:mm:ss"
                   )
-            }}
+            }} -->
           </template>
         </el-table-column>
-        <el-table-column prop="photoCount" label="照片数量">
+        <el-table-column
+          prop="photoCount"
+          label="照片数量"
+          sortable
+          :sort-method="picSort"
+        >
           <template slot-scope="scope">
             {{ scope.row.photoInfo.photoCount }}
           </template>
@@ -213,6 +238,7 @@
           @size-change="handleSizeChange"
           :current-page="page"
           :page-size="pageSize"
+          :page-sizes="[20, 50, 100, 500, 1000]"
           layout="sizes, prev, pager, next, jumper,total"
           :total="total"
           background
@@ -286,6 +312,22 @@ export default {
   },
   watch: {},
   methods: {
+    //传图pic排序
+    picSort(a, b) {
+      // 确保 a 和 b 都有 mntnStatus.reportMap 对象
+      const aPic = (a.photoInfo.photoCount && a.photoInfo.photoCount) || 0;
+      const bPic = (b.photoInfo.photoCount && b.photoInfo.photoCount) || 0;
+      // 将 pic 转换为数字进行比较
+      const numA = Number(aPic);
+      const numB = Number(bPic);
+      // 根据需要进行升序或降序排序
+      // 这里假设你想要升序排序（从小到大）
+      return numA - numB;
+      // 如果你想要降序排序（从大到小），则返回 numB - numA
+    },
+    formatLastHeartbeat(timestamp) {
+      return this.$moment(timestamp * 1000).format("YYYY-MM-DD HH:mm:ss");
+    },
     //获取电压信息
     getSearchdy() {
       getSearchInfo({ type: 1 })

vue.config.js

@@ -23,8 +23,8 @@ module.exports = defineConfig({
         //表示拦截以/api开头的请求路径
 
         //target: "http://192.168.1.190:8080", //190 需要去掉/Api
-        target: "http://61.169.135.146:9911/", //运维 覆冰
-        //target: "http://61.169.135.146:40080/", //dell
+        //target: "http://61.169.135.146:9911/", //运维 覆冰
+        target: "http://61.169.135.146:40080/", //dell
         //target: "http://192.168.50.198:8093", //java本机
         changOrigin: true, //是否开启跨域
         pathRewrite: {