diff --git a/src/utils/printUtils.ts b/src/utils/printUtils.ts
index 07c9d75..c1cb904 100644
--- a/src/utils/printUtils.ts
+++ b/src/utils/printUtils.ts
@@ -42,7 +42,7 @@
* @param style 打印样式
* @param ignoreElements 忽略元素id列表
*/
-export function printImage(image: string, header?: string, style?: string) {
+export function printImage_margins(image: string, header?: string, style?: string) {
printJS({
printable: image, // 标签元素id
type: 'image', // 打印类型
@@ -52,6 +52,13 @@
})
}
+export function printImage(image: string) {
+ printJS({
+ printable: image, // 标签元素id
+ type: 'image', // 打印类型
+ })
+}
+
/**
* 打印pdf
* @param pdfUrl
diff --git a/src/utils/printUtils.ts b/src/utils/printUtils.ts
index 07c9d75..c1cb904 100644
--- a/src/utils/printUtils.ts
+++ b/src/utils/printUtils.ts
@@ -42,7 +42,7 @@
* @param style 打印样式
* @param ignoreElements 忽略元素id列表
*/
-export function printImage(image: string, header?: string, style?: string) {
+export function printImage_margins(image: string, header?: string, style?: string) {
printJS({
printable: image, // 标签元素id
type: 'image', // 打印类型
@@ -52,6 +52,13 @@
})
}
+export function printImage(image: string) {
+ printJS({
+ printable: image, // 标签元素id
+ type: 'image', // 打印类型
+ })
+}
+
/**
* 打印pdf
* @param pdfUrl
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 2f14010..e7f7fb4 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -476,7 +476,8 @@
任务分发
-
+
+
退回
diff --git a/src/utils/printUtils.ts b/src/utils/printUtils.ts
index 07c9d75..c1cb904 100644
--- a/src/utils/printUtils.ts
+++ b/src/utils/printUtils.ts
@@ -42,7 +42,7 @@
* @param style 打印样式
* @param ignoreElements 忽略元素id列表
*/
-export function printImage(image: string, header?: string, style?: string) {
+export function printImage_margins(image: string, header?: string, style?: string) {
printJS({
printable: image, // 标签元素id
type: 'image', // 打印类型
@@ -52,6 +52,13 @@
})
}
+export function printImage(image: string) {
+ printJS({
+ printable: image, // 标签元素id
+ type: 'image', // 打印类型
+ })
+}
+
/**
* 打印pdf
* @param pdfUrl
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 2f14010..e7f7fb4 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -476,7 +476,8 @@
任务分发
-
+
+
退回
diff --git a/src/views/business/taskMeasure/print/components/canvas/canvas.vue b/src/views/business/taskMeasure/print/components/canvas/canvas.vue
index bab554c..0faeb4d 100644
--- a/src/views/business/taskMeasure/print/components/canvas/canvas.vue
+++ b/src/views/business/taskMeasure/print/components/canvas/canvas.vue
@@ -7,7 +7,7 @@
const props = defineProps({
width: {
type: Number,
- default: 300,
+ default: 550,
},
height: {
type: Number,
@@ -90,7 +90,7 @@
watch(() => props.printForm, (printContent) => {
console.log('生成二维码的设备id:', printContent.equipmentId)
const codeUrl = useCreateQr(printContent.equipmentId)
- // const codeUrl = useCreateQr('1745008578843930626')
+ // const codeUrl = useCreateQr('1743119306968838146')
// 获取签名
// getAutographList(printContent.userId).then(() => {
// // 获取签名图片的文件
@@ -107,41 +107,41 @@
ctx.fillStyle = 'transparent'
ctx.fillRect(0, 0, props.width, props.height)
- // 编号
+ // 出厂编号
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText('', 140, 100)
ctx.fillText(printContent.manufactureNo, 140, 100)
- // ctx.fillText('C212947893', 140, 100)
+ // ctx.fillText('220215934', 140, 100)
// 年
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.year, 140, 140)
- // ctx.fillText('2025', 140, 140)
+ // ctx.fillText('2026', 140, 140)
// 月
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.month, 240, 140)
- // ctx.fillText('05', 240, 140)
+ // ctx.fillText('05', 243, 140)
// 日
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.day, 300, 140)
- // ctx.fillText('09', 300, 140)
+ // ctx.fillText('19', 304, 140)
// 人名
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.personName, 140, 180)
- // ctx.fillText('李翔宇', 140, 180)
+ // ctx.fillText('李翔宇', 140, 180
ctx.drawImage(imageCode, 420, 20, 160, 160)
// ctx.drawImage(imageSign, 140, 150, 40, 100)
diff --git a/src/utils/printUtils.ts b/src/utils/printUtils.ts
index 07c9d75..c1cb904 100644
--- a/src/utils/printUtils.ts
+++ b/src/utils/printUtils.ts
@@ -42,7 +42,7 @@
* @param style 打印样式
* @param ignoreElements 忽略元素id列表
*/
-export function printImage(image: string, header?: string, style?: string) {
+export function printImage_margins(image: string, header?: string, style?: string) {
printJS({
printable: image, // 标签元素id
type: 'image', // 打印类型
@@ -52,6 +52,13 @@
})
}
+export function printImage(image: string) {
+ printJS({
+ printable: image, // 标签元素id
+ type: 'image', // 打印类型
+ })
+}
+
/**
* 打印pdf
* @param pdfUrl
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 2f14010..e7f7fb4 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -476,7 +476,8 @@
任务分发
-
+
+
退回
diff --git a/src/views/business/taskMeasure/print/components/canvas/canvas.vue b/src/views/business/taskMeasure/print/components/canvas/canvas.vue
index bab554c..0faeb4d 100644
--- a/src/views/business/taskMeasure/print/components/canvas/canvas.vue
+++ b/src/views/business/taskMeasure/print/components/canvas/canvas.vue
@@ -7,7 +7,7 @@
const props = defineProps({
width: {
type: Number,
- default: 300,
+ default: 550,
},
height: {
type: Number,
@@ -90,7 +90,7 @@
watch(() => props.printForm, (printContent) => {
console.log('生成二维码的设备id:', printContent.equipmentId)
const codeUrl = useCreateQr(printContent.equipmentId)
- // const codeUrl = useCreateQr('1745008578843930626')
+ // const codeUrl = useCreateQr('1743119306968838146')
// 获取签名
// getAutographList(printContent.userId).then(() => {
// // 获取签名图片的文件
@@ -107,41 +107,41 @@
ctx.fillStyle = 'transparent'
ctx.fillRect(0, 0, props.width, props.height)
- // 编号
+ // 出厂编号
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText('', 140, 100)
ctx.fillText(printContent.manufactureNo, 140, 100)
- // ctx.fillText('C212947893', 140, 100)
+ // ctx.fillText('220215934', 140, 100)
// 年
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.year, 140, 140)
- // ctx.fillText('2025', 140, 140)
+ // ctx.fillText('2026', 140, 140)
// 月
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.month, 240, 140)
- // ctx.fillText('05', 240, 140)
+ // ctx.fillText('05', 243, 140)
// 日
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.day, 300, 140)
- // ctx.fillText('09', 300, 140)
+ // ctx.fillText('19', 304, 140)
// 人名
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.personName, 140, 180)
- // ctx.fillText('李翔宇', 140, 180)
+ // ctx.fillText('李翔宇', 140, 180
ctx.drawImage(imageCode, 420, 20, 160, 160)
// ctx.drawImage(imageSign, 140, 150, 40, 100)
diff --git a/src/views/business/taskMeasure/print/components/canvas/canvasBak.vue b/src/views/business/taskMeasure/print/components/canvas/canvasBak.vue
new file mode 100644
index 0000000..bab554c
--- /dev/null
+++ b/src/views/business/taskMeasure/print/components/canvas/canvasBak.vue
@@ -0,0 +1,165 @@
+
+
+
+
+
+
diff --git a/src/utils/printUtils.ts b/src/utils/printUtils.ts
index 07c9d75..c1cb904 100644
--- a/src/utils/printUtils.ts
+++ b/src/utils/printUtils.ts
@@ -42,7 +42,7 @@
* @param style 打印样式
* @param ignoreElements 忽略元素id列表
*/
-export function printImage(image: string, header?: string, style?: string) {
+export function printImage_margins(image: string, header?: string, style?: string) {
printJS({
printable: image, // 标签元素id
type: 'image', // 打印类型
@@ -52,6 +52,13 @@
})
}
+export function printImage(image: string) {
+ printJS({
+ printable: image, // 标签元素id
+ type: 'image', // 打印类型
+ })
+}
+
/**
* 打印pdf
* @param pdfUrl
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 2f14010..e7f7fb4 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -476,7 +476,8 @@
任务分发
-
+
+
退回
diff --git a/src/views/business/taskMeasure/print/components/canvas/canvas.vue b/src/views/business/taskMeasure/print/components/canvas/canvas.vue
index bab554c..0faeb4d 100644
--- a/src/views/business/taskMeasure/print/components/canvas/canvas.vue
+++ b/src/views/business/taskMeasure/print/components/canvas/canvas.vue
@@ -7,7 +7,7 @@
const props = defineProps({
width: {
type: Number,
- default: 300,
+ default: 550,
},
height: {
type: Number,
@@ -90,7 +90,7 @@
watch(() => props.printForm, (printContent) => {
console.log('生成二维码的设备id:', printContent.equipmentId)
const codeUrl = useCreateQr(printContent.equipmentId)
- // const codeUrl = useCreateQr('1745008578843930626')
+ // const codeUrl = useCreateQr('1743119306968838146')
// 获取签名
// getAutographList(printContent.userId).then(() => {
// // 获取签名图片的文件
@@ -107,41 +107,41 @@
ctx.fillStyle = 'transparent'
ctx.fillRect(0, 0, props.width, props.height)
- // 编号
+ // 出厂编号
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText('', 140, 100)
ctx.fillText(printContent.manufactureNo, 140, 100)
- // ctx.fillText('C212947893', 140, 100)
+ // ctx.fillText('220215934', 140, 100)
// 年
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.year, 140, 140)
- // ctx.fillText('2025', 140, 140)
+ // ctx.fillText('2026', 140, 140)
// 月
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.month, 240, 140)
- // ctx.fillText('05', 240, 140)
+ // ctx.fillText('05', 243, 140)
// 日
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.day, 300, 140)
- // ctx.fillText('09', 300, 140)
+ // ctx.fillText('19', 304, 140)
// 人名
ctx.font = '32px Arial'
ctx.fillStyle = 'black'
// 绘制文本
ctx.fillText(printContent.personName, 140, 180)
- // ctx.fillText('李翔宇', 140, 180)
+ // ctx.fillText('李翔宇', 140, 180
ctx.drawImage(imageCode, 420, 20, 160, 160)
// ctx.drawImage(imageSign, 140, 150, 40, 100)
diff --git a/src/views/business/taskMeasure/print/components/canvas/canvasBak.vue b/src/views/business/taskMeasure/print/components/canvas/canvasBak.vue
new file mode 100644
index 0000000..bab554c
--- /dev/null
+++ b/src/views/business/taskMeasure/print/components/canvas/canvasBak.vue
@@ -0,0 +1,165 @@
+
+
+
+
+
+
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index dcdf9b0..1f158e5 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -189,6 +189,7 @@
placeholder="标准类型"
class="short-input"
filterable
+ clearable
>
@@ -210,6 +211,7 @@
placeholder="负责人"
class="short-input"
filterable
+ clearable
>