From b2d0d640cf48d874fe24816672f1a4c3e57fda36 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 21 三月 2025 14:53:31 +0800
Subject: [PATCH] 修改电路实验问题
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 8ef3574..86f67e1 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -3927,10 +3927,10 @@
if (name == '妫�楠屽師濮嬭褰�' || name == '杈愬皠璇曢獙妫�娴嬪師濮嬭褰�') {
let num = 0
for (let i in this.param) {
- if(!this.param[i].insResult||!this.param[i].insResult.v||(!this.param[i].insResult.v.v&&this.param[i].insResult.v.v!==0)){
- this.$message.error("璇疯緭鍏ユ楠岃繃绋嬪��");
- return;
- }else{
+ if (!this.param[i].insResult || !this.param[i].insResult.v || (!this.param[i].insResult.v.v && this.param[i].insResult.v.v !== 0)) {
+ this.$message.error("璇疯緭鍏ユ楠岃繃绋嬪��");
+ return;
+ } else {
if (this.param[i].insResult.v.v != 0 && this.param[i].insResult.v.v != 1) {
num++;
}
@@ -4438,9 +4438,13 @@
if (this.sonLaboratory === "鐢佃矾璇曢獙") {
// // 鐢佃矾璇曢獙鏁伴噰
// 鑾峰彇褰撳墠鏍峰搧鐨勬楠岄」
- let list = await this.getCurrentProduct(this.currentSample.id, 0);
- this.currentSample.insProduct = this.HaveJson(list);
- this.currentNum++;
+ if (response.data &&
+ ((response.data.includes('xlsx') && response.data.includes('浜よ皟')) ||
+ (response.data.includes('csv') && response.data.includes('椹绘尝')))) {
+ let list = await this.getCurrentProduct(this.currentSample.id, 0);
+ this.currentSample.insProduct = this.HaveJson(list);
+ this.currentNum++;
+ }
} else if (this.sonLaboratory === "鎸姩") {
this.getDocAnalysis(response.data)
}
@@ -4448,7 +4452,7 @@
this.$message.error(response.message);
}
},
- getDocAnalysis (data) {
+ getDocAnalysis(data) {
const psToDataKeyMap = {
'妫�楠屽��1': '1',
'妫�楠屽��9': '9',
--
Gitblit v1.9.3