new page ready

src/api/Navs.js

@@ -4,7 +4,7 @@ let navs = [ {
     "ordno": "1",
     "c_level": "1",
     "clmcode": "index",
-    "clmname": "用户管理",
+    "clmname": "区域管理",
     "clmurl": "",
     "prname": "",
     "en": "1",
@@ -19,7 +19,7 @@ let navs = [ {
             "ordno": "0",
             "c_level": "2",
             "clmcode": "front_index",
-            "clmname": "消费者管理",
+            "clmname": "区域管理",
             "clmurl": "/yhgl",
             "prname": null,
             "en": "1",
@@ -27,14 +27,31 @@ let navs = [ {
             "grouplist": "2,5",
             "memo": null,
             "icon": "home_icon"
-        },{
-            "clmid": "22",
+        },
+    ]
+},{
+    "clmid": "3",
+    "spclmid": "0",
+    "ordno": "1",
+    "c_level": "1",
+    "clmcode": "index",
+    "clmname": "监测记录",
+    "clmurl": "",
+    "prname": "",
+    "en": "1",
+    "show": "1",
+    "grouplist": "2,5",
+    "memo": "",
+    "icon": "icon-list",
+    "childs": [
+        {
+            "clmid": "21",
             "spclmid": "0",
             "ordno": "0",
             "c_level": "2",
             "clmcode": "front_index",
-            "clmname": "mock模拟数据",
-            "clmurl": "/mockPage",
+            "clmname": "手机信号",
+            "clmurl": "/phoneSign",
             "prname": null,
             "en": "1",
             "show": "1",
@@ -42,13 +59,27 @@ let navs = [ {
             "memo": null,
             "icon": "home_icon"
         },{
-            "clmid": "23",
+            "clmid": "21",
             "spclmid": "0",
             "ordno": "0",
             "c_level": "2",
             "clmcode": "front_index",
-            "clmname": "图表页面",
-            "clmurl": "/chart",
+            "clmname": "wifi信号",
+            "clmurl": "/wifiSign",
+            "prname": null,
+            "en": "1",
+            "show": "1",
+            "grouplist": "2,5",
+            "memo": null,
+            "icon": "home_icon"
+        },{
+            "clmid": "21",
+            "spclmid": "0",
+            "ordno": "0",
+            "c_level": "2",
+            "clmcode": "06g",
+            "clmname": "0-6G扫描",
+            "clmurl": "/06g",
             "prname": null,
             "en": "1",
             "show": "1",
@@ -58,60 +89,13 @@ let navs = [ {
         },
     ]
 },
-    {
-        "clmid": "3",
-        "spclmid": "0",
-        "ordno": "1",
-        "c_level": "1",
-        "clmcode": "index",
-        "clmname": "充值查询",
-        "clmurl": "",
-        "prname": "",
-        "en": "1",
-        "show": "1",
-        "grouplist": "2,5",
-        "memo": "",
-        "icon": "icon-list",
-        "childs": [
-            {
-                "clmid": "31",
-                "spclmid": "0",
-                "ordno": "0",
-                "c_level": "2",
-                "clmcode": "front_index",
-                "clmname": "许可查询",
-                "clmurl": "/czcx",
-                "prname": null,
-                "en": "1",
-                "show": "1",
-                "grouplist": "2,5",
-                "memo": null,
-                "icon": "home_icon"
-            },
-            {
-                "clmid": "32",
-                "spclmid": "0",
-                "ordno": "0",
-                "c_level": "2",
-                "clmcode": "front_index",
-                "clmname": "分级充值",
-                "clmurl": "/fjcz",
-                "prname": null,
-                "en": "1",
-                "show": "1",
-                "grouplist": "2,5",
-                "memo": null,
-                "icon": "home_icon"
-            },
-        ]
-    },
     {
         "clmid": "4",
         "spclmid": "0",
         "ordno": "1",
         "c_level": "1",
         "clmcode": "index",
-        "clmname": "业务管理",
+        "clmname": "设备管理",
         "clmurl": "",
         "prname": "",
         "en": "1",
@@ -126,7 +110,7 @@ let navs = [ {
                 "ordno": "0",
                 "c_level": "2",
                 "clmcode": "front_index",
-                "clmname": "监测记录",
+                "clmname": "设备管理",
                 "clmurl": "/record",
                 "prname": null,
                 "en": "1",
@@ -135,21 +119,6 @@ let navs = [ {
                 "memo": null,
                 "icon": "home_icon"
             },
-            {
-                "clmid": "42",
-                "spclmid": "0",
-                "ordno": "0",
-                "c_level": "2",
-                "clmcode": "front_index",
-                "clmname": "分级查询",
-                "clmurl": "/fjcx",
-                "prname": null,
-                "en": "1",
-                "show": "1",
-                "grouplist": "2,5",
-                "memo": null,
-                "icon": "home_icon"
-            },
         ]
     },
     {
@@ -158,7 +127,7 @@ let navs = [ {
         "ordno": "1",
         "c_level": "1",
         "clmcode": "index",
-        "clmname": "系统管理",
+        "clmname": "二维码管理",
         "clmurl": "",
         "prname": "",
         "en": "1",
@@ -173,7 +142,7 @@ let navs = [ {
                 "ordno": "0",
                 "c_level": "2",
                 "clmcode": "front_index",
-                "clmname": "系统消息",
+                "clmname": "二维码管理",
                 "clmurl": "/news",
                 "prname": null,
                 "en": "1",
@@ -182,35 +151,6 @@ let navs = [ {
                 "memo": null,
                 "icon": "home_icon"
             },
-            {
-                "clmid": "52",
-                "spclmid": "0",
-                "ordno": "0",
-                "c_level": "2",
-                "clmcode": "front_index",
-                "clmname": "基本设置",
-                "clmurl": "/basic",
-                "prname": null,
-                "en": "1",
-                "show": "1",
-                "grouplist": "2,5",
-                "memo": null,
-                "icon": "home_icon"
-            }, {
-                "clmid": "53",
-                "spclmid": "0",
-                "ordno": "0",
-                "c_level": "2",
-                "clmcode": "front_index",
-                "clmname": "密码修改",
-                "clmurl": "/pwd",
-                "prname": null,
-                "en": "1",
-                "show": "1",
-                "grouplist": "2,5",
-                "memo": null,
-                "icon": "home_icon"
-            },
         ]
     },
     {
@@ -219,7 +159,7 @@ let navs = [ {
         "ordno": "1",
         "c_level": "1",
         "clmcode": "index",
-        "clmname": "常用页面",
+        "clmname": "系统设置",
         "clmurl": "",
         "prname": "",
         "en": "1",
@@ -234,7 +174,7 @@ let navs = [ {
                 "ordno": "0",
                 "c_level": "2",
                 "clmcode": "front_index",
-                "clmname": "关于我们",
+                "clmname": "固件管理",
                 "clmurl": "/aboutUs",
                 "prname": null,
                 "en": "1",

src/components/Console.vue

@@ -9,7 +9,7 @@
                 控制台
             </div>
             <div class="cslist cubeContent">
-                <div class="cstitle" @click="ClickGetInfo(0,0)">
+                <div :class="[{'cstitle':true},{'active':cstitle}]" @click="ClickGetInfo(0,0)">
                     安全监控首页
                 </div>
                 <div class="loft cspart">
@@ -82,6 +82,7 @@
                 manageIndex: 0,
                 RoomIndex: 0,
                 equipIndex: 0,
+                cstitle: false,
             };
         },
         mounted() {
@@ -94,9 +95,11 @@
                 this.loftIndex = 0;
                 this.manageIndex = 0;
                 this.equipIndex = 0;
+                this.cstitle = false;
                 let thisBtn = {};
                 switch (parseInt(level)) {
                     case 0:
+                        this.cstitle = true;
                         break;
                     case 1:
                         this.loftIndex = index + 1;

src/components/Total.vue

@@ -19,6 +19,16 @@
                 </div>
             </div>
             <div class="loftContainer" v-if="LoftPanel">
+                <div class="tlt">
+                    <h5>正在监测</h5>
+                    <BigRader></BigRader>
+                </div>
+                <div class="trt">
+                    <h5>实时监测记录</h5>
+                    <Watching></Watching>
+                </div>
+            </div>
+            <div class="manageContainer" v-if="managePanel">
                 <div class="tlt">
                     <h5></h5>
                     <SmallRader></SmallRader>
@@ -63,16 +73,18 @@
             return {
                 TotalPanel: true,//总控
                 LoftPanel: false,//楼层
+                managePanel: false,//区域
                 RoomPanel: false,//房间
                 DetctorPanel: false,//设备
             }
         },
         props: ['postTitle'],
         watch: {
-            postTitle:function(val){
+            postTitle: function (val) {
                 let that = this;
                 that.TotalPanel = false;
                 that.LoftPanel = false;
+                that.managePanel = false;
                 that.RoomPanel = false;
                 that.DetctorPanel = false;
 
@@ -80,13 +92,13 @@
                     case 0: //默认全部
                         that.TotalPanel = true;
                         break;
-                    case 1: //楼层区域
+                    case 1: //楼层
                         that.LoftPanel = true;
                         break;
-                    case 2: //小区域
-                        that.RoomPanel = true;
+                    case 2: //楼层区域
+                        that.managePanel = true;
                         break;
-                    case 3: //房间区域
+                    case 3: //小区域
                         that.RoomPanel = true;
                         break;
                     case 4: //单个设备
@@ -160,18 +172,28 @@
     }
 
     .loftContainer .tlt {
+        width: 48%;
         float: left;
         padding-left: 10px;
-        margin-top: 60px;
     }
 
     .loftContainer .trt {
+        width: 48%;
         float: right;
         padding-right: 20px;
         overflow: hidden;
-        margin-top: 30px;
     }
 
+
+    .loftContainer {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-top: 55px;
+    }
+
+
     .RoomContainer .tlt {
         float: left;
         padding-left: 10px;
@@ -184,6 +206,7 @@
         overflow: hidden;
         margin-top: 30px;
     }
+
     .DetctorContianer {
         width: 100%;
         overflow: hidden;
@@ -191,6 +214,7 @@
         margin: 0 auto;
         margin-top: 55px;
     }
+
     .DetctorContianer .tlt {
         width: 48%;
         float: left;
@@ -203,6 +227,7 @@
         padding-right: 20px;
         overflow: hidden;
     }
+
     .DetctorContianer h5 {
         width: 126px;
         height: 26px;
@@ -216,4 +241,31 @@
         background: url("../assets/img/main/title.png") top center no-repeat;
         background-size: 100% 100%;
     }
+
+    .manageContainer .tlt {
+        float: left;
+        padding-left: 10px;
+        margin-top: 60px;
+    }
+
+    .manageContainer .trt {
+        float: right;
+        padding-right: 20px;
+        overflow: hidden;
+        margin-top: 30px;
+    }
+
+    .loftContainer h5 {
+        width: 126px;
+        height: 26px;
+        line-height: 26px;
+        text-align: center;
+        color: #6DC1FF;
+        font-size: 14px;
+        margin: 0;
+        margin-left: 33%;
+        margin-bottom: 19px;
+        background: url("../assets/img/main/title.png") top center no-repeat;
+        background-size: 100% 100%;
+    }
 </style>

src/views/Main.vue

@@ -46,6 +46,8 @@
                 loadingState: false,
                 pageLevel: 0,//默认查全部
                 // pageLevel: 1,//当前为楼层
+                // pageLevel: 2,//当前为楼层区域
+                // pageLevel: 3,//当前为房间
                 // pageLevel: 4,//当前为单个设备
             }
         },