From 3daf7343d477d81efa05e2e7d073100f92beb0b2 Mon Sep 17 00:00:00 2001
From: suixy <2277317060@qq.com>
Date: Tue, 6 Jan 2026 16:21:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  84 ++-
 src/api/system/printTemplateList/index.ts     |   5 +-
 src/assets/images/doc.png                     | Bin 0 -> 37999 bytes
 .../images/electricityIcon.svg}               |   0
 src/main.ts                                   |  23 +-
 src/views/boardGenerate/boardList.vue         |   3 -
 .../boardGenerate/nodes/board/annularNode.vue |  20 +-
 .../nodes/board/carouselNode.vue              |   4 +-
 src/views/print/externalPrint.vue             | 493 ++--------------
 src/views/print/index.vue                     | 544 +++++++++++++++++-
 src/views/print/nodes/barCodeNode.vue         |  35 +-
 src/views/print/nodes/inputNode.vue           |  17 +-
 src/views/print/nodes/selectNode.vue          |   1 +
 src/views/print/nodes/textNode.vue            |   7 +-
 src/views/print/nodes/timeNode.vue            |   4 +-
 src/views/print/tool.js                       |  18 +-
 src/views/print/view.vue                      |   4 +-
 17 files changed, 756 insertions(+), 506 deletions(-)
 create mode 100644 src/assets/images/doc.png
 rename src/{views/dms/deviceLubeReport/index.vue => assets/images/electricityIcon.svg} (100%)

diff --git a/package.json b/package.json
index d314f0c..f85680c 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "dev": "vite serve --mode development",
+    "dev": "NODE_TLS_REJECT_UNAUTHORIZED=0 vite serve --mode development",
     "build:prod": "node --max_old_space_size=8192 node_modules/vite/bin/vite.js build --mode production",
     "build:dev": "vite build --mode development",
     "preview": "vite preview",
@@ -126,5 +126,87 @@
     "@vue/runtime-core": "3.5.21",
     "@vue/reactivity": "3.5.21",
     "@vue/shared": "3.5.21"
+  },
+  "json": {
+    "tableData": [
+      {
+        "value1": "DRT10.00R2018PRT105",
+        "value2": "LH514",
+        "value3": 62.15,
+        "value4": 2,
+        "value5": 124.3
+      },
+      {
+        "value1": "TYRELAND11R22.518PREC088",
+        "value2": "LH806",
+        "value3": 48.78,
+        "value4": 2,
+        "value5": 97.56
+      },
+      {
+        "value1": "XBRI295/80R22.518PRXF0RZA",
+        "value2": "LH614",
+        "value3": 67.02,
+        "value4": 1,
+        "value5": 67.02
+      },
+      {
+        "value1": "昆仑12R22.518PRKT988",
+        "value2": "LH909",
+        "value3": 61.49,
+        "value4": 2,
+        "value5": 122.98
+      },
+      {
+        "value1": "昆仑14.00R25★★★KT701",
+        "value2": "LH1107",
+        "value3": 181.45,
+        "value4": 1,
+        "value5": 181.45
+      },
+      {
+        "value1": "昆仑14.00R25★★★KT702",
+        "value2": "LH1203",
+        "value3": 179.53,
+        "value4": 1,
+        "value5": 179.53
+      },
+      {
+        "value1": "昆仑275/80R22.518PRKT878 CK",
+        "value2": "LH414",
+        "value3": 53.31,
+        "value4": 1,
+        "value5": 53.31
+      },
+      {
+        "value1": "昆仑295/80R22.518PRKT852",
+        "value2": "LH611",
+        "value3": 63.07,
+        "value4": 1,
+        "value5": 63.07
+      },
+      {
+        "value1": "昆仑315/80R22.522PRKT851 N2",
+        "value2": "LH206",
+        "value3": 73.59,
+        "value4": 1,
+        "value5": 73.59
+      },
+      {
+        "value1": "昆仑315/80R22.522PRKT890",
+        "value2": "LH410",
+        "value3": 73.69,
+        "value4": 2,
+        "value5": 147.38
+      },
+      {
+        "value1": "昆仑385/65R22.524PRKT186 CK",
+        "value2": "LH313",
+        "value3": 72.01,
+        "value4": 1,
+        "value5": 72.01
+      }
+    ],
+    "total": 10
   }
 }
diff --git a/src/api/system/printTemplateList/index.ts b/src/api/system/printTemplateList/index.ts
index 35311f2..82a8019 100644
--- a/src/api/system/printTemplateList/index.ts
+++ b/src/api/system/printTemplateList/index.ts
@@ -12,7 +12,10 @@ export const listPrintTemplateList = (query?: PrintTemplateListQuery): AxiosProm
   return request({
     url: '/system/printTemplateList/list',
     method: 'get',
-    params: query
+    params: query,
+    headers: {
+      isToken: false,
+    },
   });
 };
 
