Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm

app-dm/src/pages/ListPages/Training/Operation2.jsx

@@ -130,16 +130,17 @@ function Operation2() {
                 student_ID,
                 operateID
             })
-            const result=detectionSrc.data['result']
-            if(result==='NO'){
+            const result=detectionSrc.data
+            if(result.includes('NO')){
                 alert('连接失败')
                 setTrainScore(0)
             }else{
                 alert('连接成功')
                 setTrainScore(50)
             }
-        }catch{
-            alert('detection出错')
+        }catch(err){
+            console.log(err)
+            alert('detection出错 ')
         }
     }
 

app-dm/src/setupTests.js

@@ -1,5 +1,5 @@
 // jest-dom adds custom jest matchers for asserting on DOM nodes.
 // allows you to do things like:
 // expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
+// learn more: https://github.com/testing-library/jest-do m
 import '@testing-library/jest-dom';

python/k8s_func.py

@@ -1,6 +1,7 @@
 import json
 import traceback
 
+
 import yaml
 from kubernetes import client, config
 from flask import jsonify