From 60d5cd6b267c50c4075e52e599a50ed3a51ecb3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Tue, 24 Oct 2023 09:01:10 +0800
Subject: [PATCH] t

---
 App.vue                         | 19 ++++++++-----------
 manifest.json                   |  4 ++--
 pages/device/APF/comp/basic.vue |  6 +++---
 pages/device/APF/comp/xieBo.vue |  6 +++---
 pages/device/APF/detail.vue     |  6 +++++-
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/App.vue b/App.vue
index 25b96d9..42cc926 100644
--- a/App.vue
+++ b/App.vue
@@ -19,21 +19,18 @@ export default {
                 },
             })
         }
+        uni.onPushMessage((res) => {
+            console.log('收到推送消息：', res.data.payload.path) //监听推送消息
+            if (res.data.payload && res.data.payload.path) {
+                uni.navigateTo({
+                    url: res.data.payload.path,
+                })
+            }
+        })
     },
     onHide: function () {
         console.log('App Hide')
     },
-    onShow: function (options) {
-        // 获取从推送消息中传递的参数
-        this.pushParams = options.query
-
-        // 判断是否从推送消息中进入应用，如果是，则跳转到指定页面
-        if (options.query && options.querytargetPage) {
-            uni.navigateTo({
-                url: options.querytargetPage,
-            })
-        }
-    },
 }
 </script>
 
diff --git a/manifest.json b/manifest.json
index 36b02cc..b355bed 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "灿能物联",
     "appid" : "__UNI__88BC25B",
     "description" : "",
-    "versionName" : "1.3.4",
-    "versionCode" : 134,
+    "versionName" : "1.3.5",
+    "versionCode" : 135,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/device/APF/comp/basic.vue b/pages/device/APF/comp/basic.vue
index b5126c1..b08c226 100644
--- a/pages/device/APF/comp/basic.vue
+++ b/pages/device/APF/comp/basic.vue
@@ -5,7 +5,7 @@
             <view class="grid-card-content-3">
                 <view class="item item-title">名称</view>
                 <view class="item item-title">有效值(A)</view>
-                <view class="item item-title">THDI(%)</view>
+                <view class="item item-title">畸变率(%)</view>
                 <template v-for="(item, index) in renderData.电网电流">
                     <view class="item">{{ item.phase }}</view>
                     <view class="item">{{ item['Apf_RmsI_Sys(A)'] || '-' }}</view>
@@ -19,7 +19,7 @@
                 <view class="item item-title">名称</view>
                 <view class="item item-title">电压(V)</view>
                 <view class="item item-title">频率(Hz)</view>
-                <view class="item item-title">THDU(%)</view>
+                <view class="item item-title">畸变率(%)</view>
                 <template v-for="(item, index) in renderData.电网电压">
                     <view class="item">{{ item.phase }}</view>
                     <view class="item">{{ item['Apf_PhV_Sys(V)'] || '-' }}</view>
@@ -33,7 +33,7 @@
             <view class="grid-card-content-3">
                 <view class="item item-title">名称</view>
                 <view class="item item-title">有效值(A)</view>
-                <view class="item item-title">THDI(%)</view>
+                <view class="item item-title">畸变率(%)</view>
                 <template v-for="(item, index) in renderData.负载电流">
                     <view class="item">{{ item.phase }}</view>
                     <view class="item">{{ item['Apf_RmsI_Load(A)'] || '-' }}</view>
diff --git a/pages/device/APF/comp/xieBo.vue b/pages/device/APF/comp/xieBo.vue
index 297d890..85f5931 100644
--- a/pages/device/APF/comp/xieBo.vue
+++ b/pages/device/APF/comp/xieBo.vue
@@ -139,18 +139,18 @@ export default {
                 let dataOptions = []
                 let type = [
                     {
-                        name: 'Apf_HarmI',
+                        name: '电网谐波电流幅值序列',
                         key: 'Apf_HarmI',
                     },
                     {
-                        name: 'Apf_HarmUR',
+                        name: '负载谐波电压含有率序列',
                         key: 'Apf_HarmUR',
                     }
                 ]
                 Object.keys(this.renderData['电网侧']['Apf_HarmI']).forEach((item, index) => {
                     type.forEach(item2 => {
                         dataOptions.push({
-                            text: item + '_' + item2.name,
+                            text: item + '相' + item2.name,
                             pointer: item2.key + '_' + item,
                             value: dataOptions.length,
                         })
diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue
index 73f8517..b30bf59 100644
--- a/pages/device/APF/detail.vue
+++ b/pages/device/APF/detail.vue
@@ -415,7 +415,11 @@ export default {
                 element.showKey.forEach((key) => {
                     data.forEach((item) => {
                         if (item.statisticalName === key && item.phase === 'avg') {
-                            arr.push(key + ':' + item.statisticalData)
+                            if(key === 'Apf_RmsI_TolOut(A)'){
+                                arr.push(  '总输出电流:' + item.statisticalData + 'A')
+                            }else{
+                                arr.push(  '电流畸变率:' + item.statisticalData + '%')
+                            }
                         }
                     })
                 })