From 494f9051fb441091f01a280ff5d0cdf9308fc411 Mon Sep 17 00:00:00 2001
From: suixy <2277317060@qq.com>
Date: Fri, 9 Jan 2026 17:54:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/down.png         | Bin 0 -> 4059 bytes
 src/views/boardGenerate/index.vue |  12 +--
 src/views/boardGenerate/tool.js   |   7 +-
 src/views/print/externalPrint.vue | 131 +++++++++++++++++++++++-------
 4 files changed, 111 insertions(+), 39 deletions(-)
 create mode 100644 src/assets/icons/down.png

diff --git a/src/assets/icons/down.png b/src/assets/icons/down.png
new file mode 100644
index 0000000000000000000000000000000000000000..e62808c7b1c74773e9004c2513ad8e7be8093931
GIT binary patch
literal 4059
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

literal 0
HcmV?d00001

diff --git a/src/views/boardGenerate/index.vue b/src/views/boardGenerate/index.vue
index fcba5db..fbbd941 100644
--- a/src/views/boardGenerate/index.vue
+++ b/src/views/boardGenerate/index.vue
@@ -2,7 +2,6 @@
   <div class="boardGenerate">
     <div class="top">
       <span style="color: #fff">
-      {{pageSettingForm}}
       </span>
       <!--      <el-button @click="nodes.forEach(e=>e.draggable =true)">11</el-button>-->
       <div class="componentMenu">
@@ -1663,7 +1662,6 @@ const handleResizeStop = (event, node) => {
 };
 
 onMounted(async () => {
-  console.log(123123);
   icons.value = Object.keys(icon);
   loading.value = true;
   getDataSourceList({
@@ -1683,8 +1681,8 @@ onMounted(async () => {
           isPage: e.fieldThree === 'true'
         };
       });
-    })
-  customBoard.value = JSON.parse(localStorage.getItem('BOARDNODE') || '[]');
+    });
+  // customBoard.value = JSON.parse(localStorage.getItem('BOARDNODE') || '[]');
   await nextTick();
   getBoardApi(router.currentRoute.value.query.id)
     .then((res) => {
@@ -1743,12 +1741,12 @@ onMounted(async () => {
         };
       }) || [];
       pageData.value = JSON.parse(data.customContent) || {};
+      pageSettingForm.value = pageData.value;
       nextTick(() => {
         isSnapToGrid.value = true;
       });
     })
     .finally(() => {
-
       loading.value = false;
     });
 });
@@ -1776,7 +1774,7 @@ const nodes = ref([{
 }]);
 const edges = ref([]);
 const customData = ref([]);
-const customBoard = ref([]);
+// const customBoard = ref([]);
 const cellOption = ref({});
 const boardData = ref({});
 const pageData = ref({});
