From 21fc05bb1d688a1c5346ecaf6852e6169a9b8ba8 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 17 Jul 2024 13:13:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E8=A1=A8=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/reportData/photostatis/index.vue | 56 +++++++++++++++++++---
vue.config.js | 4 +-
2 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/src/views/reportData/photostatis/index.vue b/src/views/reportData/photostatis/index.vue
index 6a7bdf7..f2cc3ec 100644
--- a/src/views/reportData/photostatis/index.vue
+++ b/src/views/reportData/photostatis/index.vue
@@ -105,6 +105,7 @@
style="width: 100%"
:height="tableheight"
fit
+ :default-sort="{ order: 'descending' }"
>
@@ -115,14 +116,21 @@
-
-
+
+
+
-
+
{{ scope.row.photoInfo.firstPhotoTime }}
@@ -178,30 +194,39 @@
label="照片最后接收时间"
min-width="130"
show-overflow-tooltip
+ sortable
>
{{ scope.row.photoInfo.lastRecvTime }}
-
+
+
- {{
+ {{ formatLastHeartbeat(scope.row.workingStatus.bootTime) }}
+
-
+
{{ scope.row.photoInfo.photoCount }}
@@ -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 })
diff --git a/vue.config.js b/vue.config.js
index 01f1548..eeadbb2 100644
--- a/vue.config.js
+++ b/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: {