tx-lims-before.git

			@@ -278,11 +278,11 @@
			</el-radio-group>
			<el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-if="PROJECT=='检测中心'">
			<el-form-item label="温度:" style="margin-bottom: 0;">
			<el-input clearable v-model="otherForm.temperature" size="small" placeholder="" style="width: 100px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
			<el-input v-model="otherForm.temperature" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
			<span style="margin-left: 4px;">℃</span>
			</el-form-item>
			<el-form-item label="湿度:" style="margin-bottom: 0;">
			<el-input clearable v-model="otherForm.humidity" size="small" placeholder="" style="width: 100px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
			<el-input v-model="otherForm.humidity" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
			<span style="margin-left: 4px;">%</span>
			</el-form-item>
			</el-form>
			@@ -301,8 +301,8 @@
			<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 != '')"
			@input="handleInput(n)" @blur="bigNum(n)"
			@change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" @mousewheel.native.prevent :key="'abc-'+'000'+index+'000'+i+'000'+j">
			@input="handleInput(n)"
			@change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`, n)" @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>
			@@ -517,7 +517,7 @@
			<el-table-column
			prop="comValue"
			align="center"
			label="平均值"
			label="衰减系数"
			min-width="150">
			</el-table-column>
			<el-table-column
			@@ -1478,16 +1478,30 @@
			str += c.v.v
			count4 += 1
			}
			}else if (c.v.ps != undefined && c.v.ps.value === '检验子子项'&&this.PROJECT=='装备电缆') {
			if (count4 === 2) {
			str += c.v.v
			count4 += 1
			}
			}
			// else if (c.v.ps != undefined && c.v.ps.value === '单位'&&this.PROJECT=='检测中心'){
			// if(count4==1\|\|count4==2){
			// str += c.v.v?c.v.v:''
			// console.log('str',str,c)
			// count4 += 1
			// }
			// }
			}
			})
			if (str != '') {
			console.log('str',str)
			let count2 = 0
			for (let i in this.currentSample.insProduct) {
			// (this.currentSample
			// .insProduct[i].unit?this.currentSample
			// .insProduct[i].unit:'')
			if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
			.insProduct[i].inspectionItem +
			(this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample
			.insProduct[i].inspectionItemSubclass) ===
			.insProduct[i].inspectionItem +(this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample.insProduct[i].inspectionItemSubclass)+(this.currentSample.insProduct[i].inspectionItemClass==null\|\|this.PROJECT!='装备电缆'?'':this.currentSample.insProduct[i].inspectionItemClass) ===
			str) {
			ids.push({
			r: b.r,
			@@ -1668,7 +1682,22 @@
			})
			this.handleExcelMethod()
			},
			changeInput(m, code) {
			changeInput(m, code, n) {
			if (n) {
			// if (this.PROJECT === '装备电缆') {
			// let num2 = new this.$Big(n.v.v)
			// n.v.v = num2.toExponential()
			// }
			// 定义一个函数来验证分数是否有效
			function isValidFraction(fraction) {
			const [numerator, denominator] = fraction.split('/'); // 分子和分母
			return !(!denominator \|\| !numerator);
			}
			const isTrue = isValidFraction(n.v.v)
			if (!isTrue) {
			n.v.v = n.v.v.replace('/', '')
			}
			}
			this.startWorker()

			// 向 Worker 发送消息，开始处理逻辑
			@@ -1687,12 +1716,25 @@
			this.result = JSON.parse(event.data);
			switch (this.result.method){
			case 'saveInsContext':
			this.tableList = this.result.value.tableList
			this.param = this.result.value.param
			this.saveInsContext()
			this.$nextTick(()=>{
			this.tableList = this.result.value.tableList
			this.param = this.result.value.param
			for (var i in this.param){
			if(this.param[i].insResult&&this.param[i].insResult.v&&this.param[i].insResult.v.v){
			if(this.param[i].insResult.v.v=='合格'){
			this.$set(this.param[i].insResult.v,'v',1)
			}else if(this.param[i].insResult.v.v=='不合格'){
			this.$set(this.param[i].insResult.v,'v',0)
			}
			}
			}
			this.saveInsContext()
			})
			break;
			case 'tableList':
			this.tableList = this.result.value
			this.$nextTick(()=>{
			this.tableList = this.result.value
			})
			break;
			case 'getCurrentInsProduct':
			this.getCurrentInsProduct(this.result.value)
			@@ -1805,8 +1847,7 @@
			}
			},
			getValue(v){
			let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>'):'')
			// str.replace(new RegExp(search, 'g'), replace)
			let str = v.v?v.v:(v.v===0?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>').replace(new RegExp('@', 'g'), '<br/>'):''))
			return str
			},
			getInspectionValueType(id) {
			@@ -1837,12 +1878,10 @@
			},
			handleInput (n) {
			n.v.v = n.v.v.replace(/[^\d.^e\-/+]/g, '');
			},
			bigNum (n) {
			if (n.v.v > 10000 && this.PROJECT === '装备电缆') {
			let num2 = new this.$Big(n.v.v)
			n.v.v = num2.toExponential()
			}
			n.v.v = n.v.v.replace(/\.{2,}/g,"."); //只保留第一个. 清除多余的
			n.v.v = n.v.v.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
			n.v.v = n.v.v.replace(/\/{2,}/g,"/"); //只保留第一个/清除多余的
			n.v.v = n.v.v.replace("/","$#$").replace(/\//g,"").replace("$#$","/");
			},
			getInspectionItemType(id) {
			for (var a in this.currentSample.insProduct) {
			@@ -2057,7 +2096,8 @@
			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.param[n.i].equipName[i1].v.v = this.equipOptions[i].label
			this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label)
			// this.param[n.i].equipName[i1].v.v = this.equipOptions[i].label
			}
			}
			}
			@@ -2116,6 +2156,7 @@
			this.currentSample = this.HaveJson(this.sampleProduct[index - 1])
			let list = await this.getCurrentProduct(this.currentSample.id,0)
			this.currentSample.insProduct = this.HaveJson(list)
			this.param = {}
			this.currentSample.insProduct.forEach(a => {
			this.param[a.id] = {
			insValue: [],