首页complete

src/components/Task.vue

@@ -202,14 +202,16 @@
             // 扫描开始
             startScan() {
                 let that = this;
-                let freq06G ={};
+                let freq06G =[];
                 let signalList =[];
                 let token = localStorage.token;
                 if(that.scan.begin > 0){
-                    freq06G = {
-                        "begin": that.scan.begin,
-                        "end": that.scan.end
-                    }
+                    freq06G = [
+                        {
+                            begin:parseInt(that.scan.begin),
+                            end: parseInt(that.scan.end)
+                        }
+                    ]
                 }
                 if(that.scan.agreement.length == 0){
                     that.$message({

src/views/Main.vue

@@ -11,7 +11,7 @@
                 <Detecter :detecter-list="detectorList"></Detecter>
             </div>
             <div class="cube">
-                <Task :task-info="taskInfo" :task-result="taskResult"  @GetScanClick="ClickGetScan"></Task>
+                <Task :task-info="taskInfo" :task-result="taskResult" @GetScanClick="ClickGetScan"></Task>
             </div>
         </div>
         <div :class="[{'md':true},{'bigMd':!showLeft}]">
@@ -45,6 +45,16 @@
                 </div>
             </transition>
         </div>
+
+        <el-dialog title="扫描结果" :visible.sync="dialogScanVisible" width="30%">
+            <el-table :data="scanGridData">
+                <el-table-column property="name" label="设备" width="150"></el-table-column>
+                <el-table-column property="state" label="结果" width="200"></el-table-column>
+            </el-table>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="dialogScanVisible = false" size="small" type="primary">关闭</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -81,13 +91,15 @@
     export default {
         data() {
             return {
-                CurrentRegionId:0,
+                CurrentRegionId: 0,
                 WifiRs: {},
                 ScanRs: {},
                 signList: {},
                 totalRs: [],
                 equipRs: [],
+                dialogScanVisible: false,
                 regionList: [],
+                scanGridData: [],
                 detectorList: [],
                 showLeft: true,
                 regionId: '',
@@ -105,8 +117,8 @@
                     Url: 'equip',
                     Rs: [],
                 },
-                taskInfo:{},
-                taskResult:{}
+                taskInfo: {},
+                taskResult: {}
             }
         },
         mounted() {
@@ -207,23 +219,28 @@
                 this.getWirelessStatus(Id);
                 this.getScanStrategyList(Id);
             },
-            ClickGetScan(Rs){
+            ClickGetScan(Rs) {
                 let that = this;
                 Rs.regionId = that.CurrentRegionId;
-                let postdata = qs.stringify(Rs);
-                WirelessStart(postdata).then(res => {
+                let params = Rs;
+                WirelessStart(params).then(res => {
                     let json = res;
                     if (json.Code == 0) {
-                        that.$message({
-                            showClose: true,
-                            message: '开始扫描！',
-                            type: 'success'
-                        });
+                        that.showScanRresult(json.Rs)
                     } else {
                         that.$message.error(json.Memo);
                     }
                 })
             },
+            showScanRresult() {
+                let that = this;
+                let Rs = [
+                    {name: "设备1", state: 1},
+                    {name: "设备2", state: 2},
+                ];
+                that.dialogScanVisible = true;
+                that.scanGridData = Rs;
+            },
             getRegion06G(id) {
                 let that = this;
                 let param = {
@@ -349,10 +366,10 @@
                         this.taskResult = json.Rs;
                     } else {
                         this.taskResult = {
-                            BeginAt:'',
-                            DataSize:'0',
-                            Duration:'',
-                            IsStop:false,
+                            BeginAt: '',
+                            DataSize: '0',
+                            Duration: '',
+                            IsStop: false,
                         };
                         that.$message.error(json.Memo);
                     }
@@ -377,7 +394,7 @@
 
 <style scoped>
     @import "../assets/css/cube.css";
-
+    @import "../assets/css/dialog.css";
     .mainContainer {
         width: 100%;
         overflow: hidden;
@@ -452,4 +469,25 @@
         background-size: 100%;
     }
 
+     .el-table {
+        background-color: #061B44;
+        color: #6DC1FF;
+    }
+     .el-table th,  .el-table tr {
+        background-color: #061B44;
+        color: #6DC1FF;
+    }
+    /deep/ .el-table th,   /deep/ .el-table tr {
+        background-color: #061B44;
+        color: #6DC1FF;
+    }
+    /deep/  .el-table td,  /deep/  .el-table th.is-leaf {
+        border-bottom: 1px solid #061B44;
+    }
+    /deep/ .el-table--border::after,  /deep/ .el-table--group::after,  /deep/ .el-table::before {
+        background-color: #061B44;
+    }
+    /deep/ .el-dialog__title {
+        color: #6DC1FF;
+    }
 </style>