Merge branch 'feature_1.0' into qa

quanyawei

2023-09-25 c4aedc3f07326068221ee1b957eee146808afbcb

 src/views/list/devicesBasic.vue

@@ -1287,16 +1287,19 @@
  ]

  private changesen:number=0

  private handleChangevalue1(value: string){

    console.log(this.changesen);

    if(this.changesen===1){

      this.handleChange2(this.reskey);

    }

  }

  private AQIhandleChange(value: string){

    console.log(this.changesen);

       if(this.changesen===1){

      this.handleChange2(this.reskey);

    }

  }

  private ceAQIhandleChange(value: string){

    console.log(this.changesen);

    if(this.changesen===1){

      this.handleChange2(this.reskey);

    }

@@ -1680,9 +1683,10 @@
      this.datatable=[]

      this.datatable=res.data.data

      if(this.selectvalue1==='a99054'){

        console.log(21323);

         for(var i=0;i<this.datatable.length;i++){

          if(this.ceAQIvalue==='+'){

             this.datatable[i].cel=Number((this.datatable[i].cel + this.ceAQIvaluein).toFixed(2))

             this.datatable[i].cel=((this.datatable[i].cel-0) + (this.ceAQIvaluein-0)).toFixed(2) 
          }else if(this.ceAQIvalue==='-'){

            this.datatable[i].cel=Number((this.datatable[i].cel - this.ceAQIvaluein).toFixed(2))

          }else if(this.ceAQIvalue==='*'){

@@ -1716,10 +1720,9 @@
              this.datatable[i].cel=Number((this.datatable[i].cel / this.ceAQIvaluein).toFixed(3))

            }

            this.datatable[i].agehou='aqi*'+this.datatable[i].aqi+'+'+'ce1*'+this.datatable[i].cel

            this.changesen=1;

        }

      }

      
      this.changesen=1;

    })

  }



@@ -2048,10 +2051,10 @@
  }



  private handleCreateModalCancel1():any{

    this.datatable=[];

    this.selectvalue1='请选择因子';

    this.changesen=0;

    this.visibleCreateModal1=false;

    this.datatable=[]

    this.selectvalue1='请选择因子'

    this.changesen=0

  }



  private handlerSelectChange(arr1: any, arr2: any) {