周界防范

public/static/config.js

@@ -10,8 +10,8 @@
 // api 请求路径
 var PLATFROM_CONFIG = {};
 // PLATFROM_CONFIG.baseUrl = "http://172.16.120.49/securityapi/" //测试服务器
-PLATFROM_CONFIG.baseUrl = "http://172.16.120.85:8082/"
-    // PLATFROM_CONFIG.baseUrl = "http://10.21.39.1:8082" //生产
+// PLATFROM_CONFIG.baseUrl = "http://172.16.120.85:8082/"
+PLATFROM_CONFIG.baseUrl = "http://10.21.39.1:8082" //生产
     //alarming WEBSOCKET
 let userInfo = window.localStorage.getItem("key");
 var PLATFROM_WEBSOCKET = {};

src/views/device/guard/index.vue

@@ -331,7 +331,7 @@ export default {
         status: [
           { required: true, message: "设备状态不能为空", trigger: ["blur",'change'] }
         ],
-        dkAreaStatus: [
+        dkZoneStatus: [
           { required: true, message: "设防状态不能为空", trigger: ["blur",'change'] }
         ],
 
@@ -393,6 +393,7 @@ export default {
     cancel() {
       this.open = false;
       this.open1 = false;
+      this.loading = false
       this.reset();
     },
     // 取消按钮
@@ -450,16 +451,26 @@ export default {
         this.$refs["form1"].validate(valid => {
           if (valid) {
             this.loading = true
+            let arr = []
             api.queryPerimeterDevice({dkAreaName:this.form.dkAreaName,pageSize:200,pageNo:1}).then((response1) => {
               if(response1.data.pageList.length>0){
                 let data = response1.data.pageList
                 this.title2 = this.form.dkAreaName
                 for(let i=0;i<data.length;i++){
                   if(data[i].dkZoneStatus == "布防" || data[i].dkZoneStatus == "撤防"){
-                    this.fq.push(data[i])
+                    // this.fq.push(data[i])
+                    arr.push(data[i])
                   }
                 }
-                if(this.fq.length>1){
+                // console.log(this.fq)
+                //  console.log(arr)
+                // if(this.fq.length>1){
+                if(arr.length>1){
+                  for(let i =0;i<arr.length;i++){
+                    if(arr[i].connId == arr[0].connId){
+                      this.fq.push(arr[i])
+                    }
+                  }
                   this.open2 = true
                 }else{
                   this.submitForm2()
@@ -475,7 +486,8 @@ export default {
     },
     submitForm2() {
       let operateType = undefined
-      if(this.form.dkAreaStatus == "布防"){
+      // console.log(this.form.dkZoneStatus)
+      if(this.form.dkZoneStatus == "布防"){
         operateType = 1
       }else{
         operateType = 3