signaldigger debug

README.md

@@ -5,12 +5,16 @@
 
 ## todo
 
-01/30
-todo
-2
+2021/02/23 
+
+2. T
+/ScanStrategy/ListDetail
+策略列表带详情 name 模糊查询无效
+3.
 
 
 
+1.首页探测器部分，跳走后自动筛选； √
 <s>
 1.
 /ScheduledTask/Edit

src/Global.js

@@ -414,7 +414,7 @@ AllTypeOption = function () {
 levelOptions = function () {
     let option = [
         {
-            value: 0,
+            value: '',
             label: '全部'
         }, {
             value: 1,

src/api/getApiRes.js

@@ -90,6 +90,12 @@ export function RegionAdd(postdata) {
     return getApiBasic(url, postdata);
 }
 
+// 修改区域
+export function RegionEdit(postdata) {
+    let url = headapi + 'v1/Region/Edit';
+    return getApiBasic(url, postdata);
+}
+
 // 区域详情
 export function RegionDetail(postdata) {
     let url = headapi + 'v1/Region/Detail';

src/components/BigRader.vue

@@ -61,7 +61,7 @@
 <style scoped>
     .BigRader {
         width: 100%;
-        height: 270px;
+        height: 230px;
         overflow: hidden;
         display: block;
     }

src/components/DetcotrRecord.vue

@@ -7,32 +7,14 @@
             <span class="link" @click="link(detctorRs.Url)">
                 more+
             </span>
-            <el-table
-                    :data="tableData"
-                    stripe
-                    :default-sort="{prop: 'date', order: 'descending'}"
-                    style="width: 100%">
-                <el-table-column
-                        prop="DetectorName"
-                        label="探测器"
-                        align="center"
-                >
+            <el-table :data="tableData" stripe :default-sort="{prop: 'date', order: 'descending'}" style="width: 100%"
+                height="140px">
+                <el-table-column prop="DetectorName" label="探测器" align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="WirelessType"
-                        label="类型"
-                        sortable
-                        :formatter="filterWirelessTypeName"
-                >
+                <el-table-column prop="WirelessType" label="类型" sortable :formatter="filterWirelessTypeName">
                 </el-table-column>
-                <el-table-column
-                        prop="UpdateAtMilleSec"
-                        label="时间"
-                        width="160"
-                        align="center"
-                        sortable
-                        :formatter="filterTime"
-                >
+                <el-table-column prop="UpdateAtMilleSec" label="时间" width="160" align="center" sortable
+                    :formatter="filterTime">
                 </el-table-column>
 
             </el-table>
@@ -96,7 +78,7 @@
         },
         methods: {
             link(url) {
-                this.$router.push({path: url, query: {x: 0}});
+                this.$router.push({ path: url, query: { x: 0 } });
             },
             // 设置分页数据
             setPaginations() {
@@ -191,21 +173,26 @@
         color: #6DC1FF;
     }
 
-    .el-table, .el-table__expanded-cell {
+    .el-table,
+    .el-table__expanded-cell {
         background: none;
     }
 
-    /deep/ .el-table th, /deep/ .el-table tr {
+    /deep/ .el-table th,
+    /deep/ .el-table tr {
         background: none;
         color: #6DC1FF;
         border: none;
     }
 
-    /deep/ .el-table td, /deep/ .el-table th.is-leaf {
+    /deep/ .el-table td,
+    /deep/ .el-table th.is-leaf {
         border: none;
     }
 
-    /deep/ .el-button--primary.is-active, /deep/ .el-button--primary:active, /deep/ .el-button--primary {
+    /deep/ .el-button--primary.is-active,
+    /deep/ .el-button--primary:active,
+    /deep/ .el-button--primary {
         background: none;
         border: 1px solid #005EA2;
         color: #6DC1FF;
@@ -217,15 +204,23 @@
         color: #6DC1FF;
     }
 
-    .el-table--border::after, .el-table--group::after, .el-table::before {
+    .el-table--border::after,
+    .el-table--group::after,
+    .el-table::before {
         display: none;
     }
 
-    .el-pagination.is-background .btn-next.disabled, /deep/ .el-pagination.is-background .btn-next:disabled, /deep/ .el-pagination.is-background .btn-prev.disabled, .el-pagination.is-background .btn-prev:disabled, /deep/ .el-pagination.is-background .el-pager li.disabled {
+    .el-pagination.is-background .btn-next.disabled,
+    /deep/ .el-pagination.is-background .btn-next:disabled,
+    /deep/ .el-pagination.is-background .btn-prev.disabled,
+    .el-pagination.is-background .btn-prev:disabled,
+    /deep/ .el-pagination.is-background .el-pager li.disabled {
         color: #6DC1FF;
     }
 
-    /deep/ .el-pagination.is-background .btn-next, /deep/ .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {
+    /deep/ .el-pagination.is-background .btn-next,
+    /deep/ .el-pagination.is-background .btn-prev,
+    .el-pagination.is-background .el-pager li {
         background-color: #061B44;
     }
 
@@ -242,11 +237,11 @@
         color: #6DC1FF;
     }
 
-    /deep/ .el-table--enable-row-hover .el-table__body tr:hover > td {
+    /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td {
         background: rgba(27, 86, 200, 0.77);
     }
 
-    /deep/ .el-table--striped .el-table__body tr.el-table__row--striped:hover > td {
+    /deep/ .el-table--striped .el-table__body tr.el-table__row--striped:hover>td {
         background: rgba(27, 86, 200, 0.77);
     }
 
@@ -316,4 +311,29 @@
         background: #002540;
     }
 
-</style>
+    /* 滚动条 */
+    /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+        /*滚动条整体样式*/
+        width: 5px;
+        /*高宽分别对应横竖滚动条的尺寸*/
+        height: 1px;
+    }
+
+    /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+        border-radius: 10px;
+        -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.2);
+        background: #535353;
+    }
+
+    /deep/ .el-table__body-wrapper::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+        -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.2);
+        border-radius: 10px;
+        background: #6dc2ff67;
+    }
+    /deep/ .el-table .cell {
+        padding: 0;
+        line-height: 12px;
+    }
+</style>

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 }]" @click="handleSelect(detecter.Id)">
+                        <div :class="[{'detecterItem':true},{'active':loftIndex }]" @click="handleSelect(detecter)">
                             <div class="grid-content bg-purple"> {{detecter.TagName}}</div>
                         </div>
                     </el-col>
@@ -35,8 +35,8 @@
         },
         props: ['detecterList'],
         methods: {
-            handleSelect(Id) {
-                this.$router.push({path: '/equip', query: {id: Id}});
+            handleSelect(detecter) {
+                this.$router.push({path: '/equip', query: {id: detecter.Id,name:detecter.TagName}});
             },
         }
     }

src/components/Headside.vue

@@ -6,9 +6,9 @@
                 <i class="dot"></i>
                 <em>检测中</em>
             </div>
-            <div class="fill_left" @click="left_part_hide">
+            <!-- <div class="fill_left" @click="left_part_hide">
                 <img src="../assets/img/headside/fill_left.png" height="14" width="18"/>
-            </div>
+            </div> -->
             <div class="screen">
                 <img src="../assets/img/headside/screen_max.png" v-if="!screen_full" height="18" width="19"
                      @click="full_screen"/>
@@ -569,10 +569,9 @@
     }
 
     .fill_left {
-        position: absolute;
         float: left;
         margin-top: 20px;
-        margin-left: 24%;
+        margin-left: 0%;
         cursor: pointer;
         z-index: 222;
     }

src/components/HistoryRecord.vue

@@ -7,7 +7,7 @@
             <span class="link" @click="link(historyRs.Url)">
                 more+
             </span>
-            <el-table :data="tableData" stripe :default-sort="{prop: 'date', order: 'descending'}" height="150px"
+            <el-table :data="tableData" stripe :default-sort="{prop: 'date', order: 'descending'}" height="140px"
                 style="width: 100%">
                 <el-table-column prop="Oem" label="名称" width="140" align="center">
                     <template slot-scope="scope">
@@ -314,24 +314,28 @@
     }
 
     /* 滚动条 */
-    ..el-table__body-wrapper::-webkit-scrollbar {
+    /deep/ .el-table__body-wrapper::-webkit-scrollbar {
         /*滚动条整体样式*/
-        width: 10px;
+        width: 5px;
         /*高宽分别对应横竖滚动条的尺寸*/
         height: 1px;
     }
 
-    ..el-table__body-wrapper::-webkit-scrollbar-thumb {
+    /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
         /*滚动条里面小方块*/
         border-radius: 10px;
-        -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+        -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.2);
         background: #535353;
     }
 
-    ..el-table__body-wrapper::-webkit-scrollbar-track {
+    /deep/ .el-table__body-wrapper::-webkit-scrollbar-track {
         /*滚动条里面轨道*/
-        -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+        -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.2);
         border-radius: 10px;
-        background: #EDEDED;
+        background: #6dc2ff67;
+    }
+    /deep/ .el-table .cell {
+        padding: 0;
+        line-height: 12px;
     }
 </style>

src/components/RunTimeRecord.vue

@@ -7,57 +7,36 @@
             <span class="link" @click="link(runtimeRs.Url)">
                 more+
             </span>
-            <el-table
-                    :data="tableData"
-                    stripe
-                    :default-sort="{prop: 'date', order: 'descending'}"
-                    style="width: 100%">
-                <el-table-column
-                        prop="ComName"
-                        label="品牌"
-                        width="140"
-                        align="center"
-                >
+            <el-table :data="tableData" stripe :default-sort="{prop: 'date', order: 'descending'}" height="140px"
+                style="width: 100%">
+                <el-table-column prop="ComName" label="品牌" width="140" align="center">
                     <template slot-scope="scope">
                         <el-tooltip class="item" effect="dark" :content="scope.row.ComName" placement="top-start">
                             <span>
-                                    {{ scope.row.ComName.length > 6 ?  scope.row.ComName.substr(0,9)+'...' : scope.row.ComName }}
+                                {{ scope.row.ComName.length > 6 ? scope.row.ComName.substr(0,9)+'...' :
+                                scope.row.ComName }}
                             </span>
                             <span v-if="!scope.row.ComName">未知品牌</span>
                         </el-tooltip>
                     </template>
                 </el-table-column>
-                <el-table-column
-                        prop="DetectorName"
-                        label="探测器"
-                >
+                <el-table-column prop="DetectorName" label="探测器">
                 </el-table-column>
-                <el-table-column
-                        prop="Type"
-                        label="类型"
-                        sortable
-                        :formatter="filterType"
-                >
+                <el-table-column prop="Type" label="类型" sortable :formatter="filterType">
                 </el-table-column>
-                <el-table-column
-                        prop="UpdateAtMilleSec"
-                        label="时间"
-                        width="160"
-                        align="center"
-                        sortable
-                        :formatter="filterTime"
-                >
+                <el-table-column prop="UpdateAtMilleSec" label="时间" width="160" align="center" sortable
+                    :formatter="filterTime">
                 </el-table-column>
 
             </el-table>
             <!--<div v-show="allTableData.length != 0">-->
-                <!--<el-pagination-->
-                        <!--background-->
-                        <!--layout="prev, pager, next"-->
-                        <!--:total="pageination.total"-->
-                        <!--:page-size="pageination.pageItem"-->
-                        <!--@current-change="pageChange"-->
-                <!--&gt;</el-pagination>-->
+            <!--<el-pagination-->
+            <!--background-->
+            <!--layout="prev, pager, next"-->
+            <!--:total="pageination.total"-->
+            <!--:page-size="pageination.pageItem"-->
+            <!--@current-change="pageChange"-->
+            <!--&gt;</el-pagination>-->
             <!--</div>-->
         </div>
     </div>
@@ -70,7 +49,7 @@
         data() {
             return {
                 pageination: {
-                    pageItem: 2,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 30,
                     pageIndex: 1,
@@ -109,7 +88,7 @@
         },
         methods: {
             link(url) {
-                this.$router.push({path: url, query: {x: 0}});
+                this.$router.push({ path: url, query: { x: 0 } });
             },
             // 设置分页数据
             setPaginations() {
@@ -204,21 +183,26 @@
         color: #6DC1FF;
     }
 
-    .el-table, .el-table__expanded-cell {
+    .el-table,
+    .el-table__expanded-cell {
         background: none;
     }
 
-    /deep/ .el-table th, /deep/ .el-table tr {
+    /deep/ .el-table th,
+    /deep/ .el-table tr {
         background: none;
         color: #6DC1FF;
         border: none;
     }
 
-    /deep/ .el-table td, /deep/ .el-table th.is-leaf {
+    /deep/ .el-table td,
+    /deep/ .el-table th.is-leaf {
         border: none;
     }
 
-    /deep/ .el-button--primary.is-active, /deep/ .el-button--primary:active, /deep/ .el-button--primary {
+    /deep/ .el-button--primary.is-active,
+    /deep/ .el-button--primary:active,
+    /deep/ .el-button--primary {
         background: none;
         border: 1px solid #005EA2;
         color: #6DC1FF;
@@ -230,15 +214,23 @@
         color: #6DC1FF;
     }
 
-    .el-table--border::after, .el-table--group::after, .el-table::before {
+    .el-table--border::after,
+    .el-table--group::after,
+    .el-table::before {
         display: none;
     }
 
-    .el-pagination.is-background .btn-next.disabled, /deep/ .el-pagination.is-background .btn-next:disabled, /deep/ .el-pagination.is-background .btn-prev.disabled, .el-pagination.is-background .btn-prev:disabled, /deep/ .el-pagination.is-background .el-pager li.disabled {
+    .el-pagination.is-background .btn-next.disabled,
+    /deep/ .el-pagination.is-background .btn-next:disabled,
+    /deep/ .el-pagination.is-background .btn-prev.disabled,
+    .el-pagination.is-background .btn-prev:disabled,
+    /deep/ .el-pagination.is-background .el-pager li.disabled {
         color: #6DC1FF;
     }
 
-    /deep/ .el-pagination.is-background .btn-next, /deep/ .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {
+    /deep/ .el-pagination.is-background .btn-next,
+    /deep/ .el-pagination.is-background .btn-prev,
+    .el-pagination.is-background .el-pager li {
         background-color: #061B44;
     }
 
@@ -255,11 +247,11 @@
         color: #6DC1FF;
     }
 
-    /deep/ .el-table--enable-row-hover .el-table__body tr:hover > td {
+    /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td {
         background: rgba(27, 86, 200, 0.77);
     }
 
-    /deep/ .el-table--striped .el-table__body tr.el-table__row--striped:hover > td {
+    /deep/ .el-table--striped .el-table__body tr.el-table__row--striped:hover>td {
         background: rgba(27, 86, 200, 0.77);
     }
 
@@ -329,4 +321,29 @@
         background: #002540;
     }
 
-</style>
+    /* 滚动条 */
+    /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+        /*滚动条整体样式*/
+        width: 5px;
+        /*高宽分别对应横竖滚动条的尺寸*/
+        height: 1px;
+    }
+
+    /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+        border-radius: 10px;
+        -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.2);
+        background: #535353;
+    }
+
+    /deep/ .el-table__body-wrapper::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+        -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.2);
+        border-radius: 10px;
+        background: #6dc2ff67;
+    }
+    /deep/ .el-table .cell {
+        padding: 0;
+        line-height: 12px;
+    }
+</style>

src/components/signMap.vue

@@ -3,14 +3,17 @@
         <div class="sum-title">
             {{signList.title}}
         </div>
+        <div class="fill_left" @click="left_part_hide">
+            <img src="../assets/img/headside/fill_left.png" height="14" width="18" />
+        </div>
         <div class="compass">
-            <img src="../assets/img/main/compass.png" height="30" width="30"/>
+            <img src="../assets/img/main/compass.png" height="30" width="30" />
         </div>
         <div class="screen">
             <img src="../assets/img/headside/screen_max.png" v-if="!screen_full" height="18" width="19"
-                 @click="full_screen"/>
+                @click="full_screen" />
             <img src="../assets/img/headside/screen_min.png" v-if="screen_full" height="18" width="19"
-                 @click="cancle_screen"/>
+                @click="cancle_screen" />
         </div>
         <div :class="[{'signMapList':true},{'full_state':full_state}]">
             <div class="tips" v-if="scanState == 1">
@@ -31,53 +34,34 @@
             <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 == 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"
-                                      v-if="s.WirelessType == 2"/>
-                                 <img src="../assets/img/signMap/dxcdma.png" height="54" width="54"
-                                      v-if="s.WirelessType == 3"/>
-                                 <img src="../assets/img/signMap/yd3g.png" height="54" width="54"
-                                      v-if="s.WirelessType == 4"/>
-                                 <img src="../assets/img/signMap/lt3g.png" height="54" width="54"
-                                      v-if="s.WirelessType == 5"/>
-                                 <img src="../assets/img/signMap/yd4g.png" height="54" width="54"
-                                      v-if="s.WirelessType == 6"/>
-                                 <img src="../assets/img/signMap/lt4g.png" height="54" width="54"
-                                      v-if="s.WirelessType == 7"/>
-                                 <img src="../assets/img/signMap/dx4g.png" height="54" width="54"
-                                      v-if="s.WirelessType == 8"/>
-                                 <img src="../assets/img/signMap/433M.png" height="54" width="54"
-                                      v-if="s.WirelessType == 9"/>
-                                 <img src="../assets/img/signMap/wifi.png" height="54" width="54"
-                                      v-if="s.WirelessType == 10"/>
-                                 <img src="../assets/img/signMap/ism.png" height="54" width="54"
-                                      v-if="s.WirelessType == 11"/>
-                                 <img src="../assets/img/signMap/800M.png" height="54" width="54"
-                                      v-if="s.WirelessType == 12"/>
-                                <img src="../assets/img/main/unknow.png" height="54" width="54"
-                                     v-if="s.WirelessType == 20"/>
-                                <img src="../assets/img/main/cam.png" height="54" width="54"
-                                     v-if="s.WirelessType == 21"/>
-                                <img src="../assets/img/main/unknow_w.png" height="54" width="54"
-                                     v-if="s.WirelessType == 22"/>
-                                <img src="../assets/img/main/phone.png" height="54" width="54"
-                                     v-if="s.WirelessType == 23"/>
-                                <img src="../assets/img/main/wifi_w.png" height="54" width="54"
-                                     v-if="s.WirelessType == 24"/>
-                             </em>
-                                <s :class="[
+            <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 == 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" v-if="s.WirelessType == 2" />
+                        <img src="../assets/img/signMap/dxcdma.png" height="54" width="54" v-if="s.WirelessType == 3" />
+                        <img src="../assets/img/signMap/yd3g.png" height="54" width="54" v-if="s.WirelessType == 4" />
+                        <img src="../assets/img/signMap/lt3g.png" height="54" width="54" v-if="s.WirelessType == 5" />
+                        <img src="../assets/img/signMap/yd4g.png" height="54" width="54" v-if="s.WirelessType == 6" />
+                        <img src="../assets/img/signMap/lt4g.png" height="54" width="54" v-if="s.WirelessType == 7" />
+                        <img src="../assets/img/signMap/dx4g.png" height="54" width="54" v-if="s.WirelessType == 8" />
+                        <img src="../assets/img/signMap/433M.png" height="54" width="54" v-if="s.WirelessType == 9" />
+                        <img src="../assets/img/signMap/wifi.png" height="54" width="54" v-if="s.WirelessType == 10" />
+                        <img src="../assets/img/signMap/ism.png" height="54" width="54" v-if="s.WirelessType == 11" />
+                        <img src="../assets/img/signMap/800M.png" height="54" width="54" v-if="s.WirelessType == 12" />
+                        <img src="../assets/img/main/unknow.png" height="54" width="54" v-if="s.WirelessType == 20" />
+                        <img src="../assets/img/main/cam.png" height="54" width="54" v-if="s.WirelessType == 21" />
+                        <img src="../assets/img/main/unknow_w.png" height="54" width="54" v-if="s.WirelessType == 22" />
+                        <img src="../assets/img/main/phone.png" height="54" width="54" v-if="s.WirelessType == 23" />
+                        <img src="../assets/img/main/wifi_w.png" height="54" width="54" v-if="s.WirelessType == 24" />
+                    </em>
+                    <s :class="[
                                 {'yd':s.WirelessType == 1 || s.WirelessType == 4 || s.WirelessType == 6},
                                 {'lt':s.WirelessType == 2 || s.WirelessType == 5 || s.WirelessType == 7},
                                 {'dx':s.WirelessType == 3 || s.WirelessType == 8 },
                                 {'qt':s.WirelessType == 9 || s.WirelessType == 10 || s.WirelessType == 11|| s.WirelessType == 12},
-                                ]"
-                                >{{s.WirelessType | typeName}}</s>
+                                ]">{{s.WirelessType | typeName}}</s>
                 </span>
             </div>
             <div class="right_rule">
@@ -88,15 +72,11 @@
                 <span>0</span>
                 <span v-for="i in XMax" v-if="i % xLimit == 0">{{i}}</span>
             </div>
-            <el-dialog
-                    title="提示"
-                    :visible.sync="dialogVisible"
-                    width="30%"
-            >
+            <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
                 <span>{{dialogText}}</span>
                 <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible = false" size="mini" type="primary">关闭</el-button>
-  </span>
+                    <el-button @click="dialogVisible = false" size="mini" type="primary">关闭</el-button>
+                </span>
             </el-dialog>
         </div>
     </div>
@@ -110,7 +90,7 @@
                 screen_full: false,
                 checked: true,
                 full_state: false,
-                scanState:1,
+                scanState: 1,
                 scan: {},
                 XMax: 56,
                 YMax: 56,
@@ -161,6 +141,9 @@
             },
         },
         methods: {
+            left_part_hide(){
+                this.$store.dispatch('status/addCount')
+            },
             // 全屏
             full_screen() {
                 let that = this;
@@ -334,7 +317,7 @@
         color: #fff;
     }
 
-    .signMapListBg > span {
+    .signMapListBg>span {
         position: absolute;
         float: left;
         overflow: hidden;
@@ -391,6 +374,7 @@
         0% {
             opacity: 0.5;
         }
+
         100% {
             opacity: 1;
         }
@@ -400,10 +384,20 @@
         0% {
             opacity: 0.5;
         }
+
         100% {
             opacity: 1;
         }
     }
 
-
-</style>
+    .fill_left {
+        float: left;
+        margin-top: 0px;
+        margin-left: 10px;
+        cursor: pointer;
+        z-index: 222;
+        position: relative;
+        top: -10px;
+        float: left;
+    }
+</style>

src/views/Equip.vue

@@ -21,11 +21,8 @@
                     <div class="pline">
                         <em>所属区域:</em>
                         <el-select v-model="panel.regionid">
-                            <el-option
-                                    v-for="item in panel.regionidOptions"
-                                    :key="item.Id"
-                                    :label="item.Name"
-                                    :value="item.Id">
+                            <el-option v-for="item in panel.regionidOptions" :key="item.Id" :label="item.Name"
+                                :value="item.Id">
                             </el-option>
                         </el-select>
                     </div>
@@ -40,87 +37,38 @@
                 </div>
             </div>
         </div>
-        <el-table
-                :data="tableData"
-                is-horizontal-resize
-                :default-sort="{prop: 'date', order: 'descending'}"
-                v-loading="loading"
-                element-loading-background="rgba(0, 0, 0, 0.8)"
-                class=""
-                @selection-change="handleSelectionChange"
-                stripe
-                ref="multipleTable"
-                @row-click="handle"
-        >
-            <el-table-column
-                    type="selection"
-                    width="55">
+        <el-table :data="tableData" is-horizontal-resize :default-sort="{prop: 'date', order: 'descending'}"
+            v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class=""
+            @selection-change="handleSelectionChange" stripe ref="multipleTable" @row-click="handle">
+            <el-table-column type="selection" width="55">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    label="序号"
-                    width="60"
-                    sortable
-            >
+            <el-table-column type="index" label="序号" width="60" sortable>
             </el-table-column>
-            <el-table-column
-                    prop="Mac"
-                    label="Mac"
-            >
+            <el-table-column prop="Mac" label="Mac">
             </el-table-column>
-            <el-table-column
-                    prop="TagName"
-                    label="标签名"
-            >
+            <el-table-column prop="TagName" label="标签名">
             </el-table-column>
-            <el-table-column
-                    prop="RegionName"
-                    label="区域名称"
-            >
+            <el-table-column prop="RegionName" label="区域名称">
                 <template slot-scope="scope">
                     <el-tooltip class="item" effect="dark" :content="scope.row.RegionName" placement="top-start">
-                            <span>
-                                    {{ scope.row.RegionName.length > 22 ?  scope.row.RegionName.substr(0,22)+'...' : scope.row.RegionName }}
-                            </span>
+                        <span>
+                            {{ scope.row.RegionName.length > 22 ? scope.row.RegionName.substr(0,22)+'...' :
+                            scope.row.RegionName }}
+                        </span>
                     </el-tooltip>
                 </template>
             </el-table-column>
-            <el-table-column
-                    prop="FirmwareVersion"
-                    label="软件版本"
-                    sortable
-            >
+            <el-table-column prop="FirmwareVersion" label="软件版本" sortable>
             </el-table-column>
-            <el-table-column
-                    prop="HardwareVersion"
-                    label="硬件版本"
-                    sortable
-            >
+            <el-table-column prop="HardwareVersion" label="硬件版本" sortable>
             </el-table-column>
-            <el-table-column
-                    prop="StatusChangeTime"
-                    label="登机时间"
-                    sortable
-                    :formatter="filterTime"
-            >
+            <el-table-column prop="StatusChangeTime" label="登机时间" sortable :formatter="filterTime">
             </el-table-column>
-            <el-table-column
-                    prop="StatusChangeTime"
-                    label="最后上报时间"
-                    sortable
-                    :formatter="filterTime"
-            >
+            <el-table-column prop="StatusChangeTime" label="最后上报时间" sortable :formatter="filterTime">
             </el-table-column>
-            <el-table-column
-                    prop="Memo"
-                    label="备注"
-            >
+            <el-table-column prop="Memo" label="备注">
             </el-table-column>
-            <el-table-column
-                    prop="Status"
-                    label="状态"
-                    sortable
-            >
+            <el-table-column prop="Status" label="状态" sortable>
                 <template slot-scope="scope">
                     <span class="red" v-if="scope.row.Status == 0">已禁用</span>
                     <span v-if="scope.row.Status == 1">已启用</span>
@@ -131,42 +79,29 @@
             </el-table-column>
         </el-table>
         <br>
-        <el-pagination
-                background
-                :total="pageination.total"
-                :page-size="pageination.pageItem"
-                @current-change="pageChange"
-        ></el-pagination>
+        <el-pagination background :total="pageination.total" :page-size="pageination.pageItem"
+            @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"
-                :large="true"
-                @dialog_cancel="dialog_cancel"
-                @dialog_ok="dialog_ok"
-        >
+        <dialog_referrer_list :show="dialog_state" :title="dialog_title" :large="true" @dialog_cancel="dialog_cancel"
+            @dialog_ok="dialog_ok">
             <div class="dialogContent">
                 <el-row :gutter="24">
                     <el-col :span="12">
                         <label>
                             MAC地址*
                         </label>
-                        <el-input v-model="dialog.mac" @keyup.native="autoCompleteMac"
-                                  :disabled="dialog_type == 2"></el-input>
+                        <el-input v-model="dialog.mac" @keyup.native="autoCompleteMac" :disabled="dialog_type == 2">
+                        </el-input>
                     </el-col>
                     <el-col :span="12">
                         <label>
                             设备所属区域
                         </label>
                         <el-select class="selectStyle" ref="regionlevelOne" v-model="dialog.regionId"
-                                   placeholder="请选择所属区域">
-                            <el-option
-                                    v-for="item in dialog.regionlevelOneIdOptions"
-                                    :key="item.Id"
-                                    :label="item.Name"
-                                    :value="item.Id"
-                            >
+                            placeholder="请选择所属区域">
+                            <el-option v-for="item in dialog.regionlevelOneIdOptions" :key="item.Id" :label="item.Name"
+                                :value="item.Id">
                             </el-option>
                         </el-select>
                     </el-col>
@@ -191,7 +126,7 @@
                             <img src="../assets/img/main/grid.png" alt="">
                             <div class="pointers" @click="addPoint">
                                 <i v-for="point in dialog.points"
-                                   :style="{left:point.x*1+'px',top:point.y * 1+'px'}"></i>
+                                    :style="{left:point.x*1+'px',top:point.y * 1+'px'}"></i>
                             </div>
                         </div>
                     </el-col>
@@ -229,7 +164,7 @@
                     mac: '',
                     comId: 1,
                     regionlevelOneId: 0,
-                    regionId: 0,
+                    regionId: '',
                     tagname: '',
                     longitude: 0,
                     latitude: 0,
@@ -244,13 +179,13 @@
                     plateImgSrc: '',
                     regionlevelOneIdOptions: [],
                     regionIdRoomOptions: [],
-                    points: [],
+                    points: [{ x: 0, y: 0 }],
                     CoordsId: 0,
                     status: 0,
                 },
                 tabIndex: 0,
                 tabs: [
-                    {name: '探测设备管理', url: 'equip'},
+                    { name: '探测设备管理', url: 'equip' },
                 ],
                 // panel 配置项目
                 panel: {
@@ -262,14 +197,14 @@
                     keyword: '',
                     USERCODE: '',
                     taskstatus: 99,
-                    regionid: 0,
+                    regionid: '',
                     regionid2: '',
                     regionidOptions: [],
                     regionidOptions2: [],
                     options: [
-                        {value: 99, label: '全部'},
-                        {value: 1, label: '进行中'},
-                        {value: 2, label: '已完成'},
+                        { value: 99, label: '全部' },
+                        { value: 1, label: '进行中' },
+                        { value: 2, label: '已完成' },
                     ],
                     time1: globalBt3(2),
                 },
@@ -293,13 +228,23 @@
             }
         },
         mounted() {
-            if (this.$route.query.RegionId) {
+            if (this.$route.query.name) {
                 this.panel.regionid = this.$route.query.RegionId;
-                this.panel.tagname = this.$route.query.TagName;
+                this.panel.tagname = this.$route.query.name;
             }
-
             this.getTableQuery();
         },
+        watch: {
+            $route(to) {
+                if (to.name == 'Equip') {
+                    if (this.$route.query.name) {
+                        this.panel.regionid = this.$route.query.RegionId;
+                        this.panel.tagname = this.$route.query.name;
+                    }
+                    this.getTableQuery();
+                }
+            },
+        },
         methods: {
             // 页面数据查询
             getTableQuery() {
@@ -311,7 +256,7 @@
                 let param = {
                     token: localStorage.token,
                     mac: this.panel.mac,//
-                    regionId: that.panel.regionId,//
+                    regionId: that.panel.regionid,//
                     name: that.panel.tagname,//标签名
                 };
                 let postdata = qs.stringify(param);
@@ -349,7 +294,7 @@
                             return false
                         }
                         that.panel.regionidOptions = json.Rs;
-                        that.panel.regionidOptions.unshift({Id: 0, Name: "全部", DisplayName: "全部"});
+                        that.panel.regionidOptions.unshift({ Id: '', Name: "全部", DisplayName: "全部" });
                     } else {
                         that.$message.error(json.Memo + '，错误代码：' + json.Code);
                     }
@@ -406,7 +351,7 @@
             },
             // 跳转tab页面
             goTab(url) {
-                this.$router.push({path: url});
+                this.$router.push({ path: url });
             },
             // 查询按钮
             query() {
@@ -482,7 +427,7 @@
                 this.dialog.purchasesrc = '';
                 this.dialog.memo = '';
                 this.dialog.coords_memo = '';
-                this.dialog.points = [{}];
+                this.dialog.points = [{x:0,y:0}];
 
                 // 加载默认的平面图
                 // this.dialogGetGetChildRegionSelect(0, 1);
@@ -578,7 +523,7 @@
                 // 重载地区列表
                 this.getGeFullRegionSelect();
 
-                that.dialog.points = [{x: row.X, y: row.Y}];
+                that.dialog.points = [{ x: row.X, y: row.Y }];
 
                 // let param = {
                 //     token: localStorage.token,
@@ -618,11 +563,11 @@
                 this.$router.push({
                     path: '/phoneSign',
                     query:
-                        {
-                            detectorid: row.Id,
-                            comId: 1,
-                            regionId: row.RegionId,
-                        }
+                    {
+                        detectorid: row.Id,
+                        comId: 1,
+                        regionId: row.RegionId,
+                    }
                 });
             },
             // 探测记录
@@ -630,11 +575,11 @@
                 this.$router.push({
                     path: '/wifiSign',
                     query:
-                        {
-                            detectorid: row.Id,
-                            comId: 1,
-                            regionId: row.RegionId,
-                        }
+                    {
+                        detectorid: row.Id,
+                        comId: 1,
+                        regionId: row.RegionId,
+                    }
                 });
             },
             dialog_cancel() {
@@ -855,7 +800,7 @@
             addPoint(e) {
                 let x = e.offsetX;
                 let y = e.offsetY;
-                this.dialog.points = [{x: x, y: y}];
+                this.dialog.points = [{ x: x, y: y }];
             },
             // 获取位置的文字内容
             selectRegionLabel(id) {
@@ -876,16 +821,7 @@
                 this.$refs.multipleTable.toggleRowSelection(row);
             }
         },
-        watch: {
-            // 'dialog.regionlevelOneId': function (val) {
-            //     this.dialogGetGetChildRegionSelect(val, 2)
-            // },
-            'dialog.regionId': function (val) {
-                if (val) {
-                    this.getRegionPictureGetByRegionId(val);
-                }
-            },
-        },
+
         components: {
             dialog_referrer_list
         }
@@ -990,4 +926,4 @@
     .yellow {
         color: #fd0;
     }
-</style>
+</style>

src/views/Main.vue

@@ -12,7 +12,7 @@
             </div>
             <div class="cube">
                 <Task :task-info="taskInfo" :task-result="taskResult" @GetScanClick="ClickGetScan"
-                      @stopScan="clickStopScan"></Task>
+                    @stopScan="clickStopScan"></Task>
             </div>
         </div>
         <div :class="[{'md':true},{'bigMd':!showLeft}]">
@@ -85,7 +85,7 @@
         WirelessStart,
         WirelessStop,
     } from '../api/getApiRes.js'
