From cc702f8d62c082c8f4b97b44e094fb8b8c7b97d8 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 31 七月 2024 15:16:06 +0800
Subject: [PATCH] 修改检验任务bug
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 416 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 275 insertions(+), 141 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 498b892..003f684 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -230,7 +230,7 @@
<template>
<div v-loading="loading" class="inspection">
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屽崟璇︽儏
+ <el-col :span="12" style="padding-left: 20px;text-align: left;" >妫�楠屽崟璇︽儏
</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>
@@ -238,12 +238,12 @@
<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"
+ <el-button size="small" type="primary" @click="addVerifyDia = true" v-if="state==1"
:loading="submitLoading">鎻愪氦</el-button>
<!-- 澶嶆牳 -->
<el-button size="medium" type="primary" @click="upInsReview(1)" :loading="reviewLoading"
- v-show="state>1">閫氳繃</el-button>
- <el-button size="medium" @click="upInsReview(0)" v-show="state>1">涓嶉�氳繃</el-button>
+ v-if="state>1">閫氳繃</el-button>
+ <el-button size="medium" @click="upInsReview(0)" v-if="state>1">涓嶉�氳繃</el-button>
<el-button size="small" @click="$emit('goback')">杩斿洖</el-button>
</el-col>
</el-row>
@@ -285,8 +285,8 @@
</el-radio-group>
</div>
<div style="display: flex;align-items: center;">
- <span v-if="fibers.length>0"> 鍏夌氦甯︼細</span>
- <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,1)" v-if="fibers.length>0" size="small">
+ <span v-if="fibers.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'"> 鍏夌氦甯︼細</span>
+ <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,1)" v-if="fibers.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'" size="small">
<el-option
v-for="item in fibers"
:key="item.value"
@@ -296,8 +296,8 @@
<el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'宸叉':'鏈' }}</el-tag>
</el-option>
</el-select>
- <span v-if="fiber.length>0"> 鍏夌氦锛�</span>
- <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,2)" v-if="fiber.length>0" size="small">
+ <span v-if="fiber.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'"> 鍏夌氦锛�</span>
+ <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,2)" v-if="fiber.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'" size="small">
<el-option
v-for="item in fiber"
:label="item.bushColor+'-'+item.color"
@@ -317,16 +317,16 @@
<span style="margin-left: 4px;">%</span>
</el-form-item>
</el-form>
- <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
- <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
+ <el-button type="primary" size="small" v-if="(dataAcquisitionEidt>0||tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'&&temDataAcquisition)&&PROJECT=='妫�娴嬩腑蹇�'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
+ <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="(dataAcquisitionEidt>0)&&PROJECT=='妫�娴嬩腑蹇�'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
</div>
</div>
- <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'&&tableLists.find(m=>m.templateId==currentTable).templateName!='鐑惊鐜楠屽師濮嬭褰�')">
- <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
+ <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐑惊鐜�')&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╁崌璇曢獙'))">
+ <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index+currentTable+currentSample.id">
<tbody>
<tr v-for="(m,i) in item.arr" :key="i">
<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"
+ 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?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}`"
@@ -370,9 +370,13 @@
</el-option>
</el-select>
</template>
+ <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='璁惧鍚嶇О' && state==1">
+ <span>{{ n.v.v }}</span>
+ </template>
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='瑕佹眰鍊�' && state==1">
<span :style="`font-family:${n.v.ff} !important;`">{{getTell(n.i)}}</span>
</template>
+ <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='璁＄畻鍊�' && state==1"><span :style="`font-family:${n.v.ff} !important;`">{{ toFixed(n.v.v,n.v.ct) }}</span></template>
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏈�缁堝��' && state==1">
<!-- <el-input class="table_input" type="textarea"
:disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
@@ -497,24 +501,24 @@
ref="wareTableData"
border
v-loading="wareTableDataLoading"
- style="width: 100%;margin-bottom: 30px;" align="center" v-show="wareForm.inspectionItemSubclass!='20(甯告俯)'&&wareForm.inspectionItemSubclass!='20'||(wareForm.inspectionItemSubclass=='20(甯告俯)'&&wareForm.inspectionItem==1)||(wareForm.inspectionItemSubclass=='20'&&wareForm.inspectionItem==numOptions.length)">
+ style="width: 100%;margin-bottom: 30px;" align="center" v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'&&wareForm.inspectionItemSubclass!='20'||(wareForm.inspectionItemSubclass=='20(甯告俯)'&&wareForm.inspectionItem==1)||(wareForm.inspectionItemSubclass=='20'&&wareForm.inspectionItem==numOptions.length)">
<el-table-column
label="搴忓彿"
type="index"
- width="60"
+ width="59"
align="center"
>
</el-table-column>
<el-table-column
prop="bushColor"
label="绠¤壊鏍�"
- width="80"
+ width="75"
align="center">
</el-table-column>
<el-table-column
prop="code"
label="鍏夌氦甯︾紪鍙�"
- width="110"
+ width="105"
align="center">
</el-table-column>
<el-table-column
@@ -528,7 +532,7 @@
prop="value0"
label="澶栫"
align="center"
- width="80" :key="(new Date())+'1'">
+ width="100" :key="(new Date().getTime())+'1234567'">
<template slot="header">
{{ '澶栫'+(index+1) }}
</template>
@@ -540,7 +544,7 @@
prop="value1"
label="鍐呯"
align="center"
- width="80" :key="(new Date())+'2'">
+ width="100" :key="(new Date().getTime())+'23333333'">
<template slot="header">
{{ '鍐呯'+(index+1) }}
</template>
@@ -551,7 +555,7 @@
<el-table-column
prop="comValue"
align="center"
- min-width="150" :key="(new Date())+'3'">
+ min-width="150" :key="(new Date().getTime())+'364654654'">
<template slot="header">
{{ '琛板噺绯绘暟'+item }}
</template>
@@ -564,7 +568,7 @@
label="琛板噺宸�"
align="center"
v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'"
- min-width="90" :key="(new Date())+'4'">
+ min-width="90" :key="(new Date().getTime())+'434634634634'">
<template slot="header">
{{ '琛板噺宸�'+(index+1) }}
</template>
@@ -576,7 +580,7 @@
prop="insResult"
label="缁撹"
align="center"
- min-width="70" v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'" :key="(new Date())+'5'">
+ min-width="70" v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'" :key="(new Date().getTime())+'53457689809808-'">
<template slot="header">
{{ '缁撹'+(index+1) }}
</template>
@@ -589,9 +593,9 @@
</template>
</el-table>
</div>
- <div v-loading="tableLoading" v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�'">
+ <div v-loading="tableLoading" v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐑惊鐜�')||tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╁崌璇曢獙')">
<el-divider></el-divider>
- <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">鐑惊鐜楠屽師濮嬭褰�</h4>
+ <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">{{tableLists.find(m=>m.templateId==currentTable).templateName}}</h4>
<el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
<el-form-item label="浠櫒鍚嶇О:" style="margin-bottom: 0;">
<el-input clearable v-model="equipForm.value0" disabled size="small" placeholder=""></el-input>
@@ -673,7 +677,7 @@
:data="{
orderId:id
}"
- v-show="state==1&&fileAdd"
+ v-if="state==1&&fileAdd"
:on-success="handleSuccessUp" :show-file-list="false"
accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' :headers="headers" :on-change="beforeUpload"
style="width: 80px !important;"
@@ -742,11 +746,11 @@
</el-table-column>
<!-- 妫�楠屽崟浼氭湁涓�涓槸鍚︽湁閰嶅鏍峰搧瀛楁鎺у埗鏄剧ず -->
<el-table-column prop="joinModel" label="閰嶅鏍峰搧鍨嬪彿" min-width="130px" show-overflow-tooltip
- v-if="insOrder.mating>0"></el-table-column>
+ v-if="insOrder.mating>0"></el-table-column>
<el-table-column prop="joinName" label="閰嶅鏍峰搧鍚嶇О" min-width="130px" show-overflow-tooltip
- v-if="insOrder.mating>0"></el-table-column>
+ v-if="insOrder.mating>0"></el-table-column>
<el-table-column prop="joinNum" label="閰嶅鏍峰搧鏁伴噺" min-width="130px" show-overflow-tooltip
- v-if="insOrder.mating>0"></el-table-column>
+ v-if="insOrder.mating>0"></el-table-column>
</el-table>
</el-drawer>
<el-drawer title="浠诲姟鍒囨崲" :visible.sync="taskVisible" :size="500">
@@ -940,6 +944,7 @@
},
result: null,
worker: null,
+ worker0: null,
wareLength:[],
dataAcquisitionInfo:{},
dataAcquisitionEidt:0,
@@ -955,6 +960,7 @@
inspectionItemClass:null,
},
thermalCyclingLoading:false,
+ temDataAcquisition:false,
}
},
computed: {
@@ -1045,11 +1051,48 @@
},
currentTable(val1, val0) {
if (val0 != null && val1 != val0) {
- this.tableLists.forEach((m, i) => {
+ this.tableLists.forEach(async (m, i) => {
if (m.templateId == val1) {
- this.tableList = null;
- this.tableList = [(this.tableLists[i])];
- this.handleTableData()
+ let list = await this.getCurrentProduct(this.currentSample.id,0)
+ this.currentSample.insProduct = this.HaveJson(list)
+ // console.log(this.currentSample)
+ this.currentSample.insProduct.forEach(a => {
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: [],
+ equipName: [],
+ insResult: null
+ }
+ })
+ this.getReportModel(this.currentSample.id)
+ const mySet1 = new Set();
+ this.tableLists = this.currentSample.insProduct.filter(m => {
+ let num0 = mySet1.size;
+ if (m.templateId != null&&m.template != null) {
+ try {
+ mySet1.add(JSON.stringify({
+ template: m.template,
+ templateId: m.templateId
+ }))
+ } catch (error) {
+ console.log(222,error);
+ }
+ }
+ let num1 = mySet1.size;
+ if (num1 > num0) {
+ return m
+ }
+ });
+ if (this.tableLists && this.tableLists.length > 0) {
+ this.tableList = null;
+ this.tableList = this.tableLists.filter(m => m.templateId == val1)
+ this.handleTableData()
+ }
+ // this.$delete(this.tableList,0)
+ // this.$set(this.tableList, 0, m)
+ // this.handleTableData()
}
})
}
@@ -1057,7 +1100,7 @@
equipForm:{
deep:true,
handler(val){
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')&&this.equipOptions&&this.equipOptions.length>0){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))&&this.equipOptions&&this.equipOptions.length>0){
this.param[this.currentSample.insProduct[0].id].equipValue = []
this.param[this.currentSample.insProduct[0].id].equipName = []
if(this.equipForm.code0){
@@ -1117,80 +1160,94 @@
methods: {
// 鏁版嵁閲囬泦
getDataAcquisitionDevice(){
- this.dataAcquisitionLoading = true
- this.$axios.get(this.$api.deviceScope.dataCollection+'?entrustCode='+this.insOrder.entrustCode+'&sampleCode='+this.currentSample.sampleCode + '&id=' + this.currentSample.id).then(res=>{
- this.dataAcquisitionLoading = false
- if(res.code!=200){
- return
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
+ // 娓╁害寰幆妫�楠屽師濮嬭褰�----鏁伴噰----PK8000
+ let temperature = this.wareForm.inspectionItemSubclass;
+ if(typeof temperature == 'string'&&temperature.includes('(甯告俯)')){
+ temperature = `20鈩�(甯告俯)`
+ }else{
+ temperature = temperature + '鈩�'
}
- this.dataAcquisitionInfo = res.data
- let list = this.tableList[0].arr
- list.forEach((item,index)=>{
- let num = 0;
- let str = ''
- item.forEach(m=>{
- if(m.v.ps&&(m.v.ps.value=='妫�楠屽瓙椤�'||m.v.ps.value=='妫�楠岄」')){
- if(m.v.ps&&m.v.ps.value=='妫�楠岄」'){
- if(num==0){
- str = m.v.v+','
- num++
- }
- }
- if(m.v.ps&&m.v.ps.value=='妫�楠屽瓙椤�'){
- if(num==1){
- str = str+m.v.v
- }
- }
- if(this.dataAcquisitionInfo[str]){
- let num = 0;
- list[index].forEach(n=>{
- if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('妫�楠屽��')){
- num++
- }
- })
- list[index].forEach((n,i)=>{
- if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('妫�楠屽��')){
- let arr = n.v.ps.value.split('鍊�')
- if(arr[1] ==this.dataAcquisitionInfo.frequency){
- setTimeout(()=>{
- this.$delete(n.v,'v')
- this.$set(n.v,'v',this.dataAcquisitionInfo[str])
- this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
- },1000)
- }else if(Number(this.dataAcquisitionInfo.frequency)>num){
- if(n.v.ps.value.includes(num)){
- setTimeout(()=>{
- this.$delete(n.v,'v')
- this.$set(n.v,'v',this.dataAcquisitionInfo[str])
- this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
- },1000)
- }
- }
- }
- })
- }
- }
- })
+ this.dataAcquisitionLoading = true
+ this.$axios.post(this.$api.deviceScope.temDataAcquisition,{
+ entrustCode:this.insOrder.entrustCode,
+ sampleCode:this.currentSample.sampleCode,
+ model:this.wareForm0.model,
+ cycles:this.wareForm.inspectionItem,
+ temperature:temperature,
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ noQs:true
+ }).then(res=>{
+ this.dataAcquisitionLoading = false
+ if(res.code!=200){
+ return
+ }
+ // console.log(res.data)
+ this.wareFormChange()
})
- })
+ }else{
+ // 涓�鑸殑鏁版嵁閲囬泦
+ this.dataAcquisitionLoading = true
+ this.$axios.get(this.$api.deviceScope.dataCollection+'?entrustCode='+this.insOrder.entrustCode+'&sampleCode='+this.currentSample.sampleCode + '&id=' + this.currentSample.id).then(res=>{
+ this.dataAcquisitionLoading = false
+ if(res.code!=200){
+ return
+ }
+ this.dataAcquisitionInfo = res.data
+ try {
+ // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
+ this.worker0.postMessage(JSON.stringify({
+ dataAcquisitionInfo: this.dataAcquisitionInfo,
+ list:this.tableList[0].arr
+ }));
+ } catch (error) {
+ console.log(1111,error);
+ }
+ // 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
+ this.worker0.onmessage = (event) => {
+ let result = JSON.parse(event.data);
+ if(result.method=='changeInput'){
+ let {list,n} = result.value
+ this.$set(this.tableList[0],'arr',list)
+ this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
+ }
+ };
+ })
+ }
},
// 澶氱嚎绋�
startWorker() {
- if (this.worker) {
+ if (this.worker) {
this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
}
// 鍒涘缓 Worker 瀹炰緥
this.worker = new Worker('/static/js/worker.js');
+ if (this.worker0) {
+ this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
+ }
+ // 鍒涘缓 Worker 瀹炰緥
+ this.worker0 = new Worker('/static/js/worker0.js');
},
stopWorker() {
if (this.worker) {
this.worker.terminate();
this.worker = null;
}
+ if (this.worker0) {
+ this.worker0.terminate();
+ this.worker0 = null;
+ }
},
// 娓╁害寰幆---寮�濮�
changeItem(row){
- if(row.value0&&row.value1){
+ if(row.value0&&!row.value1){
+ this.$set(row,'comValue',Number(row.value0).toFixed(3))
+ }else if(!row.value0&&row.value1){
+ this.$set(row,'comValue',Number(row.value1).toFixed(3))
+ }else if(row.value0&&row.value1){
this.$set(row,'comValue',((Number(row.value0)+Number(row.value1))/2).toFixed(3))
}else{
return
@@ -1360,8 +1417,10 @@
let arr1 = []
this.wareLength = [];
for(let i=0;i<arr.length;i++){
- arr1.push([])
this.wareLength.push(arr[i][0].inspectionItemClass)
+ }
+ for(let i=0;i<arr[0].length;i++){
+ arr1.push([])
}
arr.forEach((item,index)=>{
item.forEach((m,i)=>{
@@ -1672,6 +1731,7 @@
let fileDel = false
let fileAdd = false
let collected = false
+ let temDataAcquisition = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'uploadFile') {
fileAdd = true
@@ -1682,12 +1742,16 @@
if (power[i].menuMethod == 'isItAllowedToModifyTheCollectedValues') {
collected = true
}
+ if (power[i].menuMethod == 'temDataAcquisition') {
+ temDataAcquisition = true
+ }
}
if (!fileDel) {
this.componentData0.do.splice(1, 1)
}
this.fileAdd = fileAdd
this.collected = collected
+ this.temDataAcquisition = temDataAcquisition
},
async getCurrentProduct(id,type){
this.tableLoading = true;
@@ -1888,10 +1952,14 @@
this.tableLists = this.currentSample.insProduct.filter(m => {
let num0 = mySet1.size;
if (m.templateId != null&&m.template != null) {
- mySet1.add(JSON.stringify({
- template: m.template,
- templateId: m.templateId
- }))
+ try {
+ mySet1.add(JSON.stringify({
+ template: m.template,
+ templateId: m.templateId
+ }))
+ } catch (error) {
+ console.log(222,error);
+ }
}
let num1 = mySet1.size;
if (num1 > num0) {
@@ -1911,10 +1979,14 @@
this.tableLists = list.filter(m => {
let num0 = mySet1.size;
if (m.templateId != null&&m.template != null) {
- mySet1.add(JSON.stringify({
- template: m.template,
- templateId: m.templateId
- }))
+ try {
+ mySet1.add(JSON.stringify({
+ template: m.template,
+ templateId: m.templateId
+ }))
+ } catch (error) {
+ console.log(333,error);
+ }
}
let num1 = mySet1.size;
if (num1 > num0) {
@@ -1960,7 +2032,7 @@
}
// 娓╁害寰幆妫�楠屽師濮嬭褰�---缁撴潫
// 鐑惊鐜楠屽師濮嬭褰�---寮�濮�
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�'){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
let ask = this.currentSample.insProduct[0].ask
let askList = ask.split(';')
this.thermalCyclingInfo.max = Number(askList[askList.length-1])
@@ -2147,8 +2219,7 @@
conclusionList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '缁撹')
finalList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '鏈�缁堝��')
a.template.forEach( b => {
- if (b.v.ps != undefined && b.v.ps.value === '搴忓彿' && (b.v.mc == undefined || Object.keys(b.v.mc)
- .length === 4)) {
+ if (b.v.ps != undefined && b.v.ps.value === '搴忓彿' && (b.v.mc == undefined || Object.keys(b.v.mc).length === 4)) {
count1++
b.v.v = count1
}
@@ -2156,12 +2227,14 @@
b.v.v = this.getAsk(b.i)
}
if (b.v.ps != undefined && typeof b.v.ps.value ==='string'&&b.v.ps.value.includes('妫�楠屽��')) {
- b.v.v = ''
+ this.$set(b.v, 'v','' )
+ // b.v.v = ''
b.u = ''
b.i && this.param[b.i].insValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁＄畻鍊�') {
- b.v.v = ''
+ this.$set(b.v, 'v','' )
+ // b.v.v = ''
b.i && this.param[b.i].comValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁惧缂栫爜') {
@@ -2237,7 +2310,7 @@
} catch (e) {}
try {
let equipValue = JSON.parse(a.insProductResult.equipValue)
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
this.param[a.id].equipValue = []
for (let i = 0; i < equipValue.length; i++) {
this.param[a.id].equipValue.push({
@@ -2248,7 +2321,7 @@
}
}
for (let i = 0; i < equipValue.length; i++) {
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
// 娓╁害寰幆璁惧璧嬪��
this.$set(this.equipForm,`code`+i,equipValue[i].v)
this.param[a.id].equipValue[i].v.v = equipValue[i].v
@@ -2276,7 +2349,7 @@
} catch (e) {}
try {
let equipName = JSON.parse(a.insProductResult.equipName)
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
this.param[a.id].equipName = []
for (let i = 0; i < equipName.length; i++) {
this.param[a.id].equipName.push({
@@ -2287,7 +2360,7 @@
}
}
for (let i = 0; i < equipName.length; i++) {
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁崌璇曢獙鍘熷璁板綍妯℃澘')){
// 娓╁害寰幆璧嬪��
this.$set(this.equipForm,`value`+i,equipName[i].v)
this.param[a.id].equipName[i].v.v = equipName[i].v
@@ -2319,16 +2392,21 @@
n.v.v = n.v.v.replace('/', '')
}
}
- // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
- this.worker.postMessage(JSON.stringify({
- code: code,
- tableList:this.tableList,
- excelMethodList:this.excelMethodList,
- comparisonList:this.comparisonList,
- currentSample:this.currentSample,
- PROJECT:this.PROJECT,
- param:this.param
- }));
+ try {
+ // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
+ this.worker.postMessage(JSON.stringify({
+ code: code,
+ tableList:this.tableList,
+ excelMethodList:this.excelMethodList,
+ comparisonList:this.comparisonList,
+ currentSample:this.currentSample,
+ PROJECT:this.PROJECT,
+ param:this.param,
+ currentTable:this.currentTable
+ }));
+ } catch (error) {
+ console.log(444,error);
+ }
// 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
this.worker.onmessage = (event) => {
@@ -2409,8 +2487,12 @@
}
this.tableList[0].insProductResult[m].push(obj);
})
+ try {
+ this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
+ } catch (error) {
+ console.log(555,error);
+ }
}
- this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
break;
case 'insValue':
if (value && value.length > 0) {
@@ -2422,8 +2504,12 @@
}
this.tableList[0].insProductResult[m].push(obj);
})
+ try {
+ this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
+ } catch (error) {
+ console.log(666,error);
+ }
}
- this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
break;
case 'equipValue':
if (value && value.length > 0) {
@@ -2434,8 +2520,12 @@
}
this.tableList[0].insProductResult[m].push(obj);
})
+ try {
+ this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
+ } catch (error) {
+ console.log(777,error);
+ }
}
- this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
break;
case 'equipName':
if (value && value.length > 0) {
@@ -2446,8 +2536,12 @@
}
this.tableList[0].insProductResult[m].push(obj);
})
+ try {
+ this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
+ } catch (error) {
+ console.log(888,error);
+ }
}
- this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
break;
case 'resValue':
this.tableList[0].lastValue = value?value.v.v:''
@@ -2511,11 +2605,16 @@
return sum
},
handleInput (n) {
- n.v.v = n.v.v.replace(/[^\d.^e\-/+]/g, '');
- 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("$#$","/");
+ try {
+ n.v.v = n.v.v.replace(/[^\d.^e\-/+]/g, '');
+ 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("$#$","/");
+ } catch (error) {
+ console.log(error);
+ }
+
},
getInspectionItemType(id) {
for (var a in this.currentSample.insProduct) {
@@ -2649,6 +2748,14 @@
this.$message.error("璇锋寚瀹氬鏍镐汉鍛�")
return
}
+ if(!this.otherForm.humidity){
+ this.$message.error("璇疯緭鍏ユ箍搴�")
+ return
+ }
+ if(!this.otherForm.temperature){
+ this.$message.error("璇疯緭鍏ユ俯搴�")
+ return
+ }
this.addVerifyDia = false
this.submitLoading = true;
this.$axios.post(this.$api.insOrderPlan.checkSubmitPlan, {
@@ -2661,8 +2768,7 @@
orderId: this.orderId,
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
- entrustCode: this.insOrder.entrustCode,
- sampleCode: this.currentSample.sampleCode
+ entrustCode: this.insOrder.entrustCode
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
@@ -2715,25 +2821,50 @@
return
},
saveInsContext() {
- // console.log(1111,this.param)
- if(this.param){
- this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
- param: JSON.stringify(this.param)
- }).then(res => {
- if (res.code == 201) {
- this.$message.error('淇濆瓨澶辫触')
- return
- }
- this.$message.success('宸蹭繚瀛�')
- })
+ console.log(1111,this.param)
+ try {
+ if(this.param){
+ this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
+ param: JSON.stringify(this.param)
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('淇濆瓨澶辫触')
+ return
+ }
+ this.$message.success('宸蹭繚瀛�')
+ })
+ // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
+ this.worker.postMessage(JSON.stringify({
+ type: 'saveData',
+ tableList:this.tableList,
+ param:this.param,
+ currentTable:this.currentTable
+ }));
+ }
+ }catch (error) {
+ console.log(999,error);
}
},
changeEquip(val, n) {
+ this.tableList[0].arr.forEach((item,index)=>{
+ item.forEach((m,i)=>{
+ if(this.param[m.i]){
+ this.param[m.i].state = 1
+ }
+ })
+ })
+ for (let i in this.param) {
+ if(this.param[i].state!=1){
+ delete this.param[i]
+ }
+ }
for (let i in this.equipOptions) {
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.$delete(this.param[n.i].equipValue[i1].v,'v')
this.$set(this.param[n.i].equipValue[i1].v,'v',val)
+ this.$delete(this.param[n.i].equipName[i1].v,'v')
this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label)
this.param[n.i].equipValue[i1].isItADataAcquisitionDevice = this.equipOptions[i].isItADataAcquisitionDevice
}
@@ -2750,17 +2881,20 @@
})
}
}
- console.log(this.param)
+ // console.log(this.param)
this.saveInsContext()
},
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
let data = []
+ let userName = JSON.parse(localStorage.getItem("user")).name;
res.data.forEach(a => {
- data.push({
+ if(a.name !== userName) {
+ data.push({
label: a.name,
value: a.id
})
+ }
})
this.personList = data
})
--
Gitblit v1.9.3