1.设备状态页面故障状态隐藏，故障状态合并到设备状态中 2.警情处理完成后，修改设备状态为正常，新加参数设备编号

Administrator

2021-05-06 efa261b97d0974869276513b1e900421bf4ff573

1.设备状态页面故障状态隐藏，故障状态合并到设备状态中    2.警情处理完成后，修改设备状态为正常，新加参数设备编号

 src/views/clientManagement/clientManagement.vue

@@ -69,7 +69,7 @@

          <template slot-scope="{ row }" slot="dxzt">
            <el-tag>{{
              row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "在线" : "无"
              row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "正常" :row.dxzt == "2" ? "报警":row.dxzt == "3" ? "故障":"无"
              }}
            </el-tag>
          </template>
@@ -464,7 +464,8 @@
              label: "故障状态",
              prop: "state",
              addDisplay: false,
              editDisplay: false
              editDisplay: false,
              hide:true
            },
            {
              label: "故障原因",
@@ -711,11 +712,9 @@
            //判断是新增还是修改
            if(that.isEdit){
                getclient(this.form.id).then(res => {
                  debugger;
                  that.province = res.data.data.province;
                  that.city = res.data.data.city;
                  that.district = res.data.data.district;

                  // that.province = res.data.data.province;
                  // that.city = res.data.data.city;
                  // that.district = res.data.data.district;
                });
              }
            
@@ -731,13 +730,17 @@
              this.form.street = address.substring(address.indexOf("区")+1,address.length);
            }
            //写入新的省市区
            that.form.province = val.addressComponent.province;
            if(val.addressComponent.city==""){
                that.form.city = val.addressComponent.province;
            }else{
                that.form.city = val.addressComponent.city;
            }
            that.form.district = val.addressComponent.district;
            that.form.province = "11";
            that.form.city = "1101";
            that.form.district = "110101";
            // that.form.province = val.addressComponent.province;
            // if(val.addressComponent.city==""){
            //     that.form.city = val.addressComponent.province;
            // }else{
            //     that.form.city = val.addressComponent.city;
            // }
            // that.form.district = val.addressComponent.district;
            //调用接口获取省市区编号
          }
        },
        immediate: true,
@@ -934,7 +937,6 @@
          });
      },
      beforeOpen(done, type) {
        debugger;
        if (["edit", "view"].includes(type)) {
          getclient(this.form.id).then(res => {
            this.form = res.data.data;
@@ -999,7 +1001,7 @@
            } else if (data.records[i].heartbeat == "") {
              data.records[i].dxzt = 0;
            } else {
              data.records[i].dxzt = 1;
              data.records[i].dxzt = data.records[i].dtype;
            }
          }


 src/views/policeTracking/policeTracking.vue

@@ -730,6 +730,7 @@
        bz: this.form.bz,
        snumber: this.form.alarmId,
        sname: this.form.alarmPeople,
        deviceNumber:this.form.deviceNumber,
        zc: zc,
        zctime: this.getDate().current,
      };