From 6bab6174e3eb0d8a37eade096ff70bf984e82439 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 03 九月 2024 16:55:06 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6
---
/dev/null | 10 ----------
.gitignore | 3 ++-
Web/src/views/device/sortPallet/index.vue | 2 +-
Admin.NET/WCS.Application/Enum/PLCEnum.cs | 10 ++++++++++
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
index b1a5d68..f077813 100644
--- a/.gitignore
+++ b/.gitignore
@@ -361,4 +361,5 @@
.ionide/
# Fody - auto-generated XML schema
-FodyWeavers.xsd
\ No newline at end of file
+FodyWeavers.xsd
+/Web/public/config.js
diff --git a/Admin.NET/WCS.Application/Enum/PLCEnum.cs b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
index d0f45f7..ac2f2ce 100644
--- a/Admin.NET/WCS.Application/Enum/PLCEnum.cs
+++ b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
@@ -31,6 +31,16 @@
/// </summary>
[Description("浠剁杈撻�佺嚎")]
BoxConveyorLine = 4,
+ /// <summary>
+ /// 鐮佸灈鏈哄櫒浜�
+ /// </summary>
+ [Description("鐮佸灈鏈哄櫒浜�")]
+ RobotPalletizer = 5,
+ /// <summary>
+ /// 鎷嗗灈鏈哄櫒浜�
+ /// </summary>
+ [Description("鎷嗗灈鏈哄櫒浜�")]
+ StackingRobot = 6,
}
/// <summary>
diff --git a/Web/public/config.js b/Web/public/config.js
deleted file mode 100644
index 0d5d130..0000000
--- a/Web/public/config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-window.__env__ = {
- "VITE_PORT": "8889",
- "VITE_OPEN": "false",
- "VITE_OPEN_CDN": "false",
- "VITE_PUBLIC_PATH": "",
- "VITE_DEFAULT_USER": "superadmin",
- "VITE_DEFAULT_USER_PASSWORD": "123456",
- "VITE_SM_PUBLIC_KEY": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312",
- "VITE_API_URL": "http://localhost:5005"
-}
\ No newline at end of file
diff --git a/Web/src/views/device/sortPallet/index.vue b/Web/src/views/device/sortPallet/index.vue
index 92f969e..0ce1640 100644
--- a/Web/src/views/device/sortPallet/index.vue
+++ b/Web/src/views/device/sortPallet/index.vue
@@ -208,7 +208,7 @@
}
.otherValuefix{
width: 100%;
- height: 550px;
+ height: 500px;
padding: 10px;
border-bottom: 1px solid rgb(197, 195, 195);
}
--
Gitblit v1.8.0