南昌市物联网技防平台-前端
Administrator
2021-05-06 205525b9f47b5d755f81344069a9456fdab9dd8d
体温导出参数修改,设备管理修改时,新增判断组织机构是否为数组
2 files modified
28 ■■■■■ changed files
src/views/animalHeat/animalHeat.vue 6 ●●●● patch | view | raw | blame | history
src/views/clientManagement/clientManagement.vue 22 ●●●● patch | view | raw | blame | history
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);