合并冲突

licp

2024-08-02 332125c247b8cec21af77479f07ef35558eb6bba

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -784,7 +784,7 @@
        <el-button type="primary" @click="submit()">确 定</el-button>
      </span>
    </el-dialog>
    <el-dialog title="数据采集-计算数据选择" :visible.sync="dataGetDia" min-width="400px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="beforeDataGetDia">
    <el-dialog title="数据采集" :visible.sync="dataGetDia" min-width="400px" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
      <div>
        <table border="1" cellpadding="10" class="thermal-table">
          <tr>
@@ -816,7 +816,6 @@
        </table>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="beforeDataGetDia()">取 消</el-button>
        <el-button type="primary" @click="submitDataGet()" :loading="getDataIndexLoading">确 定</el-button>
      </span>
    </el-dialog>
@@ -1274,12 +1273,13 @@
            child:[]
          }
          for(let j in data[i]){
            if(j!='frequency'&&!data[i][j].isCalculation){
            console.log(j,data[i][j])
            if(j!='frequency'&&data[i][j]&&!data[i][j].isCalculation){
              this.dataAcquisitionInfo[i+','+j] = {
                value:data[i][j].result,
                frequency:data[i].frequency
              }
            }else if(j!='frequency'&&data[i][j].isCalculation){
            }else if(j!='frequency'&&data[i][j]&&data[i][j].isCalculation){
              let obj0 = {
                name:j,
                arr:data[i][j].result
@@ -1324,6 +1324,7 @@
            done()
          }else{
            this.dataGetDia = false
            this.getDataIndex = []
          }
        }).catch(() => {})
      },
@@ -1361,7 +1362,9 @@
          if(res.code!=200){
            return
          }
          this.dataGetDia = false
          this.handleDataAcquisition(res.data)
          this.getDataIndex = []
        })
      },
      // 多线程