数采修改

licp

2024-07-23 233f4f296c699d2f2a78ca3c9848c2ffba21eea6

数采修改

 src/components/do/b1-ins-order/add.vue

@@ -849,6 +849,7 @@
        <el-button type="primary" @click="spliceData">保存</el-button>
      </span>
    </el-dialog>
    <!-- 电力试验室---温升试验/热循环 -->
    <el-dialog :title="temperatureTitle" :visible.sync="temperatureShow" width="260px" :before-close="temperatureShowClose" :show-close="false">
      <div>
        <div v-if="isShowInput" style="margin-bottom: 6px">

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

@@ -299,7 +299,7 @@
          <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&collected" @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!='温度循环检验原始记录'">
      <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!='热循环检验原始记录')">
        <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
          <tbody>
            <tr v-for="(m,i) in item.arr" :key="i">
@@ -347,7 +347,6 @@
                      <el-option v-for="item in equipOptions" :key="item.value" :label="item.value" :value="item.value">
                      </el-option>
                    </el-select>
                    <!-- <el-button type="primary" icon="el-icon-document-copy" size="small" circle title="数采" v-if="n.isItADataAcquisitionDevice&&PROJECT=='检测中心'" @click="getDataAcquisitionDevice(n.v.v)"></el-button> -->
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='要求值' && state==1">
                    <span :style="`font-family:${n.v.ff} !important;`">{{getTell(n.i)}}</span>
@@ -407,7 +406,7 @@
          </tbody>
        </table>
      </div>
      <div v-loading="tableLoading" v-else>
      <div v-loading="tableLoading" v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName=='温度循环检验原始记录'">
        <el-divider></el-divider>
        <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">温度循环检验原始记录</h4>
        <el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
@@ -567,6 +566,59 @@
            </el-table-column>
           </template>
        </el-table>
      </div>
      <div v-loading="tableLoading" v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName=='热循环检验原始记录'">
        <el-divider></el-divider>
        <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">热循环检验原始记录</h4>
        <el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
        <el-form-item label="型号:" style="margin-bottom: 0;">
          <el-input clearable v-model="wareForm0.model" disabled size="small" placeholder=""></el-input>
        </el-form-item>
        <el-form-item label="试验方法:" style="margin-bottom: 0;">
          <el-input clearable v-model="wareForm0.methodName" disabled size="small" placeholder=""></el-input>
        </el-form-item>
        <el-form-item label="循环次数:" style="margin-bottom: 0;">
          <el-input-number v-model="thermalCyclingInfo.inspectionItem" :min="1" :max="thermalCyclingInfo.max" label="" style="margin-top:4px" size="small" ></el-input-number>
        </el-form-item>
        </el-form>
        <el-divider></el-divider>
        <el-form :inline="true" :model="equipForm" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
          <el-form-item label="仪器名称:">
            <el-input clearable v-model="equipForm.value0" disabled size="small" placeholder=""></el-input>
          </el-form-item>
          <el-form-item label="仪器编号:">
            <el-select v-model="equipForm.code0" placeholder="请选择" size="small">
              <el-option
                v-for="item in equipOptions"
                :key="item.value"
                :label="item.value"
                :value="item.value">
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="仪器名称:" >
            <el-input clearable v-model="equipForm.value1" disabled size="small" placeholder=""></el-input>
          </el-form-item>
          <el-form-item label="仪器编号:">
            <el-select v-model="equipForm.code1" placeholder="请选择" size="small">
              <el-option
                v-for="item in equipOptions"
                :key="item.value"
                :label="item.value"
                :value="item.value">
              </el-option>
            </el-select>
          </el-form-item>
        </el-form>
        <table border="1" class="tables" cellpadding="10">
          <tr v-for="(item,index) in thermalCyclingInfo.arr">
            <td style="width: 100px;text-align: center;">{{ item }}</td>
            <td>
              <el-input clearable size="small" placeholder="温度"></el-input>
              <el-input clearable size="small" placeholder="直流电阻"></el-input>
            </td>
          </tr>
        </table>
      </div>
      <el-upload :action="action"
      :data="{
