From 0479e3bcf39f458669ecd95bf43c20b7a1b1929e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 02 八月 2024 14:17:39 +0800
Subject: [PATCH] 数采升级-前端修改
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 138 +++++++++++++++++++++++++++++++++-------------
1 files changed, 99 insertions(+), 39 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 67022a4..080013c 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -784,7 +784,7 @@
<el-button type="primary" @click="submit()">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="鏁版嵁閲囬泦" :visible.sync="dataGetDia" min-width="400px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="beforeDataGetDia">
+ <el-dialog title="鏁版嵁閲囬泦-璁＄畻鏁版嵁閫夋嫨" :visible.sync="dataGetDia" min-width="400px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="beforeDataGetDia">
<div>
<table border="1" cellpadding="10" class="thermal-table">
<tr>
@@ -798,10 +798,8 @@
<td>{{ item.child[0].name }}</td>
<td>
<el-checkbox-group
- v-model="item.child[0].value"
- :min="0"
- :max="item.child[0].maxNum">
- <el-checkbox v-for="(n,j) in item.child[0].arr" :label="n" :key="j+'ppppppppp'">{{n}}</el-checkbox>
+ v-model="getDataIndex">
+ <el-checkbox v-for="(n,j) in item.child[0].arr" :label="j" :key="j+'ppppppppp'">{{n}}</el-checkbox>
</el-checkbox-group>
</td>
</tr>
@@ -809,10 +807,8 @@
<td>{{ m.name }}</td>
<td>
<el-checkbox-group
- v-model="m.value"
- :min="0"
- :max="m.maxNum">
- <el-checkbox v-for="(n,j) in m.arr" :label="n" :key="j+'bbbbbbbbbbbbbb'">{{n}}</el-checkbox>
+ v-model="getDataIndex">
+ <el-checkbox v-for="(n,j) in m.arr" :label="j" :key="j+'bbbbbbbbbbbbbb'">{{n}}</el-checkbox>
</el-checkbox-group>
</td>
</tr>
@@ -821,7 +817,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="beforeDataGetDia()">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitDataGet()">纭� 瀹�</el-button>
+ <el-button type="primary" @click="submitDataGet()" :loading="getDataIndexLoading">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -988,6 +984,7 @@
worker0: null,
wareLength:[],
dataAcquisitionInfo:{},
+ dataAcquisitionInfoNew:{},
dataAcquisitionEidt:0,
dataAcquisitionEidtAble:false,
dataAcquisitionLoading:false,
@@ -1008,15 +1005,11 @@
child:[
{
name:'1285nm~1330nm',
- arr:[12,13],
- maxNum:1,
- value:[]
+ arr:[12,13,14,15],
},
{
name:'1525nm~1575nm',
- arr:[12,13],
- maxNum:1,
- value:[]
+ arr:[12,13,14,15],
},
]
},
@@ -1026,12 +1019,12 @@
{
name:'鎴嚦娉㈤暱',
arr:[12,13,14,15],
- maxNum:3,
- value:[]
}
]
}
- ]
+ ],
+ getDataIndex:[],
+ getDataIndexLoading:false
}
},
computed: {
@@ -1267,27 +1260,58 @@
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)
- }
- };
+ this.dataAcquisitionInfoNew = this.HaveJson(res.data)
+ this.handleDataAcquisition(res.data)
})
}
+ },
+ handleDataAcquisition(data){
+ this.dataAcquisitionInfo = {}
+ this.getData = []
+ for (let i in data){
+ let obj = {
+ faName:i,
+ child:[]
+ }
+ for(let j in data[i]){
+ if(j!='frequency'&&!data[i][j].isCalculation){
+ this.dataAcquisitionInfo[i+','+j] = {
+ value:data[i][j].result,
+ frequency:data[i].frequency
+ }
+ }else if(j!='frequency'&&data[i][j].isCalculation){
+ let obj0 = {
+ name:j,
+ arr:data[i][j].result
+ }
+ obj.child.push(obj0)
+ }
+ }
+ if(obj.child.length>0){
+ this.getData.push(obj)
+ }
+ }
+ if(this.getData.length>0){
+ this.dataGetDia = true
+ }
+ 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)
+ }
+ };
},
beforeDataGetDia(done){
this.$confirm('鏄惁鍙栨秷鏁版嵁閲囬泦?', "鎻愮ず", {
@@ -1302,7 +1326,43 @@
}
}).catch(() => {})
},
- submitDataGet(){},
+ submitDataGet(){
+ if(this.getDataIndex.length==0){
+ this.$message.error('璇烽�夋嫨闇�瑕佽绠楃殑鏁版嵁')
+ return
+ }
+ this.getDataIndex.sort((a, b) => a - b);
+ for (let i in this.dataAcquisitionInfoNew){
+ for(let j in this.dataAcquisitionInfoNew[i]){
+ if(j!='frequency'&&this.dataAcquisitionInfoNew[i][j].isCalculation){
+ let arr = []
+ for(let k = 0;k<this.dataAcquisitionInfoNew[i][j].result.length;k++){
+ if(this.getDataIndex.includes(k)){
+ arr.push(this.dataAcquisitionInfoNew[i][j].result[k])
+ }
+ }
+ if(arr.length>0){
+ this.dataAcquisitionInfoNew[i][j].result = arr
+ }
+ }
+ }
+ }
+ this.getDataIndexLoading = true;
+ this.$axios.post(this.$api.deviceScope.formulaCalculation,{
+ map:this.dataAcquisitionInfoNew
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ noQs:true
+ }).then(res=>{
+ this.getDataIndexLoading = false;
+ if(res.code!=200){
+ return
+ }
+ this.handleDataAcquisition(res.data.map)
+ })
+ },
// 澶氱嚎绋�
startWorker() {
if (this.worker) {
--
Gitblit v1.9.3