Merge branch 'master' of http://101.42.248.108:3000/wangyu/post-check-web

.env.development

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

src/utils/baseUrl.js

@@ -19,8 +19,10 @@ export const getBaseUrl = () => {
     // 惠州石化服务器IP
     const url = type == 1 ? 'http://10.152.72.7:8180' : 'http://10.152.72.7:8180';
 
+  // 阿里云IP
+    // const url = type === 1 ? 'http://101.42.248.108:17005' : 'http://101.42.248.108:17005';
   // 开发本机
-  //   const url = type == 1 ? 'http://localhost:8180' : 'http://localhost:8180';
+  //   const url = type === 1 ? 'http://127.0.0.1:8180' : 'http://127.0.0.1:8180';
 
     return url
 }

src/views/login.vue

@@ -93,6 +93,8 @@ export default {
       loginForm: {
         username: "",
         password: "",
+        // username: "ganjiantest",
+        // password: "Hzsh.eitc@6626.admin",
         rememberMe: false,
         code: "",
         uuid: "",
@@ -127,16 +129,16 @@ export default {
     this.getCookie();
   },
   methods: {
-    getCode() {
-      getCodeImg().then((res) => {
-        this.captchaEnabled =
-          res.captchaEnabled === undefined ? true : res.captchaEnabled;
-        if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
-          this.loginForm.uuid = res.uuid;
-        }
-      });
-    },
+    // getCode() {
+    //   getCodeImg().then((res) => {
+    //     this.captchaEnabled =
+    //       res.captchaEnabled === undefined ? true : res.captchaEnabled;
+    //     if (this.captchaEnabled) {
+    //       this.codeUrl = "data:image/gif;base64," + res.img;
+    //       this.loginForm.uuid = res.uuid;
+    //     }
+    //   });
+    // },
     getCookie() {
       const username = Cookies.get("username");
       const password = Cookies.get("password");

vue.config.js

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