Merge branch 'cnas' into master

licp

2024-12-05 25d10ee678644a6283454ca486d74a938eeccfd1

 src/components/do/b1-inspect-order-plan/circuit-parameters2.vue

@@ -86,7 +86,7 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.tell"></div>
              <div style="text-align: center;" v-html="n.ask"></div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -127,7 +127,7 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.tell"></div>
              <div style="text-align: center;" v-html="n.ask"></div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -213,7 +213,7 @@
        {
          inspectionItemSubclass:'电压驻波比',
          unit:'/',
          tell:'≤1.45',
          ask:'≤1.45',
          result:0,
          portList:[],
          angleList:[],
@@ -222,7 +222,7 @@
        {
          inspectionItemSubclass:'同极化隔离度',
          unit:'dB',
          tell:'≤1.45',
          ask:'≤1.45',
          result:0,
          portList:[],
          angleList:[],
@@ -232,7 +232,7 @@
          inspectionItemSubclass:'互调',
          often:'',//互调特有字段
          unit:'dB',
          tell:'≤1.45',
          ask:'≤1.45',
          result:0,
          portList:[],
          angleList:[],
@@ -243,13 +243,15 @@
      isMore:false,
      insProductNew:[],
      intermodulationNum:0,//互调检验项目的数量
      loading:{}
      loading:{},
      upTemplateState:false,
    };
  },
  watch: {
    // 角度数量变化时，更新所有频段下面的所有项目下的所有端口和角度
    angleList(val) {
      this.allBandList.forEach(item => {
      if(!this.upTemplateState){
        this.allBandList.forEach(item => {
        item.projectList.forEach(m => {
          if(m.angleList.length!==val.length){
            m.angleList = JSON.parse(JSON.stringify(this.angleList))
@@ -274,6 +276,7 @@
          }
        })
      })
      }
    },
    currentNum(val) {
      this.initData()
@@ -345,19 +348,20 @@
                    angleList.push({value:m})
                  })
                  this.angleList = angleList
                  this.upTemplateState = false
                }
                let tell = ''
                if(item.tell.includes(',')){
                  item.tell.split(',').forEach((m,i)=>{
                    tell = tell + m+ (i==item.tell.split(',').length-1?'':'<br/>')
                let ask = ''
                if(item.ask.includes(',')){
                  item.ask.split(',').forEach((m,i)=>{
                    ask = ask + m+ (i==item.ask.split(',').length-1?'':'<br/>')
                  })
                }else{
                  tell = item.tell
                  ask = item.ask
                }
                let obj = {
                  inspectionItemSubclass: item.inspectionItemSubclass,
                  unit:item.unit,
                  tell:tell,
                  ask:ask,
                  result:n.result,
                  id:item.id,
                  often:n.often,
@@ -447,6 +451,7 @@
    },
    // 删除数组
    deleteList(index,list,type){
      this.upTemplateState = false
      if(list.length>1){
        if(type=='互调'){
          let index = null;
@@ -502,6 +507,7 @@
    },
    // 添加数组
    addList(list,type){
      this.upTemplateState = false
      if(type=='互调'){
        let obj = null;
        let index = null;
@@ -643,8 +649,8 @@
      this.$set( this.loading, y, true)
      // this.loading[y] = true
      this.$axios.post(this.$api.insOrderPlan.saveInsContext2, {
        orderId:this.orderId,
        sampleId:this.sampleId,
        // orderId:this.orderId,
        sampleId:this.orderId,
        sonLaboratory:h.projectList[0].sonLaboratory,
        frequency:h.band,
        insProductResult2s:arr
@@ -666,6 +672,50 @@
      }).catch(err => {
        console.log(err)
      })
    },
    saveAll(){
      if(this.allBandList.find(m=>!m.band)){
        this.$message.error('请先填写频段')
        return false
      }else{
        this.allBandList.forEach((h,j)=>{
          this.save(h,j)
        })
        return true
      }
    },
    // 更新模板
    upTemplate(obj){
      this.upTemplateState = true;
      // return
      obj.allBandList.forEach((item,index)=>{
        if(!this.allBandList[index]){
          this.$set(this.allBandList, index, {projectList:this.HaveJson(this.allBandList[0].projectList)})
          // this.allBandList[index] = {
          //   projectList:this.HaveJson(this.allBandList[0].projectList),
          //   band:item.band
          // }
        }
        let arr = []
        item.projectList.forEach((m,i)=>{
          if(this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass)){
            let obj0 = {
            angleList:m.angleList,
            portList:m.portList,
            portNum:m.portNum,
              // value:m.value,
              valueType:m.valueType
            }
            this.$set(obj0,'value',m.value)
            arr.push({...this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass),...obj0})
          }
        })
        // this.allBandList[index].projectList = arr
        this.$delete(this.allBandList[index],'projectList')
        this.$set(this.allBandList[index],'projectList',arr)
      })
      this.angleList = obj.angleList
      this.intermodulationNum = obj.intermodulationNum
    }
  }
}