-
- 单位: {{ data.companyName }}
+
+
+ 单位: {{ data.companyName }}
+
-
-
-
- 负责人: {{ data.directorName }}
+
+
+ 负责人: {{ data.directorName }}
+
@@ -72,35 +74,37 @@
width: 60mm;
height: 30mm;
display: flex;
- // padding: 10mm 0;
- // border: 1mm solid #ccc;
+ padding: 0 1.6mm;
.left-info {
- height: 30mm;
+ // height: 55mm;
display: flex;
- justify-content: space-around;
+ justify-content: center;
flex-direction: column;
- padding: 1.5mm 0;
- padding-left: 2mm;
+ // padding: 1.5mm 0;
+ width: 40mm;
+ // box-sizing: content-box;
+ overflow: hidden;
.info {
display: flex;
- font-size: 3.5mm;
+ font-size: 3mm;
font-family: "华文黑体";
}
}
.right-con {
- // padding-top: 10mm;
- height: 30mm;
+ box-sizing: content-box;
+ // padding-top: 2mm;
+ height: 28mm;
display: flex;
- justify-content: space-around;
+ justify-content: center;
flex-direction: column;
- padding-left: 2mm;
+ padding-left: 1mm;
.canvas {
- width: 13.8mm;
- height: 15mm;
+ width: 20mm;
+ height: 20mm;
}
}
}
diff --git a/src/assets/icons/icon-qrcode.svg b/src/assets/icons/icon-qrcode.svg
new file mode 100644
index 0000000..970d6a0
--- /dev/null
+++ b/src/assets/icons/icon-qrcode.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-rfid.svg b/src/assets/icons/icon-rfid.svg
new file mode 100644
index 0000000..858dc3c
--- /dev/null
+++ b/src/assets/icons/icon-rfid.svg
@@ -0,0 +1 @@
+
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 159dee7..8c582f5 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -266,7 +266,7 @@
-
+
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 6a9b44b..f536dcb 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -233,9 +233,9 @@
-
+
批量增加
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 4741aed..8fa6d8d 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -1104,7 +1104,7 @@
- 扫描
+ RFID扫描
diff --git a/src/views/tested/device/info/components/infoTable.vue b/src/views/tested/device/info/components/infoTable.vue
index c654641..a2b2764 100644
--- a/src/views/tested/device/info/components/infoTable.vue
+++ b/src/views/tested/device/info/components/infoTable.vue
@@ -96,9 +96,9 @@
-
+
增加行
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 99b8172..b3483a7 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -1003,7 +1003,8 @@
printable: 'printDiv',
type: 'html',
// targetStyles: ['*'],
- style: '@page {margin:1mm 0mm ;resolution: 500dpi;}',
+ // style: '@page {margin:0mm 0mm ;resolution: 1000dpi;}',
+ style: '@media print { @page {size: auto; margin: 0.2mm;resolution: 1000dpi; } body{margin:0 0px}}',
// onPrintDialogClose: true,
// targetStyles: ['*'], // 使用dom的所有样式,很重要
targetStyle: '*',
@@ -1226,7 +1227,7 @@
-
+
diff --git a/src/views/tested/device/info/components/printTag.vue b/src/views/tested/device/info/components/printTag.vue
index 47b4d0b..c7ba4b4 100644
--- a/src/views/tested/device/info/components/printTag.vue
+++ b/src/views/tested/device/info/components/printTag.vue
@@ -32,29 +32,31 @@
-
-
- 名称: {{ data.equipmentName }}
+
+
+
+ 名称: {{ data.equipmentName }}
+
-
-
-
- 型号: {{ data.model }}
+
+
+ 型号: {{ data.model }}
+
-
-
-
- 编号: {{ data.equipmentNo }}
+
+
+ 编号: {{ data.manufactureNo }}
+
-
-
-
- 单位: {{ data.companyName }}
+
+
+ 单位: {{ data.companyName }}
+
-
-
-
- 负责人: {{ data.directorName }}
+
+
+ 负责人: {{ data.directorName }}
+
@@ -72,35 +74,37 @@
width: 60mm;
height: 30mm;
display: flex;
- // padding: 10mm 0;
- // border: 1mm solid #ccc;
+ padding: 0 1.6mm;
.left-info {
- height: 30mm;
+ // height: 55mm;
display: flex;
- justify-content: space-around;
+ justify-content: center;
flex-direction: column;
- padding: 1.5mm 0;
- padding-left: 2mm;
+ // padding: 1.5mm 0;
+ width: 40mm;
+ // box-sizing: content-box;
+ overflow: hidden;
.info {
display: flex;
- font-size: 3.5mm;
+ font-size: 3mm;
font-family: "华文黑体";
}
}
.right-con {
- // padding-top: 10mm;
- height: 30mm;
+ box-sizing: content-box;
+ // padding-top: 2mm;
+ height: 28mm;
display: flex;
- justify-content: space-around;
+ justify-content: center;
flex-direction: column;
- padding-left: 2mm;
+ padding-left: 1mm;
.canvas {
- width: 13.8mm;
- height: 15mm;
+ width: 20mm;
+ height: 20mm;
}
}
}
diff --git a/src/views/tested/device/info/components/reportTable.vue b/src/views/tested/device/info/components/reportTable.vue
index 58ffee1..7b79326 100644
--- a/src/views/tested/device/info/components/reportTable.vue
+++ b/src/views/tested/device/info/components/reportTable.vue
@@ -122,9 +122,9 @@
-
+
增加行
diff --git a/src/assets/icons/icon-qrcode.svg b/src/assets/icons/icon-qrcode.svg
new file mode 100644
index 0000000..970d6a0
--- /dev/null
+++ b/src/assets/icons/icon-qrcode.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-rfid.svg b/src/assets/icons/icon-rfid.svg
new file mode 100644
index 0000000..858dc3c
--- /dev/null
+++ b/src/assets/icons/icon-rfid.svg
@@ -0,0 +1 @@
+
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 159dee7..8c582f5 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -266,7 +266,7 @@
-
+
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 6a9b44b..f536dcb 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -233,9 +233,9 @@
-
+
批量增加
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 4741aed..8fa6d8d 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -1104,7 +1104,7 @@
- 扫描
+ RFID扫描
diff --git a/src/views/tested/device/info/components/infoTable.vue b/src/views/tested/device/info/components/infoTable.vue
index c654641..a2b2764 100644
--- a/src/views/tested/device/info/components/infoTable.vue
+++ b/src/views/tested/device/info/components/infoTable.vue
@@ -96,9 +96,9 @@
-
+
增加行
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 99b8172..b3483a7 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -1003,7 +1003,8 @@
printable: 'printDiv',
type: 'html',
// targetStyles: ['*'],
- style: '@page {margin:1mm 0mm ;resolution: 500dpi;}',
+ // style: '@page {margin:0mm 0mm ;resolution: 1000dpi;}',
+ style: '@media print { @page {size: auto; margin: 0.2mm;resolution: 1000dpi; } body{margin:0 0px}}',
// onPrintDialogClose: true,
// targetStyles: ['*'], // 使用dom的所有样式,很重要
targetStyle: '*',
@@ -1226,7 +1227,7 @@
-
+
diff --git a/src/views/tested/device/info/components/printTag.vue b/src/views/tested/device/info/components/printTag.vue
index 47b4d0b..c7ba4b4 100644
--- a/src/views/tested/device/info/components/printTag.vue
+++ b/src/views/tested/device/info/components/printTag.vue
@@ -32,29 +32,31 @@
-
-
- 名称: {{ data.equipmentName }}
+
+
+
+ 名称: {{ data.equipmentName }}
+
-
-
-
- 型号: {{ data.model }}
+
+
+ 型号: {{ data.model }}
+
-
-
-
- 编号: {{ data.equipmentNo }}
+
+
+ 编号: {{ data.manufactureNo }}
+
-
-
-
- 单位: {{ data.companyName }}
+
+
+ 单位: {{ data.companyName }}
+
-
-
-
- 负责人: {{ data.directorName }}
+
+
+ 负责人: {{ data.directorName }}
+
@@ -72,35 +74,37 @@
width: 60mm;
height: 30mm;
display: flex;
- // padding: 10mm 0;
- // border: 1mm solid #ccc;
+ padding: 0 1.6mm;
.left-info {
- height: 30mm;
+ // height: 55mm;
display: flex;
- justify-content: space-around;
+ justify-content: center;
flex-direction: column;
- padding: 1.5mm 0;
- padding-left: 2mm;
+ // padding: 1.5mm 0;
+ width: 40mm;
+ // box-sizing: content-box;
+ overflow: hidden;
.info {
display: flex;
- font-size: 3.5mm;
+ font-size: 3mm;
font-family: "华文黑体";
}
}
.right-con {
- // padding-top: 10mm;
- height: 30mm;
+ box-sizing: content-box;
+ // padding-top: 2mm;
+ height: 28mm;
display: flex;
- justify-content: space-around;
+ justify-content: center;
flex-direction: column;
- padding-left: 2mm;
+ padding-left: 1mm;
.canvas {
- width: 13.8mm;
- height: 15mm;
+ width: 20mm;
+ height: 20mm;
}
}
}
diff --git a/src/views/tested/device/info/components/reportTable.vue b/src/views/tested/device/info/components/reportTable.vue
index 58ffee1..7b79326 100644
--- a/src/views/tested/device/info/components/reportTable.vue
+++ b/src/views/tested/device/info/components/reportTable.vue
@@ -122,9 +122,9 @@
-
+
增加行
diff --git a/src/views/tested/device/info/components/roamTable.vue b/src/views/tested/device/info/components/roamTable.vue
index 1018db5..b822d55 100644
--- a/src/views/tested/device/info/components/roamTable.vue
+++ b/src/views/tested/device/info/components/roamTable.vue
@@ -94,9 +94,9 @@
-
+
增加行
diff --git a/src/assets/icons/icon-qrcode.svg b/src/assets/icons/icon-qrcode.svg
new file mode 100644
index 0000000..970d6a0
--- /dev/null
+++ b/src/assets/icons/icon-qrcode.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-rfid.svg b/src/assets/icons/icon-rfid.svg
new file mode 100644
index 0000000..858dc3c
--- /dev/null
+++ b/src/assets/icons/icon-rfid.svg
@@ -0,0 +1 @@
+
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 159dee7..8c582f5 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -266,7 +266,7 @@
-
+
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 6a9b44b..f536dcb 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -233,9 +233,9 @@
-
+
批量增加
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 4741aed..8fa6d8d 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -1104,7 +1104,7 @@
- 扫描
+ RFID扫描
diff --git a/src/views/tested/device/info/components/infoTable.vue b/src/views/tested/device/info/components/infoTable.vue
index c654641..a2b2764 100644
--- a/src/views/tested/device/info/components/infoTable.vue
+++ b/src/views/tested/device/info/components/infoTable.vue
@@ -96,9 +96,9 @@
-
+
增加行
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 99b8172..b3483a7 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -1003,7 +1003,8 @@
printable: 'printDiv',
type: 'html',
// targetStyles: ['*'],
- style: '@page {margin:1mm 0mm ;resolution: 500dpi;}',
+ // style: '@page {margin:0mm 0mm ;resolution: 1000dpi;}',
+ style: '@media print { @page {size: auto; margin: 0.2mm;resolution: 1000dpi; } body{margin:0 0px}}',
// onPrintDialogClose: true,
// targetStyles: ['*'], // 使用dom的所有样式,很重要
targetStyle: '*',
@@ -1226,7 +1227,7 @@
-
+
diff --git a/src/views/tested/device/info/components/printTag.vue b/src/views/tested/device/info/components/printTag.vue
index 47b4d0b..c7ba4b4 100644
--- a/src/views/tested/device/info/components/printTag.vue
+++ b/src/views/tested/device/info/components/printTag.vue
@@ -32,29 +32,31 @@
-
-
- 名称: {{ data.equipmentName }}
+
+
+
+ 名称: {{ data.equipmentName }}
+
-
-
-
- 型号: {{ data.model }}
+
+
+ 型号: {{ data.model }}
+
-
-
-
- 编号: {{ data.equipmentNo }}
+
+
+ 编号: {{ data.manufactureNo }}
+
-
-
-
- 单位: {{ data.companyName }}
+
+
+ 单位: {{ data.companyName }}
+
-
-
-
- 负责人: {{ data.directorName }}
+
+
+ 负责人: {{ data.directorName }}
+
@@ -72,35 +74,37 @@
width: 60mm;
height: 30mm;
display: flex;
- // padding: 10mm 0;
- // border: 1mm solid #ccc;
+ padding: 0 1.6mm;
.left-info {
- height: 30mm;
+ // height: 55mm;
display: flex;
- justify-content: space-around;
+ justify-content: center;
flex-direction: column;
- padding: 1.5mm 0;
- padding-left: 2mm;
+ // padding: 1.5mm 0;
+ width: 40mm;
+ // box-sizing: content-box;
+ overflow: hidden;
.info {
display: flex;
- font-size: 3.5mm;
+ font-size: 3mm;
font-family: "华文黑体";
}
}
.right-con {
- // padding-top: 10mm;
- height: 30mm;
+ box-sizing: content-box;
+ // padding-top: 2mm;
+ height: 28mm;
display: flex;
- justify-content: space-around;
+ justify-content: center;
flex-direction: column;
- padding-left: 2mm;
+ padding-left: 1mm;
.canvas {
- width: 13.8mm;
- height: 15mm;
+ width: 20mm;
+ height: 20mm;
}
}
}
diff --git a/src/views/tested/device/info/components/reportTable.vue b/src/views/tested/device/info/components/reportTable.vue
index 58ffee1..7b79326 100644
--- a/src/views/tested/device/info/components/reportTable.vue
+++ b/src/views/tested/device/info/components/reportTable.vue
@@ -122,9 +122,9 @@
-
+
增加行
diff --git a/src/views/tested/device/info/components/roamTable.vue b/src/views/tested/device/info/components/roamTable.vue
index 1018db5..b822d55 100644
--- a/src/views/tested/device/info/components/roamTable.vue
+++ b/src/views/tested/device/info/components/roamTable.vue
@@ -94,9 +94,9 @@
-
+
增加行
diff --git a/src/views/tested/device/info/components/statusTable.vue b/src/views/tested/device/info/components/statusTable.vue
index 519a854..9fe89a3 100644
--- a/src/views/tested/device/info/components/statusTable.vue
+++ b/src/views/tested/device/info/components/statusTable.vue
@@ -138,9 +138,9 @@
-
+
增加行