-    import {mapGetters, mapActions, mapState} from "vuex";
+    import { mapGetters, mapActions, mapState } from "vuex";
     import Global from "../Global"
 
     let qs = require('qs');
@@ -212,8 +212,15 @@
                         that.detectorList = json.Rs
                     } else {
                         that.detectorList = [];
-                        that.$message.error(json.Memo);
+                        if (json.Code == 1010) {
+                            localStorage.clear();
+                            that.$router.push({path: '/login'});
+                            return false
+                        } else {
+                            that.$message.error(json.Memo);
+                        }
                     }
+
                 })
             },
             // Wifi柱状图信息传入探测器Id
@@ -280,7 +287,7 @@
                                 message: '区域扫描已停止！',
                                 type: 'success'
                             });
-                            this.ClickGetInfo(that.CurrentRegionId, this.selectName )
+                            this.ClickGetInfo(that.CurrentRegionId, this.selectName)
 
                         } else {
                             that.$message.error(json.Memo + '，错误代码：' + json.Code);
@@ -532,25 +539,30 @@
         color: #6DC1FF;
     }
 
-    .el-table th, .el-table tr {
+    .el-table th,
+    .el-table tr {
         background-color: #061B44;
         color: #6DC1FF;
     }
 
-    /deep/ .el-table th, /deep/ .el-table tr {
+    /deep/ .el-table th,
+    /deep/ .el-table tr {
         background-color: #061B44;
         color: #6DC1FF;
     }
 
-    /deep/ .el-table td, /deep/ .el-table th.is-leaf {
+    /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 {
+    /deep/ .el-table--border::after,
+    /deep/ .el-table--group::after,
+    /deep/ .el-table::before {
         background-color: #061B44;
     }
 
     /deep/ .el-dialog__title {
         color: #6DC1FF;
     }
-</style>
+</style>

src/views/Record.vue

@@ -147,14 +147,14 @@
             >
             </el-table-column>
             <el-table-column
-                    prop="安全等级"
-                    label="Level"
+                    prop="Level"
+                    label="安全等级"
                     sortable
             >
                 <template slot-scope="scope">
                     <span v-if="scope.row.Level == 1">安全</span>
                     <span v-if="scope.row.Level == 2" class="yellow">可疑</span>
-                    <span v-if="scope.row.Level == 3" class="red">危险</span>
+                    <span v-if="scope.row.Level == 3" class="red">可疑</span>
                     <span v-if="scope.row.Level == 4" class="red">危险</span>
                 </template>
             </el-table-column>
@@ -256,13 +256,14 @@
                 let et = parseInt(new Date(that.panel.time1[1]).getTime() / 1000);
                 let param = {
                     token: localStorage.token,
+                    detectorId:this.panel.detectorId,//
                     mac: this.panel.mac,//
                     deviceType: that.panel.deviceType,//
                     level: that.panel.level,//标签名
                     bt: bt,//
                     et: et,//
-                    offset: this.start,
                     limit: this.start + 100,//
+                    offset: this.start,
                 };
                 let postdata = qs.stringify(param);
                 DetectorLogQuery(postdata).then(res => {
@@ -298,7 +299,7 @@
                             return false
                         }
                         that.panel.detectorIdOptions = json.Rs;
-                        that.panel.detectorIdOptions.unshift({Id: 0, TagName: "全部", DisplayName: "全部"});
+                        that.panel.detectorIdOptions.unshift({Id: '', TagName: "全部", DisplayName: "全部"});
                     } else {
                         that.$message.error(json.Memo + '，错误代码：' + json.Code);
                     }
@@ -364,16 +365,6 @@
                 return filterAllType(column);
             },
         },
-        watch: {
-            // 'dialog.regionlevelOneId': function (val) {
-            //     this.dialogGetGetChildRegionSelect(val, 2)
-            // },
-            'dialog.regionId': function (val) {
-                if (val) {
-                    this.getRegionPictureGetByRegionId(val);
-                }
-            },
-        },
     }
 </script>
 

src/views/Region.vue

@@ -21,95 +21,31 @@
                 </div>
             </div>
         </div>
-        <el-table
-                :data="tableData"
-                is-horizontal-resize
-                :default-sort="{prop: 'date', order: 'descending'}"
-                v-loading="loading"
-                element-loading-background="rgba(0, 0, 0, 0.8)"
-                class=""
-                @selection-change="handleSelectionChange"
-                stripe
-                ref="multipleTable"
-                @row-click="handle"
-        >
-            <el-table-column
-                    type="selection"
-                    width="55">
+        <el-table :data="tableData" is-horizontal-resize :default-sort="{prop: 'date', order: 'descending'}"
+            v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class=""
+            @selection-change="handleSelectionChange" stripe ref="multipleTable" @row-click="handle">
+            <el-table-column type="selection" width="55">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    label="序号"
-                    width="60"
-                    sortable
-            >
+            <el-table-column type="index" label="序号" width="60" sortable>
             </el-table-column>
-            <el-table-column
-                    prop="Name"
-                    label="区域名称"
-            >
+            <el-table-column prop="Name" label="区域名称">
             </el-table-column>
-            <el-table-column
-                    prop="Description"
-                    label="描述"
-            >
+            <el-table-column prop="Description" label="描述">
             </el-table-column>
-            <el-table-column
-                    prop="X"
-                    label="长/m"
-                    sortable
-            >
+            <el-table-column prop="X" label="长/m" sortable>
             </el-table-column>
-            <el-table-column
-                    prop="Y"
-                    label="宽/m"
-                    sortable
-            >
+            <el-table-column prop="Y" label="宽/m" sortable>
             </el-table-column>
-            <el-table-column
-                    prop="CreateTime"
-                    label="添加时间"
-                    :formatter="filterTime"
-                    sortable
-            >
+            <el-table-column prop="CreateTime" label="添加时间" :formatter="filterTime" sortable>
             </el-table-column>
-            <!--<el-table-column-->
-            <!--prop="Status"-->
-            <!--label="状态"-->
-            <!--&gt;-->
-            <!--</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;-->
-            <!--&lt;!&ndash;<el-button class="" type="primary" size="small" @click="goWifiRecord(scope.row)">监测记录</el-button>&ndash;&gt;-->
-            <!--&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
-                background
-                :total="pageination.total"
-                :page-size="pageination.pageItem"
-                @current-change="pageChange"
-        ></el-pagination>
+        <el-pagination background :total="pageination.total" :page-size="pageination.pageItem"
+            @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"
-                :large="true"
-                @dialog_cancel="dialog_cancel"
-                @dialog_ok="dialog_ok"
-        >
+        <dialog_referrer_list :show="dialog_state" :title="dialog_title" :large="true" @dialog_cancel="dialog_cancel"
+            @dialog_ok="dialog_ok">
             <div class="dialogContent">
                 <el-row :gutter="24">
                     <el-col :span="24">
@@ -159,6 +95,7 @@
         RegionListDetail,
         RegionDelete,
         RegionAdd,
+        RegionEdit,
     } from '../api/getApiRes.js'
 
     let qs = require('qs');
