From 38299af0db3871a506d3d3e077a168b0a2ee9d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 21 Jul 2025 17:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/boardGenerate/boardList.vue         |  2 +-
 src/views/boardGenerate/index1.vue            | 24 ++++++++++++++-----
 .../boardGenerate/nodes/form/iconNode.vue     |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/views/boardGenerate/boardList.vue b/src/views/boardGenerate/boardList.vue
index 561d7e8..4f1b50d 100644
--- a/src/views/boardGenerate/boardList.vue
+++ b/src/views/boardGenerate/boardList.vue
@@ -171,7 +171,7 @@ const createData = () => {
   }
 };
 const compileBoard = (row) => {
-  router.push({ path: '/boardGenerate', query: { id: row.pageConfigId } });
+  router.push({ path: '/boardGenerate1', query: { id: row.pageConfigId } });
 };
 const viewboard = (row) => {
   router.push({ path: '/boardView', query: { id: row.pageConfigId } });
diff --git a/src/views/boardGenerate/index1.vue b/src/views/boardGenerate/index1.vue
index cc817e1..a3b7581 100644
--- a/src/views/boardGenerate/index1.vue
+++ b/src/views/boardGenerate/index1.vue
@@ -339,9 +339,15 @@
           trigger="contextmenu"
           @command="nodeOperate">
           <div class="level" :class="{isSelect: i.selected}" @contextmenu.prevent @click="pitchOnNode(i)">
-            <div class="isShow">
-              <el-icon style="cursor: pointer" color="#fff" :size="16">
-                <View />
+            <!--            <div class="isShow">-->
+            <!--              <el-icon style="cursor: pointer" color="#fff" :size="16">-->
+            <!--                <View />-->
+            <!--              </el-icon>-->
+            <!--            </div>-->
+            <div class="isLock">
+              <el-icon style="cursor: pointer" color="#fff" :size="16" @click="i.data.isLock = !i.data.isLock">
+                <Unlock v-if="!i.data.isLock" />
+                <Lock v-if="i.data.isLock" />
               </el-icon>
             </div>
             <div class="icon">
@@ -359,6 +365,7 @@
           <template #dropdown>
             <el-dropdown-menu>
               <el-dropdown-item :command="{ type: 'toTop', node: i }">置顶</el-dropdown-item>
+              <el-dropdown-item :command="{ type: 'toBottom', node: i }">置底</el-dropdown-item>
               <el-dropdown-item :command="{ type: 'moveUp', node: i }">上移一层</el-dropdown-item>
               <el-dropdown-item :command="{ type: 'moveDown', node: i }">下移一层</el-dropdown-item>
               <el-dropdown-item :command="{ type: 'copy', node: i }">复制</el-dropdown-item>
@@ -771,7 +778,7 @@
 
                 </el-form-item>
                 <el-form-item label="图标路径" v-if="Object.keys(nodeAttrForm).includes('iconSrc')">
-                  <el-input v-model="nodeAttrForm.imgSrc" style="width: 100%" />
+                  <el-input v-model="nodeAttrForm.iconSrc" style="width: 100%" />
                 </el-form-item>
                 <el-form-item label="视频路径" v-if="Object.keys(nodeAttrForm).includes('videoSrc')">
                   <el-input v-model="nodeAttrForm.videoSrc" style="width: 100%" />
@@ -1059,7 +1066,9 @@ import {
   Plus,
   Setting,
   StarFilled,
-  Delete
+  Delete,
+  Unlock,
+  Lock
 } from '@element-plus/icons-vue';
 import * as icon from '@element-plus/icons-vue';
 import { MarkerType, useVueFlow, VueFlow } from '@vue-flow/core';
@@ -1311,7 +1320,7 @@ const save = () => {
     customContent: JSON.stringify(pageSettingForm.value),
     designPagePointList: nodes.value.map((e, index) => {
       let data = {};
-      let savaField = ['customData', 'options'];
+      let savaField = ['customData', 'options', 'isLock'];
       Object.keys(e.data).forEach((key) => {
         if (savaField.includes(key)) {
           data[key] = e.data[key];
@@ -1429,6 +1438,9 @@ const nodeOperate = (data) => {
     case 'toTop':
       nodes.value = [...nodes.value.filter(e => e.id !== data.node.id), data.node];
       break;
+    case 'toBottom':
+      nodes.value = [data.node, ...nodes.value.filter(e => e.id !== data.node.id)];
+      break;
     case 'moveUp':
       arr.splice(index, 1);
       arr.splice(index + 1, 0, item);
diff --git a/src/views/boardGenerate/nodes/form/iconNode.vue b/src/views/boardGenerate/nodes/form/iconNode.vue
index bfaa7f6..1c27eae 100644
--- a/src/views/boardGenerate/nodes/form/iconNode.vue
+++ b/src/views/boardGenerate/nodes/form/iconNode.vue
@@ -11,7 +11,7 @@
                :style="{width:props.dimensions.width+'px',height:props.dimensions.height+'px',fontSize:props.dimensions.width+'px' }">
         <component :is="icon[props.data.options.icon]" />
       </el-icon>
-      <el-image style="width: 100%; height: 100%" v-if="props.inputData?.imgSrc ||props.data.options.iconSrc"
+      <el-image style="width: 100%; height: 100%" v-if="props.inputData?.imgSrc || props.data.options.iconSrc"
                 :src="props.inputData?.imgSrc ||props.data.options.iconSrc || 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'"
                 fit="contain" />
     </div>