添加游客

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": {

pages/device/APF/detail.vue

@@ -178,6 +178,9 @@ export default {
                     }, {
                         iconPath: '/static/table.png',
                         text: '删除',
+                    }, {
+                        iconPath: '/static/feedback.png',
+                        text: '反馈',
                     })
                     break;
                 case 5:

pages/device/APF/report.vue

@@ -2,6 +2,8 @@
     <Cn-page :loading='loading'>
         <view slot='body'>
             <view class='record'>
+                <uni-nav-bar dark :fixed="true" status-bar left-icon="left" rightText="关闭通知" background-color="#fff"
+                    color="#111" title="告警情况" @clickLeft="back" @clickRight="messageSet" />
                 <div class="header">
                     <uni-segmented-control :current="current" :values="items" :style-type="styleType"
                         :active-color="activeColor" @clickItem="onClickItem" />
@@ -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
         },

pages/index/comp/indexGongCheng.vue

@@ -15,11 +15,10 @@
             </div>
         </div>
         <view style="padding:20rpx 20rpx 0">
-            <Cn-grid title="注册">
+            <Cn-grid title="常用功能">
-                <Cn-grid-item src="/static/device2.png" text="设备" @click="registerDevice"></Cn-grid-item>
+                <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
-                <Cn-grid-item src="/static/gateway2.png" text="网关" @click="registerGateway"></Cn-grid-item>
+                <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
+                <Cn-grid-item src="/static/feedback2.png" text="提交反馈" @click="submitFeedBack"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
             </Cn-grid>
         </view>
         <view class="nav">
