Commit 06c1c002 authored by chenwei's avatar chenwei

fixed time data clear

parent 957f5743
import axios from 'axios' import axios from "axios";
import { Notification, MessageBox, Message } from 'element-ui' import { Notification, MessageBox, Message } from "element-ui";
import store from '@/store' import store from "@/store";
import { getToken } from '@/utils/auth' import { getToken } from "@/utils/auth";
import errorCode from '@/utils/errorCode' import errorCode from "@/utils/errorCode";
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import {getTenantEnable} from "@/utils/ruoyi"; import { getTenantEnable } from "@/utils/ruoyi";
import { getLocale } from '@/utils/db'; import { getLocale } from "@/utils/db";
import i18n from "@/i18n"; import i18n from "@/i18n";
// 是否显示重新登录 // 是否显示重新登录
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实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
// axios中请求配置有baseURL选项,表示请求URL公共部分 // axios中请求配置有baseURL选项,表示请求URL公共部分
baseURL: (localStorage.VUE_APP_BASE_API || process.env.VUE_APP_BASE_API) + '/admin-api/', // 此处的 /admin-api/ 地址,原因是后端的基础路径为 /admin-api/ baseURL:
(localStorage.VUE_APP_BASE_API || process.env.VUE_APP_BASE_API) +
"/admin-api/", // 此处的 /admin-api/ 地址,原因是后端的基础路径为 /admin-api/
// 超时 // 超时
timeout: 1000 * 30 timeout: 1000 * 30,
}) });
// 如果是生产环境则打印提示 // 如果是生产环境则打印提示
if (process.env.NODE_ENV === 'development' && service.defaults.baseURL === 'https://api2.groupage.cn/admin-api/') { if (
console.log('%c请注意,当前为生产环境请谨慎操作!!', 'background-color: red; font-size: 3em; color:yellow'); process.env.NODE_ENV === "development" &&
console.log('%c接口地址:' + service.defaults.baseURL, 'background-color: black; font-size: 1.5em; color:yellow !important'); service.defaults.baseURL === "https://api2.groupage.cn/admin-api/"
) {
console.log(
"%c请注意,当前为生产环境请谨慎操作!!",
"background-color: red; font-size: 3em; color:yellow"
);
console.log(
"%c接口地址:" + service.defaults.baseURL,
"background-color: black; font-size: 1.5em; color:yellow !important"
);
} }
// request拦截器 // request拦截器
service.interceptors.request.use(config => { service.interceptors.request.use(
config.headers['locale'] = getLocale() (config) => {
config.headers["locale"] = getLocale();
// 是否需要设置 token // 是否需要设置 token
const isToken = (config.headers || {}).isToken === false const isToken = (config.headers || {}).isToken === false;
if (getToken() && !isToken) { if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
} }
// 设置租户 // 设置租户
if (getTenantEnable()) { if (getTenantEnable()) {
const tenantId = Cookies.get('tenantId'); const tenantId = Cookies.get("tenantId");
if (tenantId) { if (tenantId) {
config.headers['tenant-id'] = tenantId; config.headers["tenant-id"] = tenantId;
} }
} }
// get请求映射params参数 // get请求映射params参数
if (config.method === 'get' && config.params) { if (config.method === "get" && config.params) {
let url = config.url + '?'; let url = config.url + "?";
for (const propName of Object.keys(config.params)) { for (const propName of Object.keys(config.params)) {
const value = config.params[propName]; const value = config.params[propName];
var part = encodeURIComponent(propName) + "="; var part = encodeURIComponent(propName) + "=";
if (value !== null && typeof(value) !== "undefined") { if (value !== null && typeof value !== "undefined") {
if (typeof value === 'object') { if (typeof value === "object") {
for (const key of Object.keys(value)) { for (const key of Object.keys(value)) {
let params = propName + '[' + key + ']'; let params = propName + "[" + key + "]";
var subPart = encodeURIComponent(params) + "="; var subPart = encodeURIComponent(params) + "=";
url += subPart + encodeURIComponent(value[key]) + "&"; url += subPart + encodeURIComponent(value[key]) + "&";
} }
...@@ -63,105 +75,112 @@ service.interceptors.request.use(config => { ...@@ -63,105 +75,112 @@ service.interceptors.request.use(config => {
config.params = {}; config.params = {};
config.url = url; config.url = url;
} }
return config return config;
}, error => { },
console.log(error) (error) => {
Promise.reject(error) console.log(error);
}) Promise.reject(error);
}
);
// 响应拦截器 // 响应拦截器
service.interceptors.response.use(res => { service.interceptors.response.use(
(res) => {
// 未设置状态码则默认成功状态 // 未设置状态码则默认成功状态
const code = res.data.code || 200; const code = res.data.code || 200;
// 获取错误信息 // 获取错误信息
const msg = errorCode[code] || res.data.msg || errorCode['default'] const msg = errorCode[code] || res.data.msg || errorCode["default"];
if (code === 401) { if (code === 401) {
if (!isRelogin.show) { if (!isRelogin.show) {
isRelogin.show = true; isRelogin.show = true;
MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { MessageBox.confirm(
confirmButtonText: '重新登录', "登录状态已过期,您可以继续留在该页面,或者重新登录",
cancelButtonText: '取消', "系统提示",
type: 'warning' {
} confirmButtonText: "重新登录",
).then(() => { cancelButtonText: "取消",
type: "warning",
}
)
.then(() => {
isRelogin.show = false; isRelogin.show = false;
store.dispatch('LogOut').then(() => { store.dispatch("LogOut").then(() => {
location.href = '/'; location.href = "/";
});
}) })
}).catch(() => { .catch(() => {
isRelogin.show = false; isRelogin.show = false;
}); });
} }
return Promise.reject('无效的会话,或者会话已过期,请重新登录。') return Promise.reject("无效的会话,或者会话已过期,请重新登录。");
} else if (code === 500) { } else if (code === 500) {
Message({ Message({
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
message: msg, message: msg,
type: 'error' type: "error",
}) });
return Promise.reject(new Error(msg)) return Promise.reject(new Error(msg));
} else if (code === 901) { } else if (code === 901) {
Message({ Message({
type: 'error', type: "error",
duration: 0, duration: 0,
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
message: '<div>演示模式,无法进行写操作</div>' message:
+ '<div> &nbsp; </div>' "<div>演示模式,无法进行写操作</div>" +
+ '<div>参考 https://doc.iocoder.cn/ 教程</div>' "<div> &nbsp; </div>" +
+ '<div> &nbsp; </div>' "<div>参考 https://doc.iocoder.cn/ 教程</div>" +
+ '<div>5 分钟搭建本地环境</div>', "<div> &nbsp; </div>" +
}) "<div>5 分钟搭建本地环境</div>",
return Promise.reject(new Error(msg)) });
return Promise.reject(new Error(msg));
} else if (code === 555) { } else if (code === 555) {
// 额外情况 // 额外情况
return Promise.reject(res.data) return Promise.reject(res.data);
} else if (code === 566) { } else if (code === 566) {
// 额外情况 // 额外情况
return Promise.reject(res.data) return Promise.reject(res.data);
} else if (code === 666) { } else if (code === 666) {
// 额外情况 // 额外情况
return Promise.reject(res.data) return Promise.reject(res.data);
} else if (code !== 200) { } else if (code !== 200) {
// 如果内容很长则用alert提示,不然可能显示不全,自动隐藏也会导致看不完整就消失了 // 如果内容很长则用alert提示,不然可能显示不全,自动隐藏也会导致看不完整就消失了
if(msg.length > 300){ if (msg.length > 300) {
MessageBox.alert(msg, i18n.t('错误提示'), i18n.t('确定')) MessageBox.alert(msg, i18n.t("错误提示"), i18n.t("确定"));
}else{ } else {
Notification.error({ Notification.error({
title: msg title: msg,
}) });
} }
return Promise.reject(msg || 'error') return Promise.reject(msg || "error");
} else { } else {
return res.data return res.data;
} }
}, },
error => { (error) => {
console.log('err' + error) console.log("err" + error);
let { message } = error; let { message } = error;
if (message === "Network Error") { if (message === "Network Error") {
message = "后端接口连接异常"; message = "后端接口连接异常";
} } else if (message.includes("timeout")) {
else if (message.includes("timeout")) {
message = "系统接口请求超时"; message = "系统接口请求超时";
} } else if (message.includes("Request failed with status code")) {
else if (message.includes("Request failed with status code")) {
message = "系统接口" + message.substr(message.length - 3) + "异常"; message = "系统接口" + message.substr(message.length - 3) + "异常";
} }
Message({ Message({
message: message, message: message,
type: 'error', type: "error",
duration: 5 * 1000 duration: 5 * 1000,
}) });
return Promise.reject(error) return Promise.reject(error);
} }
) );
export function getBaseHeader() { export function getBaseHeader() {
return { return {
'Authorization': "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
'tenant-id': Cookies.get('tenantId'), "tenant-id": Cookies.get("tenantId"),
} };
} }
export default service export default service;
...@@ -917,7 +917,7 @@ export default { ...@@ -917,7 +917,7 @@ export default {
"queryParams.dateRangeCreateTime": { "queryParams.dateRangeCreateTime": {
handler: function (newVal, oldVal) { handler: function (newVal, oldVal) {
this.$nextTick(() => { this.$nextTick(() => {
if (newVal.length > 0) { if (newVal.length) {
this.queryParams.startTime = newVal[0]; this.queryParams.startTime = newVal[0];
this.queryParams.endTime = newVal[1]; this.queryParams.endTime = newVal[1];
} else { } else {
......
...@@ -676,7 +676,7 @@ export default { ...@@ -676,7 +676,7 @@ export default {
//导出 //导出
handleBatchExport() { handleBatchExport() {
let params = { ...this.queryParams }; let params = { ...this.queryParams };
if (this.dateRangeCreateTime.length > 0) { if (this.dateRangeCreateTime) {
params.startTime = this.dateRangeCreateTime[0]; params.startTime = this.dateRangeCreateTime[0];
params.endTime = this.dateRangeCreateTime[1]; params.endTime = this.dateRangeCreateTime[1];
params.pageNo = null; params.pageNo = null;
...@@ -795,7 +795,7 @@ export default { ...@@ -795,7 +795,7 @@ export default {
handleQuery() { handleQuery() {
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;
let params = { ...this.queryParams }; let params = { ...this.queryParams };
if (this.dateRangeCreateTime.length > 0) { if (this.dateRangeCreateTime) {
params.startTime = this.dateRangeCreateTime[0]; params.startTime = this.dateRangeCreateTime[0];
params.endTime = this.dateRangeCreateTime[1]; params.endTime = this.dateRangeCreateTime[1];
} }
...@@ -807,7 +807,7 @@ export default { ...@@ -807,7 +807,7 @@ export default {
}, },
handleQueryPagination() { handleQueryPagination() {
let params = { ...this.queryParams }; let params = { ...this.queryParams };
if (this.dateRangeCreateTime.length > 0) { if (this.dateRangeCreateTime) {
params.startTime = this.dateRangeCreateTime[0]; params.startTime = this.dateRangeCreateTime[0];
params.endTime = this.dateRangeCreateTime[1]; params.endTime = this.dateRangeCreateTime[1];
} }
......
...@@ -296,10 +296,11 @@ export default { ...@@ -296,10 +296,11 @@ export default {
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;
let params = { ...this.queryParams }; let params = { ...this.queryParams };
if (this.dateRangeCreateTime.length > 0) { if (this.dateRangeCreateTime) {
params.startTime = this.dateRangeCreateTime[0]; params.startTime = this.dateRangeCreateTime[0];
params.endTime = this.dateRangeCreateTime[1]; params.endTime = this.dateRangeCreateTime[1];
} }
console.log("44444", params);
queryMemberScoreRecord(params).then((res) => { queryMemberScoreRecord(params).then((res) => {
this.loading = false; this.loading = false;
this.memberList = res.data.list; this.memberList = res.data.list;
...@@ -308,7 +309,7 @@ export default { ...@@ -308,7 +309,7 @@ export default {
}, },
handleQueryPagination() { handleQueryPagination() {
let params = { ...this.queryParams }; let params = { ...this.queryParams };
if (this.dateRangeCreateTime.length > 0) { if (this.dateRangeCreateTime) {
params.startTime = this.dateRangeCreateTime[0]; params.startTime = this.dateRangeCreateTime[0];
params.endTime = this.dateRangeCreateTime[1]; params.endTime = this.dateRangeCreateTime[1];
} }
......
...@@ -344,8 +344,7 @@ export default { ...@@ -344,8 +344,7 @@ export default {
handleQuery() { handleQuery() {
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;
let params = { ...this.queryParams }; let params = { ...this.queryParams };
if (this.dateRangeCreateTime) {
if (this.dateRangeCreateTime.length > 0) {
params.startTime = this.dateRangeCreateTime[0]; params.startTime = this.dateRangeCreateTime[0];
params.endTime = this.dateRangeCreateTime[1]; params.endTime = this.dateRangeCreateTime[1];
} }
...@@ -357,7 +356,7 @@ export default { ...@@ -357,7 +356,7 @@ export default {
}, },
handleQueryPagination() { handleQueryPagination() {
let params = { ...this.queryParams }; let params = { ...this.queryParams };
if (this.dateRangeCreateTime.length > 0) { if (this.dateRangeCreateTime) {
params.startTime = this.dateRangeCreateTime[0]; params.startTime = this.dateRangeCreateTime[0];
params.endTime = this.dateRangeCreateTime[1]; params.endTime = this.dateRangeCreateTime[1];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment