From 5cc9eb2d302ffe6218221208a28b60f91b57e41e Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期六, 09 十一月 2024 14:02:59 +0800
Subject: [PATCH] U bug修复
---
src/views/test/testBatch.vue | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/src/views/test/testBatch.vue b/src/views/test/testBatch.vue
index e17ce52..7d0a6b0 100644
--- a/src/views/test/testBatch.vue
+++ b/src/views/test/testBatch.vue
@@ -58,6 +58,24 @@
);
});
+// 鏄惁鍙互淇敼鍧囪 浠粍鏁�
+const canChangeBattCount = computed(() => {
+ if (
+ devType.value != 2 ||
+ selectData.value[2].length == 0 ||
+ selectData.value[2].filter((v) => v.devOnline == 1).length == 0
+ ) {
+ return false;
+ }
+ return selectData.value[2]
+ .filter((v) => v.devOnline == 1)
+ .every((v) => {
+ return onlyOneGroup.value
+ ? v.state[0].isTesting == 0
+ : v.state[0].isTesting == 0 && v.state[1].isTesting == 0;
+ });
+});
+
// 涓�浣撴満 鎸夐挳鍙敤鎺у埗 鍏叡鏂规硶
function computeYT(someFn) {
return computed(() => {
@@ -68,16 +86,16 @@
) {
return false;
} else {
- return selectData.value[1]
- .filter((v) => v.devOnline == 1)
- .some(someFn);
+ return selectData.value[1].filter((v) => v.devOnline == 1).some(someFn);
}
});
}
// 涓�浣撴満 鎸夐挳鍙敤鎺у埗 鍚姩
const canStartYT = computeYT((v) => v.state.isTesting == 0);
// 涓�浣撴満 鎸夐挳鍙敤鎺у埗 鏆傚仠
-const canPauseYT = computeYT((v) => v.state.isTesting == 1 && v.state.testPause == 0);
+const canPauseYT = computeYT(
+ (v) => v.state.isTesting == 1 && v.state.testPause == 0
+);
// 涓�浣撴満 鎸夐挳鍙敤鎺у埗 缁х画
const canContinueYT = computeYT((v) => v.state.testPause == 1);
// 涓�浣撴満 鎸夐挳鍙敤鎺у埗 鍋滄
@@ -93,9 +111,7 @@
) {
return false;
} else {
- return selectData.value[2]
- .filter((v) => v.devOnline == 1)
- .some(someFn);
+ return selectData.value[2].filter((v) => v.devOnline == 1).some(someFn);
}
});
}
@@ -104,9 +120,13 @@
// 鍧囪 浠� 鎸夐挳鍙敤鎺у埗 鍚姩缁�2
const canStartJH2 = computeJH((v) => v.state[1].isTesting == 0);
// 鍧囪 浠� 鎸夐挳鍙敤鎺у埗 鏆傚仠缁�1
-const canPauseJH1 = computeJH((v) => v.state[0].isTesting == 1 && v.state[0].isTestPause == 0);
+const canPauseJH1 = computeJH(
+ (v) => v.state[0].isTesting == 1 && v.state[0].isTestPause == 0
+);
// 鍧囪 浠� 鎸夐挳鍙敤鎺у埗 鏆傚仠缁�2
-const canPauseJH2 = computeJH((v) => v.state[1].isTesting == 1 && v.state[1].isTestPause == 0);
+const canPauseJH2 = computeJH(
+ (v) => v.state[1].isTesting == 1 && v.state[1].isTestPause == 0
+);
// 鍧囪 浠� 鎸夐挳鍙敤鎺у埗 缁х画缁�1
const canContinueJH1 = computeJH((v) => v.state[0].isTestPause == 1);
// 鍧囪 浠� 鎸夐挳鍙敤鎺у埗 缁х画缁�2
@@ -318,11 +338,16 @@
function pauseYtj(type) {
let devIds = devs.value;
if (type == 1) {
- devIds = devIds.filter(
- (v) => v.devOnline == 1 && v.state.isTesting == 1 && v.state.testPause == 0
- ).map((v) => v.devId);
+ devIds = devIds
+ .filter(
+ (v) =>
+ v.devOnline == 1 && v.state.isTesting == 1 && v.state.testPause == 0
+ )
+ .map((v) => v.devId);
} else {
- devIds = devIds.filter((v) => v.devOnline == 1 && v.state.testPause == 1).map((v) => v.devId);
+ devIds = devIds
+ .filter((v) => v.devOnline == 1 && v.state.testPause == 1)
+ .map((v) => v.devId);
}
let loading = $loading();
pauseA200ParamPl(devIds, type)
@@ -474,9 +499,7 @@
<el-button
size="small"
class="btn-start btn-grp1"
- :disabled="
- !selectData[devType].filter((v) => v.devOnline == 1).length
- "
+ :disabled="!canChangeBattCount"
@click="setBattCount"
>璁剧疆缁勬暟</el-button
>
@@ -620,6 +643,7 @@
v-if="jhyBattCountVisible"
:isBatch="true"
:devs="devs"
+ :isOnlyOne="onlyOneGroup"
></batt-count-content>
</el-dialog>
</div>
--
Gitblit v1.9.1