3 Commits 888265b5a9 ... 56dbc1f457

Author SHA1 Message Date
  csg6 56dbc1f457 生产打包配置 2 weeks ago
  csg6 00b123dd29 Merge remote-tracking branch 'origin/master' 3 weeks ago
  csg6 16d5f1671e 0 3 weeks ago
5 changed files with 20 additions and 24 deletions
  1. 1 1
      .env.development
  2. 1 1
      .env.production
  3. 5 11
      src/utils/baseUrl.js
  4. 12 10
      src/views/login.vue
  5. 1 1
      vue.config.js

+ 1 - 1
.env.development

@@ -7,7 +7,7 @@ ENV = 'development'
7 7
 # 若依管理系统/开发环境
8 8
 # VUE_APP_BASE_API = '/prod-api'
9 9
 # 阿里云IP
10
-VUE_APP_BASE_API = 'http://39.106.66.72:8180'
10
+VUE_APP_BASE_API = 'http://101.42.248.108:17005'
11 11
 
12 12
 # 内控开发IP
13 13
 # VUE_APP_BASE_API = 'http://10.152.164.68:8180'

+ 1 - 1
.env.production

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 惠州石化
5 5
 ENV = 'production'
6 6
 
7 7
 # 若依管理系统/生产环境
8
-VUE_APP_BASE_API = 'http://39.106.66.72:8180'
8
+VUE_APP_BASE_API = 'http://101.42.248.108:17005'
9 9
 
10 10
 # 内控开发IP
11 11
 # VUE_APP_BASE_API = 'http://10.152.164.68:8180'

+ 5 - 11
src/utils/baseUrl.js

@@ -7,19 +7,13 @@ if(pathname === '/' || pathname === "/postcheck") {
7 7
 }
8 8
 export const getBaseUrl = () => {
9 9
     const type = window.localStorage.getItem("isPathType")
10
-    // 阿里云IP
11
-    const url = type === 1 ? 'http://39.106.66.72:8180' : 'http://39.106.66.72:8180';
12
-    // const url = type == 1 ? 'http://192.168.3.200:8180' : 'http://192.168.3.200:8180';
13
-
14
-    // 内控开发IP
15
-    // const url = type === 1 ? 'http://10.152.164.68:8180' : 'http://10.152.164.68:8180';
16
-    // const url = type === 1 ? 'http://10.152.164.69:8180' : 'http://10.152.164.69:8180';
17
-
18
-    // 惠州石化服务器IP
19
-    // const url = type == 1 ? 'http://10.152.72.5:8180' : 'http://10.152.72.5:8180';
10
+  // 惠州石化服务器IP-生产
11
+  const url = type === 1 ? 'http://10.152.72.7:8180' : 'http://10.152.72.7:8180';
20 12
 
13
+  // 阿里云IP
14
+    // const url = type === 1 ? 'http://101.42.248.108:17005' : 'http://101.42.248.108:17005';
21 15
   // 开发本机
22
-  //   const url = type == 1 ? 'http://localhost:8180' : 'http://localhost:8180';
16
+  //   const url = type === 1 ? 'http://127.0.0.1:8180' : 'http://127.0.0.1:8180';
23 17
 
24 18
     return url
25 19
 }

+ 12 - 10
src/views/login.vue

@@ -93,6 +93,8 @@ export default {
93 93
       loginForm: {
94 94
         username: "",
95 95
         password: "",
96
+        // username: "ganjiantest",
97
+        // password: "Hzsh.eitc@6626.admin",
96 98
         rememberMe: false,
97 99
         code: "",
98 100
         uuid: "",
@@ -127,16 +129,16 @@ export default {
127 129
     this.getCookie();
128 130
   },
129 131
   methods: {
130
-    getCode() {
131
-      getCodeImg().then((res) => {
132
-        this.captchaEnabled =
133
-          res.captchaEnabled === undefined ? true : res.captchaEnabled;
134
-        if (this.captchaEnabled) {
135
-          this.codeUrl = "data:image/gif;base64," + res.img;
136
-          this.loginForm.uuid = res.uuid;
137
-        }
138
-      });
139
-    },
132
+    // getCode() {
133
+    //   getCodeImg().then((res) => {
134
+    //     this.captchaEnabled =
135
+    //       res.captchaEnabled === undefined ? true : res.captchaEnabled;
136
+    //     if (this.captchaEnabled) {
137
+    //       this.codeUrl = "data:image/gif;base64," + res.img;
138
+    //       this.loginForm.uuid = res.uuid;
139
+    //     }
140
+    //   });
141
+    // },
140 142
     getCookie() {
141 143
       const username = Cookies.get("username");
142 144
       const password = Cookies.get("password");

+ 1 - 1
vue.config.js

@@ -45,7 +45,7 @@ module.exports = {
45 45
         // target: `http://localhost:8180`,
46 46
         // target: `http://192.168.3.90:8180`,
47 47
         // target: `http://10.152.164.68:8180`,
48
-        target: `http://10.152.72.5:8180`,
48
+        target: `http://10.152.72.7:8180`,
49 49
         changeOrigin: true
50 50
       }
51 51
     },