diff --git a/src/assets/privateOrder/common/topic2.png b/src/assets/privateOrder/common/topic2.png new file mode 100644 index 0000000..feaa0a3 Binary files /dev/null and b/src/assets/privateOrder/common/topic2.png differ diff --git a/src/assets/privateOrder/general/APT.png b/src/assets/privateOrder/general/APT.png new file mode 100644 index 0000000..8cf30c5 Binary files /dev/null and b/src/assets/privateOrder/general/APT.png differ diff --git a/src/assets/privateOrder/general/云监测.png b/src/assets/privateOrder/general/云监测.png new file mode 100644 index 0000000..63cd7cd Binary files /dev/null and b/src/assets/privateOrder/general/云监测.png differ diff --git a/src/assets/privateOrder/general/数据来源BG2.png b/src/assets/privateOrder/general/数据来源BG2.png new file mode 100644 index 0000000..69f03f1 Binary files /dev/null and b/src/assets/privateOrder/general/数据来源BG2.png differ diff --git a/src/assets/privateOrder/general/数据来源BG3.png b/src/assets/privateOrder/general/数据来源BG3.png new file mode 100644 index 0000000..a44861c Binary files /dev/null and b/src/assets/privateOrder/general/数据来源BG3.png differ diff --git a/src/assets/privateOrder/general/数据来源bg.png b/src/assets/privateOrder/general/数据来源bg.png new file mode 100644 index 0000000..18c4803 Binary files /dev/null and b/src/assets/privateOrder/general/数据来源bg.png differ diff --git a/src/assets/privateOrder/general/硬探针.png b/src/assets/privateOrder/general/硬探针.png index e34ff18..aea1d4c 100644 Binary files a/src/assets/privateOrder/general/硬探针.png and b/src/assets/privateOrder/general/硬探针.png differ diff --git a/src/assets/privateOrder/general/系统监测.png b/src/assets/privateOrder/general/系统监测.png index b06dde9..8917e5a 100644 Binary files a/src/assets/privateOrder/general/系统监测.png and b/src/assets/privateOrder/general/系统监测.png differ diff --git a/src/assets/privateOrder/general/软探针.png b/src/assets/privateOrder/general/软探针.png index 687095d..1f9cc28 100644 Binary files a/src/assets/privateOrder/general/软探针.png and b/src/assets/privateOrder/general/软探针.png differ diff --git a/src/styles/font/Alibaba-PuHuiTi-Bold.otf b/src/styles/font/Alibaba-PuHuiTi-Bold.otf new file mode 100644 index 0000000..ceabfc8 Binary files /dev/null and b/src/styles/font/Alibaba-PuHuiTi-Bold.otf differ diff --git a/src/styles/font/Alibaba-PuHuiTi-Heavy.otf b/src/styles/font/Alibaba-PuHuiTi-Heavy.otf new file mode 100644 index 0000000..ceabfc8 Binary files /dev/null and b/src/styles/font/Alibaba-PuHuiTi-Heavy.otf differ diff --git a/src/styles/font/Alibaba-PuHuiTi-Light.otf b/src/styles/font/Alibaba-PuHuiTi-Light.otf new file mode 100644 index 0000000..ceabfc8 Binary files /dev/null and b/src/styles/font/Alibaba-PuHuiTi-Light.otf differ diff --git a/src/styles/font/Alibaba-PuHuiTi-Medium.otf b/src/styles/font/Alibaba-PuHuiTi-Medium.otf new file mode 100644 index 0000000..ceabfc8 Binary files /dev/null and b/src/styles/font/Alibaba-PuHuiTi-Medium.otf differ diff --git a/src/styles/font/Alibaba-PuHuiTi-Regular.otf b/src/styles/font/Alibaba-PuHuiTi-Regular.otf new file mode 100644 index 0000000..ceabfc8 Binary files /dev/null and b/src/styles/font/Alibaba-PuHuiTi-Regular.otf differ diff --git a/src/styles/font/DIN.ttf b/src/styles/font/DIN.ttf new file mode 100644 index 0000000..7a54ed1 Binary files /dev/null and b/src/styles/font/DIN.ttf differ diff --git a/src/styles/font/font.css b/src/styles/font/font.css index 8108d4d..180f859 100644 --- a/src/styles/font/font.css +++ b/src/styles/font/font.css @@ -180,3 +180,47 @@ font-weight: normal; font-style: normal; } + +@font-face { + font-family: AlibabaPuHuiTiB; + src: url("Alibaba-PuHuiTi-Bold.otf"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: AlibabaPuHuiTiH; + src: url("Alibaba-PuHuiTi-Heavy.otf"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: AlibabaPuHuiTiR; + src: url("Alibaba-PuHuiTi-Regular.otf"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: AlibabaPuHuiTiL; + src: url("Alibaba-PuHuiTi-Light.otf"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: AlibabaPuHuiTiM; + src: url("Alibaba-PuHuiTi-Medium.otf"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: DIN; + src: url("DIN.ttf"); + font-weight: normal; + font-style: normal; +} + + diff --git a/src/views/privateOrder/common/ModuleTitle.vue b/src/views/privateOrder/common/ModuleTitle.vue index e1d9852..9520b59 100644 --- a/src/views/privateOrder/common/ModuleTitle.vue +++ b/src/views/privateOrder/common/ModuleTitle.vue @@ -28,20 +28,23 @@ export default {