This commit is contained in:
仲么了
2023-10-24 09:01:10 +08:00
parent 4cacc4cdb1
commit 60d5cd6b26
5 changed files with 21 additions and 20 deletions

19
App.vue
View File

@@ -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 () { onHide: function () {
console.log('App Hide') console.log('App Hide')
}, },
onShow: function (options) {
// 获取从推送消息中传递的参数
this.pushParams = options.query
// 判断是否从推送消息中进入应用,如果是,则跳转到指定页面
if (options.query && options.querytargetPage) {
uni.navigateTo({
url: options.querytargetPage,
})
}
},
} }
</script> </script>

View File

@@ -2,8 +2,8 @@
"name" : "灿能物联", "name" : "灿能物联",
"appid" : "__UNI__88BC25B", "appid" : "__UNI__88BC25B",
"description" : "", "description" : "",
"versionName" : "1.3.4", "versionName" : "1.3.5",
"versionCode" : 134, "versionCode" : 135,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {

View File

@@ -5,7 +5,7 @@
<view class="grid-card-content-3"> <view class="grid-card-content-3">
<view class="item item-title">名称</view> <view class="item item-title">名称</view>
<view class="item item-title">有效值(A)</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.电网电流"> <template v-for="(item, index) in renderData.电网电流">
<view class="item">{{ item.phase }}</view> <view class="item">{{ item.phase }}</view>
<view class="item">{{ item['Apf_RmsI_Sys(A)'] || '-' }}</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">名称</view>
<view class="item item-title">电压(V)</view> <view class="item item-title">电压(V)</view>
<view class="item item-title">频率(Hz)</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.电网电压"> <template v-for="(item, index) in renderData.电网电压">
<view class="item">{{ item.phase }}</view> <view class="item">{{ item.phase }}</view>
<view class="item">{{ item['Apf_PhV_Sys(V)'] || '-' }}</view> <view class="item">{{ item['Apf_PhV_Sys(V)'] || '-' }}</view>
@@ -33,7 +33,7 @@
<view class="grid-card-content-3"> <view class="grid-card-content-3">
<view class="item item-title">名称</view> <view class="item item-title">名称</view>
<view class="item item-title">有效值(A)</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.负载电流"> <template v-for="(item, index) in renderData.负载电流">
<view class="item">{{ item.phase }}</view> <view class="item">{{ item.phase }}</view>
<view class="item">{{ item['Apf_RmsI_Load(A)'] || '-' }}</view> <view class="item">{{ item['Apf_RmsI_Load(A)'] || '-' }}</view>

View File

@@ -139,18 +139,18 @@ export default {
let dataOptions = [] let dataOptions = []
let type = [ let type = [
{ {
name: 'Apf_HarmI', name: '电网谐波电流幅值序列',
key: 'Apf_HarmI', key: 'Apf_HarmI',
}, },
{ {
name: 'Apf_HarmUR', name: '负载谐波电压含有率序列',
key: 'Apf_HarmUR', key: 'Apf_HarmUR',
} }
] ]
Object.keys(this.renderData['电网侧']['Apf_HarmI']).forEach((item, index) => { Object.keys(this.renderData['电网侧']['Apf_HarmI']).forEach((item, index) => {
type.forEach(item2 => { type.forEach(item2 => {
dataOptions.push({ dataOptions.push({
text: item + '_' + item2.name, text: item + '' + item2.name,
pointer: item2.key + '_' + item, pointer: item2.key + '_' + item,
value: dataOptions.length, value: dataOptions.length,
}) })

View File

@@ -415,7 +415,11 @@ export default {
element.showKey.forEach((key) => { element.showKey.forEach((key) => {
data.forEach((item) => { data.forEach((item) => {
if (item.statisticalName === key && item.phase === 'avg') { 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 + '%')
}
} }
}) })
}) })