From a8eef6d797f29d0715d150927d1f21a72ad2f5f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= Date: Mon, 27 Feb 2023 14:56:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=87=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- pages.json | 27 +++++++-- pages/device/APF/detail.vue | 14 ++++- pages/device/DVR/detail.vue | 13 +++- pages/gateway/new.vue | 13 +++- pages/index/message.vue | 12 +++- pages/message/incident.vue | 78 ++++++++++++++++++++++-- pages/message/report.vue | 3 + pages/message/term.vue | 43 +++++++++++++ pages/message/termDetail.vue | 60 +++++++++++++++++++ pages/message/termList.vue | 113 +++++++++++++++++++++++++++++++++++ static/template.png | Bin 0 -> 2160 bytes static/term.png | Bin 0 -> 4012 bytes static/version.png | Bin 0 -> 5026 bytes tsconfig.json | 29 +++++++++ 15 files changed, 387 insertions(+), 20 deletions(-) create mode 100644 pages/message/term.vue create mode 100644 pages/message/termDetail.vue create mode 100644 pages/message/termList.vue create mode 100644 static/template.png create mode 100644 static/term.png create mode 100644 static/version.png create mode 100644 tsconfig.json diff --git a/manifest.json b/manifest.json index 45ec424..e03eb73 100644 --- a/manifest.json +++ b/manifest.json @@ -131,5 +131,5 @@ "uniStatistics" : { "enable" : false }, - "vueVersion" : "2" + "vueVersion" : "3" } diff --git a/pages.json b/pages.json index e44ebb7..6c431e6 100644 --- a/pages.json +++ b/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 }, diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue index 140bb7b..7dda120 100644 --- a/pages/device/APF/detail.vue +++ b/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', diff --git a/pages/device/DVR/detail.vue b/pages/device/DVR/detail.vue index 920def3..a2f2415 100644 --- a/pages/device/DVR/detail.vue +++ b/pages/device/DVR/detail.vue @@ -27,7 +27,7 @@ - + @@ -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: '用户', }, { diff --git a/pages/gateway/new.vue b/pages/gateway/new.vue index e7ef1f7..4a13b5d 100644 --- a/pages/gateway/new.vue +++ b/pages/gateway/new.vue @@ -3,9 +3,9 @@