select

src/api/Navs.js

@@ -228,20 +228,6 @@ let navs = [{
                 "grouplist": "2,5",
                 "memo": null,
                 "icon": "home_icon"
-            }, {
-                "clmid": "63",
-                "spclmid": "0",
-                "ordno": "0",
-                "c_level": "2",
-                "clmcode": "front_index",
-                "clmname": "系统设置",
-                "clmurl": "/setting",
-                "prname": null,
-                "en": "1",
-                "show": "1",
-                "grouplist": "2,5",
-                "memo": null,
-                "icon": "home_icon"
             },
         ]
     },

src/router/index.js

@@ -160,7 +160,7 @@ router.beforeEach((to,from,next)=> {
     NProgress.start();
     const isLogin = localStorage.token? true : false;
 
-    if(to.path == '/login' || to.path == '/register'){//'login'和'register'相当于是路由白名单
+    if(to.path == '/login' || to.path == '/register'|| to.path == '/poster'){//'login'和'register'相当于是路由白名单
         next();
     }else{
         //如果token存在，就正常跳转，如果不存在，则说明未登陆，则跳转到'login'

src/views/Equip.vue

@@ -418,16 +418,18 @@
                     regionId: regionId,
                 };
                 let postdata = qs.stringify(param);
-                GetChildRegionSelect(postdata).then(res => {
+                GeFullRegionSelect(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
                         if (level == 1) {
+                            console.log( json.Rs);
                             that.dialog.regionlevelOneIdOptions = json.Rs;
-                            that.dialog.regionlevelOneId = json.Rs[0].Id;
+                            that.dialog.regionlevelOneId = regionId;
                         } else {
                             if (json.Rs) {
+                                console.log(123);
                                 that.dialog.regionIdRoomOptions = json.Rs;
-                                that.dialog.regionId = json.Rs[0].Id;
+                                that.dialog.regionId = regionId;
                             } else {
                                 that.dialog.regionIdRoomOptions = [];
                                 that.dialog.regionId = '';
@@ -605,10 +607,12 @@
                 this.dialog.location = row.Location;
                 this.dialog.purchasesrc = row.PurchaseSrc;
                 this.dialog.memo = row.Memo;
+                this.dialogGetGetChildRegionSelect(row.RegionId, 1);
                 // this.dialog.coords_memo = row.coords_memo;
 
                 // 重载地区列表
                 this.getGeFullRegionSelect();
+
                 let param = {
                     token: localStorage.token,
                     detectorId: row.Id,

src/views/Hardware.vue

@@ -45,8 +45,8 @@
                                 </el-select>
                             </el-col>
                             <!--<el-col :span="4">-->
-                                <!--<em>固件版本:</em>-->
-                                <!--<el-input v-model="panel.keyword" placeholder="请输入固件版本"></el-input>-->
+                            <!--<em>固件版本:</em>-->
+                            <!--<el-input v-model="panel.keyword" placeholder="请输入固件版本"></el-input>-->
                             <!--</el-col>-->
                             <el-col :span="4">
                                 <el-button size="small" type="primary" @click="query">查询</el-button>
@@ -238,7 +238,7 @@
                     {name: '固件管理', url: 'hardware'},
                     //{name: '警务通管理', url: 'police'},
                     {name: '密码修改', url: 'pwd'},
-                    {name: '系统设置', url: 'setting'},
+                    // {name: '系统设置', url: 'setting'},
                 ],
                 fileList: [
                     // {name: 'food.jpeg',
@@ -399,10 +399,10 @@
                 this.fileList = fileList.slice(-3);
             },
             handleupload(file) {
-                if (file.type != 'application/x-zip-compressed') {
-                    this.$message.error('只允许上传压缩文件，当前文件格式为' + file.type);
-                    return false
-                }
+                // if (file.type != 'application/x-zip-compressed') {
+                //     this.$message.error('只允许上传压缩文件，当前文件格式为' + file.type);
+                //     return false
+                // }
             },
             handleClose() {
                 console.log(123);
@@ -557,8 +557,16 @@
         padding-left: 20px;
     }
 
+    ul {
+        margin: 0;
+        padding: 0;
+        list-style: none;
+    }
+
     .tabs ul {
-        width: 558px;
+        width: 358px;
+        margin: 0 auto;
+        margin-top: 15px;
     }
 
     table span {

src/views/Pwd.vue

@@ -71,7 +71,7 @@
                     {name: '固件管理', url: 'hardware'},
                     //{name: '警务通管理', url: 'police'},
                     {name: '密码修改', url: 'pwd'},
-                    {name: '系统设置', url: 'setting'},
+                    // {name: '系统设置', url: 'setting'},
                 ],
                 valImgSrc: '',
                 overtime: '',
@@ -211,8 +211,16 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
+    ul {
+        margin: 0;
+        padding: 0;
+        list-style: none;
+    }
+
     .tabs ul {
-        width: 558px;
+        width: 358px;
+        margin: 0 auto;
+        margin-top: 15px;
     }
 
     .image-border {

src/views/Setting.vue

@@ -13,14 +13,14 @@
         </div>
         <div class="content">
             <ul>
-                <li>
-                    <em>报警声音</em>
-                    <el-switch
-                            v-model="setting.sound"
-                            active-color="#6DC1FF"
-                            inactive-color="#DCDFE6">
-                    </el-switch>
-                </li>
+<!--                <li>-->
+<!--                    <em>报警声音</em>-->
+<!--                    <el-switch-->
+<!--                            v-model="setting.sound"-->
+<!--                            active-color="#6DC1FF"-->
+<!--                            inactive-color="#DCDFE6">-->
+<!--                    </el-switch>-->
+<!--                </li>-->
                 <li>
                     <em>设备固件自动升级</em>
                     <el-switch