From 96786804c393a2733ac497381cd1aeeb8b227eac Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Wed, 2 Aug 2023 15:03:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 +- src/App.vue | 30 ++- src/api/archives/cosmetics.js | 11 ++ src/api/archives/toLogin.js | 21 ++ src/api/index.js | 16 +- src/permission.js | 81 ++++---- src/utils/request.js | 2 +- src/utils/request2.js | 2 +- src/views/censor/index.vue | 16 +- src/views/netWorkStat/index.vue | 331 ++++++++++++++++++++++++++++++++ vue.config.js | 19 +- 11 files changed, 445 insertions(+), 92 deletions(-) create mode 100644 src/api/archives/cosmetics.js create mode 100644 src/api/archives/toLogin.js create mode 100644 src/views/netWorkStat/index.vue diff --git a/.env.development b/.env.development index fc5c371..c737ca5 100644 --- a/.env.development +++ b/.env.development @@ -3,12 +3,8 @@ VUE_APP_TITLE = 产品档案管理系统 # 开发环境配置 ENV = 'development' - -# 检查员管理系统/开发环境 -VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api' -# 自己公司 -VUE_APP_BASE_API2 = '' -VUE_APP_BASE_API3 = '/configApi/' +# 开发环境 +VUE_APP_BASE_API = '/configApi' VUE_APP_PREFIX ='' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/App.vue b/src/App.vue index 29de49f..615b10c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,14 +11,28 @@ import ThemePicker from "@/components/ThemePicker"; export default { name: "App", components: { ThemePicker }, - metaInfo() { - return { - title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title, - titleTemplate: title => { - return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE - } - } - } + metaInfo() { + return { + title: + this.$store.state.settings.dynamicTitle && + this.$store.state.settings.title, + titleTemplate: (title) => { + return title + ? `${title} - ${process.env.VUE_APP_TITLE}` + : process.env.VUE_APP_TITLE; + }, + }; + }, + mounted(){ + setTimeout(async () => { + let Authentication = await this.$api.toLogin.frimLogin(); + console.log(Authentication); + localStorage.setItem( + "Authentication", + Authentication.data.result.userToken + ); + }, 1000); + } }; diff --git a/vue.config.js b/vue.config.js index 821e41d..e9f6f06 100644 --- a/vue.config.js +++ b/vue.config.js @@ -42,21 +42,12 @@ module.exports = { open: true, proxy: { "/configApi": { - target: "https://dev-mssm-liaoning.imian.org.cn/api/admin", + target: "https://dev-mssm-liaoning.imian.org.cn/ggfw-api", changeOrigin: true, pathRewrite: { "^/configApi": "", }, }, - // detail: https://cli.vuejs.org/config/#devserver-proxy - [process.env.VUE_APP_BASE_API2]: { - target: `http://192.168.0.105:9026/inspector`, - // target: `https://dev-mssm-liaoning.imian.org.cn/api/inspector/inspector`, - changeOrigin: true, - pathRewrite: { - ["^" + process.env.VUE_APP_BASE_API2]: "", - }, - }, }, disableHostCheck: true, }, @@ -142,10 +133,10 @@ module.exports = { }, }); config.optimization.runtimeChunk("single"), - { - from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件 - to: "./", //到根目录下 - }; + { + from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件 + to: "./", //到根目录下 + }; }); }, }; From 3b68db049910e038aad37885d820b3c319d0d9fd Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Wed, 2 Aug 2023 15:25:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/cosmeticsFile/medical.vue | 9 +- .../components/cosmeticsArchives.vue | 832 +++++++++++------- src/views/productsMsg/components/health.vue | 550 +++++++++++- 3 files changed, 1044 insertions(+), 347 deletions(-) diff --git a/src/views/cosmeticsFile/medical.vue b/src/views/cosmeticsFile/medical.vue index 3d860b6..45d348c 100644 --- a/src/views/cosmeticsFile/medical.vue +++ b/src/views/cosmeticsFile/medical.vue @@ -432,6 +432,10 @@ export default { width: 82%; padding: 0; } +::v-deep .el-input { + width: 50% !important; + margin-left: 25px; +} ::v-deep .el-dialog:not(.is-fullscreen) { margin-bottom: 1vh !important; } @@ -489,8 +493,5 @@ export default { .el-radio { margin-top: 10px; } -.el-input { - width: 50% !important; - margin-left: 25px; -} + \ No newline at end of file diff --git a/src/views/productsMsg/components/cosmeticsArchives.vue b/src/views/productsMsg/components/cosmeticsArchives.vue index b79abf1..3d22b30 100644 --- a/src/views/productsMsg/components/cosmeticsArchives.vue +++ b/src/views/productsMsg/components/cosmeticsArchives.vue @@ -1,341 +1,370 @@ - - - - - \ No newline at end of file diff --git a/src/views/productsMsg/components/health.vue b/src/views/productsMsg/components/health.vue index 85acc76..aaf4e95 100644 --- a/src/views/productsMsg/components/health.vue +++ b/src/views/productsMsg/components/health.vue @@ -1,5 +1,549 @@ \ No newline at end of file + + + + + + + \ No newline at end of file From b3819171300c94d2d73859a49c8a5d6f5d5d90ba Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Wed, 2 Aug 2023 21:29:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/archives/cosmetics.js | 46 +- src/api/index.js | 4 +- src/components/Pagination/index.vue | 4 +- src/utils/request2.js | 2 +- .../components/cosmeticsArchives.vue | 796 ++++++------------ 5 files changed, 327 insertions(+), 525 deletions(-) diff --git a/src/api/archives/cosmetics.js b/src/api/archives/cosmetics.js index b43cad3..5a87be0 100644 --- a/src/api/archives/cosmetics.js +++ b/src/api/archives/cosmetics.js @@ -1,11 +1,49 @@ import request from "@/utils/request2"; export default { - //获取 - getList(query) { + //根据名称或者备案号分页查询国产化妆品数据 + domesticList(query) { return request({ - url: "/inspectorAssign", + url: "/pharmaceuticals/gccp", method: "GET", params: query, }); - } + }, + //根据备案号查询单条国产化妆品数据 + // domesticGet(bah) { + // return request({ + // url: `/pharmaceuticals/gccp/${bah}`, + // method: "GET", + // }); + // }, + //根据名称或者注册证号分页查询国产特殊化妆品数据 + specialList(query) { + return request({ + url: "/pharmaceuticals/gctshzp", + method: "GET", + params: query, + }); + }, + //通过注册证号查询单条国产特殊化妆品 + // specialGet(bah) { + // return request({ + // url: `/pharmaceuticals/gctshzp/${bah}`, + // method: "GET", + // }); + // }, + //分页条件查询进口产品 + importList(query) { + return request({ + url: "/pharmaceuticals/jkcp", + method: "GET", + params: query, + }); + }, + //根据名称或者注册证号分页查询进口特殊化妆品数据 + importSpecialList(query) { + return request({ + url: "/pharmaceuticals/jktshzp", + method: "GET", + params: query, + }); + }, } diff --git a/src/api/index.js b/src/api/index.js index 34b2288..541b2bc 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,4 +1,6 @@ import toLogin from "./archives/toLogin"; +import cosmetics from "./archives/cosmetics"; export default { - toLogin + toLogin, + cosmetics }; \ No newline at end of file diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue index 678aa54..cb95d5a 100644 --- a/src/components/Pagination/index.vue +++ b/src/components/Pagination/index.vue @@ -48,7 +48,7 @@ export default { pageSizes: { type: Array, default() { - return [10, 20, 30, 50]; + return [5,10,20]; }, }, // 移动端页码按钮的数量端默认值5 @@ -119,7 +119,7 @@ export default { display: flex; justify-content: space-between; align-items: center; - margin-top: 10px; + padding: 15px 20px; } .pagination-container.hidden { diff --git a/src/utils/request2.js b/src/utils/request2.js index c905591..76979a0 100644 --- a/src/utils/request2.js +++ b/src/utils/request2.js @@ -29,7 +29,7 @@ service.interceptors.request.use( const isRepeatSubmit = (config.headers || {}).repeatSubmit === false; if (!isToken) { config.headers["Authentication"] = localStorage.getItem( - "MSSM-LIAONING__TOKEN" + "Authentication" ); } // get请求映射params参数 diff --git a/src/views/productsMsg/components/cosmeticsArchives.vue b/src/views/productsMsg/components/cosmeticsArchives.vue index 3d22b30..ea4e4d5 100644 --- a/src/views/productsMsg/components/cosmeticsArchives.vue +++ b/src/views/productsMsg/components/cosmeticsArchives.vue @@ -1,554 +1,316 @@ + +.pagination { + display: flex; + justify-content: space-between; + padding: 15px 20px; +} + \ No newline at end of file