优化检验任务计算

licp

2024-04-22 47431e32e426d14736415ac0cc9cdcd88f7c07e5

优化检验任务计算

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

@@ -784,7 +784,15 @@
                  valueList.forEach(b => {
                    str = str.replace(b.name, b.value)
                  })
                  comResult = eval(str)
                  if(item.v.f.includes('/')>-1){
                    if(Object.getOwnPropertyNames(comValue).length==valueList.length){
                      comResult = eval(str)
                    }else{
                      comResult = ''
                    }
                  }else{
                    comResult = eval(str)
                  }
                  break;
              }
              list.forEach(a => {
@@ -835,7 +843,7 @@
              let regex = /[=\+\-\*\%\(\)\/\s]/g
              let mode = item.v.f.replace(regex, ' ').split(' ');
              mode.filter(m => m && !Number(m)).forEach(m => {
                let r = m.split('')[1] - 1
                let r =  m.replace(/[a-zA-Z]/g, "") - 1
                let c = this.comparisonList.find(j => j.label == m.split('')[0]).value
                valueList.push({
                  c,

 src/main.js

@@ -13,9 +13,9 @@

//本地
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://192.168.0.24:8001';//李
const javaApi = 'http://192.168.11.200:8001';//李
// const javaApi = 'http://192.168.11.249:8001';//张
const javaApi = 'http://192.168.11.50:8001';//姜
// const javaApi = 'http://192.168.11.50:8001';//姜
// const javaApi = 'http://114.132.189.42:9006';//测试服
//胜云服务器
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";

 src/view/notice.vue

@@ -69,14 +69,14 @@
        <div class="content">
          <img :src="`../../static/img/notice-${m.type}.svg`" alt="" style="width: 50px;margin-right: 18px;">
          <div class="content-info">
            <h4 style="font-weight: normal;margin-bottom: 6px;display: flex;align-items: center;justify-content: space-between;">
            <h4 style="font-weight: normal;margin-bottom: 4px;display: flex;align-items: center;justify-content: space-between;">
              <span>{{ m.title }}</span>
              <span class="time" style="color: #999999;font-size: 14px;">{{ m.time }}</span>
              <span class="time" style="color: #999999;font-size: 12px;">{{ m.time }}</span>
            </h4>
            <p style="color: #999999;font-size: 14px;margin-bottom: 8px;" class="ellipsis-multiline">{{ m.content }}</p>
            <el-tag type="danger" v-if="m.status==0">已拒绝</el-tag>
            <el-tag type="success" v-if="m.status==1">已接收</el-tag>
            <p style="font-size: 14px;color: #999999;display: flex;align-items: center;justify-content: space-between;">
            <p style="color: #999999;font-size: 14px;margin-bottom: 6px;" class="ellipsis-multiline">{{ m.content }}</p>
            <el-tag type="danger" size="small" v-if="m.status==0" style="margin-bottom: 4px;">已拒绝</el-tag>
            <el-tag type="success" size="small" v-if="m.status==1" style="margin-bottom: 4px;">已接收</el-tag>
            <p style="font-size: 12px;color: #999999;display: flex;align-items: center;justify-content: space-between;">
              <span>发送人：{{m.sendUser}}</span>
              <span>收件人：{{ m.getUser }}</span>
            </p>
@@ -95,7 +95,7 @@
export default {
  data(){
    return{
      drawer:true,
      drawer:false,
      direction:'rtl',
      options:[],
      type:'0',
@@ -105,7 +105,7 @@
          title:'标题',
          content:'内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容',
          time:'2019-08-07 15:34:26',
          status:1,//消息状态：拒绝、接收
          status:0,//消息状态：拒绝、接收
          isRead:0,//是否已读
          sendUser:'小明',
          getUser:'李华',