Merge remote-tracking branch 'origin/master'

value

2024-06-21 691440d02d1e5545ebdae1bbf07fa7f5520c689f

Merge remote-tracking branch 'origin/master'

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

@@ -163,8 +163,8 @@
            </el-select>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label"><span class="required-span">* </span>委托人：</div>
        <el-col class="search_thing" :span="6" >
          <div class="search_label"><span class="required-span">* </span>制单人：</div>
          <div class="search_input">
            <el-input size="small" clearable disabled v-model="addObj.custom"></el-input>
            <!-- <el-input readonly size="small" v-model="addObj.custom">
@@ -186,7 +186,7 @@
        <el-col class="search_thing" :span="6">
          <div class="search_label"><span class="required-span">* </span>联系方式：</div>
          <div class="search_input">
            <el-input size="small" placeholder="选择委托客户" clearable disabled v-model="addObj.phone"></el-input>
            <el-input size="small" placeholder="选择委托客户" clearable :readonly="active>1" v-model="addObj.phone"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
@@ -306,7 +306,7 @@
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">制单人：</div>
          <div class="search_label">委托人：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input>
          </div>
@@ -612,6 +612,12 @@
      <el-table
      :data="editTable"
      style="width: 100%">
      <!-- inspectionItemList -->
      <el-table-column
          prop="inspectionItemList"
          label="检验项"
          width="180">
        </el-table-column>
        <el-table-column
          prop="sampleCode"
          label="样品编号"
