Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before

lxp

2024-08-09 e841b95caeeb3ba3f512fab431976f64f1061a9e

Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before

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

@@ -620,8 +620,7 @@
        </el-row>
      </span>
    </el-dialog>
    <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow && examine == 0" :active="active" />
    <fiberOpticConfigTwo :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow && examine == 1" :active="active" />
    <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow" :active="active" />
    <equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" />
    <cableConfig v-if="cableConfigShow" :active="active" />
<!--    单选特殊值处理框-->
@@ -3002,7 +3001,7 @@
        this.totalArr = []
        this.total = 0;
        this.sampleList.forEach(item => {
          if (item.insProduct  && item.insProduct.length > 0) {
          if (item.insProduct && item.insProduct.length > 0) {
            item.insProduct.forEach(a => {
              this.totalArr.push(a)
            })

 src/components/do/b1-ins-order/fiberoptic-config-two.vue

@@ -35,12 +35,12 @@
              </div>
              <div class="search-item" style="margin-right: 10px;">
                <label style="width: 100px">每根管抽检标准量</label>
                <el-input v-model="packageInfo.standNum" placeholder="请输入" size="small" @blur="addStandNum" :disabled="active!=1" style="width:100px"></el-input>
                <el-input v-model="packageInfo.standNum" placeholder="请输入" size="small" @blur="addStandNum" :disabled="active!=1" style="width:70px"></el-input>
              </div>
              <div class="search-item">
                <label style="width: 100px">每根管抽检检测量</label>
                <el-input v-model="packageInfo.testNum" placeholder="请输入" size="small" @blur="addTestNum"
                style="width:100px"
                style="width:70px"
                  :disabled="packageInfo.radio===0||active!=1"></el-input>
              </div>
            </div>
@@ -480,7 +480,7 @@
              this.fiberList.push(b)
            })
            }
            

          }else{
            this.fiberList = []
            a.fiber.forEach(b=>{
@@ -489,7 +489,7 @@
          }
        })
      }
      

      this.getTypeDicts1()
      this.getStandTreeBySampleType()
      this.getStandTreeBySampleType2()
@@ -515,7 +515,7 @@
              }
            })
          })
          

      }
      if(this.detectionItems.type == 0) {
        // 赋值检测项信息 光纤
@@ -586,7 +586,7 @@
        this.fiberList = []
        this.fibersList = []
        this.detectionItems = []
        

        // 页面是否含有光纤带
        if(this.packageInfo.ismiers) {
          // 全检
@@ -629,8 +629,8 @@
          }
        }

        
        


      },
      upNum() {
        this.fiberList = []
@@ -691,7 +691,7 @@
                }
                a.fibers.push(fibers)
                this.fibersList.push(fibers)
              } 
              }
        })
      } else {
          this.bushing = []
@@ -765,7 +765,7 @@
        //     this.addFiber()
        //   }, 200)
        // })
        

          // 将下拉框值赋值给光纤  监听去除
          if(this.selectFiberList.length == 0) {
            this.$message.error('请选择数据')
@@ -802,7 +802,7 @@
          this.detectionType = 0
           this.$set(this.detectionItems,'type',0)
          }
          

        })
      },
      methodChange2(val) {
@@ -899,7 +899,7 @@
                fibersIdent: a.ident,
                productList: []
              }
              this.fiberList.push(fiber) 
              this.fiberList.push(fiber)
            }
          })
        } else {
@@ -920,7 +920,7 @@
          })
        }
      }else {
        this.fiberList = [] 
        this.fiberList = []
        let flag = true
        // 按照顺序生成光纤色标
        let colors2 = []
@@ -962,7 +962,7 @@
        //   this.$message.error('未选择套管')
        //   return
        // }
        // this.fiberList = [] 
        // this.fiberList = []
        // let flag = true
        // // 按照顺序生成光纤色标
        // let colors2 = []
@@ -1113,7 +1113,7 @@
        }else if (type == 0){
          this.detectionItems = []
          this.detectionItems = row.productList
        } 
        }
      //   if(type == 1) {
      //     if((row.model == null || row.model == '') && (row.standard == null || row.standard == '')){
      //       this.detectionItems = []
@@ -1146,11 +1146,11 @@
      //         let product =  JSON.parse(JSON.stringify(row.productList))
      //         setTimeout(() => {
      //           product.forEach(p => {
      //           let rowToSelect = this.detectionItems.find(item => item.id === p.id);  
      //           if (rowToSelect) {  
      //           let rowToSelect = this.detectionItems.find(item => item.id === p.id);
      //           if (rowToSelect) {
      //             this.toggleSelection(rowToSelect);
      //           }
      //         });  
      //         });
      //       },200)
      //       }
      //     }
