合并冲突

.env.JIS5000

@@ -0,0 +1,5 @@
+NODE_ENV = 'production'
+#VUE_APP_BASE_URL = http://10.0.0.198:9010/
+VUE_APP_BASE_URL = http://192.168.190.30:9010/
+VUE_APP_LOGIN_TITLE = SCCP JIS系统
+VUE_APP_LOGIN_LOGO = ../assets/img/logo.png

.env.JIS5300

@@ -1,4 +1,5 @@
 NODE_ENV = 'production'
-VUE_APP_BASE_URL = http://101.201.121.115:9010/
+#VUE_APP_BASE_URL = http://10.0.0.198:9010/
+VUE_APP_BASE_URL = http://192.168.190.28:9010/
 VUE_APP_LOGIN_TITLE = SCCP JIS系统
 VUE_APP_LOGIN_LOGO = ../assets/img/logo.png

.env.NOBO

@@ -0,0 +1,9 @@
+NODE_ENV = 'production'
+VUE_APP_LOGIN_TITLE = 长城诺博
+VUE_APP_LOGIN_LOGO = ../assets/img/logo.png
+
+#客户测试环境
+#VITE_APP_BASE_URL = http://10.42.253.5:9010/
+
+#客户正式环境
+VITE_APP_BASE_URL = http://10.42.253.3:9010/

.env.PUREMG48

@@ -0,0 +1,4 @@
+NODE_ENV = 'production'
+VUE_APP_BASE_URL = http://10.86.176.199:9010/
+VUE_APP_LOGIN_TITLE = PUREM G48 排气系统排序发运管理系统
+VUE_APP_LOGIN_LOGO = ../assets/img/logo.png

.env.TRIM

@@ -1,4 +1,9 @@
 NODE_ENV = 'production'
-VUE_APP_BASE_URL = http://101.201.121.115:9010/
 VUE_APP_LOGIN_TITLE = 安道拓南通面套工厂COS系统
-VUE_APP_LOGIN_LOGO = ../assets/img/logo.png
+VUE_APP_LOGIN_LOGO = ../assets/img/logo.png
+#正式
+#VUE_APP_BASE_URL = http://10.104.120.109:9010/
+VUE_APP_BASE_URL = https://ntcos.adient.com/
+#测试
+#VUE_APP_BASE_URL = http://10.227.4.5:9010/
+#VUE_APP_BASE_URL = https://ntcos-qa.adient.com/

package.json

@@ -5,10 +5,15 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "TRIM": "vue-cli-service --mode TRIM",
+    "JIS5000": "vue-cli-service --mode JIS5000",
     "JIS5300": "vue-cli-service --mode JIS5300",
-    "ETL": "vue-cli-service --mode ETL",
+    "PUREMG48": "vue-cli-service --mode PUREMG48",
     "build:TRIM": "vue-cli-service build --mode TRIM",
+    "build:JIS5000": "vue-cli-service build --mode JIS5000",
     "build:JIS5300": "vue-cli-service build --mode JIS5300",
+    "build:PUREMG48": "vue-cli-service build --mode PUREMG48",
+    "build:NOBO": "vue-cli-service build --mode NOBO",
+    "ETL": "vue-cli-service --mode ETL",
     "build:ETL": "vue-cli-service build --mode ETL"
   },
   "dependencies": {

src/server/request.js

@@ -3,7 +3,7 @@ import axios from "axios";
 // create an axios instance
 const service = axios.create({
 	// baseURL: process.env.VUE_APP_BASE_URL || 'http://101.201.121.115:9010/',
-  baseURL:"/sylxzk/etl/"
+  baseURL:"/sylxzk/"
   // timeout: 20000, // request timeout
 });
 // request interceptor