调整消息推送

pages/index/comp/device.vue

@@ -70,14 +70,17 @@
                     <Cn-device-card :device="item" :key="index">
                         <template v-slot:title>
                             <!-- 卡片标题 -->
-                            
+
                             <switch
                                 v-if="transfer || share"
                                 :checked="checkList.indexOf(item.equipmentId) > -1"
                                 style="transform: scale(0.8); position: relative; left: 20rpx"
                                 @change="switchChange(item)"
                             />
-                            <view class="star-icon" v-else>   <uni-icons type="search" size="25"></uni-icons> </view>
+                            <view class="star-icon" v-else>
+                                <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                                🔍
+                            </view>
                         </template>
                     </Cn-device-card>
                 </uni-swipe-action-item>
@@ -373,6 +376,7 @@ export default {
 /deep/ .button-group--right {
     padding: 0 0 20rpx;
 }
-
-
+.star-icon {
+    font-size: 40rpx;
+}
 </style>

pages/index/comp/indexGongCheng.vue

@@ -15,15 +15,13 @@
                     <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
                     <view class="header-item-label">离线设备</view>
                 </view>
-                <view class="header-item" @click="jumpMessage">
-                    <view class="header-item-value">{{ devCount.alarmCount || 0 }}</view>
-                    <view class="header-item-label">告警数量</view>
+                <view class="header-item" @click="jumpMessage(0)">
+                    <view class="header-item-value">{{ devCount.eventCount || 0 }}</view>
+                    <view class="header-item-label">暂态事件数</view>
                 </view>
-                <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 class="header-item" @click="jumpMessage(1)">
+                    <view class="header-item-value">{{ devCount.harmonicCount || 0 }}</view>
+                    <view class="header-item-label">稳态事件数</view>
                 </view>
                 <view class="header-item" @click="eningerNum">
                     <view class="header-item-value">{{ devCount.eningerCount || 0 }}</view>
@@ -178,7 +176,12 @@ export default {
                 url: '/pages/device/list?type=' + type,
             })
         },
