修改bug

licp

2024-07-16 49af39650d947cd7b12f665e58585c95410715d3

修改bug

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

@@ -1484,11 +1484,22 @@
                      count4 += 1
                    }
                  }
                  // else if (c.v.ps != undefined && c.v.ps.value === '单位'&&this.PROJECT=='检测中心'){
                  //   if(count4==1||count4==2){
                  //     str += c.v.v?c.v.v:''
                  //     console.log('str',str,c)
                  //     count4 += 1
                  //   }
                  // }
                }
              })
              if (str != '') {
                console.log('str',str)
                let count2 = 0
                for (let i in this.currentSample.insProduct) {
                  // (this.currentSample
                  // .insProduct[i].unit?this.currentSample
                  // .insProduct[i].unit:'')
                  if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
                  .insProduct[i].inspectionItem +(this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample.insProduct[i].inspectionItemSubclass)+(this.currentSample.insProduct[i].inspectionItemClass==null||this.PROJECT!='装备电缆'?'':this.currentSample.insProduct[i].inspectionItemClass) ===
                    str) {
@@ -1708,6 +1719,15 @@
              this.$nextTick(()=>{
                this.tableList = this.result.value.tableList
                this.param = this.result.value.param
                for (var i in this.param){
                  if(this.param[i].insResult&&this.param[i].insResult.v&&this.param[i].insResult.v.v){
                    if(this.param[i].insResult.v.v=='合格'){
                      this.$set(this.param[i].insResult.v,'v',1)
                    }else if(this.param[i].insResult.v.v=='不合格'){
                      this.$set(this.param[i].insResult.v,'v',0)
                    }
                  }
                }
                this.saveInsContext()
              })
              break;
@@ -1827,7 +1847,7 @@
          }
      },
      getValue(v){
        let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>').replace(new RegExp('@', 'g'), '<br/>'):'')
        let str = v.v?v.v:(v.v===0?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>').replace(new RegExp('@', 'g'), '<br/>'):''))
        return str
      },
      getInspectionValueType(id) {

 src/components/view/b1-inspection-order.vue

@@ -177,7 +177,7 @@
            <div class="search_thing" style="width: 20%;">
              <div class="search_label">样品名称：</div>
              <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
                  v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing" style="width: 20%;">
              <div class="search_label">样品型号：</div>
@@ -459,7 +459,7 @@
                componentData: {
                    entity: {
                        entrustCode: null,
                        sampleType: null,
                        sample: null,
            sampleName: null,
            sampleModel: null,
            sampleCode: null,

 src/main.js

@@ -18,9 +18,9 @@
Vue.prototype.PROJECT = '检测中心'
// Vue.prototype.PROJECT = '装备电缆'
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
const javaApi = 'http://172.20.10.5:8001';
const javaApi = 'http://10.1.88.162:8001';

//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";

 static/js/worker.js

@@ -310,10 +310,13 @@
            if (a[0].r == item.r && comResult !== '') {
              for (var b in a) {
                if (a[b].c == item.c) {
                  // console.log('comResult---', comResult)
                  try{
                    let val = parseFloat(comResult.toFixed(3))
                    a[b].v.v = isNaN(val) ? '' : val
                    if(comResult==0){
                      a[b].v.v = 0
                    }else{
                      let val = parseFloat(comResult.toFixed(3))
                      a[b].v.v = isNaN(val) ? '' : val
                    }
                  }catch(error){
                    a[b].v.v = comResult
                    console.log('error---', error)