debug

src/Global.js

@@ -418,7 +418,7 @@ levelOptions = function () {
             label: '全部'
         }, {
             value: 1,
-            label: '白名单'
+            label: '可信设备'
         }, {
             value: 2,
             label: '安全'

src/components/Task.vue

@@ -76,14 +76,17 @@
                             信号录制
                         </em></el-col>
                     <el-col :span="12">
-                        <el-button type="primary" plain size="small" @click="startScan" v-if="taskText.IsStop">开始扫描</el-button>
+                        <el-button type="primary" plain size="small" @click="startScan"
+                                   v-if="taskText.Status != 3&&taskText.Status != 4">开始扫描
+                        </el-button>
                         <el-button type="primary" plain size="small" @click="stopScan" v-else>停止扫描</el-button>
                     </el-col>
                 </el-col>
                 <ul class="scan_detail">
                     <li>
                         <em>运行状态: </em>
-                        <span>{{taskText.IsStop |filterIsStop }}</span>
+                        <span v-if="taskText.Status <= 4">{{taskText.Status |filterStatus }}</span>
+                        <span v-if="taskText.Status > 4" style="color: red">{{taskText.Status |filterStatus }}</span>
                     </li>
                     <li>
                         <em>开始时间: </em>
@@ -135,6 +138,7 @@
                     }
                 ],
                 taskText: {
+                    Status: '',
                     BeginAt: '',
                     DataSize: '0',
                     Duration: '',
@@ -153,7 +157,7 @@
                     this.taskText.BeginAt = newName.BeginAt;
                     this.taskText.DataSize = newName.DataSize;
                     this.taskText.Duration = newName.Duration;
-                    this.taskText.IsStop = newName.IsStop;
+                    this.taskText.Status = newName.Status;
                 },
                 deep: true,
                 immediate: true
@@ -238,7 +242,7 @@
             }
         },
         methods: {
-            turnRecord(){
+            turnRecord() {
                 this.recordState = !this.recordState
             },
             // 扫描开始
@@ -270,7 +274,7 @@
                     }
                 }
                 let Rs = {
-                    duration:parseInt(this.scan.duration),
+                    duration: parseInt(this.scan.duration),
                     freq06G: freq06G,
                     isRecording: this.recordState,
                     signalList: signalList,
@@ -279,7 +283,7 @@
                 this.$emit('GetScanClick', Rs);//触发事件
             },
             // 停止扫描
