页面切图

manifest.json

@@ -131,5 +131,5 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "3"
 }

pages.json

@@ -184,19 +184,37 @@
     {
       "path": "pages/message/incident",
       "style": {
-        "navigationBarTitleText": "系统消息"
+        "navigationBarTitleText": "暂态事件"
+      }
+    },
+    {
+      "path": "pages/message/term",
+      "style": {
+        "navigationBarTitleText": "终端状态消息"
+      }
+    },
+    {
+      "path": "pages/message/termList",
+      "style": {
+        "navigationBarTitleText": "异常终端列表"
+      }
+    },
+    {
+      "path": "pages/message/termDetail",
+      "style": {
+        "navigationBarTitleText": "异常终端详情"
       }
     },
     {
       "path": "pages/message/report",
       "style": {
-        "navigationBarTitleText": "告警"
+        "navigationBarTitleText": "稳态越限"
       }
     },
     {
       "path": "pages/message/system",
       "style": {
-        "navigationBarTitleText": "事件"
+        "navigationBarTitleText": "系统消息"
       }
     },
     {
@@ -322,9 +340,8 @@
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "灿能电力",
     "navigationBarBackgroundColor": "#ffffff",
-    "backgroundColor": "#f3f4f5"
+    "backgroundColor": "#f3f4f5",
     // #ifdef H5
-    ,
     "navigationStyle": "custom"
     // #endif
   },

pages/device/APF/detail.vue

@@ -154,8 +154,11 @@ export default {
             } else if (e.item.text === '用户') {
                 uni.navigateTo({ url: '/pages/device/user' })
             } else if (e.item.text === '报表') {
-                // uni.navigateTo({ url: '/pages/device/user' })
                 this.$util.toast('效果是直接打开报表')
+            }else if (e.item.text === '版本') {
+                this.$util.toast('功能暂未开放')
+            }else if (e.item.text === '模版') {
+                this.$util.toast('效果是功能暂未开放直接打开报表')
             }
             this.$refs.fab.close()
         },
