diff --git a/public/favicon.ico b/public/favicon.ico index e84af23..2a9cdba 100644 --- a/public/favicon.ico +++ b/public/favicon.ico diff --git a/src/mes/indexMes/assets/logo.png b/src/mes/indexMes/assets/logo.png index 5b26f40..2a9cdba 100644 --- a/src/mes/indexMes/assets/logo.png +++ b/src/mes/indexMes/assets/logo.png 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 = () => { logo
- 普什3D生产执行系统(EBC-MES) + 伟盛鑫淼生产执行系统(EBC-MES)
diff --git a/src/mes/login/asstes/logo.png b/src/mes/login/asstes/logo.png index 5b26f40..2a9cdba 100644 --- a/src/mes/login/asstes/logo.png +++ b/src/mes/login/asstes/logo.png diff --git a/src/mes/login/asstes/logo1.png b/src/mes/login/asstes/logo1.png deleted file mode 100644 index ae31b5d..0000000 --- a/src/mes/login/asstes/logo1.png +++ /dev/null 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 => {
Enterprise Business Capability MES
-
普什3D生产执行系统
+
伟盛鑫淼生产执行系统
EBC-MES
-
普什3D生产执行系统(EBC-MES)
+
伟盛鑫淼生产执行系统(EBC-MES)
{configs.map(item => handleGetFormItem(props, 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/',