From f8bc9a303bc315c571d64398d91d9823eccd78f7 Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Thu, 26 Oct 2023 11:28:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +- src/api/largeScreen/index.js | 10 +++ src/utils/request.js | 68 ++++++++++--------- src/views/bigpage/bigcomponents/recallbox.vue | 5 -- 4 files changed, 46 insertions(+), 40 deletions(-) create mode 100644 src/api/largeScreen/index.js 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(); From beb4149046a27c78c25359ae0991c69fa3088e78 Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Fri, 27 Oct 2023 09:06:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/largeScreen/index.js | 50 +- src/permission.js | 2 +- src/utils/request.js | 1 + .../bigpage/bigcomponents/AdverseBox.vue | 859 +++++++++--------- .../bigcomponents/ChangeinformationList.vue | 160 ++-- .../bigpage/bigcomponents/informationBox.vue | 645 ++++++------- src/views/bigpage/bigcomponents/recallbox.vue | 466 +++++----- src/views/bigpage/index.vue | 2 - src/views/components/Pagination.vue | 199 ++-- 9 files changed, 1300 insertions(+), 1084 deletions(-) diff --git a/src/api/largeScreen/index.js b/src/api/largeScreen/index.js index 7552cd6..8aeacb0 100644 --- a/src/api/largeScreen/index.js +++ b/src/api/largeScreen/index.js @@ -2,9 +2,49 @@ import request from '@/utils/request' // 根据批准文号或备案编号查询召回信息 export function getRecall(query) { - return request({ - url: '/ggfw-api/pharmaceuticals/largeScreen/findRecallByName', - method: 'get', - params:query - }) + return request({ + url: '/ggfw-api/pharmaceuticals/largeScreen/findRecallByName', + method: 'get', + params: query + }) +} +//根据批准文号或备案编号查询自然年一年根据报告类型化妆品报告数量统计 +export function getCosmeticsBL(query) { + return request({ + url: '/ggfw-api/pharmaceuticals/largeScreen/getHZPReportCountByType', + method: 'get', + params: query + }) +} +//根据批准文号或备案编号查询自然年一年根据报告类型医疗器械数量统计 +export function getMedicalDevicesBL(query) { + return request({ + url: '/ggfw-api/pharmaceuticals/largeScreen/getYLQXReportCountByType', + method: 'get', + params: query + }) +} +//根据批准文号或备案编号查询自然年一年根据报告类型药品报告数量统计 +export function getDrugBL(query) { + return request({ + url: '/ggfw-api/pharmaceuticals/largeScreen/getYPReportCountByType', + method: 'get', + params: query + }) +} +//根据批准文号或备案编号查询药品变更信息 +export function getDrugChange(query) { + return request({ + url: '/ggfw-api/pharmaceuticals/largeScreen/pageAlterByReq', + method: 'get', + params: query + }) +} +//根据批准文号或备案编号查询产品档案抽检信息 +export function getCPCJ(query) { + return request({ + url: '/ggfw-api/pharmaceuticals/largeScreen/productFileInspect', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/permission.js b/src/permission.js index c0d24f2..04099c9 100644 --- a/src/permission.js +++ b/src/permission.js @@ -11,7 +11,7 @@ NProgress.configure({ showSpinner: false }) const whiteList = ['/login', '/register'] router.beforeEach((to, from, next) => { - setToken() + setToken('UT:f7d012aa-8291-494c-a984-70793cef9ccf') NProgress.start() next() }) diff --git a/src/utils/request.js b/src/utils/request.js index 796d765..9e5eadb 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -27,6 +27,7 @@ service.interceptors.request.use(config => { // 是否需要防止数据重复提交 const isRepeatSubmit = (config.headers || {}).repeatSubmit === false if (getToken() && !isToken) { + // config.headers['Authentication'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers['Authentication'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 } // get请求映射params参数 diff --git a/src/views/bigpage/bigcomponents/AdverseBox.vue b/src/views/bigpage/bigcomponents/AdverseBox.vue index 46d1a37..fb3fbd2 100644 --- a/src/views/bigpage/bigcomponents/AdverseBox.vue +++ b/src/views/bigpage/bigcomponents/AdverseBox.vue @@ -1,448 +1,491 @@ diff --git a/src/views/bigpage/bigcomponents/ChangeinformationList.vue b/src/views/bigpage/bigcomponents/ChangeinformationList.vue index 64aebf3..77707c2 100644 --- a/src/views/bigpage/bigcomponents/ChangeinformationList.vue +++ b/src/views/bigpage/bigcomponents/ChangeinformationList.vue @@ -1,100 +1,138 @@ diff --git a/src/views/bigpage/bigcomponents/informationBox.vue b/src/views/bigpage/bigcomponents/informationBox.vue index 2140f97..26aba5b 100644 --- a/src/views/bigpage/bigcomponents/informationBox.vue +++ b/src/views/bigpage/bigcomponents/informationBox.vue @@ -1,360 +1,381 @@ diff --git a/src/views/bigpage/bigcomponents/recallbox.vue b/src/views/bigpage/bigcomponents/recallbox.vue index 2b74a21..5024036 100644 --- a/src/views/bigpage/bigcomponents/recallbox.vue +++ b/src/views/bigpage/bigcomponents/recallbox.vue @@ -1,271 +1,279 @@ diff --git a/src/views/bigpage/index.vue b/src/views/bigpage/index.vue index 2cb3799..39a6dac 100644 --- a/src/views/bigpage/index.vue +++ b/src/views/bigpage/index.vue @@ -48,7 +48,6 @@ -
@@ -60,7 +59,6 @@
-
diff --git a/src/views/components/Pagination.vue b/src/views/components/Pagination.vue index 75da93f..cdf6b2d 100644 --- a/src/views/components/Pagination.vue +++ b/src/views/components/Pagination.vue @@ -1,87 +1,154 @@