From bb953313928f61bd011bf40f81fcf30c0e2e1175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Fri, 3 Nov 2023 16:33:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/list.js                             |   1 +
 components/Cn-device-card/Cn-device-card.vue  |   4 +-
 manifest.json                                 |   4 +-
 pages.json                                    | 103 +-------
 pages/device/APF/comp/xieBo.vue               |  21 +-
 pages/device/APF/detail.vue                   |  64 +++--
 pages/device/list.vue                         |   4 +-
 pages/index/comp/device.vue                   |  14 +-
 pages/index/comp/indexYunWei.vue              |  40 +++-
 pages/index/comp/indexZhuanZhi.vue            |  39 +--
 pages/index/index.vue                         |   3 -
 pages/index/message.vue                       |  26 +-
 pages/index/mine.vue                          |   5 +-
 pages/message/message.vue                     | 223 ++++++++++++++++++
 ...{transientDetail.vue => messageDetail.vue} |   0
 pages/message/report.vue                      | 105 ---------
 pages/message/reportDetail.vue                |  61 -----
 pages/message/reportList.vue                  | 113 ---------
 pages/message/run.vue                         |  82 -------
 pages/message/runDetail.vue                   |  61 -----
 pages/message/steady.vue                      | 105 ---------
 pages/message/steadyDetail.vue                |  61 -----
 pages/message/steadyList.vue                  |  54 -----
 pages/message/transient.vue                   | 106 ---------
 pages/mine/setup.vue                          |   6 +-
 pages/project/detail.vue                      |  46 ++--
 static/deivce_success.png                     | Bin 0 -> 2631 bytes
 static/device_bad2.png                        | Bin 0 -> 3476 bytes
 static/device_success.png                     | Bin 2615 -> 2631 bytes
 static/run2.png                               | Bin 0 -> 3522 bytes
 static/steady2.png                            | Bin 0 -> 4453 bytes
 static/zantai2.png                            | Bin 0 -> 5157 bytes
 32 files changed, 402 insertions(+), 949 deletions(-)
 create mode 100644 pages/message/message.vue
 rename pages/message/{transientDetail.vue => messageDetail.vue} (100%)
 delete mode 100644 pages/message/report.vue
 delete mode 100644 pages/message/reportDetail.vue
 delete mode 100644 pages/message/reportList.vue
 delete mode 100644 pages/message/run.vue
 delete mode 100644 pages/message/runDetail.vue
 delete mode 100644 pages/message/steady.vue
 delete mode 100644 pages/message/steadyDetail.vue
 delete mode 100644 pages/message/steadyList.vue
 delete mode 100644 pages/message/transient.vue
 create mode 100644 static/deivce_success.png
 create mode 100644 static/device_bad2.png
 create mode 100644 static/run2.png
 create mode 100644 static/steady2.png
 create mode 100644 static/zantai2.png

