diff --git a/src/assets/font/PingfangScMedium.otf b/src/assets/font/PingfangScMedium.otf new file mode 100644 index 0000000..f40327f Binary files /dev/null and b/src/assets/font/PingfangScMedium.otf differ diff --git a/src/assets/font/font.css b/src/assets/font/font.css index 4346981..bc44302 100644 --- a/src/assets/font/font.css +++ b/src/assets/font/font.css @@ -39,3 +39,10 @@ font-weight: normal; font-style: normal; } + +@font-face { + font-family: 'PingFang SC'; + src: url('~@assets/font/PingfangScMedium.otf'); + font-weight: normal; + font-style: normal; +} diff --git a/src/assets/less/common.less b/src/assets/less/common.less index f1e8e9c..6d9bb62 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -456,6 +456,10 @@ button.ant-btn { } .info-row.info-row-inline { display: inline-flex; + + .info-label { + font-family: Rubik, Rubik, sans-serif; + } } .info-row .info-label { flex: auto; @@ -474,6 +478,7 @@ button.ant-btn { font-family: Rubik, Rubik, sans-serif; font-weight: 400; font-size: 14px; + line-height: 16px; color: @text-color; } .over-text { diff --git a/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue b/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue index f7adc1f..6cc0be9 100644 --- a/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue +++ b/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue @@ -79,7 +79,7 @@ -
+
工作状态
运行