diff --git a/src/assets/imgs/bg_tiaojian_hov.svg b/src/assets/imgs/bg_tiaojian_hov.svg
new file mode 100644
index 0000000000000000000000000000000000000000..69cadafd87cfac67eac3816ddcfce603ee74943a
--- /dev/null
+++ b/src/assets/imgs/bg_tiaojian_hov.svg
@@ -0,0 +1,25 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="142" height="73" viewBox="0 0 142 73">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke: #fcce72;
+        stroke-linejoin: round;
+        stroke-width: 3px;
+        fill-rule: evenodd;
+        filter: url(#filter);
+      }
+    </style>
+    <filter id="filter" x="6" y="96" width="139" height="70" filterUnits="userSpaceOnUse">
+      <feOffset result="offset" dy="4" in="SourceAlpha"/>
+      <feGaussianBlur result="blur" stdDeviation="2.828"/>
+      <feFlood result="flood" flood-color="#000765" flood-opacity="0.15"/>
+      <feComposite result="composite" operator="in" in2="blur"/>
+      <feBlend result="blend" in="SourceGraphic"/>
+    </filter>
+  </defs>
+  <g transform="translate(-4.5 -94.5)" style="fill: #fff; filter: url(#filter)">
+    <path id="条件节点" class="cls-1" d="M81.665,100.221l50.709,18.925c6.16,2.3,6.16,11.429,0,13.728L81.665,151.8a19.05,19.05,0,0,1-13.361,0L17.6,132.874c-6.16-2.3-6.16-11.429,0-13.728L68.3,100.221A19.058,19.058,0,0,1,81.665,100.221Z" style="stroke: inherit; filter: none; fill: inherit"/>
+  </g>
+  <use transform="translate(-4.5 -94.5)" xlink:href="#条件节点" style="stroke: #fcce72; filter: none; fill: none"/>
+</svg>
diff --git a/src/assets/imgs/bg_tiaojian_nor.svg b/src/assets/imgs/bg_tiaojian_nor.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a1ace51b6ae442b713392c97481f840f8c977db5
--- /dev/null
+++ b/src/assets/imgs/bg_tiaojian_nor.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="118" height="46" viewBox="0 0 123 50.969">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke: #f5ab4c;
+        stroke-linejoin: round;
+        stroke-width: 3px;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path id="bg_tiaojian_nor" class="cls-1" d="M506.45,765.085L555.523,781.9a6.394,6.394,0,0,1,0,12.2L506.45,810.905a20,20,0,0,1-12.93,0l-49.073-16.812a6.394,6.394,0,0,1,0-12.2l49.073-16.812A19.982,19.982,0,0,1,506.45,765.085Z" transform="translate(-438.5 -762.531)"/>
+</svg>
diff --git a/src/components/svgIcon.vue b/src/components/svgIcon.vue
index 264dca2794c5695db21d7d74deaf995de0b9d5f0..655d3d367ab764a3e25d06c2de779564b8c8760d 100644
--- a/src/components/svgIcon.vue
+++ b/src/components/svgIcon.vue
@@ -1,43 +1,43 @@
 <template>
- <svg :class="svgClass" aria-hidden="true">
- <use :xlink:href="iconName"/>
- </svg>
+  <svg :class="svgClass" aria-hidden="true">
+    <use :xlink:href="iconName" />
+  </svg>
 </template>
  
 <script>
 export default {
- name: 'SvgIcon',
- props: {
- iconClass: {
-  type: String,
-  required: true,
- },
- className: {
-  type: String,
-  default: '',
- },
- },
- computed: {
- iconName () {
-  return `#icon-${this.iconClass}`
- },
- svgClass () {
-  if (this.className) {
-  return 'svg-icon ' + this.className
-  } else {
-  return 'svg-icon'
-  }
- },
- },
-}
+  name: "SvgIcon",
+  props: {
+    iconClass: {
+      type: String,
+      required: true,
+    },
+    className: {
+      type: String,
+      default: "",
+    },
+  },
+  computed: {
+    iconName() {
+      return `#icon-${this.iconClass}`;
+    },
+    svgClass() {
+      if (this.className) {
+        return "svg-icon " + this.className;
+      } else {
+        return "svg-icon";
+      }
+    },
+  },
+};
 </script>
  
 <style scoped>
 .svg-icon {
- width: 1em;
- height: 1em;
- vertical-align: -0.15em;
- fill: currentColor;
- overflow: hidden;
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/work-flow/super-flow.vue b/src/components/work-flow/super-flow.vue
index 71d77fc5ffa2da3d4b4785b441a979f182e1439c..58cf256843049e3cc4679025ce663e71db92fdae 100644
--- a/src/components/work-flow/super-flow.vue
+++ b/src/components/work-flow/super-flow.vue
@@ -14,14 +14,46 @@
       <div class="node-container">
         <p class="label_head">节点类型</p>
         <p class="label_explanation">请拖拽添加到流程中</p>
-        <div
-          class="node-item"
-          :class="{'node-item-begin': item.value.meta.type == 1, 'node-item-end': item.value.meta.type == 2, 'node-item-default': item.value.meta.type == 3}"
-          v-for="(item, index) in nodeItemList"
-          :key="index"
-          @mousedown="evt => nodeItemMouseDown(evt, item.value)"
-        >
-          <span>{{item.label}}</span>
+        <div class="nodes_i" v-for="(item, index) in nodeItemList" :key="index">
+          <div
+            class="node-item"
+            :class="{
+              'node-item-begin': item.value.meta.type == 1,
+              'node-item-end': item.value.meta.type == 2,
+              'node-item-default': item.value.meta.type == 3,
+              'node-item-judge': item.value.meta.type == 4,
+            }"
+            @mousedown="(evt) => nodeItemMouseDown(evt, item.value)"
+          >
+            <div>
+              <svg-icon
+                id="judge_svg"
+                v-if="item.value.meta.type == 4"
+                icon-class="bg_tiaojian_nor"
+                class="judge_svg"
+              ></svg-icon>
+            </div>
+            <div>{{ item.label }}</div>
+          </div>
+          <div>
+            <el-popover placement="right" width="300" trigger="hover">
+              <div>
+                <p v-if="item.value.meta.type == 1">
+                  每个流程必须有一个开始节点。
+                </p>
+                <p v-else-if="item.value.meta.type == 2">
+                  每个流程必须有一个结束节点。
+                </p>
+                <p v-else-if="item.value.meta.type == 3">
+                  在开始节点和结束节点中间可连接多个普通节点。
+                </p>
+                <p v-else-if="item.value.meta.type == 4">
+                  使用条件节点可以触发分支流程。未配置条件节点的分支流程将默认触发，配置了条件节点的分支，可根据条件节点名称选择触发或不触发该分支。
+                </p>
+              </div>
+              <i class="node_icon el-icon-question" slot="reference"></i>
+            </el-popover>
+          </div>
         </div>
       </div>
     </div>
@@ -39,46 +71,92 @@
       >
         <template v-slot:node="node">
           <div
-            :class="{'flow-node-begin': nodeParams(node.meta.id).type == 1, 'flow-node-end': nodeParams(node.meta.id).type == 2, 'flow-node-default': nodeParams(node.meta.id).type == 3 && node.meta.id != nodeItem.id, 'flow-node-default-active': nodeParams(node.meta.id).type == 3 && node.meta.id == nodeItem.id }"
+            :class="{
+              'flow-node-begin': nodeParams(node.meta.id).type == 1,
+              'flow-node-end': nodeParams(node.meta.id).type == 2,
+              'flow-node-default':
+                nodeParams(node.meta.id).type == 3 &&
+                node.meta.id != nodeItem.id,
+              'flow-node-default-active':
+                nodeParams(node.meta.id).type == 3 &&
+                node.meta.id == nodeItem.id,
+              'flow-node-judge':
+                nodeParams(node.meta.id).type == 4 &&
+                node.meta.id != nodeItem.id,
+            }"
             :id="node.meta.id"
           >
+            <div
+              v-if="nodeParams(node.meta.id).type == 4"
+              :style="`width: ${other_width}px;height: ${other_height}px`"
+              class="svg_in"
+            >
+              <svg-icon
+                id="judge_svg"
+                :style="`font-size: ${other_font_size}px;top: -${svg_top}px;`"
+                icon-class="bg_tiaojian_nor"
+                class="judge_svg"
+              ></svg-icon>
+            </div>
             <div
               class="node_span"
               :style="`line-height: ${line_hieght}px;font-size: ${font_size}px;`"
               @click="clickItem(node.meta.id)"
               @blur="blurItem"
               :title="nodeParams(node.meta.id).name"
-            >{{nodeParams(node.meta.id).name}}</div>
+            >
+              {{ nodeParams(node.meta.id).name }}
+            </div>
             <div class="node_del" @click="delNode(node.meta.id)"></div>
           </div>
         </template>
       </super-flow>
     </div>
