diff --git a/App.vue b/App.vue
index 3c6616a..e511dae 100644
--- a/App.vue
+++ b/App.vue
@@ -22,9 +22,17 @@ export default {
         uni.onPushMessage((res) => {
             console.log('收到推送消息：', res.data.payload.path) //监听推送消息
             if (res.data.payload && res.data.payload.path) {
-                uni.navigateTo({
+                uni.setStorageSync('messageParams', {
+                    name: '',
+                    id: '',
+                    type: res.data.payload.path.split('type=')[1],
+                })
+                uni.switchTab({
                     url: res.data.payload.path,
                 })
+                // uni.navigateTo({
+                //     url: res.data.payload.path,
+                // })
             }
         })
     },
@@ -37,7 +45,7 @@ export default {
 <style lang="scss">
 /*每个页面公共css */
 @import './common/css/base.scss';
-@import "@/static/iconfont/iconfont.css";
+@import '@/static/iconfont/iconfont.css';
 
 /deep/ uni-tabbar .uni-tabbar__badge {
     width: auto;
diff --git a/common/api/device.js b/common/api/device.js
index 65ac574..efc0674 100644
--- a/common/api/device.js
+++ b/common/api/device.js
@@ -1,5 +1,4 @@
 import request from '../js/request'
-import config from '../js/config'
 
 // 获取设备
 export function getDeviceList(params) {
@@ -15,12 +14,15 @@ export function getDeviceList(params) {
  * @param {*} id  工程id
  * @returns
  */
+const date = new Date()
+const year = date.getFullYear() // 年份 4 位
+const month = (date.getMonth() + 1).toString().padStart(2, '0') // 月份自动补 0
+const currentYearMonth = `${year}-${month}`
 export function getDevCount(id) {
     return request({
         url: '/cs-device-boot/deviceUser/devCount',
         method: 'post',
-
-        data: { id },
+        data: { id: id, time: currentYearMonth },
     })
 }
 
@@ -209,11 +211,11 @@ export const engineeringPinToTop = (params) => {
 // 查询工程树
 export const lineTree = (params) => {
     return request({
-        url: '/cs-device-boot/csLedger/lineTree',
+        url: '/cs-device-boot/csLedger/AppLineTree',
         method: 'POST',
-        data: {
-            type: 'engineering',
-        },
+        // data: {
+        //     type: 'engineering',
+        // },
         // header: {
         //     'Content-Type': 'application/json',
         // },
@@ -236,6 +238,5 @@ export const queryEquipmentByndid = (params) => {
         url: '/cs-device-boot/EquipmentDelivery/queryEquipmentByndid',
         method: 'POST',
         data: params,
-      
     })
 }
diff --git a/common/js/config.js b/common/js/config.js
index ad3033a..f346d07 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -1,7 +1,7 @@
 const debug = true // true 是连地服务端本地，false 是连接线上
 
 const development = {
-    domain: 'http://192.168.1.103:10215',
+    domain: 'http://192.168.2.126:10215',
 }
 
 const production = {
diff --git a/components/Cn-filterCriteria/Cn-filterCriteria.vue b/components/Cn-filterCriteria/Cn-filterCriteria.vue
index 79801c4..071aaa5 100644
--- a/components/Cn-filterCriteria/Cn-filterCriteria.vue
+++ b/components/Cn-filterCriteria/Cn-filterCriteria.vue
@@ -113,7 +113,7 @@ export default {
                         id: '',
                         pid: '0',
                         pids: '0',
-                        name: '全部项目',
+                        name: '全部工程',
                         path: null,
                         provinceId: null,
                         cityId: null,
diff --git a/manifest.json b/manifest.json
index 22e47f8..70ba654 100644
--- a/manifest.json
+++ b/manifest.json
@@ -139,7 +139,7 @@
                 "/api" : {
                     "https" : true,
                     // "target" : "https://pqmcn.com:8092/api",
-                    "target" : "http://192.168.1.103:10215",
+                    "target" : "http://192.168.2.126:10215",
                     "changOrigin" : true,
                     "pathRewrite" : {
                         "/api" : ""
@@ -153,6 +153,9 @@
         },
         "unipush" : {
             "enable" : false
+        },
+        "sdkConfigs" : {
+            "maps" : {}
         }
     },
     "mp-toutiao" : {
diff --git a/pages/device/APF/report.vue b/pages/device/APF/report.vue
index 87b6d95..f0555fc 100644
--- a/pages/device/APF/report.vue
+++ b/pages/device/APF/report.vue
@@ -24,7 +24,9 @@
                         <!-- <view class="content-item-header-right-des">暂态类型：{{ item.showName }}</view> -->
                         <!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> -->
                     </view>
-                    <view class="ml10" v-if="type === '0' || item.status != '1'">  <uni-icons type="search" size="25"></uni-icons></view>
+                    <view class="ml10" v-if="type === '0' || item.status != '1'">
+                        <uni-icons type="search" size="25" color="#376cf3"></uni-icons
+                    ></view>
                 </view>
                 <view class="content-item-footer">{{ item.subTitle }}</view>
             </view>
@@ -112,8 +114,8 @@ export default {
             this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
             this.store.params.type = this.type
             this.store.params.deviceId = this.deviceId
-            this.store.params.startTime =  this.$util.getBeforeDays()
-            this.store.params.endTime = this.$util.getToday() 
+            this.store.params.startTime = this.$util.getBeforeDays()
+            this.store.params.endTime = this.$util.getToday()
             this.store.loadedCallback = () => {
                 this.store.data.forEach((item) => {
                     if (this.type === '3') {
diff --git a/pages/device/list.vue b/pages/device/list.vue
index 2229bd9..532d90e 100644
--- a/pages/device/list.vue
+++ b/pages/device/list.vue
@@ -91,7 +91,8 @@
                                         @change="switchChange(item)"
                                     />
                                     <view class="star-icon" v-else>
-                                        <uni-icons type="search" size="25"></uni-icons>
+                                        <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                                        🔍
                                     </view>
                                 </template>
                             </Cn-device-card>
diff --git a/pages/device/realTime/index.vue b/pages/device/realTime/index.vue
index f057d26..6e7cc61 100644
--- a/pages/device/realTime/index.vue
+++ b/pages/device/realTime/index.vue
@@ -10,7 +10,7 @@
                                 ><picker
                                     @change="lineChange"
                                     @cancel="selectProject = false"
-                                    :value="lineId"
+                                    :value="lineKey"
                                     :range="lineList"
                                     range-key="name"
                                 >
@@ -175,7 +175,7 @@ export default {
                 { name: '电压总谐波畸变率(%)', A: '/', B: '/', C: '/' },
             ],
             disabled: false,
-            countdown: 60,
+            countdown: 30,
             lineId: '00B78D00A87A1',
             lineKey: 0,
             lineList: [],
@@ -607,7 +607,7 @@ export default {
                 if (this.countdown <= 0) {
                     clearInterval(this.numTimer) // 清除定时器
                     this.disabled = false // 启用按钮
-                    this.countdown = 60 // 重置倒计时
+                    this.countdown = 30 // 重置倒计时
                     this.numTimer = null // 清空定时器标识
                 }
             }, 1000)
@@ -643,7 +643,7 @@ export default {
                     }
                 })
                 .catch(() => {
-                    this.countdown = 60 // 重置倒计时
+                    this.countdown = 30 // 重置倒计时
                     this.disabled = false
                     this.connection = false
                     this.clear()
@@ -870,7 +870,7 @@ export default {
         async lineChange(e) {
             await this.clear()
             this.disabled = false
-            this.countdown = 60
+            this.countdown = 30
 
             this.lineKey = e.detail.value
             this.lineId = this.lineList[e.detail.value].lineId
diff --git a/pages/index/comp/device.vue b/pages/index/comp/device.vue
index f9c58ad..1ca0370 100644
--- a/pages/index/comp/device.vue
+++ b/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>
diff --git a/pages/index/comp/indexGongCheng.vue b/pages/index/comp/indexGongCheng.vue
index 3ee91a8..585524f 100644
--- a/pages/index/comp/indexGongCheng.vue
+++ b/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',
             })
diff --git a/pages/index/comp/indexYouKe.vue b/pages/index/comp/indexYouKe.vue
index f474932..aae76cb 100644
--- a/pages/index/comp/indexYouKe.vue
+++ b/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>
diff --git a/pages/index/comp/indexYunWei.vue b/pages/index/comp/indexYunWei.vue
index eb86979..c2e884b 100644
--- a/pages/index/comp/indexYunWei.vue
+++ b/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',
             })
diff --git a/pages/index/comp/indexZhuYongHu.vue b/pages/index/comp/indexZhuYongHu.vue
index 88fa145..ceceea3 100644
--- a/pages/index/comp/indexZhuYongHu.vue
+++ b/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>
diff --git a/pages/index/comp/indexZhuanZhi.vue b/pages/index/comp/indexZhuanZhi.vue
index 70e3e66..ecf98f3 100644
--- a/pages/index/comp/indexZhuanZhi.vue
+++ b/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>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 543c877..65f1f29 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -176,10 +176,10 @@ export default {
                 // console.log(`12312`,res)
                 // Object.assign(this.devCount, res.data)
                 this.devCount = res.data
-                this.devCount.currentOffLineDevs.forEach((item) => {
+                this.devCount.currentOffLineDevs?.forEach((item) => {
                     item.runStatus = 1
                 })
-                this.devCount.offLineDevs.forEach((item) => {
+                this.devCount.offLineDevs?.forEach((item) => {
                     item.runStatus = 1
                 })
                 this.devCount.engineeringListLength = this.engineeringList.length
diff --git a/pages/index/message1.vue b/pages/index/message1.vue
index 2391c25..8c68c05 100644
--- a/pages/index/message1.vue
+++ b/pages/index/message1.vue
@@ -11,14 +11,9 @@
                 />
                 <!-- 角标 -->
                 <view class="badge-container">
-                    <span
-                        v-for="(item, index) in items"
-                        :key="index"
-                        class="badge"
-                        :style="{ left: getBadgeRightPosition(index) }"
-                        v-if="badgeCounts[index] > 0"
-                    >
-                        {{ badgeCounts[index] > 99 ? '99+' : badgeCounts[index] }}
+                    <span v-for="(item, index) in items" :key="index" class="badge">
+                        <uni-badge :text="badgeCounts[index] > 99 ? '99+' : badgeCounts[index]" />
+                        <!-- {{ badgeCounts[index] > 99 ? '99+' : badgeCounts[index] }} -->
                     </span>
                 </view>
                 <!-- 筛选条件 -->
@@ -74,7 +69,7 @@ export default {
     props: {},
     data() {
         return {
-            items: ['暂态事件', '稳态事件', '运行告警', '运行事件'],
+            items: ['暂态事件', '稳态事件'], //'运行告警', '运行事件'
             badgeCounts: [0, 0, 0, 0],
             current: 0,
             colorIndex: 0,
@@ -123,7 +118,7 @@ export default {
         const params = uni.getStorageSync('messageParams')
         this.getDevCount()
         this.$nextTick(() => {
-            if (params.type != '') {
+            if (params.type !== '') {
                 this.current = params.type - 0
             }
             if (params.name != '') {
@@ -236,7 +231,11 @@ export default {
 
         // 根据索引动态计算右侧偏移位置，使徽章对准每个标签的右上角
         getBadgeRightPosition(index) {
-            return (index + 1) * (this.width / 4) + 'px'
+            if (this.items == 4) {
+                return (index + 1) * (this.width / 4) + 'px'
+            } else {
+                return (index + 0) * (this.width / 2) + 'px'
+            }
         },
     },
 
@@ -282,25 +281,36 @@ export default {
     }
     .badge-container {
         position: absolute;
-        top: 10rpx; /* 徽章向上偏移，与控件重叠 */
+        top: -10rpx; /* 徽章向上偏移，与控件重叠 */
+        display: flex;
+        justify-content: space-around;
         right: 0;
         width: 100%;
         height: 0;
         pointer-events: none; /* 确保徽章不干扰点击事件 */
     }
+    /deep/ .uni-badge--error {
+        background-color: #ff3b30;
+    }
 
     .badge {
-        position: absolute;
+        flex: 1;
+        // position: absolute;
         // min-width: 18px;
-        height: 16px;
-        padding: 0 4px;
-        background-color: #ff3b30; /* 红色徽章 */
-        color: white;
-        font-size: 22rpx;
-        line-height: 16px;
+        // height: 16px;
+        // padding: 0 4px;
+        // background-color: #ff3b30; /* 红色徽章 */
+        // color: white;
+        // font-size: 22rpx;
+        // line-height: 16px;
+        // text-align: center;
+        // border-radius: 9px;
+        //
         text-align: center;
-        border-radius: 9px;
-        transform: translateX(-150%); /* 使徽章中心对齐右上角 */
+        // transform: translateX(-110%); /* 使徽章中心对齐右上角 */
+        .uni-badge--x {
+            left: 70rpx;
+        }
     }
 }
 </style>
diff --git a/pages/message/message.vue b/pages/message/message.vue
index b9eaa1e..0e5a1b9 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -28,7 +28,10 @@
                         >
                         <!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> -->
                     </view>
-                    <view class="ml10" v-if="type === '0' || item.status != '1'">  <uni-icons type="search" size="25"></uni-icons></view>
+                    <view class="ml10" v-if="type === '0' || item.status != '1'">
+                        <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                            🔍
+                </view>
                 </view>
                 <view class="content-item-footer">{{ item.subTitle }}</view>
             </view>
diff --git a/pages/message1/alarm.vue b/pages/message1/alarm.vue
index 71b8dbf..ebea6c4 100644
--- a/pages/message1/alarm.vue
+++ b/pages/message1/alarm.vue
@@ -36,7 +36,10 @@
                             <text class="event-id">{{ item.date }}发生告警终端{{ item.warnNums }}台</text>
                         </view>
                     </view>
-                    <view class="event-action">   <uni-icons type="search" size="25"></uni-icons> </view>
+                    <view class="event-action"> 
+                        <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                    🔍
+                    </view>
                 </view>
             </uni-card>
             <uni-load-more
diff --git a/pages/message1/steadyState.vue b/pages/message1/steadyState.vue
index d29c88b..c10788d 100644
--- a/pages/message1/steadyState.vue
+++ b/pages/message1/steadyState.vue
@@ -50,11 +50,12 @@
                         </view>
                     </view>
                     <view class="event-action">
-                        <uni-icons type="search" size="25"></uni-icons>
+                        <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                        🔍
                     </view>
                 </view>
                 <!-- 详情区域 -->
-                <view class="event-detail">
+                <view class="event-detail textBox">
                     <text>{{ item.statisticsDate }}发生 {{ item.overLimitDesc }} </text>
                 </view>
             </uni-card>
@@ -191,4 +192,14 @@ export default {
 /deep/ .uni-scroll-view-refresher {
     display: none;
 }
+.textBox {
+    max-height: 110rpx;
+    overflow: hidden;
+    /* 下面是溢出显示省略号关键样式 */
+    display: -webkit-box;
+    -webkit-line-clamp: 3; /* 控制最多显示几行，你可以改 2/3/4 */
+    -webkit-box-orient: vertical;
+    text-overflow: ellipsis;
+    word-break: break-all;
+}
 </style>
diff --git a/pages/message1/transient.vue b/pages/message1/transient.vue
index 1cd0239..c83d648 100644
--- a/pages/message1/transient.vue
+++ b/pages/message1/transient.vue
@@ -87,7 +87,10 @@
                             <text>监测点名称：{{ item.lineName }}</text>
                         </view>
                     </view>
-                    <view class="event-action">   <uni-icons type="search" size="25" color="#376cf3"></uni-icons> </view>
+                    <view class="event-action">
+                        <!-- <uni-icons type="search" size="25" color="#376cf3"></uni-icons> -->
+                        🔍
+                    </view>
                 </view>
                 <!-- 详情区域 -->
                 <view class="event-detail">
@@ -293,5 +296,4 @@ export default {
 /deep/ .uni-scroll-view-refresher {
     display: none;
 }
-
 </style>