@@ -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) => {

pages/index/comp/indexYouKe.vue

@@ -0,0 +1,221 @@
+<template>
+    <view class="index-zhuyonghu">
+        <div class="header">
+            <div class="header-item">
+                <div class="header-item-value">3</div>
+                <div class="header-item-label">正常设备</div>
+            </div>
+            <div class="header-item">
+                <div class="header-item-value">1</div>
+                <div class="header-item-label">报警设备</div>
+            </div>
+            <div class="header-item">
+                <div class="header-item-value">0</div>
+                <div class="header-item-label">离线设备</div>
+            </div>
+        </div>
+        <view class="nav">
+            <picker @change="projectNameChange" :value="select.projectNameIndex" :range="projectList" range-key="text">
+                <view class="nav-menu" :class="{ 'nav-menu-active': select.projectName }">{{
+                    select.projectName || '项目' }} </view>
+            </picker>
+            <picker @change="projectTypeChange" :value="select.projectTypeIndex" :range="projectType" range-key="text">
+                <view class="nav-menu" :class="{ 'nav-menu-active': select.projectType }">{{
+                    select.projectType || '类型' }} </view>
+            </picker>
+        </view>
+        <view class="content device" :style="{ minHeight: minHeight }">
+            <uni-card :title="item.name" :sub-title="item.project" :extra="item.type" padding="0"
+                v-for="(item, index) in deviceListFilter" :key="index" @click="jump(item)" thumbnail="/static/device.png">
+                <!-- <text>{{ item.project }} {{ item.type }}</text> -->
+            </uni-card>
+            <uni-load-more status="nomore"></uni-load-more>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    data () {
+        return {
+            loading: false,
+            userInfo: {},
+            select: {
+                projectName: '',
+                projectNameIndex: 0,
+                projectType: '',
+                projectTypeIndex: 0
+            },
+            projectType: [
+                {
+                    text: '全部类型',
+                    value: 0
+                },
+                {
+                    text: '监测',
+                    value: 1
+                },
+                {
+                    text: '用能',
+                    value: 2
+                },
+                {
+                    text: '环境',
+                    value: 3
+                },
+                {
+                    text: '安防',
+                    value: 4
+                },
+                {
+                    text: '其他',
+                    value: 5
+                }
+            ],
+            projectList: [
+                {
+                    text: '全部项目',
+                    value: 1
+                },
+                {
+                    text: 'XXX项目1',
+                    value: 1
+                },
+                {
+                    text: 'XXX项目2',
+                    value: 1
+                },
+                {
+                    text: 'XXX项目3',
+                    value: 1
+                },
+
+            ],
+            navHeight: 0,
+            minHeight: '',
+            deviceList: [
+                {
+                    name: '设备APF-1',
+                    des: '设备描述1',
+                    type: '监测',
+                    project: 'XXX项目1',
+                },
+                {
+                    name: '设备APF-2',
+                    des: '设备描述1',
+                    type: '监测',
+                    project: 'XXX项目1',
+                },
+                {
+                    name: '设备APF-3',
+                    des: '设备描述2',
+                    type: '用能',
+                    project: 'XXX项目2'
+                },
+                {
+                    name: '设备DVR-1',
+                    des: '设备描述3',
+                    type: '监测',
+                    project: 'XXX项目3'
+                }
+            ]
+        }
+    },
+    computed: {
+
+        deviceListFilter () {
+            return this.deviceList.filter(item => {
+                if (this.select.projectName) {
+                    return item.project === this.select.projectName
+                } else if (this.select.projectType) {
+                    return item.type === this.select.projectType
+                } else {
+                    return true
+                }
+            })
+        }
+    },
+    methods: {
+        projectTypeChange (e) {
+            // 重置name
+            this.select.projectName = ''
+            this.select.projectNameIndex = 0
+
+            this.select.projectTypeIndex = e.detail.value
+            if (e.detail.value === 0) {
+                this.select.projectType = ''
+                return
+            }
+            this.select.projectType = this.projectType[e.detail.value].text
+
+
+        },
+        projectNameChange (e) {
+            console.log(e);
+            // 重置type
+            this.select.projectType = ''
+            this.select.projectTypeIndex = 0
+
+            this.select.projectNameIndex = e.detail.value
+            if (e.detail.value === 0) {
+                this.select.projectName = ''
+                return
+            }
+            this.select.projectName = this.projectList[e.detail.value].text
+        },
+        registerDevice () {
+            uni.showModal({
+                title: '提示',
+                content: '请选择设备类型',
+                confirmText: '直连装置',
+                cancelText: '网关接入',
+                cancelColor: '#007aff',
+                success: ({ confirm, cancel }) => {
+                    if (confirm) {
+                        uni.navigateTo({
+                            url: '/pages/device/new'
+                        })
+                    } else if (cancel) {
+                        uni.navigateTo({
+                            url: '/pages/gateway/list'
+                        })
+                    }
+                }
+            })
+        },
+        registerGateway () {
+            uni.navigateTo({
+                url: '/pages/gateway/new'
+            })
+        },
+        navMenuClick (index) {
+            this.navMenuActive = index
+        },
+        jump (item) {
+            if (item.name.indexOf('APF') > -1) {
+                uni.navigateTo({
+                    url: '/pages/device/APF/detail'
+                })
+            } else if (item.name.indexOf('DVR') > -1) {
+                uni.navigateTo({
+                    url: '/pages/device/DVR/detail'
+                })
+            }
+        },
+    },
+    mounted () {
+        setTimeout(() => {
+            // 获取nav高度
+            uni.createSelectorQuery().select('.nav').boundingClientRect((rect) => {
+                this.navHeight = rect.height
+                // #ifdef H5 
+                this.minHeight = 'calc(100vh - env(safe-area-inset-bottom) - ' + (50 + this.navHeight) + 'px)'
+                // #endif
+                // #ifdef APP-PLUS
+                this.minHeight = 'calc(100vh - ' + this.navHeight + 'px)'
+                // #endif
+            }).exec()
+        }, 1000);
+    }
+}
+</script>
+<style lang='scss'></style>

pages/index/comp/indexYunWei.vue

