diff --git a/package.json b/package.json index abec74b..45c0802 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "bpmn-js": "16.4.0", "clipboard": "2.0.11", "crypto-js": "4.2.0", + "dayjs": "^1.11.13", "diagram-js": "12.3.0", "didi": "9.0.2", "echarts": "5.5.0", @@ -41,9 +42,11 @@ "image-conversion": "^2.1.1", "js-beautify": "1.14.11", "js-cookie": "3.0.5", + "jsbarcode": "^3.11.6", "jsencrypt": "3.3.2", "nprogress": "0.2.0", "pinia": "2.1.7", + "qrcode": "^1.5.4", "screenfull": "6.0.2", "uuid": "^11.0.5", "vform3-builds": "^3.0.10", diff --git a/src/views/print/file/img.png b/src/views/print/file/img.png new file mode 100644 index 0000000..638f064 Binary files /dev/null and b/src/views/print/file/img.png differ diff --git a/src/views/print/index.vue b/src/views/print/index.vue index 7dafd88..9204a84 100644 --- a/src/views/print/index.vue +++ b/src/views/print/index.vue @@ -63,6 +63,22 @@ + + + + @@ -91,6 +107,10 @@ import { StarFilled } from '@element-plus/icons-vue'; import tool, { options } from './tool'; import AreaNode from './nodes/areaNode.vue'; import TextNode from './nodes/textNode.vue'; +import ImageNode from './nodes/image.vue'; +import BarCodeNode from './nodes/barCodeNode.vue'; +import QRCodeNode from './nodes/QRCodeNode.vue'; +import TimeNode from './nodes/timeNode.vue'; const router = useRouter(); // 获取自定义的方法 diff --git a/src/views/print/nodes/QRCodeNode.vue b/src/views/print/nodes/QRCodeNode.vue new file mode 100644 index 0000000..42677ff --- /dev/null +++ b/src/views/print/nodes/QRCodeNode.vue @@ -0,0 +1,59 @@ + + + + diff --git a/src/views/print/nodes/barCodeNode.vue b/src/views/print/nodes/barCodeNode.vue new file mode 100644 index 0000000..1c73898 --- /dev/null +++ b/src/views/print/nodes/barCodeNode.vue @@ -0,0 +1,64 @@ + + + + diff --git a/src/views/print/nodes/image.vue b/src/views/print/nodes/image.vue index 72e0983..957e1ed 100644 --- a/src/views/print/nodes/image.vue +++ b/src/views/print/nodes/image.vue @@ -7,12 +7,14 @@
- +
+ + diff --git a/src/views/print/tool.js b/src/views/print/tool.js index 6fd3f09..61ecafe 100644 --- a/src/views/print/tool.js +++ b/src/views/print/tool.js @@ -22,8 +22,14 @@ const getOption = (e) => { } }; const getNodeSize = (e) => { - if (e === 'line' || e === 'multiLines' || e === 'bar' || e === 'multiBars' || e === 'curve' || e === 'multiCurves' || e === 'customBoard' || e === 'pie') { + if (e === 'text') { return { width: cmToPx(5), height: cmToPx(2) }; + } else if (e === 'image') { + return { width: cmToPx(5), height: cmToPx(5) }; + } else if (e === 'barCode') { + return { width: cmToPx(5), height: cmToPx(2) }; + } else if (e === 'QRCode') { + return { width: cmToPx(5), height: cmToPx(5) }; } else { return { width: cmToPx(5), height: cmToPx(2) }; }