diff --git a/src/assets/images/doc.png b/src/assets/images/doc.png
new file mode 100644
index 0000000000000000000000000000000000000000..34a6e627dbf64d08e0f449e87ff507198906691d
GIT binary patch
literal 37999
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
bzRVi+T-cH{JF-$gZMXaG-cq*toA3VvDV!Z$

literal 0
HcmV?d00001

diff --git a/src/views/dms/deviceLubeReport/index.vue b/src/assets/images/electricityIcon.svg
similarity index 100%
rename from src/views/dms/deviceLubeReport/index.vue
rename to src/assets/images/electricityIcon.svg
diff --git a/src/main.ts b/src/main.ts
index 120a8d8..b7299b4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -43,8 +43,8 @@ import ElementIcons from '@/plugins/svgicon';
 
 import ElementPlus from 'element-plus';
 import 'element-plus/dist/index.css';
-import VForm3 from 'vform3-builds';
-import 'vform3-builds/dist/designer.style.css';
+// import VForm3 from 'vform3-builds';
+// import 'vform3-builds/dist/designer.style.css';
 
 // permission control
 import './permission';
@@ -53,15 +53,15 @@ import './permission';
 import i18n from '@/lang/index';
 
 // vxeTable
-import VXETable from 'vxe-table';
-import 'vxe-table/lib/style.css';
+// import VXETable from 'vxe-table';
+// import 'vxe-table/lib/style.css';
 
 import print from 'vue3-print-nb';
 
 
-VXETable.config({
-  zIndex: 999999
-});
+// VXETable.config({
+//   zIndex: 999999
+// });
 
 // 修改 el-dialog 默认点击遮照为不关闭
 import { ElDialog } from 'element-plus';
@@ -73,6 +73,11 @@ import { register } from 'swiper/element/bundle';
 import 'swiper/css/bundle';
 
 register();
+
+
+import * as echarts from 'echarts';
+window.echarts = echarts;
+
 const app = createApp(App);
 
 
@@ -93,11 +98,11 @@ app.use(print);
 app.use(HighLight);
 app.use(ElementIcons);
 app.use(ElementPlus);
-app.use(VForm3);
+// app.use(VForm3);
 app.use(router);
 app.use(store);
 app.use(i18n);
-app.use(VXETable);
+// app.use(VXETable);
 app.use(plugins);
 // 自定义指令
 directive(app);
diff --git a/src/views/boardGenerate/boardList.vue b/src/views/boardGenerate/boardList.vue
index 4f1b50d..6bd0281 100644
--- a/src/views/boardGenerate/boardList.vue
+++ b/src/views/boardGenerate/boardList.vue
@@ -71,9 +71,6 @@
 </template>
 <script lang="ts" setup>
 import { useRouter } from 'vue-router';
-import axios from 'axios';
-import request from '@/utils/request';
-import { options } from './tool.js';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { addBoardApi, delBoardApi, editBoardApi, getBoardListApi } from '@/views/boardGenerate/api/boardList';
 
diff --git a/src/views/boardGenerate/nodes/board/annularNode.vue b/src/views/boardGenerate/nodes/board/annularNode.vue
index 953fb0b..dafae92 100644
--- a/src/views/boardGenerate/nodes/board/annularNode.vue
+++ b/src/views/boardGenerate/nodes/board/annularNode.vue
@@ -16,6 +16,24 @@ import { NodeResizer } from '@vue-flow/node-resizer';
 import { Handle, Position } from '@vue-flow/core';
 import * as echarts from 'echarts';
 
+let json = {
+  'tableData': [{
+    'value1': '测试数据1-1',
+    'value2': '测试数据1-2',
+    'value3': '测试数据1-3'
+  }, { 'value1': '测试数据2-1', 'value2': '测试数据2-2', 'value3': '测试数据2-3' }, {
+    'value1': '测试数据3-1',
+    'value2': '测试数据3-2',
+    'value3': '测试数据3-3'
+  }, { 'value1': '测试数据4-1', 'value2': '测试数据4-2', 'value3': '测试数据4-3' }, {
+    'value1': '测试数据5-1',
+    'value2': '测试数据5-2',
+    'value3': '测试数据5-3'
+  }, { 'value1': '测试数据6-1', 'value2': '测试数据6-2', 'value3': '测试数据6-3' }],
+  'total': 10
+};
+
+
 const props = defineProps({
   ratioWidth: {
     type: Number,
@@ -62,7 +80,7 @@ const colorList = ['#9E87FF', '#73DDFF', '#fe9a8b', '#F56948', '#9E87FF'];
 const getOption = () => {
   const chartOption = {
     title: {
-      text: props.data.options.title || '设备运行数量',
+      text: props.data.options.title || ' ',
       textStyle: {
         fontSize: 12,
         fontWeight: 400,
diff --git a/src/views/boardGenerate/nodes/board/carouselNode.vue b/src/views/boardGenerate/nodes/board/carouselNode.vue
index 846ded2..4ffca4f 100644
--- a/src/views/boardGenerate/nodes/board/carouselNode.vue
+++ b/src/views/boardGenerate/nodes/board/carouselNode.vue
@@ -1,7 +1,8 @@
 <template>
   <div
     :style="{width:props.dimensions.width*props.ratioWidth+'px',height:props.dimensions.height*props.ratioHeight+'px'}">
-    <NodeResizer @resizeEnd="(e) => $emit('resize', e)" color="#fff" v-if="!props.isView && !props.isHideHandle && props.selected" @resize="resize" />
+    <NodeResizer @resizeEnd="(e) => $emit('resize', e)" color="#fff"
+                 v-if="!props.isView && !props.isHideHandle && props.selected" @resize="resize" />
 
     <div class="custom-node"
          :style="{width:props.dimensions.width*props.ratioWidth+'px',height:props.dimensions.height*props.ratioHeight+'px',pointerEvents:props.isView?'auto': 'none'}">
@@ -122,7 +123,6 @@ watch(() => [JSON.parse(JSON.stringify(props.data?.options?.carouselImages || '[
     nextTick(() => {
       swiperShow.value = true;
     });
-    console.log(list.value);
   }
 }, { deep: true, immediate: true });
 const emit = defineEmits(['resize']);
diff --git a/src/views/print/externalPrint.vue b/src/views/print/externalPrint.vue
index 4f14793..a3b7975 100644
--- a/src/views/print/externalPrint.vue
+++ b/src/views/print/externalPrint.vue
@@ -6,7 +6,7 @@
                  :style="{display:'inline-block',margin:'0 4px 4px 0'}"
                  :body-style="{padding:'4px 0'}">
           <template #header>
-            <el-image style="width: 100%; height: 100%" :src="lineImg" fit="contain" />
+            <el-image style="width: 100%; height: 100%" :src="doc" fit="contain" />
           </template>
           <div class="moduleText">{{ i.templateName }}</div>
         </el-card>
@@ -17,7 +17,7 @@
         <div
           class="content"
           v-for="pageData in pageDatas"
-          :style="{ pageBreakAfter: 'always', width: cmToPx(pageWidth) + 'px', height: cmToPx(pageHeight) + 'px', marginBottom: '4px' }"
+          :style="{ pageBreakAfter: 'always', width: cmToPx(pageWidth) + 'px', height: cmToPx(pageHeight) + 'px', marginBottom: '4px' ,transform: `scale(${zoom})`}"
         >
           <div v-for="i in nodes" class="node" :style="{ left: i.position?.x + 'px', top: i.position?.y + 'px' }">
             <template v-if="i.type === 'text'">
@@ -88,7 +88,6 @@
       </div>
     </div>
     <div class="right">
-      {{ pageDatas }}
       <el-dropdown split-button type="primary" @click="printFun" @command="switchPrinter" style="margin-right: 8px">
         {{ printName() }}
         <template #dropdown>
@@ -122,8 +121,9 @@ import InputNode from './nodes/inputNode.vue';
 import { useRoute } from 'vue-router';
 import { isJSON } from '@/utils/scrin.js';
 import { listPrintTemplateList } from '@/api/system/printTemplateList/index';
-import lineImg from '@/views/boardGenerate/images/lineImg.png';
+import doc from '@/assets/images/doc.png';
 import { getSysPrintTemplateNodeList } from '@/api/system/printTemplateNode/index';
+import { listPrintTemplateInfo } from '@/api/system/printTemplateInfo/index';
 
 const printTemplateList = ref([]);
 const route = useRoute();
@@ -151,428 +151,9 @@ const printRef = ref();
 const pageWidth = ref(21);
 const pageHeight = ref(29.7);
 const pageDatas = ref([]);
+const zoom = ref(1)
 const { cmToPx } = options;
 const nodes = ref([]);
-let printNode = `[
-  {
-    "id": "area_d14a13ad_1a78_4171_b54f_93d18abd528d",
-    "type": "area",
-    "dimensions": {
-      "width": 794,
-      "height": 1123
-    },
-    "computedPosition": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "handleBounds": {
-      "source": null,
-      "target": null
-    },
-    "selected": false,
-    "dragging": false,
-    "resizing": false,
-    "initialized": false,
-    "isParent": true,
-    "position": {
-      "x": 0,
-      "y": 0
-    },
-    "data": {},
-    "events": {},
-    "name": "area"
-  },
-  {
-    "id": "text_1902a5ff_d7fc_4750_b634_8a88868f3ddb",
-    "type": "text",
-    "dimensions": {
-      "width": 94,
-      "height": 19
-    },
-    "computedPosition": {
-      "x": 151.1811023622047,
-      "y": 37.79527559055118,
-      "z": 1
-    },
-    "handleBounds": {
-      "source": null,
-      "target": null
-    },
-    "selected": false,
-    "dragging": false,
-    "resizing": false,
-    "initialized": false,
-    "isParent": false,
-    "position": {
-      "x": 151.1811023622047,
-      "y": 37.79527559055118
-    },
-    "data": {
-      "options": {
-        "default": "供应商",
-        "border": [
-          {
-            "type": "top",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "right",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "bottom",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "left",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          }
-        ]
-      },
-      "outputData": {}
-    },
-    "events": {},
-    "name": "text",
-    "parentNode": "area_d14a13ad_1a78_4171_b54f_93d18abd528d",
-    "extent": "parent",
-    "style": {
-      "width": "94px",
-      "height": "19px"
-    }
-  },
-  {
-    "id": "text_899234fc_9ace_49c3_8127_fadeabcbd23d",
-    "type": "text",
-    "dimensions": {
-      "width": 94,
-      "height": 19
-    },
-    "computedPosition": {
-      "x": 150.97637795275588,
-      "y": 56.69291338582677,
-      "z": 1
-    },
-    "handleBounds": {
-      "source": null,
-      "target": null
-    },
-    "selected": false,
-    "dragging": false,
-    "resizing": false,
-    "initialized": false,
-    "isParent": false,
-    "position": {
-      "x": 150.97637795275588,
-      "y": 56.69291338582677
-    },
-    "data": {
-      "options": {
-        "default": "客户名称",
-        "border": [
-          {
-            "type": "top",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "right",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "bottom",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "left",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          }
-        ]
-      },
-      "outputData": {}
-    },
-    "events": {},
-    "name": "text",
-    "parentNode": "area_d14a13ad_1a78_4171_b54f_93d18abd528d",
-    "extent": "parent",
-    "style": {
-      "width": "94px",
-      "height": "19px"
-    }
-  },
-  {
-    "id": "text_8da299d4_a35b_4ba9_bfac_860c200b6cf3",
-    "type": "text",
-    "dimensions": {
-      "width": 94,
-      "height": 19
-    },
-    "computedPosition": {
-      "x": 245.66929133858267,
-      "y": 56.69291338582677,
-      "z": 1
-    },
-    "handleBounds": {
-      "source": null,
-      "target": null
-    },
-    "selected": false,
-    "dragging": false,
-    "resizing": false,
-    "initialized": false,
-    "isParent": false,
-    "position": {
-      "x": 245.66929133858267,
-      "y": 56.69291338582677
-    },
-    "data": {
-      "options": {
-        "field": "name",
-        "default": "",
-        "border": [
-          {
-            "type": "top",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "right",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "bottom",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "left",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          }
-        ]
-      },
-      "outputData": {}
-    },
-    "events": {},
-    "name": "text",
-    "parentNode": "area_d14a13ad_1a78_4171_b54f_93d18abd528d",
-    "extent": "parent",
-    "style": {
-      "width": "94px",
-      "height": "19px"
-    }
-  },
-  {
-    "id": "text_5a3a87dd_1697_43a1_9678_f20421e1f3df",
-    "type": "text",
-    "dimensions": {
-      "width": 396,
-      "height": 19
-    },
-    "computedPosition": {
-      "x": 245.66929133858267,
-      "y": 37.79527559055118,
-      "z": 1
-    },
-    "handleBounds": {
-      "source": null,
-      "target": null
-    },
-    "selected": false,
-    "dragging": false,
-    "resizing": false,
-    "initialized": false,
-    "isParent": false,
-    "position": {
-      "x": 245.66929133858267,
-      "y": 37.79527559055118
-    },
-    "data": {
-      "options": {
-        "field": "DONGLONG HOME TEXTILE CO..,LTD.",
-        "default": "DONGLONG HOME TEXTILE CO..,LTD.",
-        "border": [
-          {
-            "type": "top",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "right",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "bottom",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "left",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          }
-        ]
-      },
-      "outputData": {}
-    },
-    "events": {},
-    "name": "text",
-    "parentNode": "area_d14a13ad_1a78_4171_b54f_93d18abd528d",
-    "extent": "parent",
-    "style": {
-      "width": "396px",
-      "height": "19px"
-    }
-  },
-  {
-    "id": "text_e9bde955_7c37_44d0_8c37_265ad44fdd9d",
-    "type": "text",
-    "dimensions": {
-      "width": 75,
-      "height": 19
-    },
-    "computedPosition": {
-      "x": 170.0787401574803,
-      "y": 302.3622047244094,
-      "z": 1
-    },
-    "handleBounds": {
-      "source": null,
-      "target": null
-    },
-    "selected": false,
-    "dragging": false,
-    "resizing": false,
-    "initialized": false,
-    "isParent": false,
-    "position": {
-      "x": 170.0787401574803,
-      "y": 302.3622047244094
-    },
-    "data": {
-      "options": {
-        "field": "deviceName",
-        "default": "",
-        "border": [
-          {
-            "type": "top",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "right",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "bottom",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          },
-          {
-            "type": "left",
-            "isShow": false,
-            "width": 1,
-            "color": "#000",
-            "borderType": "solid"
-          }
-        ]
-      },
-      "outputData": {}
-    },
-    "events": {},
-    "name": "text",
-    "parentNode": "area_d14a13ad_1a78_4171_b54f_93d18abd528d",
-    "extent": "parent",
-    "style": {
-      "width": "75px",
-      "height": "19px"
-    }
-  },
-  {
-    "id": "QRCode_94877b0d_0e26_4a8e_b159_8d99120725a0",
-    "type": "QRCode",
-    "dimensions": {
-      "width": 189,
-      "height": 189
-    },
-    "computedPosition": {
-      "x": 415.74803149606294,
-      "y": 264.56692913385825,
-      "z": 1001
-    },
-    "handleBounds": {
-      "source": null,
-      "target": null
-    },
-    "selected": true,
-    "dragging": false,
-    "resizing": false,
-    "initialized": false,
-    "isParent": false,
-    "position": {
-      "x": 415.74803149606294,
-      "y": 264.56692913385825
-    },
-    "data": {
-      "options": {
-        "default": "123123121"
-      },
-      "outputData": {}
-    },
-    "events": {},
-    "name": "QRCode",
-    "parentNode": "area_d14a13ad_1a78_4171_b54f_93d18abd528d",
-    "extent": "parent"
-  }
-]`;
 const messageFun = (event) => {
   console.log(event);
   // if (isJSON(event.data)) {
@@ -581,8 +162,7 @@ const messageFun = (event) => {
     if (data.type === 'print') {
       printFun();
     }
-    if (data.type === 'JSONDATA') {
-      console.log(88);
+  if (data.type === 'JSONDATA') {
       if (typeof data.message === 'object' && data.message !== null && !Array.isArray(data.message)) {
         pageDatas.value = [data.message];
         // window.chrome?.webview?.postMessage('setDataFinally');
@@ -594,35 +174,37 @@ const messageFun = (event) => {
       }
       console.log('message', data.message);
     }
-    if (data.type === 'setTemplate') {
-      nodes.value = JSON.parse(printNode || '[]');
-    }
   // }
   console.log(event);
 };
 const setNodes = (data) => {
-  // nodes.value = JSON.parse(printNode || '[]');
 
-  getSysPrintTemplateNodeList({ templateInfoId: data.templateInfoId }).then(v => {
-    nodes.value = v.data.map(vv => {
-      return {
-        id: vv.id,
-        type: vv.type,
-        name: vv.name,
-        dimensions: {
-          width: vv.width,
-          height: vv.height
-        },
-        handleBounds: {
-          source: null,
-          target: null
-        },
-        position: {
-          x: vv.x,
-          y: vv.y
-        },
-        data: JSON.parse(vv.data)
-      };
+  listPrintTemplateInfo({ templateListId: data.templateListId }).then(e => {
+    let templateInfoId = e.rows?.[0]?.templateInfoId;
+    getSysPrintTemplateNodeList({ templateInfoId }).then(v => {
+      nodes.value = v.data.map(vv => {
+        return {
+          id: vv.id,
+          type: vv.type,
+          name: vv.name,
+          dimensions: {
+            width: vv.width,
+            height: vv.height
+          },
+          handleBounds: {
+            source: null,
+            target: null
+          },
+          position: {
+            x: vv.x,
+            y: vv.y
+          },
+          data: JSON.parse(vv.data)
+        };
+      });
+      nextTick(() => {
+        zoom.value = ((printRef.value.offsetWidth - 20) / 793)
+      });
     });
   });
 };
@@ -759,6 +341,7 @@ defineExpose({
   background-repeat: no-repeat;
   background-size: 100% 100%;
   border: 1px solid #ccc;
+  transform-origin: top left;
 }
 
 .node {
@@ -767,7 +350,7 @@ defineExpose({
 
 .left {
   display: inline-block;
-  width: 550px;
+  width: 10vw;
   height: 100vh;
   overflow: auto;
   margin-right: 50px;
@@ -775,9 +358,10 @@ defineExpose({
 
 .center {
   display: inline-block;
-  width: calc(100% - 200px - 600px);
+  width: calc(100% - 10vw - 50px);
   height: 100vh;
   overflow: auto;
+  padding-top: 40px;
 
   &::-webkit-scrollbar {
     display: none;
@@ -787,7 +371,10 @@ defineExpose({
 .right {
   vertical-align: top;
   display: inline-block;
-  width: 200px;
+  width: 140px;
+  position: absolute;
+  right: 0;
+  top: 0;
 }
 </style>
 <style>
diff --git a/src/views/print/index.vue b/src/views/print/index.vue
index 47642a7..3dc6b01 100644
--- a/src/views/print/index.vue
+++ b/src/views/print/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="overflow:hidden;">
+  <div style="overflow:hidden;" v-loading="loading">
     <div class="top">
       <div style="line-height: 60px;margin-left: 12px;">
         <el-button-group>
@@ -20,14 +20,15 @@
         <el-input v-model="zoomInput" disabled style="margin-left: 8px;width:100px" />
         <el-button @click="zoomChange(0.1)" icon="ZoomIn" circle style="margin-left: 8px;" />
         <el-button type="primary" @click="view" style="margin-left: 12px;">预览</el-button>
-        <el-button type="primary" @click="imp" style="margin-left: 12px;">场景1</el-button>
+        <!--        <el-button type="primary" @click="imp" style="margin-left: 12px;">场景1</el-button>-->
         <el-button type="primary" @click="save" style="margin-left: 12px;">保存</el-button>
         <el-button type="primary" @click="clear" style="margin-left: 12px;">清空</el-button>
       </div>
     </div>
     <div class="bottom">
       <div class="leftPanel">
-        <h4>基础组件</h4>
+        <!--        <h4>基础组件</h4>-->
+        <h4>组件</h4>
         <el-tag :draggable="true" @dragstart="onDragStart($event, 'text',pid)" class="mx-1" size="large">文字</el-tag>
         <el-tag :draggable="true" @dragstart="onDragStart($event, 'image',pid)" class="mx-1" size="large">图片</el-tag>
         <el-tag :draggable="true" @dragstart="onDragStart($event, 'barCode',pid)" class="mx-1" size="large">条形码
@@ -50,11 +51,11 @@
         <!--        </el-tag>-->
         <!--        <el-tag :draggable="true" @dragstart="onDragStart($event, 'circle',pid)" class="mx-1" size="large">圆形-->
         <!--        </el-tag>-->
-        <h4>表单组件</h4>
-        <el-tag :draggable="true" @dragstart="onDragStart($event, 'text',pid,{name:'deviceName'})" class="mx-1"
-                size="large">
-          设备名称
-        </el-tag>
+        <!--        <h4>表单组件</h4>-->
+        <!--        <el-tag :draggable="true" @dragstart="onDragStart($event, 'text',pid,{name:'deviceName'})" class="mx-1"-->
+        <!--                size="large">-->
+        <!--          设备名称-->
+        <!--        </el-tag>-->
       </div>
       <div class="content" @drop="onDrop">
         <div class="flowArea" :style="{width:zoom * cmToPx(pageWidth)+'px',height:zoom * cmToPx(pageHeight)+'px'}">
@@ -149,6 +150,9 @@
             <el-input-number :min="12" :controls="false" v-model="nodeAttrForm.fontSize"
                              style="width: 100%" />
           </el-form-item>
+          <el-form-item label="是否加粗" v-if="Object.keys(nodeAttrForm).includes('isBold')">
+            <el-switch v-model="nodeAttrForm.isBold" />
+          </el-form-item>
           <el-form-item label="使用字典" v-if="Object.keys(nodeAttrForm).includes('dic')">
             <el-select
               v-model="nodeAttrForm.dic"
@@ -176,6 +180,15 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="时间" v-if="Object.keys(nodeAttrForm).includes('dateTime')">
+            <el-date-picker
+              v-model="nodeAttrForm.dateTime"
+              type="datetime"
+            />
+          </el-form-item>
+          <el-form-item label="时间格式" v-if="Object.keys(nodeAttrForm).includes('dateTimeFormat')">
+            <el-input v-model="nodeAttrForm.dateTimeFormat" style="width: 100%" />
+          </el-form-item>
           <el-form-item v-if="Object.keys(nodeAttrForm).includes('selectOptions')" label="选项集合">
             <el-input-tag
               v-model="nodeAttrForm.selectOptions"
@@ -409,7 +422,7 @@
 </template>
 <script setup lang="ts">
 import { v4 as uuidv4 } from 'uuid';
-import { useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useVueFlow, VueFlow } from '@vue-flow/core';
 import { Background } from '@vue-flow/background';
 import tool, { options } from './tool';
@@ -426,13 +439,499 @@ import { updatePrintTemplateList } from '@/api/system/printTemplateList';
 import { getPrintTemplateInfo, listPrintTemplateInfo, updatePrintTemplateInfo } from '@/api/system/printTemplateInfo';
 import { getPrintTemplateNode, getSysPrintTemplateNodeList, updateTemplateNode } from '@/api/system/printTemplateNode';
 import { listType } from '@/api/system/dict/type';
+import { ElMessage } from 'element-plus';
 
-const router = useRouter();
+
+let obj = [
+  {
+    'templateInfoId': 5,
+    'id': 'text_94b0f100_e009_4f05_8e9e_b5fb47ee1ce9',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 396.8503937007874,
+    'y': 264.56692913385825,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"操作人","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_409bdd88_a0c1_401b_9358_4cf79e44cafc',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 37.79527559055118,
+    'y': 321.25984251968504,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"自检结果","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'select_a7ccbaaf_911c_4c81_ab88_a853503be3b0',
+    'type': 'select',
+    'name': 'select',
+    'width': 245,
+    'height': 56,
+    'x': 510.2362204724409,
+    'y': 264.56692913385825,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"UserListSel","dic":"","default":"","JScript":"","selectField":"UserList","selectOptions":[],"horizontalAlign":"center","verticalAlign":"center","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'select_ee7c1e26_818d_45e6_95c5_e5f21413ce57',
+    'type': 'select',
+    'name': 'select',
+    'width': 245,
+    'height': 56,
+    'x': 151.1811023622047,
+    'y': 321.25984251968504,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"ResultListSel","dic":"","default":"","JScript":"","selectField":"ResultList","selectOptions":["合格","不合格"],"horizontalAlign":"center","verticalAlign":"center","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_daf9fa77_5763_4ec8_a458_6c8188df6ffd',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 396.8503937007874,
+    'y': 321.25984251968504,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"有效期/天","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'inputNode_1cffa360_de94_40cd_8afb_90e0f0d3df08',
+    'type': 'inputNode',
+    'name': 'inputNode',
+    'width': 245,
+    'height': 56,
+    'x': 510.2362204724409,
+    'y': 321.25984251968504,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"default":"","horizontalAlign":"center","verticalAlign":"center","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_20742495_3bef_4eb1_b270_a5b593f01b05',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 37.79527559055118,
+    'y': 377.95275590551176,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"工装编号","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'inputNode_1fc55162_082b_42a3_b0b2_c20b5b40aaf9',
+    'type': 'inputNode',
+    'name': 'inputNode',
+    'width': 245,
+    'height': 56,
+    'x': 151.1811023622047,
+    'y': 377.95275590551176,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"default":"","horizontalAlign":"center","verticalAlign":"center","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_1df92c08_fb99_461b_9832_40e29ef6bd5e',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 396.8503937007874,
+    'y': 377.95275590551176,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"宽度/mm","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_7d8ead78_2f05_47d3_a2e4_bf04e16ccf4b',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 37.79527559055118,
+    'y': 434.64566929133855,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"开始时间","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_6d815e1f_3df9_465e_8c2f_242a77581921',
+    'type': 'text',
+    'name': 'text',
+    'width': 604,
+    'height': 57,
+    'x': 151.1811023622047,
+    'y': 434.64566929133855,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":" ","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_09537908_518c_4d40_aeac_21ed2c334cfd',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 37.79527559055118,
+    'y': 491.33858267716533,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"结束时间","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_12baf7dc_d8ea_4306_aca0_1da27748624b',
+    'type': 'text',
+    'name': 'text',
+    'width': 604,
+    'height': 57,
+    'x': 151.1811023622047,
+    'y': 491.33858267716533,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":" ","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_da7367c2_4ea1_49e3_8410_071396e02e1d',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 37.79527559055118,
+    'y': 548.0314960629921,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"数量","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_77a8a5b8_1331_4223_b0bd_bc2422046cd2',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 396.8503937007874,
+    'y': 548.0314960629921,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"单位","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_1179727a_8d5f_4831_a35b_0ebab4a34947',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 37.79527559055118,
+    'y': 604.7244094488188,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"车次/批次","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_dd1cf0cc_3d03_4bf3_90f8_41a96a59d727',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 396.8503937007874,
+    'y': 604.7244094488188,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"连续打印数","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'inputNode_2d06f82c_469e_4244_9127_9683949fe34e',
+    'type': 'inputNode',
+    'name': 'inputNode',
+    'width': 245,
+    'height': 56,
+    'x': 151.1811023622047,
+    'y': 548.0314960629921,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"default":"","horizontalAlign":"center","verticalAlign":"center","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'select_5e3c5ac3_7c11_4a72_8201_6a7bf472f4e3',
+    'type': 'select',
+    'name': 'select',
+    'width': 245,
+    'height': 56,
+    'x': 510.2362204724409,
+    'y': 548.0314960629921,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"UnitListSel","dic":"","default":"","JScript":"","selectField":"UnitList","selectOptions":[],"horizontalAlign":"center","verticalAlign":"center","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'inputNode_582e7d7a_a65b_413a_b9cb_8d695554dc6d',
+    'type': 'inputNode',
+    'name': 'inputNode',
+    'width': 245,
+    'height': 56,
+    'x': 151.1811023622047,
+    'y': 604.7244094488188,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"default":"","horizontalAlign":"center","verticalAlign":"center","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'inputNode_5bb7be18_19f3_48ad_baed_99bcbc00bc9b',
+    'type': 'inputNode',
+    'name': 'inputNode',
+    'width': 245,
+    'height': 56,
+    'x': 510.2362204724409,
+    'y': 604.7244094488188,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"default":"","horizontalAlign":"center","verticalAlign":"center","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_e085f85d_5313_4564_8bfe_6edb367d81cd',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 37.79527559055118,
+    'y': 661.4173228346456,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"备注","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'inputNode_d9318360_2e28_468c_afb2_a2d91d6f4715',
+    'type': 'inputNode',
+    'name': 'inputNode',
+    'width': 245,
+    'height': 56,
+    'x': 151.1811023622047,
+    'y': 661.4173228346456,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"default":"","horizontalAlign":"center","verticalAlign":"center","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_7225b39c_d9b0_4b0d_b37d_61b2b8a1421c',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 396.8503937007874,
+    'y': 661.4173228346456,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"工位","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'select_7633de51_0735_43fb_86f2_bcff43ca1bcd',
+    'type': 'select',
+    'name': 'select',
+    'width': 245,
+    'height': 56,
+    'x': 510.2362204724409,
+    'y': 661.4173228346456,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"StationListSel","dic":"","default":"","JScript":"","selectField":"StationList","selectOptions":[],"horizontalAlign":"center","verticalAlign":"center","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_c6360050_c623_497a_be89_1f33d57e5294',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 37.79527559055118,
+    'y': 718.1102362204724,
+    'parentNode': 'area_4be8ea51_d03c_4d9b_833a_decf81486a93',
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"条形码","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'barCode_30a0ac1d_e823_423c_9103_2485ab83e78a',
+    'type': 'barCode',
+    'name': 'barCode',
+    'width': 604,
+    'height': 57,
+    'x': 151.1811023622047,
+    'y': 718.1102362204724,
+    'parentNode': null,
+    'data': '{"options":{"field":"","default":"","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_e9531742_1a0e_4081_92c0_a3078b6d565d',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 58,
+    'x': 37.79527559055118,
+    'y': 263.66929133858264,
+    'parentNode': null,
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"机台","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_d4a02b06_9879_4391_96b2_a88e65d5ec45',
+    'type': 'text',
+    'name': 'text',
+    'width': 245,
+    'height': 57,
+    'x': 151.1811023622047,
+    'y': 264.56692913385825,
+    'parentNode': null,
+    'data': '{"options":{"field":"MachineName","horizontalAlign":"center","default":" ","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_da74eee9_cd5f_42ff_91d4_7a4ba4dad25f',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 58,
+    'x': 37.79527559055118,
+    'y': 207.87401574803147,
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"物料规格","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_02410e87_87b6_48f8_9d11_19d0c2bfc13d',
+    'type': 'text',
+    'name': 'text',
+    'width': 604,
+    'height': 57,
+    'x': 151.1811023622047,
+    'y': 207.87401574803147,
+    'data': '{"options":{"field":"MaterialSpec","horizontalAlign":"center","default":"","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_c013b2fe_8ded_48d6_a9b3_53ab66355c17',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 37.79527559055118,
+    'y': 151.1811023622047,
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"班次","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_2910ecd1_e0b1_4de0_8e97_c3117c09df78',
+    'type': 'text',
+    'name': 'text',
+    'width': 245,
+    'height': 57,
+    'x': 151.1811023622047,
+    'y': 151.1811023622047,
+    'data': '{"options":{"field":"ClassesName","horizontalAlign":"center","default":" ","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_a0e85857_475f_4693_806c_786a895d399a',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 396.8503937007874,
+    'y': 151.1811023622047,
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"班组","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_8a3c400c_1cb2_4ca0_bce8_0ec8f1c18867',
+    'type': 'text',
+    'name': 'text',
+    'width': 245,
+    'height': 57,
+    'x': 510.2362204724409,
+    'y': 151.1811023622047,
+    'data': '{"options":{"field":"TeamName","horizontalAlign":"center","default":" ","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_6c5b0121_5a90_47f2_b3d6_0688e1d7ede1',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 58,
+    'x': 37.79527559055118,
+    'y': 94.48818897637794,
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"计划号","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":true,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_568e98ea_0e2d_4af1_b06a_d581323faa1c',
+    'type': 'text',
+    'name': 'text',
+    'width': 245,
+    'height': 57,
+    'x': 151.1811023622047,
+    'y': 94.48818897637794,
+    'data': '{"options":{"field":"PlanCode","horizontalAlign":"center","default":" ","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_cabf1e71_f957_4a79_9ffb_c1e5c165e8f3',
+    'type': 'text',
+    'name': 'text',
+    'width': 113,
+    'height': 57,
+    'x': 396.8503937007874,
+    'y': 94.48818897637794,
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"卡片编号","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_dc409f72_a849_4100_a328_c6407f3c075e',
+    'type': 'text',
+    'name': 'text',
+    'width': 245,
+    'height': 57,
+    'x': 510.2362204724409,
+    'y': 94.48818897637794,
+    'data': '{"options":{"field":"CardRecordCode","horizontalAlign":"center","default":" ","isBold":false,"fontSize":14,"border":[{"type":"top","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'text_20440da6_4bd0_4b16_aa2e_ee9d0bc6339a',
+    'type': 'text',
+    'name': 'text',
+    'width': 793,
+    'height': 94,
+    'x': 0,
+    'y': 0,
+    'data': '{"options":{"field":"","horizontalAlign":"center","default":"生产流转卡","isBold":true,"fontSize":24,"border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  },
+  {
+    'templateInfoId': 5,
+    'id': 'inputNode_3f98a70f_be42_4bfc_9e5d_007d57eb929b',
+    'type': 'inputNode',
+    'name': 'inputNode',
+    'width': 245,
+    'height': 56,
+    'x': 510.2362204724409,
+    'y': 377.95275590551176,
+    'data': '{"options":{"default":"","horizontalAlign":"center","verticalAlign":"center","border":[{"type":"top","isShow":false,"width":1,"color":"#000","borderType":"solid"},{"type":"right","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"bottom","isShow":true,"width":1,"color":"#000","borderType":"solid"},{"type":"left","isShow":false,"width":1,"color":"#000","borderType":"solid"}]},"outputData":{}}'
+  }
+];
+
+const router = useRoute();
 const { updateNode } = useVueFlow();
 // 获取自定义的方法
 const { onDragStart, onDrop, onDragOver } = tool();
 const { cmToPx } = options;
 const internalInstance = getCurrentInstance();
+const loading = ref(false);
 
 const data = {
   planCode:'1',
@@ -535,22 +1034,21 @@ const zoomChange = (e) => {
 
 const view = () => {
   localStorage.setItem('printNodes', JSON.stringify(nodes.value));
-  console.log();
   internalInstance.appContext.config.globalProperties.$openPrint([data, data, data], 'demo1');
   // isView.value = true;
 
 };
 const save = () => {
+  loading.value = true;
   localStorage.setItem('printNodes', JSON.stringify(nodes.value));
   updatePrintTemplateInfo({
     templateInfoId: pageId.value,
-    templateListId: router.currentRoute.value.query.id,
+    templateListId: router.query.id,
     paperType: pageType.value === 'zdy' ? '自定义' : pageType.value,
     width: pageWidth.value,
     height: pageHeight.value,
     activeFlag: '1'
   });
-  console.log(nodes.value);
   updateTemplateNode(
     nodes.value.map(e => {
       return {
@@ -566,7 +1064,15 @@ const save = () => {
         data: JSON.stringify(e.data)
       };
     })
-  );
+  ).then((e) => {
+    loading.value = false;
+    if (e.code === 200) {
+      ElMessage({
+        message: '保存成功',
+        type: 'success'
+      });
+    }
+  })
 };
 const clear = () => {
   pid.value =  `area_${uuidv4().replaceAll('-', '_')}`
@@ -602,9 +1108,11 @@ onMounted(() => {
   //   nodes.value = JSON.parse(nodesData);
   //   pid.value = nodes.value.find(e => e.name === 'area')?.id;
   // }
-
-  listPrintTemplateInfo({ templateListId: router.currentRoute.value.query.id }).then(e => {
-    let data = e.rows[0] || {};
+  loading.value = true;
+  listPrintTemplateInfo({ templateListId: router.query.id }).then(e => {
+    let data = e.rows[0];
+    console.log(data);
+    if (!data) return;
     pageType.value = (data.paperType || 'A4') === '自定义' ? 'zdy' : data.paperType;
     pageId.value = data.templateInfoId;
     pageWidth.value = data.width || 21;
@@ -642,7 +1150,7 @@ onMounted(() => {
       } else {
         clear();
       }
-      console.log(nodes.value);
+      loading.value = false;
     });
   });
 });
diff --git a/src/views/print/nodes/barCodeNode.vue b/src/views/print/nodes/barCodeNode.vue
index e2636ae..ee22837 100644
--- a/src/views/print/nodes/barCodeNode.vue
+++ b/src/views/print/nodes/barCodeNode.vue
@@ -5,12 +5,11 @@
                  :max-height="pageSize.height" color="#000"
                  v-if="!props.isView && !props.isHideHandle && props.selected" />
     <div class="custom-node"
-         :style="{ width:props.dimensions.width+'px',lineHeight:props.dimensions.height+'px',height:props.dimensions.height+'px',pointerEvents:props.isView?'auto': 'none'}">
+         :style="{ ...border(),width:props.dimensions.width+'px',lineHeight:props.dimensions.height+'px',height:props.dimensions.height+'px',pointerEvents:props.isView?'auto': 'none'}">
       <img
         v-if="eleData"
-        :width="props.dimensions.width+'px'"
-        :height="props.dimensions.height+'px'"
-        :style="{ width:props.dimensions.width+'px',height:props.dimensions.height+'px',objectFit:'contain' }"
+        :height="props.dimensions.height +'px'"
+        :style="{ marginTop:'2px',height:props.dimensions.height - 4 +'px',objectFit:'contain' }"
         :id="'barcode'+props.id+props.index" />
     </div>
   </div>
@@ -61,12 +60,37 @@ const props = defineProps({
 
 });
 const eleData = ref('');
+
+const border = () => {
+  let res = {};
+  if (props.data.options.border) {
+    let top = props.data.options.border.find(e => e.type === 'top');
+    let right = props.data.options.border.find(e => e.type === 'right');
+    let bottom = props.data.options.border.find(e => e.type === 'bottom');
+    let left = props.data.options.border.find(e => e.type === 'left');
+    if (top.isShow) {
+      res['borderTop'] = `${top.width}px ${top.borderType} ${top.color}`;
+    }
+    if (right.isShow) {
+      res['borderRight'] = `${right.width}px ${right.borderType} ${right.color}`;
+    }
+    if (bottom.isShow) {
+      res['borderBottom'] = `${bottom.width}px ${bottom.borderType} ${bottom.color}`;
+    }
+    if (left.isShow) {
+      res['borderLeft'] = `${left.width}px ${left.borderType} ${left.color}`;
+    }
+  }
+  return res;
+};
 const getEleData = () => {
   if (props.isView) {
-    eleData.value = props.data.options.field ? props.pageData?.[props.data.options.field] : props.data.options.default;
+    eleData.value = (props.data.options.field ? props.pageData?.[props.data.options.field] : props.data.options.default);
   } else {
     eleData.value = props.data.options.default || '1234567890abc';
   }
+  console.log(props.isView);
+  console.log(eleData.value);
 };
 onMounted(() => {
   getEleData();
@@ -98,6 +122,7 @@ watch(() => JSON.parse(JSON.stringify(props.data.options.default)), (obj1, obj2)
 <style scoped>
 .custom-node {
   position: absolute;
+  text-align: center;
 }
 </style>
 
diff --git a/src/views/print/nodes/inputNode.vue b/src/views/print/nodes/inputNode.vue
index ba7bc00..aa3ee2c 100644
--- a/src/views/print/nodes/inputNode.vue
+++ b/src/views/print/nodes/inputNode.vue
@@ -66,6 +66,16 @@ watch(() => JSON.parse(JSON.stringify(props.data.options.default)), (obj1, obj2)
   }
 }, { deep: true, immediate: true });
 
+const getEleData = () => {
+  if (props.isView) {
+    text.value = props.data.options.field ? props.pageData?.[props.data.options.field] : props.data.options.default;
+  } else {
+    text.value = props.data.options.default;
+  }
+};
+onMounted(() => {
+  getEleData();
+});
 const border = () => {
   let res = {};
   if (props.data.options.border) {
@@ -105,12 +115,13 @@ const border = () => {
   .span {
     text-align: center;
     width: 100%;
+    font-size: 14px;
   }
 }
 
 .inputEl {
   border-bottom: 1px solid #409EFF;
-
+  text-align: center;
 
   :deep(.el-input__wrapper) {
     padding: 0 !important;
@@ -118,6 +129,10 @@ const border = () => {
     box-shadow: none;
 
   }
+
+  :deep(.el-input__inner) {
+    text-align: center;
+  }
 }
 </style>
 
diff --git a/src/views/print/nodes/selectNode.vue b/src/views/print/nodes/selectNode.vue
index 5496a6b..b014f2c 100644
--- a/src/views/print/nodes/selectNode.vue
+++ b/src/views/print/nodes/selectNode.vue
@@ -166,6 +166,7 @@ const border = () => {
   .span {
     text-align: center;
     width: 100%;
+    font-size: 14px;
   }
 }
 
diff --git a/src/views/print/nodes/textNode.vue b/src/views/print/nodes/textNode.vue
index 8a4a792..2a8d053 100644
--- a/src/views/print/nodes/textNode.vue
+++ b/src/views/print/nodes/textNode.vue
@@ -6,10 +6,10 @@
                  v-if="!props.isView && !props.isHideHandle && props.selected" />
 
     <div class="custom-node"
-         :style="{...border(),justifyContent:  'center',textAlign:props.data.options.horizontalAlign,width:props.dimensions.width+'px',lineHeight:props.dimensions.height+'px',height:props.dimensions.height+'px',pointerEvents:props.isView?'auto': 'none',}">
+         :style="{...border(),justifyContent:  'center',textAlign:props.data.options.horizontalAlign,width:props.dimensions.width+'px',height:props.dimensions.height+'px',pointerEvents:props.isView?'auto': 'none',}">
       <span
         v-if="eleData"
-        :style="{color:props.data.options.color,fontSize:props.data.options.fontSize+'px'}">
+        :style="{color:props.data.options.color,fontSize:props.data.options.fontSize+'px',fontWeight:props.data.options.isBold?'bold':'normal'}">
 <!--        :style="{color:props.data.options.color,fontSize:props.dimensions.height+'px'}">-->
         {{ eleData }}
       </span>
@@ -92,6 +92,9 @@ const border = () => {
 <style scoped>
 .custom-node {
   position: absolute;
+  display: flex;
+  align-items: center;
+  overflow: auto
 }
 </style>
 
diff --git a/src/views/print/nodes/timeNode.vue b/src/views/print/nodes/timeNode.vue
index 78a2e8f..58e3137 100644
--- a/src/views/print/nodes/timeNode.vue
+++ b/src/views/print/nodes/timeNode.vue
@@ -52,9 +52,9 @@ const props = defineProps({
 const eleData = ref('');
 const getEleData = () => {
   if (props.isView) {
-    eleData.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
+    eleData.value = dayjs(props.data.options.dateTime || '').format(props.data.options.dateTimeFormat);
   } else {
-    eleData.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
+    eleData.value = dayjs(props.data.options.dateTime || '').format(props.data.options.dateTimeFormat);
   }
 };
 onMounted(() => {
diff --git a/src/views/print/tool.js b/src/views/print/tool.js
index c275463..0be4e3b 100644
--- a/src/views/print/tool.js
+++ b/src/views/print/tool.js
@@ -16,8 +16,7 @@ const getOption = (e, name) => {
   let commonOption = { field: name || '' };
   if (e === 'text') {
     return {
-      ...commonOption, horizontalAlign: 'center',
-      default: '',
+      ...commonOption, horizontalAlign: 'center', default: '', isBold: false,
       fontSize: 14,
       border: [{ type: 'top', isShow: false, width: 1, color: '#000', borderType: 'solid' }, {
         type: 'right', isShow: false, width: 1, color: '#000', borderType: 'solid'
@@ -28,13 +27,20 @@ const getOption = (e, name) => {
   } else if (e === 'image') {
     return { ...commonOption, imageSrc: '', imageType: '' };
   } else if (e === 'barCode') {
-    return { ...commonOption, default: '' };
+    return {
+      ...commonOption,
+      default: '',
+      border: [{ type: 'top', isShow: false, width: 1, color: '#000', borderType: 'solid' }, {
+        type: 'right', isShow: false, width: 1, color: '#000', borderType: 'solid'
+      }, { type: 'bottom', isShow: false, width: 1, color: '#000', borderType: 'solid' }, {
+        type: 'left', isShow: false, width: 1, color: '#000', borderType: 'solid'
+      }]
+    };
   } else if (e === 'QRCode') {
     return { ...commonOption, default: '' };
   } else if (e === 'dateTime') {
     return {
-      ...commonOption,
-      dateTimeType: '',
+      ...commonOption, dateTimeType: '', dateTimeFormat: 'yyyy-MM-dd hh:mm:ss', dateTime: new Date().getTime(),
       border: [{ type: 'top', isShow: false, width: 1, color: '#000', borderType: 'solid' }, {
         type: 'right', isShow: false, width: 1, color: '#000', borderType: 'solid'
       }, { type: 'bottom', isShow: false, width: 1, color: '#000', borderType: 'solid' }, {
@@ -58,7 +64,7 @@ const getOption = (e, name) => {
     };
   } else if (e === 'inputNode') {
     return {
-      default: '',
+      default: '', field: '',
       horizontalAlign: 'center',
       verticalAlign: 'center',
       border: [{ type: 'top', isShow: false, width: 1, color: '#000', borderType: 'solid' }, {
diff --git a/src/views/print/view.vue b/src/views/print/view.vue
index 9b27177..8c23c3f 100644
--- a/src/views/print/view.vue
+++ b/src/views/print/view.vue
@@ -1,7 +1,7 @@
 <template>
 
-  <el-dialog v-model="isView" title="预览" :close-on-press-escape="false" :show-close="false">
-    <div id="printInfo" ref="printRef">
+  <el-dialog v-model="isView"  title="预览" :close-on-press-escape="false" :show-close="false">
+    <div id="printInfo" ref="printRef" v-if="isView">
       <div class="content" v-for=" (pageData,index) in pageDatas"
            :style="{pageBreakAfter: 'always',width: cmToPx(pageWidth)+'px',height: cmToPx(pageHeight)+'px',marginBottom:'4px'}">
         <div v-for="i in nodes" class="node" :style="{left:i.position?.x+'px',top: i.position?.y+'px'}">