@@ -1171,7 +1171,7 @@
      //   }
      //   this.$axios.post(this.$api.standardTree.selectStandardProductList, {
      //     model: this.mireModel.split(' - ')[1],
      //     standardMethodListId: this.mireStandard,  
      //     standardMethodListId: this.mireStandard,
      //     factory: ''
      //   }, {
      //     headers: {
@@ -1186,16 +1186,16 @@
      //     this.detectionItems = res.data
      //     this.detectionType = 0
      //     this.$set(this.detectionItems,'type',0)
         
      //     if (row.productList != null && row.productList.length > 0) { 
      //       let product =  JSON.parse(JSON.stringify(row.productList)) 

      //     if (row.productList != null && row.productList.length > 0) {
      //       let product =  JSON.parse(JSON.stringify(row.productList))
      //       setTimeout(() => {
      //         product.forEach(p => {  
      //           let rowToSelect = this.detectionItems.find(item => item.id === p.id);  
      //           if (rowToSelect) {  
      //         product.forEach(p => {
      //           let rowToSelect = this.detectionItems.find(item => item.id === p.id);
      //           if (rowToSelect) {
      //             this.toggleSelection(rowToSelect);
      //           }  
      //         });  
      //           }
      //         });
      //       },200)
      //       }
      //     }

 src/components/do/b1-ins-order/fiberoptic-config.vue

@@ -40,7 +40,7 @@
              <div class="search-item">
                <label style="width: 100px">每根管抽检检测量</label>
                <el-input v-model="packageInfo.testNum" placeholder="请输入" size="small" @blur="addTestNum"
                  :disabled="packageInfo.radio===0||active!=1" style="width:100px"></el-input>
                  :disabled="packageInfo.radio===0||active!=1" style="width:70px"></el-input>
              </div>
            </div>
            <el-table ref="table0" :data="bushing" tooltip-effect="dark" style="width: 100%" height="203px" size="small"

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

@@ -242,7 +242,7 @@
        <!-- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">光纤切换</el-button>
        <el-button size="small" type="primary" @click="fiberOpticTapeVisible=true" v-if="fiberOpticTape.length>0">光纤带切换</el-button>
        <el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">套管切换</el-button> -->
        <el-button size="small" type="primary" @click="sampleVisible=true">样品切换</el-button>
        <el-button size="small" type="primary" @click="sampleVisible=true;uploadSample()">样品切换</el-button>
        <el-button size="small" type="primary" @click="taskVisible=true">任务切换</el-button>
        <el-button size="small" type="primary" @click="addVerifyDia = true" v-if="state==1"
          :loading="submitLoading">提交</el-button>