-    <div class="flow_options">
+    <div v-if="this.nodeItem.type == 3" class="flow_options">
       <p class="options_head">操作</p>
       <div class="options_item" @click="showGeneralSettings">
-        <img :src="require('@/assets/imgs/lcsj_ic_set.png')" class="options_img" />
+        <img
+          :src="require('@/assets/imgs/lcsj_ic_set.png')"
+          class="options_img"
+        />
         <p class="options_text">常规设置</p>
       </div>
       <div class="options_item_1">
-        <img :src="require('@/assets/imgs/lcsj_ic_chajian.png')" class="options_img" />
+        <img
+          :src="require('@/assets/imgs/lcsj_ic_chajian.png')"
+          class="options_img"
+        />
         <p class="options_text">插件设置</p>
         <div class="options_pop">
           <div class="options_pop_item" @click="showInterfacePlugin">
-            <img :src="require('@/assets/imgs/lcsj_ic_jiekou.png')" class="options_item_img" />
+            <img
+              :src="require('@/assets/imgs/lcsj_ic_jiekou.png')"
+              class="options_item_img"
+            />
             <p class="options_item_text">接口插件</p>
           </div>
           <div class="options_pop_item" @click="showProcessService">
-            <img :src="require('@/assets/imgs/lcsj_ic_liucheng.png')" class="options_item_img" />
+            <img
+              :src="require('@/assets/imgs/lcsj_ic_liucheng.png')"
+              class="options_item_img"
+            />
             <p class="options_item_text">流程服务</p>
           </div>
           <div class="options_pop_item" @click="showTimeoutManagement">
-            <img :src="require('@/assets/imgs/lcsj_ic_chaoshi.png')" class="options_item_img" />
+            <img
+              :src="require('@/assets/imgs/lcsj_ic_chaoshi.png')"
+              class="options_item_img"
+            />
             <p class="options_item_text">超时管理</p>
           </div>
         </div>
       </div>
-      <div v-if="nodeParams(nodeItem.id).plugins && nodeParams(nodeItem.id).plugins.length > 0">
+      <div
+        v-if="
+          nodeParams(nodeItem.id).plugins &&
+          nodeParams(nodeItem.id).plugins.length > 0
+        "
+      >
         <div class="checked_line"></div>
         <p class="options_head_1">已选插件</p>
         <div
@@ -87,7 +165,11 @@
           :key="'checked' + index"
         >
           <div v-if="item.plugin_type == 1">
-            <img :src="require('@/assets/imgs/lcsj_ic_jiekou.png')"  @click="showInterfacePlugin" class="checked_item_img" />
+            <img
+              :src="require('@/assets/imgs/lcsj_ic_jiekou.png')"
+              @click="showInterfacePlugin"
+              class="checked_item_img"
+            />
             <img
               :src="require('@/assets/imgs/lcsj_btn_delete.png')"
               @click="delItem(1)"
@@ -96,7 +178,11 @@
             <p class="checked_item_text">接口插件</p>
           </div>
           <div v-else-if="item.plugin_type == 2">
-            <img :src="require('@/assets/imgs/lcsj_ic_liucheng.png')" @click="showProcessService" class="checked_item_img" />
+            <img
+              :src="require('@/assets/imgs/lcsj_ic_liucheng.png')"
+              @click="showProcessService"
+              class="checked_item_img"
+            />
             <img
               :src="require('@/assets/imgs/lcsj_btn_delete.png')"
               @click="delItem(2)"
@@ -105,7 +191,11 @@
             <p class="checked_item_text">流程服务</p>
           </div>
           <div v-else-if="item.plugin_type == 3">
-            <img :src="require('@/assets/imgs/lcsj_ic_chaoshi.png')" @click="showTimeoutManagement" class="checked_item_img" />
+            <img
+              :src="require('@/assets/imgs/lcsj_ic_chaoshi.png')"
+              @click="showTimeoutManagement"
+              class="checked_item_img"
+            />
             <img
               :src="require('@/assets/imgs/lcsj_btn_delete.png')"
               @click="delItem(3)"
@@ -116,6 +206,16 @@
         </div>
       </div>
     </div>
+    <div v-if="this.nodeItem.type == 4" class="flow_options">
+      <p class="options_head">操作</p>
+      <div class="options_item" @click="showJudgeGeneralSettings">
+        <img
+          :src="require('@/assets/imgs/lcsj_ic_set.png')"
+          class="options_img"
+        />
+        <p class="options_text">常规设置</p>
+      </div>
+    </div>
     <el-dialog
       :visible.sync="dialog_general"
       top="25vh"
@@ -126,9 +226,14 @@
     >
       <div class="general_settings">
         <p class="general_title">节点编号：</p>
-        <p
-          class="general_val"
-        >{{ nodeParams(nodeItem.id).node_code && nodeParams(nodeItem.id).node_code != "" ? nodeParams(nodeItem.id).node_code : "暂无（保存后将自动生成节点编号）" }}</p>
+        <p class="general_val">
+          {{
+            nodeParams(nodeItem.id).node_code &&
+            nodeParams(nodeItem.id).node_code != ""
+              ? nodeParams(nodeItem.id).node_code
+              : "暂无（保存后将自动生成节点编号）"
+          }}
+        </p>
         <p class="general_title">节点名称：</p>
         <p class="general_input">
           <el-input v-model="node_name" placeholder="请输入节点名称"></el-input>
@@ -150,7 +255,9 @@
       <div class="interface_plugin">
         <div class="interface_msg">
           <i class="el-icon-warning-outline"></i>
-          <span>接口插件设置后，流程服务在节点完成时自动调取该接口，同步节点业务数据，保存到流程服务中。</span>
+          <span
+            >接口插件设置后，流程服务在节点完成时自动调取该接口，同步节点业务数据，保存到流程服务中。</span
+          >
         </div>
         <div class="interface_plugin_item">
           <div class="fwcs_fwdz">服务地址：</div>
@@ -170,7 +277,9 @@
                 ></el-option>
               </el-select>
             </el-input>
-            <el-button @click="clickFwcs()" class="fwcs_btn_fwcs">连接测试</el-button>
+            <el-button @click="clickFwcs()" class="fwcs_btn_fwcs"
+              >连接测试</el-button
+            >
           </div>
           <el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab">
             <el-tab-pane label="请求参数" name="0">
@@ -208,7 +317,11 @@
               <el-row class="sqxx_row">
                 <el-col :span="6">
                   <div class="sqxx_title">授权方式：</div>
-                  <el-select v-model="sqfsVal" placeholder="请选择" class="sqxx_select">
+                  <el-select
+                    v-model="sqfsVal"
+                    placeholder="请选择"
+                    class="sqxx_select"
+                  >
                     <el-option
                       v-for="item in optionsSq"
                       :key="item.value"
@@ -222,7 +335,10 @@
                 </el-col>
                 <el-col :span="16">
                   <div class="sqxx_title">Token：</div>
-                  <el-input v-model="tokenVal" placeholder="请输入内容"></el-input>
+                  <el-input
+                    v-model="tokenVal"
+                    placeholder="请输入内容"
+                  ></el-input>
                 </el-col>
               </el-row>
             </el-tab-pane>
@@ -276,7 +392,10 @@
             <div class="skfw_csfwxx">测试服务信息：</div>
             <div class="test_succ">
               <div class="skcs_jg">
-                <img src="@/assets/imgs/test_icon_error.png" class="skcs_jg_img" />&nbsp;测试失败
+                <img
+                  src="@/assets/imgs/test_icon_error.png"
+                  class="skcs_jg_img"
+                />&nbsp;测试失败
               </div>
             </div>
           </div>
@@ -298,7 +417,9 @@
       <div class="process_service">
         <div class="process_msg">
           <i class="el-icon-warning-outline"></i>
-          <span>配置流程服务插件后，该节点可调用流程服务，并在此节点触发该流程。</span>
+          <span
+            >配置流程服务插件后，该节点可调用流程服务，并在此节点触发该流程。</span
+          >
         </div>
         <p class="process_title">我的服务：</p>
         <p class="process_input">
@@ -328,15 +449,25 @@
       <div class="timeout_service">
         <div class="timeout_msg">
           <i class="el-icon-warning-outline"></i>
-          <span>添加超时管理插件后，根据配置该节点超时后会发送消息给请求方。</span>
+          <span
+            >添加超时管理插件后，根据配置该节点超时后会发送消息给请求方。</span
+          >
         </div>
         <p class="timeout_title">超时设置：</p>
         <div class="timeout_input">
           <div class="timeout_row">
             <div class="timeout_input_group">
               <div class="input_left">最大时长</div>
-              <el-input-number v-model="max_time_0" controls-position="right" :min="0"></el-input-number>
-              <el-select v-model="max_time_type_0" class="input_right_select" placeholder="请输入">
+              <el-input-number
+                v-model="max_time_0"
+                controls-position="right"
+                :min="0"
+              ></el-input-number>
+              <el-select
+                v-model="max_time_type_0"
+                class="input_right_select"
+                placeholder="请输入"
+              >
                 <el-option
                   v-for="item in durationOptions"
                   :key="item.value"
@@ -354,8 +485,16 @@
           <div class="timeout_row">
             <div class="timeout_input_group">
               <div class="input_left">最大时长</div>
-              <el-input-number v-model="max_time_1" controls-position="right" :min="0"></el-input-number>
-              <el-select v-model="max_time_type_1" class="input_right_select" placeholder="请输入">
+              <el-input-number
+                v-model="max_time_1"
+                controls-position="right"
+                :min="0"
+              ></el-input-number>
+              <el-select
+                v-model="max_time_type_1"
+                class="input_right_select"
+                placeholder="请输入"
+              >
                 <el-option
                   v-for="item in durationOptions"
                   :key="item.value"
@@ -375,6 +514,41 @@
         </div>
       </div>
     </el-dialog>
+    <el-dialog
+      :visible.sync="dialog_general_judge"
+      top="25vh"
+      width="420px"
+      :modal-append-to-body="false"
+      title="常规设置"
+      :close-on-click-modal="false"
+    >
+      <div class="general_settings">
+        <p class="general_title">节点编号：</p>
+        <p class="general_val">
+          {{
+            nodeParams(nodeItem.id).node_code &&
+            nodeParams(nodeItem.id).node_code != ""
+              ? nodeParams(nodeItem.id).node_code
+              : "暂无（保存后将自动生成节点编号）"
+          }}
+        </p>
+        <p class="general_title">节点名称：</p>
+        <p class="general_input">
+          <el-input v-model="node_name" placeholder="请输入节点名称"></el-input>
+        </p>
+        <p class="general_title">条件描述：</p>
+        <p class="general_input">
+          <el-input
+            v-model="node_content"
+            placeholder="请输入条件描述"
+          ></el-input>
+        </p>
+        <div class="dia_footer">
+          <el-button class="cancel" @click="generalJudgeCancel">取消</el-button>
+          <el-button class="submit" @click="generalJudgeSubmit">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -480,6 +654,18 @@ export default {
         info: null,
       },
       nodeItemList: [
+        {
+          label: "开始",
+          value: {
+            width: 120,
+            height: 48,
+            meta: {
+              label: "开始",
+              name: "开始",
+              type: 1,
+            },
+          },
+        },
         {
           label: "普通节点",
           value: {
@@ -493,14 +679,14 @@ export default {
           },
         },
         {
-          label: "开始",
+          label: "条件节点",
           value: {
             width: 120,
             height: 48,
             meta: {
-              label: "开始",
-              name: "开始",
-              type: 1,
+              label: "条件节点",
+              name: "条件节点",
+              type: 4,
             },
           },
         },
@@ -530,11 +716,13 @@ export default {
         ],
       ],
       dialog_general: false,
+      dialog_general_judge: false,
       nodeItem: {
         id: "",
         name: "",
       },
       node_name: "",
+      node_content: "",
       show_options_pop: false,
       dialog_interface: false,
       optionType: [
@@ -630,6 +818,10 @@ export default {
       max_time_check_1: false,
       line_hieght: 41,
       font_size: 16,
+      other_width: 120,
+      other_height: 48,
+      other_font_size: 116,
+      svg_top:34
     };
   },
   mounted() {
@@ -732,6 +924,14 @@ export default {
               id: query.meta.id,
               plugins: [],
             };
+          } else if (conf.info.meta.type == 4) {
+            obj = {
+              label: "条件节点",
+              name: "条件节点",
+              type: 4,
+              id: query.meta.id,
+              plugins: [],
+            };
           }
           this.nodeParamsList.push(obj);
         }
@@ -765,7 +965,7 @@ export default {
     clickItem(index) {
       let item = this.nodeParams(index);
       this.nodeItem = item;
-      // console.log(item);
+      console.log(this.nodeItem);
     },
     blurItem() {
       this.nodeItem = {
@@ -791,9 +991,9 @@ export default {
     checkNodeCouldEdit() {
       let self = this;
       if (self.nodeItem.id && self.nodeItem.id != "") {
-        if (self.nodeItem.type == 3) {
+        if (self.nodeItem.type == 3 || self.nodeItem.type == 4) {
           return true;
-        } else {
+        } else if (self.nodeItem.type == 1 || self.nodeItem.type == 2) {
           self.$message({
             message: "开始和结束节点不可被编辑",
             type: "warning",
@@ -817,6 +1017,15 @@ export default {
         self.dialog_general = true;
       }
     },
+    showJudgeGeneralSettings() {
+      if (this.checkNodeCouldEdit()) {
+        let self = this;
+        self.node_name = self.nodeParamsList.find((item) => {
+          return item.id == self.nodeItem.id;
+        }).name;
+        self.dialog_general_judge = true;
+      }
+    },
     showInterfacePlugin() {
       let self = this;
       if (self.checkNodeCouldEdit()) {
@@ -890,6 +1099,27 @@ export default {
       }
       self.dialog_general = false;
     },
+    generalJudgeCancel() {
+      this.dialog_general_judge = false;
+    },
+    generalJudgeSubmit() {
+      let self = this;
+      if (self.nodeItem.type == 4) {
+        let index = self.nodeParamsList.findIndex((item) => {
+          return item.id == self.nodeItem.id;
+        });
+        if (index != -1) {
+          self.nodeParamsList[index].name = self.node_name;
+          self.nodeParamsList[index].content = self.node_content;
+        } else {
+          self.$message({
+            message: "修改失败",
+            type: "error",
+          });
+        }
+      }
+      self.dialog_general_judge = false;
+    },
     clickTab() {},
     getUrl(enUrl) {
       let url = decodeURI(enUrl);
@@ -1294,6 +1524,10 @@ export default {
       });
       this.line_hieght = 41 * scale;
       this.font_size = 16 * scale;
+      this.other_width = 120 * scale;
+      this.other_height = 48 * scale;
+      this.other_font_size = 116 * scale;
+      this.svg_top = 34 * scale;
       this.nodeList = obj.nodeList;
       this.linkList = obj.linkList;
     },
@@ -1463,22 +1697,43 @@ export default {
   background-color: #ffffff;
   border-radius: 10px;
   line-height: @node-item-height;
-  box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.3);
+  // box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.3);
   cursor: pointer;
   user-select: none;
   text-align: center;
   z-index: 6;
-  &:hover {
-    box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.4);
-  }
   &.node-item-begin {
     border: solid 3px #25bdb1;
+    // &:hover {
+    //   box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.4);
+    // }
   }
   &.node-item-end {
     border: solid 3px #f78181;
+    // &:hover {
+    //   box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.4);
+    // }
   }
   &.node-item-default {
     border: solid 3px #b4c6f5;
+    // &:hover {
+    //   box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.4);
+    // }
+  }
+  &.node-item-judge {
+    border: none;
+    box-shadow: none;
+    position: relative;
+    background: transparent;
+    overflow: hidden;
+    line-height: 48px;
+    .judge_svg {
+      font-size: 116px;
+      position: absolute;
+      z-index: -1;
+      top: -34px;
+      left: 0px;
+    }
   }
 }
 .scale_block {
@@ -1514,8 +1769,8 @@ export default {
     }
   }
   .node-container {
-    width: 160px;
-    height: 300px;
+    width: 180px;
+    height: 360px;
     text-align: center;
     background-color: #f8f9fd;
     border-radius: 8px;
@@ -1741,6 +1996,7 @@ export default {
       background-color: #25bdb1;
       color: #ffffff;
       position: relative;
+      box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.3);
     }
     .flow-node-end {
       width: 100%;
@@ -1751,6 +2007,7 @@ export default {
       border: solid 3px #e86262;
       color: #ffffff;
       position: relative;
+      box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.3);
     }
     .flow-node-default {
       width: 100%;
@@ -1760,6 +2017,7 @@ export default {
       background-color: #fff;
       border: solid 3px #b4c6f5;
       position: relative;
+      box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.3);
     }
     .flow-node-default-active {
       width: 100%;
@@ -1772,6 +2030,25 @@ export default {
       color: #fff;
       position: relative;
     }
+    .flow-node-judge {
+      width: 100%;
+      height: 100%;
+      padding: 2px 6px;
+      border-radius: 8px;
+      background-color: transparent;
+      border: none;
+      position: relative;
+      .svg_in {
+        position: absolute;
+        top: 0;
+        left: 0;
+        z-index: -1;
+        overflow: hidden;
+        .judge_svg {
+          position: relative;
+        }
+      }
+    }
   }
 }
 .super-flow__menu-container .super-flow__menu {
@@ -1872,4 +2149,19 @@ export default {
     }
   }
 }
+.super-flow-demo1 {
+  .super-flow__node {
+    box-shadow: none;
+  }
+}
+.nodes_i {
+  position: relative;
+  display: flex;
+  justify-content: space-around;
+}
+.node_icon {
+  position: relative;
+  top: 30px;
+  right: 4px;
+}
 </style>
\ No newline at end of file
diff --git a/src/icons/svg/bg_tiaojian_hov.svg b/src/icons/svg/bg_tiaojian_hov.svg
new file mode 100644
index 0000000000000000000000000000000000000000..69cadafd87cfac67eac3816ddcfce603ee74943a
--- /dev/null
+++ b/src/icons/svg/bg_tiaojian_hov.svg
@@ -0,0 +1,25 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="142" height="73" viewBox="0 0 142 73">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke: #fcce72;
+        stroke-linejoin: round;
+        stroke-width: 3px;
+        fill-rule: evenodd;
+        filter: url(#filter);
+      }
+    </style>
+    <filter id="filter" x="6" y="96" width="139" height="70" filterUnits="userSpaceOnUse">
+      <feOffset result="offset" dy="4" in="SourceAlpha"/>
+      <feGaussianBlur result="blur" stdDeviation="2.828"/>
+      <feFlood result="flood" flood-color="#000765" flood-opacity="0.15"/>
+      <feComposite result="composite" operator="in" in2="blur"/>
+      <feBlend result="blend" in="SourceGraphic"/>
+    </filter>
+  </defs>
+  <g transform="translate(-4.5 -94.5)" style="fill: #fff; filter: url(#filter)">
+    <path id="条件节点" class="cls-1" d="M81.665,100.221l50.709,18.925c6.16,2.3,6.16,11.429,0,13.728L81.665,151.8a19.05,19.05,0,0,1-13.361,0L17.6,132.874c-6.16-2.3-6.16-11.429,0-13.728L68.3,100.221A19.058,19.058,0,0,1,81.665,100.221Z" style="stroke: inherit; filter: none; fill: inherit"/>
+  </g>
+  <use transform="translate(-4.5 -94.5)" xlink:href="#条件节点" style="stroke: #fcce72; filter: none; fill: none"/>
+</svg>
diff --git a/src/icons/svg/bg_tiaojian_nor.svg b/src/icons/svg/bg_tiaojian_nor.svg
new file mode 100644
index 0000000000000000000000000000000000000000..77b03c99153122fb88c36506964458144316afa1
--- /dev/null
+++ b/src/icons/svg/bg_tiaojian_nor.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="123" height="50.969" viewBox="0 0 123 50.969">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke: #f5ab4c;
+        stroke-linejoin: round;
+        stroke-width: 3px;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path id="bg_tiaojian_nor" class="cls-1" d="M506.45,765.085L555.523,781.9a6.394,6.394,0,0,1,0,12.2L506.45,810.905a20,20,0,0,1-12.93,0l-49.073-16.812a6.394,6.394,0,0,1,0-12.2l49.073-16.812A19.982,19.982,0,0,1,506.45,765.085Z" transform="translate(-438.5 -762.531)"/>
+</svg>
diff --git a/src/pages/workbench/component-center/process-management/process-design/edit.vue b/src/pages/workbench/component-center/process-management/process-design/edit.vue
index a448ca8ae746442399c6931faff68cf5eeac527e..cd022f7ceadbd927542523a2b3b1255e9f7e8f2f 100644
--- a/src/pages/workbench/component-center/process-management/process-design/edit.vue
+++ b/src/pages/workbench/component-center/process-management/process-design/edit.vue
@@ -1,9 +1,15 @@
 <template>
   <div class="design_contain">
     <el-breadcrumb separator="/" class="bread_crumb1">
-      <el-breadcrumb-item :to="{ path: '/workplace' }">{{ $t("lang.online_component_tool") }}</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/progress/designer' }">{{ $t("lang.process_design") }}</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/progress/designer' }">{{ $t("lang.process_management") }}</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/workplace' }">{{
+        $t("lang.online_component_tool")
+      }}</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/progress/designer' }">{{
+        $t("lang.process_design")
+      }}</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/progress/designer' }">{{
+        $t("lang.process_management")
+      }}</el-breadcrumb-item>
       <el-breadcrumb-item>{{ $t("lang.edit") }}</el-breadcrumb-item>
     </el-breadcrumb>
     <BlockRadius class="block_item">
@@ -15,10 +21,18 @@
           class="apaas_step"
         >
           <div class="step_in" ref="stepInProcess">
-            <el-form :model="basic_form" :rules="rules" ref="basicInformation" class="form_left">
+            <el-form
+              :model="basic_form"
+              :rules="rules"
+              ref="basicInformation"
+              class="form_left"
+            >
               <el-form-item prop="name">
                 <p class="formname">流程名称：</p>
-                <el-input v-model="basic_form.name" placeholder="请输入流程名称"></el-input>
+                <el-input
+                  v-model="basic_form.name"
+                  placeholder="请输入流程名称"
+                ></el-input>
               </el-form-item>
               <el-form-item prop="workplace">
                 <p class="formname">工作区域：</p>
@@ -39,7 +53,7 @@
                 <p class="formname">流程描述：</p>
                 <el-input
                   type="textarea"
-                  :autosize="{ minRows: 6, maxRows: 10}"
+                  :autosize="{ minRows: 6, maxRows: 10 }"
                   v-model="basic_form.desc"
                   placeholder="请输入流程描述"
                 ></el-input>
@@ -85,7 +99,10 @@
           <div class="steps_container steps_done">
             <div class="steps_done_info">
               <div class="left_container">
-                <img :src="require('@/assets/imgs/steps_done.png')" width="100%" />
+                <img
+                  :src="require('@/assets/imgs/steps_done.png')"
+                  width="100%"
+                />
               </div>
               <div class="right_container">
                 <p>保存成功</p>
