Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/deviceLog/WorkChartModel.vue

@@ -55,7 +55,6 @@
        <div class="checkboxgroup">
          <p>统计参数</p>
          <div class="checkboxgroup_con">

            <a-checkbox-group name="checkboxgroup" :value="option" :options="plainOptions" @change="checkboxOnChange"/>
          </div>
        </div>
@@ -133,7 +132,6 @@
      let equipment = param.equipmentId
      getAction(this.url.initPlainOptions,{equipmentId:equipment}).then((res) => {
        if (res.success) {

          let temp = []
          // debugger
          for (var item of res.result) {
@@ -143,7 +141,6 @@
          if(temp.length>0){
            that.option = [temp[0].value]
          }

        }
      })
    },