From 1238ad893b8aff59ad5952622002cfc114523cc3 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Wed, 12 Jun 2024 09:00:11 +0800
Subject: [PATCH] =?UTF-8?q?rev:gateWay=E5=9B=BE=E6=A0=87=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=92=8C=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logicflow/PropertySetting/SequenceFlowProperties.vue  | 6 +++++-
 .../logicflow/registerNode/registerGatewayTask.js         | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/SequenceFlowProperties.vue b/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/SequenceFlowProperties.vue
index 3e94cfb4..9d136879 100644
--- a/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/SequenceFlowProperties.vue
+++ b/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/SequenceFlowProperties.vue
@@ -7,6 +7,9 @@
       <el-form-item label="名称" prop="name">
         <el-input v-model="formData.name"></el-input>
       </el-form-item>
+      <el-form-item label="表达式" prop="skipExpression">
+        <el-input v-model="formData.skipExpression"></el-input>
+      </el-form-item>
       <el-form-item label="描述" prop="documentation">
         <el-input v-model="formData.documentation"></el-input>
       </el-form-item>
@@ -44,7 +47,8 @@ export default {
       formData: {
         id: '',
         name: '',
-        documentation: ''
+        documentation: '',
+        skipExpression: ''
       },
       rules: {
         id: [
diff --git a/wms_pro/qd/src/views/wms/flow_manage/logicflow/registerNode/registerGatewayTask.js b/wms_pro/qd/src/views/wms/flow_manage/logicflow/registerNode/registerGatewayTask.js
index 7adc6b5c..3a24b92e 100644
--- a/wms_pro/qd/src/views/wms/flow_manage/logicflow/registerNode/registerGatewayTask.js
+++ b/wms_pro/qd/src/views/wms/flow_manage/logicflow/registerNode/registerGatewayTask.js
@@ -59,10 +59,10 @@ class ResizableDiamondView extends DiamondResize.view {
     const {x, y, width, height} = model;
     const style = model.getNodeStyle();
     const {stroke} = style;
-    const iconWidth = width / 3; // 图标宽度
-    const iconHeight = height / 3; // 图标高度
-    const iconX = x - iconWidth; // 调整图标位置的X坐标
-    const iconY = y - iconHeight; // 调整图标位置的Y坐标
+    const iconWidth = width; // 图标宽度
+    const iconHeight = height; // 图标高度
+    const iconX = x - iconWidth / 2; // 调整图标位置的X坐标
+    const iconY = y - iconHeight / 2; // 调整图标位置的Y坐标
     return h(
       'svg',
       {