This commit is contained in:
仲么了
2023-09-28 16:30:07 +08:00
parent 182195512a
commit 9c8dc2cd0a
9 changed files with 45 additions and 29 deletions

View File

@@ -2,8 +2,8 @@
"name" : "灿能物联", "name" : "灿能物联",
"appid" : "__UNI__88BC25B", "appid" : "__UNI__88BC25B",
"description" : "", "description" : "",
"versionName" : "1.3.1", "versionName" : "1.3.2",
"versionCode" : 131, "versionCode" : 132,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {
@@ -58,7 +58,13 @@
}, },
/* ios */ /* ios */
"ios" : { "ios" : {
"dSYMs" : false "dSYMs" : false,
"privacyDescription" : {
"NSPhotoLibraryUsageDescription" : "上传拓扑图、更改头像、扫码模块需要读取相册内容,是否允许读取相册内容",
"NSCameraUsageDescription" : "设备移交和分享需要用到摄像头扫码,是否允许使用摄像头",
"NSPhotoLibraryAddUsageDescription" : "下载图片需要保存到相册,是否允许保存照片到相册",
"NSLocationAlwaysAndWhenInUseUsageDescription" : "获取定位信息记录项目数据"
}
}, },
/* SDK */ /* SDK */
"sdkConfigs" : { "sdkConfigs" : {

View File

@@ -24,7 +24,7 @@
<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>
<view class="item">{{ item['Apf_Freq(Hz)'] || '-' }}</view> <view class="item">{{ item['Apf_Freq(Hz)'] || '-' }}</view>
<view class="item">{{ item['Apf_ThdU(%)'] || '-' }}</view> <view class="item">{{ item['Apf_ThdU_Sys(%)'] || '-' }}</view>
</template> </template>
</view> </view>
</view> </view>
@@ -99,6 +99,9 @@ export default {
case 'Apf_Freq(Hz)': case 'Apf_Freq(Hz)':
key = '电网电压' key = '电网电压'
break break
case 'Apf_ThdU_Sys(%)':
key = '电网电压'
break
case 'Apf_RmsI_Load(A)': case 'Apf_RmsI_Load(A)':
key = '负载电流' key = '负载电流'
break break

View File

@@ -37,7 +37,7 @@ export default {
async init() { async init() {
let dictData = await this.$util.getDictData('app_event') let dictData = await this.$util.getDictData('app_event')
console.log(dictData) console.log(dictData)
this.store = this.DataSource('/cs-harmonic-boot/event/queryEventList') this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
this.store.params.type = 3 this.store.params.type = 3
this.store.firstCallBack = (res) => { this.store.firstCallBack = (res) => {
// this.store.data.forEach((item) => { // this.store.data.forEach((item) => {

View File

@@ -36,7 +36,7 @@ export default {
async init() { async init() {
let dictData = await this.$util.getDictData('app_event') let dictData = await this.$util.getDictData('app_event')
console.log(dictData) console.log(dictData)
this.store = this.DataSource('/cs-harmonic-boot/event/queryEventList') this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
this.store.params.type = 2 this.store.params.type = 2
this.store.firstCallBack = (res) => { this.store.firstCallBack = (res) => {
this.loading = false this.loading = false

View File

@@ -37,7 +37,7 @@ export default {
async init() { async init() {
let dictData = await this.$util.getDictData('app_event') let dictData = await this.$util.getDictData('app_event')
console.log(dictData) console.log(dictData)
this.store = this.DataSource('/cs-harmonic-boot/event/queryEventList') this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
this.store.params.type = 1 this.store.params.type = 1
this.store.firstCallBack = (res) => { this.store.firstCallBack = (res) => {
// this.store.data.forEach((item) => { // this.store.data.forEach((item) => {

View File

@@ -40,7 +40,7 @@ export default {
async init() { async init() {
let dictData = await this.$util.getDictData('app_event') let dictData = await this.$util.getDictData('app_event')
console.log(dictData) console.log(dictData)
this.store = this.DataSource('/cs-harmonic-boot/event/queryEventList') this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
this.store.params.type = 0 this.store.params.type = 0
this.store.firstCallBack = (res) => { this.store.firstCallBack = (res) => {
// this.store.data.forEach((item) => { // this.store.data.forEach((item) => {

View File

@@ -1,11 +1,11 @@
<template> <template>
<view :loading="loading"> <view :loading="loading">
<view class="mine"> <view class="mine">
<view class="mine-nav" @click="jump('changePhone')" style=" box-shadow: 0 4rpx 8rpx #e7e7e74c;"> <view class="mine-nav" @click="jump('changePhone')" style="box-shadow: 0 4rpx 8rpx #e7e7e74c">
<view class="mine-nav-label">更换手机号</view> <view class="mine-nav-label">更换手机号</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('changePwd')" style="border-bottom: none; "> <view class="mine-nav" @click="jump('changePwd')" style="border-bottom: none">
<view class="mine-nav-label">修改密码</view> <view class="mine-nav-label">修改密码</view>
<uni-icons type="forward" color="#aaa" size="20"></uni-icons> <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
</view> </view>
@@ -13,11 +13,11 @@
<view class="mine-nav-label">消息配置</view> <view class="mine-nav-label">消息配置</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('agreement')" style="margin-top:20rpx;"> <view class="mine-nav" @click="jump('agreement')" style="margin-top: 20rpx">
<view class="mine-nav-label">用户协议</view> <view class="mine-nav-label">用户协议</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('policy')" > <view class="mine-nav" @click="jump('policy')">
<view class="mine-nav-label">个人信息保护政策</view> <view class="mine-nav-label">个人信息保护政策</view>
<uni-icons type="forward" color="#aaa" size="20"></uni-icons> <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
</view> </view>
@@ -41,12 +41,12 @@
<view class="mine-nav-label">意见反馈</view> <view class="mine-nav-label">意见反馈</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('about')" style="border-bottom: none; "> <view class="mine-nav" @click="jump('about')" style="border-bottom: none">
<view class="mine-nav-label">关于我们</view> <view class="mine-nav-label">关于我们</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">
<view class="mine-nav-label" style="text-align:center">退出登录</view> <view class="mine-nav-label" style="text-align: center">退出登录</view>
</view> </view>
</view> </view>
</view> </view>
@@ -57,36 +57,43 @@ import { queryPersonSet } from '@/common/api/mine.js'
export default { export default {
data() { data() {
return { return {
loading: false loading: false,
} }
}, },
methods: { methods: {
async init() { async init() {},
},
jump(type) { jump(type) {
switch (type) { switch (type) {
case 'changePwd': case 'changePwd':
uni.navigateTo({ uni.navigateTo({
url: `/pages/user/changePwd` url: `/pages/user/changePwd`,
}) })
break; break
case 'changePhone': case 'changePhone':
uni.navigateTo({ uni.navigateTo({
url: `/pages/user/changePhone` url: `/pages/user/changePhone`,
}) })
break; break
case 'layout': case 'layout':
uni.reLaunch({ uni.showModal({
url: `/pages/user/login` title: '提示',
content: '确定退出登录吗?',
success: (res) => {
if (res.confirm) {
uni.reLaunch({
url: `/pages/user/login`,
})
}
},
}) })
break; break
default: default:
uni.navigateTo({ uni.navigateTo({
url: `/pages/mine/${type}` url: `/pages/mine/${type}`,
}) })
break; break
} }
} },
}, },
onLoad() { onLoad() {
this.init() this.init()
@@ -146,4 +153,4 @@ export default {
} }
} }
} }
</style> </style>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 467 KiB

BIN
static/logo_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB