Merge branch 'qingban' of http://139.155.176.112:8091/project-all/mes-admin-temp into qingban

src/hooks/vueflowHooks.ts

@@ -23,7 +23,15 @@ export const isStraightFlow = (nodes: any[], edges: any[]) => {
       return edge.source;
     })
   );
-  if (sourceNodeIdsSet.size !== edges.length) {
+  let targetNodeIdsSet = new Set(
+    edges.map((edge) => {
+      return edge.target;
+    })
+  );
+  if (
+    sourceNodeIdsSet.size !== edges.length ||
+    targetNodeIdsSet.size !== edges.length
+  ) {
     return [isSerial, message];
   }
 

src/views/base/craftManagement/route/bindProcess.vue

@@ -122,9 +122,9 @@
       <div class="detailInfo">
         <el-scrollbar>
           <div class="opBox">
-            <el-button type="success" @click="changeStyle">
+            <!-- <el-button type="success" @click="changeStyle">
               按钮风格切换
-            </el-button>
+            </el-button> -->
             <el-button type="primary" @click="changeEditStatus">{{
               !editStatus ? "切换为工序信息编辑模式" : "切换为工序路线编辑模式"
             }}</el-button>