@@ -166,6 +183,8 @@ export default {
       let end_after = 0;
       let in_edge = 0;
       let out_edge = 0;
+      let judge_nodes = [];
+      let in_judge_edges = 0;
       let datas = { ...data.obj };
       datas.nodeList.forEach((item) => {
         let da = data.params.find((nodep) => {
@@ -181,6 +200,9 @@ export default {
           end_num++;
           end_id = item.id;
         }
+        if (item.meta.type == 4) {
+          judge_nodes.push(item.meta.id);
+        }
         if (
           datas.linkList.findIndex((el) => {
             return el.startId == item.id;
@@ -208,6 +230,9 @@ export default {
         if (end_id == item.startId) {
           end_after++;
         }
+        if (judge_nodes.indexOf(item.endId) != -1) {
+          in_judge_edges++;
+        }
       });
       if (start_num != 1 || end_num != 1) {
         this.$message({
@@ -238,6 +263,11 @@ export default {
           message: "不能连接本节点之前的节点",
           type: "warning",
         });
+      } else if (judge_nodes.length != in_judge_edges) {
+        this.$message({
+          message: "条件节点应当有且只有一条入边",
+          type: "warning",
+        });
       } else {
         return datas;
       }
diff --git a/src/pages/workbench/component-center/process-management/process-design/index.vue b/src/pages/workbench/component-center/process-management/process-design/index.vue
index faf25bebb59dce2fb0670b90b72976babafdc4b6..633798a76055bee924a22bd24fa1d433deec2079 100644
--- a/src/pages/workbench/component-center/process-management/process-design/index.vue
+++ b/src/pages/workbench/component-center/process-management/process-design/index.vue
@@ -151,6 +151,8 @@ export default {
       let end_after = 0;
       let in_edge = 0;
       let out_edge = 0;
+      let judge_nodes = [];
+      let in_judge_edges = 0;
       let datas = { ...data.obj };
       datas.nodeList.forEach((item) => {
         let da = data.params.find((nodep) => {
@@ -166,6 +168,9 @@ export default {
           end_num++;
           end_id = item.id;
         }
+        if (item.meta.type == 4) {
+          judge_nodes.push(item.meta.id)
+        }
         if (
           datas.linkList.findIndex((el) => {
             return el.startId == item.id;
@@ -193,6 +198,9 @@ export default {
         if (end_id == item.startId) {
           end_after++;
         }
+        if (judge_nodes.indexOf(item.endId) != -1) {
+          in_judge_edges++;
+        }
       });
       if (start_num != 1 || end_num != 1) {
         this.$message({
@@ -223,6 +231,11 @@ export default {
           message: "不能连接本节点之前的节点",
           type: "warning",
         });
+      }  else if (judge_nodes.length != in_judge_edges) {
+        this.$message({
+          message: "条件节点应当有且只有一条入边",
+          type: "warning",
+        });
       } else {
         return datas;
       }