Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-05-07 27da7b76d81f97e84ebdded5f62023151989ab11

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

 src/api/supervisory/data.js

@@ -24,6 +24,14 @@
  })
}

export const getEquipments = () => {
    return request({
        url: '/api/blade-jfpts/equipment/equipment/SeleCs',
        method: 'post',
        params: {}
    })
}

export const getEquipment = () => {
  return request({
    url: '/api/blade-jfpts/equipment/equipment/SeleC',

 src/views/animalHeat/animalHeat.vue

@@ -256,7 +256,11 @@
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          window.open(`/api/blade-jfpts/animalHeat/animalHeat/export-animalHeat?begTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&status=${this.$route.query.status}&timeDesc=${this.$route.query.timeDesc}`);
          let begTime = this.$route.query.startTime==undefined? '':this.$route.query.startTime;
          let endTime = this.$route.query.endTime==undefined? '':this.$route.query.endTime;
          let status = this.$route.query.status==undefined? '':this.$route.query.status;
          let timeDesc = this.$route.query.timeDesc==undefined? '':this.$route.query.timeDesc;
          window.open(`/api/blade-jfpts/animalHeat/animalHeat/export-animalHeat?begTime=${begTime}&endTime=${endTime}&status=${status}&timeDesc=${timeDesc}`);
        });
      },
      //数据报表导出

 src/views/clientManagement/clientManagement.vue

@@ -730,17 +730,13 @@
              this.form.street = address.substring(address.indexOf("区")+1,address.length);
            }
            //写入新的省市区
            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;
            //调用接口获取省市区编号
            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,
@@ -865,6 +861,10 @@
        });
      },
      rowUpdate(row, index, done, loading) {
        debugger;
        if(Array.isArray(row.deptId)){
            row.deptId = row.deptId.join(",");
        }
        update(row).then(() => {
          // this.initFlag = false;
          this.onLoad(this.page);
@@ -1001,8 +1001,20 @@
            } else if (data.records[i].heartbeat == "") {
              data.records[i].dxzt = 0;
            } else {
              if(data.records[i].dtype==1){
              data.records[i].dxzt = data.records[i].dtype;
            }
              if(data.records[i].dtype==2){
                  data.records[i].dxzt = 2;
              }
              if(data.records[i].dtype==3){
                  data.records[i].dxzt = 3;
              }
              if(data.records[i].dtype=="" || data.records[i].dtype==0){
                  data.records[i].dxzt = 1;
              }
             
            }
          }

          data.records.sort((a, b) => {

 src/views/supervisoryConsole/data.vue

@@ -257,7 +257,7 @@
  getList,
  getEquipmentList,
  getDayWarnList,
  getEquipment,
  getEquipments,
} from "@/api/supervisory/data";

export default {
@@ -292,7 +292,7 @@
      that.drawPillar(res.data.data);
    });

    getEquipment().then((res) => {
    getEquipments().then((res) => {
      console.log(res.data.data, 123);

      var total = 0;
@@ -300,6 +300,7 @@
      total += res.data.data.zx;
      total += res.data.data.dx;
      total += res.data.data.gz;
      total += res.data.data.yj;

      console.log(total, 45);

@@ -350,6 +351,8 @@
        sum += item.value;
      });

      sum +=that.yj;

      var option = {
        title: [
          {