diff --git a/.env.production b/.env.production index c6adc7d..6e1379e 100644 --- a/.env.production +++ b/.env.production @@ -5,11 +5,11 @@ VUE_APP_TITLE = 产品档案管理系统 ENV = 'production' # 检查员管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API = '/ggfw-api' #外网(部署104、105服务器) # VUE_APP_BASE_API2 = '/api/inspector/inspector' -VUE_APP_BASE_API2 = :9026/inspector +VUE_APP_BASE_API2 = '/ggfw-api' #调用外部接口 VUE_APP_BASE_API3 = '/api/admin' #本地文件下载路径 diff --git a/src/api/external/index.js b/src/api/external/index.js index 6e7df23..ba82bc3 100644 --- a/src/api/external/index.js +++ b/src/api/external/index.js @@ -3,6 +3,7 @@ import request from "@/utils/request"; //获取用户信息 export function getselfInfo() { return request({ + // baseURL: location.origin, url: "/api/admin/user/getSelfInfo", method: "GET", }); diff --git a/src/views/productsMsg/components/cosmeticsArchives.vue b/src/views/productsMsg/components/cosmeticsArchives.vue index f502369..ca6ce12 100644 --- a/src/views/productsMsg/components/cosmeticsArchives.vue +++ b/src/views/productsMsg/components/cosmeticsArchives.vue @@ -9,28 +9,28 @@ - + - + - + - + - + - + - + - + @@ -117,9 +117,10 @@ @@ -137,23 +138,23 @@ export default { A1: "产品名称", A2: "备案编码", A3: "生产企业", - types: '1', + types: "1", total: 0, options: [ { - value: '1', + value: "1", label: "国产化妆品", }, { - value: '2', + value: "2", label: "国产特殊化妆品", }, { - value: '3', + value: "3", label: "进口化妆品", }, { - value: '4', + value: "4", label: "进口特殊化妆品", }, ], @@ -162,47 +163,67 @@ export default { cpmc: "", name: "", scqy: "", + }, + form: { size: 10, current: 1, }, + jieliuShow: true, }; }, mounted() {}, created() { - this.changeType('1'); + this.changeType("1"); }, methods: { + jieliuFunc() { + if (this.jieliuShow) { + this.getData(this.types); + this.jieliuShow = false; + setTimeout(() => { + this.jieliuShow = true; + }, 3000); + } else { + this.$message("点击过快"); + } + }, //去内嵌页面 toDetail(e) { let data = ""; - if (this.types == '1') { + if (this.types == "1") { data = e.bah; - } else if (this.types == '2') { + } else if (this.types == "2") { data = e.zczh; - } else if (this.types == '3') { + } else if (this.types == "3") { data = e.bah; - } else if (this.types == '4') { + } else if (this.types == "4") { data = e.zczh; } //利用type区分三种档案 //利用flag区分四种化妆品详情 然后分别调用不同的详情接口 this.$router.push({ path: `/cosmeticsDetail`, - query: { type: '1', flag: this.types, data }, + query: { type: "1", flag: this.types, data }, }); }, //搜索 searchList() { - this.getData(this.types); + this.form.current = 1; + + for (let i in this.form1) { + this.form[i] = this.form1[i]; + } + this.jieliuFunc(); }, getPagination(e) { console.log(e); - this.form1.current = e.page; - this.form1.size = e.limit; + this.form.current = e.page; + this.form.size = e.limit; this.chinaCosmetics(); }, //重置 reset() { + this.types = "1"; this.form1 = { babm: "", cpmc: "", @@ -211,75 +232,79 @@ export default { size: 10, current: 1, }; + this.form = { + size: 10, + current: 1, + }; + this.jieliuFunc(); }, //国产化妆品 async chinaCosmetics() { this.loading = true; - let msg1 = await this.$api.cosmetics.domesticList(this.form1); + let msg1 = await this.$api.cosmetics.domesticList(this.form); this.tableData = msg1.data.records; this.total = msg1.data.total; - this.form1.size = msg1.data.size; - this.form1.current = msg1.data.current; + this.form.size = msg1.data.size; + this.form.current = msg1.data.current; this.loading = false; }, //国产特殊化妆品 async chinaSpecialCosmetics() { this.loading = true; - let msg1 = await this.$api.cosmetics.specialList(this.form1); + let msg1 = await this.$api.cosmetics.specialList(this.form); this.tableData = msg1.data.records; this.total = msg1.data.total; - this.form1.size = msg1.data.size; - this.form1.current = msg1.data.current; + this.form.size = msg1.data.size; + this.form.current = msg1.data.current; this.loading = false; }, //进口化妆品 async importCosmetics() { this.loading = true; - let msg1 = await this.$api.cosmetics.importList(this.form1); + let msg1 = await this.$api.cosmetics.importList(this.form); this.tableData = msg1.data.records; this.total = msg1.data.total; - this.form1.size = msg1.data.size; - this.form1.current = msg1.data.current; + this.form.size = msg1.data.size; + this.form.current = msg1.data.current; this.loading = false; }, //进口特殊化妆品 async importSpecialCosmetics() { this.loading = true; - let msg1 = await this.$api.cosmetics.importSpecialList(this.form1); + let msg1 = await this.$api.cosmetics.importSpecialList(this.form); this.tableData = msg1.data.records; this.total = msg1.data.total; - this.form1.size = msg1.data.size; - this.form1.current = msg1.data.current; + this.form.size = msg1.data.size; + this.form.current = msg1.data.current; this.loading = false; }, async getData(e) { - if (e == '1') { + if (e == "1") { this.A2 = "备案编码"; this.A3 = "生产企业"; this.chinaCosmetics(); - } else if (e == '2') { + } else if (e == "2") { this.A2 = "批准日期"; this.A3 = "省份"; this.chinaSpecialCosmetics(); - } else if (e == '3') { + } else if (e == "3") { this.A2 = "备案编码"; this.A3 = "生产企业"; this.importCosmetics(); - } else if (e == '4') { + } else if (e == "4") { this.A2 = "批准日期"; this.A3 = "省份"; this.importSpecialCosmetics(); } }, async changeType(e) { - this.reset(); + // this.reset(); this.getData(e); }, }, }; - \ No newline at end of file +::v-deep.el-table--medium .el-table__cell { + padding: 5.3px 0; +} +::v-deep .el-table { + overflow: auto; +} + diff --git a/src/views/productsMsg/components/health.vue b/src/views/productsMsg/components/health.vue index 557dd81..372159a 100644 --- a/src/views/productsMsg/components/health.vue +++ b/src/views/productsMsg/components/health.vue @@ -9,7 +9,7 @@ - + @@ -27,14 +27,14 @@ - + - + @@ -57,23 +57,50 @@
- - - - - - + + + + + + + - + @@ -30,11 +30,12 @@ export default { }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}` }; }, - methods: {}, + methods: {}, created() { this.$nextTick(() => { }); }, + methods: {}, mounted() { this.$nextTick(() => { let dom = document.getElementsByClassName("ifram-view"); diff --git a/src/views/productsMsg/index.vue b/src/views/productsMsg/index.vue index 1606695..edf0372 100644 --- a/src/views/productsMsg/index.vue +++ b/src/views/productsMsg/index.vue @@ -9,7 +9,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -35,12 +35,12 @@ - + - + - + - + - + - + @@ -129,10 +129,10 @@
@@ -148,10 +148,36 @@ export default { loading: false, tableData: [], total: 0, + options: [ + { + value: 1, + label: "全部", + }, + { + value: 2, + label: "中药", + }, + { + value: 3, + label: "辅料", + }, + { + value: 4, + label: "生物制品", + }, + { + value: 5, + label: "化学药品", + }, + ], form1: { - types: "", + jx: "", ypfl: "", name: "", + pzwh: "", + scqy: "", + }, + form: { size: 10, current: 1, }, @@ -177,6 +203,17 @@ export default { this.chinaCosmetics(1); }, methods: { + jieliuFunc() { + if (this.jieliuShow) { + this.chinaCosmetics(); + this.jieliuShow = false; + setTimeout(() => { + this.jieliuShow = true; + }, 3000); + } else { + this.$message("点击过快"); + } + }, //去内嵌页面 toDetail(e) { this.$router.push({ @@ -186,33 +223,43 @@ export default { }, //搜索 searchList() { - this.form1.current = 1; - this.chinaCosmetics(); + this.form.current = 1; + for (let i in this.form1) { + this.form[i] = this.form1[i]; + } + console.log(this.form); + this.jieliuFunc(); }, getPagination(e) { console.log(e); - this.form1.current = e.page; - this.form1.size = e.limit; - this.chinaCosmetics(); + this.form.current = e.page; + this.form.size = e.limit; + this.chinaCosmetics(1); }, //重置 reset() { this.form1 = { - name: "", + jx: "", ypfl: "", + name: "", + pzwh: "", + scqy: "", + }; + this.form = { size: 10, current: 1, }; + this.jieliuFunc(); }, //国产化妆品 async chinaCosmetics() { this.loading = true; - let msg1 = await this.$api.cosmetics.vRdgYpwhGxwz(this.form1); + let msg1 = await this.$api.cosmetics.vRdgYpwhGxwz(this.form); console.log(msg1); this.tableData = msg1.data.records; this.total = msg1.data.total; - this.form1.size = msg1.data.size; - this.form1.current = msg1.data.current; + this.form.size = msg1.data.size; + this.form.current = msg1.data.current; this.loading = false; }, }, @@ -263,7 +310,7 @@ export default { text-align: center; } .tabsBottom { - height: 70%; + // height: 70%; padding-top: 10px; .foot-main { height: 100%; @@ -276,6 +323,7 @@ export default { padding: 10px 20px; } .table-box { + overflow-y: auto; padding: 0 20px; .table-item { } @@ -285,4 +333,10 @@ export default { justify-content: space-between; padding: 15px 20px; } +::v-deep.el-table--medium .el-table__cell { + padding: 7px 0; +} +::v-deep .el-table { + overflow: auto; +} diff --git a/vue.config.js b/vue.config.js index eb7b903..aa17b39 100644 --- a/vue.config.js +++ b/vue.config.js @@ -26,7 +26,7 @@ module.exports = { // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 // publicPath: process.env.NODE_ENV === "production" ? "/demo/inspector/" : "/", - publicPath: process.env.NODE_ENV === "production" ? "/inspector/" : "/", + publicPath: process.env.NODE_ENV === "production" ? "/ggfw-dangan/" : "/", // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: "dist", // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）