new page ready

src/api/Navs.js

@@ -72,20 +72,6 @@ let navs = [{
             "grouplist": "2,5",
             "memo": null,
             "icon": "home_icon"
-        }, {
-            "clmid": "21",
-            "spclmid": "0",
-            "ordno": "0",
-            "c_level": "2",
-            "clmcode": "06g",
-            "clmname": "0-6G扫描",
-            "clmurl": "/GSign",
-            "prname": null,
-            "en": "1",
-            "show": "1",
-            "grouplist": "2,5",
-            "memo": null,
-            "icon": "home_icon"
         },
     ]
 },
@@ -184,20 +170,6 @@ let navs = [{
                 "icon": "home_icon"
             },
             {
-                "clmid": "62",
-                "spclmid": "0",
-                "ordno": "0",
-                "c_level": "2",
-                "clmcode": "front_index",
-                "clmname": "警务通管理",
-                "clmurl": "/police",
-                "prname": null,
-                "en": "1",
-                "show": "1",
-                "grouplist": "2,5",
-                "memo": null,
-                "icon": "home_icon"
-            }, {
                 "clmid": "62",
                 "spclmid": "0",
                 "ordno": "0",

src/api/getApiRes.js

@@ -214,3 +214,10 @@ export function RegionPictureGetByRegionId(postdata) {
     let url = headapi + 'v1/Company/RegionPictureGetByRegionId';
     return getApiBasic(url,postdata);
 }
+
+// 获取下级区域选择框信息
+export function GetChildRegionSelect(postdata) {
+    // 获取下级区域选择框信息
+    let url = headapi + 'v1/Auth/GetChildRegionSelect';
+    return getApiBasic(url,postdata);
+}

src/assets/css/dialog.css

@@ -54,7 +54,7 @@
 }
 .el-dialog, .el-pager li {
     background: rgba(0,23,67,0.8);
-    color:#6DC1FF!important;
+    /*color:#6DC1FF!important;*/
 }
 .el-dialog__body {
     color:#6DC1FF!important;

src/assets/css/panel.css

@@ -393,3 +393,6 @@
     height: 30px;
     float: left;
 }
+.yellow {
+    color:#FFDD00 ;
+}

src/views/Equip.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="content">
         <div class="tabs">
             <ul>
                 <li v-for="(tab,i) in tabs" @click="goTab(tab.url)" :class="{'active':tabIndex == i}">
@@ -12,34 +12,20 @@
                 <div class=" panel_control">
                     <el-row :gutter="20">
                         <el-col :span="4">
-                            <em>设备ID:</em>
-                            <el-input v-model="panel.keyword" placeholder="请输入设备ID"></el-input>
-                        </el-col>
-                        <el-col :span="4">
-                            <em>MAC:</em>
-                            <el-input v-model="panel.keyword" placeholder="请输入MAC地址"></el-input>
+                            <em>标签名:</em>
+                            <el-input v-model="panel.tagname" placeholder="请输入标签名"></el-input>
                         </el-col>
                         <el-col :span="4">
                             <em>所属区域:</em>
-                            <el-select v-model="panel.taskstatus">
+                            <el-select v-model="panel.regionid">
                                 <el-option
-                                        v-for="item in panel.options"
+                                        v-for="item in panel.regionidOptions"
                                         :key="item.value"
                                         :label="item.label"
                                         :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-col>
-                        <el-col :span="6">
-                            <em>登记时间:</em>
-                            <el-date-picker
-                                    v-model="panel.time1"
-                                    type="daterange"
-                                    range-separator="至"
-                                    start-placeholder="开始日期"
-                                    end-placeholder="结束日期">
-                            </el-date-picker>
-                        </el-col>
                         <el-col :span="4">
                             <el-button size="small" type="primary" @click="query">查询</el-button>
                         </el-col>
@@ -65,42 +51,61 @@
                     width="55">
             </el-table-column>
             <el-table-column
-                    prop="name"
-                    label="设备ID"
+                    prop="Mac"
+                    label="Mac"
             >
             </el-table-column>
             <el-table-column
-                    prop="date"
-                    label="检测时间"
-                    width="180">
+                    prop="TagName"
+                    label="标签名"
+            >
             </el-table-column>
             <el-table-column
-                    prop="name"
-                    label="探测区域"
+                    prop="Location"
+                    label="位置"
             >
             </el-table-column>
             <el-table-column
-                    prop="name"
-                    label="信道"
-                    width="180">
+                    prop="FirmwareVersion"
+                    label="软件版本"
+            >
             </el-table-column>
             <el-table-column
-                    prop="address"
-                    label="信号频段">
+                    prop="HardwareVersion"
+                    label="硬件版本"
+            >
             </el-table-column>
             <el-table-column
-                    prop="address"
-                    label="数据量">
+                    prop="LastOnline"
+                    label="最近上线"
+            >
             </el-table-column>
             <el-table-column
-                    prop="address"
-                    label="信号强度">
+                    prop="Dayfind"
+                    label="当日报警"
+            >
+            </el-table-column>
+            <el-table-column
+                    prop="Memo"
+                    label="备注"
+            >
+            </el-table-column>
+            <el-table-column
+                    prop="Status"
+                    label="状态"
+            >
+                <template slot-scope="scope">
+                    <span v-if="scope.row.Status == 0">已禁用</span>
+                    <span v-if="scope.row.Status == 1">已启用</span>
+                </template>
             </el-table-column>
             <el-table-column
                     prop="address"
                     label="操作记录">
                 <template slot-scope="scope">
-                    <span @click="goRecord(scope.row)">探测记录</span>
+                    <el-button class="control_btn" type="text" @click="goPoster(scope.row)">记录</el-button>
+                    <el-button class="control_btn" type="text" @click="goPoster(scope.row)">时间轴</el-button>
+                    <el-button class="control_btn" type="text" @click="goPoster(scope.row)">禁用</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -112,6 +117,7 @@
                 @current-change="pageChange"
         ></el-pagination>
 
+        <el-button class="down_btn" type="primary" @click="goPoster(scope.row)">下载驱动器todo</el-button>
         <dialog_referrer_list
                 :show="dialog_state"
                 :title="dialog_title"
@@ -232,8 +238,6 @@
         methods: {
             // 页面数据查询
             getTableQuery() {
-                // 获取探测器列表
-                this.getDetOption();
                 let that = this;
                 that.loading = true;
                 // 查询检测设备。上级区域id，区域id必传。regionid传0，查询supregionid对应所有子区域的检测设备。 如果supregionid，regionid都传0，默认查询企业ID下所有检测设备
@@ -241,7 +245,7 @@
                     token: localStorage.token,
                     supregionid: 0,//
                     regionid: 0,//
-                    comid : 1,//
+                    comid: 1,//
                     tagname: that.panel.tagname,//标签名
                     start: 1,//
                     tableMax: 300,//
@@ -278,10 +282,6 @@
             handleSelectionChange(val) {
                 this.multipleSelection = val;
                 console.log(val);
-            },
-            // 页面数据查询
-            getTableQuery() {
-
             },
             // 设置分页数据
             setPaginations() {
@@ -397,4 +397,10 @@
     table span {
         cursor: pointer;
     }
+    .down_btn {
+        float: left;
+    }
+    .content {
+        padding-left: 10px;
+    }
 </style>

src/views/Hardware.vue

@@ -172,7 +172,7 @@
                 tabIndex: 0,
                 tabs: [
                     {name: '固件管理', url: 'hardware'},
-                    {name: '警务通管理', url: 'police'},
+                    //{name: '警务通管理', url: 'police'},
                     {name: '密码修改', url: 'pwd'},
                     {name: '系统设置', url: 'setting'},
                 ],

src/views/Main.vue

@@ -342,6 +342,7 @@
         float: left;
         overflow: hidden;
         margin-right: 10px;
+        margin-left: 10px;
     }
 
     .mcenter {
@@ -363,7 +364,7 @@
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        margin-bottom: 5px;
+        margin-bottom: 15px;
     }
 
     /*total */

src/views/PhoneSign.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="content">
         <div class="tabs">
             <ul>
                 <li v-for="(tab,i) in tabs" @click="goTab(tab.url)" :class="{'active':tabIndex == i}">
@@ -66,16 +66,19 @@
             <el-table-column
                     prop="Wwan"
                     label="通信方式"
+                    width="120"
             >
             </el-table-column>
             <el-table-column
                     prop="SignalType"
                     label="信号类型"
+                    width="120"
             >
             </el-table-column>
             <el-table-column
                     prop="SignalIntensity"
                     label="信号强度"
+                    width="120"
             >
             </el-table-column>
             <el-table-column
@@ -84,11 +87,14 @@
             </el-table-column>
             <el-table-column
                     prop="Operator"
-                    label="信道">
+                    label="信道"
+                    width="120"
+            >
             </el-table-column>
             <el-table-column
                     prop="DeviceType"
                     label="设备类型"
+                    width="120"
             >
                 <template slot-scope="scope">
                     <!--0:其他-->
@@ -102,9 +108,10 @@
             <el-table-column
                     prop="DangerLevel"
                     label="危险等级"
+                    width="120"
             >
                 <template slot-scope="scope">
-                    <span v-if="scope.row.DangerLevel == -1">危险</span>
+                    <span class="yellow" v-if="scope.row.DangerLevel == -1">危险</span>
                     <span v-if="scope.row.DangerLevel != -1">安全</span>
                 </template>
             </el-table-column>
@@ -132,7 +139,7 @@
                 tabs: [
                     {name: '手机信号记录', url: 'phoneSign'},
                     {name: 'WiFi信号记录', url: 'wifiSign'},
-                    {name: '0-6G扫描记录', url: 'GSign'},
+                    // {name: '0-6G扫描记录', url: 'GSign'},
                 ],
                 // panel 配置项目
                 panel: {
@@ -307,5 +314,14 @@
 
 <style scoped>
     @import "../assets/css/panel.css";
-
+    .tabs ul {
+        width: 400px;
+    }
+    .content {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        padding-left: 10px;
+    }
 </style>

src/views/Police.vue

@@ -176,7 +176,7 @@
                 tabIndex: 1,
                 tabs: [
                     {name: '固件管理', url: 'hardware'},
-                    {name: '警务通管理', url: 'police'},
+                    //{name: '警务通管理', url: 'police'},
                     {name: '密码修改', url: 'pwd'},
                     {name: '系统设置', url: 'setting'},
                 ],

src/views/Pwd.vue

@@ -61,10 +61,10 @@
                 }
             };
             return {
-                tabIndex: 2,
+                tabIndex: 1,
                 tabs: [
                     {name: '固件管理', url: 'hardware'},
-                    {name: '警务通管理', url: 'police'},
+                    //{name: '警务通管理', url: 'police'},
                     {name: '密码修改', url: 'pwd'},
                     {name: '系统设置', url: 'setting'},
                 ],

src/views/Region.vue

@@ -43,7 +43,6 @@
                       />
                       <img src="../assets/img/region/watch.png"
                            height="18" width="18"
-                           v-if="node.level != 1"
                            @click="seeLoft(node)"
                       />
                       </span>
@@ -51,16 +50,15 @@
                 </el-tree>
             </div>
             <div class="plate">
-                <div class="loftList" v-if="loftList">
+                <div class="loftList" >
                     <div class="plateTitle">
                         {{plateTitle}}
                     </div>
-                    <!--<ul class="list" v-if="false">-->
-                    <!--<li>-->
-                    <!--<img src="../assets/img/region/loft.png" height="22" width="20"/>-->
-                    <!--<em>1楼</em>-->
-                    <!--</li>-->
-                    <!--</ul>-->
+                    <ul class="list" v-if="loftListState">
+                        <li v-for="loft in loftList" @click="seePic(loft)">
+                            <img src="../assets/img/region/loft.png" height="22"
+                                                          width="20"/><em>{{loft.Name}}</em></li>
+                    </ul>
                     <div class="plateImg" v-if="plateImg">
                         <!--<img src="../assets/img/main/RoomBg.png" height="769" width="1396"/>-->
                         <img :src="plateImgSrc"/>
@@ -150,7 +148,8 @@
         RegionStatusEdit,
         RegionAdd,
         GetRegiononeinfo,
-        RegionPictureGetByRegionId
+        RegionPictureGetByRegionId,
+        GetChildRegionSelect
     }
         from '../api/getApiRes.js'
 
@@ -181,9 +180,8 @@
                 disabled: false,
                 plateTitle: '',
                 plateImg: false,
-                loftList: [
-                    {}
-                ],
+                loftListState: false,
+                loftList: [],
                 defaultProps: {
                     label: 'Name',
                     children: 'ChildSelect'
@@ -199,7 +197,7 @@
             // 获取建筑树列表
             getDate() {
                 let param = {
-                    'token': localStorage.token,
+                    token: localStorage.token,
                 };
                 let postdata = qs.stringify(param);
                 GetRegionAndDectorSelect(postdata).then(res => {
@@ -211,6 +209,29 @@
                     }
                 })
             },
+            // 获取下级列表
+            getGetChildRegionSelect(regionId) {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                    regionId: regionId,
+                };
+                let postdata = qs.stringify(param);
+                GetChildRegionSelect(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        that.loftList = json.Rs;
+                    } else {
+                        that.$message.error(json.Memo);
+                    }
+                })
+            },
+            // 查看当前楼宇的平面图
+            seePic(loft){
+                this.loftListState = false;
+                this.plateImg = true;
+                this.getRegionPictureGetByRegionId(loft.Id);
+            },
             clearDialog() {
                 let that = this;
                 that.dialog.superiorid = 0;//上级 为空
@@ -439,16 +460,20 @@
                 switch (parseInt(node.level)) {
                     case 1:
                         // 看列表
-                        that.loftList = true;
+                        that.loftListState = true;
+                        that.plateImg = false;
+                        that.getGetChildRegionSelect(node.data.Id);
                         break;
                     case 2:
                         // 看楼层图
+                        that.loftListState = false;
                         that.plateImg = true;
                         that.getRegionPictureGetByRegionId(node.data.Id);
                         // that.plateImgSrc
                         break;
                     case 3:
                         // 看会议图
+                        that.loftListState = false;
                         that.plateImg = true;
                         that.getRegionPictureGetByRegionId(node.data.Id);
                         break;
@@ -542,13 +567,7 @@
     }
 
     .pages {
-        /*position: absolute;*/
-        /*top: 0;*/
-        /*bottom: 0;*/
-        /*left: 0;*/
-        /*right: 0;*/
         width: 100%;
-        /*height: 100%;*/
         min-height: 600px;
         overflow: hidden;
         display: block;
@@ -572,7 +591,7 @@
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        margin-top: 30px;
+        margin-top: 10px;
     }
 
     .content .tree {
@@ -582,6 +601,7 @@
         color: #6DC1FF;
         border: 1px solid #005EA2;
         float: left;
+        margin-left: 10px;
     }
 
     .addMain {
@@ -618,7 +638,7 @@
     }
 
     .plate {
-        width: 1360px;
+        width: 1440px;
         min-height: 780px;
         float: left;
         margin-left: 10px;
@@ -657,8 +677,10 @@
         background: #08255B;
         border: 1px solid #005EA2;
         padding: 13px 0;
+        margin-right: 10px;
+        margin-bottom: 10px;
+        cursor: pointer;
     }
-
     .list img {
         display: block;
         margin: 0 auto;

src/views/Setting.vue

@@ -38,10 +38,10 @@
     export default {
         data() {
             return {
-                tabIndex: 3,
+                tabIndex: 2,
                 tabs: [
                     {name: '固件管理', url: 'hardware'},
-                    {name: '警务通管理', url: 'police'},
+                    //{name: '警务通管理', url: 'police'},
                     {name: '密码修改', url: 'pwd'},
                     {name: '系统设置', url: 'setting'},
                 ],

src/views/WifiSign.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="content">
         <div class="tabs">
             <ul>
                 <li v-for="(tab,i) in tabs" @click="goTab(tab.url)" :class="{'active':tabIndex == i}">
@@ -59,6 +59,7 @@
             <el-table-column
                     prop="DetectorId"
                     label="探测设备ID"
+                    width="120"
             >
             </el-table-column>
             <el-table-column
@@ -79,6 +80,7 @@
             <el-table-column
                     prop="SignalIntensity"
                     label="信号强度"
+                    width="120"
             >
             </el-table-column>
             <el-table-column
@@ -90,9 +92,10 @@
             <el-table-column
                     prop="DangerLevel"
                     label="危险等级"
+                    width="120"
             >
                 <template slot-scope="scope">
-                    <span v-if="scope.row.DangerLevel == -1">危险</span>
+                    <span class="yellow" v-if="scope.row.DangerLevel == -1">危险</span>
                     <span v-if="scope.row.DangerLevel != -1">安全</span>
                 </template>
             </el-table-column>
@@ -121,7 +124,7 @@
                 tabs: [
                     {name: '手机信号记录', url: 'phoneSign'},
                     {name: 'WiFi信号记录', url: 'wifiSign'},
-                    {name: '0-6G扫描记录', url: 'GSign'},
+                    // {name: '0-6G扫描记录', url: 'GSign'},
                 ],
                 // panel 配置项目
                 panel: {
@@ -289,4 +292,14 @@
 
 <style scoped>
     @import "../assets/css/panel.css";
+    .tabs ul {
+        width: 400px;
+    }
+    .content {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        padding-left: 10px;
+    }
 </style>