From c183f91ace7b913926b0a18d95e7fab519fc3366 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: Wed, 15 Feb 2023 16:32:21 +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          |  11 +++--
 pages.json             |   6 +++
 pages/device/list.vue  |  12 ++---
 pages/gateway/new.vue  |   2 +-
 pages/index/mine.vue   |  11 ++++-
 pages/mine/project.vue | 108 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 138 insertions(+), 12 deletions(-)
 create mode 100644 pages/mine/project.vue

diff --git a/manifest.json b/manifest.json
index 62a9954..45ec424 100644
--- a/manifest.json
+++ b/manifest.json
@@ -25,7 +25,8 @@
         "modules" : {
             "Maps" : {},
             "Barcode" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -67,8 +68,12 @@
                     }
                 },
                 "push" : {
-                    "unipush" : null
-                }
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : false
+                    }
+                },
+                "share" : {}
             },
             "icons" : {
                 "android" : {
diff --git a/pages.json b/pages.json
index 40a8597..e094c94 100644
--- a/pages.json
+++ b/pages.json
@@ -258,6 +258,12 @@
       "style": {
         "navigationBarTitleText": "修改昵称"
       }
+    },
+    {
+      "path": "pages/mine/project",
+      "style": {
+        "navigationBarTitleText": "项目管理"
+      }
     }
   ],
   "tabBar": {
diff --git a/pages/device/list.vue b/pages/device/list.vue
index 92f83dd..3149ed3 100644
--- a/pages/device/list.vue
+++ b/pages/device/list.vue
@@ -2,16 +2,11 @@
     <Cn-page :loading='loading'>
         <view slot='body'>
             <view class='device-list'>
-                <div class="header">
-                    <uni-segmented-control :current="current" :values="items" :style-type="styleType"
-                        :active-color="activeColor" @clickItem="onClickItem" />
-                </div>
-                <uni-card title="基础设备" sub-title="副标题" extra="APF" v-for="item in 10" :key="item"
+                <uni-card title="基础设备" sub-title="副标题" extra="APF" v-for="item in 10" :key="item" @click="jump"
                     thumbnail="/static/real_time_data.png">
                     <text>设备基础信息 </text>
                 </uni-card>
                 <uni-load-more  status="nomore"></uni-load-more>
-                <uni-fab ref="fab" horizontal="right" vertical="bottom" :content="content" @trigger="trigger" />
             </view>
         </view>
     </Cn-page>
@@ -36,6 +31,11 @@ export default {
         onClickItem (e) {
             this.current = e.currentIndex
         },
+        jump () {
+            uni.navigateTo({
+                url: '/pages/device/APF/detail'
+            })
+        },
         trigger (e) {
             if (e.index === 0) {
                 uni.navigateTo({
diff --git a/pages/gateway/new.vue b/pages/gateway/new.vue
index f3b0760..cdfa1bd 100644
--- a/pages/gateway/new.vue
+++ b/pages/gateway/new.vue
@@ -5,7 +5,7 @@
                 <uni-forms>
                     <uni-forms-item label="设备DID">
                         <view style="display:flex">
-                            <uni-easyinput type="number" v-model="code" placeholder="请输入设备DID" />
+                            <uni-easyinput type="number" v-model="code" placeholder="请输入设备NDID" />
                             <uni-icons type="camera" color="#007aff" size="26" class="ml20"
                                 @click="scanCode"></uni-icons>
                         </view>
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 973658d..f153f3b 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -14,17 +14,24 @@
                 <view class="mine-nav-label">角色升级</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view> -->
-            <view class="mine-nav" @click="jump('user')">
+
+            <view class="mine-nav" @click="jump('user')" v-if="userInfo.role == 4">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/subordinate.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')"
+            <view class="mine-nav" @click="jump('project')" v-if="userInfo.role == 4">
+                <image mode="aspectFill" class="mine-nav-icon" src="/static/subordinate.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"
                 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('setup')" style="margin-top:20rpx;border-bottom: none; ">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/setup.png" />
                 <view class="mine-nav-label">设置</view>
diff --git a/pages/mine/project.vue b/pages/mine/project.vue
new file mode 100644
index 0000000..bb509eb
--- /dev/null
+++ b/pages/mine/project.vue
@@ -0,0 +1,108 @@
+<template>
+    <view :loading="loading">
+        <view class="message">
+            <view class="message-nav" @click="jump('system')">
+                <view class="message-nav-label">监测</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+            <view class="message-nav" @click="jump('feedback')">
+                <view class="message-nav-label">治理</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+            <view class="message-nav" @click="jump('report')">
+                <view class="message-nav-label">用能</view>
+                <uni-badge text="3"></uni-badge>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+           
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    data () {
+        return {
+            loading: false
+        }
+    },
+    methods: {
+        init () {
+        },
+        upgrade (code) {
+            console.log(code);
+            uni.showToast({
+                title: '升级成功',
+                icon: 'none'
+            })
+        },
+        jump (type) {
+            uni.navigateTo({
+                url: `/pages/device/list`
+            })            
+        }
+    },
+    onLoad () {
+        this.init()
+    },
+}
+</script>
+
+<style lang="scss">
+.message {
+    padding-top: 20rpx;
+    .message-header {
+        padding: 200rpx 34rpx 34rpx;
+        display: flex;
+        align-items: center;
+        background: $uni-theme-white;
+        margin-bottom: 20rpx;
+        box-shadow: 0 4rpx 8rpx #e7e7e74c;
+
+        .message-header-head {
+            margin-right: 30rpx;
+            height: 128rpx;
+            width: 128rpx;
+            border-radius: $uni-theme-radius;
+            overflow: hidden;
+        }
+
+        .message-header-name {
+            margin-right: 30rpx;
+            flex: 1;
+            font-size: 36rpx;
+            color: #111;
+            font-weight: 700;
+
+            .tag {
+                margin-top: 10rpx;
+                font-size: 24rpx;
+                color: #aaa;
+            }
+        }
+    }
+
+    .message-nav {
+        padding: 34rpx;
+        display: flex;
+        align-items: center;
+        background: $uni-theme-white;
+        border-bottom: 1rpx solid #e8e8e8;
+
+        &-icon {
+            margin-right: 30rpx;
+            height: 44rpx;
+            width: 44rpx;
+            border-radius: $uni-theme-radius;
+            overflow: hidden;
+        }
+
+        &-label {
+            margin-right: 30rpx;
+            flex: 1;
+            font-size: 28rpx;
+            color: #111;
+        }
+    }
+}
+</style>
\ No newline at end of file