diff --git a/common/js/list.js b/common/js/list.js
index e0d1dc9..1af13d7 100644
--- a/common/js/list.js
+++ b/common/js/list.js
@@ -35,6 +35,7 @@ export default {
                 firstCallBack: null,
                 loadedCallback: null,
                 reload() {
+                    if(this.status == 'loading') return
                     this.data = []
                     this.status = 'loading'
                     this.empty = false
diff --git a/components/Cn-device-card/Cn-device-card.vue b/components/Cn-device-card/Cn-device-card.vue
index 147fae9..b719f19 100644
--- a/components/Cn-device-card/Cn-device-card.vue
+++ b/components/Cn-device-card/Cn-device-card.vue
@@ -45,10 +45,10 @@ export default {
                     str = '/static/device_bad.png'
                     break
                 case 2:
-                    str = '/static/device.png'
+                    str = '/static/device_success.png'
                     break
                 default:
-                    str = '/static/device.png'
+                    str = '/static/device_success.png'
                     break
             }
             return str
diff --git a/manifest.json b/manifest.json
index c2ebb71..d6fe042 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "灿能物联",
     "appid" : "__UNI__88BC25B",
     "description" : "",
-    "versionName" : "1.4.1",
-    "versionCode" : 141,
+    "versionName" : "1.4.2",
+    "versionCode" : 142,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 2509f64..4b889be 100644
--- a/pages.json
+++ b/pages.json
@@ -192,7 +192,7 @@
             }
         },
         {
-            "path": "pages/message/transient",
+            "path": "pages/message/message",
             "style": {
                 "app-plus": {
                     "bounce": "none",
@@ -215,98 +215,11 @@
             }
         },
         {
-            "path": "pages/message/transientDetail",
+            "path": "pages/message/messageDetail",
             "style": {
                 "navigationBarTitleText": "暂态事件详情"
             }
         },
-        {
-            "path": "pages/message/report",
-            "style": {
-                "app-plus": {
-                    "bounce": "none",
-                    //关闭窗口回弹效果
-                    "titleNView": {
-                        "titleText": "设备告警",
-                        // 窗口的标题
-                        "titleAlign": "center",
-                        "padding-right": "20rpx",
-                        "buttons": [
-                            {
-                                "text": "一键已读",
-                                "fontSize": "28rpx",
-                                "select": false,
-                                "width": "auto"
-                            }
-                        ]
-                    }
-                }
-            }
-        },
-        {
-            "path": "pages/message/reportList",
-            "style": {
-                "navigationBarTitleText": "异常设备列表"
-            }
-        },
-        {
-            "path": "pages/message/reportDetail",
-            "style": {
-                "navigationBarTitleText": "设备告警详情"
-            }
-        },
-        {
-            "path": "pages/message/steady",
-            "style": {
-                "app-plus": {
-                    "bounce": "none",
-                    //关闭窗口回弹效果
-                    "titleNView": {
-                        "titleText": "稳态越限",
-                        // 窗口的标题
-                        "titleAlign": "center",
-                        "padding-right": "20rpx",
-                        "buttons": [
-                            {
-                                "text": "一键已读",
-                                "fontSize": "28rpx",
-                                "select": false,
-                                "width": "auto"
-                            }
-                        ]
-                    }
-                }
-            }
-        },
-        {
-            "path": "pages/message/run",
-            "style": {
-                "app-plus": {
-                    "bounce": "none",
-                    //关闭窗口回弹效果
-                    "titleNView": {
-                        "titleText": "运行事件",
-                        // 窗口的标题
-                        "titleAlign": "center",
-                        "padding-right": "20rpx",
-                        "buttons": [
-                            {
-                                "text": "一键已读",
-                                "fontSize": "28rpx",
-                                "select": false,
-                                "width": "auto"
-                            }
-                        ]
-                    }
-                }
-            }
-        },
-        {
-            "path": "pages/message/runDetail",
-            "style": {
-                "navigationBarTitleText": "运行事件详情"
-            }
-        },
         {
             "path": "pages/device/transfer",
             "style": {
@@ -451,18 +364,6 @@
                 "navigationBarTitleText": "网关详情"
             }
         },
-        {
-            "path": "pages/message/steadyList",
-            "style": {
-                "navigationBarTitleText": "越限监测点列表"
-            }
-        },
-        {
-            "path": "pages/message/steadyDetail",
-            "style": {
-                "navigationBarTitleText": "稳态事件详情"
-            }
-        },
         {
             "path": "pages/project/transfer",
             "style": {
diff --git a/pages/device/APF/comp/xieBo.vue b/pages/device/APF/comp/xieBo.vue
index 1bfbc85..86ea0b6 100644
--- a/pages/device/APF/comp/xieBo.vue
+++ b/pages/device/APF/comp/xieBo.vue
@@ -18,6 +18,7 @@
             ></uni-data-select>
         </div>
         <view class="charts-box">
+            <view class="data-time">{{ time }}</view>
             <qiun-data-charts type="bar" :ontouch="true" :opts="opts" :chartData="chartData" />
         </view>
     </view>
@@ -30,6 +31,10 @@ export default {
             type: Array,
             default: () => [],
         },
+        dataTime: {
+            type: String,
+            default: '',
+        },
     },
     data() {
         return {
@@ -44,6 +49,7 @@ export default {
                 },
             ],
             parity: 2,
+            time: '',
             dataOptions: [],
             dataRadio: 0,
             renderData: {
@@ -72,9 +78,10 @@ export default {
                     '#9A60B4',
                     '#ea7ccc',
                 ],
-                padding: [20, 10, 0, 0],
+                padding: [0, 10, 0, 0],
                 legend: {
                     position: 'top',
+                    float: 'left',
                 },
                 xAxis: {
                     disableGrid: true,
@@ -105,10 +112,10 @@ export default {
     },
     watch: {
         basicData: {
-            handler: function (newVal, oldVal) {
+            handler(newVal, oldVal) {
                 console.log(this.basicData)
                 let basicData = JSON.parse(JSON.stringify(this.basicData))
-                this.dataRadio = 0
+                // this.dataRadio = 0
                 this.renderData = {
                     电网侧: {
                         Apf_HarmI: {},
@@ -176,6 +183,8 @@ export default {
                 this.dataOptions = dataOptions
                 console.log(dataOptions)
                 this.initEcharts()
+                console.log(this.dataTime)
+                this.time = this.$util.parseTime(this.dataTime - 8 * 60 * 60)
             },
             deep: true,
             immediate: true,
@@ -227,6 +236,12 @@ export default {
 .charts-box {
     margin-top: 20rpx;
     height: 100vh;
+    .data-time {
+        position: absolute;
+        right: 20rpx;
+        margin-top: 18rpx;
+        font-size: 24rpx;
+    }
 }
 .header-form {
     display: flex;
diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue
index ef17258..7023552 100644
--- a/pages/device/APF/detail.vue
+++ b/pages/device/APF/detail.vue
@@ -21,21 +21,26 @@
                                     <view class="grid-card-content-1">
                                         <view class="item">{{ item.label }}</view>
                                         <view class="item" v-for="(child, childIndex) in item.value" :key="childIndex">
-                                            {{ child }}
+                                            <text>{{ child.label }}</text>
+                                            <text style="font-weight: 700">{{ child.value }}</text>
                                         </view>
                                     </view>
                                 </view>
                             </view>
-                            <view class="module">
+                            <view class="module" v-if="IOData.length">
                                 <view class="grid-card">
-                                    <view class="grid-card-content-2">
+                                    <view class="grid-card-content-6">
                                         <template v-for="(item, index) in IOData">
                                             <view class="item">{{ item.clDid }}</view>
-                                            <view class="item">
-                                                <view style="width: 30rpx"> {{ item.value || '-' }}</view>
+                                            <view class="item" style="font-weight: 700">
+                                                {{ item.value || '-' }}
                                                 <view v-if="item.value"> °C</view>
                                             </view>
                                         </template>
+                                        <template v-for="(item, index) in 3 - (IOData.length % 3)">
+                                            <view class="item"></view>
+                                            <view class="item"> </view>
+                                        </template>
                                     </view>
                                 </view>
                             </view>
@@ -61,7 +66,7 @@
                         <basic :basicData="basicData"></basic>
                     </view>
                     <view v-else-if="navMenuActive == 1">
-                        <xieBo :basicData="basicData"></xieBo>
+                        <xieBo :dataTime="dataTime" :basicData="basicData"></xieBo>
                     </view>
                     <view v-else-if="navMenuActive == 2">
                         <power :basicData="basicData"></power>
@@ -98,13 +103,24 @@
                         @confirm="dialogInputConfirm"
                     ></uni-popup-dialog>
                 </uni-popup> -->
-                 <!-- 输入框示例 -->
-                 <uni-popup ref="inputDialog" type="dialog">
-                    <uni-popup-dialog ref="inputClose" type="info" mode="input" :title="dialogType"
-                                      value="对话框预置提示内容!"
-                                      placeholder="请输入内容" @confirm="dialogInputConfirm">
-                        <uni-easyinput type="textarea" :maxlength="250" autoHeight v-model="remarkContent"
-                                       placeholder="请输入备注"></uni-easyinput>
+                <!-- 输入框示例 -->
+                <uni-popup ref="inputDialog" type="dialog">
+                    <uni-popup-dialog
+                        ref="inputClose"
+                        type="info"
+                        mode="input"
+                        :title="dialogType"
+                        value="对话框预置提示内容!"
+                        placeholder="请输入内容"
+                        @confirm="dialogInputConfirm"
+                    >
+                        <uni-easyinput
+                            type="textarea"
+                            :maxlength="250"
+                            autoHeight
+                            v-model="remarkContent"
+                            placeholder="请输入备注"
+                        ></uni-easyinput>
                     </uni-popup-dialog>
                 </uni-popup>
             </view>
@@ -132,6 +148,7 @@ export default {
     },
     data() {
         return {
+            dataTime: '',
             remarkContent: '',
             dialogType: '',
             domLoading: true,
@@ -425,12 +442,22 @@ export default {
                 element.showKey.forEach((key) => {
                     data.forEach((item) => {
                         if (item.statisticalName === key && item.phase === 'avg') {
-                            if(key === 'Apf_RmsI_TolOut(A)'){
-                                arr.push(  '总输出电流:' + item.statisticalData + 'A')
-                            }else{
-                                arr.push(  '电流畸变率:' + item.statisticalData + '%')
+                            if (key === 'Apf_RmsI_TolOut(A)') {
+                                arr.push({
+                                    label: '总输出电流:',
+                                    value: item.statisticalData + 'A',
+                                })
+                            } else {
+                                arr.push({
+                                    label: '电流畸变率:',
+                                    value: item.statisticalData + '%',
+                                })
+                                // arr.push('电流畸变率:' + item.statisticalData + '%')
                             }
                         }
+                        if (item.time) {
+                            this.dataTime = item.time.seconds
+                        }
                     })
                 })
                 element.value = arr
@@ -582,10 +609,9 @@ export default {
             position: absolute;
             bottom: 0;
             right: 10rpx;
-            width: 200rpx;
             opacity: 0.8;
-
             .grid-card-content-2,
+            .grid-card-content-6,
             .grid-card-content-1 {
                 font-size: 16rpx;
 
diff --git a/pages/device/list.vue b/pages/device/list.vue
index 5a55c81..26a951d 100644
--- a/pages/device/list.vue
+++ b/pages/device/list.vue
@@ -24,8 +24,8 @@
                               @click="select.selectProject = true">
                             {{
                                 select.projectName
-                                    ? select.projectName.length > 4
-                                        ? select.projectName.substring(0, 4) + '...'
+                                    ? select.projectName.length > 6
+                                        ? select.projectName.substring(0, 6) + '...'
                                         : select.projectName
                                     : '全部项目'
                             }}
diff --git a/pages/index/comp/device.vue b/pages/index/comp/device.vue
index 525a1c3..252c787 100644
--- a/pages/index/comp/device.vue
+++ b/pages/index/comp/device.vue
@@ -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>
diff --git a/pages/index/comp/indexYunWei.vue b/pages/index/comp/indexYunWei.vue
index 40d7c80..0fc5610 100644
--- a/pages/index/comp/indexYunWei.vue
+++ b/pages/index/comp/indexYunWei.vue
@@ -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({
diff --git a/pages/index/comp/indexZhuanZhi.vue b/pages/index/comp/indexZhuanZhi.vue
index cb8c5d8..70e3e66 100644
--- a/pages/index/comp/indexZhuanZhi.vue
+++ b/pages/index/comp/indexZhuanZhi.vue
@@ -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">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 714115c..80f99d0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -74,9 +74,6 @@ export default {
             timer: null,
         }
     },
-    onPullDownRefresh() {
-        console.log('onPullDownRefresh')
-    },
     computed: {
         emptyEngineeringName() {
             if (this.userInfo.authorities === 'tourist') {
diff --git a/pages/index/message.vue b/pages/index/message.vue
index 68ec460..ef88c5d 100644
--- a/pages/index/message.vue
+++ b/pages/index/message.vue
@@ -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>
 
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index d44bd8f..62fcb89 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -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)
diff --git a/pages/message/message.vue b/pages/message/message.vue
new file mode 100644
index 0000000..f79ec4a
--- /dev/null
+++ b/pages/message/message.vue
@@ -0,0 +1,223 @@
+<template>
+    <Cn-page :loading="loading">
+        <view class="content" slot="body">
+            <view class="content-item" v-for="(item, index) in store.data" :key="index" @click="jump(item)">
+                <view class="content-item-header">
+                    <uni-badge
+                        class="uni-badge-left-margin"
+                        :is-dot="true"
+                        :text="item.status == '1' ? 0 : 1"
+                        absolute="rightTop"
+                        size="small"
+                    >
+                        <view class="content-item-header-icon">
+                            <image mode="aspectFill" :src="staticIcon" style="height: 60rpx; width: 60rpx"></image>
+                        </view>
+                    </uni-badge>
+                    <view class="content-item-header-right">
+                        <view class="content-item-header-right-title">{{ item.equipmentName }}</view>
+                        <!-- <view class="content-item-header-right-des">{{ item.engineeringName }} {{ item.projectName }}</view> -->
+                        <view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</view>
+                        <view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view>
+                        <!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> -->
+                    </view>
+                    <view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view>
+                </view>
+                <view class="content-item-footer">{{ item.subTitle }}</view>
+            </view>
+            <!-- <uni-card
+                :title="item.equipmentName"
+                :extra="item.status == '1' ? '' : '未读'"
+                :sub-title="item.subTitle"
+                thumbnail="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png"
+                @click="jump(item)"
+                v-for="(item, index) in store.data"
+                :key="index"
+            >
+                <view class="term-list-bottom">
+                    <view class="term-list-bottom-item" v-for="(item2, textIndex) in item.dataSet" :key="textIndex">
+                        {{ item2.showName + ':' + (item2.value == 3.1415926 ? '-' : item2.value) + (item2.unit || '') }}
+                    </view>
+                </view>
+            </uni-card> -->
+            <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
+            <uni-load-more v-if="store.data && store.data.length > 0" :status="store.status"></uni-load-more>
+        </view>
+    </Cn-page>
+</template>
+
+<script>
+import list from '@/common/js/list'
+import { updateStatus } from '@/common/api/message'
+
+export default {
+    mixins: [list],
+    data() {
+        return {
+            loading: true,
+            type: '',
+            staticIcon: '',
+        }
+    },
+    onLoad(o) {
+        this.type = o.type
+        switch (o.type) {
+            case '0':
+                uni.setNavigationBarTitle({ title: '暂态事件' })
+                this.staticIcon = '/static/zantai2.png'
+                break
+            case '1':
+                uni.setNavigationBarTitle({ title: '稳态事件' })
+                this.staticIcon = '/static/steady2.png'
+                break
+            case '2':
+                uni.setNavigationBarTitle({ title: '运行事件' })
+                this.staticIcon = '/static/run2.png'
+                break
+            case '3':
+                uni.setNavigationBarTitle({ title: '设备告警' })
+                this.staticIcon = '/static/device_bad2.png'
+                break
+        }
+    },
+    onShow() {
+        this.loading = true
+        this.init()
+    },
+    onNavigationBarButtonTap(e) {
+        uni.showModal({
+            title: '提示',
+            content: '确定要全部标记为已读吗？',
+            success: (res) => {
+                if (res.confirm) {
+                    updateStatus({
+                        type: this.type,
+                        eventIds: [],
+                    }).then(() => {
+                        this.loading = true
+                        this.store.reload()
+                    })
+                }
+            },
+        })
+    },
+    methods: {
+        async init() {
+            let dictData = await this.$util.getDictData('app_event')
+            console.log(dictData)
+            this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
+            this.store.params.type = this.type
+            this.store.loadedCallback = () => {
+                this.store.data.forEach((item) => {
+                    if (this.type !== '0') {
+                        item.subTitle = `于${item.startTime}发生${item.showName}`
+                    } else {
+                        item.subTitle =
+                            `于${item.startTime}发生${item.showName}。` +
+                            item.dataSet
+                                .map((item2) => {
+                                    return (
+                                        item2.showName +
+                                        '：' +
+                                        (item2.value == 3.1415926 ? '-' : item2.value) +
+                                        (item2.unit || '')
+                                    )
+                                })
+                                .join('，')
+                    }
+                })
+                this.loading = false
+            }
+            this.store.reload()
+        },
+        jump(item) {
+            if (this.type === '0') {
+                let str = JSON.stringify(item).replace(/%/g, '百分比')
+                uni.navigateTo({ url: '/pages/message/messageDetail?detail=' + encodeURIComponent(str) })
+            } else {
+                if (item.status != '1') {
+                    item.status = '1'
+                    updateStatus({
+                        eventIds: [item.id],
+                    })
+                }
+            }
+        },
+    },
+}
+</script>
+
+<style lang="scss">
+.content {
+    .content-item {
+        margin: 20rpx;
+        padding: 20rpx 20rpx;
+        box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 6rpx 2rpx;
+        border-radius: 8rpx;
+        border: 1px solid #ebeef5;
+        background: #fff;
+        .content-item-header {
+            display: flex;
+            padding: 20rpx 0;
+            border-bottom: 1px solid #ebeef5;
+            .content-item-header-icon {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100rpx;
+                height: 100rpx;
+                border-radius: 8rpx;
+                background: $uni-theme-color;
+            }
+            .content-item-header-right {
+                flex: 1;
+                display: flex;
+                flex-direction: column;
+                justify-content: space-between;
+                height: 100rpx;
+                margin-left: 20rpx;
+                .content-item-header-right-title {
+                    font-size: 28rpx;
+                    font-weight: bold;
+                    color: #111;
+                }
+                .content-item-header-right-des {
+                    font-size: 24rpx;
+                    color: #999;
+                }
+            }
+        }
+        .content-item-footer {
+            margin-top: 20rpx;
+            font-size: 24rpx;
+            color: #999;
+        }
+    }
+    // padding-top: 20rpx;
+}
+
+.term-list-bottom {
+    .term-list-bottom-item {
+        font-size: 28rpx;
+        margin-bottom: 10rpx;
+        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;
+}
+
+/deep/ .uni-card__header-extra-text {
+    color: #dd524d !important;
+    font-size: 20rpx;
+}
+</style>
diff --git a/pages/message/transientDetail.vue b/pages/message/messageDetail.vue
similarity index 100%
rename from pages/message/transientDetail.vue
rename to pages/message/messageDetail.vue
diff --git a/pages/message/report.vue b/pages/message/report.vue
deleted file mode 100644
index cd7fc96..0000000
--- a/pages/message/report.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-    <Cn-page :loading="loading">
-        <view class="content" slot="body">
-            <uni-list :border="false">
-                <uni-list-item
-                    isDot
-                    show-badge
-                    badgeType="error"
-                    :badge-text="item.status == 1 ? '' : '未读'"
-                    :title="'告警代码：'+item.code"
-                    :note="item.startTime"
-                    @click="jump(item)"
-                    clickable
-                    v-for="(item, index) in store.data"
-                />
-            </uni-list>
-            <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more v-if="store.data && store.data.length > 0" :status="store.status"></uni-load-more>
-        </view>
-    </Cn-page>
-</template>
-
-<script>
-import list from '@/common/js/list'
-import { updateStatus } from '@/common/api/message'
-
-export default {
-    mixins: [list],
-    data() {
-        return {
-            loading: true,
-        }
-    },
-    onShow() {
-        this.init()
-    },
-    onNavigationBarButtonTap(e) {
-        uni.showModal({
-            title: '提示',
-            content: '确定要全部标记为已读吗？',
-            success: (res) => {
-                if (res.confirm) {
-                    updateStatus({
-                        type: 3,
-                        eventIds:[]
-                    }).then(() => {
-                        this.store.reload()
-                    })
-                }
-            },
-        })
-    },
-    methods: {
-        async init() {
-            let dictData = await this.$util.getDictData('app_event')
-            console.log(dictData)
-            this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
-            this.store.params.type = 3
-            this.store.firstCallBack = (res) => {
-                // this.store.data.forEach((item) => {
-                //     item.title = dictData.find((item2) => item2.code === item.tag)?.name
-                // })
-                // console.log(this.store.data)
-                this.loading = false
-            }
-            this.store.reload()
-        },
-        jump(item) {
-            let str = JSON.stringify(item).replace(/%/g, '百分比')
-            uni.navigateTo({ url: '/pages/message/reportDetail?detail=' + encodeURIComponent(str) })
-        },
-    },
-}
-</script>
-
-<style lang="scss">
-.content {
-    // padding-top: 20rpx;
-}
-
-.term-list-bottom {
-    .term-list-bottom-item {
-        font-size: 28rpx;
-        margin-bottom: 10rpx;
-        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;
-}
-
-/deep/ .uni-card__header-extra-text {
-    color: #dd524d !important;
-    font-size: 20rpx;
-}
-</style>
diff --git a/pages/message/reportDetail.vue b/pages/message/reportDetail.vue
deleted file mode 100644
index ba5f937..0000000
--- a/pages/message/reportDetail.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-    <Cn-page :loading="loading">
-        <view class="detail" slot="body">
-            <view class="detail-content" style="font-size: 32rpx">
-                <!-- <view class="detail-content-title mb20">发生时间</view> -->
-                <view>{{ detail.startTime }}</view>
-            </view>
-            <view class="detail-content">
-                <view class="detail-content-title mb20">基础信息</view>
-                <view class="mb5"> 设备名称：{{ detail.equipmentName }}</view>
-                <view class="mb5"> 项目名称：{{ detail.projectName }} </view>
-                <view class="mb5"> 工程名称：{{ detail.engineeringName }} </view>
-                <view class="mb5"> 告警代码：{{ detail.code }}</view>
-                <view class="mb5" v-for="(item, textIndex) in detail.dataSet" :key="textIndex">
-                    {{ item.showName + ':' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }}
-                </view>
-            </view>
-        </view>
-    </Cn-page>
-</template>
-<script>
-import { updateStatus } from '@/common/api/message'
-
-export default {
-    data() {
-        return {
-            loading: true,
-            detail: {},
-        }
-    },
-    onLoad(options) {
-        console.log(options.detail)
-        this.detail = JSON.parse(decodeURIComponent(options.detail).replace(/百分比/g, '%'))
-        this.loading = false
-        if (this.detail.status != 1) {
-            updateStatus({
-                eventIds: [this.detail.id],
-            })
-        }
-    },
-    methods: {},
-}
-</script>
-<style lang="scss">
-.detail {
-    padding: 20rpx 0;
-
-    .detail-content {
-        padding: 20rpx;
-        background: #fff;
-        margin-bottom: 20rpx;
-        font-size: 26rpx;
-
-        .detail-content-title {
-            font-size: 32rpx;
-            color: #111;
-            font-weight: 700;
-        }
-    }
-}
-</style>
diff --git a/pages/message/reportList.vue b/pages/message/reportList.vue
deleted file mode 100644
index 4a649db..0000000
--- a/pages/message/reportList.vue
+++ /dev/null
@@ -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>
diff --git a/pages/message/run.vue b/pages/message/run.vue
deleted file mode 100644
index 746a524..0000000
--- a/pages/message/run.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-    <Cn-page :loading="loading">
-        <view class="content" slot="body">
-            <uni-list :border="false">
-                <uni-list-item
-                    isDot
-                    show-badge
-                    badgeType="error"
-                    :badge-text="item.status == 1 ? '' : '未读'"
-                    :title="item.showName"
-                    :note="item.startTime"
-                    @click="jump(item)"
-                    clickable
-                    v-for="(item, index) in store.data"
-                />
-            </uni-list>
-            <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more v-if="store.data && store.data.length > 0" :status="store.status"></uni-load-more>
-        </view>
-    </Cn-page>
-</template>
-<script>
-import list from '@/common/js/list'
-import { updateStatus } from '@/common/api/message'
-
-export default {
-    mixins: [list],
-    data() {
-        return {
-            loading: true,
-        }
-    },
-    onShow() {
-        this.init()
-    },
-    onNavigationBarButtonTap(e) {
-        uni.showModal({
-            title: '提示',
-            content: '确定要全部标记为已读吗？',
-            success: (res) => {
-                if (res.confirm) {
-                    updateStatus({
-                        type: 2,
-                        eventIds:[]
-                    }).then(() => {
-                        this.store.reload()
-                    })
-                }
-            },
-        })
-    },
-    methods: {
-        async init() {
-            let dictData = await this.$util.getDictData('app_event')
-            console.log(dictData)
-            this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
-            this.store.params.type = 2
-            this.store.firstCallBack = (res) => {
-                this.loading = false
-            }
-            this.store.reload()
-        },
-        jump(item) {
-            let str = JSON.stringify(item).replace(/%/g, '百分比')
-            uni.navigateTo({ url: '/pages/message/runDetail?detail=' + encodeURIComponent(str) })
-        },
-    },
-}
-</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>
diff --git a/pages/message/runDetail.vue b/pages/message/runDetail.vue
deleted file mode 100644
index 2c28810..0000000
--- a/pages/message/runDetail.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-    <Cn-page :loading="loading">
-        <view class="detail" slot="body">
-            <view class="detail-content" style="font-size: 32rpx">
-                <!-- <view class="detail-content-title mb20">发生时间</view> -->
-                <view>{{ detail.startTime }}</view>
-            </view>
-            <view class="detail-content">
-                <view class="detail-content-title mb20">基础信息</view>
-                <view class="mb5"> 设备名称：{{ detail.equipmentName }}</view>
-                <view class="mb5"> 项目名称：{{ detail.projectName }} </view>
-                <view class="mb5"> 工程名称：{{ detail.engineeringName }} </view>
-                <view class="mb5"> 事件名称：{{ detail.showName }}</view>
-                <view class="mb5" v-for="(item, textIndex) in detail.dataSet" :key="textIndex">
-                    {{ item.showName + ':' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }}
-                </view>
-            </view>
-        </view>
-    </Cn-page>
-</template>
-<script>
-import { updateStatus } from '@/common/api/message'
-
-export default {
-    data() {
-        return {
-            loading: true,
-            detail: {},
-        }
-    },
-    onLoad(options) {
-        console.log(options.detail)
-        this.detail = JSON.parse(decodeURIComponent(options.detail).replace(/百分比/g, '%'))
-        this.loading = false
-        if (this.detail.status != 1) {
-            updateStatus({
-                eventIds: [this.detail.id],
-            })
-        }
-    },
-    methods: {},
-}
-</script>
-<style lang="scss">
-.detail {
-    padding: 20rpx 0;
-
-    .detail-content {
-        padding: 20rpx;
-        background: #fff;
-        margin-bottom: 20rpx;
-        font-size: 26rpx;
-
-        .detail-content-title {
-            font-size: 32rpx;
-            color: #111;
-            font-weight: 700;
-        }
-    }
-}
-</style>
diff --git a/pages/message/steady.vue b/pages/message/steady.vue
deleted file mode 100644
index 28fb6ae..0000000
--- a/pages/message/steady.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-    <Cn-page :loading="loading">
-        <view class="content" slot="body">
-            <uni-list :border="false">
-                <uni-list-item
-                    isDot
-                    show-badge
-                    badgeType="error"
-                    :badge-text="item.status == 1 ? '' : '未读'"
-                    :title="item.showName"
-                    :note="item.startTime"
-                    @click="jump(item)"
-                    clickable
-                    v-for="(item, index) in store.data"
-                />
-            </uni-list>
-            <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more v-if="store.data && store.data.length > 0" :status="store.status"></uni-load-more>
-        </view>
-    </Cn-page>
-</template>
-
-<script>
-import list from '@/common/js/list'
-import { updateStatus } from '@/common/api/message'
-
-export default {
-    mixins: [list],
-    data() {
-        return {
-            loading: true,
-        }
-    },
-    onShow() {
-        this.init()
-    },
-    onNavigationBarButtonTap(e) {
-        uni.showModal({
-            title: '提示',
-            content: '确定要全部标记为已读吗？',
-            success: (res) => {
-                if (res.confirm) {
-                    updateStatus({
-                        type: 1,
-                        eventIds:[]
-                    }).then(() => {
-                        this.store.reload()
-                    })
-                }
-            },
-        })
-    },
-    methods: {
-        async init() {
-            let dictData = await this.$util.getDictData('app_event')
-            console.log(dictData)
-            this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
-            this.store.params.type = 1
-            this.store.firstCallBack = (res) => {
-                // this.store.data.forEach((item) => {
-                //     item.title = dictData.find((item2) => item2.code === item.tag)?.name
-                // })
-                // console.log(this.store.data)
-                this.loading = false
-            }
-            this.store.reload()
-        },
-        jump(item) {
-            let str = JSON.stringify(item).replace(/%/g, '百分比')
-            uni.navigateTo({ url: '/pages/message/steadyDetail?detail=' + encodeURIComponent(str) })
-        },
-    },
-}
-</script>
-
-<style lang="scss">
-.content {
-    // padding-top: 20rpx;
-}
-
-.term-list-bottom {
-    .term-list-bottom-item {
-        font-size: 28rpx;
-        margin-bottom: 10rpx;
-        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;
-}
-
-/deep/ .uni-card__header-extra-text {
-    color: #dd524d !important;
-    font-size: 20rpx;
-}
-</style>
diff --git a/pages/message/steadyDetail.vue b/pages/message/steadyDetail.vue
deleted file mode 100644
index 2c28810..0000000
--- a/pages/message/steadyDetail.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-    <Cn-page :loading="loading">
-        <view class="detail" slot="body">
-            <view class="detail-content" style="font-size: 32rpx">
-                <!-- <view class="detail-content-title mb20">发生时间</view> -->
-                <view>{{ detail.startTime }}</view>
-            </view>
-            <view class="detail-content">
-                <view class="detail-content-title mb20">基础信息</view>
-                <view class="mb5"> 设备名称：{{ detail.equipmentName }}</view>
-                <view class="mb5"> 项目名称：{{ detail.projectName }} </view>
-                <view class="mb5"> 工程名称：{{ detail.engineeringName }} </view>
-                <view class="mb5"> 事件名称：{{ detail.showName }}</view>
-                <view class="mb5" v-for="(item, textIndex) in detail.dataSet" :key="textIndex">
-                    {{ item.showName + ':' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }}
-                </view>
-            </view>
-        </view>
-    </Cn-page>
-</template>
-<script>
-import { updateStatus } from '@/common/api/message'
-
-export default {
-    data() {
-        return {
-            loading: true,
-            detail: {},
-        }
-    },
-    onLoad(options) {
-        console.log(options.detail)
-        this.detail = JSON.parse(decodeURIComponent(options.detail).replace(/百分比/g, '%'))
-        this.loading = false
-        if (this.detail.status != 1) {
-            updateStatus({
-                eventIds: [this.detail.id],
-            })
-        }
-    },
-    methods: {},
-}
-</script>
-<style lang="scss">
-.detail {
-    padding: 20rpx 0;
-
-    .detail-content {
-        padding: 20rpx;
-        background: #fff;
-        margin-bottom: 20rpx;
-        font-size: 26rpx;
-
-        .detail-content-title {
-            font-size: 32rpx;
-            color: #111;
-            font-weight: 700;
-        }
-    }
-}
-</style>
diff --git a/pages/message/steadyList.vue b/pages/message/steadyList.vue
deleted file mode 100644
index d3c613f..0000000
--- a/pages/message/steadyList.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<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>
diff --git a/pages/message/transient.vue b/pages/message/transient.vue
deleted file mode 100644
index 9d594dc..0000000
--- a/pages/message/transient.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-    <Cn-page :loading="loading">
-        <view class="content" slot="body">
-            <uni-card
-                :title="item.showName"
-                :extra="item.status == '1' ? '' : '未读'"
-                :sub-title="item.startTime"
-                @click="jump(item)"
-                v-for="(item, index) in store.data"
-                :key="index"
-            >
-                <view class="term-list-bottom">
-                    <view class="term-list-bottom-item" v-for="(item2, textIndex) in item.dataSet" :key="textIndex">
-                        {{ item2.showName + ':' + (item2.value == 3.1415926 ? '-' : item2.value) + (item2.unit || '') }}
-                    </view>
-                </view>
-            </uni-card>
-            <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more v-if="store.data && store.data.length > 0" :status="store.status"></uni-load-more>
-        </view>
-    </Cn-page>
-</template>
-
-<script>
-import list from '@/common/js/list'
-import { updateStatus } from '@/common/api/message'
-
-export default {
-    mixins: [list],
-    data() {
-        return {
-            loading: true,
-        }
-    },
-    onShow() {
-        this.init()
-    },
-    onNavigationBarButtonTap(e) {
-        uni.showModal({
-            title: '提示',
-            content: '确定要全部标记为已读吗？',
-            success: (res) => {
-                if (res.confirm) {
-                    updateStatus({
-                        type: 0,
-                        eventIds:[]
-                    }).then(() => {
-                        this.store.reload()
-                    })
-                }
-            },
-        })
-    },
-    methods: {
-        async init() {
-            let dictData = await this.$util.getDictData('app_event')
-            console.log(dictData)
-            this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
-            this.store.params.type = 0
-            this.store.firstCallBack = (res) => {
-                // this.store.data.forEach((item) => {
-                //     item.title = dictData.find((item2) => item2.code === item.tag)?.name
-                // })
-                // console.log(this.store.data)
-                this.loading = false
-            }
-            this.store.reload()
-        },
-        jump(item) {
-            let str = JSON.stringify(item).replace(/%/g, '百分比')
-            uni.navigateTo({ url: '/pages/message/transientDetail?detail=' + encodeURIComponent(str) })
-        },
-    },
-}
-</script>
-
-<style lang="scss">
-.content {
-    // padding-top: 20rpx;
-}
-
-.term-list-bottom {
-    .term-list-bottom-item {
-        font-size: 28rpx;
-        margin-bottom: 10rpx;
-        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;
-}
-
-/deep/ .uni-card__header-extra-text {
-    color: #dd524d !important;
-    font-size: 20rpx;
-}
-</style>
diff --git a/pages/mine/setup.vue b/pages/mine/setup.vue
index df16f4b..698d16d 100644
--- a/pages/mine/setup.vue
+++ b/pages/mine/setup.vue
@@ -80,7 +80,7 @@ export default {
                     break
                 case 'book':
                     uni.openDocument({
-                        filePath: "/static/user_manual.docx",
+                        filePath: '/static/user_manual.docx',
                         success: function (res) {
                             console.log('打开文档成功')
                         },
@@ -92,6 +92,10 @@ export default {
                         content: '是否确认退出登录？',
                         success: (res) => {
                             if (res.confirm) {
+                                uni.removeStorageSync(this.$cacheKey.messageCount)
+                                // #ifdef APP-PLUS
+                                plus.runtime.setBadgeNumber(0)
+                                // #endif
                                 uni.reLaunch({
                                     url: `/pages/user/login`,
                                 })
diff --git a/pages/project/detail.vue b/pages/project/detail.vue
index d2f0e93..2a15cc1 100644
--- a/pages/project/detail.vue
+++ b/pages/project/detail.vue
@@ -21,7 +21,7 @@
                 </view>
                 <view class="content device" :style="{ minHeight: 'calc(100vh - ' + navHeight + 'px)' }">
                     <view v-show="navMenuActive == 0">
-                        <uni-card
+                        <!-- <uni-card
                             :title="item.equipmentName"
                             :sub-title="'创建时间：' + item.createTime"
                             :extra="item.mac"
@@ -31,31 +31,33 @@
                             padding="0"
                             :thumbnail="deviceIcon(item.runStatus)"
                         >
-                        </uni-card>
+                        </uni-card> -->
+                        <Cn-device-card v-for="(item, index) in store.data" :device="item" :key="index">
+                        </Cn-device-card>
                         <Cn-empty v-if="store.empty"></Cn-empty>
                         <uni-load-more
                             v-if="store.data && store.data.length > 0"
                             :status="store.status"
                         ></uni-load-more>
                     </view>
-<!--                    <view style="padding: 0 20rpx" v-show="navMenuActive == 1">-->
-<!--                        <uni-list>-->
-<!--                            <uni-list-item-->
-<!--                                title="张三"-->
-<!--                                note="2023-02-10 14:55"-->
-<!--                                thumb="/static/head.png"-->
-<!--                                thumb-size="lg"-->
-<!--                            >-->
-<!--                            </uni-list-item>-->
-<!--                            <uni-list-item-->
-<!--                                title="李四"-->
-<!--                                note="2023-02-10 14:55"-->
-<!--                                thumb="/static/head.png"-->
-<!--                                thumb-size="lg"-->
-<!--                            >-->
-<!--                            </uni-list-item>-->
-<!--                        </uni-list>-->
-<!--                    </view>-->
+                    <!--                    <view style="padding: 0 20rpx" v-show="navMenuActive == 1">-->
+                    <!--                        <uni-list>-->
+                    <!--                            <uni-list-item-->
+                    <!--                                title="张三"-->
+                    <!--                                note="2023-02-10 14:55"-->
+                    <!--                                thumb="/static/head.png"-->
+                    <!--                                thumb-size="lg"-->
+                    <!--                            >-->
+                    <!--                            </uni-list-item>-->
+                    <!--                            <uni-list-item-->
+                    <!--                                title="李四"-->
+                    <!--                                note="2023-02-10 14:55"-->
+                    <!--                                thumb="/static/head.png"-->
+                    <!--                                thumb-size="lg"-->
+                    <!--                            >-->
+                    <!--                            </uni-list-item>-->
+                    <!--                        </uni-list>-->
+                    <!--                    </view>-->
                     <view style="padding: 0 20rpx" v-show="navMenuActive == 1">
                         <!-- <image
                             class="gplot gplot-box"
@@ -249,7 +251,7 @@ export default {
                     return {
                         name: item.name,
                         extname: 'img',
-                        url: this.$config.static +  item.filePath,
+                        url: this.$config.static + item.filePath,
                         ...item,
                     }
                 })
@@ -297,7 +299,7 @@ export default {
         }, 1000)
         console.log(option.project)
         this.project = JSON.parse(decodeURIComponent(option.project))
-        this.project.topologyDiagramPaths.forEach(item=>{
+        this.project.topologyDiagramPaths.forEach((item) => {
             item.filePath = this.$config.static + item.filePath
         })
         this.init()
diff --git a/static/deivce_success.png b/static/deivce_success.png
new file mode 100644
index 0000000000000000000000000000000000000000..facbd1c082e19337e13049ae4416eea73b842eec
GIT binary patch
literal 2631
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

literal 0
HcmV?d00001

diff --git a/static/device_bad2.png b/static/device_bad2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d225459d9ad2f4c9e38d80bf05b7f51da3e749ce
GIT binary patch
literal 3476
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
CJUx>D

literal 0
HcmV?d00001

diff --git a/static/device_success.png b/static/device_success.png
index 9b82797dfcc77639fb885eb4ae9d44cd29bc301f..facbd1c082e19337e13049ae4416eea73b842eec 100644
GIT binary patch
literal 2631
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

literal 2615
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
N1o(w)7yE)|{{saean%3-

diff --git a/static/run2.png b/static/run2.png
new file mode 100644
index 0000000000000000000000000000000000000000..070b342e8cdcaaf661b67542bb556a086910391d
GIT binary patch
literal 3522
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
QTvG-y(mzKj*L9}<2dWGxcK`qY

literal 0
HcmV?d00001

diff --git a/static/steady2.png b/static/steady2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c2610d2bfc301e289b21b102012c7cdb9909014
GIT binary patch
literal 4453
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

literal 0
HcmV?d00001

diff --git a/static/zantai2.png b/static/zantai2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2bbf5c5878e5518dfda9f42e60c0fdb72eb5c43
GIT binary patch
literal 5157
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
E2Yw1`0ssI2

literal 0
HcmV?d00001