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

目录调整

Browse Source
This commit is contained in:
仲么了
2023-09-18 14:19:09 +08:00
parent fdede42e08
commit 5234c207b4
14 changed files with 230 additions and 229 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.2.7", "versionName" : "1.2.8",
"versionCode" : 127, "versionCode" : 128,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

20
pages.json
View File

@@ -184,43 +184,43 @@
} }
}, },
{ {
"path": "pages/message/incident", "path": "pages/message/transient",
"style": { "style": {
"navigationBarTitleText": "暂态事件" "navigationBarTitleText": "暂态事件"
} }
}, },
{ {
"path": "pages/message/incidentDetail", "path": "pages/message/transientDetail",
"style": { "style": {
"navigationBarTitleText": "暂态事件详情" "navigationBarTitleText": "暂态事件详情"
} }
}, },
{ {
"path": "pages/message/term", "path": "pages/message/report",
"style": { "style": {
"navigationBarTitleText": "设备状态消息" "navigationBarTitleText": "设备告警"
} }
}, },
{ {
"path": "pages/message/termList", "path": "pages/message/reportList",
"style": { "style": {
"navigationBarTitleText": "异常设备列表" "navigationBarTitleText": "异常设备列表"
} }
}, },
{ {
"path": "pages/message/termDetail", "path": "pages/message/reportDetail",
"style": { "style": {
"navigationBarTitleText": "异常设备详情" "navigationBarTitleText": "异常设备详情"
} }
}, },
{ {
"path": "pages/message/report", "path": "pages/message/steady",
"style": { "style": {
"navigationBarTitleText": "稳态越限" "navigationBarTitleText": "稳态越限"
} }
}, },
{ {
"path": "pages/message/system", "path": "pages/message/run",
"style": { "style": {
"navigationBarTitleText": "系统消息" "navigationBarTitleText": "系统消息"
} }
@@ -370,13 +370,13 @@
} }
}, },
{ {
"path": "pages/message/reportList", "path": "pages/message/steadyList",
"style": { "style": {
"navigationBarTitleText": "越限监测点列表" "navigationBarTitleText": "越限监测点列表"
} }
}, },
{ {
"path": "pages/message/reportDetail", "path": "pages/message/steadyDetail",
"style": { "style": {
"navigationBarTitleText": "越限监测点详情" "navigationBarTitleText": "越限监测点详情"
} }

8
pages/index/message.vue
View File

@@ -1,24 +1,24 @@
<template> <template>
<view :loading="loading"> <view :loading="loading">
<view class="message"> <view class="message">
<view class="message-nav" @click="jump('system')"> <view class="message-nav" @click="jump('run')">
<image mode="aspectFill" class="message-nav-icon" src="/static/message3.png" /> <image mode="aspectFill" class="message-nav-icon" src="/static/message3.png" />
<view class="message-nav-label">运行事件</view> <view class="message-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="message-nav" @click="jump('incident')"> <view class="message-nav" @click="jump('transient')">
<image mode="aspectFill" class="message-nav-icon" src="/static/incident.png" /> <image mode="aspectFill" class="message-nav-icon" src="/static/incident.png" />
<view class="message-nav-label">暂态事件</view> <view class="message-nav-label">暂态事件</view>
<!-- <uni-badge text="2"></uni-badge>--> <!-- <uni-badge text="2"></uni-badge>-->
<uni-icons type="forward" color="#aaa" size="20"></uni-icons> <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
</view> </view>
<view class="message-nav" @click="jump('report')"> <view class="message-nav" @click="jump('steady')">
<image mode="aspectFill" class="message-nav-icon" src="/static/report.png" /> <image mode="aspectFill" class="message-nav-icon" src="/static/report.png" />
<view class="message-nav-label">稳态事件</view> <view class="message-nav-label">稳态事件</view>
<!-- <uni-badge text="3"></uni-badge>--> <!-- <uni-badge text="3"></uni-badge>-->
<uni-icons type="forward" color="#aaa" size="20"></uni-icons> <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
</view> </view>
<view class="message-nav" @click="jump('term')"> <view class="message-nav" @click="jump('report')">
<image mode="aspectFill" class="message-nav-icon" src="/static/term.png" /> <image mode="aspectFill" class="message-nav-icon" src="/static/term.png" />
<view class="message-nav-label">设备告警</view> <view class="message-nav-label">设备告警</view>
<!-- <uni-badge text="1"></uni-badge>--> <!-- <uni-badge text="1"></uni-badge>-->

15
pages/message/report.vue
View File

@@ -1,11 +1,12 @@
<template> <template>
<view class="content"> <view class="content">
<uni-list :border="false"> <uni-list :border="false">
<uni-list-item show-badge badgeType="error" isDot badge-text="未读" title="发生稳态越限监测点10个" note="2023-02-03" clickable @click="jump" /> <uni-list-item :show-badge="true" badgeType="error" isDot badge-text="未读" title="设备异常共4台"
<uni-list-item show-badge badgeType="error" isDot badge-text="未读" title="发生稳态越限监测点10个" note="2023-02-02" clickable @click="jump" /> note="2023-02-27 15:13:29" clickable @click="jump" />
<uni-list-item show-badge badgeType="error" isDot badge-text="未读" title="发生稳态越限监测点10个" note="2023-02-01" clickable @click="jump" /> <uni-list-item badgeType="error" isDot badge-text="未读" title="设备异常共1台" note="2023-02-14 15:10:29" clickable
<uni-list-item badgeType="error" isDot badge-text="未读" title="发生稳态越限监测点10个" note="2023-01-31" clickable @click="jump" /> @click="jump" />
<uni-list-item badgeType="error" isDot badge-text="未读" title="发生稳态越限监测点10个" note="2023-01-30" clickable @click="jump" /> <uni-list-item badgeType="error" isDot badge-text="未读" title="设备异常共4台" note="2023-02-10 15:10:29" clickable
@click="jump" />
</uni-list> </uni-list>
<uni-load-more status="nomore"></uni-load-more> <uni-load-more status="nomore"></uni-load-more>
</view> </view>
@@ -23,7 +24,8 @@ export default {
}, },
methods: { methods: {
jump () { jump () {
uni.navigateTo({ url: '/pages/message/reportList' }) console.log(123);
uni.navigateTo({ url: '/pages/message/termList' })
} }
} }
} }
@@ -38,7 +40,6 @@ export default {
/deep/ .uni-list-item { /deep/ .uni-list-item {
background-color: $uni-theme-white !important; background-color: $uni-theme-white !important;
} }
/deep/ .uni-badge { /deep/ .uni-badge {
background-color: unset !important; background-color: unset !important;
color: #dd524d !important; color: #dd524d !important;

19
pages/message/reportDetail.vue
View File

@@ -7,13 +7,24 @@
<view>2023-02-14</view> <view>2023-02-14</view>
</view> </view>
<view class="detail-content "> <view class="detail-content ">
<view class="detail-content-title mb20">电压谐波畸变率越限4</view> <view class="detail-content-title mb20">设备基础信息</view>
<image style="width:100%" src="/static/boxing3.jpeg" mode="widthFix" /> <view class="mb10">灿能园区，NPQS_681</view>
<view>网络参数：00-B7-8D-A8-00-D3</view>
</view> </view>
<view class="detail-content "> <view class="detail-content ">
<view class="detail-content-title mb20">5次电压谐波含有率越限</view> <view class="detail-content-title mb20">设备通讯信息</view>
<image style="width:100%" src="/static/boxing3.jpeg" mode="widthFix" /> <view class="mb10">NPQS_681通讯设备1次，具体如下所示</view>
<view>2023-02-14 10:59:10至2023-02-14 10:59:57</view>
</view> </view>
<view class="detail-content ">
<view class="detail-content-title mb20">设备告警信息</view>
<view class="mb10">暂无告警信息</view>
</view>
<view class="detail-content ">
<view class="detail-content-title mb20">设备流量信息</view>
<view class="mb10">NPQS_681的流量于2023-02-14 23:59:59占总流量的0.0%</view>
</view>
</view> </view>
</view> </view>
</Cn-page> </Cn-page>

103
pages/message/reportList.vue
View File

@@ -1,16 +1,70 @@
<template> <template>
<view class="content"> <view class="content">
<view class="detail-content " style="font-size:32rpx">
<!-- <view class="detail-content-title mb20">发生时间</view> --> <uni-card title="灿能园区，NPQS_682发生设备状态异常一次" sub-title="2023-02-27 15:13:29" @click="jump">
<view>2023-02-14</view> <view class="term-list-bottom">
<view class="term-list-bottom-item">
<view>设备告警</view>
<view>0次</view>
</view> </view>
<uni-list :border="false"> <view class="term-list-bottom-item">
<uni-list-item title="灿能园区，CN_NPQS682发生稳态越线" note="电压谐波畸变率越限45分钟,5次电压谐波含有率越限5分钟" clickable @click="jump" /> <view>通讯设备</view>
<uni-list-item title="灿能园区，CN_NPQS682发生稳态越线" note="电压谐波畸变率越限27分钟,5次电压谐波含有率越限3分钟" clickable @click="jump" /> <view>1次</view>
<uni-list-item title="灿能园区，CN_NPQS682发生稳态越线" note="电压谐波畸变率越限45分钟,5次电压谐波含有率越限5分钟" clickable @click="jump" /> </view>
<uni-list-item title="灿能园区，CN_NPQS682发生稳态越线" note="电压谐波畸变率越限45分钟,5次电压谐波含有率越限5分钟" clickable @click="jump" /> <view class="term-list-bottom-item">
<uni-list-item title="灿能园区，CN_NPQS682发生稳态越线" note="电压谐波畸变率越限45分钟,5次电压谐波含有率越限5分钟" clickable @click="jump" /> <view>设备流量</view>
</uni-list> <view>0次</view>
</view>
</view>
</uni-card>
<uni-card title="灿能园区，NPQS_681发生设备状态异常一次" sub-title="2023-02-27 13:13:29" @click="jump">
<view class="term-list-bottom">
<view class="term-list-bottom-item">
<view>设备告警</view>
<view>0次</view>
</view>
<view class="term-list-bottom-item">
<view>通讯设备</view>
<view>1次</view>
</view>
<view class="term-list-bottom-item">
<view>设备流量</view>
<view>0次</view>
</view>
</view>
</uni-card>
<uni-card title="灿能园区，NPQS_682发生设备状态异常一次" sub-title="2023-02-27 11:13:29" @click="jump">
<view class="term-list-bottom">
<view class="term-list-bottom-item">
<view>设备告警</view>
<view>0次</view>
</view>
<view class="term-list-bottom-item">
<view>通讯设备</view>
<view>1次</view>
</view>
<view class="term-list-bottom-item">
<view>设备流量</view>
<view>0次</view>
</view>
</view>
</uni-card>
<uni-card title="灿能园区，NPQS_682发生设备状态异常一次" sub-title="2023-02-27 09:13:29" @click="jump">
<view class="term-list-bottom">
<view class="term-list-bottom-item">
<view>设备告警</view>
<view>0次</view>
</view>
<view class="term-list-bottom-item">
<view>通讯设备</view>
<view>1次</view>
</view>
<view class="term-list-bottom-item">
<view>设备流量</view>
<view>0次</view>
</view>
</view>
</uni-card>
<uni-load-more status="nomore"></uni-load-more> <uni-load-more status="nomore"></uni-load-more>
</view> </view>
</template> </template>
@@ -27,7 +81,8 @@ export default {
}, },
methods: { methods: {
jump () { jump () {
uni.navigateTo({ url: '/pages/message/reportDetail' }) console.log(123);
uni.navigateTo({ url: '/pages/message/termDetail' })
} }
} }
} }
@@ -35,20 +90,24 @@ export default {
<style lang="scss"> <style lang="scss">
.content { .content {
.detail-content{ // padding-top: 20rpx;
padding: 20rpx 30rpx;
background: #fff;
margin-bottom: 20rpx;
}
} }
.term-list-bottom {
.term-list-bottom-item{
font-size: 28rpx;
margin-bottom: 20rpx;
display: flex;
justify-content: space-between;
// view:first-of-type{
// color: #111;
// }
}
.term-list-bottom-item:last-of-type{
margin-bottom: 0;
}
}
/deep/ .uni-list-item { /deep/ .uni-list-item {
background-color: $uni-theme-white !important; background-color: $uni-theme-white !important;
} }
/deep/ .uni-badge {
background-color: unset !important;
color: #dd524d !important;
font-size: 28rpx !important;
}
</style> </style>

0
pages/message/system.vue → pages/message/run.vue
View File

47
pages/message/steady.vue Normal file
View File

@@ -0,0 +1,47 @@
<template>
<view class="content">
<uni-list :border="false">
<uni-list-item show-badge badgeType="error" isDot badge-text="未读" title="发生稳态越限监测点10个" note="2023-02-03" clickable @click="jump" />
<uni-list-item show-badge badgeType="error" isDot badge-text="未读" title="发生稳态越限监测点10个" note="2023-02-02" clickable @click="jump" />
<uni-list-item show-badge badgeType="error" isDot badge-text="未读" title="发生稳态越限监测点10个" note="2023-02-01" clickable @click="jump" />
<uni-list-item badgeType="error" isDot badge-text="未读" title="发生稳态越限监测点10个" note="2023-01-31" clickable @click="jump" />
<uni-list-item badgeType="error" isDot badge-text="未读" title="发生稳态越限监测点10个" note="2023-01-30" clickable @click="jump" />
</uni-list>
<uni-load-more status="nomore"></uni-load-more>
</view>
</template>
<script>
export default {
data () {
return {
title: '灿能'
}
},
onLoad () {
},
methods: {
jump(){
uni.navigateTo({ url: '/pages/message/steadyList' })
}
}
}
</script>
<style lang="scss">
.content {
padding-top: 20rpx;
}
/deep/ .uni-list-item {
background-color: $uni-theme-white !important;
}
/deep/ .uni-badge {
background-color: unset !important;
color: #dd524d !important;
font-size: 28rpx !important;
}
</style>

19
pages/message/termDetail.vue → pages/message/steadyDetail.vue
View File

@@ -7,24 +7,13 @@
<view>2023-02-14</view> <view>2023-02-14</view>
</view> </view>
<view class="detail-content "> <view class="detail-content ">
<view class="detail-content-title mb20">设备基础信息</view> <view class="detail-content-title mb20">电压谐波畸变率越限4</view>
<view class="mb10">灿能园区，NPQS_681</view> <image style="width:100%" src="/static/boxing3.jpeg" mode="widthFix" />
<view>网络参数：00-B7-8D-A8-00-D3</view>
</view> </view>
<view class="detail-content "> <view class="detail-content ">
<view class="detail-content-title mb20">设备通讯信息</view> <view class="detail-content-title mb20">5次电压谐波含有率越限</view>
<view class="mb10">NPQS_681通讯设备1次，具体如下所示</view> <image style="width:100%" src="/static/boxing3.jpeg" mode="widthFix" />
<view>2023-02-14 10:59:10至2023-02-14 10:59:57</view>
</view> </view>
<view class="detail-content ">
<view class="detail-content-title mb20">设备告警信息</view>
<view class="mb10">暂无告警信息</view>
</view>
<view class="detail-content ">
<view class="detail-content-title mb20">设备流量信息</view>
<view class="mb10">NPQS_681的流量于2023-02-14 23:59:59占总流量的0.0%</view>
</view>
</view> </view>
</view> </view>
</Cn-page> </Cn-page>

54
pages/message/steadyList.vue Normal file
View File

@@ -0,0 +1,54 @@
<template>
<view class="content">
<view class="detail-content " style="font-size:32rpx">
<!-- <view class="detail-content-title mb20">发生时间</view> -->
<view>2023-02-14</view>
</view>
<uni-list :border="false">
<uni-list-item title="灿能园区，CN_NPQS682发生稳态越线" note="电压谐波畸变率越限45分钟,5次电压谐波含有率越限5分钟" clickable @click="jump" />
<uni-list-item title="灿能园区，CN_NPQS682发生稳态越线" note="电压谐波畸变率越限27分钟,5次电压谐波含有率越限3分钟" clickable @click="jump" />
<uni-list-item title="灿能园区，CN_NPQS682发生稳态越线" note="电压谐波畸变率越限45分钟,5次电压谐波含有率越限5分钟" clickable @click="jump" />
<uni-list-item title="灿能园区，CN_NPQS682发生稳态越线" note="电压谐波畸变率越限45分钟,5次电压谐波含有率越限5分钟" clickable @click="jump" />
<uni-list-item title="灿能园区，CN_NPQS682发生稳态越线" note="电压谐波畸变率越限45分钟,5次电压谐波含有率越限5分钟" clickable @click="jump" />
</uni-list>
<uni-load-more status="nomore"></uni-load-more>
</view>
</template>
<script>
export default {
data () {
return {
title: '灿能'
}
},
onLoad () {
},
methods: {
jump () {
uni.navigateTo({ url: '/pages/message/steadyDetail' })
}
}
}
</script>
<style lang="scss">
.content {
.detail-content{
padding: 20rpx 30rpx;
background: #fff;
margin-bottom: 20rpx;
}
}
/deep/ .uni-list-item {
background-color: $uni-theme-white !important;
}
/deep/ .uni-badge {
background-color: unset !important;
color: #dd524d !important;
font-size: 28rpx !important;
}
</style>

48
pages/message/term.vue
View File

@@ -1,48 +0,0 @@
<template>
<view class="content">
<uni-list :border="false">
<uni-list-item :show-badge="true" badgeType="error" isDot badge-text="未读" title="设备异常共4台"
note="2023-02-27 15:13:29" clickable @click="jump" />
<uni-list-item badgeType="error" isDot badge-text="未读" title="设备异常共1台" note="2023-02-14 15:10:29" clickable
@click="jump" />
<uni-list-item badgeType="error" isDot badge-text="未读" title="设备异常共4台" note="2023-02-10 15:10:29" clickable
@click="jump" />
</uni-list>
<uni-load-more status="nomore"></uni-load-more>
</view>
</template>
<script>
export default {
data () {
return {
title: '灿能'
}
},
onLoad () {
},
methods: {
jump () {
console.log(123);
uni.navigateTo({ url: '/pages/message/termList' })
}
}
}
</script>
<style lang="scss">
.content {
padding-top: 20rpx;
}
/deep/ .uni-list-item {
background-color: $uni-theme-white !important;
}
/deep/ .uni-badge {
background-color: unset !important;
color: #dd524d !important;
font-size: 28rpx !important;
}
</style>

113
pages/message/termList.vue
View File

@@ -1,113 +0,0 @@
<template>
<view class="content">
<uni-card title="灿能园区，NPQS_682发生设备状态异常一次" sub-title="2023-02-27 15:13:29" @click="jump">
<view class="term-list-bottom">
<view class="term-list-bottom-item">
<view>设备告警</view>
<view>0次</view>
</view>
<view class="term-list-bottom-item">
<view>通讯设备</view>
<view>1次</view>
</view>
<view class="term-list-bottom-item">
<view>设备流量</view>
<view>0次</view>
</view>
</view>
</uni-card>
<uni-card title="灿能园区，NPQS_681发生设备状态异常一次" sub-title="2023-02-27 13:13:29" @click="jump">
<view class="term-list-bottom">
<view class="term-list-bottom-item">
<view>设备告警</view>
<view>0次</view>
</view>
<view class="term-list-bottom-item">
<view>通讯设备</view>
<view>1次</view>
</view>
<view class="term-list-bottom-item">
<view>设备流量</view>
<view>0次</view>
</view>
</view>
</uni-card>
<uni-card title="灿能园区，NPQS_682发生设备状态异常一次" sub-title="2023-02-27 11:13:29" @click="jump">
<view class="term-list-bottom">
<view class="term-list-bottom-item">
<view>设备告警</view>
<view>0次</view>
</view>
<view class="term-list-bottom-item">
<view>通讯设备</view>
<view>1次</view>
</view>
<view class="term-list-bottom-item">
<view>设备流量</view>
<view>0次</view>
</view>
</view>
</uni-card>
<uni-card title="灿能园区，NPQS_682发生设备状态异常一次" sub-title="2023-02-27 09:13:29" @click="jump">
<view class="term-list-bottom">
<view class="term-list-bottom-item">
<view>设备告警</view>
<view>0次</view>
</view>
<view class="term-list-bottom-item">
<view>通讯设备</view>
<view>1次</view>
</view>
<view class="term-list-bottom-item">
<view>设备流量</view>
<view>0次</view>
</view>
</view>
</uni-card>
<uni-load-more status="nomore"></uni-load-more>
</view>
</template>
<script>
export default {
data () {
return {
title: '灿能'
}
},
onLoad () {
},
methods: {
jump () {
console.log(123);
uni.navigateTo({ url: '/pages/message/termDetail' })
}
}
}
</script>
<style lang="scss">
.content {
// padding-top: 20rpx;
}
.term-list-bottom {
.term-list-bottom-item{
font-size: 28rpx;
margin-bottom: 20rpx;
display: flex;
justify-content: space-between;
// view:first-of-type{
// color: #111;
// }
}
.term-list-bottom-item:last-of-type{
margin-bottom: 0;
}
}
/deep/ .uni-list-item {
background-color: $uni-theme-white !important;
}
</style>

5
pages/message/incident.vue → pages/message/transient.vue
View File

@@ -38,6 +38,7 @@ export default {
let dictData = this.$util.getDictData('app_event') let dictData = 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/event/queryEventList')
this.store.params.type = 0
this.store.firstCallBack = (res) => { this.store.firstCallBack = (res) => {
this.store.data.forEach(item => { this.store.data.forEach(item => {
item.title = item.equipmentName + dictData.find(item2 => item2.code === item.tag).name item.title = item.equipmentName + dictData.find(item2 => item2.code === item.tag).name
@@ -49,8 +50,8 @@ export default {
}, },
jump(item) { jump(item) {
let str = JSON.stringify(item).replace(/%/g,'百分比') let str = JSON.stringify(item).replace(/%/g,'百分比')
uni.navigateTo({url: '/pages/message/incidentDetail?detail=' + encodeURIComponent(str)}) uni.navigateTo({url: '/pages/message/transientDetail?detail=' + encodeURIComponent(str)})
} },
} }
} }
</script> </script>

0
pages/message/incidentDetail.vue → pages/message/transientDetail.vue
View File