@@ -1057,6 +1057,7 @@
        getDataIndex:[],
        getDataIndexLoading:false,
        changeType:null,
        getDataTypeId:''
      }
    },
    computed: {
@@ -1397,6 +1398,7 @@
            // 向 Worker 发送消息，开始处理逻辑
            this.getDataIndexLoading = false
            this.dataGetDia = false
            this.getDataTypeId = ''
            this.worker0.postMessage(JSON.stringify({
              dataAcquisitionInfo: this.dataAcquisitionInfo,
              list:this.tableList[0].arr
@@ -1412,6 +1414,8 @@
            let {list,n} = result.value
            this.$set(this.tableList[0],'arr',list)
            this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
          }else if(result.getDataTypeId){
            this.getDataTypeId = result.getDataTypeId
          }
        };
      },
@@ -1984,6 +1988,14 @@
        this.fileAdd = fileAdd
        this.collected = collected
        this.temDataAcquisition = temDataAcquisition
      },
      uploadSample(){
        this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
          id: this.id,
          laboratory: this.sonLaboratory
        }).then(async res => {
          this.sampleProduct = res.data.sampleProduct
        })
      },
      async getCurrentProduct(id,type){
        this.tableLoading = true;
@@ -2672,7 +2684,7 @@
        let str = code.split('-')
        let pId = str[3]
        for(let i =0;i<this.currentSample.insProduct.length;i++){
          if(this.currentSample.insProduct[i].id==pId&&(this.currentSample.insProduct[i].ask=='-'||this.currentSample.insProduct[i].ask=='/')){
          if(this.currentSample.insProduct[i].id==pId&&(this.currentSample.insProduct[i].ask=='-'||this.currentSample.insProduct[i].ask=='/'||this.currentSample.insProduct[i].ask=='—')){
            this.tableList[0].arr.forEach(item=>{
              item.forEach(m=>{
                if(m.i==pId&&m.v.ps&&m.v.ps.value=='结论'){
@@ -2714,15 +2726,20 @@
            currentSample:this.currentSample,
            PROJECT:this.PROJECT,
            param:this.param,
            currentTable:this.currentTable
            currentTable:this.currentTable,
            getDataTypeId:this.getDataTypeId
          }));
        } catch (error) {
          console.log(444,error);
        }
        let getDataType = false

        // 监听 Worker 返回的结果
        this.worker.onmessage = (event) => {
          this.result = JSON.parse(event.data);
          if(this.result.value.getDataTypeId){
            getDataType = true
          }
          switch (this.result.method){
            case 'saveInsContext':
              this.$nextTick(()=>{
@@ -2738,7 +2755,13 @@
                    }
                  }
                }
                this.saveInsContext()
                if(this.isGet&&!this.dataAcquisitionEidtAble&&!getDataType){
                  return
                }
                setTimeout(()=>{
                  this.saveInsContext()
                },2000)
                // this.saveInsContext()
              })
              break;
            case 'tableList':
@@ -3132,8 +3155,8 @@
        return
      },
      saveInsContext() {
        console.log(1111,this.param)
        try {
          console.log(1111,this.param)
          if(this.param){
            this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
              param: JSON.stringify(this.param)

 src/main.js

@@ -20,7 +20,7 @@
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
const javaApi = 'http://192.168.0.104:8001';
const javaApi = 'http://192.168.92.249:8001';
//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
// const javaApi = 'http://114.132.189.42:1234';

 static/js/worker.js

@@ -12,6 +12,7 @@
}
let param = null
let currentTable = ''
let getDataTypeId = null
self.onmessage = function(event) {
  const data = JSON.parse(event.data);
  if(currentTable!=data.currentTable){
@@ -30,6 +31,11 @@
    return
  }
  code = data.code;
  if(data.getDataTypeId){
    getDataTypeId = data.getDataTypeId
  }else{
    getDataTypeId = null
  }
  if(tableList){
    let str = code.split('-')
    let r = str[1]
@@ -292,11 +298,18 @@
            // console.log(5555,tableList)
          }
          // console.log('1234567789', tableList,getParam())
          // console.log('1234567789', item)
          let getDataType0 = false
          console.log('1234567789', item.i,getDataTypeId)
          if(item.i==getDataTypeId){
            getDataType0 = true
          }
          result = {
            method:'saveInsContext',
            value:{
              tableList,
              param:getParam()
              param:getParam(),
              getDataTypeId:getDataType0?getDataTypeId:''
            }
          }
          self.postMessage(JSON.stringify(result))

 static/js/worker0.js

@@ -4,12 +4,15 @@
  method:'',
  value:null
}

let arrSpecial = []
let numSpecial = 0;
self.onmessage = function(event) {
  const data = JSON.parse(event.data);
  dataAcquisitionInfo = data.dataAcquisitionInfo;
  list = data.list;
  // console.log(111,dataAcquisitionInfo)
  arrSpecial = []
  numSpecial = 0
  handleData()
}

@@ -43,6 +46,8 @@
              if(Array.isArray(dataAcquisitionInfo[str].value)){
                for (let i = 0; i < dataAcquisitionInfo[str].value.length; i++) {
                  if(i+1==arr[1]){
                    arrSpecial.push(n.i)
                    numSpecial++
                    setTimeout(()=>{
                      let num0 = 0
                      if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
@@ -65,6 +70,8 @@
                }
              }else{
                if(arr[1] ==dataAcquisitionInfo[str].frequency){
                  arrSpecial.push(n.i)
                  numSpecial++
                  setTimeout(()=>{
                    let num0 = 0
                    if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
@@ -85,6 +92,8 @@
                  },2000)
                }else if(Number(dataAcquisitionInfo[str].frequency)>num){
                  if(n.v.ps.value.includes(num)){
                    arrSpecial.push(n.i)
                    numSpecial++
                    setTimeout(()=>{
                      let num0 = 0
                      if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
@@ -112,4 +121,12 @@
      }
    })
  })
  if(arrSpecial[numSpecial-1]){
    setTimeout(()=>{
      result = {
        getDataTypeId:arrSpecial[numSpecial-1],
      }
      self.postMessage(JSON.stringify(result))
    },0)
  }
}