@@ -15,11 +15,9 @@
             </div>
         </div>
         <view style="padding:20rpx 20rpx 0">
-            <Cn-grid title="注册">
+            <Cn-grid title="常用功能">
-                <Cn-grid-item src="/static/device2.png" text="设备" @click="registerDevice"></Cn-grid-item>
+                <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
-                <Cn-grid-item src="/static/gateway2.png" text="网关" @click="registerGateway"></Cn-grid-item>
+                <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
             </Cn-grid>
         </view>
         <view class="nav">

pages/index/comp/indexZhuYongHu.vue

@@ -15,11 +15,11 @@
             </div>
         </div>
         <view style="padding:20rpx 20rpx 0">
-            <Cn-grid title="注册">
+            <Cn-grid title="常用功能">
-                <Cn-grid-item src="/static/device2.png" text="设备" @click="registerDevice"></Cn-grid-item>
+                <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
-                <Cn-grid-item src="/static/gateway2.png" text="网关" @click="registerGateway"></Cn-grid-item>
+                <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
+                <Cn-grid-item src="/static/feedback2.png"  text="提交反馈"
-                <Cn-grid-item background="#fff"></Cn-grid-item>
+                    @click="submitFeedBack"></Cn-grid-item>
             </Cn-grid>
         </view>
         <view class="nav">
