From f743df9508776dd59e19c1d8bd946b49d83e07eb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期六, 29 六月 2024 15:28:41 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 417 +++++++++++++++++++++++++++++------------------------------
1 files changed, 205 insertions(+), 212 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 1a6e052..454ee55 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -204,15 +204,15 @@
<template>
<div v-loading="loading" class="inspection">
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">妫�楠屽崟璇︽儏
- <span style="color: #3A7BFA;"> 鏍峰搧</span>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屽崟璇︽儏
+ <!-- <span style="color: #3A7BFA;"> 鏍峰搧</span>
<span v-if="currentFiberOpticTape" style="color: #3A7BFA;"> - 鍏夌氦甯�</span>
- <span v-if="currentFiberOptic" style="color: #3A7BFA;"> - 鍏夌氦</span>
+ <span v-if="currentFiberOptic" style="color: #3A7BFA;"> - 鍏夌氦</span> -->
</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">鍏夌氦鍒囨崲</el-button>
+ <!-- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">鍏夌氦鍒囨崲</el-button>
<el-button size="small" type="primary" @click="fiberOpticTapeVisible=true" v-if="fiberOpticTape.length>0">鍏夌氦甯﹀垏鎹�</el-button>
- <el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">濂楃鍒囨崲</el-button>
+ <el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">濂楃鍒囨崲</el-button> -->
<el-button size="small" type="primary" @click="sampleVisible=true">鏍峰搧鍒囨崲</el-button>
<el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
<el-button size="small" type="primary" @click="addVerifyDia = true" v-show="state==1"
@@ -253,11 +253,26 @@
</el-form>
</div>
<div class="center">
- <div class="search">
- <el-radio-group v-model="currentTable" size="small">
- <el-radio-button :label="item.templateId" v-for="(item,index) in tableLists" :key="index"
- size="small">{{ item.templateName }}</el-radio-button>
- </el-radio-group>
+ <div class="search" style="text-align: left;display: flex;align-items: center;justify-content: space-between;">
+ <div style="display: flex;align-items: center;">
+ <span v-if="tableList.length>0">妫�楠屾ā鏉匡細</span>
+ <el-radio-group v-model="currentTable" size="small">
+ <el-radio-button :label="item.templateId" v-for="(item,index) in tableLists" :key="index"
+ size="small">{{ item.templateName }}</el-radio-button>
+ </el-radio-group>
+ </div>
+ <div>
+ <span v-if="fibers.length>0"> 鍏夌氦甯︼細</span>
+ <el-radio-group v-model="currentTab" size="small" v-if="fibers.length>0" @input="m=>handleChange(m,1)">
+ <el-radio-button :label="item.id" v-for="(item,index) in fibers" :key="index"
+ size="small">{{ item.code }}</el-radio-button>
+ </el-radio-group>
+ <span v-if="fiber.length>0"> 鍏夌氦锛�</span>
+ <el-radio-group v-model="currentTab" size="small" v-if="fiber.length>0" @input="m=>handleChange(m,2)">
+ <el-radio-button :label="item.id" v-for="(item,index) in fiber" :key="index"
+ size="small">{{ item.color }}</el-radio-button>
+ </el-radio-group>
+ </div>
</div>
<div class="center-box" id="nav" v-loading="tableLoading">
<table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
@@ -266,13 +281,13 @@
<td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
v-if="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
:rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
- :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
+ :style="`background:${n.v.bg?n.v.bg:''};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
<div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`"
- :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;background:${n.v.bg};`">
+ :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`">
<template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��' && state==1">
<el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
:disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
- @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" type="number">
+ @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" type="number" @mousewheel.native.prevent :key="'abc-'+'000'+index+'000'+i+'000'+j">
<el-button slot="append" type="primary" icon="el-icon-edit" size="mini"
v-if="getInspectionItemType(n.i) == 1" @click="getSystemValue(n)"></el-button>
</el-input>
@@ -482,6 +497,7 @@
<script>
import ValueTable from '../../tool/value-table.vue'
import file from '../../../util/file'
+ import excelFunction from '../../../util/excelFountion'
export default {
props: ['sonLaboratory', 'orderId', 'state'],
components: {
@@ -609,7 +625,11 @@
currentFiberOptic:null,//褰撳墠鍏夌氦
currentBushing:null,//褰撳墠濂楃
tableLoading:false,
- upLoading:false
+ upLoading:false,
+ temptList:null,
+ fiber:[],
+ fibers:[],
+ currentTab:null
}
},
computed: {
@@ -668,6 +688,7 @@
insResult: null
}
})
+ this.getReportModel(this.currentSample.id)
if (this.currentSample.index == undefined) this.currentSample['index'] = 1
let bushing = this.currentSample.bushing
// this.handleTableData()
@@ -682,6 +703,7 @@
this.currentFiberOptic = null;
this.bushing = []
this.currentBushing = null;
+ this.currentTab = null;
if(bushing&&bushing.length>0){
this.bushing = bushing
}
@@ -697,7 +719,7 @@
}
})
}
- }
+ },
},
methods: {
getPower(){
@@ -803,13 +825,43 @@
insResult: null
}
})
+ this.getReportModel(row.id)
let bushing = this.currentSample.bushing
if(bushing&&bushing.length>0){
this.bushing = bushing
}
- // this.handleTableData()
+ this.handleTableData()
this.getTableLists();
this.currentKey = row.index
+ this.currentTab = null;
+ },
+ getReportModel(id){
+ this.$axios.post(this.$api.insOrderPlan.getReportModel+'?sampleId='+id, {}).then(res => {
+ this.fibers = res.data['鍏夌氦甯�']
+ this.fiber = res.data['鍏夌氦']
+ })
+ },
+ async handleChange(m,type){
+ if(m){
+ let list = await this.getCurrentProduct(m,type)
+ if(list.length>0){
+ list.forEach(a => {
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: [],
+ equipName: [],
+ insResult: null
+ }
+ })
+ this.getTableLists0(list)
+ }else{
+ this.tableLists = []
+ this.tableList = []
+ this.$message.error('妫�楠岄」涓虹┖')
+ }
+ }
},
handleChangeTask(row) {
if (row.length > 0) this.id = row[0].id;
@@ -1087,12 +1139,12 @@
} else {
this.param[b.i].resValue = b
} */
- if (b.i !== undefined) {
+ if (b.i !== undefined&&!this.param[b.i].resValue) {
this.param[b.i].resValue = b
}
}
if (b.v.ps != undefined && b.v.ps.value === '缁撹') {
- if (b.i !== undefined) {
+ if (b.i !== undefined&&!this.param[b.i].insResult) {
this.param[b.i].insResult = b
conclusionList.forEach((n, i) => {
if (n.r == b.r && n.c == b.c) {
@@ -1154,6 +1206,7 @@
this.param[a.id].insResult.v.v = a.insResult
} catch (e) {}
})
+ console.log(this.tableList)
this.handleExcelMethod()
},
changeInput(m, code) {
@@ -1163,6 +1216,7 @@
let id = str[0]
let pId = str[3]
var list = []
+ // console.log(id, 'r', r , 'c',c,this.tableList)
for (let a in this.tableList) {
if (this.tableList[a].templateId == id) {
list = this.tableList[a].arr
@@ -1196,93 +1250,65 @@
}
})
})
- if (item.methodName == '鑷畾涔夋柟娉�' && item.v.ps != undefined && item.v.ps.value == '缁撹') {
+ if (item.v.ps != undefined && item.v.ps.value == '缁撹') {
if (this.currentSample.insProduct.find(m => m.id == item.i)) {
let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask?this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
let res = Object.values(comValue)[0]
let comp = []
- if(ask){
- comp = ask.map((m, i) => {
- if (m.includes('=')) {
- let str = m.split('=')[1]
- if(typeof res == 'string'&&typeof str == 'string'){
- return res.trim() == str.trim()
- }else{
- return res == str
- }
- } else if (m.includes('鈮�')) {
- return res >= m.split('鈮�')[1]
- }else if (m.includes('鈮�')) {
- return res <= m.split('鈮�')[1]
- }else if (m.includes('<')) {
- return res < m.split('<')[1]
- }else if (m.includes('>')) {
- return res > m.split('>')[1]
- }else if (m.includes('~')) {
- let k = m.split('~')
- return res >= k[0] && res <= k[1]
- }else if(m.includes('-')){
- let k = m.split('-')
- return res >= k[0] && res <= k[1]
- }else if(m.includes('卤')){
- let k = m.split('卤')
- return res >= (k[0] - k[1]) && res <= (k[0] + k[1])
+ console.log(res, ask)
+ if(res==''||res==null||res==undefined||res=='Infinity'){
+ item.v.v = ''
+ }else{
+ if(ask){
+ comp = ask.map((m, i) => {
+ if (m.includes('=')) {
+ let str = m.split('=')[1]
+ if(typeof res == 'string'&&typeof str == 'string'){
+ return res.trim() == str.trim()
+ }else{
+ return eval(res) == eval(str)
+ }
+ } else if (m.includes('鈮�')) {
+ console.log(res, eval(res <= m.split('鈮�')[1]))
+ return eval(res) >= eval(m.split('鈮�')[1])
+ }else if (m.includes('鈮�')) {
+ console.log(res,m.split('鈮�')[1])
+ return eval(res) <= eval(m.split('鈮�')[1])
+ }else if (m.includes('<')) {
+ return eval(res) < eval(m.split('<')[1])
+ }else if (m.includes('>')) {
+ return eval(res) > eval(m.split('>')[1])
+ }else if (m.includes('~')) {
+ let k = m.split('~')
+ return eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
+ }else if(m.includes('-')){
+ let k = m.split('-')
+ return eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
+ }else if(m.includes('卤')){
+ let k = m.split('卤')
+ console.log(eval(res),eval((k[0] - k[1])),eval(res),eval((k[0] + k[1])))
+ return eval(res) >= eval((k[0] - k[1])) && eval(res) <= eval((k[0] + k[1]))
+ }else if(m.includes('锛�')){
+ return eval(res) > eval(m.split('锛�')[1])
+ }else if(m.includes('锛�')){
+ return eval(res) < eval(m.split('锛�')[1])
+ }
+ })
}
- })
- }
- if (comp.every(m => m)) {
- item.v.v = 1
- } else {
- item.v.v = 0
+ if (comp.every(m => m)) {
+ item.v.v = 1
+ } else {
+ item.v.v = 0
+ }
}
this.saveInsContext()
}
} else {
- let comResult = 0;
- switch (item.methodName) {
- case 'AVERAGE':
- let num = 0
- for (var a in comValue) {
- num += comValue[a]
- }
- comResult = num / Object.keys(comValue).length
- break;
- case 'SUM':
- let sum = 0
- for (var a in comValue) {
- sum += comValue[a]
- }
- comResult = sum
- break;
- case 'MEDIAN':
- let arr = []
- for (var a in comValue) {
- arr.push(comValue[a])
- }
- comResult = this.median(arr)
- break;
- case 'APS':
- let arr0 = []
- for (var a in comValue) {
- arr0.push(comValue[a])
- }
- 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 comResult = ''
+ try {
+ if(this.getInspectionValueType(item.i)==1){
+ comResult = excelFunction.compute(item.v.f.replace(/=/g, ' '),comValue)
+ }else{
let valueList = [];
item.valueList.forEach(a => {
valueList.push({
@@ -1297,27 +1323,94 @@
}
})
}
- let str = item.v.f.replace(/=/g, ' ');
+ let str = item.v.f.replace(/=/g, ' ')
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('锛�', ',')
- console.log(str)
- try {
- if(this.getInspectionValueType(item.i)==1){
- comResult = eval(str)
- }else{
- comResult = str
- }
- } catch (error) {
+ comResult = str
+ }
+ } catch (error) {
- }
- break;
}
+ // comResult = excelFunction.compute(item.v.f.replace(/=/g, ' '),comValue);
+ // switch (item.methodName) {
+ // case 'AVERAGE':
+ // let num = 0
+ // for (var a in comValue) {
+ // num += comValue[a]
+ // }
+ // comResult = num / Object.keys(comValue).length
+ // break;
+ // case 'SUM':
+ // let sum = 0
+ // for (var a in comValue) {
+ // sum += comValue[a]
+ // }
+ // comResult = sum
+ // break;
+ // case 'MEDIAN':
+ // let arr = []
+ // for (var a in comValue) {
+ // arr.push(comValue[a])
+ // }
+ // comResult = this.median(arr)
+ // break;
+ // case 'APS':
+ // let arr0 = []
+ // for (var a in comValue) {
+ // arr0.push(comValue[a])
+ // }
+ // 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 => {
+ // valueList.push({
+ // name: `${this.comparisonList.find(e=>e.value==a.c).label}${a.r+1}`,
+ // value: 0,
+ // })
+ // })
+ // for (var a in comValue) {
+ // valueList.forEach(b => {
+ // if (b.name == a) {
+ // b.value = comValue[a]
+ // }
+ // })
+ // }
+ // let str = item.v.f.replace(/=/g, ' ');
+ // 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)
+ // }else{
+ // comResult = str
+ // }
+ // } catch (error) {
+
+ // }
+ // break;
+ // }
list.forEach(a => {
- if (a[0].r == item.r && comResult != '') {
+ if (a[0].r == item.r && comResult !== '') {
for (var b in a) {
if (a[b].c == item.c) {
try{
@@ -1405,107 +1498,7 @@
handleExcelMethod() {
if (this.excelMethodList.length > 0) {
this.excelMethodList.map(item => {
- 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('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;
- let r1 = null;
- let c1 = null;
- let mode = item.v.f.split('(')[1].split(')')[0];
- let start = mode.split(':')[0]
- let end = mode.split(':')[1]
- c0 = this.comparisonList.find(j => j.label == start.split('')[0]).value
- r0 = start.replace(/[a-zA-Z]/g, "") - 1
- c1 = this.comparisonList.find(j => j.label == end.split('')[0]).value
- r1 = end.replace(/[a-zA-Z]/g, "") - 1
- for (let i = Number(r0); i <= Number(r1); i++) {
- for (let u = Number(c0); u <= Number(c1); u++) {
- valueList.push({
- r: i,
- c: u
- })
- }
- }
- } else {
- valueList = []
- let regex = /[=\+\-\*\%\(\)\/\^\s]/g
- let mode = item.v.f.replace(regex, ' ').split(' ');
- mode.filter(m => m && !Number(m)&&m!='undefined').forEach(m => {
- let r = m.replace(/[a-zA-Z]/g, "") - 1
- let c = this.comparisonList.find(j => j.label == m.split('')[0]).value
- valueList.push({
- c,
- r
- })
- })
- }
- item.valueList = valueList;
+ item.valueList = excelFunction.changeParameter(item.v.f);
return item;
})
}
--
Gitblit v1.9.3