diff --git a/src/api/external/index.js b/src/api/external/index.js index 527f619..ba82bc3 100644 --- a/src/api/external/index.js +++ b/src/api/external/index.js @@ -3,7 +3,7 @@ import request from "@/utils/request"; //获取用户信息 export function getselfInfo() { return request({ - baseURL: location.origin, + // baseURL: location.origin, url: "/api/admin/user/getSelfInfo", method: "GET", }); diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index c307fa4..c793da2 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -285,7 +285,8 @@ export default { color: #495060; background: #fff; padding: 0 8px; - font-size: 12px; + font-size: 14px; + font-weight: 550; margin-left: 5px; margin-top: 6px; &:first-of-type { diff --git a/src/utils/rem.js b/src/utils/rem.js index 746d934..49363ed 100644 --- a/src/utils/rem.js +++ b/src/utils/rem.js @@ -1,6 +1,6 @@ // rem等比适配配置文件 // 基准大小 -const baseSize = 16; +const baseSize = 20; // 设置 rem 函数 function setRem() { // 当前页面宽度相对于 1920宽的缩放比例，可根据自己需要修改。 diff --git a/src/views/index.vue b/src/views/index.vue index 77b9629..94efef0 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -78,7 +78,7 @@ export default { } .tree-menu { background: #465970; - width: 220px; + width: 180px; box-sizing: border-box; padding: 14px 10px; & > div { @@ -104,7 +104,7 @@ export default { height: 100%; background: #f2f2f2; - overflow: hidden; + overflow-y: auto; } .child-views { height: calc(100% - 40px); @@ -120,6 +120,8 @@ export default { .view-child { display: flex; align-items: center; + font-size: 16px; + font-weight: 600; } } \ No newline at end of file diff --git a/src/views/productsMsg/components/cosmeticsArchives.vue b/src/views/productsMsg/components/cosmeticsArchives.vue index f2bf401..c60356a 100644 --- a/src/views/productsMsg/components/cosmeticsArchives.vue +++ b/src/views/productsMsg/components/cosmeticsArchives.vue @@ -57,20 +57,21 @@ - - - -
+
重置 查询
+ +
+ +
-
产品列表
+
产品列表1
- + - + - + - - - +
+ + + +
+
+ 重置 + 查询 +
-
- 重置 - 查询 -
+
@@ -62,82 +49,31 @@
产品列表
- 导出 + 导出
- + - + - - - - + + + + - +
- +
@@ -190,7 +126,7 @@ export default { src: "", }; }, - mounted() {}, + mounted() { }, created() { this.chinaCosmetics(); }, @@ -203,23 +139,23 @@ export default { background: "rgba(0, 0, 0, 0.7)", }); dcylqx(this.form1).then((res) => { - const blob = new Blob([res],{type:res.type}); + const blob = new Blob([res], { type: res.type }); const link = document.createElement("a"); link.style.display = 'none' link.href = window.URL.createObjectURL(blob); - link.download = "医疗器械"+ '.xlsx'; + link.download = "医疗器械" + '.xlsx'; link.click(); this.loadA.close(); this.$message({ type: "success", message: "导出成功", }); - }) .catch((err) => { - this.$message({ - type: "info", - message: "导出失败", - }); + }).catch((err) => { + this.$message({ + type: "info", + message: "导出失败", }); + }); }, closeDC() { this.showCK = false; @@ -229,13 +165,10 @@ export default { }); }, exportList() { - this.src = `确定导出${ - this.form1.cpmc ? `产品名称为${this.form1.cpmc}、` : "" - }${this.form1.cplb ? `产品类别为${this.form1.cplb}、` : ""}${ - this.form1.scqy ? `生产企业为${this.form1.scqy}、` : "" - }${ - this.form1.zczh ? `注册证编号或备案编号为${this.form1.zczh}、` : "" - }数据吗?`; + this.src = `确定导出${this.form1.cpmc ? `产品名称为${this.form1.cpmc}、` : "" + }${this.form1.cplb ? `产品类别为${this.form1.cplb}、` : ""}${this.form1.scqy ? `生产企业为${this.form1.scqy}、` : "" + }${this.form1.zczh ? `注册证编号或备案编号为${this.form1.zczh}、` : "" + }数据吗?`; this.showCK = true; }, jieliuFunc() { @@ -303,12 +236,15 @@ export default { ::v-deep .el-dialog:not(.is-fullscreen) { margin-top: 30vh !important; } + ::v-deep .el-dialog__body { padding: 15px; } + ::v-deep .el-select { width: 100% !important; } + .container { height: 100%; // overflow: auto; @@ -321,9 +257,11 @@ export default { color: #323233; font-size: 20px; font-weight: bold; + .searchP { position: relative; cursor: pointer; + &::before { content: ""; width: 78px; @@ -334,23 +272,28 @@ export default { } } } + .tabs { width: 100%; height: 30%; background: #fff; } } + //=================== ::v-deep .el-button--medium { padding: 8px; } + .footBox { - width: 100%; - text-align: center; + width: 87.5%; + text-align: right; } + .tabsBottom { height: 70%; padding-top: 10px; + .foot-main { height: 100%; // min-height: 600px; @@ -358,23 +301,34 @@ export default { background: white; } } + .exportBtn { padding: 10px 20px; } + .table-box { padding: 0 20px; - .table-item { - } + + .table-item {} } + .pagination { display: flex; justify-content: space-between; padding: 15px 20px; } + ::v-deep.el-table--medium .el-table__cell { padding: 5.3px 0; } + ::v-deep .el-table { overflow: auto; } + +::v-deep .logformitem { + .el-form-item__label { + line-height: 25px; + } +} diff --git a/src/views/productsMsg/index.vue b/src/views/productsMsg/index.vue index 96851b4..49fa6f0 100644 --- a/src/views/productsMsg/index.vue +++ b/src/views/productsMsg/index.vue @@ -9,31 +9,20 @@ - + - + - + @@ -41,32 +30,24 @@ - + - + - + + +
+ 重置 + 查询 +
+ -
- 重置 - 查询 -
+
@@ -74,28 +55,12 @@
药品列表
- 导出 + 导出
- - + + - +
- +
@@ -208,7 +157,7 @@ export default { src: "", }; }, - mounted() {}, + mounted() { }, created() { this.chinaCosmetics(1); }, @@ -247,13 +196,10 @@ export default { }); }, exportList() { - this.src = `确定导出${ - this.form1.cpmc ? `产品名称为${this.form1.cpmc}、` : "" - }${this.form1.ypfl ? `药品分类为${this.form1.ypfl}、` : ""}${ - this.form1.pzwh ? `批准文号为${this.form1.pzwh}、` : "" - }${this.form1.scqy ? `生产企业为${this.form1.scqy}、` : ""}${ - this.form1.jx ? `剂型为${this.form1.jx}、` : "" - }数据吗?`; + this.src = `确定导出${this.form1.cpmc ? `产品名称为${this.form1.cpmc}、` : "" + }${this.form1.ypfl ? `药品分类为${this.form1.ypfl}、` : ""}${this.form1.pzwh ? `批准文号为${this.form1.pzwh}、` : "" + }${this.form1.scqy ? `生产企业为${this.form1.scqy}、` : ""}${this.form1.jx ? `剂型为${this.form1.jx}、` : "" + }数据吗?`; this.showCK = true; }, jieliuFunc() { @@ -328,12 +274,15 @@ export default { ::v-deep .el-dialog:not(.is-fullscreen) { margin-top: 30vh !important; } + ::v-deep .el-dialog__body { padding: 15px; } + ::v-deep .el-select { width: 100% !important; } + .container { height: 100%; // overflow: auto; @@ -346,9 +295,11 @@ export default { color: #323233; font-size: 20px; font-weight: bold; + .searchP { position: relative; cursor: pointer; + &::before { content: ""; width: 78px; @@ -359,23 +310,28 @@ export default { } } } + .tabs { width: 100%; height: 30%; background: #fff; } } + //=================== ::v-deep .el-button--medium { padding: 8px; } + .footBox { - width: 100%; - text-align: center; + width: 87.5%; + text-align: right; } + .tabsBottom { // height: 70%; padding-top: 10px; + .foot-main { height: 100%; // min-height: 600px; @@ -383,23 +339,28 @@ export default { background: white; } } + .exportBtn { padding: 10px 20px; } + .table-box { overflow-y: auto; padding: 0 20px; - .table-item { - } + + .table-item {} } + .pagination { display: flex; 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/src/views/productsMsg/zyzj.vue b/src/views/productsMsg/zyzj.vue index 7d362c2..caa0f57 100644 --- a/src/views/productsMsg/zyzj.vue +++ b/src/views/productsMsg/zyzj.vue @@ -7,41 +7,41 @@
- + - + - + + + + + + + +
- - - - - - - - - - - - - + +
+ + + +
- +
+ 重置 + 查询 +
-
- 重置 - 查询 -
+
@@ -55,7 +55,7 @@
- + @@ -65,17 +65,17 @@ {{ scope.row.bah }} - + - + - + @@ -109,8 +109,8 @@ export default { tableData: [], total: 0, form1: { - //通用名称 - tymc: "", + //通用名称 + tymc: "", //备案号 bah: "", //剂型 @@ -207,7 +207,7 @@ export default { this.$router.push({ path: `/cosmeticsDetail`, query: { type: "4", data: e.id }, - + }); }, //搜索 @@ -314,8 +314,8 @@ export default { } .footBox { - width: 100%; - text-align: center; + width: 87.5%; + text-align: right; } .tabsBottom { @@ -354,4 +354,10 @@ export default { ::v-deep .el-table { overflow: auto; } + +::v-deep .logformitem { + .el-form-item__label { + line-height: 25px; + } +} diff --git a/src/views/tool/build/index.vue b/src/views/tool/build/index.vue index 6e400be..aa5e91f 100644 --- a/src/views/tool/build/index.vue +++ b/src/views/tool/build/index.vue @@ -521,6 +521,7 @@ export default { .left-scrollbar .el-scrollbar__view { overflow-x: hidden; + } .el-rate {