添加0.00，解决设备名称绑定失败的问题

licp

2024-08-05 fbfaa7ff0fa38793f0eb8b4f1b86aa686e59347d

添加0.00，解决设备名称绑定失败的问题

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

@@ -22,7 +22,7 @@

  .search .form-inline {
    padding-top: 20px;
    padding-left: 50px;
    padding-left: 0px;
  }

  .center {
@@ -259,13 +259,13 @@
          <el-input clearable v-model="insOrder.entrustCode" disabled size="small" placeholder="请输入"></el-input>
        </el-form-item>
        <el-form-item label="样品编号:">
          <el-input clearable v-model="currentSample.sampleCode" disabled size="small" placeholder="请输入"></el-input>
          <el-input clearable v-model="currentSample.sampleCode" disabled size="small" placeholder="请输入" style="width: 100px;"></el-input>
        </el-form-item>
        <el-form-item label="样品名称:">
          <el-input clearable v-model="currentSample.sample" disabled size="small" placeholder="请输入"></el-input>
        </el-form-item>
        <el-form-item label="样品数量:">
          <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="请输入"></el-input>
          <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="请输入" style="width: 70px;"></el-input>
        </el-form-item>
        <el-form-item label="下发时间:">
          <el-input clearable v-model="insOrder.sendTime" disabled size="small" placeholder="请输入"></el-input>
@@ -274,10 +274,14 @@
          <el-input clearable v-model="insOrder.typeName" disabled size="small" placeholder="请输入"></el-input>
        </el-form-item>
        <el-form-item label="约定时间:">
          <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="请输入"></el-input>
          <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="请输入" style="width: 100px;"></el-input>
        </el-form-item>
        <el-form-item label="当前样品位数:">
          <el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag>
        </el-form-item>
        <el-form-item label="备注:">
          <span style="color:red">{{ insOrder.remark?insOrder.remark:'-' }}</span>
          <!-- <el-tag v-if="currentKey">{{ insOrder.remark }}</el-tag> -->
        </el-form-item>
      </el-form>
    </div>
@@ -2635,18 +2639,6 @@
                    }
                  }
                }
                // let obj = this.param[code.split('-')[3]]
                // this.tableList[0].arr.forEach(item=>{
                //   item.forEach(m=>{
                //     if(obj&&obj.insResult&&m.c==obj.insResult.c&&m.r==obj.insResult.r){
                //       m.v.v = obj.insResult.v.v
                //     }
                //     if(obj&&obj.resValue&&m.c==obj.resValue.c&&m.r==obj.resValue.r){
                //       m.v.v = obj.resValue.v.v
                //     }
                //   })
                // })
                // console.log(this.tableList,this.param)
                this.saveInsContext()
              })
              break;
@@ -3067,8 +3059,6 @@
      },
      changeEquip(val, n,v) {
        this.$set(n.v,'v',val)
        console.log(3333,val,n)
        this.$set(n.v,'v',val)
        this.tableList[0].arr.forEach((item,index)=>{
          item.forEach((m,i)=>{
            if(this.param[m.i]){
@@ -3095,13 +3085,20 @@
          }
        }
        for (let i in this.equipOptions) {
          if (this.equipOptions[i].value === val) {
          if (this.equipOptions[i].value == val) {
            for (let i1 in this.param[n.i].equipName) {
              if (this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r) {
                this.$delete(this.param[n.i].equipValue[i1].v,'v')
                this.$set(this.param[n.i].equipValue[i1].v,'v',val)
                this.$delete(this.param[n.i].equipName[i1].v,'v')
                this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label)
                this.tableList[0].arr.forEach((item,index)=>{
                  item.forEach((m)=>{
                    if(m.i==n.i&&m.v.ps&&m.v.ps.value=='设备名称'){
                      this.$set(m.v,'v',this.equipOptions[i].label)
                    }
                  })
                })
              }
            }
          }

 static/js/worker.js

@@ -106,8 +106,7 @@
          let ask = currentSample.insProduct.find(m => m.id == item.i).ask?currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
          let res = Object.values(comValue)[0]
          let comp = []

          if(res==''||res==null||res==undefined||res=='Infinity'){
          if(res===''||res===null||res===undefined||res==='Infinity'){
            item.v.v = null
            list.forEach(a => {
              if (a[0].r == item.r) {
@@ -167,6 +166,7 @@
                    }
                  }else{
                    let str = handleFraction(m.split('≤')[1])
                    console.log(555555,res,str)
                    return eval(res) <= eval(str)
                  }
                }else if (m.includes('<')) {
@@ -282,7 +282,7 @@
                }
              })
            }
            // console.log(tableList)
            // console.log(5555,tableList)
          }
          // console.log('1234567789', tableList,getParam())
          result = {
@@ -482,16 +482,20 @@
        b.i &&b.v.v&& param[b.i].comValue.push(b)
      }
      if (b.v.ps != undefined && b.v.ps.value === '设备编码') {
        b.i &&b.v.v&& param[b.i].equipValue.push(b)
        b.i &&b.v&& param[b.i].equipValue.push(b)
      }
      if (b.v.ps != undefined && b.v.ps.value === '设备名称') {
        b.i &&b.v.v&& param[b.i].equipName.push(b)
        b.i &&b.v&& param[b.i].equipName.push(b)
      }
      if (b.v.ps != undefined && b.v.ps.value === '最终值') {
        b.i &&b.v.v&& (param[b.i].resValue = b)
        b.i &&b.v&& (param[b.i].resValue = b)
      }
      if (b.v.ps != undefined && b.v.ps.value === '结论') {
        b.i &&(b.v.v||b.v.v===0||b.v.v==='0')&& (param[b.i].insResult = b)
        if(b.i &&(b.v.v||b.v.v===0||b.v.v==='0')){
          if(b.v.v != '合格'&&b.v.v != '不合格'){
            param[b.i].insResult = b
          }
        }
      }
    })
  })
@@ -508,7 +512,7 @@
function SUM(...val){
  try {
    let num = null;
    if(val&&val.length>0){
    if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
      val.forEach(item=>{
        num+=item;
      })
@@ -527,7 +531,7 @@
function MAX(...val){
  try {
    let max = null;
    if(val&&val.length>0){
    if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
      val = val.filter(item=>item!=null&&item!=='')
      if(val.length>0){
        max = Math.max(...val)
@@ -549,7 +553,7 @@
function MIN(...val){
  try {
    let min = null;
    if(val&&val.length>0){
    if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
      val = val.filter(item=>item!=null&&item!=='')
      if(val.length>0){
        min = Math.min(...val)
@@ -570,8 +574,8 @@
  try {
    let num = null;
    let arr = [];
    if(val&&val.length>0){
      arr = val.filter(item=>item!=null&&item!=''&&item!=undefined)
    if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
      arr = val.filter(item=>item!==null&&item!==''&&item!=undefined)
      arr.forEach(item=>{
        num+=item;
      })