diff --git a/.env.production b/.env.production index 4354845..9f37c9b 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,4 @@ VUE_APP_TITLE = 可视化管控平台 ENV = 'production' # 博诺思管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API = '/nxdt-api' diff --git a/src/components/pro-tabs/bns-timeline-tabs.vue b/src/components/pro-tabs/bns-timeline-tabs.vue index 92504cb..0cc36a0 100644 --- a/src/components/pro-tabs/bns-timeline-tabs.vue +++ b/src/components/pro-tabs/bns-timeline-tabs.vue @@ -219,8 +219,8 @@ export default { return (item, index) => { if (this.items[index].status == '审核通过') return '√' if (this.items[index].status == '审核驳回') return 'X' - if (this.items[index].status == '撤回' || (this.items[index].status == '' && item.isActive != 10)) return '?' - if (this.items[index].status == '' && item.isActive == 10) return '?' + if (this.items[index].status == '撤回' || (this.items[index].status == '' && item.isActive != 1)) return '' + if (this.items[index].status == '' && item.isActive == 1) return '?' } }, }, diff --git a/src/router/index.js b/src/router/index.js index 8bf46b8..1106191 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -787,6 +787,7 @@ const createRouter = () => mode: 'history', // 去掉url中的# scrollBehavior: () => ({ y: 0 }), routes: constantRoutes, + // base: '/nxdt', }) const router = createRouter() diff --git a/src/utils/bonus.js b/src/utils/bonus.js index f646d3d..79af40e 100644 --- a/src/utils/bonus.js +++ b/src/utils/bonus.js @@ -1,26 +1,25 @@ import { getToDoNum } from '@/api/system/notice' -export function lookFile(){ - // return 'http://192.168.0.14:21626/file/statics' //14服务器 +export function lookFile() { + return 'http://192.168.0.14:21626/file/statics' //14服务器 // return 'http://112.29.103.165:14413/file/statics' //1.6演示服务器 - return 'http://218.21.27.6:1999/file/statics' //生产服务器 + // return 'http://218.21.27.6:1999/file/statics' //生产服务器 } -export function lookFaceFile(){ - // return 'http://192.168.0.14:21626/file/statics/' //14服务器 +export function lookFaceFile() { + return 'http://192.168.0.14:21626/file/statics/' //14服务器 //return 'http://112.29.103.165:14413/file/statics/' //1.6演示服务器 - return 'http://218.21.27.6:1999/file/statics/' //生产服务器 + // return 'http://218.21.27.6:1999/file/statics/' //生产服务器 } -export function filePreview(){ - // return 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器 +export function filePreview() { + return 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器 // return 'http://112.29.103.165:8012/onlinePreview?url=' //1.6演示服务器 - return 'http://218.21.27.6:18013/onlinePreview?url=' + // return 'http://218.21.27.6:18013/onlinePreview?url=' } export function lookMioIoFile() { - return 'http://218.21.27.6:19090/nxdt-courseware' //生产服务器 - // return 'http://192.168.0.14:9090/nxdt-courseware' //14服务器 + // return 'http://218.21.27.6:19090/nxdt-courseware' //生产服务器 + return 'http://192.168.0.14:9090/nxdt-courseware-1' //14服务器 } - // lookFile: 'http://218.21.27.6:1999/nxnyback/statics', // filePreviewPath: 'http://218.21.27.6:8012/onlinePreview?url=', // lookFile: 'http://112.29.103.165:14413/file/statics', diff --git a/src/utils/request.js b/src/utils/request.js index 2a24530..d04c831 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,141 +3,159 @@ 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/bonus"; +import { tansParams, blobValidate } from '@/utils/bonus' import cache from '@/plugins/cache' import { saveAs } from 'file-saver' import { encryptCBC, decryptCBC } from '@/utils/aescbc' -let downloadLoadingInstance; +let downloadLoadingInstance +let loadingInstance = null // 是否显示重新登录 -export let isRelogin = { show: false }; +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, // 超时 - timeout: 10000 * 5 + timeout: 10000 * 5, }) // request拦截器 -service.interceptors.request.use(config => { - // 是否需要设置 token - const isToken = (config.headers || {}).isToken === false - // 是否需要防止数据重复提交 - const isRepeatSubmit = (config.headers || {}).repeatSubmit === false - if (getToken() && !isToken) { - config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - } - config.headers['tokenType'] = 'sys' -// return Promise.reject('无效的会话,或者会话已过期,请重新登录。') - // get请求映射params参数 - if (config.method === 'get' && config.params) { - let param=tansParams(config.params); - if(param){ - param = param.slice(0, -1); - param=encryptCBC(param); +service.interceptors.request.use( + config => { + loadingInstance = Loading.service({ + lock: true, // 锁定屏幕 + text: '正在发起网络请求,请稍后...', // 提示的文字 + spinner: 'el-icon-loading', // 自定义加载图标 + background: 'rgba(0, 0, 0, 0.7)', // 背景颜色 + }) + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false + // 是否需要防止数据重复提交 + const isRepeatSubmit = (config.headers || {}).repeatSubmit === false + if (getToken() && !isToken) { + config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + } + config.headers['tokenType'] = 'sys' + // return Promise.reject('无效的会话,或者会话已过期,请重新登录。') + // get请求映射params参数 + if (config.method === 'get' && config.params) { + let param = tansParams(config.params) + if (param) { + param = param.slice(0, -1) + param = encryptCBC(param) } - let url = config.url + '?' + param; - config.params = {}; - config.url = url; - } - if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) { - // console.log(config) - const requestObj = { - url: config.url, - data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data, - time: new Date().getTime() + let url = config.url + '?' + param + config.params = {} + config.url = url } - const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小 - const limitSize = 5 * 1024 * 1024; // 限制存放数据5M - if (requestSize >= limitSize) { - console.warn(`[${config.url}]: ` + '请求数据大小超出允许的5M限制,无法进行防重复提交验证。') - return config; - } - 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 { + if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) { + // console.log(config) + const requestObj = { + url: config.url, + data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data, + time: new Date().getTime(), + } + const requestSize = Object.keys(JSON.stringify(requestObj)).length // 请求数据大小 + const limitSize = 5 * 1024 * 1024 // 限制存放数据5M + if (requestSize >= limitSize) { + console.warn(`[${config.url}]: ` + '请求数据大小超出允许的5M限制,无法进行防重复提交验证。') + return config + } + 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) + } } } - } - // console.log(config) - - if( config.headers['Content-Type']=='application/json;charset=utf-8'){ - if(typeof (config.data)=='object'){ - config.data = encryptCBC(JSON.stringify(config.data)) - config.headers['Content-Type']='application/json'; - } - } - //对下载请求进行数据参数拦截加密 - if(config.headers['Content-Type']=='application/x-www-form-urlencoded'){ // console.log(config) - // console.log(config.data) - if(typeof (config.data)=='object'){ - // console.log(config.data) - let formData=tansParams(config.data); - if(formData){ - formData = formData.slice(0, -1); - let formdata={}; - formdata.formData=encryptCBC(formData) - config.data=formdata; + if (config.headers['Content-Type'] == 'application/json;charset=utf-8') { + if (typeof config.data == 'object') { + config.data = encryptCBC(JSON.stringify(config.data)) + config.headers['Content-Type'] = 'application/json' + } + } + //对下载请求进行数据参数拦截加密 + if (config.headers['Content-Type'] == 'application/x-www-form-urlencoded') { + // console.log(config) + // console.log(config.data) + if (typeof config.data == 'object') { + // console.log(config.data) + let formData = tansParams(config.data) + if (formData) { + formData = formData.slice(0, -1) + let formdata = {} + formdata.formData = encryptCBC(formData) + config.data = formdata + } + } else { + config.data = 'formData=' + encryptCBC(JSON.stringify(config.data)) } - }else{ - config.data ="formData="+ encryptCBC(JSON.stringify(config.data)) } - } - if(config.headers['Content-Type']==null || config.headers['Content-Type']==''){ - config.headers['Content-Type']='application/json'; - console.warn("请求类型为空"); - } - return config -}, error => { + if (config.headers['Content-Type'] == null || config.headers['Content-Type'] == '') { + config.headers['Content-Type'] = 'application/json' + console.warn('请求类型为空') + } + return config + }, + error => { + if (loadingInstance) loadingInstance.close() console.log(error) Promise.reject(error) -}) + } +) // 响应拦截器 -service.interceptors.response.use(res => { +service.interceptors.response.use( + res => { + if (loadingInstance) loadingInstance.close() //自动解密 // console.log("res.data.decrypt=="+res.data.decrypt) - if(typeof res.data.decrypt!='undefined' && res.data.decrypt){ - const resultData=decryptCBC(res.data.data); - res.data=JSON.parse(resultData); + if (typeof res.data.decrypt != 'undefined' && res.data.decrypt) { + const resultData = decryptCBC(res.data.data) + res.data = JSON.parse(resultData) // console.log('🚀 ~ request.js--> 返回结果:', res.data) } // 未设置状态码则默认成功状态 - const code = res.data.code || 200; + const code = res.data.code || 200 // 获取错误信息 const msg = errorCode[code] || res.data.msg || errorCode['default'] // 二进制数据则直接返回 - if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { + 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 = '/index'; + isRelogin.show = true + MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning', + }) + .then(() => { + isRelogin.show = false + store.dispatch('LogOut').then(() => { + location.href = '/index' + }) }) - }).catch(() => { - isRelogin.show = false; - }); - } + .catch(() => { + isRelogin.show = false + }) + } return Promise.reject('无效的会话,或者会话已过期,请重新登录。') } else if (code === 500) { // Message({ message: msg, type: 'error' }) @@ -154,14 +172,15 @@ service.interceptors.response.use(res => { } }, error => { + if (loadingInstance) loadingInstance.close() 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) + "异常"; + 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) + '异常' } Message({ message: message, type: 'error', duration: 5 * 1000 }) return Promise.reject(error) @@ -170,61 +189,77 @@ service.interceptors.response.use(res => { // 通用下载方法 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', - "encryption":"encryption" - }, - 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(); + 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', encryption: 'encryption' }, + 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 function derive(url, params, filename, config) { - downloadLoadingInstance = Loading.service({ text: "正在下载数据,请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", }) - return service.post(url, JSON.stringify(params), { - // transformRequest: [(params) => { return tansParams(params) }], - headers: { - // 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', - 'Content-Type': 'application/json; charset=UTF-8', - 'encryption': 'encryption' - }, - 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(); + downloadLoadingInstance = Loading.service({ + text: '正在下载数据,请稍候', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)', }) + return service + .post(url, JSON.stringify(params), { + // transformRequest: [(params) => { return tansParams(params) }], + headers: { + // 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', + 'Content-Type': 'application/json; charset=UTF-8', + encryption: 'encryption', + }, + 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/vue.config.js b/vue.config.js index 80d5b25..3caa1b5 100644 --- a/vue.config.js +++ b/vue.config.js @@ -38,10 +38,10 @@ module.exports = { // target: `http://localhost:18080`, // target: 'http://192.168.0.176:18080', // target: 'http://192.168.0.58:19090', // 杰 - // target: 'http://192.168.0.14:18080', // 测试环境 + target: 'http://192.168.0.14:1999/nxdt-api', // 测试环境 // target: 'http://218.21.27.6:1999/prod-api', // 生产环境 // target: 'http://192.168.0.38:18080', // 郝志权 - target: 'http://192.168.2.125:18080', // 梁超 + // target: 'http://192.168.2.125:18080', // 梁超 changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '',