diff --git a/pages.json b/pages.json index 9e0b958..80ab1d7 100644 --- a/pages.json +++ b/pages.json @@ -142,13 +142,16 @@ { "path": "pages/device/APF/report", "style": { - "navigationBarTitleText": "告警情况" + "navigationBarTitleText": "告警情况", + "navigationStyle": "custom" + } }, { "path": "pages/device/DVR/report", "style": { - "navigationBarTitleText": "告警情况" + "navigationBarTitleText": "告警情况", + "navigationStyle": "custom" } }, { @@ -330,6 +333,12 @@ "style": { "navigationBarTitleText": "项目移交" } + }, + { + "path": "pages/mine/audit", + "style": { + "navigationBarTitleText": "角色升级审核" + } } ], "tabBar": { diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue index 374d865..79e4d5d 100644 --- a/pages/device/APF/detail.vue +++ b/pages/device/APF/detail.vue @@ -178,6 +178,9 @@ export default { }, { iconPath: '/static/table.png', text: '删除', + }, { + iconPath: '/static/feedback.png', + text: '反馈', }) break; case 5: diff --git a/pages/device/APF/report.vue b/pages/device/APF/report.vue index ce742df..064a298 100644 --- a/pages/device/APF/report.vue +++ b/pages/device/APF/report.vue @@ -2,6 +2,8 @@ +
@@ -26,6 +28,17 @@ export default { } }, methods: { + back(){ + uni.navigateBack() + }, + messageSet(){ + uni.showModal({ + title: '提示', + content: '确定关闭该设备的告警通知吗?', + showCancel: true, + success: ({ confirm, cancel }) => {} + }) + }, onClickItem (e) { this.current = e.currentIndex }, diff --git a/pages/index/comp/indexGongCheng.vue b/pages/index/comp/indexGongCheng.vue index cd3edf0..ce80c58 100644 --- a/pages/index/comp/indexGongCheng.vue +++ b/pages/index/comp/indexGongCheng.vue @@ -15,11 +15,10 @@
- - - - - + + + + @@ -46,6 +45,7 @@ export default { data () { return { loading: false, + userInfo: {}, select: { projectName: '', projectNameIndex: 0, @@ -209,6 +209,7 @@ export default { }, }, mounted () { + this.userInfo = uni.getStorageSync('userInfo') setTimeout(() => { // 获取nav高度 uni.createSelectorQuery().select('.nav').boundingClientRect((rect) => { diff --git a/pages/index/comp/indexYouKe.vue b/pages/index/comp/indexYouKe.vue new file mode 100644 index 0000000..cf49a9c --- /dev/null +++ b/pages/index/comp/indexYouKe.vue @@ -0,0 +1,221 @@ + + + \ No newline at end of file diff --git a/pages/index/comp/indexYunWei.vue b/pages/index/comp/indexYunWei.vue index cd3edf0..be992ae 100644 --- a/pages/index/comp/indexYunWei.vue +++ b/pages/index/comp/indexYunWei.vue @@ -15,11 +15,9 @@ - - - - - + + + diff --git a/pages/index/comp/indexZhuYongHu.vue b/pages/index/comp/indexZhuYongHu.vue index cd3edf0..9f1c936 100644 --- a/pages/index/comp/indexZhuYongHu.vue +++ b/pages/index/comp/indexZhuYongHu.vue @@ -15,11 +15,11 @@ - - - - - + + + + @@ -141,6 +141,11 @@ export default { } }, methods: { + submitFeedBack () { + uni.navigateTo({ + url: '/pages/device/feedback' + }) + }, projectTypeChange (e) { // 重置name this.select.projectName = '' diff --git a/pages/index/comp/indexZhuanZhi.vue b/pages/index/comp/indexZhuanZhi.vue index feb8274..a75f9fe 100644 --- a/pages/index/comp/indexZhuanZhi.vue +++ b/pages/index/comp/indexZhuanZhi.vue @@ -36,7 +36,7 @@ export default { data () { return { - loading: false + loading: false, } }, methods: { @@ -51,7 +51,9 @@ export default { }) } }, - } + }, + created(){ + }, } \ No newline at end of file diff --git a/static/feedback.png b/static/feedback.png index 674cf69..cc281ed 100644 Binary files a/static/feedback.png and b/static/feedback.png differ diff --git a/static/feedback2.png b/static/feedback2.png new file mode 100644 index 0000000..2a55159 Binary files /dev/null and b/static/feedback2.png differ diff --git a/static/message4.png b/static/message4.png new file mode 100644 index 0000000..fc0aab4 Binary files /dev/null and b/static/message4.png differ diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue index d15b06b..e8e773e 100644 --- a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue +++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue @@ -37,7 +37,7 @@ - +