diff --git a/src/App.vue b/src/App.vue index 5f2150d..cfa7463 100644 --- a/src/App.vue +++ b/src/App.vue @@ -51,7 +51,7 @@ export default { token, leixing } - console.log(888,obj); + console.log(888, obj); if ( obj.token == undefined ) { @@ -95,20 +95,48 @@ export default { }; /** sudo mv ggfw-iframe.zip /usr/share/nginx/html/ggfw-iframe 在 MSSM-Dev 文件夹下 移动压缩包到 ggfw文件夹下 - - cd /usr/share/nginx/html/ggfw-iframe 移动到文件夹下 - - unzip ggfw-iframe.zip -d . 解压 - - rm ./ggfw-iframe.zip 删除当前目录下的压缩包 弹出确定删除 打 y 并回车 + + cd /usr/share/nginx/html/ggfw-iframe 移动到文件夹下 + + unzip ggfw-iframe.zip -d . 解压 + + rm ./ggfw-iframe.zip 删除当前目录下的压缩包 弹出确定删除 打 y 并回车 */ - diff --git a/src/api/Myapi/frimCenter/index.js b/src/api/Myapi/frimCenter/index.js index af4041c..5848b91 100644 --- a/src/api/Myapi/frimCenter/index.js +++ b/src/api/Myapi/frimCenter/index.js @@ -1,6 +1,6 @@ import request from "@/utils/request"; -// let api = "/api"; -let api = location.origin +let api = "/api"; +// let api = location.origin export default { // 分页查询企业执照列表 getEnterpriseLicenseByPage(data) { diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 81db4fc..18f54e8 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -217,7 +217,7 @@ // 输入框 .el-input__inner { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: rgb(41, 47, 56); @@ -226,7 +226,7 @@ // 多行输入框 .el-textarea__inner { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Bolde CN; } diff --git a/src/assets/styles/utils.scss b/src/assets/styles/utils.scss index 4fdc498..37758e2 100644 --- a/src/assets/styles/utils.scss +++ b/src/assets/styles/utils.scss @@ -11,6 +11,9 @@ // @return $px/1920*100vh; // } +@function vb($px) { + @return $px/1420*100vw; +} @function vw($px) { @return $px/1920*100vw; } diff --git a/src/components/FileUploadTwo/index.vue b/src/components/FileUploadTwo/index.vue index 8157499..7b07f2e 100644 --- a/src/components/FileUploadTwo/index.vue +++ b/src/components/FileUploadTwo/index.vue @@ -310,7 +310,7 @@ export default { margin-right: vw(10); } span { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: 400; color: #1e80eb; diff --git a/src/components/FileUploadTwosan/index.vue b/src/components/FileUploadTwosan/index.vue index 6e284ae..ddaf82b 100644 --- a/src/components/FileUploadTwosan/index.vue +++ b/src/components/FileUploadTwosan/index.vue @@ -314,7 +314,7 @@ export default { margin-right: vw(10); } span { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: 400; color: #1e80eb; diff --git a/src/components/mycalendar/index.vue b/src/components/mycalendar/index.vue index 62b3fa2..fb62c6d 100644 --- a/src/components/mycalendar/index.vue +++ b/src/components/mycalendar/index.vue @@ -367,7 +367,7 @@ export default { justify-content: space-between; justify-items: center; .cal_h_data { - font-size: vw(20); + font-size: vb(20); font-family: DIN; font-weight: bold; color: #0a2a4d; @@ -394,7 +394,7 @@ export default { } .cal_h_zhou { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #0a2a4d; @@ -405,7 +405,7 @@ export default { } .cal_month { - font-size: vw(14); + font-size: vb(14); text-align: center; height: calc(100% - 60px); @@ -418,7 +418,7 @@ export default { text-align: center; line-height: vw(38); cursor: pointer; - font-size: vw(22); + font-size: vb(22); font-family: DIN; font-weight: bold; color: #0a2a4d; @@ -442,13 +442,13 @@ export default { justify-content: space-around; justify-items: center; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 500; color: #b1b6bf; line-height: vh(33); .cal_m_day_cell2 { - font-size: vw(18); + font-size: vb(18); font-family: Source Han Sans CN; font-weight: 500; color: #b1b6bf; diff --git a/src/utils/request.js b/src/utils/request.js index ca72300..752bfbd 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -18,10 +18,10 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8"; const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 // !本地使用 - // baseURL: process.env.VUE_APP_BASE_API, + baseURL: process.env.VUE_APP_BASE_API, // !外地使用 - baseURL: location.origin + process.env.VUE_APP_URL, + // baseURL: location.origin + process.env.VUE_APP_URL, // 超时 timeout: 60000, }); diff --git a/src/views/components/RecallModule/RecallModule.vue b/src/views/components/RecallModule/RecallModule.vue index 582b251..1299d43 100644 --- a/src/views/components/RecallModule/RecallModule.vue +++ b/src/views/components/RecallModule/RecallModule.vue @@ -145,7 +145,7 @@ export default { .myttile-font { position: relative; z-index: 2; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -153,7 +153,7 @@ export default { align-items: center; span { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: 400; color: #ff0f0f; @@ -173,7 +173,7 @@ export default { } ::v-deep .column-text-eight { text-align: center; - font-size: vw(14); + font-size: vb(14); line-height: vh(39); } ::v-deep .el-pagination { @@ -204,7 +204,7 @@ export default { .domestic { display: flex; align-items: flex-start; - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: 400; color: #f93f4d; diff --git a/src/views/components/TianBao/index.vue b/src/views/components/TianBao/index.vue index add0a95..43e57cd 100644 --- a/src/views/components/TianBao/index.vue +++ b/src/views/components/TianBao/index.vue @@ -228,7 +228,7 @@ export default { padding: vh(5) 0 0 0; } div { - font-size: vw(20); + font-size: vb(20); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -245,13 +245,13 @@ export default { justify-content: space-between; align-items: center; .tianbao-left { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #6a6c6f; } .tianbao-right { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #292f38; @@ -272,7 +272,7 @@ export default { align-items: center; justify-content: center; cursor: pointer; - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #ffffff; diff --git a/src/views/components/auditInfo/index.vue b/src/views/components/auditInfo/index.vue index e4688fe..74afd0c 100644 --- a/src/views/components/auditInfo/index.vue +++ b/src/views/components/auditInfo/index.vue @@ -102,7 +102,7 @@ export default { padding: vh(5) 0 0 0; } div { - font-size: vw(20); + font-size: vb(20); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -123,7 +123,7 @@ export default { .tianbao-left { width: vw(90); align-self: stretch; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #6a6c6f; @@ -131,7 +131,7 @@ export default { .tianbao-right { flex: 1; /* 右边元素占据剩余空间 */ align-self: auto; /* 高度自适应内容 */ - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #292f38; diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index b76cba7..2da4f92 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -119,7 +119,7 @@ export default { padding: vh(5) 0 0 0; } div { - font-size: vw(20); + font-size: vb(20); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -132,7 +132,7 @@ export default { background: #f8f9fa; .zhaohuipingjai { margin: 0 0 vh(30) 0; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Bolde CN; font-weight: bold; color: #6a6c6f; diff --git a/src/views/components/dialogTow/dialogTow.vue b/src/views/components/dialogTow/dialogTow.vue index 45af898..4d2d9cc 100644 --- a/src/views/components/dialogTow/dialogTow.vue +++ b/src/views/components/dialogTow/dialogTow.vue @@ -624,7 +624,7 @@ export default { padding: vh(5) 0 0 0; } div { - font-size: vw(20); + font-size: vb(20); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -652,7 +652,7 @@ export default { } ::v-deep .el-form-item__label { width: vw(160); - font-size: vw(12); + font-size: vb(12); font-family: Source Han Regular CN; font-weight: 400; color: #6a6c6f; @@ -673,7 +673,7 @@ export default { width: vw(1477); .el-textarea__inner { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Bolde CN; } } @@ -682,7 +682,7 @@ export default { // height: vh(90); width: vw(655); ::v-deep .el-textarea__inner { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Bolde CN; } } @@ -693,7 +693,7 @@ export default { left: 0; display: inline-block; margin-left: 10px; - font-size: vw(12); + font-size: vb(12); } .bottom { @@ -703,7 +703,7 @@ export default { ::v-deep .el-button { border: vw(1) solid #1e80eb; - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: 400; padding: vh(10) vw(18); @@ -759,7 +759,7 @@ export default { width: vw(150); text-align: right; margin-right: vw(10); - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6a6c6f; @@ -779,7 +779,7 @@ export default { width: vw(150); text-align: right; margin-right: vw(10); - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6a6c6f; @@ -791,7 +791,7 @@ export default { margin-left: vw(10); display: inline-block; border: vw(1) solid #1e80eb; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; padding: vh(10) vw(18); diff --git a/src/views/components/dialogTowZeling/index.vue b/src/views/components/dialogTowZeling/index.vue index 0ed6042..c1803a0 100644 --- a/src/views/components/dialogTowZeling/index.vue +++ b/src/views/components/dialogTowZeling/index.vue @@ -513,7 +513,7 @@ export default { padding: vh(5) 0 0 0; } div { - font-size: vw(20); + font-size: vb(20); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -538,7 +538,7 @@ export default { align-items: center; .form-b-title { width: vw(100); - font-size: vw(12); + font-size: vb(12); font-family: Source Han Regular CN; font-weight: 400; color: #6a6c6f; @@ -579,7 +579,7 @@ export default { .el-icon-date { position: absolute; right: vw(20); - font-size: vw(20); + font-size: vb(20); } } } @@ -595,7 +595,7 @@ export default { display: flex; align-items: center; justify-content: center; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #292f38; @@ -612,7 +612,7 @@ export default { pointer-events: auto; .form-f-titme { width: vw(140); - font-size: vw(12); + font-size: vb(12); font-family: Source Han Regular CN; font-weight: 400; color: #6a6c6f; @@ -634,7 +634,7 @@ export default { margin-right: vw(5); } span { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #1e80eb; @@ -652,7 +652,7 @@ export default { } ::v-deep .el-form-item__label { width: vw(100); - font-size: vw(12); + font-size: vb(12); font-family: Source Han Regular CN; font-weight: 400; color: #6a6c6f; @@ -671,7 +671,7 @@ export default { left: 0; display: inline-block; margin-left: vw(10); - font-size: vw(12); + font-size: vb(12); } .bottom { @@ -720,7 +720,7 @@ export default { width: vw(150); text-align: right; margin-right: vw(10); - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6a6c6f; @@ -740,7 +740,7 @@ export default { width: vw(150); text-align: right; margin-right: vw(10); - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6a6c6f; @@ -752,7 +752,7 @@ export default { margin-left: vw(10); display: inline-block; border: vw(1) solid #1e80eb; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; padding: vh(10) vw(18); diff --git a/src/views/components/dialogTowZhaohui/dialogTow.vue b/src/views/components/dialogTowZhaohui/dialogTow.vue index 151e0e9..c6df506 100644 --- a/src/views/components/dialogTowZhaohui/dialogTow.vue +++ b/src/views/components/dialogTowZhaohui/dialogTow.vue @@ -556,7 +556,7 @@ export default { padding: vh(5) 0 0 0; } div { - font-size: vw(20); + font-size: vb(20); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -580,7 +580,7 @@ export default { margin-right: vw(80); .recallbasic-box { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; line-height: vh(50); @@ -643,7 +643,7 @@ export default { no-repeat; background-size: 100% 100%; - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: 500; color: #75777a; @@ -662,7 +662,7 @@ export default { .pingjiaContenr { padding: vw(20); .zhaohuipingjai { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Bolde CN; font-weight: bold; color: #6a6c6f; diff --git a/src/views/components/dialogTowhuixian/dialogTow.vue b/src/views/components/dialogTowhuixian/dialogTow.vue index fc1034e..4273072 100644 --- a/src/views/components/dialogTowhuixian/dialogTow.vue +++ b/src/views/components/dialogTowhuixian/dialogTow.vue @@ -671,7 +671,7 @@ export default { padding: vh(5) 0 0 0; } div { - font-size: vw(20); + font-size: vb(20); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -699,7 +699,7 @@ export default { } ::v-deep .el-form-item__label { width: vw(160); - font-size: vw(12); + font-size: vb(12); font-family: Source Han Regular CN; font-weight: 400; color: #6a6c6f; @@ -720,7 +720,7 @@ export default { width: vw(1477); .el-textarea__inner { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Bolde CN; } } @@ -729,7 +729,7 @@ export default { // height: vh(90); width: vw(655); ::v-deep .el-textarea__inner { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Bolde CN; } } @@ -740,7 +740,7 @@ export default { left: 0; display: inline-block; margin-left: 10px; - font-size: vw(12); + font-size: vb(12); } .bottom { @@ -750,7 +750,7 @@ export default { ::v-deep .el-button { border: vw(1) solid #1e80eb; - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: 400; padding: vh(10) vw(18); @@ -806,7 +806,7 @@ export default { width: vw(150); text-align: right; margin-right: vw(10); - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6a6c6f; @@ -826,7 +826,7 @@ export default { width: vw(150); text-align: right; margin-right: vw(10); - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6a6c6f; @@ -838,7 +838,7 @@ export default { margin-left: vw(10); display: inline-block; border: vw(1) solid #1e80eb; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; padding: vh(10) vw(18); diff --git a/src/views/components/downloadBox/index.vue b/src/views/components/downloadBox/index.vue index e0e1eff..2356889 100644 --- a/src/views/components/downloadBox/index.vue +++ b/src/views/components/downloadBox/index.vue @@ -108,14 +108,14 @@ export default { diff --git a/src/views/components/tianbaoDialog/index.vue b/src/views/components/tianbaoDialog/index.vue index 5c0c647..d31bd84 100644 --- a/src/views/components/tianbaoDialog/index.vue +++ b/src/views/components/tianbaoDialog/index.vue @@ -184,7 +184,7 @@ export default { padding: vh(5) 0 0 0; } div { - font-size: vw(18); + font-size: vb(18); font-family: Source Han Sans CN; font-weight: bold; color: #292f38; @@ -202,7 +202,7 @@ export default { width: vw(150); text-align: right; margin-right: vw(10); - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6a6c6f; @@ -222,7 +222,7 @@ export default { width: vw(150); text-align: right; margin-right: vw(10); - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6a6c6f; @@ -254,7 +254,7 @@ export default { .zhanubottom-boxa { width: 100%; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #6a6c6f; @@ -264,7 +264,7 @@ export default { white-space: nowrap; /* 防止换行 */ } .zhanubottom-boxb { - font-size: vw(14); + font-size: vb(14); font-family: DIN-Regular; font-weight: 400; color: #b1b6bf; @@ -288,7 +288,7 @@ export default { height: vh(20); } span { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #1e80eb; diff --git a/src/views/components/voucherImg/index.vue b/src/views/components/voucherImg/index.vue index c122cd8..4ed577f 100644 --- a/src/views/components/voucherImg/index.vue +++ b/src/views/components/voucherImg/index.vue @@ -104,7 +104,7 @@ export default { padding: vh(5) 0 0 0; } div { - font-size: vw(20); + font-size: vb(20); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -144,7 +144,7 @@ export default { margin-right: vw(10); } span { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: 400; color: #1e80eb; diff --git a/src/views/firmContent/components/blockHeader/index.vue b/src/views/firmContent/components/blockHeader/index.vue index 176882a..0516163 100644 --- a/src/views/firmContent/components/blockHeader/index.vue +++ b/src/views/firmContent/components/blockHeader/index.vue @@ -101,7 +101,7 @@ export default { margin-right: vw(9); } .title { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: bold; color: #1e80eb; @@ -129,7 +129,7 @@ export default { } span { display: inline-block; - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: 400; color: #1e80eb; @@ -155,7 +155,7 @@ export default { } span { display: inline-block; - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: 400; color: #fff; diff --git a/src/views/firmContent/components/descriptions/index.vue b/src/views/firmContent/components/descriptions/index.vue index 0345dfe..07e4e46 100644 --- a/src/views/firmContent/components/descriptions/index.vue +++ b/src/views/firmContent/components/descriptions/index.vue @@ -62,7 +62,7 @@ export default { .my--descriptions { ::v-deep .descriptions-label-style { background-color: #F5F7FA; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6A6C6F; @@ -70,7 +70,7 @@ export default { } ::v-deep .descriptions-labelWidth-style { background-color: #F5F7FA; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6A6C6F; @@ -78,14 +78,14 @@ export default { } ::v-deep .descriptions-content-style { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #292F38; width: vw(610); } ::v-deep .descriptions-contentWidth-style { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; width: vw(450); @@ -100,7 +100,7 @@ export default { background-color: #F7FAFC; .descriptions-labelChange-style { background-color: #F7FAFC; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6A6C6F; @@ -110,7 +110,7 @@ export default { } .descriptions-contentChange-style { background-color: #F7FAFC; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #292F38; diff --git a/src/views/firmContent/components/descriptionsbianji/index.vue b/src/views/firmContent/components/descriptionsbianji/index.vue index d226972..9daced5 100644 --- a/src/views/firmContent/components/descriptionsbianji/index.vue +++ b/src/views/firmContent/components/descriptionsbianji/index.vue @@ -143,7 +143,7 @@ export default { .my--descriptions { ::v-deep .descriptions-label-style { background-color: #F5F7FA; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6A6C6F; @@ -152,7 +152,7 @@ export default { ::v-deep .descriptions-labelWidth-style { background-color: #F5F7FA; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6A6C6F; @@ -160,7 +160,7 @@ export default { } ::v-deep .descriptions-content-style { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #292F38; @@ -168,7 +168,7 @@ export default { } ::v-deep .descriptions-contentWidth-style { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; width: vw(450); @@ -186,7 +186,7 @@ export default { .descriptions-labelChange-style { background-color: #F7FAFC; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6A6C6F; @@ -197,7 +197,7 @@ export default { .descriptions-contentChange-style { background-color: #F7FAFC; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #292F38; diff --git a/src/views/firmContent/components/dialogTitle/index.vue b/src/views/firmContent/components/dialogTitle/index.vue index 6959665..7ca2daf 100644 --- a/src/views/firmContent/components/dialogTitle/index.vue +++ b/src/views/firmContent/components/dialogTitle/index.vue @@ -82,7 +82,7 @@ export default { padding: vh(5) 0 0 0; } div { - font-size: vw(20); + font-size: vb(20); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; diff --git a/src/views/firmContent/components/downloadFileBox/index.vue b/src/views/firmContent/components/downloadFileBox/index.vue index c79cfe2..410eb8e 100644 --- a/src/views/firmContent/components/downloadFileBox/index.vue +++ b/src/views/firmContent/components/downloadFileBox/index.vue @@ -106,7 +106,7 @@ export default { margin-right: vw(10); } div { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6A6C6F; diff --git a/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue b/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue index 77cfc9e..1b38c08 100644 --- a/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue +++ b/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue @@ -5,12 +5,7 @@
抽样级别:
- +
@@ -28,19 +23,8 @@
- - + + - + +
-
+
基本信息
-
+
检验项目
- + - + - + - + - + - +
@@ -213,7 +138,7 @@ export default { //抽样编号 cybh: "", //批准文号 - yppzwh:'' + yppzwh: '' }, //主键 ids: "", @@ -668,8 +593,8 @@ export default { return "font-family: Adobe Heiti Std;font-weight: normal;"; } }, - currentChange(index) {}, - sizeChange(index) {}, + currentChange(index) { }, + sizeChange(index) { }, }, mounted() { // this.$nextTick(()=>{ @@ -685,13 +610,16 @@ export default { diff --git a/src/views/firmContent/drugInfo/zhaohui/PZchouyang.vue b/src/views/firmContent/drugInfo/zhaohui/PZchouyang.vue index 5707163..4668f01 100644 --- a/src/views/firmContent/drugInfo/zhaohui/PZchouyang.vue +++ b/src/views/firmContent/drugInfo/zhaohui/PZchouyang.vue @@ -710,7 +710,7 @@ export default { ::v-deep span { display: inline-block; color: #1e80eb; - font-size: vw(14); + font-size: vb(14); font-family: Adobe Heiti Std; font-weight: normal; } @@ -718,14 +718,14 @@ export default { ::v-deep .el-table td { height: vh(40); padding: vh(10); - font-size: vw(14); + font-size: vb(14); font-weight: 400; color: #292f38; } ::v-deep .el-table th { height: vh(40); padding: 0; - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: bold; color: #292f38; @@ -745,7 +745,7 @@ export default { margin: 0; } .custom { - font-size: 14px; + font-size: vb(14); font-family: Source Han Sans CN-Regular, Source Han Sans CN; font-weight: 400; color: #292f38; @@ -761,7 +761,7 @@ export default { height: vw(28); } .custom { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #292f38; @@ -805,7 +805,7 @@ export default { } span { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #2f3742; @@ -832,7 +832,7 @@ export default { display: flex; align-items: center; .input--label { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #6a6c6f; @@ -863,7 +863,7 @@ export default { height: vh(40); background: #1e80eb; border-radius: vw(4); - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #ffffff; @@ -880,7 +880,7 @@ export default { border: vw(1) solid #1e80eb; border-radius: vw(4); background-color: #fff; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #1e80eb; diff --git a/src/views/firmContent/drugInfo/zhaohui/chouYang/chouYang.vue b/src/views/firmContent/drugInfo/zhaohui/chouYang/chouYang.vue index eb7fbf4..88ed809 100644 --- a/src/views/firmContent/drugInfo/zhaohui/chouYang/chouYang.vue +++ b/src/views/firmContent/drugInfo/zhaohui/chouYang/chouYang.vue @@ -141,7 +141,7 @@ export default { ::v-deep span { display: inline-block; color: #1e80eb; - font-size: vw(14); + font-size: vb(14); font-family: Adobe Heiti Std; font-weight: normal; } @@ -149,7 +149,7 @@ export default { ::v-deep .el-table td { height: vh(60); padding: 0; - font-size: vw(14); + font-size: vb(14); font-weight: 400; font-family: Source Han Sans CN; color: #292f38; @@ -157,7 +157,7 @@ export default { ::v-deep .el-table th { height: vh(40); padding: 0; - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: bold; color: #292f38; @@ -180,7 +180,7 @@ export default { height: vw(28); } .custom { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #292f38; diff --git a/src/views/firmContent/drugInfo/zhaohui/chouyangInfo/index.vue b/src/views/firmContent/drugInfo/zhaohui/chouyangInfo/index.vue index 9cd3fe8..f6f3686 100644 --- a/src/views/firmContent/drugInfo/zhaohui/chouyangInfo/index.vue +++ b/src/views/firmContent/drugInfo/zhaohui/chouyangInfo/index.vue @@ -360,7 +360,7 @@ export default { clip-path: polygon(0 0, calc(100% - (15 / 1920*100vw)) 0,100% 40%, 100% calc(100% - 0px), calc(100% - 0px) 100%, 0px 100%,0 calc(100% - 0px),0 0px); .title-relative { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: 400; color: #ffffff; @@ -377,7 +377,7 @@ export default { background-color: #F7FAFC; padding: vh(15) vw(20); width: vw(256); - font-size: vw(16); + font-size: vb(16); font-family: Source Han Sans CN; font-weight: 400; color: #F5F7FA; @@ -385,7 +385,7 @@ export default { // text-align: right; } .contentClassName{ - font-size: vw(16); + font-size: vb(16); padding: vh(15) 0; font-family: Source Han Sans CN; font-weight: 400; diff --git a/src/views/firmContent/drugInfo/zhaohui/drugDetail.vue b/src/views/firmContent/drugInfo/zhaohui/drugDetail.vue index 7b1b11d..f9d03a6 100644 --- a/src/views/firmContent/drugInfo/zhaohui/drugDetail.vue +++ b/src/views/firmContent/drugInfo/zhaohui/drugDetail.vue @@ -9,66 +9,55 @@ :append-to-body="true" >
详情
--> -
-
-
- {{ item }} -
+
+
+
+ {{ item }}
+
-
-
- -
- +
+
+
-
-
- -
- - - - + +
+
+
+ +
+ + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
@@ -463,8 +452,8 @@ export default { actionTab(e) { this.action = e; }, - currentChange() {}, - sizeChange() {}, + currentChange() { }, + sizeChange() { }, }, }; @@ -473,51 +462,61 @@ export default { ::v-deep .el-dialog__header { background: #f8f9fa; } + .headerText { color: #333333; } + .header--title { margin: 15px 0; display: flex; justify-content: space-between; align-items: center; + .title--left { display: flex; align-items: center; + .line { width: 4px; height: 16px; background: #1e80eb; margin-right: 8px; } + .title { - font-size: 18px; + font-size: vb(18); font-weight: bold; color: #1e80eb; } } } + .mar { margin: 10px 0; } -::v-deep .el-descriptions-row > th { + +::v-deep .el-descriptions-row>th { width: 18%; background: #f5f7fa; color: #292f38; font-weight: 500; } -::v-deep .el-descriptions-row > td { + +::v-deep .el-descriptions-row>td { width: 32%; } ::v-deep .el-dialog:not(.is-fullscreen) { margin-bottom: 1vh !important; } + .content-tabs { .tabs { width: 100%; display: flex; border-bottom: 1px solid #dbe0e8; + .tab { border: 1px solid #dbe0e8; background: #f8f9f9; @@ -528,16 +527,19 @@ export default { border-bottom: none; margin-right: 7px; cursor: pointer; + &:last-child { margin-right: 0; } } + .actionTab { background-color: #1e80eb; color: #fff; } } } + .pagination { display: flex; justify-content: space-between; diff --git a/src/views/firmContent/drugInfo/zhaohui/drugProvince.vue b/src/views/firmContent/drugInfo/zhaohui/drugProvince.vue index 3cc73ae..751c721 100644 --- a/src/views/firmContent/drugInfo/zhaohui/drugProvince.vue +++ b/src/views/firmContent/drugInfo/zhaohui/drugProvince.vue @@ -422,7 +422,7 @@ export default { margin-right: 8px; } .title { - font-size: 18px; + font-size: vb(18); font-weight: bold; color: #1e80eb; } @@ -444,7 +444,7 @@ export default { border: 1px dashed #dee2ee; button { background: #1e80eb; - font-size:14px; + font-size:vw(14); padding:4px 14px; color: #fff; border: none; @@ -466,7 +466,7 @@ export default { color: #333; cursor: pointer; & > span { - font-size: 14px; + font-size: vb(14); } .file-icon { color: #02d1a6; diff --git a/src/views/firmContent/drugInfo/zhaohui/medical.vue b/src/views/firmContent/drugInfo/zhaohui/medical.vue index 79dd0df..e306e25 100644 --- a/src/views/firmContent/drugInfo/zhaohui/medical.vue +++ b/src/views/firmContent/drugInfo/zhaohui/medical.vue @@ -446,7 +446,7 @@ export default { color: #333; cursor: pointer; & > span { - font-size: 14px; + font-size: vb(14); } .file-icon { color: #02d1a6; diff --git a/src/views/firmContent/drugInfo/zhaohui/samplingDetail.vue b/src/views/firmContent/drugInfo/zhaohui/samplingDetail.vue index bea2db5..c8e0285 100644 --- a/src/views/firmContent/drugInfo/zhaohui/samplingDetail.vue +++ b/src/views/firmContent/drugInfo/zhaohui/samplingDetail.vue @@ -494,7 +494,7 @@ export default { margin-right: 8px; } .title { - font-size: 18px; + font-size: vb(18); font-weight: bold; color: #1e80eb; } @@ -524,7 +524,7 @@ export default { color: #333; cursor: pointer; & > span { - font-size: 14px; + font-size: vb(14); } .file-icon { color: #02d1a6; diff --git a/src/views/firmContent/drugInfo/zhongyao/drugBasicInfo.vue b/src/views/firmContent/drugInfo/zhongyao/drugBasicInfo.vue index 0be30ea..c74256b 100644 --- a/src/views/firmContent/drugInfo/zhongyao/drugBasicInfo.vue +++ b/src/views/firmContent/drugInfo/zhongyao/drugBasicInfo.vue @@ -206,7 +206,7 @@ export default { ::v-deep span { display: inline-block; color: #1e80eb; - font-size: vw(14); + font-size: vb(14); font-family: Adobe Heiti Std; font-weight: normal; } @@ -215,7 +215,7 @@ export default { ::v-deep .el-table td { height: vh(40); padding: 0; - font-size: vw(14); + font-size: vb(14); font-family: Adobe Heiti Std; font-weight: 400; color: #292F38; @@ -224,7 +224,7 @@ export default { ::v-deep .el-table th { height: vh(40); padding: 0; - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: bold; color: #292f38; @@ -252,7 +252,7 @@ export default { } .custom { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #292f38; diff --git a/src/views/firmContent/drugInfo/zhongyaobiangeng/adverseReaction.vue b/src/views/firmContent/drugInfo/zhongyaobiangeng/adverseReaction.vue index 8d918d4..f3c52b2 100644 --- a/src/views/firmContent/drugInfo/zhongyaobiangeng/adverseReaction.vue +++ b/src/views/firmContent/drugInfo/zhongyaobiangeng/adverseReaction.vue @@ -135,7 +135,7 @@ export default { ::v-deep span { display: inline-block; color: #1e80eb; - font-size: vw(14); + font-size: vb(14); font-family: Adobe Heiti Std; font-weight: normal; } @@ -144,7 +144,7 @@ export default { ::v-deep .el-table td { height: vh(40); padding: 0; - font-size: vw(14); + font-size: vb(14); font-weight: 400; color: #292F38; } @@ -152,7 +152,7 @@ export default { ::v-deep .el-table th { height: vh(40); padding: 0; - font-size: vw(14); + font-size: vb(14); font-family: Source Han Sans CN; font-weight: bold; color: #292f38; @@ -180,7 +180,7 @@ export default { } .custom { - font-size: 14px; + font-size: vb(14); font-family: Source Han Sans CN-Regular, Source Han Sans CN; font-weight: 400; color: #292f38; @@ -195,7 +195,7 @@ export default { padding-bottom: vh(20); .custom { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #292f38; diff --git a/src/views/homework.vue b/src/views/homework.vue index 8236345..0591380 100644 --- a/src/views/homework.vue +++ b/src/views/homework.vue @@ -630,7 +630,7 @@ p { } .clearfix-font { - font-size: vw(18); + font-size: vb(18); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -643,14 +643,14 @@ p { right: vw(20); cursor: pointer; span { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #8e8e8e; } i { - font-size: vw(14); + font-size: vb(14); } } } @@ -714,7 +714,7 @@ p { margin: 0 0 0 vw(17); .ctile-top-font-top { margin-bottom: vh(16); - font-size: vw(26); + font-size: vb(26); font-family: Source Han Sans CN; font-weight: 500; color: #ffffff; @@ -729,7 +729,7 @@ p { // height: 17px; } span { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #bad5ff; @@ -755,14 +755,14 @@ p { width: vw(70); span { color: #ffffff; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 500; color: #ffffff; } } span { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #cddeff; @@ -790,7 +790,7 @@ p { } .clearfix-font { - font-size: vw(18); + font-size: vb(18); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -832,19 +832,19 @@ p { } .mycit-p1 { // margin-bottom: 14px; - font-size: vw(18); + font-size: vb(18); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; } .mycit-p2 { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #8e8e8e; span { margin-right: vw(8); - font-size: vw(32); + font-size: vb(32); font-family: DIN; font-weight: bold; color: #31c5a7; @@ -889,7 +889,7 @@ p { border-radius: vw(6); text-align: center; p { - font-size: vw(24); + font-size: vb(24); font-family: DIN; font-weight: bold; color: #ffffff; @@ -903,7 +903,7 @@ p { width: vw(522); .mybody-top-right1 { margin: 0 0 vh(5) 0; - font-size: vh(20); + font-size: vb(20); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -913,7 +913,7 @@ p { } .mybody-top-right2 { height: vh(45); - font-size: vh(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #8e8e8e; @@ -974,7 +974,7 @@ p { margin: 0 vw(10) 0 0; } span { - font-size: vw(22); + font-size: vb(22); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -1006,7 +1006,7 @@ p { height: 10vh; line-height: 10vh; - font-size: vw(24); + font-size: vb(24); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -1030,7 +1030,7 @@ p { justify-content: center; span { - font-size: vw(25); + font-size: vb(25); font-family: Source Han Sans CN; font-weight: 400; color: #b1b6bf; @@ -1075,13 +1075,13 @@ p { border-radius: vw(6); .myriit-font-top { margin: 0 0 vw(5) 0; - font-size: vw(16); + font-size: vb(16); font-family: Source Han Bolde CN; font-weight: bold; } .myriit-font-bottom { - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #979797; @@ -1130,12 +1130,12 @@ p { align-items: center; i { margin: 0 vw(6) 0 0; - font-size: vw(24); + font-size: vb(24); color: #2e78ff; } span { width: vw(400); - font-size: vw(16); + font-size: vb(16); font-family: Source Han Regular CN; font-weight: 400; color: #292f38; @@ -1145,7 +1145,7 @@ p { } } .tyontyicontent-item-right { - font-size: vw(16); + font-size: vb(16); font-family: DIN; font-weight: 400; color: #b1b6bf; diff --git a/src/views/index.vue b/src/views/index.vue index 8eb2df9..2809964 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -485,7 +485,7 @@ p { } .clearfix-font { - font-size: vw(18); + font-size: vb(18); font-family: Source Han Bolde CN; font-weight: bold; color: #292f38; @@ -498,14 +498,14 @@ p { right: vw(5); cursor: pointer; span { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #8e8e8e; } i { - font-size: vw(14); + font-size: vb(14); } } } @@ -524,7 +524,7 @@ p { // height: vw(26); } .dialog-font { - font-size: vw(20); + font-size: vb(20); font-family: Source Han Sans CN; font-weight: bold; color: #292f38; @@ -532,7 +532,7 @@ p { } .dialog-content { margin: vh(10) 0 0 vw(25); - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #292f38; @@ -573,7 +573,7 @@ p { .msd-wenzi { margin: 0 vw(10); width: vw(178); - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #292f38; @@ -583,7 +583,7 @@ p { } .msd-jiantou { - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #292f38; @@ -627,7 +627,7 @@ p { box-sizing: border-box; width: vw(280); // height: 23px; - font-size: vw(24); + font-size: vb(24); font-family: Source Han Sans CN; font-weight: 500; color: #ffffff; @@ -662,7 +662,7 @@ p { margin: vh(0) 0 0 vw(5); width: vw(41); height: vw(14); - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #ffffff; @@ -682,14 +682,14 @@ p { height: vh(35); background: #ffffff; border-radius: vw(15); - font-size: vw(14); + font-size: vb(14); font-family: Source Han Regular CN; font-weight: 400; color: #b1b6bf; } .el-input__icon { margin: vh(-4) 0 0 0; - font-size: vw(16); + font-size: vb(16); cursor: pointer; /*改变鼠标样式为手型*/ } } @@ -714,7 +714,7 @@ p { border-radius: 50%; background-color: #ff0000; - font-size: vw(12); + font-size: vb(12); transform: scale(0.73); font-family: DIN-Regular; font-weight: 400; @@ -742,7 +742,7 @@ p { span { position: relative; z-index: 1; - font-size: vw(18); + font-size: vb(18); font-family: Source Han Regular CN; font-weight: 400; color: #ffffff;