From 7e7a8e3b15df991b9c3fbd22b94534b1d1984e29 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 14 九月 2026 19:54:28 +0800
Subject: [PATCH] 新疆——新聚lims 1.检验任务详情逻辑重构，不需要判断结论逻辑，添加复杂运算逻辑
---
src/views/business/inspectionTask/components/InspectionWord.vue | 773 ++++++++++++----------------------------------------------
1 files changed, 167 insertions(+), 606 deletions(-)
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index bd71a78..4c61c6b 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -41,7 +41,8 @@
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"
+ <el-input
+ v-if="getInspectionValueType(n.i) == 1 || (getInspectionValueType(n.i) != 2 && getInspectionValueType(n.i) != 4)"
: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"
@@ -61,34 +62,6 @@
<span v-else-if="getInspectionValueType(n.i) == 4"
:style="`font-family:${n.v.ff} !important;`">/</span>
</template>
- <template v-else-if="n.v.ps != undefined && n.v.ps.value === '缁撹'">
- <el-select
- v-if="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state == 1"
- v-model="n.v.v" class="table_input"
- @change="m => changeInput(m, `${item.templateId}-${n.r}-${n.c}-${n.i}`, n, 'getDataType')">
- <el-option :value="1" label="鍚堟牸"></el-option>
- <el-option :value="0" label="涓嶅悎鏍�"></el-option>
- <el-option :value="3" label="涓嶅垽瀹�"></el-option>
- <el-option :value="2" label="寰呭畾"></el-option>
- </el-select>
- <template v-if="state > 1">
- <span v-if="n.v.v === 1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
- <span v-else-if="n.v.v === 0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
- <span v-else-if="n.v.v === 3"
- :style="`font-family:${n.v.ff} !important;color: #3A7BFA;`">涓嶅垽瀹�</span>
- <span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
- </template>
- <template v-if="getInspectionValueType(n.i) != 2 && state == 1">
- <span v-if="n.v.v === 1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
- <span v-else-if="n.v.v === 0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
- <span v-else-if="n.v.v === 3"
- :style="`font-family:${n.v.ff} !important;color: #3A7BFA;`">涓嶅垽瀹�</span>
- <span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
- </template>
- </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 === '璁惧鍚嶇О'">
<el-select v-model="n.v.v" :disabled="state > 1" class="table_input" filterable multiple
placeholder="璁惧" remote @change="(val) => changeEquip(val, n)"
@@ -98,9 +71,6 @@
{{ item.label + '--' + item.value }}
</el-option>
</el-select>
- </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>
@@ -510,22 +480,9 @@
return
}
this.currentSample.insProduct = this.HaveJson(list)
- // 鍒濆鍖栦紶閫掑埌鍚庣鐨勫弬鏁�
+ // 鍒濆鍖栦紶閫掑埌鍚庣鐨勫弬鏁�,鎸夆�滄ā鏉縤d + 鍗曞厓鏍煎潗鏍�(r-c)鈥濆瓨
this.param = {}
this.changeType = 0;
- this.currentSample.insProduct.forEach(a => {
- // 鏄惁涓烘垚鍝佺數缂嗕笅鐨勬澗濂楃椤圭洰锛屼笉鏄垯鎵ц鍒濆鍖�
- if (this.handleCasing(a.inspectionItem)) {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null
- }
- }
- })
// await this.determineWhetherToCollectData()//鏄惁闇�瑕佹暟閲�
if (this.currentSample.index == undefined) this.currentSample['index'] = 1
let bushing = this.currentSample.bushing
@@ -545,19 +502,7 @@
if (m.templateId == val1) {
let list = await this.getCurrentProduct(this.currentSample.id, 0)
this.currentSample.insProduct = this.HaveJson(list)//璧嬪�煎綋鍓嶆牱鍝佺殑妫�楠岄」
- this.param = {}//鍒濆鍖栦紶鍒板悗绔殑鍙傛暟
- this.currentSample.insProduct.forEach((a, j) => {
- if (this.handleCasing(a.inspectionItem)) {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null
- }
- }
- })
+ this.param = {}//鍒濆鍖栦紶鍒板悗绔殑鍙傛暟,鎸夆�滄ā鏉縤d + 鍗曞厓鏍煎潗鏍�(r-c)鈥濆瓨
// 鍘婚噸妯℃澘锛岃繑鍥炴湁鍑犱釜妯℃澘
const mySet1 = new Set();
this.tableLists = this.currentSample.insProduct.filter(m => {
@@ -590,47 +535,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.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) {
- // 璧嬪�肩涓�涓澶囩殑淇℃伅
- this.equipForm.value0 = this.equipOptions.find(m => m.value == this.equipForm.code0).label
- this.param[this.currentSample.insProduct[0].id].equipValue.push({
- i: this.currentSample.insProduct[0].id,
- v: {
- v: this.equipForm.code0
- }
- })
- this.param[this.currentSample.insProduct[0].id].equipName.push({
- i: this.currentSample.insProduct[0].id,
- v: {
- v: this.equipForm.value0
- }
- })
- }
- if (this.equipForm.code1) {
- // 璧嬪�肩浜屼釜璁惧鐨勪俊鎭�
- this.equipForm.value1 = this.equipOptions.find(m => m.value == this.equipForm.code1).label
- this.param[this.currentSample.insProduct[0].id].equipValue.push({
- i: this.currentSample.insProduct[0].id,
- v: {
- v: this.equipForm.code1
- }
- })
- this.param[this.currentSample.insProduct[0].id].equipName.push({
- i: this.currentSample.insProduct[0].id,
- v: {
- v: this.equipForm.value1
- }
- })
- }
- // 淇濆瓨鏁版嵁
- this.saveInsContext()
- }
- }
+ handler(val) { },
},
},
beforeDestroy() {
@@ -894,16 +799,6 @@
let list = await this.getCurrentProduct(m, type, cableTag)
if (list.length > 0) {
this.param = {}
- list.forEach(a => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null
- }
- })
this.getTableLists0(list)
this.worker.postMessage(JSON.stringify({
type: 'saveData',
@@ -1084,129 +979,19 @@
count++
})
})
- // 鏈寰幆涓昏鏄帶鍒跺悎骞�,浠ュ強鎺у埗妫�楠岄」淇℃伅鏄惁灞曠ず鍑烘潵,浠ヤ究鍚庣画妫�楠�
+ // 鎸夊悗绔笅鍙戠殑鈥滄ā鏉縄D + 妯℃澘琛屽彿鈥濈洿鎺ョ粦瀹氭楠岄」锛屼笉鍋氬悕绉版瘮瀵癸紝涓嶉殣钘忎换浣曡
this.tableList.forEach(a => {
- let dels = new Set()//闇�瑕佸垹闄ょ殑琛�
- let ids = []//鎵�鏈夋楠岄」鐨刬d
- let set3 = new Set()
- a.template.forEach(b => {
- let size1 = set3.size
- let size2 = set3.add(b.r).size
- if (size1 < size2) {
- let str = ''
- let str2 = ''
- let unit2 = ''
- let count4 = 0
- let isThree = 0
- a.template.forEach(c => {
- // 鑾峰彇鍒� 妫�楠岄」鍒嗙被+妫�楠岄」+妫�楠屽瓙椤圭殑鎷兼帴,濡傛灉妯℃澘閲岀殑淇℃伅璺熸帴鍙ｈ繑鍥炵殑妫�楠岄」淇℃伅鑳藉鍖归厤鍒欏睍绀哄嚭鏉�
- if (b.r === c.r) {
- if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」鍒嗙被' && count4 === 0) {
- // 涓夌骇鍒嗙被
- isThree = 1
- } else if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」' && count4 === 0) {
- // 浜岀骇鍒嗙被
- isThree = 0
- }
- if (isThree == 0) {
- if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」') {
- if (count4 === 0) {
- str += c.v.v
- count4 += 1
- }
- } else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙椤�') {
- if (count4 === 1) {
- str += c.v.v
- count4 += 1
- }
- }
- } else if (isThree == 1) {
- if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」鍒嗙被') {
- if (count4 === 0) {
- str += c.v.v
- count4 += 1
- }
- } else if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」') {
- if (count4 === 1) {
- str += c.v.v
- count4 += 1
- }
- } else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙椤�') {
- if (count4 === 2) {
- str += c.v.v
- count4 += 1
- }
- }
- }
- if (str === '鏈烘鎬ц兘骞叉�佹媺浼稿己搴�(绾靛悜)') {
- if (c.v.ps != undefined && c.v.ps.value === '鍗曚綅') {
- str2 = str + c.v.v
- unit2 = c.v.v
-
- }
- }
- }
- })
- if (str != '') {
- let count2 = 0
- for (let i in this.currentSample.insProduct) {
- let inspectionItemClass = this.currentSample.insProduct[i].inspectionItemClass == null || this.currentSample.insProduct[i].inspectionItemClass == undefined ? '' : this.currentSample.insProduct[i].inspectionItemClass
- let inspectionItem = this.currentSample.insProduct[i].inspectionItem == null || this.currentSample.insProduct[i].inspectionItem == undefined ? '' : this.currentSample.insProduct[i].inspectionItem
- let inspectionItemSubclass = this.currentSample.insProduct[i].inspectionItemSubclass == null || this.currentSample.insProduct[i].inspectionItemSubclass == undefined ? '' : this.currentSample.insProduct[i].inspectionItemSubclass
- if (inspectionItemSubclass === '骞叉�佹媺浼稿己搴�(绾靛悜)') {
- // 妫�楠屽瓙椤逛负'骞叉�佹媺浼稿己搴�(绾靛悜)'鏃讹紝妯＄増閲屾槸涓や釜璁＄畻鍊煎搴旂浉鍚岀殑妫�楠屽�煎苟涓旇绠楁柟寮忎笉鍚岋紝瑕佹牴鎹浉鍚岀殑'鍗曚綅'鍋氱壒娈婄殑娓叉煋
- const unit = this.currentSample.insProduct[i].unit
- if ((this.currentSample.insProduct[i].templateId === a.templateId && inspectionItemClass + inspectionItem + inspectionItemSubclass + unit === str2) || (this.currentSample.insProduct[i].templateId === a.templateId && !unit2.includes('/') && inspectionItemClass + inspectionItem + inspectionItemSubclass === str)) {
- ids.push({
- r: b.r,
- id: this.currentSample.insProduct[i].id,
- product: this.currentSample.insProduct[i]
- })
- break
- }
- } else {
- // 濡傛灉鐩哥瓑,閭ｄ箞璇存槑鎵惧埌浜�,骞朵笖鎶奿d瀛樿捣鏉�,鍚庣画妫�楠岄」涔熶細鍦ㄩ〉闈腑鏄剧ず鍑烘潵
- if (this.currentSample.insProduct[i].templateId === a.templateId && inspectionItemClass + inspectionItem + inspectionItemSubclass === str) {
- ids.push({
- r: b.r,
- id: this.currentSample.insProduct[i].id,
- product: this.currentSample.insProduct[i]
- })
- break
- }
- }
- count2++
- }
- if (count2 == this.currentSample.insProduct.length) {
- dels.add(b.r)
- }
+ const directProducts = this.currentSample.insProduct.filter(
+ (product) => product.templateId === a.templateId &&
+ product.templateRowIndex !== null && product.templateRowIndex !== undefined
+ );
+ directProducts.forEach((product) => {
+ a.template.forEach((cell) => {
+ if (cell.r === product.templateRowIndex) {
+ cell.i = product.id;
}
- }
- })
- // 鎿嶄綔鍒犻櫎
- dels.forEach(del => {
- for (let b = 0; b < a.template.length; b++) {
- if (a.template[b].r === del) {
- a.template.splice(b, 1)
- b -= 1
- }
- }
- })
- // 鎿嶄綔璧嬪��--涓昏璧嬪�煎崟浣�,璇曢獙鏂规硶绛変俊鎭�
- ids.forEach(id => {
- for (let b = 0; b < a.template.length; b++) {
- if (a.template[b].r === id.r) {
- a.template[b].i = id.id
- if (a.template[b].v.ps != undefined && a.template[b].v.ps.value === '鍗曚綅') {
- a.template[b].v.v = id.product.unit
- }
- if (a.template[b].v.ps != undefined && (a.template[b].v.ps.value === '璇曢獙鏂规硶' || a.template[b].v
- .ps.value === '妫�娴嬫柟娉�')) {
- a.template[b].v.v = id.product.methodS
- }
- }
- }
- })
+ });
+ });
let set2 = new Set()
// 鍚堝苟鐨勬暟鎹鐞�,cs rs 浠ｈ〃鍚堝苟鐨勬暟閲�
a.template.forEach(b => {
@@ -1233,60 +1018,24 @@
let arrs = []
let set = new Set()
let count1 = 0
- let conclusionList = []; //缁撹鍒楄〃
- let finalList = []; //鏈�缁堝�煎垪琛�
- // 缁撹涓庢渶缁堝�煎湪杩欓噷涓�涓�瀵瑰簲,浠ヤ笅涓や釜鍒楄〃闀垮害鑲畾鏄竴鏍风殑,濡傛灉鏈変笉涓�鏍�,閭ｄ箞澶氬崐鏄ā鏉块厤缃緱闂
- 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)) {
// 瀵瑰簭鍙疯繘琛岃祴鍊�
count1++
b.v.v = count1
}
- if (b.v.ps != undefined && b.v.ps.value === '瑕佹眰鍊�') {
- // 瀵硅姹傚�艰繘琛岃祴鍊�
- b.v.v = this.getAsk(b.i)
- }
- // 瀵归〉闈㈢殑鍜岀粰鍚庣浼犲弬鐨勬楠屽��,璁＄畻鍊�,璁惧缂栫爜,璁惧鍚嶇О,鏈�缁堝��,缁撹杩涜鍒濆鍖�
- if (b.v.ps != undefined && typeof b.v.ps.value === 'string' && b.v.ps.value.includes('妫�楠屽��')) {
+ // 鍒濆鍖栧彲濉啓/鍙绠楀崟鍏冩牸,鍚庣画鎸夊潗鏍囧洖鏄�
+ if (
+ b.v.ps != undefined &&
+ typeof b.v.ps.value === 'string' &&
+ (b.v.ps.value.includes('妫�楠屽��') ||
+ b.v.ps.value === '璁＄畻鍊�' ||
+ b.v.ps.value === '鏈�缁堝��' ||
+ b.v.ps.value === '璁惧鍚嶇О')
+ ) {
this.$set(b.v, 'v', '')
- // b.v.v = ''
- b.u = ''
- b.i && this.param[b.i] && this.param[b.i].insValue.push(b)
- }
- if (b.v.ps != undefined && b.v.ps.value === '璁＄畻鍊�') {
- this.$set(b.v, 'v', '')
- // b.v.v = ''
- b.i && this.param[b.i] && this.param[b.i].comValue.push(b)
- }
- if (b.v.ps != undefined && b.v.ps.value === '璁惧缂栫爜') {
- // b.v.v = ''
- this.$set(b.v, 'v', '')
- b.i && this.param[b.i] && this.param[b.i].equipValue.push(b)
- }
- if (b.v.ps != undefined && b.v.ps.value === '璁惧鍚嶇О') {
- this.$set(b.v, 'v', '')
- // b.v.v = ''
- b.i && this.param[b.i] && this.param[b.i].equipName.push(b)
- }
- if (b.v.ps != undefined && b.v.ps.value === '鏈�缁堝��') {
- // b.v.v = ''
- this.$set(b.v, 'v', '')
- if (b.i !== undefined && this.param[b.i] && !this.param[b.i].resValue) {
- this.param[b.i].resValue = b
- }
- }
- if (b.v.ps != undefined && b.v.ps.value === '缁撹') {
- if (b.i !== undefined && this.param[b.i] && !this.param[b.i].insResult) {
- this.param[b.i].insResult = b
- conclusionList.forEach((n, i) => {
- if (n.r == b.r && n.c == b.c) {
- b.v.f =
- `(${this.comparisonList.find(j => j.value == (finalList[i].c)).label}${finalList[i].r + 1})`
-
- }
- })
+ if (b.v.ps.value.includes('妫�楠屽��')) {
+ b.u = ''
}
}
set.add(b.r)
@@ -1313,97 +1062,45 @@
this.tableWidth += (a.style.columnlen[i] === undefined ? 100 : a.style.columnlen[i])
}
})
- // 鏈寰幆涓昏鏄椤甸潰鍙婂悗绔紶鍙傝繘琛屽垵濮嬪寲璧嬪��
- this.currentSample.insProduct.forEach(async a => {
- try {
- // 璁＄畻鍊艰祴鍊�
- let comValue = JSON.parse(a.insProductResult.comValue)
- for (var i = 0; i < comValue.length; i++) {
- this.param[a.id].comValue[i].v.v = this.toFixed(comValue[i].v, this.param[a.id].comValue[i].v.ct)
- }
- } catch (e) { }
- try {
- // 妫�楠屽�艰祴鍊�
- let insValue = JSON.parse(a.insProductResult.insValue)
- for (let i = 0; i < insValue.length; i++) {
- if (this.param[a.id].insValue.find(m => m.c == insValue[i].c && m.r == insValue[i].r)) {
- this.param[a.id].insValue.find(m => m.c == insValue[i].c && m.r == insValue[i].r).v.v = this.toFixed(insValue[i].v, this.param[a.id].insValue.find(m => m.c == insValue[i].c && m.r == insValue[i].r).v.ct)
- this.param[a.id].insValue.find(m => m.c == insValue[i].c && m.r == insValue[i].r).u = insValue[i].u
- // this.param[a.id].insValue[i].v.v = insValue[i].v
- // this.param[a.id].insValue[i].u = insValue[i].u
- }
- }
- } 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.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({
- v: {
- v: ''
- }
- })
- }
- }
- 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.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
- } else {
- // 鏅�氳澶囪祴鍊�
- this.param[a.id].equipValue[i].v.v = equipValue[i].v
- }
- }
- } catch (e) { }
- try {
- // 璁惧鍚嶇О璧嬪��
- let equipName = JSON.parse(a.insProductResult.equipName)
- for (let i = 0; i < equipName.length; i++) {
- equipName[i].v !== '' && equipName[i].v.map(val => {
- const index = this.equipOptions.findIndex(item => item.value === val)
- if (index > -1) {
- // 鏍规嵁璁惧缂栫爜杞崲涓虹浉搴旂殑璁惧鍚嶇О
- val = this.equipOptions[index].deviceName
- }
- })
- }
- 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({
- v: {
- v: ''
- }
- })
- }
- }
- 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.includes('鐑惊鐜�') || this.tableLists.find(m => m.templateId == this.currentTable).templateName.includes('娓╁崌璇曢獙'))) {
- // 娓╁害寰幆璧嬪��
- this.$set(this.equipForm, `value` + i, equipName[i].v)
- this.param[a.id].equipName[i].v.v = equipName[i].v
- } else {
- // 鏅�氳澶囧悕绉拌祴鍊�
- this.param[a.id].equipName[i].v.v = equipName[i].v
- }
- }
- } catch (e) {
- console.log('璁惧鍚嶇О璧嬪��----', e)
- }
- try {
- // 鏈�缁堝�艰祴鍊�
- this.param[a.id].resValue.v.v = this.toFixed(a.lastValue, this.param[a.id].resValue.v.ct)
- // 缁撹璧嬪��
- this.param[a.id].insResult.v.v = a.insResult
- } catch (e) { }
- })
+ // 鎸夆�滄ā鏉縤d + 鍗曞厓鏍煎潗鏍�(r-c)鈥濆洖鏄惧凡淇濆瓨鐨勫��
+ this.initParamByCoordinate()
// 瀵筫xcel鍑芥暟杩涜澶勭悊
this.handleExcelMethod()
+ },
+ // 鎸夆�滄ā鏉縤d + 鍗曞厓鏍煎潗鏍�(r-c)鈥濆洖鏄惧凡淇濆瓨鐨勫��
+ initParamByCoordinate() {
+ this.param = {}
+ this.tableList.forEach(a => {
+ this.param[a.templateId] = {}
+ const product = this.currentSample.insProduct.find(m => m.templateId === a.templateId)
+ let saved = (product && (product.recordValues || product.insProductResult)) || {}
+ if (typeof saved === 'string') {
+ try {
+ saved = JSON.parse(saved)
+ } catch (e) {
+ saved = {}
+ }
+ }
+ a.template.forEach(cell => {
+ const key = `${cell.r}-${cell.c}`
+ const item = saved[key]
+ if (item === undefined || item === null) {
+ return
+ }
+ const value = typeof item === 'object' ? item.v : item
+ if (value === undefined || value === null) {
+ return
+ }
+ cell.v.v = value
+ if (typeof item === 'object' && item.u) {
+ cell.u = item.u
+ }
+ this.param[a.templateId][key] = {
+ v: value,
+ u: typeof item === 'object' ? item.u : cell.u
+ }
+ })
+ })
},
// 妫�楠屽�艰緭鍏ュ悗瑙﹀彂鐨勫嚱鏁�
changeInput(m, code, n, getDataType) {
@@ -1411,9 +1108,7 @@
if (getDataType == 'getDataType') {
this.getDataType = 2;
}
- let currentInsItemId = null//褰撳墠妫�楠岄」id
if (n) {
- currentInsItemId = JSON.parse(JSON.stringify(n.i))
// 瀹氫箟涓�涓嚱鏁版潵楠岃瘉鍒嗘暟鏄惁鏈夋晥
if (typeof n.v.v == 'string') {
function isValidFraction(fraction) {
@@ -1441,6 +1136,10 @@
modelType: this.sampleProduct[0].model,
currentInsItem: n
}));
+ // 鍏堜繚瀛樹富绾跨▼涓凡缁忚緭鍏ョ殑鍘熷鍊笺�俉orker 瀹屾垚璁＄畻鍚庝細鍐嶆鍏ラ槦淇濆瓨璁＄畻缁撴灉銆�
+ if (n) {
+ this.saveInsContext()
+ }
} catch (error) {
console.log(444, error);
}
@@ -1450,24 +1149,11 @@
this.result = JSON.parse(event.data);
switch (this.result.method) {
case 'saveInsContext':
- console.log(`output->`, 11111111111111)
this.$nextTick(() => {
- // this.$delete(this.tableList[0],'arr')
- this.$set(this.tableList[0], 'arr', this.result.value.tableList[0].arr)
- this.param = this.result.value.param
- if (this.result.value.currentInsItem) {
- currentInsItemId = this.result.value.currentInsItem.i
- }
- // 鐗规畩澶勭悊涓�涓嬬粨璁�,浼氭湁杩欑鐗规畩鎯呭喌
- 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)
- }
- }
- }
+ const resultValue = this.result.value
+ this.$set(this.tableList[0], 'arr', resultValue.tableList[0].arr)
+ this.param = resultValue.param
+ this.saveInsContext()
})
break;
case 'tableList':
@@ -1475,116 +1161,16 @@
// 鏇存柊鏁版嵁
this.$delete(this.tableList[0], 'arr')
this.$set(this.tableList[0], 'arr', this.result.value[0].arr)
- // this.param = this.result.value.param
- if (this.result.value.currentInsItem) {
- currentInsItemId = this.result.value.currentInsItem.i
- }
})
- break;
- case 'getCurrentInsProduct':
- // 鏇存柊椤甸潰鏁版嵁
- this.getCurrentInsProduct(this.result.value)
break;
}
};
- // 淇濆瓨鏁版嵁
- setTimeout(() => {
- this.saveInsContext(currentInsItemId)
- }, 200)
},
// 鏄惁闇�瑕佹暟閲�
// async determineWhetherToCollectData() {
// let res = determineWhetherToCollectData({ managementNumber: '' })
// this.isGet = res.data
// },
- // 鏍规嵁鍚庣浼犲弬鏇存柊椤甸潰鏁版嵁 param => this.tableList[0].insProductResult
- getCurrentInsProduct(pId) {
- if (!this.tableList[0].insProductResult) {
- this.tableList[0].insProductResult = {}
- }
- for (let m in this.param[pId]) {
- let value = this.param[pId][m]
- switch (m) {
- case 'comValue':
- // 璧嬪�艰绠楀��
- if (value && value.length > 0) {
- this.tableList[0].insProductResult[m] = [];
- value.forEach((a, i) => {
- let obj = {
- v: a.v.v,
- }
- 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);
- }
- }
- break;
- // 璧嬪�兼楠屽��
- case 'insValue':
- if (value && value.length > 0) {
- this.tableList[0].insProductResult[m] = [];
- value.forEach((a, i) => {
- let obj = {
- v: a.v.v,
- u: a.u,
- }
- 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);
- }
- }
- break;
- // 璧嬪�艰澶囩紪鍙�
- case 'equipValue':
- if (value && value.length > 0) {
- this.tableList[0].insProductResult[m] = [];
- value.forEach((a, i) => {
- let obj = {
- v: a.v.v,
- }
- 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);
- }
- }
- break;
- // 璧嬪�艰澶囧悕绉�
- case 'equipName':
- if (value && value.length > 0) {
- this.tableList[0].insProductResult[m] = [];
- value.forEach((a, i) => {
- let obj = {
- v: a.v.v,
- }
- 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);
- }
- }
- break;
- // 璧嬪�兼渶缁堝��
- case 'resValue':
- this.tableList[0].lastValue = value ? value.v.v : ''
- break;
- // 璧嬪�肩粨璁�
- case 'insResult':
- this.tableList[0].insResult = value ? value.v.v : ''
- break;
- }
- }
- },
// 瀵笶XCEL鍑芥暟杩涜澶勭悊
handleExcelMethod() {
if (this.excelMethodList.length > 0) {
@@ -1615,14 +1201,6 @@
for (var a in this.currentSample.insProduct) {
if (this.currentSample.insProduct[a].id == id) {
return this.currentSample.insProduct[a].inspectionValueType
- }
- }
- },
- // 鑾峰彇瑕佹眰鎻忚堪
- getTell(id) {
- for (var a in this.currentSample.insProduct) {
- if (this.currentSample.insProduct[a].id == id) {
- return this.currentSample.insProduct[a].tell
}
}
},
@@ -1659,26 +1237,22 @@
}
}
},
- // 鑾峰彇瑕佹眰鍊�
- getAsk(id) {
- for (var a in this.currentSample.insProduct) {
- if (this.currentSample.insProduct[a].id == id) {
- return this.currentSample.insProduct[a].ask
- }
- }
- },
getSystemValue(n) {
let code = null
try {
- this.param[n.i].equipValue.forEach(a => {
- if (a.r === n.r) {
- if (a.v.v == null || a.v.v == '') {
- this.$message.error('璇峰厛閫夋嫨閲囬泦鐨勮澶�')
- return
- } else {
- code = a.v.v
- }
- }
+ this.tableList.forEach(table => {
+ (table.arr || []).forEach(row => {
+ row.forEach(cell => {
+ if (cell.i == n.i && cell.r === n.r && cell.v.ps && cell.v.ps.value === '璁惧缂栫爜') {
+ if (cell.v.v == null || cell.v.v == '') {
+ this.$message.error('璇峰厛閫夋嫨閲囬泦鐨勮澶�')
+ return
+ } else {
+ code = cell.v.v
+ }
+ }
+ })
+ })
})
} catch (e) {
// console.log(e);
@@ -1857,91 +1431,97 @@
})
return
},
- // 缁熶竴鍦ㄨ繖閲屼繚瀛樻暟鎹�
- saveInsContext(currentInsItemId) {
- try {
- if (this.param) {
- let param = null
- if (currentInsItemId) {
- param = { [currentInsItemId]: this.param[currentInsItemId] }
- } else {
- param = this.param
+ // 鎸夆�滄ā鏉縤d + 鍗曞厓鏍煎潗鏍�(r-c)鈥濅粠褰撳墠妯℃澘蹇収鍑哄緟淇濆瓨鍙傛暟
+ buildParam() {
+ const param = {}
+ this.tableList.forEach(a => {
+ param[a.templateId] = {}
+ a.template.forEach(cell => {
+ const isEditable =
+ cell.v.ps != undefined &&
+ typeof cell.v.ps.value === 'string' &&
+ (cell.v.ps.value.includes('妫�楠屽��') ||
+ cell.v.ps.value === '璁＄畻鍊�' ||
+ cell.v.ps.value === '鏈�缁堝��' ||
+ cell.v.ps.value === '璁惧鍚嶇О')
+ if (!isEditable) {
+ return
}
- saveUnqualifiedContext({
- param: JSON.stringify(param),
- currentTable: this.currentTable,
- sampleId: this.currentSample.id
- }).then(res => {
- this.$message.success('宸蹭繚瀛�')
- })
- // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
- this.worker.postMessage(JSON.stringify({
- modelType: this.sampleProduct[0].model,
- type: 'saveData',
- tableList: this.tableList,
- param: this.param,
- currentTable: this.currentTable
- }));
+ if (
+ cell.v.ps.value.includes('妫�楠屽��') &&
+ (cell.v.v === '' || cell.v.v === null || cell.v.v === undefined)
+ ) {
+ return
+ }
+ param[a.templateId][`${cell.r}-${cell.c}`] = {
+ v: cell.v.v,
+ u: cell.u
+ }
+ })
+ })
+ return param
+ },
+ // 缁熶竴鍦ㄨ繖閲屼繚瀛樻暟鎹�
+ saveInsContext() {
+ try {
+ if (!this.param) {
+ return
}
+ const param = this.buildParam()
+ this.param = param
+ let isNoTestValue = ''
+ this.tableList.forEach(a => {
+ a.template.forEach(cell => {
+ if (
+ cell.v.ps != undefined &&
+ typeof cell.v.ps.value === 'string' &&
+ cell.v.ps.value.includes('妫�楠屽��') &&
+ (cell.v.v === '' || cell.v.v === null || cell.v.v === undefined)
+ ) {
+ isNoTestValue = 1
+ }
+ })
+ })
+ saveUnqualifiedContext({
+ param: JSON.stringify(param),
+ currentTable: this.currentTable,
+ sampleId: this.currentSample.id,
+ isNoTestValue: isNoTestValue
+ }).then(res => {
+ this.$message.success('宸蹭繚瀛�')
+ })
+ // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
+ this.worker.postMessage(JSON.stringify({
+ modelType: this.sampleProduct[0].model,
+ type: 'saveData',
+ tableList: this.tableList,
+ param: this.param,
+ currentTable: this.currentTable
+ }));
} catch (error) {
console.log(999, error);
}
},
// 璁惧鏀瑰彉
- changeEquip(val, n, v) {
- try {
- // this.$set(n.v,'v',val)
- this.tableList[0].arr.forEach((item, index) => {
- item.forEach((m, i) => {
- if (this.param[m.i]) {
- this.param[m.i].state = 1
+ changeEquip(val, n) {
+ const selectedDevices = Array.isArray(val) ? [...val] : []
+ const deviceCodes = selectedDevices.join('锛�')
+ this.$set(n.v, 'v', selectedDevices)
+ this.tableList.forEach(table => {
+ (table.arr || []).forEach(row => {
+ row.forEach(cell => {
+ if (cell.i == n.i && cell.v.ps) {
+ if (cell.v.ps.value === '璁惧鍚嶇О') {
+ this.$set(cell.v, 'v', [...selectedDevices])
+ } else if (cell.v.ps.value === '璁惧缂栫爜') {
+ this.$set(cell.v, 'v', deviceCodes)
+ }
}
- // if(m.i==n.i&&m.v.ps&&m.v.ps.value=='璁惧鍚嶇О'&&v){
- // this.$set(m.v,'v',v)
- // }
})
})
- for (let i in this.param) {
- if (this.param[i].state != 1) {
- delete this.param[i]
- }
- }
- // if(val&&v){
- // 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',v)
- // }
- // }
- // }
- // this.equipOptions涓鸿澶囧悕绉颁笅鎷夋閫夐」鏁版嵁
- 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.join('锛�'))
- this.$delete(this.param[n.i].equipName[i1].v, 'v')
- // 灏嗘暟缁勮祴鍊肩粰璁惧缂栫爜
- this.$set(this.param[n.i].equipName[i1].v, 'v', val)
- this.tableList[0].arr.forEach((item, index) => {
- item.forEach((m) => {
- if (m.i == n.i && m.v.ps && m.v.ps.value == '璁惧缂栫爜') {
- this.$set(m.v, 'v', val.join('锛�'))
- }
- if (m.i == n.i && m.v.ps && m.v.ps.value == '璁惧鍚嶇О') {
- this.$set(m.v, 'v', val)
- }
- })
- })
- }
- }
- // 淇濆瓨鏁版嵁
- this.saveInsContext(n.i)
- } catch (e) {
- console.log('changeEquip----', e)
- }
+ })
+ // 閫夋嫨銆佺Щ闄ゃ�佹竻绌哄潎鐢� change 浜嬩欢瑙﹀彂锛岀珛鍗充繚瀛樸��
+ this.saveInsContext()
},
getAuthorizedPerson() {
selectUserCondition({ type: 1 }).then((res) => {
@@ -1996,16 +1576,6 @@
this.param = {}
this.fiberOptic = []
this.currentFiberOptic = null;
- this.currentFiberOpticTape.productList.forEach(a => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null
- }
- })
this.fiberOpticTapeVisible = false;
let list = await this.getCurrentProduct(this.currentFiberOpticTape.id, 1)
this.getTableLists0(list)
@@ -2025,16 +1595,7 @@
}
this.currentKey2 = index
this.currentFiberOptic = this.HaveJson(this.fiberOptic[index - 1])
- this.currentFiberOptic.productList.forEach(a => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null
- }
- })
+ this.param = {}
let list = await this.getCurrentProduct(this.currentFiberOptic.id, 2)
this.getTableLists0(list)
},
--
Gitblit v1.9.3