-        jumpMessage() {
+        jumpMessage(type) {
+            uni.setStorageSync('messageParams', {
+                name: '',
+                id: '',
+                type: type,
+            })
             uni.switchTab({
                 url: '/pages/index/message1',
             })

pages/index/comp/indexYouKe.vue

@@ -1,72 +1,72 @@
-<template>
-    <view class="index-zhuyonghu">
-        <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-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
-                    <view class="header-item-label">设备总数</view>
-                </view>
-                <view class="header-item" @click="jump('onLineDevs')">
-                    <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
-                    <view class="header-item-label">在线设备</view>
-                </view>
-                <view class="header-item" @click="jump('offLineDevs')">
-                    <view class="header-item-value">{{ devCount.offLineDevCount || 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>
-                <view class="header-item-label">设备总数</view>
-            </view>
-            <view class="header-item" @click="jump('currentOnLineDevs')">
-                <view class="header-item-value">{{ devCount.currentOnLineDevCount || 0 }}</view>
-                <view class="header-item-label">在线设备</view>
-            </view>
-            <view class="header-item" @click="jump('currentOffLineDevs')">
-                <view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
-                <view class="header-item-label">离线设备</view>
-            </view>
-        </view>
-        <view style="padding: 20rpx 20rpx 0">
-            <Cn-grid title="">
-                <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
-                <!-- <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item> -->
-                <Cn-grid-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>
-            </Cn-grid>
-        </view>
-		
-    </view>
-</template>
-<script>
-export default {
-    props: {
-        devCount: {
-            type: Object,
-            default: {},
-        },
-    },
-    methods: {
-        jump(type) {
-            uni.navigateTo({
-                url:
-                    '/pages/device/list?type=' + type
-            })
-        },
-        submitFeedBack() {
-            uni.navigateTo({url: '/pages/home/feedback'})
-        },
-        registerDevice() {
-            this.$util.toast('此功能仅对正式用户开放')
-        },
-    },
-}
-</script>
-<style lang="scss"></style>
+<template>
+    <view class="index-zhuyonghu">
+        <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-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">设备总数</view>
+                </view>
+                <view class="header-item" @click="jump('onLineDevs')">
+                    <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
+                    <view class="header-item-label">在线设备</view>
+                </view>
+                <view class="header-item" @click="jump('offLineDevs')">
+                    <view class="header-item-value">{{ devCount.offLineDevCount || 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>
+                <view class="header-item-label">设备总数</view>
+            </view>
+            <view class="header-item" @click="jump('currentOnLineDevs')">
+                <view class="header-item-value">{{ devCount.currentOnLineDevCount || 0 }}</view>
+                <view class="header-item-label">在线设备</view>
+            </view>
+            <view class="header-item" @click="jump('currentOffLineDevs')">
+                <view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
+                <view class="header-item-label">离线设备</view>
+            </view>
+        </view>
+        <view style="padding: 20rpx 20rpx 0">
+            <Cn-grid title="">
+                <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
+                <!-- <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item> -->
+                <Cn-grid-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>
+            </Cn-grid>
+        </view>
+		
+    </view>
+</template>
+<script>
+export default {
+    props: {
+        devCount: {
+            type: Object,
+            default: {},
+        },
+    },
+    methods: {
+        jump(type) {
+            uni.navigateTo({
+                url:
+                    '/pages/device/list?type=' + type
+            })
+        },
+        submitFeedBack() {
+            uni.navigateTo({url: '/pages/home/feedback'})
+        },
+        registerDevice() {
+            this.$util.toast('此功能仅对正式用户开放')
+        },
+    },
+}
+</script>
+<style lang="scss"></style>

pages/index/comp/indexYunWei.vue

@@ -15,11 +15,11 @@
                     <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
                     <view class="header-item-label">离线设备</view>
                 </view>
-                <view class="header-item" @click="jumpMessage">
+                <view class="header-item" @click="jumpMessage(2, false)">
                     <view class="header-item-value">{{ devCount.alarmCount || 0 }}</view>
                     <view class="header-item-label">告警数量</view>
                 </view>
-                <view class="header-item" @click="jumpMessage">
+                <view class="header-item" @click="jumpMessage(0, false)">
                     <view class="header-item-value">{{
                         devCount.eventCount + devCount.runCount + devCount.harmonicCount || 0
                     }}</view>
@@ -48,11 +48,11 @@
                 <view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
                 <view class="header-item-label">离线设备</view>
             </view>
-            <view class="header-item" @click="jumpMessage">
+            <view class="header-item" @click="jumpMessage(2, true)">
                 <view class="header-item-value">{{ devCount.currentAlarmCount || 0 }}</view>
                 <view class="header-item-label">告警数量</view>
             </view>
-            <view class="header-item" @click="jumpMessage">
+            <view class="header-item" @click="jumpMessage(0, true)">
                 <view class="header-item-value">{{
                     devCount.currentEventCount + devCount.currentRunCount + devCount.currentHarmonicCount || 0
                 }}</view>
@@ -79,12 +79,17 @@ export default {
         },
     },
     methods: {
-        jumpMessage(){
+        jumpMessage(type, flag) {
+            uni.setStorageSync('messageParams', {
+                name: flag ? uni.getStorageSync('engineering').name : '',
+                id: flag ? uni.getStorageSync('engineering').id : '',
+                type: type,
+            })
             uni.switchTab({
-                url: '/pages/index/message',
+                url: '/pages/index/message1',
             })
         },
-        eningerNum(){
+        eningerNum() {
             uni.navigateTo({
                 url: '/pages/engineering/list',
             })

pages/index/comp/indexZhuYongHu.vue

@@ -36,11 +36,11 @@
             </view>
             <view class="header-item" @click="jumpMessage('0')">
                 <view class="header-item-value">{{ devCount.eventCount || 0 }}</view>
-                <view class="header-item-label">暂态事件</view>
+                <view class="header-item-label">暂态事件数</view>
             </view>
             <view class="header-item" @click="jumpMessage('1')">
                 <view class="header-item-value">{{ devCount.harmonicCount || 0 }}</view>
-                <view class="header-item-label">稳态事件</view>
+                <view class="header-item-label">稳态事件数</view>
             </view>
         </view>
         <view class="canneng-index-title mt20">常用功能</view>

pages/index/comp/indexZhuanZhi.vue

@@ -1,122 +1,123 @@
-<template>
-    <view class="index-zhuanzhi">
-        <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-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
-                    <view class="header-item-label">设备总数</view>
-                </view>
-                <view class="header-item" @click="jump('onLineDevs')">
-                    <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
-                    <view class="header-item-label">在线设备</view>
-                </view>
-                <view class="header-item" @click="jump('offLineDevs')">
-                    <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
-                    <view class="header-item-label">离线设备</view>
-                </view>
-                <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" @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="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>
-                <view class="header-item-label">设备总数</view>
-            </view>
-            <view class="header-item" @click="jump('currentOnLineDevs')">
-                <view class="header-item-value">{{ devCount.currentOnLineDevCount || 0 }}</view>
-                <view class="header-item-label">在线设备</view>
-            </view>
-            <view class="header-item" @click="jump('currentOffLineDevs')">
-                <view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
-                <view class="header-item-label">离线设备</view>
-            </view>
-            <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" @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(true)">
-                <view class="header-item-value">{{ devCount.currentProjectCount || 0 }}</view>
-                <view class="header-item-label">项目个数</view>
-            </view>
-        </view>
-    </view>
-</template>
-<script>
-export default {
-    data() {
-        return {
-            loading: false,
-        }
-    },
-    props: {
-        devCount: {
-            type: Object,
-            default: {},
-        },
-    },
-    methods: {
-        projectWarning() {
-            uni.navigateTo({
-                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) {
-                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({
-                url: '/pages/device/list?type=' + type,
-            })
-        },
-    },
-    created() {},
-}
-</script>
-<style lang="scss">
-.index-zhuanzhi {
-}
-</style>
+<template>
+    <view class="index-zhuanzhi">
+        <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-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">设备总数</view>
+                </view>
+                <view class="header-item" @click="jump('onLineDevs')">
+                    <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
+                    <view class="header-item-label">在线设备</view>
+                </view>
+                <view class="header-item" @click="jump('offLineDevs')">
+                    <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">离线设备</view>
+                </view>
+                <view class="header-item" @click="jumpMessage(0, false)">
+                    <view class="header-item-value">{{ devCount.eventCount || 0 }}</view>
+                    <view class="header-item-label">暂态事件数</view>
+                </view>
+                <view class="header-item" @click="jumpMessage(1, false)">
+                    <view class="header-item-value">{{ devCount.harmonicCount || 0 }}</view>
+                    <view class="header-item-label">稳态事件数</view>
+                </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>
+                <view class="header-item-label">设备总数</view>
+            </view>
+            <view class="header-item" @click="jump('currentOnLineDevs')">
+                <view class="header-item-value">{{ devCount.currentOnLineDevCount || 0 }}</view>
+                <view class="header-item-label">在线设备</view>
+            </view>
+            <view class="header-item" @click="jump('currentOffLineDevs')">
+                <view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
+                <view class="header-item-label">离线设备</view>
+            </view>
+            <view class="header-item" @click="jumpMessage(0, true)">
+                <view class="header-item-value">{{ devCount.currentEventCount || 0 }}</view>
+                <view class="header-item-label">暂态事件数</view>
+            </view>
+            <view class="header-item" @click="jumpMessage(1, true)">
+                <view class="header-item-value">{{ devCount.currentHarmonicCount || 0 }}</view>
+                <view class="header-item-label">稳态事件数</view>
+            </view>
+            <view class="header-item" @click="projectNum(true)">
+                <view class="header-item-value">{{ devCount.currentProjectCount || 0 }}</view>
+                <view class="header-item-label">项目个数</view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            loading: false,
+        }
+    },
+    props: {
+        devCount: {
+            type: Object,
+            default: {},
+        },
+    },
+    methods: {
+        projectWarning() {
+            uni.navigateTo({
+                url: '/pages/zhuanzhi/warning',
+            })
+        },
+        eningerNum() {
+            uni.navigateTo({
+                url: '/pages/engineering/list',
+            })
+        },
+        jumpMessage(type, flag) {
+            uni.setStorageSync('messageParams', {
+                name: flag ? uni.getStorageSync('engineering').name : '',
+                id: flag ? uni.getStorageSync('engineering').id : '',
+                type: type,
+            })
+            uni.switchTab({
+                url: '/pages/index/message1',
+            })
+        },
+        projectNum(now) {
+            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({
+                url: '/pages/device/list?type=' + type,
+            })
+        },
+    },
+    created() {},
+}
+</script>
+<style lang="scss">
+.index-zhuanzhi {
+}
+</style>