@@ -2042,7 +2040,6 @@ const pitchOnNode = (e) => {
 
 const cellClick = (e) => {
   let option = (nodeAttrForm.value.tableCellOptions || []).find(v => v.index === e.$index && v.cellIndex === e.cellIndex) || {};
-  console.log(e);
   cellOption.value = {
     ...(nodeAttrForm.value.tableOptions?.[e.cellIndex] || {}),
     $index: e.$index,
@@ -2123,7 +2120,6 @@ const setText = (value, row, formula) => {
   }
 };
 
-
 </script>
 <style scoped lang="less">
 
diff --git a/src/views/boardGenerate/tool.js b/src/views/boardGenerate/tool.js
index 572b454..da4d23f 100644
--- a/src/views/boardGenerate/tool.js
+++ b/src/views/boardGenerate/tool.js
@@ -273,7 +273,12 @@ const getOption = (e) => {
       gridBottom: 10,
       gridRight: 10,
       tooltip: true,
-      legend: true
+      legend: true,
+      radarCenter: [30, 50],
+      radarRadius: 40,
+      radarShape: 'polygon',
+      radarSplitNumber: 5,
+      splitLineColor: '#9E87FF'
     };
   } else if (e === 'pie' || e === 'nightingaleRoseDiagram') {
     return {
diff --git a/src/views/print/externalPrint.vue b/src/views/print/externalPrint.vue
index 831d76f..3d92464 100644
--- a/src/views/print/externalPrint.vue
+++ b/src/views/print/externalPrint.vue
@@ -1,16 +1,30 @@
 <template>
-  <div style="width: 100%; height: 100vh; overflow: hidden">
-    <div class="left">
-      <div class="printTemplateList" v-for=" i in printTemplateList">
-        <el-card @click="setNodes(i)" class="moduleCard" shadow="never"
-                 :style="{display:'inline-block',margin:'0 4px 4px 0'}"
-                 :body-style="{padding:'4px 0'}">
-          <template #header>
-            <el-image style="width: 100%; height: 100%" :src="doc" fit="contain" />
-          </template>
-          <div class="moduleText">{{ i.templateName }}</div>
-        </el-card>
+  <div style="width: 100%; height: 100vh; overflow: hidden" v-loading="loading">
+    <div class="open" @click="drawer = true">
+      <div class="icon"></div>
+    </div>
+    <el-drawer
+      v-model="drawer"
+      :with-header="false"
+      :close-on-click-modal="true"
+      direction="ttb"
+      size="240"
+      ref="drawerRef"
+    >
+      <div class="divCenter" v-loading="loading">
+        <div class="printTemplateList" v-for=" i in printTemplateList">
+          <el-card @click="setNodes(i)" class="moduleCard" shadow="never"
+                   :style="{display:'inline-block',margin:'0 4px 4px 0'}"
+                   :body-style="{padding:'4px 0'}">
+            <template #header>
+              <el-image style="width: 100px" :src="doc" fit="contain" />
+            </template>
+            <div class="moduleText">{{ i.templateName }}</div>
+          </el-card>
+        </div>
       </div>
+    </el-drawer>
+    <div class="left">
     </div>
     <div class="center">
       <div id="printInfo" ref="printRef">
@@ -89,19 +103,19 @@
         </div>
       </div>
     </div>
-    <div class="right">
-      <el-dropdown split-button type="primary" @click="printFun" @command="switchPrinter" style="margin-right: 8px">
-        {{ printName() }}
-        <template #dropdown>
-          <el-dropdown-menu>
-            <el-dropdown-item :command="-1">导出PDF</el-dropdown-item>
-            <el-dropdown-item divided :command="0">本地打印</el-dropdown-item>
-            <el-dropdown-item :divided="k === 0" :command="i.id" v-for="(i, k) in printers">{{ i.name }}
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </template>
-      </el-dropdown>
-    </div>
+    <!--    <div class="right">-->
+    <!--      <el-dropdown split-button type="primary" @click="printFun" @command="switchPrinter" style="margin-right: 8px">-->
+    <!--        {{ printName() }}-->
+    <!--        <template #dropdown>-->
+    <!--          <el-dropdown-menu>-->
+    <!--            <el-dropdown-item :command="-1">导出PDF</el-dropdown-item>-->
+    <!--            <el-dropdown-item divided :command="0">本地打印</el-dropdown-item>-->
+    <!--            <el-dropdown-item :divided="k === 0" :command="i.id" v-for="(i, k) in printers">{{ i.name }}-->
+    <!--            </el-dropdown-item>-->
+    <!--          </el-dropdown-menu>-->
+    <!--        </template>-->
+    <!--      </el-dropdown>-->
+    <!--    </div>-->
   </div>
   <div id="printArea" v-if="printPngList.length > 0">
     <div v-for="(url, index) in printPngList" :key="index" class="print-page">
@@ -112,6 +126,7 @@
 <script setup>
 import html2canvas from 'html2canvas';
 import jsPDF from 'jspdf';
+import { ElMessageBox } from 'element-plus';
 import { options } from '@/views/print/tool.js';
 import TextNode from '@/views/print/nodes/textNode.vue';
 import ImageNode from '@/views/print/nodes/image.vue';
@@ -127,6 +142,18 @@ import doc from '@/assets/images/doc.png';
 import { getSysPrintTemplateNodeList } from '@/api/system/printTemplateNode/index';
 import { listPrintTemplateInfo } from '@/api/system/printTemplateInfo/index';
 
+const handleClose = (done) => {
+  ElMessageBox.confirm('Are you sure you want to close this?')
+    .then(() => {
+      done();
+    })
+    .catch(() => {
+      // catch error
+    });
+};
+const drawer = ref(false);
+const loading = ref(false);
+const drawerRef = ref()
 const printTemplateList = ref([]);
 const route = useRoute();
 const printType = ref(0);
@@ -178,7 +205,7 @@ const messageFun = (event) => {
   // }
 };
 const setNodes = (data) => {
-
+  loading.value = true;
   listPrintTemplateInfo({ templateListId: data.templateListId }).then(e => {
     let templateInfoId = e.rows?.[0]?.templateInfoId;
     getSysPrintTemplateNodeList({ templateInfoId }).then(v => {
@@ -203,8 +230,10 @@ const setNodes = (data) => {
         };
       });
       nextTick(() => {
-        zoom.value = ((printRef.value.offsetWidth - 20) / 793);
+        zoom.value = ((printRef.value.offsetWidth) / 793);
       });
+      drawer.value = false
+      loading.value = false;
     });
   });
 };
@@ -229,6 +258,9 @@ onMounted(() => {
   listPrintTemplateList().then(data => {
     printTemplateList.value = data.rows;
   });
+  nextTick(() => {
+    zoom.value = ((printRef.value.offsetWidth) / 793);
+  });
 });
 
 const switchPrinter = (e) => {
@@ -318,10 +350,11 @@ defineExpose({
 <style scoped>
 .content {
   position: relative;
+  width: 100%;
   overflow: hidden;
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  border: 1px solid #ccc;
+  border-top: 1px solid #ccc;
   transform-origin: top left;
 }
 
@@ -330,16 +363,23 @@ defineExpose({
 }
 
 .left {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 8;
   display: inline-block;
-  width: 10vw;
-  height: 100vh;
+  width: 100%;
   overflow: auto;
   margin-right: 50px;
 }
 
+.divCenter {
+  text-align: center;
+}
+
 .center {
   display: inline-block;
-  width: calc(100% - 10vw - 50px);
+  width: calc(100%);
   height: 100vh;
   overflow: auto;
   padding-top: 40px;
@@ -357,6 +397,36 @@ defineExpose({
   right: 0;
   top: 0;
 }
+.printTemplateList {
+  width: 150px;
+  display: inline-block;
+  vertical-align: top;
+  text-align: center;
+  min-width: 50px;
+}
+
+.open {
+  position: fixed;
+  top: 0;
+  left: 50%;
+  width: 100px;
+  height: 30px;
+  background-color: #ddd;
+  border-bottom-left-radius: 30px;
+  border-bottom-right-radius: 30px;
+
+  .icon {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    background-image: url("@/assets/icons/down.png");
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    width: 12px;
+    height: 12px;
+  }
+}
 </style>
 <style>
 .print-page {
@@ -393,4 +463,5 @@ defineExpose({
     page-break-after: always;
   }
 }
+
 </style>