@@ -801,6 +807,8 @@
        totalArr: [],
        model: null,
        standardMethodListId: null,
        symbolList:[
        'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z']
      }
    },
    watch: {
@@ -906,9 +914,8 @@
        this.selectUserDia = false
      },
      containsValue(str) {
        let arr = ['RTS','D','W','X','H','L']
        let symbolItem = ''
        arr.some(value =>{
        this.symbolList.some(value =>{
          if(str.includes(value)){
            symbolItem  = value
            return true
@@ -942,6 +949,12 @@
              return code[index] + '' + num
            }
          }
        }catch(e){}
      },
      handleTell(tell,symbolItem, value){
        try{
          let num = this.replaceAll(tell, symbolItem, value)
          return num
        }catch(e){}
      },
      replaceAll(str,find,value) {
@@ -985,9 +998,7 @@
              this.saveMethod(sampleList)
            }).catch(() => {})
          }else{
            let isRTS = this.totalArr.find(a => a.ask != null && (a.ask.includes('RTS') || a.ask.includes('D') || a.ask
            .includes('W') ||
            a.ask.includes('X') || a.ask.includes('H') || a.ask.includes('L')) && a.state == 1)
            let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
            if (isRTS) {
              this.editTable = this.handleData(sampleList,this.containsValue, 0)
              this.bsm3Dia = true;
@@ -1015,7 +1026,10 @@
              if (a.state == 1) {
                if(type==0){
                  let str = calBack(a.ask)
                  str&&obj.symbolList.push(str)
                  str&&obj.symbolList.push({
                    symbolItem:str,
                    inspectionItem:a.inspectionItem,
                  })
                }else if(type==1){
                  let arr = this.editTable.filter(b => b.sampleId == item.id)
                  arr.forEach(f => {
@@ -1023,6 +1037,10 @@
                      let ask = calBack(a.ask, f.symbolItem,f.value)
                      if (ask) {
                        a.ask = ask
                      }
                      let tell = this.handleTell(a.tell, f.symbolItem,f.value)
                      if (tell) {
                        a.tell = tell
                      }
                    }
                  })
@@ -1040,18 +1058,21 @@
                      if (c.state == 1) {
                        if(type==0){
                          let str = calBack(c.ask)
                          str&&obj.symbolList.push(str)
                          str&&obj.symbolList.push({
                    symbolItem:str,
                    inspectionItem:c.inspectionItem,
                  })
                        }else if(type==1){
                          // let ask = calBack(c.ask, c.rts)
                          // if (ask && c.state == 1) {
                          //   c.ask = csk
                          // }
                          let arr = this.editTable.filter(b => b.sampleId == item.id)
                          arr.forEach(f => {
                            if(c.ask.includes(f.symbolItem)){
                              let ask = calBack(c.ask, f.symbolItem,f.value)
                              if (ask) {
                                c.ask = ask
                              }
                              let tell = this.handleTell(c.tell, f.symbolItem,f.value)
                              if (tell) {
                                c.tell = tell
                              }
                            }
                          })
@@ -1068,7 +1089,10 @@
                      if (c.state == 1) {
                        if(type==0){
                          let str = calBack(c.ask)
                          str&&obj.symbolList.push(str)
                          str&&obj.symbolList.push({
                    symbolItem:str,
                    inspectionItem:c.inspectionItem,
                  })
                        }else if(type==1){
                          // let ask = calBack(c.ask, c.rts)
                          // if (ask && c.state == 1) {
@@ -1080,6 +1104,10 @@
                              let ask = calBack(c.ask, f.symbolItem,f.value)
                              if (ask) {
                                c.ask = ask
                              }
                              let tell = this.handleTell(c.tell, f.symbolItem,f.value)
                              if (tell) {
                                c.tell = tell
                              }
                            }
                          })
@@ -1094,7 +1122,10 @@
                          if (d.state == 1) {
                            if(type==0){
                              let str = calBack(d.ask)
                              str&&obj.symbolList.push(str)
                              str&&obj.symbolList.push({
                    symbolItem:str,
                    inspectionItem:d.inspectionItem,
                  })
                            }else if(type==1){
                              // let ask = calBack(d.ask, d.rts)
                              // if (ask && d.state == 1) {
@@ -1106,6 +1137,10 @@
                                  let ask = calBack(d.ask, f.symbolItem,f.value)
                                  if (ask) {
                                    d.ask = ask
                                  }
                                  let tell = this.handleTell(d.tell, f.symbolItem,f.value)
                                  if (tell) {
                                    d.tell = tell
                                  }
                                }
                              })
@@ -1125,7 +1160,23 @@
        })
        if(type==0){
          editTable.forEach(a => {
            a.symbolList = Array.from(new Set(a.symbolList))
            a.symbolList.forEach(b => {
              let arr = a.symbolList.filter(c => c.symbolItem == b.symbolItem);
              b.inspectionItemList = arr.map(c => c.inspectionItem).join(',')
            })
          })
          editTable.forEach(a => {
            let mySet = new Set();
            a.symbolList = a.symbolList.filter(b =>{
              let num0 = mySet.size;
              mySet.add(b.symbolItem);
              let num1 = mySet.size;
              if(num0!=num1){
                return true;
              }else{
                return false
              }
            })
          })
          let editTableNew = []
          editTable.forEach(a => {
@@ -1133,9 +1184,10 @@
              let obj = {
                sampleCode:a.sampleCode,
                model:a.model,
                symbolItem:b,
                symbolItem:b.symbolItem,
                sampleId:a.sampleId,
                value:null
                value:null,
                inspectionItemList:b.inspectionItemList,
              }
              editTableNew.push(obj)
            })

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

@@ -1161,7 +1161,6 @@
        }
        this.excelMethodList.forEach(item => {
          if (item.valueList.find(m => m.r == r && m.c == c)) {
            console.log(item)
            var comValue = {}
            item.valueList.forEach(a => {
              list.forEach(b => {
@@ -1254,8 +1253,22 @@
                  for (var a in comValue) {
                    arr0.push(comValue[a])
                  }
                  comResult = Math.abs(arr[0])
                  comResult = Math.abs(arr0[0])
                  break;
                // case 'MAX':
                //   let arr1 = []
                //   for (var a in comValue) {
                //     arr1.push(eval(comValue[a]))
                //   }
                //   comResult = Math.max(...arr1)
                //   break;
                // case 'MIN':
                //   let arr2 = []
                //   for (var a in comValue) {
                //     arr2.push(eval(comValue[a]))
                //   }
                //   comResult = Math.median(...arr2)
                //   break;
                default:
                  let valueList = [];
                  item.valueList.forEach(a => {
@@ -1275,6 +1288,9 @@
                  valueList.forEach(b => {
                    str = str.replace(b.name, b.value)
                  })
                  str = str.replaceAll('MAX', 'Math.max')
                  str = str.replaceAll('MIN', 'Math.min')
                  str = str.replaceAll('，', ',')
                  try {
                    if(this.getInspectionValueType(item.i)==1){
                      comResult = eval(str)
@@ -1286,7 +1302,6 @@
                  }
                  break;
              }
              console.log(comResult)
              list.forEach(a => {
                if (a[0].r == item.r && comResult != '') {
                  for (var b in a) {
@@ -1379,7 +1394,70 @@
            item.methodName = item.v.f.split('=').length > 1 && item.v.f.split('=')[1].split('(') && item.v.f.split(
              '=')[1].split('(')[0] ? item.v.f.split('=')[1].split('(')[0] : '自定义方法';
            let valueList = [];
            if (item.v.f.includes(':')) {
            if(item.v.f.includes('MAX') || item.v.f.includes('MIN')){
              item.methodName = '自定义方法'
              let regex = /[=\+\-\*\%\/\^\s]/g
              let mode = item.v.f.replace(regex, ' ').split(' ');
              let that = this
              if(item.v.f.includes('MAX')){
                item.v.f = Judgment(item.v.f, 'MAX')
              }
              if(item.v.f.includes('MIN')){
                item.v.f = Judgment(item.v.f, 'MIN')
              }
              function Judgment(f,type) {
                let newF = f
                let mode4 = mode.filter(m => m&&m.includes(type))
                mode4.forEach(m => {
                  let mode0 = m
                  if(mode0.includes(':')){
                    let r0 = null;
                    let c0 = null;
                    let r1 = null;
                    let c1 = null;
                    let mode1 = mode0.split('(')[1].split(')')[0];
                    let start = mode1.split(':')[0]
                    let end = mode1.split(':')[1]
                    c0 = that.comparisonList.find(j => j.label == start.split('')[0]).value
                    r0 = start.replace(/[a-zA-Z]/g, "") - 1
                    c1 = that.comparisonList.find(j => j.label == end.split('')[0]).value
                    r1 = end.replace(/[a-zA-Z]/g, "") - 1
                    let valueList0 = []
                    for (let i = Number(r0); i <= Number(r1); i++) {
                      for (let u = Number(c0); u <= Number(c1); u++) {
                        valueList0.push({
                          r: i,
                          c: u
                        })
                      }
                    }
                    let valueList1 = []
                    valueList0.forEach(v => {
                      let r = '';
                      let c = '';
                      r = v.r +1;
                      c = that.comparisonList.find(j => j.value == v.c).label
                      valueList1.push(c+r)
                    })
                    let mode3 = type+'('+valueList1.join(',')+')'
                    newF = newF.replace(mode0, mode3)
                    valueList = [...valueList,...valueList0]
                  }else{
                    let mode1 = mode0.replace(type, '').replace(/[=\+\-\*\%\(\)\/\^\s]/g, '');
                    let modeList = mode1.split(',');
                    modeList.filter(m => m && !Number(m)).forEach(m => {
                      let r = m.replace(/[a-zA-Z]/g, "") - 1
                      let c = that.comparisonList.find(j => j.label == m.split('')[0]).value
                      valueList.push({
                        c,
                        r
                      })
                    })
                  }
                })
                return newF
              }
            }else if (item.v.f.includes(':')) {
              valueList = [];
              let r0 = null;
              let c0 = null;

 src/main.js

@@ -16,7 +16,8 @@
// Vue.prototype.PROJECT = '装备电缆'
//本地
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
const javaApi = 'http://127.0.0.1:8001';
// const javaApi = 'http://127.0.0.1:8001';
const javaApi = 'http://192.168.0.104:8001';

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