@@ -179,7 +116,7 @@
                 },
                 tabIndex: 0,
                 tabs: [
-                    {name: '监控区域管理', url: 'equip'},
+                    { name: '监控区域管理', url: 'equip' },
                 ],
                 // panel 配置项目
                 panel: {
@@ -194,9 +131,9 @@
                     regionidOptions: [],
                     regionidOptions2: [],
                     options: [
-                        {value: 99, label: '全部'},
-                        {value: 1, label: '进行中'},
-                        {value: 2, label: '已完成'},
+                        { value: 99, label: '全部' },
+                        { value: 1, label: '进行中' },
+                        { value: 2, label: '已完成' },
                     ],
                     time1: globalBt3(2),
                 },
@@ -277,7 +214,7 @@
                             return false
                         }
                         that.panel.regionidOptions = json.Rs;
-                        that.panel.regionidOptions.unshift({Id: 0, Name: "全部", DisplayName: "全部"});
+                        that.panel.regionidOptions.unshift({ Id: 0, Name: "全部", DisplayName: "全部" });
                     } else {
                         that.$message.error(json.Memo + '，错误代码：' + json.Code);
                     }
@@ -334,7 +271,7 @@
             },
             // 跳转tab页面
             goTab(url) {
-                this.$router.push({path: url});
+                this.$router.push({ path: url });
             },
             // 查询按钮
             query() {
@@ -477,7 +414,13 @@
 
                 // 读取本条记录
                 let row = this.multipleSelection[0];
+                console.log(row);
+
                 this.dialog.eqId = row.Id;
+                this.dialog.name = row.Name;
+                this.dialog.x = row.X;
+                this.dialog.y = row.Y;
+                this.dialog.description = row.Description;
                 this.dialog.mac = row.Mac;
                 this.dialog.regionId = row.RegionId;
                 this.dialog.tagname = row.TagName;
@@ -495,7 +438,7 @@
                 // 重载地区列表
                 this.getGeFullRegionSelect();
 
-                that.dialog.points = [{x: row.X, y: row.Y}];
+                that.dialog.points = [{ x: row.X, y: row.Y }];
 
                 // let param = {
                 //     token: localStorage.token,
@@ -535,11 +478,11 @@
                 this.$router.push({
                     path: '/phoneSign',
                     query:
-                        {
-                            detectorid: row.Id,
-                            comId: 1,
-                            regionId: row.RegionId,
-                        }
+                    {
+                        detectorid: row.Id,
+                        comId: 1,
+                        regionId: row.RegionId,
+                    }
                 });
             },
             // 探测记录
