From b32cb0b11f62226cd4275fe444dd930b5386ed74 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Wed, 6 Nov 2024 11:19:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9app=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 4 ++--
pages/device/APF/comp/basic.vue | 29 +++++++++++++++--------------
pages/device/APF/comp/power.vue | 25 +++++++++++++++----------
pages/device/APF/comp/xieBo.vue | 4 ++--
pages/device/APF/report.vue | 10 +++++-----
pages/device/DVR/comp/dianWang.vue | 2 +-
pages/device/DVR/comp/niBian.vue | 2 +-
pages/device/DVR/comp/shuChu.vue | 2 +-
pages/message/message.vue | 7 +++----
pages/message/messageDetail.vue | 2 +-
pages/mine/setup.vue | 2 +-
11 files changed, 47 insertions(+), 42 deletions(-)
diff --git a/manifest.json b/manifest.json
index a9d26c2..1206498 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "灿能物联",
"appid" : "__UNI__88BC25B",
"description" : "",
- "versionName" : "1.6.3",
- "versionCode" : 163,
+ "versionName" : "1.6.4",
+ "versionCode" : 164,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/device/APF/comp/basic.vue b/pages/device/APF/comp/basic.vue
index a723a0a..694c076 100644
--- a/pages/device/APF/comp/basic.vue
+++ b/pages/device/APF/comp/basic.vue
@@ -10,10 +10,10 @@
{{ item.phase }}
{{
item['Apf_RmsI_Sys(A)'] > 0 ? item['Apf_RmsI_Sys(A)'].toFixed(2) : item['Apf_RmsI_Sys(A)']
- }}
+ }}
{{
item['Apf_ThdA_Sys(%)'] > 0 ? item['Apf_ThdA_Sys(%)'].toFixed(2) : item['Apf_ThdA_Sys(%)']
- }}
+ }}
@@ -28,13 +28,13 @@
{{ item.phase }}
{{
item['Apf_PhV_Sys(V)'] > 0 ? item['Apf_PhV_Sys(V)'].toFixed(2) : item['Apf_PhV_Sys(V)']
- }}
+ }}
{{
item['Apf_Freq(Hz)'] > 0 ? item['Apf_Freq(Hz)'].toFixed(2) : item['Apf_Freq(Hz)']
- }}
+ }}
{{
item['Apf_ThdU_Sys(%)'] > 0 ? item['Apf_ThdU_Sys(%)'].toFixed(2) : item['Apf_ThdU_Sys(%)']
- }}
+ }}
@@ -48,10 +48,10 @@
{{ item.phase }}
{{
item['Apf_RmsI_Load(A)'] > 0 ? item['Apf_RmsI_Load(A)'].toFixed(2) : item['Apf_RmsI_Load(A)']
- }}
+ }}
{{
item['Apf_ThdA_Load(%)'] > 0 ? item['Apf_ThdA_Load(%)'].toFixed(2) : item['Apf_ThdA_Load(%)']
- }}
+ }}
@@ -64,13 +64,15 @@
{{ item.phase }}
{{
- item['Apf_RmsI_TolOut(A)'] > 0
- ? item['Apf_RmsI_TolOut(A)'].toFixed(2)
- : item['Apf_RmsI_TolOut(A)']
+ item['Apf_RmsI_TolOut(A)'] == 3.1415926 ? '-' :
+ item['Apf_RmsI_TolOut(A)'] > 0
+ ? item['Apf_RmsI_TolOut(A)'].toFixed(2)
+ : item['Apf_RmsI_TolOut(A)']
}}
{{
- item['load_Rate'] > 0 ? item['load_Rate'].toFixed(2) : item['load_Rate']
- }}
+ item['load_Rate'] == 3.1415926 ? '-' : item['load_Rate'] > 0 ? item['load_Rate'].toFixed(2) :
+ item['load_Rate']
+ }}
@@ -166,6 +168,5 @@ export default {
}
diff --git a/pages/device/APF/comp/power.vue b/pages/device/APF/comp/power.vue
index 2f9e01c..a2e035a 100644
--- a/pages/device/APF/comp/power.vue
+++ b/pages/device/APF/comp/power.vue
@@ -4,15 +4,18 @@
电网侧
名称
- 有功功率(kw)
+ 有功功率(kW)
无功功率(kVar)
视在功率(kVA)
功率因数
{{ item.phase }}
- {{ item['Apf_P_Sys(W)']=='-'? '-':(item['Apf_P_Sys(W)'] / 1000).toFixed(2) }}
- {{item['Apf_Q_Sys(Var)']=='-'? '-':(item['Apf_Q_Sys(Var)'] / 1000).toFixed(2) }}
- {{ item['Apf_S_Sys(VA)']=='-'?'-' :(item['Apf_S_Sys(VA)'] / 1000).toFixed(2) }}
+ {{ item['Apf_P_Sys(W)'] == '-' ? '-' : (item['Apf_P_Sys(W)'] / 1000).toFixed(2) }}
+
+ {{ item['Apf_Q_Sys(Var)'] == '-' ? '-' : (item['Apf_Q_Sys(Var)'] / 1000).toFixed(2) }}
+
+ {{ item['Apf_S_Sys(VA)'] == '-' ? '-' : (item['Apf_S_Sys(VA)'] / 1000).toFixed(2) }}
+
{{ item['Apf_PF_Sys(null)'] || '-' }}
@@ -21,15 +24,18 @@
负载侧
名称
- 有功功率(kw)
+ 有功功率(kW)
无功功率(kVar)
视在功率(kVA)
功率因数
{{ item.phase }}
- {{ item['Apf_P_Load(W)']=='-'?'-': (item['Apf_P_Load(W)'] / 1000).toFixed(2) }}
- {{ item['Apf_Q_Load(Var)']=='-'? '-':(item['Apf_Q_Load(Var)'] / 1000).toFixed(2) }}
- {{ item['Apf_S_Load(VA)']=='-'? '-':(item['Apf_S_Load(VA)'] / 1000).toFixed(2) }}
+ {{ item['Apf_P_Load(W)'] == '-' ? '-' : (item['Apf_P_Load(W)'] / 1000).toFixed(2) }}
+
+ {{ item['Apf_Q_Load(Var)'] == '-' ? '-' : (item['Apf_Q_Load(Var)'] / 1000).toFixed(2)
+ }}
+ {{ item['Apf_S_Load(VA)'] == '-' ? '-' : (item['Apf_S_Load(VA)'] / 1000).toFixed(2) }}
+
{{ item['Apf_PF_Load(null)'] || '-' }}
@@ -115,6 +121,5 @@ export default {
}
diff --git a/pages/device/APF/comp/xieBo.vue b/pages/device/APF/comp/xieBo.vue
index a9197d5..7b783d8 100644
--- a/pages/device/APF/comp/xieBo.vue
+++ b/pages/device/APF/comp/xieBo.vue
@@ -263,11 +263,11 @@ barCateGoryGap:20,
let dataOptions = []
let type = [
{
- name: '谐波电流幅值序列',
+ name: '谐波电流幅值',
key: 'Apf_HarmI',
},
{
- name: '谐波电压含有率序列',
+ name: '谐波电压含有率',
key: 'Apf_HarmUR',
},
]
diff --git a/pages/device/APF/report.vue b/pages/device/APF/report.vue
index 2167a59..189cc17 100644
--- a/pages/device/APF/report.vue
+++ b/pages/device/APF/report.vue
@@ -14,8 +14,8 @@
-
-
+
+
🔍
@@ -107,13 +107,13 @@ export default {
this.store.loadedCallback = () => {
this.store.data.forEach((item) => {
if (this.type === '3') {
- item.showName = '告警,告警码：' + item.code
+ item.showName = '告警，告警码：' + (item.code || '-')
}
if (this.type !== '0') {
- item.subTitle = `于${item.startTime}`
+ item.subTitle = `于${item.startTime}发生${item.showName}`
} else {
item.subTitle =
- `于${item.startTime}。` +
+ `发生时间：${item.startTime}，` +
item.dataSet
.map((item2) => {
return (
diff --git a/pages/device/DVR/comp/dianWang.vue b/pages/device/DVR/comp/dianWang.vue
index 7502e4f..ff927dc 100644
--- a/pages/device/DVR/comp/dianWang.vue
+++ b/pages/device/DVR/comp/dianWang.vue
@@ -59,7 +59,7 @@