From d0bff7a4d7e0bd53f11ea629df20e48c3f72a0e6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 14 十月 2024 10:09:00 +0800
Subject: [PATCH] 修改RBD识别算法

---
 web/src/views/modules/taskReliability/RBD-edit-img.vue |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index b92bdab..b96eb43 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -1487,14 +1487,29 @@
         const nodes = this.graph.getNodes()
         for (const node of nodes) {
           if (node.getData().nodeType === 'dashedBox') {
-            this.$message({message: '璇ユā鍨嬩腑瀛樺湪铏氭锛屾棤娉曚繚瀛�', type: 'warning'})
-            return false; // 鍙栨秷娣诲姞鑺傜偣鎿嶄綔
+            this.$message({message: '璇ユā鍨嬩腑瀛樺湪铏氭锛屾棤娉曟彁浜�', type: 'warning'})
+            return false;
           }
           if (node.getData().nodeType === 'vote') {
-            const edges = this.graph.getConnectedEdges(node);
+            if (node.getData().voteNum === null || node.getData().voteNum === '') {
+              this.$message({message: '琛ㄥ喅鑺傜偣鐨勮〃鍐虫暟閲忔湭璁剧疆', type: 'warning'})
+              return false;
+            }
+            const edges = this.graph.getIncomingEdges(node);
             if (node.getData().voteNum >= edges.length) {
-              this.$message({message: '琛ㄥ喅鏁伴噺涓嶈兘楂樹簬璇ヨ妭鐐圭殑杩涚嚎鏁伴噺', type: 'warning'})
-              return false; // 鍙栨秷娣诲姞鑺傜偣鎿嶄綔
+              this.$message({message: '琛ㄥ喅鑺傜偣鐨勮〃鍐虫暟閲忓繀椤诲皬浜庤鑺傜偣鐨勮繘绾挎暟閲�', type: 'warning'})
+              return false;
+            }
+          }
+          if (node.getData().nodeType === 'switch') {
+            if (node.getData().voteNum === null || node.getData().voteNum === '') {
+              this.$message({message: '鏃佽仈鑺傜偣鐨勫浠芥暟閲忔湭璁剧疆', type: 'warning'})
+              return false;
+            }
+            const edges = this.graph.getIncomingEdges(node);
+            if (node.getData().voteNum >= edges.length) {
+              this.$message({message: '鏃佽仈鑺傜偣鐨勫浠芥暟閲忓繀椤诲皬浜庤鑺傜偣鐨勮繘绾挎暟閲�', type: 'warning'})
+              return false;
             }
           }
         }
@@ -1503,7 +1518,7 @@
         await this.$http['post'](`/taskReliability/ModelLine/analyze`, this.dataForm).then(async res => {
           if (res.msg === 'success') {
             this.$emit('refreshDataList')
-            this.$alert('瑙f瀽鎴愬姛', '鎻愮ず', {
+            this.$alert('鎻愪氦鎴愬姛', '鎻愮ず', {
               confirmButtonText: '纭畾'
             })
           }

--
Gitblit v1.9.1