@@ -167,6 +170,15 @@ export default {
             let userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
             console.log(userInfo.role);
             switch (userInfo.role) {
+                case 1:
+                    this.content.splice(0, 0, {
+                        iconPath: '/static/version.png',
+                        text: '版本',
+                    }, {
+                        iconPath: '/static/template.png',
+                        text: '模版',
+                    })
+                    break;
                 case 3:
                     this.content.splice(0, 0, {
                         iconPath: '/static/transfer.png',

pages/device/DVR/detail.vue

@@ -27,7 +27,7 @@
                 </view>
                 <uni-fab ref="fab" direction="vertical" horizontal="right" vertical="bottom" :content="content"
                     @trigger="trigger" />
-              
+
             </view>
         </view>
     </Cn-page>
@@ -121,6 +121,15 @@ export default {
             let userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
             console.log(userInfo.role);
             switch (userInfo.role) {
+                case 1:
+                    this.content.splice(0, 0, {
+                        iconPath: '/static/version.png',
+                        text: '版本',
+                    }, {
+                        iconPath: '/static/template.png',
+                        text: '模版',
+                    })
+                    break;
                 case 3:
                     this.content.splice(1, 0, {
                         iconPath: '/static/transfer.png',
@@ -128,7 +137,7 @@ export default {
                     })
                     break;
                 case 4:
-                    this.content.splice(0, 0,{
+                    this.content.splice(0, 0, {
                         iconPath: '/static/subordinate.png',
                         text: '用户',
                     }, {

pages/gateway/new.vue

@@ -3,9 +3,9 @@
         <template v-if="type == 1">
             <view class="content">
                 <uni-forms>
-                    <uni-forms-item label="设备识别码">
+                    <uni-forms-item label="网关识别码">
                         <view style="display:flex">
-                            <uni-easyinput type="number" v-model="code" placeholder="请输入设备识别码" />
+                            <uni-easyinput type="number" v-model="code" placeholder="请输入网关识别码" />
                             <uni-icons type="camera" color="#007aff" size="26" class="ml20"
                                 @click="scanCode"></uni-icons>
                         </view>
@@ -19,6 +19,9 @@
         <template v-else>
             <view class="content">
                 <uni-forms>
+                    <uni-forms-item label="项目">
+                        <uni-data-select v-model="formData.project" :localdata="projectRange"></uni-data-select>
+                    </uni-forms-item>
                     <uni-forms-item label="位置">
                         <view style="display:flex;">
                             <uni-easyinput :clearable="false" type="textarea" autoHeight v-model="formData.address"
@@ -65,7 +68,13 @@ export default {
             type: 1,
             formData: {
                 address: '',
+                project:""
             },
+            projectRange: [
+                { value: 1, text: "监测", point: 1 },
+                { value: 2, text: "治理", point: 2 },
+                { value: 3, text: "用能", point: 1 },
+            ],
             activeGplot: 1,
 
         }

pages/index/message.vue

@@ -13,14 +13,20 @@
             </view>
             <view class="message-nav" @click="jump('report')" v-if="userInfo.role == '4' || userInfo.role == '5'">
                 <image mode="aspectFill" class="message-nav-icon" src="/static/report.png" />
-                <view class="message-nav-label">告警</view>
+                <view class="message-nav-label">稳态越限</view>
                 <uni-badge text="3"></uni-badge>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
             <view class="message-nav" @click="jump('incident')" v-if="userInfo.role == '4' || userInfo.role == '5'">
                 <image mode="aspectFill" class="message-nav-icon" src="/static/incident.png" />
-                <view class="message-nav-label">事件</view>
+                <view class="message-nav-label">暂态事件</view>
-                <uni-badge text="3"></uni-badge>
+                <uni-badge text="2"></uni-badge>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+            <view class="message-nav" @click="jump('term')" v-if="userInfo.role == '4' || userInfo.role == '5'">
+                <image mode="aspectFill" class="message-nav-icon" src="/static/term.png" />
+                <view class="message-nav-label">终端状态</view>
+                <uni-badge text="1"></uni-badge>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
         </view>

pages/message/incident.vue

@@ -1,9 +1,53 @@
 <template>
     <view class="content">
-        <uni-list :border="false">
+        <uni-card title="NPQS_682发生暂降事件" extra="未读" sub-title="2023-02-27 15:13:29" @click="jump">
-            <uni-list-item :show-badge="item<4" badgeType="error" isDot badge-text="未读" title="输入电压异常"
+            <view class="term-list-bottom">
-                note="2023-02-01 15:10:29" v-for="item in 5" />
+                <view class="term-list-bottom-item">
-        </uni-list>
+                    特征增幅：88%，持续时间0.047s
+                </view>
+                <view class="term-list-bottom-item">
+                    南京市 灿能园区
+                </view>
+                <view class="term-list-bottom-item">
+                    电压等级：0.38kV
+                </view>
+                <view class="term-list-bottom-item">
+                    网路参数：00-B7-8D-A8-00-D3
+                </view>
+            </view>
+        </uni-card>
+        <uni-card title="NPQS_682发生暂降事件" extra="未读" sub-title="2023-02-27 15:13:29" @click="jump">
+            <view class="term-list-bottom">
+                <view class="term-list-bottom-item">
+                    特征增幅：88%，持续时间0.047s
+                </view>
+                <view class="term-list-bottom-item">
+                    南京市 灿能园区
+                </view>
+                <view class="term-list-bottom-item">
+                    电压等级：0.38kV
+                </view>
+                <view class="term-list-bottom-item">
+                    网路参数：00-B7-8D-A8-00-D3
+                </view>
+            </view>
+        </uni-card>
+        <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">
+                    特征增幅：88%，持续时间0.047s
+                </view>
+                <view class="term-list-bottom-item">
+                    南京市 灿能园区
+                </view>
+                <view class="term-list-bottom-item">
+                    电压等级：0.38kV
+                </view>
+                <view class="term-list-bottom-item">
+                    网路参数：00-B7-8D-A8-00-D3
+                </view>
+            </view>
+        </uni-card>
         <uni-load-more status="nomore"></uni-load-more>
     </view>
 </template>
@@ -19,18 +63,40 @@ export default {
 
     },
     methods: {
-
+        jump () {
+            console.log(123);
+            uni.navigateTo({ url: '/pages/message/termDetail' })
+        }
     }
 }
 </script>
 
 <style lang="scss">
 .content {
-    padding-top: 20rpx;
+    // 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;
+  
+}
 </style>

pages/message/report.vue

@@ -33,4 +33,7 @@ export default {
 /deep/ .uni-list-item {
     background-color: $uni-theme-white !important;
 }
+/deep/ .uni-badge {
+    background-color: unset !important;
+}
 </style>

pages/message/term.vue

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

pages/message/termDetail.vue

@@ -0,0 +1,60 @@
+<template>
+    <Cn-page :loading='loading'>
+        <view slot='body'>
+            <view class='detail'>
+                <view class="detail-content ">
+                    <!-- <view class="detail-content-title mb20">发生时间</view> -->
+                    <view>2023-02-14</view>
+                </view>
+                <view class="detail-content ">
+                    <view class="detail-content-title mb20">终端基础信息</view>
+                    <view class="mb10">灿能园区，NPQS_681</view>
+                    <view>网络参数：00-B7-8D-A8-00-D3</view>
+                </view>
+                <view class="detail-content ">
+                    <view class="detail-content-title mb20">终端通讯信息</view>
+                    <view class="mb10">NPQS_681通讯终端1次，具体如下所示</view>
+                    <view>2023-02-14 10:59:10至2023-02-14 10:59:57</view>
+                </view>
+                <view class="detail-content ">
+                    <view class="detail-content-title mb20">终端告警信息</view>
+                    <view class="mb10">暂无告警信息</view>
+                </view>
+                <view class="detail-content ">
+                    <view class="detail-content-title mb20">终端流量信息</view>
+                    <view class="mb10">NPQS_681的流量于2023-02-14 23:59:59占总流量的0.0%</view>
+                </view>
+
+            </view>
+        </view>
+    </Cn-page>
+</template>
+<script>
+export default {
+    data () {
+        return {
+            loading: false
+        }
+    },
+    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>

pages/message/termList.vue

@@ -0,0 +1,113 @@
+<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>

tsconfig.json

@@ -0,0 +1,29 @@
+// tsconfig.json
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "strict": true,
+    "jsx": "preserve",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "sourceMap": true,
+    "skipLibCheck": true,
+    "importHelpers": true,
+    "allowSyntheticDefaultImports": true,
+    "useDefineForClassFields": true,
+    "resolveJsonModule": true,
+    "lib": [
+      "esnext",
+      "dom"
+    ],
+    "types": [
+      "@dcloudio/types"
+    ]
+  },
+  "exclude": [
+    "node_modules",
+    "unpackage",
+    "src/**/*.nvue"
+  ]
+}