App/app-govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改app测试问题

Browse Source
This commit is contained in:
GGJ
2024-11-06 11:19:28 +08:00
parent 26066db3fd
commit b32cb0b11f
11 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@@ -2,8 +2,8 @@
"name" : "灿能物联", "name" : "灿能物联",
"appid" : "__UNI__88BC25B", "appid" : "__UNI__88BC25B",
"description" : "", "description" : "",
"versionName" : "1.6.3", "versionName" : "1.6.4",
"versionCode" : 163, "versionCode" : 164,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

29
pages/device/APF/comp/basic.vue
View File

@@ -10,10 +10,10 @@
<view class="item">{{ item.phase }}</view> <view class="item">{{ item.phase }}</view>
<view class="item">{{ <view class="item">{{
item['Apf_RmsI_Sys(A)'] > 0 ? item['Apf_RmsI_Sys(A)'].toFixed(2) : item['Apf_RmsI_Sys(A)'] item['Apf_RmsI_Sys(A)'] > 0 ? item['Apf_RmsI_Sys(A)'].toFixed(2) : item['Apf_RmsI_Sys(A)']
}}</view> }}</view>
<view class="item">{{ <view class="item">{{
item['Apf_ThdA_Sys(%)'] > 0 ? item['Apf_ThdA_Sys(%)'].toFixed(2) : item['Apf_ThdA_Sys(%)'] item['Apf_ThdA_Sys(%)'] > 0 ? item['Apf_ThdA_Sys(%)'].toFixed(2) : item['Apf_ThdA_Sys(%)']
}}</view> }}</view>
</template> </template>
</view> </view>
</view> </view>
@@ -28,13 +28,13 @@
<view class="item">{{ item.phase }}</view> <view class="item">{{ item.phase }}</view>
<view class="item">{{ <view class="item">{{
item['Apf_PhV_Sys(V)'] > 0 ? item['Apf_PhV_Sys(V)'].toFixed(2) : item['Apf_PhV_Sys(V)'] item['Apf_PhV_Sys(V)'] > 0 ? item['Apf_PhV_Sys(V)'].toFixed(2) : item['Apf_PhV_Sys(V)']
}}</view> }}</view>
<view class="item">{{ <view class="item">{{
item['Apf_Freq(Hz)'] > 0 ? item['Apf_Freq(Hz)'].toFixed(2) : item['Apf_Freq(Hz)'] item['Apf_Freq(Hz)'] > 0 ? item['Apf_Freq(Hz)'].toFixed(2) : item['Apf_Freq(Hz)']
}}</view> }}</view>
<view class="item">{{ <view class="item">{{
item['Apf_ThdU_Sys(%)'] > 0 ? item['Apf_ThdU_Sys(%)'].toFixed(2) : item['Apf_ThdU_Sys(%)'] item['Apf_ThdU_Sys(%)'] > 0 ? item['Apf_ThdU_Sys(%)'].toFixed(2) : item['Apf_ThdU_Sys(%)']
}}</view> }}</view>
</template> </template>
</view> </view>
</view> </view>
@@ -48,10 +48,10 @@
<view class="item">{{ item.phase }}</view> <view class="item">{{ item.phase }}</view>
<view class="item">{{ <view class="item">{{
item['Apf_RmsI_Load(A)'] > 0 ? item['Apf_RmsI_Load(A)'].toFixed(2) : item['Apf_RmsI_Load(A)'] item['Apf_RmsI_Load(A)'] > 0 ? item['Apf_RmsI_Load(A)'].toFixed(2) : item['Apf_RmsI_Load(A)']
}}</view> }}</view>
<view class="item">{{ <view class="item">{{
item['Apf_ThdA_Load(%)'] > 0 ? item['Apf_ThdA_Load(%)'].toFixed(2) : item['Apf_ThdA_Load(%)'] item['Apf_ThdA_Load(%)'] > 0 ? item['Apf_ThdA_Load(%)'].toFixed(2) : item['Apf_ThdA_Load(%)']
}}</view> }}</view>
</template> </template>
</view> </view>
</view> </view>
@@ -64,13 +64,15 @@
<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">{{ <view class="item">{{
item['Apf_RmsI_TolOut(A)'] > 0 item['Apf_RmsI_TolOut(A)'] == 3.1415926 ? '-' :
? item['Apf_RmsI_TolOut(A)'].toFixed(2) item['Apf_RmsI_TolOut(A)'] > 0
: item['Apf_RmsI_TolOut(A)'] ? item['Apf_RmsI_TolOut(A)'].toFixed(2)
: item['Apf_RmsI_TolOut(A)']
}}</view> }}</view>
<view class="item">{{ <view class="item">{{
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) :
}}</view> item['load_Rate']
}}</view>
</template> </template>
</view> </view>
</view> </view>
@@ -166,6 +168,5 @@ export default {
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.basic { .basic {}
}
</style> </style>

25
pages/device/APF/comp/power.vue
View File

@@ -4,15 +4,18 @@
<view class="grid-card-title">电网侧</view> <view class="grid-card-title">电网侧</view>
<view class="grid-card-content-5"> <view class="grid-card-content-5">
<view class="item item-title">名称</view> <view class="item item-title">名称</view>
<view class="item item-title">有功功率(kw)</view> <view class="item item-title">有功功率(kW)</view>
<view class="item item-title">无功功率(kVar)</view> <view class="item item-title">无功功率(kVar)</view>
<view class="item item-title">视在功率(kVA)</view> <view class="item item-title">视在功率(kVA)</view>
<view class="item item-title">功率因数</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_P_Sys(W)']=='-'? '-':(item['Apf_P_Sys(W)'] / 1000).toFixed(2) }}</view> <view class="item">{{ item['Apf_P_Sys(W)'] == '-' ? '-' : (item['Apf_P_Sys(W)'] / 1000).toFixed(2) }}
<view class="item">{{item['Apf_Q_Sys(Var)']=='-'? '-':(item['Apf_Q_Sys(Var)'] / 1000).toFixed(2) }}</view> </view>
<view class="item">{{ item['Apf_S_Sys(VA)']=='-'?'-' :(item['Apf_S_Sys(VA)'] / 1000).toFixed(2) }}</view> <view class="item">{{ item['Apf_Q_Sys(Var)'] == '-' ? '-' : (item['Apf_Q_Sys(Var)'] / 1000).toFixed(2) }}
</view>
<view class="item">{{ item['Apf_S_Sys(VA)'] == '-' ? '-' : (item['Apf_S_Sys(VA)'] / 1000).toFixed(2) }}
</view>
<view class="item">{{ item['Apf_PF_Sys(null)'] || '-' }}</view> <view class="item">{{ item['Apf_PF_Sys(null)'] || '-' }}</view>
</template> </template>
</view> </view>
@@ -21,15 +24,18 @@
<view class="grid-card-title">负载侧</view> <view class="grid-card-title">负载侧</view>
<view class="grid-card-content-5"> <view class="grid-card-content-5">
<view class="item item-title">名称</view> <view class="item item-title">名称</view>
<view class="item item-title">有功功率(kw)</view> <view class="item item-title">有功功率(kW)</view>
<view class="item item-title">无功功率(kVar)</view> <view class="item item-title">无功功率(kVar)</view>
<view class="item item-title">视在功率(kVA)</view> <view class="item item-title">视在功率(kVA)</view>
<view class="item item-title">功率因数</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_P_Load(W)']=='-'?'-': (item['Apf_P_Load(W)'] / 1000).toFixed(2) }}</view> <view class="item">{{ item['Apf_P_Load(W)'] == '-' ? '-' : (item['Apf_P_Load(W)'] / 1000).toFixed(2) }}
<view class="item">{{ item['Apf_Q_Load(Var)']=='-'? '-':(item['Apf_Q_Load(Var)'] / 1000).toFixed(2) }}</view> </view>
<view class="item">{{ item['Apf_S_Load(VA)']=='-'? '-':(item['Apf_S_Load(VA)'] / 1000).toFixed(2) }}</view> <view class="item">{{ item['Apf_Q_Load(Var)'] == '-' ? '-' : (item['Apf_Q_Load(Var)'] / 1000).toFixed(2)
}}</view>
<view class="item">{{ item['Apf_S_Load(VA)'] == '-' ? '-' : (item['Apf_S_Load(VA)'] / 1000).toFixed(2) }}
</view>
<view class="item">{{ item['Apf_PF_Load(null)'] || '-' }}</view> <view class="item">{{ item['Apf_PF_Load(null)'] || '-' }}</view>
</template> </template>
</view> </view>
@@ -115,6 +121,5 @@ export default {
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.basic { .basic {}
}
</style> </style>

4
pages/device/APF/comp/xieBo.vue
View File

@@ -263,11 +263,11 @@ barCateGoryGap:20,
let dataOptions = [] let dataOptions = []
let type = [ let type = [
{ {
name: '谐波电流幅值序列', name: '谐波电流幅值',
key: 'Apf_HarmI', key: 'Apf_HarmI',
}, },
{ {
name: '谐波电压含有率序列', name: '谐波电压含有率',
key: 'Apf_HarmUR', key: 'Apf_HarmUR',
}, },
] ]

10
pages/device/APF/report.vue
View File

@@ -14,8 +14,8 @@
<!-- <view class="content-item-header-right-des">{{ item.engineeringName }} {{ item.projectName }}</view> --> <!-- <view class="content-item-header-right-des">{{ item.engineeringName }} {{ item.projectName }}</view> -->
<view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</view> <view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</view>
<view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view> <view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view>
<view class="content-item-header-right-des">监测点名称：{{ item.lineName }}</view> <!-- <view class="content-item-header-right-des">监测点名称：{{ item.lineName }}</view> -->
<view class="content-item-header-right-des">暂态事件类型：{{ item.showName.slice(0, -4) }}</view> <!-- <view class="content-item-header-right-des">暂态类型：{{ item.showName }}</view> -->
<!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> --> <!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> -->
</view> </view>
<view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view> <view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view>
@@ -107,13 +107,13 @@ export default {
this.store.loadedCallback = () => { this.store.loadedCallback = () => {
this.store.data.forEach((item) => { this.store.data.forEach((item) => {
if (this.type === '3') { if (this.type === '3') {
item.showName = '告警,告警码：' + item.code item.showName = '告警，告警码：' + (item.code || '-')
} }
if (this.type !== '0') { if (this.type !== '0') {
item.subTitle = `于${item.startTime}` item.subTitle = `于${item.startTime}发生${item.showName}`
} else { } else {
item.subTitle = item.subTitle =
`于${item.startTime}。` + `发生时间：${item.startTime}，` +
item.dataSet item.dataSet
.map((item2) => { .map((item2) => {
return ( return (

2
pages/device/DVR/comp/dianWang.vue
View File

@@ -59,7 +59,7 @@
</template> </template>
<script> <script>
export default { export default {
data () { data() {
return { return {
} }
}, },

2
pages/device/DVR/comp/niBian.vue
View File

@@ -60,7 +60,7 @@
</template> </template>
<script> <script>
export default { export default {
data () { data() {
return { return {
} }
}, },

2
pages/device/DVR/comp/shuChu.vue
View File

@@ -83,7 +83,7 @@
</template> </template>
<script> <script>
export default { export default {
data () { data() {
return { return {
} }
}, },

7
pages/message/message.vue
View File

@@ -16,8 +16,7 @@
<view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view> <view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view>
<view class="content-item-header-right-des" v-if="type == '0' || type == '1'">监测点名称：{{ <view class="content-item-header-right-des" v-if="type == '0' || type == '1'">监测点名称：{{
item.lineName }}</view> item.lineName }}</view>
<view class="content-item-header-right-des" v-if="type == '0'">暂态事件类型：{{ item.showName.slice(0, <view class="content-item-header-right-des" v-if="type == '0'">暂态类型：{{ item.showName}}</view>
-4) }}</view>
<!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> --> <!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> -->
</view> </view>
<view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view> <view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view>
@@ -110,13 +109,13 @@ export default {
this.store.data.forEach((item) => { this.store.data.forEach((item) => {
if (this.type === '3') { if (this.type === '3') {
item.showName = '告警,告警码：' + item.code item.showName = '告警，告警码：' + (item.code || '-')
} }
if (this.type !== '0') { if (this.type !== '0') {
item.subTitle = `于${item.startTime}发生${item.showName}` item.subTitle = `于${item.startTime}发生${item.showName}`
} else { } else {
item.subTitle = item.subTitle =
`于${item.startTime}。` + `发生时间：${item.startTime}，` +
item.dataSet item.dataSet
.map((item2) => { .map((item2) => {
return ( return (

2
pages/message/messageDetail.vue
View File

@@ -12,7 +12,7 @@
<view class="mb5"> 工程名称：{{ detail.engineeringName }} </view> <view class="mb5"> 工程名称：{{ detail.engineeringName }} </view>
<view class="mb5"> 事件名称：{{ detail.showName }}</view> <view class="mb5"> 事件名称：{{ detail.showName }}</view>
<view class="mb5" v-for="(item, textIndex) in detail.dataSet" :key="textIndex"> <view class="mb5" v-for="(item, textIndex) in detail.dataSet" :key="textIndex">
{{ item.showName + ':' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }} {{ item.showName + '：' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }}
</view> </view>
</view> </view>
<view class="detail-content"> <view class="detail-content">

2
pages/mine/setup.vue
View File

@@ -48,7 +48,7 @@
<!-- @click="jump('about')" --> <!-- @click="jump('about')" -->
<view class="mine-nav" style="border-bottom: none"> <view class="mine-nav" style="border-bottom: none">
<view class="mine-nav-label">版本信息</view> <view class="mine-nav-label">版本信息</view>
<view style="color: #828282;font-size: 14rpx;">当前版本V1.6.3</view> <view style="color: #828282;font-size: 14rpx;">当前版本V1.6.4</view>
<!-- <uni-icons type="forward" color="#aaa" size="20"></uni-icons> --> <!-- <uni-icons type="forward" color="#aaa" size="20"></uni-icons> -->
</view> </view>
<view class="mine-nav" @click="jump('layout')" style="margin-top: 20rpx; border-bottom: none"> <view class="mine-nav" @click="jump('layout')" style="margin-top: 20rpx; border-bottom: none">