Changpeng Duan 4 years ago
parent
commit
76f657ce2a
4 changed files with 23 additions and 66 deletions
  1. 9 9
      src/api/Navs.js
  2. 1 1
      src/components/Detecter.vue
  3. 5 0
      src/components/Navside.vue
  4. 8 56
      src/views/Equip.vue

+ 9 - 9
src/api/Navs.js

@@ -5,7 +5,7 @@ let navs = [{
     "c_level": "1",
     "clmcode": "index",
     "clmname": "系统首页",
-    "clmurl": "",
+    "clmurl": "/",
     "prname": "",
     "en": "1",
     "show": "1",
@@ -36,7 +36,7 @@ let navs = [{
     "c_level": "1",
     "clmcode": "index",
     "clmname": "区域管理",
-    "clmurl": "",
+    "clmurl": "/region",
     "prname": "",
     "en": "1",
     "show": "1",
@@ -67,7 +67,7 @@ let navs = [{
     "c_level": "1",
     "clmcode": "index",
     "clmname": "无线设备管理",
-    "clmurl": "",
+    "clmurl": "/signEquip",
     "prname": "",
     "en": "1",
     "show": "1",
@@ -99,7 +99,7 @@ let navs = [{
         "c_level": "1",
         "clmcode": "index",
         "clmname": "探测设备管理",
-        "clmurl": "",
+        "clmurl": "/equip",
         "prname": "",
         "en": "1",
         "show": "1",
@@ -131,7 +131,7 @@ let navs = [{
         "c_level": "1",
         "clmcode": "index",
         "clmname": "检测记录管理",
-        "clmurl": "",
+        "clmurl": "/record",
         "prname": "",
         "en": "1",
         "show": "1",
@@ -163,7 +163,7 @@ let navs = [{
         "c_level": "1",
         "clmcode": "index",
         "clmname": "扫描策略管理",
-        "clmurl": "",
+        "clmurl": "/tactics",
         "prname": "",
         "en": "1",
         "show": "1",
@@ -194,7 +194,7 @@ let navs = [{
         "c_level": "1",
         "clmcode": "index",
         "clmname": "任务计划管理",
-        "clmurl": "",
+        "clmurl": "/plan",
         "prname": "",
         "en": "1",
         "show": "1",
@@ -225,7 +225,7 @@ let navs = [{
         "c_level": "1",
         "clmcode": "index",
         "clmname": "扫描任务管理",
-        "clmurl": "",
+        "clmurl": "/task",
         "prname": "",
         "en": "1",
         "show": "1",
@@ -256,7 +256,7 @@ let navs = [{
         "c_level": "1",
         "clmcode": "index",
         "clmname": "统计报表",
-        "clmurl": "",
+        "clmurl": "/statistics",
         "prname": "",
         "en": "1",
         "show": "1",

+ 1 - 1
src/components/Detecter.vue

@@ -13,7 +13,7 @@
             <ul>
                 <el-row :gutter="21" justify="space-between">
                     <el-col :span="8" v-for="(detecter,i) in detecterList">
-                        <div :class="[{'detecterItem':true},{'active':loftIndex == i }]" @click="handleSelect(detecter.Id)">
+                        <div :class="[{'detecterItem':true},{'active':loftIndex }]" @click="handleSelect(detecter.Id)">
                             <div class="grid-content bg-purple"> {{detecter.TagName}}</div>
                         </div>
                     </el-col>

+ 5 - 0
src/components/Navside.vue

@@ -24,6 +24,10 @@
                             </el-menu-item>
                         </el-menu-item-group>
                     </el-submenu>
+                    <!--<el-menu-item  :index="nav.clmid" :route="nav.clmurl" v-for="nav in navs">-->
+                        <!--<i :class="nav.icon"></i>-->
+                        <!--<span>{{nav.clmname}}</span>-->
+                    <!--</el-menu-item>-->
                     <el-submenu index="99">
                         <template slot="title">
                             <i class="icon_logout"></i>
@@ -130,6 +134,7 @@
     }
 
     /deep/ .el-menu-item {
+        /*height: 50px!important;*/
         background-color: rgba(255, 255, 255, 0) !important;
     }
 

+ 8 - 56
src/views/Equip.vue

@@ -11,12 +11,12 @@
             <div class="panel-body">
                 <div class=" panel_control">
                     <div class="pline">
-                        <em>设备ID:</em>
+                        <em>标签名:</em>
                         <el-input v-model="panel.tagname" placeholder=""></el-input>
                     </div>
                     <div class="pline">
                         <em>MAC地址:</em>
-                        <el-input v-model="panel.tagname" placeholder=""></el-input>
+                        <el-input v-model="panel.mac" placeholder=""></el-input>
                     </div>
                     <div class="pline">
                         <em>所属区域:</em>
@@ -29,16 +29,6 @@
                             </el-option>
                         </el-select>
                     </div>
-                    <!--<div class="pline">-->
-                        <!--<em>登记时间:</em>-->
-                        <!--<el-date-picker-->
-                                <!--v-model="panel.time1"-->
-                                <!--type="daterange"-->
-                                <!--range-separator="至"-->
-                                <!--start-placeholder="开始日期"-->
-                                <!--end-placeholder="结束日期">-->
-                        <!--</el-date-picker>-->
-                    <!--</div>-->
                     <div class="pline">
                         <el-button size="medium" type="primary" @click="query">查询</el-button>
                     </div>
@@ -51,7 +41,6 @@
             </div>
         </div>
         <el-table
-
                 :data="tableData"
                 is-horizontal-resize
                 :default-sort="{prop: 'date', order: 'descending'}"
@@ -140,31 +129,6 @@
                     <span class="red" v-if="scope.row.Status == 4">已离线</span>
                 </template>
             </el-table-column>
-            <!--<el-table-column-->
-                    <!--prop="WorkMode"-->
-                    <!--label="工作模式"-->
-                    <!--sortable-->
-            <!--&gt;-->
-                <!--<template slot-scope="scope">-->
-                    <!--<span v-if="scope.row.Status == 1">普通</span>-->
-                    <!--<span class="red" v-if="scope.row.Status == 2">演示</span>-->
-                    <!--<span class="yellow" v-if="scope.row.Status == 3">测试</span>-->
-                <!--</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
@@ -212,19 +176,6 @@
                         </label>
                         <el-input v-model="dialog.tagname"></el-input>
                     </el-col>
-                    <!--<el-col :span="12">-->
-                        <!--<label>-->
-                            <!--购买来源-->
-                        <!--</label>-->
-                        <!--<el-input v-model="dialog.purchasesrc"></el-input>-->
-                    <!--</el-col>-->
-                   <!---->
-                    <!--<el-col :span="12">-->
-                        <!--<label>-->
-                            <!--坐标说明-->
-                        <!--</label>-->
-                        <!--<el-input v-model="dialog.coords_memo "></el-input>-->
-                    <!--</el-col>-->
                     <el-col :span="12">
                         <label>
                             备注
@@ -303,6 +254,8 @@
                 ],
                 // panel 配置项目
                 panel: {
+                    mac: '',
+                    tagname: '',
                     usercode: '',
                     username: '',
                     compname: '',
@@ -360,9 +313,6 @@
                     mac: this.panel.mac,//
                     regionId: that.panel.regionId,//
                     name: that.panel.tagname,//标签名
-                    comid: 1,//
-                    start: 1,//
-                    tableMax: 9999,//
                 };
                 let postdata = qs.stringify(param);
                 DetectorList(postdata).then(res => {
@@ -786,7 +736,7 @@
                 this.selectRegionLabel(that.dialog.regionId);
                 let param = {
                     token: localStorage.token,
-                    id : that.dialog.eqId,
+                    id: that.dialog.eqId,
                     mac: that.dialog.mac,
                     comId: 1,
                     regionId: that.dialog.regionId,
@@ -920,7 +870,7 @@
                 });
             },
             filterTime(val, row, column) {
-                return nonTfmtDate(column,10);
+                return nonTfmtDate(column, 10);
             },
             handle(row, column, event) {
                 this.$refs.multipleTable.toggleRowSelection(row);
@@ -1032,9 +982,11 @@
     /deep/ .el-input.is-disabled .el-input__inner {
         background-color: #015B9E;
     }
+
     .red {
         color: red;
     }
+
     .yellow {
         color: #fd0;
     }