@@ -141,6 +141,11 @@ export default {
         }
     },
     methods: {
+        submitFeedBack () {
+            uni.navigateTo({
+                url: '/pages/device/feedback'
+            })
+        },
         projectTypeChange (e) {
             // 重置name
             this.select.projectName = ''

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(){
+    },
 }
 </script>
 <style lang='scss'>

pages/index/comp/indexZiYongHu.vue

@@ -14,14 +14,11 @@
                 <div class="header-item-label">离线设备</div>
             </div>
         </div>
-        <!-- <view style="padding:20rpx 20rpx 0">
+        <view style="padding:20rpx 20rpx 0">
-            <Cn-grid title="注册">
+            <Cn-grid title="常用功能">
-                <Cn-grid-item src="/static/device2.png" text="设备" @click="registerDevice"></Cn-grid-item>
+                <Cn-grid-item src="/static/feedback2.png" text="提交反馈" @click="submitFeedBack"></Cn-grid-item>
-                <Cn-grid-item src="/static/gateway2.png" text="网关" @click="registerGateway"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
             </Cn-grid>
-        </view> -->
+        </view>
         <view class="nav">
             <picker @change="projectNameChange" :value="select.projectNameIndex" :range="projectList" range-key="text">
                 <view class="nav-menu" :class="{ 'nav-menu-active': select.projectName }">{{
@@ -46,6 +43,7 @@ export default {
     data () {
         return {
             loading: false,
+            userInfo: {},
             select: {
                 projectName: '',
                 projectNameIndex: 0,

pages/index/index.vue

@@ -12,6 +12,7 @@
                 <ZhuYongHu v-if="userInfo.role == 4" />
                 <!-- 子用户 -->
                 <ZiYongHu v-if="userInfo.role == 5" />
+                <YouKe v-if="userInfo.role == 6"> </YouKe>
                 <uni-fab ref="fab" direction="vertical" horizontal="right" vertical="bottom" :content="content"
                     @trigger="trigger" />
             </view>
@@ -24,13 +25,15 @@ import GongCheng from "./comp/indexGongCheng.vue";
 import ZhuYongHu from "./comp/indexZhuYongHu.vue";
 import ZiYongHu from "./comp/indexZiYongHu.vue";
 import ZhuanZhi from "./comp/indexZhuanZhi.vue";
+import YouKe from "./comp/indexYouKe.vue";
 export default {
     components: {
         YunWei,
         GongCheng,
         ZhuYongHu,
         ZiYongHu,
-        ZhuanZhi
+        ZhuanZhi,
+        YouKe
     },
     data () {
         return {
@@ -58,6 +61,9 @@ export default {
             }, {
                 iconPath: '/static/mine3.png',
                 text: '子用户',
+            }, {
+                iconPath: '/static/mine3.png',
+                text: '游客',
             }
             ]
             return content
@@ -78,14 +84,10 @@ export default {
         },
 
         trigger (e) {
-            if (e.index === 5) {
+            if (e.index === 500) {
                 uni.navigateTo({
                     url: '/pages/device/new'
                 })
-            } else if (e.index === 6) {
-                uni.navigateTo({
-                    url: '/pages/gateway/new'
-                })
             } else {
                 this.userInfo.role = e.index + 1
                 uni.setStorageSync('userInfo', {
@@ -125,6 +127,13 @@ export default {
                             text: '6'
                         })
                         break
+                    case 6:
+                        roleName = '游客'
+                        uni.setTabBarBadge({
+                            index: 1,
+                            text: '6'
+                        })
+                        break
                 }
                 this.$util.toast(roleName + '角色切换成功')
             }
@@ -144,7 +153,7 @@ export default {
                 role: 4
             })
         }
-        if (this.userInfo.role == 4 || this.userInfo.role == 5) {
+        if (this.userInfo.role == 4 || this.userInfo.role == 5 || this.userInfo.role == 6) {
             uni.setTabBarBadge({
                 index: 1,
                 text: '6'

pages/index/message.vue

@@ -11,19 +11,19 @@
                 <view class="message-nav-label">反馈</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
-            <view class="message-nav" @click="jump('report')" v-if="userInfo.role == '4' || userInfo.role == '5'">
+            <view class="message-nav" @click="jump('report')" v-if="userInfo.role == '4' || userInfo.role == '5'|| userInfo.role == '6'">
                 <image mode="aspectFill" class="message-nav-icon" src="/static/report.png" />
                 <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'">
+            <view class="message-nav" @click="jump('incident')" v-if="userInfo.role == '4' || userInfo.role == '5'|| userInfo.role == '6'">
                 <image mode="aspectFill" class="message-nav-icon" src="/static/incident.png" />
                 <view class="message-nav-label">暂态事件</view>
                 <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'">
+            <view class="message-nav" @click="jump('term')" v-if="userInfo.role == '4' || userInfo.role == '5'|| userInfo.role == '6'">
                 <image mode="aspectFill" class="message-nav-icon" src="/static/term.png" />
                 <view class="message-nav-label">终端状态</view>
                 <uni-badge text="1"></uni-badge>

pages/index/mine.vue

@@ -4,18 +4,23 @@
             <view class="mine-header" @click="jump('basic')">
                 <image mode="aspectFill" class="mine-header-head" src="/static/head.png" />
                 <view class="mine-header-name hide-txt">
-                    <view>灿能电力</view>
+                    <view>灿能物联</view>
                     <view class="tag">{{ roleName }}</view>
                 </view>
                 <image src="/static/erweima.png" style="height: 50rpx;width: 50rpx;border-radius:12rpx"
                     mode="scaleToFill" />
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
-            <!-- <view class="mine-nav" @click="jump('upgrade')">
+            <view class="mine-nav" v-if="userInfo.role == 6" @click="jump('upgrade')">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/server.png" />
                 <view class="mine-nav-label">角色升级</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view> -->
+            </view>
+            <view class="mine-nav" @click="jump('audit')" v-if="userInfo.role == 2">
+                <image mode="aspectFill" class="mine-nav-icon" src="/static/server.png" />
+                <view class="mine-nav-label">角色审核</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
 
             <!-- <view class="mine-nav" @click="jump('user')" v-if="userInfo.role == 4">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/subordinate.png" />
@@ -27,20 +32,21 @@
                 <view class="mine-nav-label">扫一扫</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
-            <view class="mine-nav" @click="jump('project')" v-if="userInfo.role == 4 || userInfo.role == 3">
+            <view class="mine-nav" @click="jump('project')"
+                v-if="userInfo.role == 4 || userInfo.role == 3 || userInfo.role == 2">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/project.png" />
                 <view class="mine-nav-label">项目管理</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
             <view class="mine-nav" @click="jump('gateway')"
-                v-if="userInfo.role == 4 || userInfo.role == 3 || userInfo.role == 5"
+                v-if="userInfo.role == 4 || userInfo.role == 3 || userInfo.role == 5 || userInfo.role == 2"
                 style="border-bottom: none; box-shadow: 0 4rpx 8rpx #e7e7e74c;">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/gateway.png" />
                 <view class="mine-nav-label">网关列表</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
             <view class="mine-nav" @click="jump('setupMessage')">
-                <image mode="aspectFill" class="mine-nav-icon" src="/static/notice2.png" />
+                <image mode="aspectFill" class="mine-nav-icon" src="/static/message4.png" />
                 <view class="mine-nav-label">消息配置</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
@@ -84,6 +90,9 @@ export default {
                 case 5:
                     roleName = '子用户'
                     break
+                case 6:
+                    roleName = '游客'
+                    break
             }
             return roleName
 

pages/mine/audit.vue

@@ -0,0 +1,77 @@
+<template>
+    <Cn-page :loading='loading'>
+        <view slot='body'>
+            <view class='index'>
+                <uni-list>
+                    <uni-list-item title="张三申请成为主用户" note="2023-02-10 14:55" thumb="/static/head.png" thumb-size="lg">
+                        <template v-slot:footer>
+                            <view class="footer-btn mt20" style="background:#e47470" @click="del">拒绝</view>
+                            <view class="footer-btn mt20 ml10" @click="jump">通过</view>
+                        </template>
+                    </uni-list-item>
+                    <uni-list-item title="李四申请成为子用户" note="2023-02-10 14:55" thumb="/static/head.png" thumb-size="lg">
+                        <template v-slot:footer>
+                            <view class="footer-btn mt20" style="background:#e47470" @click="del">拒绝</view>
+                            <view class="footer-btn mt20 ml10" @click="jump">通过</view>
+                        </template>
+                    </uni-list-item>
+                </uni-list>
+                <uni-load-more status="nomore"></uni-load-more>
+            </view>
+        </view>
+    </Cn-page>
+</template>
+<script>
+export default {
+    data () {
+        return {
+            loading: false
+        }
+    },
+    methods: {
+        jump () {
+            uni.showModal({
+                title: '提示',
+                content: '确定要通过该成员吗？',
+                success: function (res) {
+                    if (res.confirm) {
+                        console.log('用户点击确定')
+                    } else if (res.cancel) {
+                        console.log('用户点击取消')
+                    }
+                }
+            })
+        },
+        del () {
+            console.log('del');
+            uni.showModal({
+                title: '提示',
+                content: '确定要拒绝该成员吗？',
+                success: function (res) {
+                    if (res.confirm) {
+                        console.log('用户点击确定')
+                    } else if (res.cancel) {
+                        console.log('用户点击取消')
+                    }
+                }
+            })
+        }
+    }
+}
+</script>
+<style lang='scss'>
+.index {
+    padding: 20rpx;
+
+    .footer-btn {
+        padding: 0 20rpx;
+        height: 50rpx;
+        background-color: #007aff;
+        font-size: 24rpx;
+        color: #fff;
+        text-align: center;
+        line-height: 50rpx;
+        border-radius: 10rpx;
+    }
+}
+</style>

uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue

@@ -37,7 +37,7 @@
 					</slot>
 				</view>
 			</view>
-		</view>
+		</view>
 		<!-- #ifndef APP-NVUE -->
 		<view class="uni-navbar__placeholder" v-if="fixed">
 			<status-bar v-if="statusBar" />