Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-cpt-vue

.gitignore

@@ -20,6 +20,5 @@ UDI_WMS_NEW/
 *.sln
 *.local
 
-/vue.config.js
 package-lock.json
 yarn.lock

src/api/login.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 登录方法
 export function login(username, password, code, uuid) {
@@ -6,66 +6,83 @@ export function login(username, password, code, uuid) {
     username,
     password,
     code,
-    uuid
+    uuid,
-  }
+  };
   return request({
-    url: '/login',
+    url: "/login",
     headers: {
-      isToken: false
+      isToken: false,
     },
-    method: 'post',
+    method: "post",
-    data: data
+    data: data,
-  })
+  });
 }
 
 // 注册方法
 export function register(data) {
   return request({
-    url: '/register',
+    url: "/register",
     headers: {
-      isToken: false
+      isToken: false,
     },
-    method: 'post',
+    method: "post",
-    data: data
+    data: data,
-  })
+  });
 }
 
 // 获取用户详细信息
 export function getInfo() {
   return request({
-    url: '/getInfo',
+    url: "/getInfo",
-    method: 'get'
+    method: "get",
-  })
+  });
 }
 
 // 退出方法
 export function logout() {
   return request({
-    url: '/admin/auth/login/out',
+    url: "/admin/auth/login/out",
-    method: 'post'
+    method: "post",
-  })
+  });
 }
 
 // 获取验证码
 export function getCodeImg() {
   return request({
-    url: '/captchaImage',
+    url: "/captchaImage",
     headers: {
-      isToken: false
+      isToken: false,
     },
-    method: 'get',
+    method: "get",
-    timeout: 20000
+    timeout: 20000,
-  })
+  });
 }
 
 // 短信验证码
 export function getCodeSms() {
   return request({
-    url: '/captchaSms',
+    url: "/captchaSms",
     headers: {
-      isToken: false
+      isToken: false,
     },
-    method: 'get',
+    method: "get",
-    timeout: 20000
+    timeout: 20000,
-  })
+  });
+}
+
+// 获取注册短信手机验证码
+export function getCodeImg2(data) {
+  return request({
+    url: "/admin/auth/register/getCheckcode",
+    method: "post",
+    data,
+  });
+}
+//验证验证码
+export function getCodeSms2(data) {
+  return request({
+    url: "/admin/auth/register/checkCode",
+    method: "post",
+    data,
+  });
 }

src/utils/request.js

@@ -1,110 +1,132 @@
-import axios from 'axios'
+import axios from "axios";
-import {Notification, MessageBox, Message, Loading} from 'element-ui'
+import { Notification, MessageBox, Message, Loading } from "element-ui";
-import store from '@/store'
+import store from "@/store";
-import {getAdminId, getToken} from '@/utils/auth'
+import { getAdminId, getToken } from "@/utils/auth";
-import errorCode from '@/utils/errorCode'
+import errorCode from "@/utils/errorCode";
-import {tansParams, blobValidate} from "@/utils/ruoyi";
+import { tansParams, blobValidate } from "@/utils/ruoyi";
-import cache from '@/plugins/cache'
+import cache from "@/plugins/cache";
-import {saveAs} from 'file-saver'
+import { saveAs } from "file-saver";
 
 let downloadLoadingInstance;
 // 是否显示重新登录
-export let isRelogin = {show: false};
+export let isRelogin = { show: false };
 
-axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 对应国际化资源文件后缀
-axios.defaults.headers['Content-Language'] = 'zh_CN'
+axios.defaults.headers["Content-Language"] = "zh_CN";
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 10000,
-})
+});
 
 // request拦截器
-service.interceptors.request.use(config => {
+service.interceptors.request.use(
+  (config) => {
     // 是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
+    const isToken = (config.headers || {}).isToken === false;
     // 是否需要防止数据重复提交
-  const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+    const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
     if (getToken() && !isToken) {
       // config.headers['ADMIN_TOKEN'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-
-
       config.headers = {
         ADMIN_ID: getAdminId(),
-      ADMIN_TOKEN: getToken()
+        ADMIN_TOKEN: getToken(),
       };
-
-
     }
     // get请求映射params参数
-  if (config.method === 'get' && config.params) {
+    if (config.method === "get" && config.params) {
-    let url = config.url + '?' + tansParams(config.params);
+      let url = config.url + "?" + tansParams(config.params);
       url = url.slice(0, -1);
       config.params = {};
       config.url = url;
     }
-  if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+    if (
+      !isRepeatSubmit &&
+      (config.method === "post" || config.method === "put")
+    ) {
       const requestObj = {
         url: config.url,
-      data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+        data:
-      time: new Date().getTime()
+          typeof config.data === "object"
-    }
+            ? JSON.stringify(config.data)
-    const sessionObj = cache.session.getJSON('sessionObj')
+            : config.data,
-    if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+        time: new Date().getTime(),
-      cache.session.setJSON('sessionObj', requestObj)
+      };
+      const sessionObj = cache.session.getJSON("sessionObj");
+      if (
+        sessionObj === undefined ||
+        sessionObj === null ||
+        sessionObj === ""
+      ) {
+        cache.session.setJSON("sessionObj", requestObj);
       } else {
         const s_url = sessionObj.url; // 请求地址
         const s_data = sessionObj.data; // 请求数据
         const s_time = sessionObj.time; // 请求时间
         const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
-      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+        if (
-        const message = '数据正在处理，请勿重复提交';
+          s_data === requestObj.data &&
-        console.warn(`[${s_url}]: ` + message)
+          requestObj.time - s_time < interval &&
-        return Promise.reject(new Error(message))
+          s_url === requestObj.url
+        ) {
+          const message = "数据正在处理，请勿重复提交";
+          console.warn(`[${s_url}]: ` + message);
+          return Promise.reject(new Error(message));
         } else {
-        cache.session.setJSON('sessionObj', requestObj)
+          cache.session.setJSON("sessionObj", requestObj);
+        }
       }
     }
+    return config;
+  },
+  (error) => {
+    console.log("2", error);
+    Promise.reject(error);
   }
-  return config
+);
-}, error => {
-  console.log(error)
-  Promise.reject(error)
-})
 
 // 响应拦截器
