上线后优化

licp

2024-08-01 8cf8aef0a99b4a2f7432542b13d705a575ae5cae

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

@@ -318,7 +318,7 @@
            </el-form-item>
          </el-form>
          <el-button type="primary" size="small" v-if="(dataAcquisitionEidt>0||tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='温度循环检验原始记录'&&temDataAcquisition)&&PROJECT=='检测中心'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">数据采集</el-button>
          <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="(dataAcquisitionEidt>0)&&PROJECT=='检测中心'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'关闭编辑':'编辑数采'}}</el-button>
          <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="(dataAcquisitionEidt>0||(tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='温度循环检验原始记录'))&&PROJECT=='检测中心'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'关闭编辑':'编辑数采'}}</el-button>
        </div>
      </div>
      <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='温度循环检验原始记录'&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('热循环')&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('温升试验'))">
@@ -537,7 +537,7 @@
                {{ '外端'+(index+1) }}
              </template>
              <template slot-scope="scope">
                <el-input size="small" v-model="scope.row.arr[index].value0" placeholder="" :disabled="state>1" @change="m=>changeItem(scope.row.arr[index])"></el-input>
                <el-input size="small" v-model="scope.row.arr[index].value0" placeholder="" :disabled="state>1||!dataAcquisitionEidtAble" @change="m=>changeItem(scope.row.arr[index])"></el-input>
              </template>
            </el-table-column>
            <el-table-column
@@ -549,7 +549,7 @@
                {{ '内端'+(index+1) }}
              </template>
              <template slot-scope="scope">
                <el-input size="small" :disabled="state>1" v-model="scope.row.arr[index].value1" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
                <el-input size="small" :disabled="state>1||!dataAcquisitionEidtAble"  v-model="scope.row.arr[index].value1" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
              </template>
            </el-table-column>
            <el-table-column
@@ -784,6 +784,46 @@
        <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">
      <div>
        <table border="1" cellpadding="10" class="thermal-table">
          <tr>
            <td style="width: 120px;">检验项</td>
            <td style="width: 120px;">检验子项</td>
            <td>数采数据</td>
          </tr>
          <template v-for="(item,index) in getData">
            <tr>
              <td :rowspan="item.child.length">{{item.faName}}</td>
              <td>{{ item.child[0].name }}</td>
              <td>
                <el-checkbox-group
                  v-model="item.child[0].value"
                  :min="0"
                  :max="item.child[0].maxNum">
                  <el-checkbox v-for="(n,j) in item.child[0].arr" :label="n" :key="j+'ppppppppp'">{{n}}</el-checkbox>
                </el-checkbox-group>
              </td>
            </tr>
            <tr v-for="(m,i) in item.child" :key="i+'bbbbbbbbbbbbbb'" v-show="i>0">
              <td>{{ m.name }}</td>
              <td>
                <el-checkbox-group
                  v-model="m.value"
                  :min="0"
                  :max="m.maxNum">
                  <el-checkbox v-for="(n,j) in m.arr" :label="n" :key="j+'bbbbbbbbbbbbbb'">{{n}}</el-checkbox>
                </el-checkbox-group>
              </td>
            </tr>
          </template>
        </table>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="beforeDataGetDia()">取 消</el-button>
        <el-button type="primary" @click="submitDataGet()">确 定</el-button>
      </span>
    </el-dialog>
  </div>
</template>

@@ -798,6 +838,7 @@
    },
    data() {
      return {
        dataGetDia:false,
        wareTableDataLoading:false,
        fileAdd:false,
        sampleVisible: false,
@@ -961,6 +1002,36 @@
        },
        thermalCyclingLoading:false,
        temDataAcquisition:false,
        getData:[
          {
            faName:'波长附加衰减',
            child:[
              {
                name:'1285nm~1330nm',
                arr:[12,13],
                maxNum:1,
                value:[]
              },
              {
                name:'1525nm~1575nm',
                arr:[12,13],
                maxNum:1,
                value:[]
              },
            ]
          },
          {
            faName:'截至波长',
            child:[
              {
                name:'截至波长',
                arr:[12,13,14,15],
                maxNum:3,
                value:[]
              }
            ]
          }
        ]
      }
    },
    computed: {
@@ -1218,6 +1289,20 @@
          })
        }
      },
      beforeDataGetDia(done){
        this.$confirm('是否取消数据采集?', "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          if(done){
            done()
          }else{
            this.dataGetDia = false
          }
        }).catch(() => {})
      },
      submitDataGet(){},
      // 多线程
      startWorker() {
        if (this.worker) {
@@ -2028,7 +2113,21 @@
              label:m
            })
          })
          this.wareFormChange()
          this.wareTableDataLoading = true
          this.$axios.post(this.$api.deviceScope.temDataAcquisition2,{
            entrustCode:this.insOrder.entrustCode,
            sampleCode:this.currentSample.sampleCode,
            model:this.currentSample.model,
            }, {
            headers: {
              'Content-Type': 'application/json'
            },
            noQs:true
          }).then(res=>{
            // console.log(res.data)
            this.wareFormChange()
          })
          // this.wareFormChange()
        }
        // 温度循环检验原始记录---结束
        // 热循环检验原始记录---开始
@@ -2694,6 +2793,8 @@
      getUserInfo() {
        this.$axios.get(this.$api.user.getUserInfo).then(res => {
          this.userId = res.data.id
          this.componentData.entity.userId = res.data.id
          console.log(1111,this.userId)
        })
      },
      // 复核