-            stopScan(){
+            stopScan() {
                 this.$emit('stopScan');//触发事件
             },
             getScanStrategyDetail() {
@@ -319,12 +323,32 @@
             }
         },
         filters: {
-            filterIsStop: function (value) {
-                if (!value) {
-                    return "扫描中"
-                } else {
-                    return "已停止";
+            filterStatus: function (value) {
+                switch (parseInt(value)) {
+                    case 1:
+                        return '未开始';
+                        break;
+                    case 2:
+                        return '关闭中';
+                        break;
+                    case 3:
+                        return '启动中';
+                        break;
+                    case 4:
+                        return '已运行';
+                        break;
+                    case 5:
+                        return '停止中';
+                        break;
+                    case 6:
+                        return '已停止';
+                        break;
+                    case 7:
+                        return '扫描失败';
+                        break;
+
                 }
+
             },
             filterBeginAt: function (value) {
                 if (!value) {

src/components/signMap.vue

@@ -13,14 +13,29 @@
                  @click="cancle_screen"/>
         </div>
         <div :class="[{'signMapList':true},{'full_state':full_state}]">
-            <div class="tips" v-if="scanState">
+            <div class="tips" v-if="scanState == 1">
+                <span>请开始扫描</span>
+            </div>
+            <div class="tips" v-if="scanState == 2">
+                <span>扫描启动中</span>
+            </div>
+            <div class="tips" v-if="scanState == 3">
+                <span>扫描启动中</span>
+            </div>
+            <div class="tips" v-if="scanState == 5">
+                <span>请开始扫描</span>
+            </div>
+            <div class="tips" v-if="scanState == 6">
+                <span>请开始扫描</span>
+            </div>
+            <div class="tips" v-if="scanState == 7">
                 <span>请开始扫描</span>
             </div>
             <div class="signMapListBg" >
                 <span v-for="s in scan"
                       :style="{ left: s.X*ruleX - errorX +'PX', top: s.Y *ruleY - errorY +'PX'}"
                 >
-                             <em class="types" @click="showToast(s.popover)" @mouseover="showToast(s.popover)"  v-if="!scanState">
+                             <em class="types" @click="showToast(s.popover)" @mouseover="showToast(s.popover)"  v-if="scanState == 4">
                                  <img src="../assets/img/signMap/ydgsm.png" height="54" width="54"
                                       v-if="s.WirelessType == 1"/>
                                  <img src="../assets/img/signMap/ltgsm.png" height="54" width="54"
@@ -95,7 +110,7 @@
                 screen_full: false,
                 checked: true,
                 full_state: false,
-                scanState:false,
+                scanState:1,
                 scan: {},
                 XMax: 56,
                 YMax: 56,
@@ -116,8 +131,7 @@
                     if (!newName.Rs) {
                         return false
                     }
-                    this.scanState = newName.Rs.IsStop;
-                    console.log(  this.scanState);
+                    this.scanState = newName.Rs.Status;
                     this.scan = newName.Rs.Chart.Data;
                     this.XMax = newName.Rs.Chart.XMax;
                     this.YMax = newName.Rs.Chart.YMax;
@@ -125,8 +139,10 @@
                     this.yLimit = parseInt(this.YMax / 12);
                     let Oem = "未知";
                     let Ssid = "未知";
-                    if (this.scan.Chart) {
-                        this.scan.Chart.map(function (item) {
+                    console.log(this.scan);
+                    if (this.scan) {
+                        this.scan.map(function (item) {
+                            console.log(item);
                             Oem = item.Oem == '' ? "未知" : item.Oem;
                             Ssid = item.Ssid == '' ? "未知" : item.Ssid;
                             item.popover = "品牌：" + Oem + " SSID：" + Ssid;

src/router/index.js

@@ -39,7 +39,7 @@ const routes = [
                 name: 'white',
                 component: () => import('@/views/white.vue'),
                 meta: {
-                    title: "白名单",
+                    title: "可信设备",
                 }
             }, {
                 path: '/GSign',
@@ -232,7 +232,7 @@ router.beforeEach((to, from, next) => {
     NProgress.start();
     const isLogin = localStorage.token ? true : false;
 
-    if (to.path == '/login' || to.path == '/register' || to.path == '/poster') {//'login'和'register'相当于是路由白名单
+    if (to.path == '/login' || to.path == '/register' || to.path == '/poster') {//'login'和'register'相当于是路由可信设备
         next();
     } else {
         //如果token存在，就正常跳转，如果不存在，则说明未登陆，则跳转到'login'

src/views/Equip.vue

@@ -151,20 +151,20 @@
                     <!--<span class="yellow" v-if="scope.row.Status == 3">测试</span>-->
                 <!--</template>-->
             <!--</el-table-column>-->
-            <el-table-column
-                    prop="address"
-                    label="操作记录"
-                    width="220"
-            >
-                <template slot-scope="scope">
-                    <!--<el-button class="" type="text" @click="goPhoneRecord(scope.row)">手机信号记录</el-button>-->
-                    <el-button class="" type="primary" size="small" @click="goWifiRecord(scope.row)">监测记录</el-button>
-                    <!--<el-button v-if="scope.row.Status == 1" class="yellow" type="text" @click="pauseRow(scope.row)">禁用-->
-                    <!--</el-button>-->
-                    <!--<el-button v-if="scope.row.Status == 0" class="green" type="text" @click="runRow(scope.row)">启用-->
-                    <!--</el-button>-->
-                </template>
-            </el-table-column>
+            <!--<el-table-column-->
+                    <!--prop="address"-->
+                    <!--label="操作记录"-->
+                    <!--width="220"-->
+            <!--&gt;-->
+                <!--<template slot-scope="scope">-->
+                    <!--&lt;!&ndash;<el-button class="" type="text" @click="goPhoneRecord(scope.row)">手机信号记录</el-button>&ndash;&gt;-->
+                    <!--<el-button class="" type="primary" size="small" @click="goWifiRecord(scope.row)">监测记录</el-button>-->
+                    <!--&lt;!&ndash;<el-button v-if="scope.row.Status == 1" class="yellow" type="text" @click="pauseRow(scope.row)">禁用&ndash;&gt;-->
+                    <!--&lt;!&ndash;</el-button>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<el-button v-if="scope.row.Status == 0" class="green" type="text" @click="runRow(scope.row)">启用&ndash;&gt;-->
+                    <!--&lt;!&ndash;</el-button>&ndash;&gt;-->
+                <!--</template>-->
+            <!--</el-table-column>-->
         </el-table>
         <br>
         <el-pagination

src/views/PhoneSign.vue

@@ -113,7 +113,7 @@
             >
                 <template slot-scope="scope">
                     <span v-if="scope.row.DangerLevel == -1">正常</span>
-                    <span v-if="scope.row.DangerLevel == 1">白名单</span>
+                    <span v-if="scope.row.DangerLevel == 1">可信设备</span>
                     <span v-if="scope.row.DangerLevel == 2">已处理</span>
                     <span class="yellow" v-if="scope.row.DangerLevel == 3">危险</span>
                     <span class="yellow" v-if="scope.row.DangerLevel == 4">危险</span>
@@ -143,7 +143,7 @@
                 tabs: [
                     {name: '手机信号记录', url: 'phoneSign'},
                     {name: 'WiFi信号记录', url: 'wifiSign'},
-                    {name: '白名单', url: 'white'},
+                    {name: '可信设备', url: 'white'},
                 ],
                 // panel 配置项目
                 panel: {

src/views/Poster.vue

@@ -404,7 +404,7 @@
                             break
                     }
                     DangerNum = row[i].DangerLevel;
-                    // 4高危3低危2已处理0白名单-1其他wifi设备
+                    // 4高危3低危2已处理0可信设备-1其他wifi设备
                     switch (parseInt(row[i].DangerLevel)) {
                         case 0:
                             DangerName = '正常';//2危险1可疑0正常摄像头-1正常其他wifi设备

src/views/Region.vue

@@ -57,17 +57,20 @@
             <el-table-column
                     prop="X"
                     label="长/m"
+                    sortable
             >
             </el-table-column>
             <el-table-column
                     prop="Y"
                     label="宽/m"
+                    sortable
             >
             </el-table-column>
             <el-table-column
                     prop="CreateTime"
                     label="添加时间"
                     :formatter="filterTime"
+                    sortable
             >
             </el-table-column>
             <!--<el-table-column-->

src/views/WifiSign.vue

@@ -131,7 +131,7 @@
             >
                 <template slot-scope="scope">
                     <span  v-if="scope.row.DangerLevel == -1">正常</span>
-                    <span v-if="scope.row.DangerLevel == 1">白名单</span>
+                    <span v-if="scope.row.DangerLevel == 1">可信设备</span>
                     <span v-if="scope.row.DangerLevel == 2">已处理</span>
                     <span class="yellow" v-if="scope.row.DangerLevel == 3">危险</span>
                     <span class="yellow" v-if="scope.row.DangerLevel == 4">危险</span>
@@ -144,7 +144,7 @@
             >
                 <template slot-scope="scope">
                     <el-button size="small" type="primary" @click="addWhite(scope.row)" v-if="scope.row.DangerLevel != 1">
-                        加入白名单
+                        加入可信设备
                     </el-button>
                 </template>
             </el-table-column>
@@ -176,7 +176,7 @@
                 tabs: [
                     {name: '手机信号记录', url: 'phoneSign'},
                     {name: 'WiFi信号记录', url: 'wifiSign'},
-                    {name: '白名单', url: 'white'},
+                    {name: '可信设备', url: 'white'},
                 ],
                 // panel 配置项目
                 panel: {
@@ -364,7 +364,7 @@
 
                 }
             },
-            // 加入白名单
+            // 加入可信设备
             addWhite(row) {
                 let that = this;
                 this.$prompt('请输入备注', '提示', {
@@ -378,7 +378,7 @@
                         token: localStorage.token,
                         mac: row.Macstr,
                         regionId: row.RegionId,
-                        dangerLevelUserOwn: 2,//危险类型 1：已处理 2：白名单
+                        dangerLevelUserOwn: 2,//危险类型 1：已处理 2：可信设备
                         deviceType: row.DeviceType,
                         name: row.ProduceCom,
                         memo: value,
@@ -391,7 +391,7 @@
                             that.$message({
                                 showClose: true,
                                 type: 'success',
-                                message: '当前设备已加入白名单中'
+                                message: '当前设备已加入可信设备中'
                             });
                         } else {
                             that.$message.error(json.Memo + '，错误代码：' + json.Code);
@@ -402,7 +402,7 @@
                     console.log(e);
                     that.$message({
                         type: 'info',
-                        message: '取消加入白名单'
+                        message: '取消加入可信设备'
                     });
                 });
             }

src/views/signEquip.vue

@@ -163,7 +163,7 @@
                     sortable
             >
                 <template slot-scope="scope">
-                    <span v-if="scope.row.RltLevel == 1">白名单</span>
+                    <span v-if="scope.row.RltLevel == 1">可信设备</span>
                     <span v-if="scope.row.RltLevel == 2" class="">正常</span>
                     <span v-if="scope.row.RltLevel == 3" class="yellow">可疑</span>
                     <span v-if="scope.row.RltLevel == 4" class="red">危险</span>

src/views/statistics.vue

@@ -78,7 +78,7 @@
                     regionidOptions2: [],
                     levelOptions: [{
                         value: 1,
-                        label: '白名单'
+                        label: '可信设备'
                     }, {
                         value: 2,
                         label: '安全'

src/views/tactics.vue

@@ -90,6 +90,7 @@
             <el-table-column
                     prop="Value.IsRecording"
                     label="信号录制"
+                    sortable
             >
                 <template slot-scope="scope">
                     <span class="red" v-if="scope.row.Value.IsRecording" style="color: #72FF99">已启用</span>

src/views/task.vue

@@ -53,6 +53,7 @@
                                 prop="Type"
                                 label="无线协议"
                                 :formatter="filterWirelessTypeName"
+                                sortable
 
                         >
                         </el-table-column>
@@ -93,17 +94,20 @@
                     prop="BeginTime"
                     label="开始时间"
                     :formatter="filterTime"
+                    sortable
             >
             </el-table-column>
 
             <el-table-column
                     prop="RegionName"
                     label="所属区域"
+                    sortable
             >
             </el-table-column>
             <el-table-column
                     prop="Config.Duration"
                     label="持续时间（秒）"
+                    sortable
             >
                 <template slot-scope="scope">
                     <span v-if="scope.row.Config.Duration == 0" style="color: yellowgreen">无限</span>
@@ -113,6 +117,7 @@
             <el-table-column
                     prop="Config.IsRecord"
                     label="是否录制"
+                    sortable
             >
                 <template slot-scope="scope">
                     <span v-if="scope.row.Config.IsRecord == 0" style="color: yellowgreen">已开启</span>
@@ -122,6 +127,7 @@
             <el-table-column
                     prop="Status"
                     label="状态"
+                    sortable
             >
                 <template slot-scope="scope">
                     <span v-if="scope.row.Status == 1" style="color: yellowgreen">正在运行</span>

src/views/white.vue

@@ -13,7 +13,7 @@
                     <el-row :gutter="20">
                         <el-col :span="4">
                             <em>Mac:</em>
-                            <el-input class="macContianer" v-model="panel.detectedmac" placeholder="请输入白名单Mac"></el-input>
+                            <el-input class="macContianer" v-model="panel.detectedmac" placeholder="请输入可信设备Mac"></el-input>
                         </el-col>
                         <el-col :span="4">
                             <em>关键词:</em>
@@ -95,7 +95,7 @@
                     width="120"
             >
                 <template slot-scope="scope">
-                    <el-button size="small" type="primary" @click="remevoWhite(scope.row.Id)">移出白名单</el-button>
+                    <el-button size="small" type="primary" @click="remevoWhite(scope.row.Id)">移出可信设备</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -125,7 +125,7 @@
                 tabs: [
                     {name: '手机信号记录', url: 'phoneSign'},
                     {name: 'WiFi信号记录', url: 'wifiSign'},
-                    {name: '白名单', url: 'white'},
+                    {name: '可信设备', url: 'white'},
                 ],
                 // panel 配置项目
                 panel: {
@@ -262,7 +262,7 @@
             },
             remevoWhite(Id) {
                 let that = this;
-                this.$confirm('此操作将从白名单移出该设备, 是否继续?', '提示', {
+                this.$confirm('此操作将从可信设备移出该设备, 是否继续?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
@@ -277,7 +277,7 @@
                         if (json.Code == 0) {
                             that.$message({
                                 showClose: true,
-                                message: '白名单移出成功！',
+                                message: '可信设备移出成功！',
                                 type: 'success'
                             });
                             that.getTableQuery();

src/views/wirelessStatistics.vue

@@ -78,7 +78,7 @@
                     regionidOptions2: [],
                     levelOptions: [{
                         value: 1,
-                        label: '白名单'
+                        label: '可信设备'
                     }, {
                         value: 2,
                         label: '安全'