-service.interceptors.response.use(res => {
+service.interceptors.response.use(
+  (res) => {
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息
-    const msg = errorCode[code] || res.data.message
+    const msg = errorCode[code] || res.data.message;
     // 二进制数据则直接返回
-    if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+    if (
-      return res.data
+      res.request.responseType === "blob" ||
+      res.request.responseType === "arraybuffer"
+    ) {
+      return res.data;
     }
     if (code === 2) {
       if (!isRelogin.show) {
         isRelogin.show = true;
-        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
+        MessageBox.confirm(
-            confirmButtonText: '重新登录',
+          "登录状态已过期，您可以继续留在该页面，或者重新登录",
-            cancelButtonText: '取消',
+          "系统提示",
-            type: 'warning'
+          {
+            confirmButtonText: "重新登录",
+            cancelButtonText: "取消",
+            type: "warning",
           }
-        ).then(() => {
+        )
+          .then(() => {
             isRelogin.show = false;
-          store.dispatch('LogOut').then(() => {
+            store.dispatch("LogOut").then(() => {
               location.href = process.env.VUE_APP_CONTEXT_PATH;
+            });
           })
-        }).catch(() => {
+          .catch(() => {
             isRelogin.show = false;
           });
       }
-      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+      return Promise.reject("无效的会话，或者会话已过期，请重新登录。");
-    }else {
+    } else {
-      return res.data
+      return res.data;
     }
   },
 
@@ -124,9 +146,9 @@ service.interceptors.response.use(res => {
       return Promise.reject('error')
     }
    */
-  error => {
+  (error) => {
-    console.log('err' + error)
+    console.log("err" + error);
-    let {message} = error;
+    let { message } = error;
     if (message == "Network Error") {
       message = "后端接口连接异常";
     } else if (message.includes("timeout")) {
@@ -136,12 +158,12 @@ service.interceptors.response.use(res => {
     }
     Message({
       message: message,
-      type: 'error',
+      type: "error",
-      duration: 5 * 1000
+      duration: 5 * 1000,
-    })
+    });
-    return Promise.reject(error)
+    return Promise.reject(error);
   }
-)
+);
 
 // 通用下载方法
 export function download(url, params, filename) {
@@ -149,30 +171,36 @@ export function download(url, params, filename) {
     text: "正在下载数据，请稍候",
     spinner: "el-icon-loading",
     background: "rgba(0, 0, 0, 0.7)",
+  });
+  return service
+    .post(url, params, {
+      transformRequest: [
+        (params) => {
+          return tansParams(params);
+        },
+      ],
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      responseType: "blob",
     })
-  return service.post(url, params, {
+    .then(async (data) => {
-    transformRequest: [(params) => {
-      return tansParams(params)
-    }],
-    headers: {'Content-Type': 'application/x-www-form-urlencoded'},
-    responseType: 'blob'
-  }).then(async (data) => {
       const isLogin = await blobValidate(data);
       if (isLogin) {
-      const blob = new Blob([data])
+        const blob = new Blob([data]);
-      saveAs(blob, filename)
+        saveAs(blob, filename);
       } else {
         const resText = await data.text();
         const rspObj = JSON.parse(resText);
-      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+        const errMsg =
+          errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
         Message.error(errMsg);
       }
       downloadLoadingInstance.close();
-  }).catch((r) => {
-    console.error(r)
-    Message.error('下载文件出现错误，请联系管理员！')
-    downloadLoadingInstance.close();
     })
+    .catch((r) => {
+      console.error(r);
+      Message.error("下载文件出现错误，请联系管理员！");
+      downloadLoadingInstance.close();
+    });
 }
 
-export default service
+export default service;

vue.config.js

@@ -11,7 +11,6 @@ const name = process.env.VUE_APP_TITLE || "UDI协调平台"; //网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
-
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档
@@ -36,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1:9991`,
+        target: `http://api.clborch.com:8190`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",