From 152a8201c7611c785070f6093e72e5aed6142613 Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期二, 30 七月 2024 13:42:08 +0800 Subject: [PATCH] pk8000前端对接 --- src/components/do/b1-inspect-order-plan/Inspection.vue | 147 +++++++++++++--------------- src/components/do/a6-device/files.vue | 95 ++++++++++++++---- src/assets/api/controller.js | 1 3 files changed, 143 insertions(+), 100 deletions(-) diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js index 7293e2c..13eb73a 100644 --- a/src/assets/api/controller.js +++ b/src/assets/api/controller.js @@ -155,6 +155,7 @@ determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲� dataCollection: "/deviceScope/dataCollection", // 鏁伴噰-鏁版嵁閲囬泦 treeDevice: "/deviceScope/treeDevice", // 璁惧鏍戝舰 + temDataAcquisition: "/deviceScope/temDataAcquisition", // PK8000鏁伴噰 } const insOrder = { diff --git a/src/components/do/a6-device/files.vue b/src/components/do/a6-device/files.vue index 4b05956..bdb6021 100644 --- a/src/components/do/a6-device/files.vue +++ b/src/components/do/a6-device/files.vue @@ -16,75 +16,117 @@ </div> </el-image> </el-col> - <el-col :span="9"> + <el-col :span="8"> <div class="form-item"> <label>璁惧鍚嶇О</label> - <p>鎵弿鐢甸暅(甯﹁兘璋�)</p> + <p>{{ handleData('鎵弿鐢甸暅(甯﹁兘璋�)') }}</p> </div> <div class="form-item"> <label>澶х被</label> - <p>鍒嗘瀽浠櫒</p> + <p>{{ handleData('鍒嗘瀽浠櫒') }}</p> </div> <div class="form-item"> <label>鍐呴儴缂栧彿</label> - <p>鎵弿鐢甸暅(甯﹁兘璋�)</p> + <p>{{ handleData('鎵弿鐢甸暅(甯﹁兘璋�)') }}</p> </div> <div class="form-item"> <label>鐢熶骇鍘傚</label> - <p>-</p> + <p>{{ handleData('鎵弿鐢甸暅(甯﹁兘璋�)') }}</p> </div> <div class="form-item"> <label>璧勪骇缂栫爜</label> - <p>-</p> + <p>{{ handleData('鎵弿鐢甸暅(甯﹁兘璋�)') }}</p> </div> <div class="form-item"> <label>鍑哄巶鏃ユ湡</label> - <p>2024-7-20</p> + <p>{{ handleData('2024-7-20') }}</p> </div> <div class="form-item"> <label>鍚敤鏃ユ湡</label> - <p>2024-7-20</p> + <p>{{ handleData('2024-7-20') }}</p> </div> <div class="form-item"> <label>鏍稿噯鍛ㄦ湡(鏈�)</label> - <p>12</p> + <p>{{ handleData('12') }}</p> </div> <div class="form-item"> <label>妫�娴嬬被鍨�</label> - <p>12</p> + <p>{{ handleData('12') }}</p> </div> <div class="form-item"> <label>鎶ュ簾鏃堕棿</label> - <p>2024-7-20</p> + <p>{{ handleData('12') }}</p> </div> <div class="form-item"> <label>鍑嗙‘搴﹂噺鍊�</label> - <p>-</p> + <p>{{ handleData('12') }}</p> </div> <div class="form-item"> <label>琚巿鏉冧汉</label> - <p>-</p> + <p>{{ handleData('12') }}</p> </div> <div class="form-item"> <label>缁翠慨璁板綍</label> - <p>-</p> + <p>{{ handleData('12') }}</p> </div> </el-col> - <el-col :span="9"> + <el-col :span="10"> <div class="form-item"> <label>瑙勬牸鍨嬪彿</label> - <p>JSM-6010LA</p> + <p>{{ handleData('JSM-6010LA') }}</p> </div> <div class="form-item"> <label>缁嗙被</label> - <p>鍒嗘瀽浠櫒</p> + <p>{{ handleData('鍒嗘瀽浠櫒') }}</p> </div> <div class="form-item"> <label>璁惧鐘舵��</label> <el-radio-group v-model="form.value1" disabled> - <el-radio :label="0">鍚堟牸</el-radio> - <el-radio :label="1">缁翠慨</el-radio> + <el-radio :label="0" style="width: 40px;">鍚堟牸</el-radio> + <el-radio :label="1" style="width: 40px;">缁翠慨</el-radio> + <el-radio :label="2" style="width: 40px;">鍋滅敤</el-radio> + <el-radio :label="3" style="width: 40px;">鎶ュ簾</el-radio> </el-radio-group> + </div> + <div class="form-item"> + <label>鍑哄巶缂栧彿</label> + <p>{{ handleData() }}</p> + </div> + <div class="form-item"> + <label>瀛樻斁鐐�</label> + <p>{{ handleData() }}</p> + </div> + <div class="form-item"> + <label>璐疆鏃ユ湡</label> + <p>{{ handleData() }}</p> + </div> + <div class="form-item"> + <label>浜у湴</label> + <p>{{ handleData() }}</p> + </div> + <div class="form-item"> + <label>鏈�杩戞函婧愭棩鏈�</label> + <p>{{ handleData() }}</p> + </div> + <div class="form-item"> + <label>閲囪喘璐圭敤(鍏�)</label> + <p>{{ handleData() }}</p> + </div> + <div class="form-item"> + <label>鍋滅敤鏃堕棿</label> + <p>{{ handleData() }}</p> + </div> + <div class="form-item"> + <label>璁惧璐熻矗浜�</label> + <p>{{ handleData() }}</p> + </div> + <div class="form-item"> + <label>楠屾敹璁板綍</label> + <p>{{ handleData() }}</p> + </div> + <div class="form-item"> + <label>鏍稿噯璇佷功</label> + <p>{{ handleData() }}</p> </div> </el-col> </el-row> @@ -197,10 +239,21 @@ requiredAdd: [], requiredUp: [] }, - upIndex:0 + upIndex:0, + form: { + value1:'' + } + } + }, + methods: { + handleData(m){ + if(m){ + return m + }else{ + return '-' + } } } - } </script> diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue index 2423696..fb42e85 100644 --- a/src/components/do/b1-inspect-order-plan/Inspection.vue +++ b/src/components/do/b1-inspect-order-plan/Inspection.vue @@ -317,8 +317,8 @@ <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.includes('鐑惊鐜�')&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╁崌璇曢獙'))"> @@ -504,20 +504,20 @@ <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 @@ -531,7 +531,7 @@ prop="value0" label="澶栫" align="center" - width="80" :key="(new Date().getTime())+'1234567'"> + width="100" :key="(new Date().getTime())+'1234567'"> <template slot="header"> {{ '澶栫'+(index+1) }} </template> @@ -543,7 +543,7 @@ prop="value1" label="鍐呯" align="center" - width="80" :key="(new Date().getTime())+'23333333'"> + width="100" :key="(new Date().getTime())+'23333333'"> <template slot="header"> {{ '鍐呯'+(index+1) }} </template> @@ -959,6 +959,7 @@ inspectionItemClass:null, }, thermalCyclingLoading:false, + temDataAcquisition:false, } }, computed: { @@ -1121,80 +1122,63 @@ 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 - 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) + 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 } - }; - // 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) - // } - // } - // } - // }) - // } - // } - // }) - // }) - }) + // 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() { @@ -1705,6 +1689,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 @@ -1715,12 +1700,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; -- Gitblit v1.9.3