diff --git a/.env.development b/.env.development index 6f47003..759542d 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,6 @@ VUE_APP_TITLE = 若依管理系统 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api' - +VUE_APP_BASE_API = 'https://dev-mssm-liaoning.imian.org.cn' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/largeScreen/index.js b/src/api/largeScreen/index.js new file mode 100644 index 0000000..7552cd6 --- /dev/null +++ b/src/api/largeScreen/index.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 根据批准文号或备案编号查询召回信息 +export function getRecall(query) { + return request({ + url: '/ggfw-api/pharmaceuticals/largeScreen/findRecallByName', + method: 'get', + params:query + }) +} \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 48298ec..6f9481d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -27,7 +27,9 @@ service.interceptors.request.use(config => { // 是否需要防止数据重复提交 const isRepeatSubmit = (config.headers || {}).repeatSubmit === false if (getToken() && !isToken) { - config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + // config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + config.headers['Authorization'] = 'UT:e0273df4-d5e3-4dd7-87c6-286e94ccde1d' // 让每个请求携带自定义token 请根据实际情况自行修改 + } // get请求映射params参数 if (config.method === 'get' && config.params) { @@ -61,46 +63,46 @@ service.interceptors.request.use(config => { } return config }, error => { - console.log(error) - Promise.reject(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 = '/index'; - }) + // 未设置状态码则默认成功状态 + 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 = '/index'; + }) }).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 - } - }, + 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; diff --git a/src/views/bigpage/bigcomponents/recallbox.vue b/src/views/bigpage/bigcomponents/recallbox.vue index cee2d97..2b74a21 100644 --- a/src/views/bigpage/bigcomponents/recallbox.vue +++ b/src/views/bigpage/bigcomponents/recallbox.vue @@ -49,9 +49,6 @@ export default { jcaddress: "抽检合格率" }, ], - - - option2: {}, // echarts myChart2: {}, @@ -60,8 +57,6 @@ export default { created() { }, mounted() { this.$nextTick(() => { - - let chartDom2 = this.$refs["right-echart"]; this.myChart2 = echarts.init(chartDom2); this.initEcharts2();