要求值是分数

licp

2024-07-04 09ee2efd8bc38d82aa01e2c0d77b84d398f606b2

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

@@ -1676,14 +1676,8 @@
                          break
                        }
                      }
                      if(this.getInspectionValueType(item.i)==1){
                        if (!isNaN(parseFloat(c.v.v))) {
                          if(c.v.v.includes('^') || c.v.v.includes('/')){
                            comValue[(tableCode + (c.r + 1))] = c.v.v
                          }else{
                            comValue[(tableCode + (c.r + 1))] = parseFloat(c.v.v)
                          }
                        }
                      if(this.getInspectionValueType(item.i)==1&&!isNaN(parseFloat(c.v.v))){
                        comValue[(tableCode + (c.r + 1))] = parseFloat(c.v.v)
                      }else{
                        comValue[(tableCode + (c.r + 1))] = c.v.v
                      }
@@ -1704,35 +1698,39 @@
                  if(ask){
                    comp = ask.map((m, i) => {
                      if (m.includes('=')) {
                        let str = m.split('=')[1]
                        console.log(res,str)
                        let str = this.handleFraction(m.split('=')[1])
                        if(typeof res == 'string'&&typeof str == 'string'){
                          console.log(res,str)
                          return  res.trim() == str.trim()
                        }else{
                          return  eval(res) == eval(str)
                        }
                      } else if (m.includes('≥')) {
                        return eval(res) >= eval(m.split('≥')[1])
                        let str = this.handleFraction(m.split('≥')[1])
                        return eval(res) >= eval(str)
                      }else if (m.includes('≤')) {
                        return eval(res) <= eval(m.split('≤')[1])
                        let str = this.handleFraction(m.split('≤')[1])
                        return eval(res) <= eval(str)
                      }else if (m.includes('<')) {
                        return  eval(res) < eval(m.split('<')[1])
                        let str = this.handleFraction(m.split('<')[1])
                        return  eval(res) < eval(str)
                      }else if (m.includes('>')) {
                        return  eval(res) > eval(m.split('>')[1])
                        let str = this.handleFraction(m.split('>')[1])
                        return  eval(res) > eval(str)
                      }else if (m.includes('~')) {
                        let k = m.split('~')
                        return  eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
                        return  eval(res) >= eval(this.handleFraction((k[0]))) && eval(res) <= eval(this.handleFraction(k[1]))
                      }else if(m.includes('-')){
                        let k = m.split('-')
                        return  eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
                        return  eval(res) >= eval(this.handleFraction(k[0])) && eval(res) <= eval(this.handleFraction(k[1]))
                      }else if(m.includes('±')){
                        let k = m.split('±')
                        return  eval(res) >= eval((k[0] - k[1])) && eval(res) <= eval((k[0] + k[1]))
                        return  eval(res) >= eval((this.handleFraction(k[0]) - this.handleFraction(k[1]))) && eval(res) <= eval((this.handleFraction(k[0]) + this.handleFraction(k[1])))
                      }else if(m.includes('＞')){
                        return  eval(res) > eval(m.split('＞')[1])
                        let str = this.handleFraction(m.split('＞')[1])
                        return  eval(res) > eval(str)
                      }else if(m.includes('＜')){
                        return  eval(res) < eval(m.split('＜')[1])
                        let str = this.handleFraction(m.split('＜')[1])
                        return  eval(res) < eval(str)
                      }
                    })
                  }
@@ -1808,6 +1806,13 @@

        }
      },
      handleFraction(str){
        if(str&&typeof(str)=='string'&&str.includes('/')){
          return eval(str.split('/')[0]/str.split('/')[1])
        }else{
          return str
        }
      },
      getCurrentInsProduct(pId) {
        if (!this.tableList[0].insProductResult) {
          this.tableList[0].insProductResult = {}