diff --git a/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.otf b/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.otf new file mode 100644 index 00000000..ee99a202 Binary files /dev/null and b/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.otf differ diff --git a/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.ttf b/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.ttf new file mode 100644 index 00000000..b20919e5 Binary files /dev/null and b/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.ttf differ diff --git a/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.woff b/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.woff new file mode 100644 index 00000000..15cc8913 Binary files /dev/null and b/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.woff differ diff --git a/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.woff2 b/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.woff2 new file mode 100644 index 00000000..dde2f11e Binary files /dev/null and b/klp-ui/src/assets/fonts/alimama/AlimamaShuHeiTi-Bold.woff2 differ diff --git a/klp-ui/src/assets/fonts/alimama/INSTRUCTION.txt b/klp-ui/src/assets/fonts/alimama/INSTRUCTION.txt new file mode 100644 index 00000000..2632a36e --- /dev/null +++ b/klp-ui/src/assets/fonts/alimama/INSTRUCTION.txt @@ -0,0 +1,19 @@ +A. 在哪里可以下载阿里妈妈数黑体? +渠道一:https://www.iconfont.cn/fonts/detail?cnid=a9fXc2HD9n7s +渠道二:fonts.alibabagroup.com + + +B. 阿里阿里妈妈数黑体简介 +基本信息:阿里妈妈数黑体为中文简体字库,收纳的中文字符包括但不限于GB2312,共计6767个汉字;英文大小写共52个;常用标点符号共206个,总计7025个字符。 + +设计说明:阿里妈妈数黑体字型饱满、体态中正,布白极具现代韵律,落笔厚实而简练;字里行间流露出先锋、前卫和时尚的视觉感受。适用于电商、广告、品牌形象、推广物料等场景。 + +C. 使用反馈、商业合作等问题,请email: +alimama-font@list.alibaba-inc.com +—— +重要!安装前请先阅读此文档 +请先按照下面流程安装文件夹里的字体包。 + +1. 打开字体文件夹,根据不同系统需要选择OTF或TTF版本 + +2. 字体所包含只有一个字重(双击安装)。 \ No newline at end of file diff --git a/klp-ui/src/assets/fonts/alimama/LICENSE.txt b/klp-ui/src/assets/fonts/alimama/LICENSE.txt new file mode 100644 index 00000000..9dab4f58 --- /dev/null +++ b/klp-ui/src/assets/fonts/alimama/LICENSE.txt @@ -0,0 +1,15 @@ +阿里妈妈数黑体法律声明 + +1. 阿里妈妈数黑体字体及包含该字体的字库软件,合称“阿里妈妈数黑体”。 + +2. 阿里妈妈数黑体的知识产权和相关权益归属于淘宝(中国)软件有限公司(以下简称“阿里妈妈”),受《中华人民共和国著作权法》及其他适用法律法规、国际公约、条约的保护。 + +3. 阿里妈妈授权个人、企业等用户在遵守本声明相关条款的前提下,可以下载、安装和使用上述阿里妈妈字体,该授权是免费的普通许可,用户可基于合法目的用于商业用途或非商业用途,但不得以任何违反本声明第4条及法律法规、政策、规章或公序良俗的方式使用。 + +4. 除本法律声明中明确授权之外,阿里妈妈未授予用户关于阿里妈妈数黑体的其他权利。未经阿里妈妈授权,任何人不得:1)对阿里妈妈数黑体进行仿制、转换、翻译、反编译、反向工程、拆分、破解或以其他方式试图从该字库软件获取源代码;2)删除、覆盖或修改阿里妈妈数黑体法律声明的全部或部分内容;3)将阿里妈妈数黑体进行单独定价出售、出租、出借、转让、转授权、或采取其他未经阿里妈妈授权的行为;4) 发布任何使外界误认其与阿里妈妈或其关联公司存在合作、赞助或背书等商业关联的不实信息。 + +5. 阿里妈妈授予用户的上述授权不附带任何明示或暗示的保证,不对任何人因从非阿里妈妈官方渠道或指定渠道下载、安装或使用阿里妈妈数黑体而引发的任何直接或间接损失承担责任。 + +6. 本声明的解释、履行与争议解决适用中华人民共和国的法律。用户与阿里妈妈就阿里妈妈数黑体的使用若发生争议,双方应友好协商,若协商不成,任一方有权向浙江省杭州市有管辖权的人民法院提起诉讼。 + +反馈与咨询联系方:alimama-font@list.alibaba-inc.com \ No newline at end of file diff --git a/klp-ui/src/views/crm/contract/components/ProductContent.vue b/klp-ui/src/views/crm/contract/components/ProductContent.vue index 2767e2ea..616f4def 100644 --- a/klp-ui/src/views/crm/contract/components/ProductContent.vue +++ b/klp-ui/src/views/crm/contract/components/ProductContent.vue @@ -53,31 +53,31 @@
-
-
-
-
- +
-
- +
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ForgeTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ForgeTagPreview.vue deleted file mode 100644 index cff9f4bd..00000000 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/ForgeTagPreview.vue +++ /dev/null @@ -1,121 +0,0 @@ - - - - - diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue index a9351b53..b4435fde 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue @@ -15,12 +15,12 @@ ">
料卷号
{{ content.enterCoilNo || '' }}
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/SaltSprayTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/SaltSprayTagPreview.vue deleted file mode 100644 index 8be09084..00000000 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/SaltSprayTagPreview.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - - - diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/SampleTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/SampleTagPreview.vue deleted file mode 100644 index 455618da..00000000 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/SampleTagPreview.vue +++ /dev/null @@ -1,123 +0,0 @@ - - - - - diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue index 30ebe5e4..6841e4ce 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue @@ -6,11 +6,11 @@
钢卷号
-
+
{{ content.currentCoilNo || '' }}
原料号
-
+
{{ content.enterCoilNo || '' }}
@@ -240,6 +240,10 @@ export default { justify-content: center; } +.current-coil-no, .enter-coil-no { + font-size: 1em !important; +} + .qrcode-container { width: 80%; height: 80%; diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue index 44eee28b..3dee72a6 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue @@ -256,12 +256,13 @@ export default { justify-content: center; font-weight: 900; color: #000; + font-family: var(--label-font); font-size: 1.2em; } .current-coil-no, .enter-coil-no { - font-size: 1.1em !important; + font-size: 1em !important; } diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue index ff6ee320..e209332b 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue @@ -262,7 +262,7 @@ export default { } .current-coil-no, .enter-coil-no { - font-size: 1.1em !important; + font-size: 1em !important; } diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/label-common.css b/klp-ui/src/views/wms/coil/panels/LabelRender/label-common.css index f3c778cc..f7843699 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/label-common.css +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/label-common.css @@ -1,3 +1,14 @@ -:root { - --label-font: '黑体', 'Courier New', 'SimSun', serif; +@font-face { + font-family: 'AlimamaShuHeiTi-Bold'; + src: url('../../../../../assets/fonts/alimama/AlimamaShuHeiTi-Bold.woff2') format('woff2'), + url('../../../../../assets/fonts/alimama/AlimamaShuHeiTi-Bold.woff') format('woff'), + url('../../../../../assets/fonts/alimama/AlimamaShuHeiTi-Bold.ttf') format('truetype'), + url('../../../../../assets/fonts/alimama/AlimamaShuHeiTi-Bold.otf') format('opentype'); + font-weight: 700; + font-style: normal; + font-display: swap; +} + +:root { + --label-font: 'AlimamaShuHeiTi-Bold', '黑体', 'SimSun', serif; }