@@ -845,7 +897,13 @@
        dataAcquisitionEidt:0,
        dataAcquisitionEidtAble:false,
        dataAcquisitionLoading:false,
        collected:false
        collected:false,
        // 热循环---开始
        thermalCyclingInfo:{
          max:0,
          inspectionItem:1,
          arr:[]
        }
      }
    },
    computed: {
@@ -948,7 +1006,7 @@
      equipForm:{
        deep:true,
        handler(val){
          if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='温度循环检验原始记录'&&this.equipOptions&&this.equipOptions.length>0){
          if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='温度循环检验原始记录'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='热循环检验原始记录')&&this.equipOptions&&this.equipOptions.length>0){
            this.param[this.currentSample.insProduct[0].id].equipValue = []
            this.param[this.currentSample.insProduct[0].id].equipName = []
            if(this.equipForm.code0){
@@ -1117,7 +1175,6 @@
        if(this.PROJECT!='检测中心'||!this.tableLists.find(m=>m.templateId==this.currentTable)||this.tableLists.find(m=>m.templateId==this.currentTable).templateName!='温度循环检验原始记录'){
          return
        }
        // this.$refs.wareTableData&&this.$refs.wareTableData.doLayout()
        if(m&&type){
          this.wareForm[type] = m
        }
@@ -1262,6 +1319,18 @@
        })
        this.getEquipOptions(true,this.currentSample.insProduct[0].id)
        // this.$refs.wareTableData&&this.$refs.wareTableData.doLayout()
      },
      thermalCyclingChange(){
        // this.wareTableDataLoading = true
        this.$axios.post(this.$api.insOrderPlan.temCycle,{
          sampleId:this.currentSample.id,
          inspectionItem:this.thermalCyclingInfo.inspectionItem
        }).then(res => {
          // this.wareTableDataLoading = false
          if (res.code == 201) return
          console.log(res.data)
          this.getEquipOptions(true,this.currentSample.insProduct[0].id)
        })
      },
      subOtherForm(m,type){
        let ids = []
@@ -1547,7 +1616,7 @@
        this.excelMethodList = []
        this.widthList = this.tableList[0].style.columnlen;
        // 温度循环检验原始记录--开始
        if(this.tableLists.find(m=>m.templateId==this.currentTable)||this.tableLists.find(m=>m.templateId==this.currentTable).templateName!='温度循环检验原始记录'){
        if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='温度循环检验原始记录'){
          let ask = this.currentSample.insProduct[0].ask
          let askList = ask.split(';')
          this.numOptions = []
@@ -1573,6 +1642,19 @@
          this.wareFormChange()
        }
        // 温度循环检验原始记录---结束
        // 热循环检验原始记录---开始
        if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='热循环检验原始记录'){
          let ask = this.currentSample.insProduct[0].ask
          let askList = ask.split(';')
          this.thermalCyclingInfo.max = Number(askList[askList.length-1])
          let arr = []
          for (let i = 0; i < askList.length-1; i++) {
            arr.push(askList[i].split(',')[0])
          }
          this.thermalCyclingInfo.arr = arr;
          console.log(this.thermalCyclingInfo)
          this.thermalCyclingChange()
        }
        this.tableList.forEach(a => {
          let mcList = []
          a.template.forEach(b => {
@@ -2137,7 +2219,6 @@
              this.equipOptions = res.data.map(m => {
                m.value = m.managementNumber
                m.label = m.deviceName
                m.isItADataAcquisitionDevice = m.isItADataAcquisitionDevice
                return m
              })
            }

 src/components/tool/scroll-paging.vue

@@ -2,7 +2,7 @@
  <div class="scroll-pagination"  ref="content" @scroll="onScroll">
    <slot></slot>
    <el-button
        v-show="isLoding&&!finishLoding"
        v-if="!finishLoding&&isLoding"
        type="text"
        style="display: flex; margin: 0 auto; color: #909399"
        ><i class="el-icon-loading" style="font-size:20px"></i