周界防范

src/views/device/guard/index.vue

@@ -38,16 +38,16 @@
           </el-select>
         </div> -->
         <div class="filter-item">
-          设防状态:
+          布防状态:
           <el-select
-            v-model="query.dkAreaStatus"
-            placeholder="请选择设防状态"
+            v-model="query.dkZoneStatus"
+            placeholder="请选择布防状态"
             clearable
             size="small"
             style="width: 100px"
           >
             <el-option
-              v-for="dict in defenseStatus"
+              v-for="dict in defenseStatus2"
               :key="dict.dictValue"
               :label="dict.dictLabel"
               :value="dict.dictValue"
@@ -61,11 +61,12 @@
           size="mini"
           @click="
             queryPerimeterDevice({
-              pageNo: pageNo,
+              pageNo: 1,
               pageSize: pageSize,
               dkAreaName: query.dkAreaName,
               dkZoneName: query.dkZoneName,
-              dkAreaStatus: query.dkAreaStatus,
+              dkZoneStatus: query.dkZoneStatus,
+
             })
           "
           >搜索</el-button
@@ -99,7 +100,7 @@
           <span  :class="scope.row.status == '1' ? 'success' : scope.row.status == '1' ? 'warning' : 'danger' ">{{scope.row.status == "1" ? "在线" : "下线"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="设防状态" align="center" prop="dkZoneStatus"  show-overflow-tooltip >
+      <el-table-column label="布防状态" align="center" prop="dkZoneStatus"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span  :class="scope.row.dkZoneStatus == '布防' ? 'success' :  scope.row.dkZoneStatus == '撤防' ? 'warning' : 'info' ">{{scope.row.dkZoneStatus}}</span>
         </template>
@@ -299,6 +300,20 @@ export default {
           dictValue: "撤防",
         },
       ],
+      defenseStatus2:[
+        {
+          dictLabel: "布防",
+          dictValue: "布防",
+        },
+        {
+          dictLabel: "撤防",
+          dictValue: "撤防",
+        },
+        {
+          dictLabel: "旁路",
+          dictValue: "旁路",
+        },
+      ],
       query: {
 
       },
@@ -556,6 +571,9 @@ export default {
       this.queryPerimeterDevice({
         pageNo: this.pageNo,
         pageSize: this.pageSize,
+        dkAreaName: this.query.dkAreaName,
+        dkZoneName: this.query.dkZoneName,
+        dkZoneStatus: this.query.dkZoneStatus,
       });
     },
     //改变每条数
@@ -564,10 +582,9 @@ export default {
       this.queryPerimeterDevice({
         pageNo: this.pageNo,
         pageSize: this.pageSize,
-        status: this.query.status,
-        deviceNum: this.query.deviceNum,
-        deviceName: this.query.deviceName,
-        addr: this.query.addr,
+        dkAreaName: this.query.dkAreaName,
+        dkZoneName: this.query.dkZoneName,
+        dkZoneStatus: this.query.dkZoneStatus,
       });
     },
     //查询区域入侵告警设备登记信息