From cb2a01ee7dea28a2661720060b03c41dc372acb5 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 01 八月 2025 11:53:16 +0800
Subject: [PATCH] 完善串口处理数据，数据选择
---
src/views/business/inspectionTask/components/InspectionWord.vue | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 8e10e5c..755730e 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -17,8 +17,8 @@
</el-radio-group>
</div>
<div style="display: flex;align-items: center;">
- <span v-if="typeSource == '1'"> 澶嶆祴娆℃暟锛�</span>
- <el-select v-if="typeSource == '1'" v-model="retestTag" placeholder="璇烽�夋嫨" size="small"
+ <span> 澶嶆祴娆℃暟锛�</span>
+ <el-select v-model="retestTag" placeholder="璇烽�夋嫨" size="small"
@change="m => handleChangeCableTag(currentSample.id, 4, 'cableTag', m)">
<el-option v-for="item in unPassNumList" :key="item.retestTag" :label="item.retestTag"
:value="item.retestTag">
@@ -33,16 +33,16 @@
<tbody>
<tr v-for="(m, i) in item.arr" :key="i">
<td v-for="(n, j) in m" v-if="n.v.mc == undefined || Object.keys(n.v.mc).length === 4"
- :id='item.templateId + "-" + n.i + "-" + n.r + "-" + n.c' :key="j" :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"
+ :id='item.templateId + "-" + n.i + "-" + n.r + "-" + n.c' :key="j"
+ :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-h-${n.v.ht} content-v-${n.v.vt}`"
:style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`"
class="content">
<template
v-if="n.v.ps != undefined && typeof n.v.ps.value === 'string' && n.v.ps.value.includes('妫�楠屽��') && state == 1">
- <el-input v-if="getInspectionValueType(n.i) == 1" :key="'abc-' + '000' + index + '000' + i + '000' + j"
- v-model="n.v.v"
+ <el-input v-if="getInspectionValueType(n.i) == 1"
+ :key="'abc-' + '000' + index + '000' + i + '000' + j" v-model="n.v.v"
:disabled="(getInspectionItemType(n.i) == 1 && !dataAcquisitionEidtAble) || (n.u != userId && n.u != undefined && n.u != '')"
class="table_input"
@change="m => changeInput(m, `${item.templateId}-${n.r}-${n.c}-${n.i}`, n, 'getDataType')"
@@ -125,7 +125,8 @@
</template>
<template v-else-if="n.v.ps != undefined && n.v.ps.value === '濂楃'">
<div style="display: flex;flex-wrap: nowrap;align-items: center;">
- <div :style="`font-family:${n.v.ff} !important;`">{{ currentBushing ? currentBushing.color : '' }}
+ <div :style="`font-family:${n.v.ff} !important;`">{{ currentBushing ? currentBushing.color : ''
+ }}
</div>
</div>
</template>
@@ -252,8 +253,10 @@
verifyPlan
} from "@/api/business/inspectionTask";
import { getUserNow, saveUnqualifiedContext } from "@/api/business/rawMaterialOrder";
+import InspectionWorker from '@/workers/InspectionWorker.worker';
+import DataWorker from '@/workers/DataWorker.worker';
export default {
- props: ['sonLaboratory', 'orderId', 'state', 'inspectorList', 'typeSource', 'unPassCheck', 'rawMaterialTag'],
+ props: ['sonLaboratory', 'orderId', 'state', 'inspectorList', 'typeSource', 'unPassCheck', 'rawMaterialTag','cableTag', 'repetitionTag'],
components: {
AddUnPass,
UnPassDialog
@@ -426,7 +429,7 @@
getDataTypeId: '',
getDataType: null,
unPassDialog: false, // 涓嶅悎鏍煎鐞嗗脊妗�
- retestTag: '', // 澶嶆祴娆℃暟
+ retestTag: '1', // 澶嶆祴娆℃暟
addCheck: false, // 鎸囧畾瀹℃牳浜哄憳寮规
checkUser: '',
type: '',
@@ -513,7 +516,7 @@
}
}
})
- await this.determineWhetherToCollectData()//鏄惁闇�瑕佹暟閲�
+ // await this.determineWhetherToCollectData()//鏄惁闇�瑕佹暟閲�
if (this.currentSample.index == undefined) this.currentSample['index'] = 1
let bushing = this.currentSample.bushing
this.getTableLists();//澶勭悊妯℃澘鍒楄〃淇℃伅
@@ -816,12 +819,12 @@
this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
}
// 鍒涘缓 Worker 瀹炰緥
- this.worker = new Worker('/static/js/worker.js');
+ this.worker = new InspectionWorker();
if (this.worker0) {
this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
}
// 鍒涘缓 Worker 瀹炰緥
- this.worker0 = new Worker('/static/js/worker0.js');
+ this.worker0 = new DataWorker();
},
// 鍋滄澶氱嚎绋�
stopWorker() {
@@ -845,8 +848,11 @@
laboratory: this.sonLaboratory,
retestTag: this.retestTag,
rawMaterialTag: this.rawMaterialTag,
+ repetitionTag: this.repetitionTag,
+ cableTag: this.cableTag,
}
- let res = getInsProductUnqualifiedRetest(params)
+ let res = await getInsProductUnqualifiedRetest(params)
+ console.log('res---', res)
if (res.code === 200 && res.data.length > 0) {
this.tableLoading = false;
this.scrollInit()
@@ -1280,7 +1286,8 @@
}
})
// 浠ヤ笅鏄牱寮忓鐞嗛�昏緫
- set = Array.sort(set)
+ // set = Array.sort(set)
+ set = [...set]
set.forEach(b => {
let arr = []
a.template.forEach(c => {
@@ -1476,10 +1483,10 @@
}, 200)
},
// 鏄惁闇�瑕佹暟閲�
- async determineWhetherToCollectData() {
- let res = determineWhetherToCollectData({ managementNumber: '' })
- this.isGet = res.data
- },
+ // async determineWhetherToCollectData() {
+ // let res = determineWhetherToCollectData({ managementNumber: '' })
+ // this.isGet = res.data
+ // },
// 鏍规嵁鍚庣浼犲弬鏇存柊椤甸潰鏁版嵁 param => this.tableList[0].insProductResult
getCurrentInsProduct(pId) {
if (!this.tableList[0].insProductResult) {
@@ -1918,7 +1925,7 @@
}
},
getAuthorizedPerson() {
- selectUserCondition({ type: 0 }).then((res) => {
+ selectUserCondition({ type: 1 }).then((res) => {
let data = [];
res.data.forEach((a) => {
data.push({
@@ -2188,7 +2195,7 @@
}
.content-h-2 {
- justify-content: end;
+ justify-content: flex-end;
}
.content-v-0 {
--
Gitblit v1.9.3