From 3dec3c47556976d1d29c8c47e5906cdce10c79c3 Mon Sep 17 00:00:00 2001
From: zhangzhen <525765282@qq.com>
Date: Wed, 19 Nov 2025 11:35:06 +0800
Subject: [PATCH] 修改地址、logo；

---
 public/favicon.ico               | Bin 69694 -> 0 bytes
 src/mes/indexMes/assets/logo.png | Bin 12961 -> 0 bytes
 src/mes/indexMes/index.js        | 2 +-
 src/mes/login/asstes/logo.png    | Bin 12961 -> 0 bytes
 src/mes/login/asstes/logo1.png   | Bin 2272 -> 0 bytes
 src/mes/login/index.js           | 4 ++--
 src/utils/config.js              | 8 ++++----
 7 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 src/mes/login/asstes/logo1.png

diff --git a/public/favicon.ico b/public/favicon.ico
index e84af23..2a9cdba 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/mes/indexMes/assets/logo.png b/src/mes/indexMes/assets/logo.png
index 5b26f40..2a9cdba 100644
Binary files a/src/mes/indexMes/assets/logo.png and b/src/mes/indexMes/assets/logo.png differ
diff --git a/src/mes/indexMes/index.js b/src/mes/indexMes/index.js
index 0f70f4f..73f738b 100644
--- a/src/mes/indexMes/index.js
+++ b/src/mes/indexMes/index.js
@@ -512,7 +512,7 @@ const HeaderConponent = () => {
         <img src={logo} alt="logo" />
       </div>
       <div className="title">
-        <span>普什3D生产执行系统（EBC-MES）</span>
+        <span>伟盛鑫淼生产执行系统（EBC-MES）</span>
       </div>
       <div className="userInfo">
         <Space size={30}>
diff --git a/src/mes/login/asstes/logo.png b/src/mes/login/asstes/logo.png
index 5b26f40..2a9cdba 100644
Binary files a/src/mes/login/asstes/logo.png and b/src/mes/login/asstes/logo.png differ
diff --git a/src/mes/login/asstes/logo1.png b/src/mes/login/asstes/logo1.png
deleted file mode 100644
index ae31b5d..0000000
Binary files a/src/mes/login/asstes/logo1.png and /dev/null differ
diff --git a/src/mes/login/index.js b/src/mes/login/index.js
index caf924d..42a5370 100644
--- a/src/mes/login/index.js
+++ b/src/mes/login/index.js
@@ -403,11 +403,11 @@ const login = baseProps => {
     <div className={styles.login}>
       <div className="loginTitle">
         <div className="loginTitle1">Enterprise Business Capability MES</div>
-        <div className="loginTitle2">普什3D生产执行系统</div>
+        <div className="loginTitle2">伟盛鑫淼生产执行系统</div>
         <div className="loginTitle3">EBC-MES</div>
       </div>
       <div className="loginBox">
-        <div className="logo">普什3D生产执行系统（EBC-MES）</div>
+        <div className="logo">伟盛鑫淼生产执行系统（EBC-MES）</div>
         <Form form={form} layout="vertical" size="large">
           {configs.map(item => handleGetFormItem(props, item))}
           <Form.Item>
diff --git a/src/utils/config.js b/src/utils/config.js
index 5a5c68c..87245ac 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -4,10 +4,10 @@ const bHttps = location.protocol === 'https:';
 export const webSite = {
   // ipAddress: '//t0.xlyprint.com:8000/xlyEntry/', /* 服务器地址 */
   // faceAddress: isDev ? '//192.168.11.22:8080/xlyFace' : '//' + location.host + '/xlyFace',
-  fileAddress: isDev ? '//10.255.0.21:8086/xlyReport/' : '//' + location.host + '/xlyReport/', // 接口地址
-  faceAddress: isDev ? '//10.255.0.21:8086/xlyFace' : '//' + location.host + '/xlyFace',
-  ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//10.255.0.21:8086/xlyEntry/' : '//' + location.host + '/xlyEntry/',
-  interfaceAddress: isDev ? '//10.255.0.21:8086/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
+  fileAddress: isDev ? '//125.69.162.96:8086/xlyReport/' : '//' + location.host + '/xlyReport/', // 接口地址
+  faceAddress: isDev ? '//125.69.162.96:8086/xlyFace' : '//' + location.host + '/xlyFace',
+  ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//125.69.162.96:8086/xlyEntry/' : '//' + location.host + '/xlyEntry/',
+  interfaceAddress: isDev ? '//125.69.162.96:8086/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
   // ipAddress: isDev ? '//ebc.jinjia.com:8091/xlyEntry/' : '//' + location.host + '/xlyEntry/',
   // interfaceAddress: isDev ? '//ebc.jinjia.com:8091/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
   // ipAddress: isDev ? '//192.168.11.26:8080/xlyEntry/' : '//' + location.host + '/xlyEntry/',
--
libgit2 0.22.2