From 7d28b3476ada033c0927d7816cdd94b9c62bdbd9 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: Fri, 17 Feb 2023 09:03:47 +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

---
 common/css/base.scss                          |  32 ++++++++-
 components/Cn-grid-item/Cn-grid-item.vue      |   4 +-
 components/Cn-grid/Cn-grid.vue                |  14 ++--
 pages/device/APF/detail.vue                   |   2 +-
 pages/device/DVR/detail.vue                   |   2 +-
 pages/device/transfer.vue                     |   4 +-
 pages/index/comp/indexZhuYongHu.vue           |  64 +++++++++++++++---
 static/device2.png                            | Bin 0 -> 3277 bytes
 static/gateway2.png                           | Bin 0 -> 5038 bytes
 uni.scss                                      |   2 +-
 .../uni-fab/components/uni-fab/uni-fab.vue    |   2 +-
 11 files changed, 99 insertions(+), 27 deletions(-)
 create mode 100644 static/device2.png
 create mode 100644 static/gateway2.png

diff --git a/common/css/base.scss b/common/css/base.scss
index f5091bc..970b2d1 100644
--- a/common/css/base.scss
+++ b/common/css/base.scss
@@ -130,14 +130,12 @@ page {
     }
 }
 
-
 .index {
 
     .header {
         margin: 0 30rpx;
-        background: $uni-theme-white;
+        background: $uni-theme-blue;
         border-radius: 12rpx;
-        background: $uni-color-primary;
         padding: 30rpx 10rpx 40rpx;
         display: grid;
         grid-gap: 60rpx 0;
@@ -159,6 +157,34 @@ page {
     }
 }
 
+
+.nav {
+    position: sticky;
+    top: 0;
+    left: 0;
+    padding: 30rpx;
+    display: flex;
+    background: rgb(243, 244, 245);
+    z-index: 2;
+    .nav-menu {
+        padding: 10rpx 20rpx;
+        margin-left: 20rpx;
+        font-size: 28rpx;
+        border-radius: 8rpx;
+        background: #ebeaec;
+        color: #666;
+        &:first-of-type {
+            margin-left: 0;
+        }
+
+        &-active {
+            background: #dfe5f7;
+            color: $uni-theme-blue;
+        }
+    }
+
+}
+
 .btn {
     display: flex;
     align-items: center;
diff --git a/components/Cn-grid-item/Cn-grid-item.vue b/components/Cn-grid-item/Cn-grid-item.vue
index f4a4017..7542168 100644
--- a/components/Cn-grid-item/Cn-grid-item.vue
+++ b/components/Cn-grid-item/Cn-grid-item.vue
@@ -24,7 +24,7 @@ export default {
     justify-content: center;
     align-items: center;
     background: $uni-theme-white;
-    height: 236rpx;
+    height: 180rpx;
 
     .grid-card-content-item-icon {
         display: flex;
@@ -33,7 +33,7 @@ export default {
         position: relative;
         width: 80rpx;
         height: 80rpx;
-        background: rgba(78, 159, 255, 1);
+        background: $uni-theme-yellow;
         border-radius: 20rpx;
 
         .grid-card-content-item-icon-2 {
diff --git a/components/Cn-grid/Cn-grid.vue b/components/Cn-grid/Cn-grid.vue
index 18edc36..8bb1d0b 100644
--- a/components/Cn-grid/Cn-grid.vue
+++ b/components/Cn-grid/Cn-grid.vue
@@ -1,8 +1,8 @@
 
 <template>
-    <view class="grid-card">
-        <view class="grid-card-title" v-if="title">{{title}}</view>
-        <view class="grid-card-content">
+    <view class="grid-nav">
+        <view class="grid-nav-title" v-if="title">{{title}}</view>
+        <view class="grid-nav-content">
             <slot />
             <Rc-grid-item background="#fff" v-for="item in seat" :key="item"></Rc-grid-item>
         </view>
@@ -30,11 +30,11 @@ export default {
 };
 </script>
 <style lang='scss'>
-.grid-card {
+.grid-nav {
     border-radius: 12rpx;
     overflow: hidden;
     background: $uni-theme-white;
-    .grid-card-title {
+    .grid-nav-title {
         height: 80rpx;
         line-height: 80rpx;
         text-indent: 40rpx;
@@ -42,10 +42,10 @@ export default {
         color: #999;
         font-size: 28rpx;
     }
-    .grid-card-content {
+    .grid-nav-content {
         background: #f6f7f8;
         display: grid;
-        grid-template-columns: 1fr 1fr 1fr;
+        grid-template-columns: 1fr 1fr 1fr 1fr;
         grid-gap: 2rpx;
     }
 }
diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue
index a37c27c..2679b41 100644
--- a/pages/device/APF/detail.vue
+++ b/pages/device/APF/detail.vue
@@ -200,7 +200,7 @@ export default {
             }
 
             &-active {
-                background: $uni-color-primary;
+                background: $uni-theme-blue;
                 color: #fff;
             }
         }
diff --git a/pages/device/DVR/detail.vue b/pages/device/DVR/detail.vue
index c0cd66e..57347ba 100644
--- a/pages/device/DVR/detail.vue
+++ b/pages/device/DVR/detail.vue
@@ -193,7 +193,7 @@ export default {
 
 
             &-active {
-                background: $uni-color-primary;
+                background: $uni-theme-blue;
                 color: #fff;
             }
         }
diff --git a/pages/device/transfer.vue b/pages/device/transfer.vue
index 1436e70..03e53f0 100644
--- a/pages/device/transfer.vue
+++ b/pages/device/transfer.vue
@@ -43,7 +43,7 @@ export default {
     .transfer-img {
         width: 500rpx;
         height: 500rpx;
-        background: $uni-color-primary ;
+        background: $uni-theme-blue ;
     }
 
     .transfer-text {
@@ -63,7 +63,7 @@ export default {
             flex: 1;
             height: 80rpx;
             border-radius: 12rpx;
-            background-color: $uni-color-primary;
+            background-color: $uni-theme-blue;
             font-size: 28rpx;
             color: #fff;
             display: flex;
diff --git a/pages/index/comp/indexZhuYongHu.vue b/pages/index/comp/indexZhuYongHu.vue
index 6ffeec9..dc379f8 100644
--- a/pages/index/comp/indexZhuYongHu.vue
+++ b/pages/index/comp/indexZhuYongHu.vue
@@ -14,24 +14,72 @@
                 <div class="header-item-label">离线设备</div>
             </div>
         </div>
-        <uni-card title="基础设备" sub-title="副标题" :extra="item % 2 ? 'APF' : 'DVR'" v-for="item in 3" :key="item"
-            @click="jump(item)" thumbnail="/static/device.png">
-            <text>设备基础信息 </text>
+        <view style="padding:30rpx 30rpx 0">
+            <Cn-grid title="注册">
+                <Cn-grid-item src="/static/device2.png" text="设备"></Cn-grid-item>
+                <Cn-grid-item src="/static/gateway2.png" text="网关"></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">
+            <view class="nav-menu" :class="{ 'nav-menu-active': navMenuActive == index }"
+                v-for="(item, index) in navMenuList" :key="index" @click="navMenuClick(index)">{{ item.text }}
+            </view>
+        </view>
+        <uni-card :title="item.name" :sub-title="item.project" :extra="item.type" v-for="item in deviceListFilter"
+            :key="item" style="margin-top:4rpx" @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
+            loading: false,
+            navMenuList: [{
+                text: '全部'
+            }, {
+                text: '监测'
+            }, {
+                text: '治理'
+            }],
+            navMenuActive: 0,
+            deviceList: [
+                {
+                    name: '设备1',
+                    des: '设备描述1',
+                    type: 'APF',
+                    project: '监测',
+                },
+                {
+                    name: '设备2',
+                    des: '设备描述2',
+                    type: 'DVR',
+                    project: '治理'
+                }
+            ]
+        }
+    },
+    computed: {
+        deviceListFilter () {
+            if (this.navMenuActive == 0) {
+                return this.deviceList
+            } else {
+                return this.deviceList.filter(item => item.project == this.navMenuList[this.navMenuActive].text)
+            }
         }
     },
     methods: {
+        navMenuClick (index) {
+            this.navMenuActive = index
+        },
         jump (item) {
             if (item % 2) {
-               uni.navigateTo({
+                uni.navigateTo({
                     url: '/pages/device/APF/detail'
                 })
             } else {
@@ -43,6 +91,4 @@ export default {
     }
 }
 </script>
-<style lang='scss'>
-.index-zhuyonghu {}
-</style>
\ No newline at end of file
+<style lang='scss'></style>
\ No newline at end of file
diff --git a/static/device2.png b/static/device2.png
new file mode 100644
index 0000000000000000000000000000000000000000..80a12dffc0d4614b5c3aa4146eb3b8fcdba7e81d
GIT binary patch
literal 3277
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

literal 0
HcmV?d00001

diff --git a/static/gateway2.png b/static/gateway2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8a398dac8767f733b24f9530b88dac23e0a2bc4
GIT binary patch
literal 5038
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
H>lFV#aMLuE

literal 0
HcmV?d00001

diff --git a/uni.scss b/uni.scss
index 7506b8d..32e1834 100644
--- a/uni.scss
+++ b/uni.scss
@@ -81,6 +81,6 @@ $uni-font-size-paragraph:15px;
 /* 全局配置 */
 
 $uni-theme-blue: #376cf3; // 全局主题色
-$uni-theme-yellow: #f2c867; // 全局主题色
+$uni-theme-yellow: #e8b956; // 全局主题色
 $uni-theme-white: #fff; // 全局主题色
 $uni-theme-radius: 12rpx; // 全局主题色
\ No newline at end of file
diff --git a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
index 037385e..b3462fb 100644
--- a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
+++ b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
@@ -114,7 +114,7 @@
 					color: '#3c3e49',
 					selectedColor: '#007AFF',
 					backgroundColor: '#fff',
-					buttonColor: '#007AFF',
+					buttonColor: '#376cf3',
 					iconColor: '#fff'
 				}
 			}