消息列表优化

This commit is contained in:
仲么了
2023-11-03 16:33:16 +08:00
parent f01f764fcf
commit bb95331392
32 changed files with 402 additions and 949 deletions

View File

@@ -1,5 +1,5 @@
<template>
<view class="device">
<view class="index-device">
<view class="nav" :style="{ top: navTabHeight + 'px' }">
<!-- <view class="nav-menu" :class="{ 'nav-menu-active': select.engineeringName }" @click="openDrawer"
>{{ select.engineeringName || '工程' }}
@@ -15,8 +15,8 @@
<view class="nav-menu" :class="{ 'nav-menu-active': select.projectName }" @click="selectProject = true">
{{
select.projectName
? select.projectName.length > 4
? select.projectName.substring(0, 4) + '...'
? select.projectName.length > 12
? select.projectName.substring(0, 12) + '...'
: select.projectName
: '全部项目'
}}
@@ -337,4 +337,10 @@ export default {
},
}
</script>
<style lang="scss"></style>
<style lang="scss">
.index-device{
.nav-menu {
}
}
</style>

View File

@@ -15,19 +15,19 @@
<view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
<view class="header-item-label">离线设备</view>
</view>
<view class="header-item">
<view class="header-item" @click="jumpMessage">
<view class="header-item-value">{{ devCount.alarmCount || 0 }}</view>
<view class="header-item-label">告警数量</view>
</view>
<view class="header-item">
<view class="header-item" @click="jumpMessage">
<view class="header-item-value">{{
devCount.eventCount + devCount.runCount + devCount.harmonicCount || 0
}}</view>
<view class="header-item-label">事件数量</view>
</view>
<view class="header-item" @click="projectNum">
<view class="header-item-value">{{ devCount.projectCount || 0 }}</view>
<view class="header-item-label">项目个数</view>
<view class="header-item" @click="eningerNum">
<view class="header-item-value">{{ devCount.eningerCount || 0 }}</view>
<view class="header-item-label">工程个数</view>
</view>
</view>
<view class="mt20"></view>
@@ -48,17 +48,17 @@
<view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
<view class="header-item-label">离线设备</view>
</view>
<view class="header-item">
<view class="header-item" @click="jumpMessage">
<view class="header-item-value">{{ devCount.currentAlarmCount || 0 }}</view>
<view class="header-item-label">告警数量</view>
</view>
<view class="header-item">
<view class="header-item" @click="jumpMessage">
<view class="header-item-value">{{
devCount.currentEventCount + devCount.currentRunCount + devCount.currentHarmonicCount || 0
}}</view>
<view class="header-item-label">事件数量</view>
</view>
<view class="header-item" @click="projectNum">
<view class="header-item" @click="projectNum(true)">
<view class="header-item-value">{{ devCount.currentProjectCount || 0 }}</view>
<view class="header-item-label">项目个数</view>
</view>
@@ -79,15 +79,33 @@ export default {
},
},
methods: {
jumpMessage(){
uni.switchTab({
url: '/pages/index/message',
})
},
eningerNum(){
uni.navigateTo({
url: '/pages/engineering/list',
})
},
projectWarning() {
uni.navigateTo({
url: '/pages/zhuanzhi/warning',
})
},
projectNum() {
uni.navigateTo({
url: '/pages/project/list',
})
console.log(now)
if (now) {
let engineering = uni.getStorageSync('engineering')
uni.navigateTo({
url: '/pages/project/list?engineeringName=' + engineering.name + '&engineeringId=' + engineering.id,
})
} else {
uni.navigateTo({
url: '/pages/project/list',
})
}
},
jump(type) {
uni.navigateTo({

View File

@@ -3,7 +3,7 @@
<template v-if="devCount.engineeringListLength > 1">
<view class="canneng-index-title mb20">所有工程设备统计</view>
<view class="header">
<view class="header-item" @click="jump('allEngineering')">
<view class="header-item" @click="jump('allEngineering')">
<view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
<view class="header-item-label">设备总数</view>
</view>
@@ -15,29 +15,28 @@
<view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
<view class="header-item-label">离线设备</view>
</view>
<view class="header-item">
<view class="header-item" @click="jumpMessage">
<view class="header-item-value">{{ devCount.alarmCount || 0 }}</view>
<view class="header-item-label">告警数量</view>
</view>
<view class="header-item">
<view class="header-item" @click="jumpMessage">
<view class="header-item-value">{{
devCount.eventCount + devCount.runCount + devCount.harmonicCount || 0
}}</view>
<view class="header-item-label">事件数量</view>
</view>
<view class="header-item" @click="projectNum(false)">
<view class="header-item-value">{{ devCount.projectCount || 0 }}</view>
<view class="header-item-label">项目个数</view>
<view class="header-item" @click="eningerNum">
<view class="header-item-value">{{ devCount.eningerCount || 0 }}</view>
<view class="header-item-label">工程个数</view>
</view>
</view>
<view class="mt20"></view>
</template>
<view class="canneng-index-title mb20">当前工程设备统计</view>
<view class="header">
<view class="header-item" @click="jump('nowEngineering')">
<view class="header-item-value">{{
devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0
}}
<view class="header-item" @click="jump('nowEngineering')">
<view class="header-item-value"
>{{ devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0 }}
</view>
<view class="header-item-label">设备总数</view>
</view>
@@ -49,11 +48,11 @@
<view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
<view class="header-item-label">离线设备</view>
</view>
<view class="header-item">
<view class="header-item" @click="jumpMessage">
<view class="header-item-value">{{ devCount.currentAlarmCount || 0 }}</view>
<view class="header-item-label">告警数量</view>
</view>
<view class="header-item">
<view class="header-item" @click="jumpMessage">
<view class="header-item-value">{{
devCount.currentEventCount + devCount.currentRunCount + devCount.currentHarmonicCount || 0
}}</view>
@@ -85,6 +84,16 @@ export default {
url: '/pages/zhuanzhi/warning',
})
},
eningerNum() {
uni.navigateTo({
url: '/pages/engineering/list',
})
},
jumpMessage(){
uni.switchTab({
url: '/pages/index/message',
})
},
projectNum(now) {
console.log(now)
if (now) {
@@ -100,13 +109,11 @@ export default {
},
jump(type) {
uni.navigateTo({
url:
'/pages/device/list?type=' + type
url: '/pages/device/list?type=' + type,
})
},
},
created() {
},
created() {},
}
</script>
<style lang="scss">

View File

@@ -74,9 +74,6 @@ export default {
timer: null,
}
},
onPullDownRefresh() {
console.log('onPullDownRefresh')
},
computed: {
emptyEngineeringName() {
if (this.userInfo.authorities === 'tourist') {

View File

@@ -52,23 +52,27 @@ export default {
},
jump(type) {
switch (type) {
case 'login':
case 'run':
uni.navigateTo({
url: `/pages/user/login`,
url: `/pages/message/message?type=${2}`,
})
break
case 'gateway':
case 'transient':
uni.navigateTo({
url: `/pages/gateway/list`,
url: `/pages/message/message?type=${0}`,
})
break
case 'upgrade':
this.$refs.inputDialog.open()
case 'steady':
uni.navigateTo({
url: `/pages/message/message?type=${1}`,
})
break
case 'report':
uni.navigateTo({
url: `/pages/message/message?type=${3}`,
})
break
default:
uni.navigateTo({
url: `/pages/message/${type}`,
})
break
}
},
@@ -79,11 +83,11 @@ export default {
this.messageCount = uni.getStorageSync(this.$cacheKey.messageCount) || {}
this.timer = setInterval(() => {
this.messageCount = uni.getStorageSync(this.$cacheKey.messageCount) || {}
}, 3000) // 定时请求
}, 1000) // 定时请求
},
onHide() {
clearInterval(this.timer)
}
},
}
</script>

View File

@@ -142,9 +142,6 @@ export default {
},
onLoad(options) {
this.init()
setInterval(() => {
this.messageCount = uni.getStorageSync(this.$cacheKey.messageCount) || {}
}, 3000) // 定时请求
},
methods: {
init() {},
@@ -251,7 +248,7 @@ export default {
this.messageCount = uni.getStorageSync(this.$cacheKey.messageCount) || {}
this.timer = setInterval(() => {
this.messageCount = uni.getStorageSync(this.$cacheKey.messageCount) || {}
}, 3000) // 定时请求
}, 1000) // 定时请求
},
onHide() {
clearInterval(this.timer)