@@ -547,11 +490,11 @@
                 this.$router.push({
                     path: '/wifiSign',
                     query:
-                        {
-                            detectorid: row.Id,
-                            comId: 1,
-                            regionId: row.RegionId,
-                        }
+                    {
+                        detectorid: row.Id,
+                        comId: 1,
+                        regionId: row.RegionId,
+                    }
                 });
             },
             dialog_cancel() {
@@ -614,44 +557,42 @@
             confirmEditEquip() {
                 let that = this;
                 // checkVal
-                if (!that.dialog.tagname) {
-                    this.$message.error('错了哦，标签名不能为空');
+                // checkVal
+                if (!that.dialog.name) {
+                    this.$message.error('错了哦，区域名称不能为空');
                     return false
                 }
-                if (that.dialog.tagname.length > 20) {
-                    this.$message.error('错了哦，标签名不能超过20个字符');
+                if (that.dialog.name.length > 8) {
+                    this.$message.error('错了哦，标签名不能超过8个字符');
                     return false
                 }
-                this.selectRegionLabel(that.dialog.regionId);
+                if (that.dialog.memo) {
+                    if (that.dialog.memo.length > 20) {
+                        this.$message.error('错了哦，描述不能超过20个字符');
+                        return false
+                    }
+                }
+                // this.selectRegionLabel(that.dialog.regionId);
                 let param = {
                     token: localStorage.token,
                     id: that.dialog.eqId,
                     mac: that.dialog.mac,
                     comId: 1,
                     regionId: that.dialog.regionId,
-                    name: that.dialog.tagname,
-                    HardwareVersion: that.dialog.HardwareVersion,
-                    FirmwareVersion: that.dialog.FirmwareVersion,
-                    FirmwareScanM4Version: that.dialog.FirmwareScanM4Version,
-                    FirmwareScanM0Version: that.dialog.FirmwareScanM0Version,
-                    location: that.dialog.location,
-                    purchasesrc: that.dialog.purchasesrc,
-                    x: that.dialog.points[0].x,
-                    y: that.dialog.points[0].y,
-                    coords_memo: that.dialog.coords_memo,
-                    memo: that.dialog.memo,
-                    coordsType: 1,//坐标状态 0：禁用， 1：启用， 9：删除，没有就传0
-                    coordsID: that.dialog.CoordsId,
+                    name: that.dialog.name,
+                    description: that.dialog.description,
+                    x: that.dialog.x,
+                    y: that.dialog.y,
                     status: that.dialog.status,
                 };
 
                 let postdata = qs.stringify(param);
-                DetectorEdit(postdata).then(res => {
+                RegionEdit(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
                         that.$message({
                             showClose: true,
-                            message: '监控区域添加成功！',
+                            message: '监控区域修改成功！',
                             type: 'success'
                         });
                         // 重载列表
@@ -740,24 +681,24 @@
                     });
                 });
             },
-            // 添加探测器位置的点坐标
-            addPoint(e) {
-                let x = e.offsetX;
-                let y = e.offsetY;
-                this.dialog.points = [{x: x, y: y}];
-            },
+            // // 添加探测器位置的点坐标
+            // addPoint(e) {
+            //     let x = e.offsetX;
+            //     let y = e.offsetY;
+            //     this.dialog.points = [{ x: x, y: y }];
+            // },
             // 获取位置的文字内容
-            selectRegionLabel(id) {
-                let that = this;
-                let selectedWorkName = {};
-                // selectedWorkName = that.dialog.regionIdRoomOptions.filter(item => {
-                selectedWorkName = that.dialog.regionlevelOneIdOptions.filter(item => {
-                    if (item.Id === id) {
-                        console.log(item.Name);
-                        that.dialog.location = item.Name;
-                    }
-                });
-            },
+            // selectRegionLabel(id) {
+            //     let that = this;
+            //     let selectedWorkName = {};
+            //     // selectedWorkName = that.dialog.regionIdRoomOptions.filter(item => {
+            //     selectedWorkName = that.dialog.regionlevelOneIdOptions.filter(item => {
+            //         if (item.Id === id) {
+            //             console.log(item.Name);
+            //             that.dialog.location = item.Name;
+            //         }
+            //     });
+            // },
             filterTime(val, row, column) {
                 return nonTfmtDate(column, 10);
             }
@@ -876,4 +817,4 @@
     .yellow {
         color: #fd0;
     }
-</style>
+</style>

src/views/signEquip.vue

@@ -12,7 +12,7 @@
                 <div class=" panel_control">
                     <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>

src/views/tactics.vue

@@ -234,7 +234,7 @@
                 // 查询检测策略。上级区域id，区域id必传。regionid传0，查询supregionid对应所有子区域的检测策略。 如果supregionid，regionid都传0，默认查询企业ID下所有检测策略
                 let param = {
                     token: localStorage.token,
-                    name: that.panel.tagname,//标签名
+                    name: that.panel.tagname,//策略名称
                 };
                 let postdata = qs.stringify(param);
                 ScanStrategyListDetail(postdata).then(res => {