diff --git a/src/api/myAPI/login.js b/src/api/myAPI/login.js index d31d4e7..1cf4a25 100644 --- a/src/api/myAPI/login.js +++ b/src/api/myAPI/login.js @@ -1,42 +1,42 @@ -import request from "@/utils/request"; -// 本地 -// let api = "API" -// 线上 -let api = location.origin -export default { - frimLogin() { - return request({ - baseURL: process.env.VUE_APP_USER_LOGIN, - url: "/ggfw-api/pharmaceuticals/login", - headers: { - "Content-Type": "application/json", - isToken: true, - repeatSubmit: false, - }, - method: "POST", - timeout: 60000, - data: { - // pdma: "Q2V0YzI4QGNvbQ==", - // urne: "2112042170015", - pdma: "MTExMTEx", - urne: "2112042170015", - }, - }); - }, - - getuserinfo() { - return request({ - // baseURL: location.origin, - baseURL: api, - url: "/api/admin/user/getSelfInfo", - method: "get", - timeout: 60000, - headers: { - // Authentication: localStorage.getItem("MSSM-LIAONING__TOKEN"), - repeatSubmit: false, - }, - }); - }, - - -}; +import request from "@/utils/request"; +// 本地 +let api = process.env.NODE_ENV === "production" ?location.origin: "API" +// 线上 +// let api = location.origin +export default { + frimLogin() { + return request({ + baseURL: process.env.VUE_APP_USER_LOGIN, + url: "/ggfw-api/pharmaceuticals/login", + headers: { + "Content-Type": "application/json", + isToken: true, + repeatSubmit: false, + }, + method: "POST", + timeout: 60000, + data: { + // pdma: "Q2V0YzI4QGNvbQ==", + // urne: "2112042170015", + pdma: "MTExMTEx", + urne: "2112042170015", + }, + }); + }, + + getuserinfo() { + return request({ + // baseURL: location.origin, + baseURL: api, + url: "/api/admin/user/getSelfInfo", + method: "get", + timeout: 60000, + headers: { + // Authentication: localStorage.getItem("MSSM-LIAONING__TOKEN"), + repeatSubmit: false, + }, + }); + }, + + +}; diff --git a/src/utils/request.js b/src/utils/request.js index bfb1ac3..47c88d3 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,154 +1,155 @@ -import axios from 'axios' -import { Notification, MessageBox, Message, Loading } from 'element-ui' -import store from '@/store' -import { getToken } from '@/utils/auth' -import errorCode from '@/utils/errorCode' -import { tansParams, blobValidate } from "@/utils/ruoyi"; -import cache from '@/plugins/cache' -import { saveAs } from 'file-saver' - -let downloadLoadingInstance; -// 是否显示重新登录 -export let isRelogin = { show: false }; - -axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' -// 创建axios实例 -const service = axios.create({ - // axios中请求配置有baseURL选项,表示请求URL公共部分 - // baseURL: process.env.VUE_APP_BASE_API, - //!线上--2.17-198 - baseURL:location.origin +"/api/ggfw", - //!其他 - // baseURL:location.origin, - // 超时 - timeout: 10000 -}) - -// request拦截器 -service.interceptors.request.use(config => { - // 是否需要设置 token - const isToken = (config.headers || {}).isToken === false - // 是否需要防止数据重复提交 - const isRepeatSubmit = (config.headers || {}).repeatSubmit === false - if (getToken() && !isToken) { - // config.headers['Authentication'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - config.headers['Authentication'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - } - // get请求映射params参数 - if (config.method === 'get' && 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')) { - const requestObj = { - url: config.url, - data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data, - time: new Date().getTime() - } - 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) { - const message = '数据正在处理,请勿重复提交'; - console.warn(`[${s_url}]: ` + message) - return Promise.reject(new Error(message)) - } else { - cache.session.setJSON('sessionObj', requestObj) - } - } - } - return config -}, error => { - console.log(error) - Promise.reject(error) -}) - -// 响应拦截器 -service.interceptors.response.use(res => { - // 未设置状态码则默认成功状态 - const code = res.data.code || 200; - // 获取错误信息 - const msg = errorCode[code] || res.data.msg || errorCode['default'] - // 二进制数据则直接返回 - if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { - return res.data - } - if (code === 401) { - if (!isRelogin.show) { - isRelogin.show = true; - MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { - isRelogin.show = false; - store.dispatch('LogOut').then(() => { - location.href = `${location.origin}/login`; - }) - }).catch(() => { - isRelogin.show = false; - }); - } - return Promise.reject('无效的会话,或者会话已过期,请重新登录。') - } else if (code === 500) { - Message({ message: msg, type: 'error' }) - return Promise.reject(new Error(msg)) - } else if (code === 601) { - Message({ message: msg, type: 'warning' }) - return Promise.reject('error') - } else if (code !== 200) { - Notification.error({ title: msg }) - return Promise.reject('error') - } else { - return res.data - } -}, - error => { - console.log('err' + error) - let { message } = error; - if (message == "Network Error") { - message = "后端接口连接异常"; - } else if (message.includes("timeout")) { - message = "系统接口请求超时"; - } else if (message.includes("Request failed with status code")) { - message = "系统接口" + message.substr(message.length - 3) + "异常"; - setTimeout(() => { - location.href = `${location.origin}/login`; - }, 2000); - } - Message({ message: message, type: 'error', duration: 5 * 1000 }) - return Promise.reject(error) - } -) - -// 通用下载方法 -export function download(url, params, filename, config) { - downloadLoadingInstance = Loading.service({ 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', - ...config - }).then(async (data) => { - const isBlob = blobValidate(data); - if (isBlob) { - const blob = new Blob([data]) - saveAs(blob, filename) - } else { - const resText = await data.text(); - const rspObj = JSON.parse(resText); - const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] - Message.error(errMsg); - } - downloadLoadingInstance.close(); - }).catch((r) => { - console.error(r) - Message.error('下载文件出现错误,请联系管理员!') - downloadLoadingInstance.close(); - }) -} - -export default service +import axios from 'axios' +import { Notification, MessageBox, Message, Loading } from 'element-ui' +import store from '@/store' +import { getToken } from '@/utils/auth' +import errorCode from '@/utils/errorCode' +import { tansParams, blobValidate } from "@/utils/ruoyi"; +import cache from '@/plugins/cache' +import { saveAs } from 'file-saver' + +let downloadLoadingInstance; +// 是否显示重新登录 +export let isRelogin = { show: false }; + +axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' +// 创建axios实例 +const service = axios.create({ + // axios中请求配置有baseURL选项,表示请求URL公共部分 + //本地调试 + baseURL: process.env.NODE_ENV === "production" ? location.origin +"/api/ggfw" : process.env.VUE_APP_BASE_API, + //!线上--2.17-198 + // baseURL:location.origin +"/api/ggfw", + //!其他 + // baseURL:location.origin, + // 超时 + timeout: 10000 +}) + +// request拦截器 +service.interceptors.request.use(config => { + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false + // 是否需要防止数据重复提交 + const isRepeatSubmit = (config.headers || {}).repeatSubmit === false + if (getToken() && !isToken) { + // config.headers['Authentication'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + config.headers['Authentication'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + } + // get请求映射params参数 + if (config.method === 'get' && 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')) { + const requestObj = { + url: config.url, + data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data, + time: new Date().getTime() + } + 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) { + const message = '数据正在处理,请勿重复提交'; + console.warn(`[${s_url}]: ` + message) + return Promise.reject(new Error(message)) + } else { + cache.session.setJSON('sessionObj', requestObj) + } + } + } + return config +}, error => { + console.log(error) + Promise.reject(error) +}) + +// 响应拦截器 +service.interceptors.response.use(res => { + // 未设置状态码则默认成功状态 + const code = res.data.code || 200; + // 获取错误信息 + const msg = errorCode[code] || res.data.msg || errorCode['default'] + // 二进制数据则直接返回 + if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { + return res.data + } + if (code === 401) { + if (!isRelogin.show) { + isRelogin.show = true; + MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { + isRelogin.show = false; + store.dispatch('LogOut').then(() => { + location.href = `${location.origin}/login`; + }) + }).catch(() => { + isRelogin.show = false; + }); + } + return Promise.reject('无效的会话,或者会话已过期,请重新登录。') + } else if (code === 500) { + Message({ message: msg, type: 'error' }) + return Promise.reject(new Error(msg)) + } else if (code === 601) { + Message({ message: msg, type: 'warning' }) + return Promise.reject('error') + } else if (code !== 200) { + Notification.error({ title: msg }) + return Promise.reject('error') + } else { + return res.data + } +}, + error => { + console.log('err' + error) + let { message } = error; + if (message == "Network Error") { + message = "后端接口连接异常"; + } else if (message.includes("timeout")) { + message = "系统接口请求超时"; + } else if (message.includes("Request failed with status code")) { + message = "系统接口" + message.substr(message.length - 3) + "异常"; + setTimeout(() => { + location.href = `${location.origin}/login`; + }, 2000); + } + Message({ message: message, type: 'error', duration: 5 * 1000 }) + return Promise.reject(error) + } +) + +// 通用下载方法 +export function download(url, params, filename, config) { + downloadLoadingInstance = Loading.service({ 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', + ...config + }).then(async (data) => { + const isBlob = blobValidate(data); + if (isBlob) { + const blob = new Blob([data]) + saveAs(blob, filename) + } else { + const resText = await data.text(); + const rspObj = JSON.parse(resText); + const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] + Message.error(errMsg); + } + downloadLoadingInstance.close(); + }).catch((r) => { + console.error(r) + Message.error('下载文件出现错误,请联系管理员!') + downloadLoadingInstance.close(); + }) +} + +export default service diff --git a/src/views/index.vue b/src/views/index.vue index 44662c4..ce33d23 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,794 +1,798 @@ - - - - - - - {{ date }} - - - - {{ dataNow(3) }} - - {{ dataNow(2) }} - - - - - - - - 返回门户 - - - - - - - 您好,{{ userName }} - - - 退出登录 - - - - - - - - - 产品画像搜索 - - - - - - - - - 搜索 - - - - {{ item.name }} - - - - - - - - {{ index + 1 }} - {{ item.name }}: - - {{ item.lable }} - - - - {{ btmLitstTitleShow ? "收起" : "展开" - }} - - - - - 为您查询到 - {{ total }} - 条数据 - - - - - - {{ item.name || "" }} - - - - 药品批准文号: - - {{ item.code || "" }} - - - - - 持有/注册/备案人: - - {{ item.scqy || "" }} - - - - - - - - 详情 - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + {{ date }} + + + + {{ dataNow(3) }} + + {{ dataNow(2) }} + + + + + + + + 返回门户 + + + + + + + 您好,{{ userName }} + + + 退出登录 + + + + + + + + + 产品画像搜索 + + + + + + + + + + 搜索 + + + + {{ item.name }} + + + + + + + + {{ index + 1 }} + {{ item.name }}: + + {{ item.lable }} + + + + {{ btmLitstTitleShow ? "收起" : "展开" + }} + + + + + 为您查询到 + {{ total }} + 条数据 + + + + + + {{ item.name || "" }} + + + + 药品批准文号: + + {{ item.code || "" }} + + + + + 持有/注册/备案人: + + {{ item.scqy || "" }} + + + + + + + + 详情 + + + + + + + + + + + + + +