From f6f28ff101c692981edc44fb52bd015265b683bd Mon Sep 17 00:00:00 2001
From: XuJiacheng <xujiacheng@blw.com>
Date: Wed, 7 Jan 2026 15:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=80=BB?=
 =?UTF-8?q?=E8=A7=88=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/panelselection/index.vue | 865 +++++++++++++++++++++++------
 1 file changed, 710 insertions(+), 155 deletions(-)

diff --git a/src/pages/panelselection/index.vue b/src/pages/panelselection/index.vue
index 074a1bd..93b35c5 100644
--- a/src/pages/panelselection/index.vue
+++ b/src/pages/panelselection/index.vue
@@ -1,11 +1,11 @@
 <template>
-  <!-- <el-button @click="test123">测试</el-button> -->
+  <!-- <el-button @click="GetProjectStatus">测试</el-button> -->
   <div class="container">
     <!-- 复制面板对话框 -->
     <el-dialog v-model="showCopyPanelDialog" title="复制面板" width="400px" :close-on-click-modal="false">
       <el-select v-model="selectedCopyProjectId" placeholder="请选择项目" filterable clearable size="small"
         style="width: 100%; margin-bottom: 20px" @change="handleCopyProjectChange" :close-on-press-escape="false">
-        <el-option v-for="project in projectList" :key="project.id" :label="project.projectName" :value="project.id" />
+        <el-option v-for="project in projectList" :key="project.id" :label="project.hotel_name" :value="project.id" />
       </el-select>
       <template #footer>
         <div class="dialog-footer">
@@ -14,21 +14,79 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 生成项目总览图参数对话框 -->
+    <el-dialog v-model="showProjectCdrDialog" title="生成项目总览图" width="520px" :close-on-click-modal="false"
+      :close-on-press-escape="false">
+      <el-form :model="projectCdrForm" label-width="90px" size="small">
+        <el-form-item label="项目名称">
+          <el-input v-model="projectCdrProjectName" disabled />
+        </el-form-item>
+        <el-form-item label="协议">
+          <el-select v-model="projectCdrForm.Protocol" placeholder="请选择/输入协议" filterable allow-create
+            default-first-option style="width: 100%">
+            <el-option v-for="p in projectCdrEnums.protocols" :key="p" :label="p" :value="p" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开关系列">
+          <el-select v-model="projectCdrForm.SwitchSeries" placeholder="请选择/输入开关系列" filterable allow-create
+            default-first-option style="width: 100%">
+            <el-option v-for="s in projectCdrEnums.switchSeries" :key="s" :label="s" :value="s" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="插座系列">
+          <el-select v-model="projectCdrForm.SocketSeries" placeholder="请选择插座系列" style="width: 100%">
+            <el-option v-for="s in projectCdrEnums.socketSeries" :key="s" :label="s" :value="s" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="中文字体">
+          <el-select v-model="projectCdrForm.ChineseFont" placeholder="请选择/输入中文字体" filterable allow-create
+            default-first-option style="width: 100%">
+            <el-option v-for="font in fontList" :key="font.ID" :label="font.FontName" :value="font.FontName" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="中文字号">
+          <el-input-number v-model="projectCdrForm.ChineseFontSize" :min="0" :max="200" :step="0.1" :precision="1"
+            controls-position="right" style="width: 40%" />
+        </el-form-item>
+        <el-form-item label="英文字体">
+          <el-select v-model="projectCdrForm.EnglishFont" placeholder="请选择/输入英文字体" filterable allow-create
+            default-first-option style="width: 100%">
+            <el-option v-for="font in fontList" :key="font.ID" :label="font.FontName" :value="font.FontName" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="英文字号">
+          <el-input-number v-model="projectCdrForm.EnglishFontSize" :min="0" :max="200" :step="0.1" :precision="1"
+            controls-position="right" style="width: 40%" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button size="small" @click="showProjectCdrDialog = false">取消</el-button>
+          <el-button type="primary" size="small" @click="confirmProjectCdr">确认生成</el-button>
+        </div>
+      </template>
+    </el-dialog>
     <!-- 左侧区域 -->
     <div class="left-panel">
       <div class="left-top">
         <span style="font-weight: bold">项目：</span>
         <el-select ref="projectSelect" v-model="selectedProjectId" placeholder="请选择项目" filterable clearable size="small"
-          @change="handleProjectSelectorChange" @visible-change="onSelectVisibleChange" style="width: 65%; margin: 0px"
+          @change="handleProjectSelectorChange" @visible-change="onSelectVisibleChange" style="width: 40%; margin: 0px"
           :disabled="isProjectLocked">
-          <el-option v-for="project in projectList" :key="project.id" :label="project.projectName"
-            :value="project.id" />
+          <el-option v-for="project in projectList" :key="project.id" :label="project.hotel_name" :value="project.id" />
         </el-select>
-        <span style="margin-left: 5px;">
-          <el-tooltip content="下载项目所有CDR文件并打包" placement="top">
-            <el-button size="small" type="warning" @click="downloadProjectCDRFiles" :disabled="!selectedProjectId"
-              style="width:24%;">
-              下载项目CDR包
+        <span style="margin-left: 2px;">
+          <el-tooltip content="生成项目总览CDR图纸" placement="top">
+            <el-button size="small" type="success" @click="GetAllProjectCDR" :disabled="!selectedProjectId || isProjectGenerating"
+              style="width:18%;">
+              生成项目总览
+            </el-button>
+          </el-tooltip>
+          <el-tooltip content="下载项目CDR文件和雕刻文件" placement="top">
+            <el-button size="small" type="warning" @click="DownloadProjectCDR" :disabled="!selectedProjectId || !isProjectDownloadAvailable"
+              style="width:18%;">
+              下载项目文件
             </el-button>
           </el-tooltip>
         </span>
@@ -46,7 +104,7 @@
                       data.panelInfo.design_status == '生成中'
                     " style="font-size: 10px; color: #e6a23c">生成中</span>
                     <span v-else-if="
-                      data.panelInfo && data.panelInfo.thumbnail_large
+                      data.panelInfo && data.panelInfo.thumbnail_large && data.panelInfo.cdr_filename && data.panelInfo.carving_filename
                     " style="font-size: 10px; color: #67c23a">已生成</span>
                     <span v-else-if="
                       data.panelInfo && data.panelInfo.panel_info_json
@@ -58,51 +116,51 @@
                 <div class="tree-node-actions">
                   <!-- 项目节点 -->
                   <template v-if="data.type === 'project'">
-                    <el-button size="small" link type="success" @click.stop="addRoomType(data)"
-                      v-if="data.project.id !== 1">新增房型</el-button>
+                    <el-button size="small" link type="success" @click.stop="addRoomType(data)">新增房型</el-button>
                     <el-button size="small" link type="primary">&emsp;&emsp;</el-button>
-                    <el-button v-if="data.project.projectCode !== '1'" size="small" link type="danger"
+                    <el-button v-if="data.project.report_id !== '1'" size="small" link type="danger"
                       @click.stop="removeProjectNode(data)">移除</el-button>
-                    <el-popover placement="bottom-end" :width="1100" trigger="click">
+                    <el-popover placement="bottom-end" :width="880" trigger="click">
                       <template #reference>
                         <el-button size="small" class="detail-btn" link type="info"
                           v-if="data.project.id !== 1">详情</el-button>
                       </template>
-                      <el-descriptions border column="4" size="small" class="details">
+                      <el-descriptions border column="2" size="small" class="details">
                         <el-descriptions-item label="项目名称">{{
-                          data.project.projectName
+                          data.project.hotel_name
                           }}</el-descriptions-item>
-                        <el-descriptions-item label="详细地址">{{
+                        <!-- <el-descriptions-item label="详细地址">{{
                           data.project.addressDetail
-                          }}</el-descriptions-item>
+                        }}</el-descriptions-item>
                         <el-descriptions-item label="所在地区">{{ data.project.quyu }} ·
-                          {{ data.project.shengfen }}</el-descriptions-item>
+                          {{ data.project.shengfen }}</el-descriptions-item> -->
                         <el-descriptions-item label="项目编号">{{
-                          data.project.projectCode
+                          data.project.report_id
                           }}</el-descriptions-item>
                         <el-descriptions-item label="审批状态">
                           <el-tag size="small" :type="data.project.shengpiStatus === '3'
                             ? 'success'
                             : 'warning'
                             ">
-                            {{
+                            已通过
+                            <!-- {{
                               data.project.shengpiStatus === "3"
                                 ? "已批准"
                                 : "待审批"
-                            }}
+                            }} -->
                           </el-tag>
                         </el-descriptions-item>
                         <el-descriptions-item label="报备信息">{{
-                          data.project.customization
+                          data.project.remarks
                           }}</el-descriptions-item>
-                        <el-descriptions-item label="房间信息">{{ data.project.roomTypeCount }} 种房型 ·
+                        <!-- <el-descriptions-item label="房间信息">{{ data.project.roomTypeCount }} 种房型 ·
                           {{
                             data.project.roomTotalCount
                           }}
-                          间客房</el-descriptions-item>
-                        <el-descriptions-item label="最后更新">{{
+                          间客房</el-descriptions-item> -->
+                        <!-- <el-descriptions-item label="最后更新">{{
                           formatDate(data.project.updatetime)
-                          }}</el-descriptions-item>
+                        }}</el-descriptions-item> -->
                       </el-descriptions>
                     </el-popover>
                   </template>
@@ -215,7 +273,7 @@
                   : ""
               }}</span>
               <div>
-                <el-tooltip content="手动刷新面板组预览图" placement="top">
+                <el-tooltip content="刷新面板组预览图" placement="top">
                   <el-button size="small" type="info" @click="refreshPanelGroupPreview" :disabled="!currentPanelNode">
                     刷新预览
                   </el-button>
@@ -247,23 +305,6 @@
             <div class="section-header">
               <span>面板组合配置</span>
               <div>
-                <!-- <el-tooltip :content="!currentPanelNode
-                  ? '请先选择面板组'
-                  : !isAllPanelsConfigured
-                    ? '请先完成所有面板的配置'
-                    : currentPanelNode?.panelInfo?.cdr_filename
-                      ? '点击下载CDR文件'
-                      : '点击生成CDR文件'
-                  " placement="top">
-                  <el-button v-if="currentPanelNode?.panelInfo?.cdr_filename" size="small" type="success"
-                    @click="downloadCDRFile" :disabled="!currentPanelNode || !isAllPanelsConfigured">
-                    下载CDR文件
-                  </el-button>
-                  <el-button v-else size="small" type="primary" @click="showPreview(1)"
-                    :disabled="!currentPanelNode || !isAllPanelsConfigured">
-                    生成CDR文件
-                  </el-button>
-                </el-tooltip> -->
                 <el-tooltip :content="!currentPanelNode
                   ? '请先选择面板组'
                   : !isAllPanelsConfigured
@@ -304,11 +345,9 @@
                   <el-table-column label="面板" min-width="200" align="center">
                     <template #default="{ row, $index }">
                       <el-select v-model="row.panelUnitGuid" placeholder="请选择面板单元" style="width: 100%" size="small"
-                        @change="
-                          handlePanelUnitChange($index, row.panelUnitGuid)
-                          " filterable :filter-method="(query) => filterPanelUnits(query)">
-                        <el-option v-for="unit in filteredPanelUnits" :key="unit.guid" :label="unit.panel_name"
-                          :value="unit.guid" style="height: 60px; padding: 10px;">
+                        @change="handlePanelUnitChange($index, row.panelUnitGuid)" filterable>
+                        <el-option v-for="unit in availablePanelUnits" :key="unit.guid" :label="unit.panel_name"
+                            :value="unit.guid" style="height: 60px; padding: 10px;">
                           <div style="display: flex; align-items: center;">
                             <el-image v-if="unit.thumbnail_large" :src="config.PicAds + unit.thumbnail_large"
                               style="width: 50px; height: 50px; margin-right: 10px;" fit="contain"
@@ -384,7 +423,7 @@
             <div class="section-header">
               <span>单面板预览图</span>
               <div>
-                <el-tooltip content="手动刷新预览图" placement="top">
+                <el-tooltip content="刷新预览图" placement="top">
                   <el-button size="small" type="info" @click="refreshPanelUnitPreview" :disabled="!currentPanelUnit">
                     刷新预览
                   </el-button>
@@ -919,7 +958,14 @@ const config = inject("config"); // config.PicAds 是图片根路径
 // ==================== HTTP 实例 ====================
 const cloudHttp = createAxiosInstance(0);
 const localHttp = createAxiosInstance(1);
-
+/* 测试方法 */
+const test123 = async () => {
+  const rs = await localHttp.post(
+    "PanelSelection/",
+    JSON.stringify({ GUID: "BB_20251204_003" })
+  );
+  console.log(rs);
+}
 // ==================== 响应式变量 ====================
 
 // 项目相关变量
@@ -1008,6 +1054,102 @@ const currentPanelUnit = ref(null);
 const panelUnitForm = ref([]);
 const fontList = ref([]);
 
+// ==================== 项目总览图参数（GetAllProjectCDR） ====================
+const showProjectCdrDialog = ref(false);
+const projectCdrGuid = ref("");
+const projectCdrProjectName = ref("");
+const projectCdrEnums = ref({
+  protocols: ["强电无线", "弱电485"],
+  switchSeries: ["T1水立方", "T1水晶方", "T3水星阁"],
+  socketSeries: ["玻璃", "塑料", "无"],
+});
+
+const projectCdrForm = ref({
+  Protocol: "强电无线",
+  SwitchSeries: "T1水立方",
+  SocketSeries: "玻璃",
+  ChineseFont: "思源黑体",
+  ChineseFontSize: 11.0,
+  EnglishFont: "Futura Std Medium",
+  EnglishFontSize: 7.0,
+});
+
+const getProjectCdrStorageKey = (guid) => `GetAllProjectCDR_Params_${guid}`;
+
+const loadProjectCdrParams = (guid) => {
+  try {
+    const raw = localStorage.getItem(getProjectCdrStorageKey(guid));
+    if (!raw) return;
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object") return;
+    projectCdrForm.value = {
+      ...projectCdrForm.value,
+      ...parsed,
+    };
+  } catch {
+    // ignore
+  }
+};
+
+const saveProjectCdrParams = (guid) => {
+  try {
+    localStorage.setItem(getProjectCdrStorageKey(guid), JSON.stringify(projectCdrForm.value));
+  } catch {
+    // ignore
+  }
+};
+
+const applyProjectCdrParamsFromWebProject = (webProjectRow) => {
+  if (!webProjectRow || typeof webProjectRow !== "object") return;
+
+  const normalizeNumberOrNull = (v) => {
+    if (v === null || v === undefined || v === "") return null;
+    const n = Number(v);
+    return Number.isFinite(n) ? n : null;
+  };
+
+  projectCdrForm.value = {
+    ...projectCdrForm.value,
+    Protocol: webProjectRow.protocol ?? projectCdrForm.value.Protocol,
+    SwitchSeries: webProjectRow.switch_series ?? projectCdrForm.value.SwitchSeries,
+    SocketSeries:
+      webProjectRow.socket_series === ""
+        ? "无"
+        : (webProjectRow.socket_series ?? projectCdrForm.value.SocketSeries),
+    ChineseFont: webProjectRow.cn_font ?? projectCdrForm.value.ChineseFont,
+    ChineseFontSize: normalizeNumberOrNull(webProjectRow.cn_font_size) ?? projectCdrForm.value.ChineseFontSize,
+    EnglishFont: webProjectRow.en_font ?? projectCdrForm.value.EnglishFont,
+    EnglishFontSize: normalizeNumberOrNull(webProjectRow.en_font_size) ?? projectCdrForm.value.EnglishFontSize,
+  };
+};
+
+const ensureProjectCdrDefaults = () => {
+  if (!projectCdrForm.value.Protocol) projectCdrForm.value.Protocol = "强电无线";
+  if (!projectCdrForm.value.SwitchSeries) projectCdrForm.value.SwitchSeries = "T1水立方";
+  // 后端约定：SocketSeries 为空字符串代表“无”，UI 用“无”表示
+  if (projectCdrForm.value.SocketSeries === "") projectCdrForm.value.SocketSeries = "无";
+  if (!projectCdrForm.value.SocketSeries) projectCdrForm.value.SocketSeries = "玻璃";
+  if (!projectCdrForm.value.ChineseFont) projectCdrForm.value.ChineseFont = "思源黑体";
+  if (projectCdrForm.value.ChineseFontSize === null || projectCdrForm.value.ChineseFontSize === undefined)
+    projectCdrForm.value.ChineseFontSize = 11.0;
+  if (!projectCdrForm.value.EnglishFont) projectCdrForm.value.EnglishFont = "Futura Std Medium";
+  if (projectCdrForm.value.EnglishFontSize === null || projectCdrForm.value.EnglishFontSize === undefined)
+    projectCdrForm.value.EnglishFontSize = 7.0;
+};
+
+const loadProjectCdrEnums = async () => {
+  try {
+    const rs = await fetchData("PanelSelection/GetProjectCdrEnums", {});
+    if (!rs || typeof rs !== "object") return;
+
+    if (Array.isArray(rs.protocols)) projectCdrEnums.value.protocols = rs.protocols;
+    if (Array.isArray(rs.switchSeries)) projectCdrEnums.value.switchSeries = rs.switchSeries;
+    if (Array.isArray(rs.socketSeries)) projectCdrEnums.value.socketSeries = rs.socketSeries;
+  } catch {
+    // ignore
+  }
+};
+
 // 防抖相关变量
 const lastPanelGroupPreviewClickTime = ref(0);
 const lastSinglePanelPreviewClickTime = ref(0);
@@ -1047,11 +1189,16 @@ const GenerationStatus = {
   ERROR: "生成错误",
   CANCELLED: "已取消",
 };
+// 项目状态跟踪
+const isProjectGenerating = ref(false);
+// 项目下载可用性跟踪
+const isProjectDownloadAvailable = ref(false);
 // 生成类型枚举
 const GenerationType = {
   PREVIEW: "组合预览",
   CDR: "CDR文件",
   SINGLE_PANEL: "单面板",
+  PROJECT: "项目",
 };
 const allModelsForUnit = ref([]);
 const selectedModelForUnit = ref(null);
@@ -1089,6 +1236,7 @@ const isPollingActive = ref(false);
 const pollingItems = ref({
   panelLists: new Set(), // 存储需要轮询的面板组GUID
   panelUnits: new Set(), // 存储需要轮询的面板单元GUID
+  projects: new Set(), // 存储需要轮询的项目GUID
 });
 // ==================== 计算属性 ====================
 // 检查是否有生成中的元素
@@ -1432,6 +1580,57 @@ const stopPolling = () => {
   console.log("停止轮询检查");
 };
 
+/**
+ * 检查项目状态
+ */
+const checkProjectStatus = async (projectGuid) => {
+  try {
+    // 调用GetProjectStatus获取项目状态
+    const projectStatus = await GetProjectStatus(projectGuid);
+
+    // 查找generationHistory中对应的项目记录
+    const projectIndex = generationHistory.value.findIndex(
+      record => record.guid === projectGuid && record.type === GenerationType.PROJECT
+    );
+
+    if (projectIndex === -1) {
+      // 如果记录不存在，从轮询列表中移除
+      pollingItems.value.projects.delete(projectGuid);
+      return false;
+    }
+
+    const record = generationHistory.value[projectIndex];
+
+    // 检查项目是否已完成生成
+    if (projectStatus !== GenerationStatus.IN_PROGRESS) {
+      // 更新记录状态
+      const endTime = new Date();
+      generationHistory.value[projectIndex] = {
+        ...record,
+        status: GenerationStatus.COMPLETED,
+        progress: 100,
+        progressText: "项目总览图已生成完成",
+        completedAt: formatDate(endTime),
+        duration: Math.round((endTime.getTime() - record.startTime) / 1000),
+      };
+
+      // 从轮询列表中移除
+      pollingItems.value.projects.delete(projectGuid);
+      isProjectGenerating.value = false;
+
+      return true;
+    }
+
+    return false;
+  } catch (error) {
+    console.error(`检查项目 ${projectGuid} 状态失败:`, error);
+    // 从轮询列表中移除错误的项目
+    pollingItems.value.projects.delete(projectGuid);
+    isProjectGenerating.value = false;
+    return false;
+  }
+};
+
 /**
  * 检查生成状态并更新数据
  */
@@ -1467,6 +1666,16 @@ const checkGeneratingStatus = async () => {
       currentPanelUnit.value = currentPanelUnit.value;
     }
 
+    // 检查项目生成状态
+    for (const projectGuid of [...pollingItems.value.projects]) {
+      try {
+        const updated = await checkProjectStatus(projectGuid);
+        if (updated) hasUpdates = true;
+      } catch (error) {
+        console.error(`检查项目 ${projectGuid} 状态失败:`, error);
+      }
+    }
+
     // 如果没有生成中的元素，停止轮询
     if (!hasGeneratingItems.value) {
       stopPolling();
@@ -1614,7 +1823,7 @@ const checkPanelUnitStatus = async (panelUnitGuid) => {
             }
           }
 
-          ElMessage.success("单面板预览图生成完成！");
+          //ElMessage.success("单面板预览图生成完成！");
           return true; // 返回true表示有更新
         }
       }
@@ -1741,11 +1950,12 @@ const updateDatabase = async (endpoint, data) => {
  */
 const getProject = async () => {
   try {
-    const rs = await cloudHttp.post("AasProjectInfoes/Get_ProjectByStatusCode");
-    projectList.value = rs.data.response.sort((a, b) => {
+    // 修改数据来源为PanelSelection/WebProjectQuery
+    const projects = await fetchData("PanelSelection/WebProjectQuery");
+    projectList.value = projects.sort((a, b) => {
       if (a.id === 1) return -1;
       if (b.id === 1) return 1;
-      return b.id - a.id;
+      return a.created_at - b.created_at;
     });
 
     // 优先使用本地保存的项目选择
@@ -1792,7 +2002,7 @@ const handleCopyProjectChange = async (projectId) => {
   );
   if (selectedProject) {
     const webProject = await getWebProjectByHotelName(
-      selectedProject.projectName
+      selectedProject.hotel_name
     );
     selectedCopyProjectGuid.value = webProject ? webProject.guid : null;
   } else {
@@ -1956,6 +2166,8 @@ const restoreSelectionsFromLocalStorage = async () => {
         selectedProjectId.value = pid;
         await handleProjectChangeApp(pid);
       }
+      const project = projectList.value.find((p) => p.id === pid);
+      await GetProjectStatus(project.guid);
     }
 
     // 等待 treeData 已加载（至少有项目节点）和 unitTableData 已加载（无论长度）
@@ -2022,9 +2234,30 @@ const handleProjectSelectorChange = async (projectId) => {
   panelConfigTable.value = [];
   panelGroupPreviewThumbnail.value = "";
   generationHistory.value = [];
+  isProjectDownloadAvailable.value = false;
 
   // 调用原有的项目变更处理方法
   await handleProjectChangeApp(projectId);
+
+  // 如果选择了项目，检查项目状态
+  if (projectId) {
+    const project = projectList.value.find((p) => p.id === projectId);
+    if (project && project.guid) {
+      // 检查项目状态
+      const projectStatus = await GetProjectStatus(project.guid);
+
+      // 如果项目正在生成，添加到轮询列表
+      if (projectStatus === "生成中") {
+        pollingItems.value.projects = pollingItems.value.projects || new Set();
+        pollingItems.value.projects.add(project.guid);
+
+        // 如果轮询未启动，启动轮询
+        if (!isPollingActive.value) {
+          startPolling();
+        }
+      }
+    }
+  }
 };
 
 /**
@@ -2038,22 +2271,12 @@ const handleProjectChangeApp = async (projectId) => {
 
   const project = projectList.value.find((p) => p.id === projectId);
   if (!project) return;
-
-  let webProject = await getWebProjectByHotelName(project.projectName);
-  if (!webProject) webProject = await createWebProject(project);
+  let webProject = project;
+  if (webProject.room_data_json === "[]") webProject = await createWebProjectRoomType(project);
   if (!webProject) {
-    ElMessage.error(`项目 ${project.projectName} 数据初始化失败，跳过加载`);
+    ElMessage.error(`项目 ${project.hotel_name} 数据初始化失败，跳过加载`);
     return;
   }
-  // 清空其他相关数据
-  // mergedPanelUnitForm.value = [];
-  // singlePanelPatternPreview.value = "";
-  // singlePanelPreview.value = "";
-  // panelGroupPreview.value = "";
-  // currentPanelNode.value = null;
-  // panelConfigTable.value = [];
-  // panelGroupPreviewThumbnail.value = "";
-  // generationHistory.value = [];
   const projectNode = await buildProjectTree(project, webProject);
   treeData.value = [projectNode];
 
@@ -2081,33 +2304,18 @@ const loadPanelUnitsByProject = async (projectGuid) => {
  * 根据酒店名称查询 Web 项目
  */
 const getWebProjectByHotelName = async (hotelName) => {
-  const projects = await fetchData("PanelSelection/WebProjectQuery");
-  return projects.find((p) => p.hotel_name === hotelName);
+  // 从projectList.value直接查找，而不是重新查询
+  return projectList.value.find((p) => p.hotel_name === hotelName);
 };
 
 /**
  * 创建 Web 项目
  */
-const createWebProject = async (project) => {
+const createWebProjectRoomType = async (project) => {
   try {
-    // 创建项目
-    const webProject = {
-      report_id: `${project.projectCode}`,
-      hotel_name: project.projectName,
-      room_type_count: project.roomTypeCount,
-      room_data_json: "[]",
-      remarks: project.customization,
-      creator: getCurrentUser(),
-    };
-
-    const projectGuid = await updateDatabase(
-      "PanelSelection/WebProjectAdd",
-      webProject
-    );
-
     // 创建房型
     const roomGuids = [];
-    for (let i = 0; i < project.roomTypeCount; i++) {
+    for (let i = 0; i < project.room_type_count; i++) {
       const roomData = {
         room_name: `房型${i + 1}`,
         room_description: `自动创建的房型`,
@@ -2127,9 +2335,7 @@ const createWebProject = async (project) => {
 
     // 更新项目信息
     const updatedProject = {
-      ...webProject,
-      guid: projectGuid,
-      room_type_count: roomGuids.length,
+      ...project,
       room_data_json: JSON.stringify(roomGuids),
     };
 
@@ -2156,12 +2362,11 @@ const buildProjectTree = async (project, webProject) => {
     if (roomInfo) {
       const panelNodes = [];
       const panelGroups = JSON.parse(roomInfo.panel_group_count || "[]");
-
       for (const panelGuid of panelGroups) {
         const panelInfo = await getPanelInfoByGuid(panelGuid);
         if (panelInfo) {
           panelNodes.push({
-            id: `panel-${roomGuid}-${panelGuid}`,
+            id: `panel-${roomGuid}-${panelGuid}_${roomInfo.room_name}`,
             name: `${panelInfo.panel_list_name}（${panelInfo.gang_series.split("_")[0]
               } ${formatNameFront12(panelInfo.model_type) || "无模型"}）`,
             type: "panel",
@@ -2187,7 +2392,7 @@ const buildProjectTree = async (project, webProject) => {
 
   return {
     id: `project-${project.id}`,
-    name: `${project.projectName} (${roomNodes.length})`,
+    name: `${project.hotel_name} (${roomNodes.length})`,
     type: "project",
     project,
     webProject,
@@ -2379,7 +2584,7 @@ const addRoomType = async (data) => {
 
     // 更新本地数据
     projectNode.webProject = updatedProject;
-    projectNode.name = `${data.project.projectName} (${roomGuids.length})`;
+    projectNode.name = `${data.project.hotel_name} (${roomGuids.length})`;
 
     // 添加新节点
     projectNode.children.push({
@@ -2433,7 +2638,7 @@ const deleteRoom = async (data) => {
 
     // 更新本地数据
     projectNode.webProject = updatedProject;
-    projectNode.name = `${data.project.projectName} (${updatedRoomGuids.length})`;
+    projectNode.name = `${data.project.hotel_name} (${updatedRoomGuids.length})`;
 
     // 删除节点
     const roomIndex = projectNode.children.findIndex(
@@ -2449,18 +2654,248 @@ const deleteRoom = async (data) => {
 };
 
 // ==================== 面板组相关方法 ====================
-
+const CheckPanelGroup = (panelGroup) => {
+  if (!panelGroup || !panelGroup.panel_group_count) {
+    ElMessage.error("面板组数据无效");
+    return false;
+  }
+  return true;
+}
 /**
- * 下载项目所有CDR文件并打包为ZIP
+ * 清空项目预览总图
  */
-const downloadProjectCDRFiles = async () => {
+const SetProjectCdr = async () => {
+  // 获取项目信息以获取GUID
+  const projectNode = findProjectNode(selectedProjectId.value);
+  if (
+    !projectNode ||
+    !projectNode.webProject ||
+    !projectNode.webProject.guid
+  ) {
+    return null;
+  }
+  const response = await fetchData("PanelSelection/SetProjectUpdateCdr",
+    { GUID: projectNode.webProject.guid});
+
+  if (!response) {
+    throw new Error(`操作失败: ${response.statusText}`);
+  }
+}
+/**
+ * 判断后台是否正在处理当前项目
+ */
+const GetProjectStatus = async (projectGuid = null) => {
+  //console.log(projectGuid);
+  // 获取项目信息以获取GUID
+  let guidToUse = projectGuid;
+  if (!guidToUse) {
+    const projectNode = findProjectNode(selectedProjectId.value);
+    if (
+      !projectNode ||
+      !projectNode.webProject ||
+      !projectNode.webProject.guid
+    ) {
+      return null;
+    }
+    guidToUse = projectNode.webProject.guid;
+  }
+
+  const response = await fetchData("PanelSelection/GetWebProject",
+    { GUID: guidToUse, UserName: getCurrentUser() });
+
+  if (!response) {
+    throw new Error(`操作失败: ${response.statusText}`);
+  } else {
+    // 检查cdr_filename是否为空，以确定下载按钮是否可用
+    isProjectDownloadAvailable.value = response[0].cdr_filename !== null && response[0].cdr_filename !== "";
+    // 返回项目状态
+    return response[0].edit_status;
+  }
+}
+/**
+ * 发送项目CDR地址到后台制图工具
+ */
+const GetAllProjectCDR = async () => {
+  // 点击按钮时：弹出参数窗口，并回填历史填写的数据
+  const projectNode = findProjectNode(selectedProjectId.value);
+  if (!projectNode || !projectNode.webProject || !projectNode.webProject.guid) {
+    ElMessage.error("无法获取项目GUID");
+    return;
+  }
+
+  if (!Array.isArray(fontList.value) || fontList.value.length === 0) {
+    await getFont();
+  }
+  await loadProjectCdrEnums();
+
+  const projectGuid = projectNode.webProject.guid;
+  projectCdrGuid.value = projectGuid;
+  projectCdrProjectName.value = projectNode.webProject.hotel_name || "";
+
+  // 先从数据库回填（后端已将这些字段写入 tbl_web_project）
+  const webProject = await fetchData("PanelSelection/GetWebProject", {
+    GUID: projectGuid,
+    UserName: getCurrentUser(),
+  });
+  if (Array.isArray(webProject) && webProject.length > 0) {
+    applyProjectCdrParamsFromWebProject(webProject[0]);
+  }
+
+  // 再从本地缓存回填（如果用户之前填写过）
+  loadProjectCdrParams(projectGuid);
+
+  ensureProjectCdrDefaults();
+
+  showProjectCdrDialog.value = true;
+};
+
+const confirmProjectCdr = async () => {
+  if (!projectCdrGuid.value) {
+    ElMessage.error("无法获取项目GUID");
+    return;
+  }
+  ensureProjectCdrDefaults();
+  saveProjectCdrParams(projectCdrGuid.value);
+  showProjectCdrDialog.value = false;
+  await submitGetAllProjectCDR();
+};
+
+const submitGetAllProjectCDR = async () => {
+  // 获取项目信息以获取GUID
+  const projectNode = findProjectNode(selectedProjectId.value);
+  if (!projectNode || !projectNode.webProject || !projectNode.webProject.guid) {
+    ElMessage.error("无法获取项目GUID");
+    return;
+  }
+
+  const startTime = new Date();
+  const projectGuid = projectNode.webProject.guid;
+  const projectName = projectNode.webProject.hotel_name;
+
+  // 创建生成中记录
+  const record = {
+    guid: projectGuid,
+    name: projectName,
+    type: GenerationType.PROJECT,
+    status: GenerationStatus.IN_PROGRESS,
+    progress: 0,
+    progressText: "正在生成项目总览图...",
+    createdAt: formatDate(startTime),
+    startTime: startTime.getTime(),
+    completedAt: null,
+    duration: null,
+  };
+
+  // 检查是否有同名且状态为"生成中"的项目记录，如果有则将其标记为"已取消"
+  const existingRecordIndex = generationHistory.value.findIndex(
+    (item) => item.name === record.name && item.type === GenerationType.PROJECT && item.status === GenerationStatus.IN_PROGRESS
+  );
+  if (existingRecordIndex !== -1) {
+    generationHistory.value[existingRecordIndex].status = GenerationStatus.CANCELLED;
+  }
+
+  // 添加到生成历史
+  generationHistory.value.unshift(record);
+  isProjectGenerating.value = true;
+
+  // 添加到轮询项目列表
+  pollingItems.value.projects = pollingItems.value.projects || new Set();
+  pollingItems.value.projects.add(projectGuid);
+
+  // 调用后端API（补齐后端要求的新参数；ProjectName 不需要用户输入）
+  await fetchData("PanelSelection/GetAllProjectCDR", {
+    GUID: projectGuid,
+    UserName: getCurrentUser(),
+    Protocol: projectCdrForm.value.Protocol,
+    ProjectName: projectName,
+    SwitchSeries: projectCdrForm.value.SwitchSeries,
+    SocketSeries: projectCdrForm.value.SocketSeries === "无" ? "" : projectCdrForm.value.SocketSeries,
+    ChineseFont: projectCdrForm.value.ChineseFont,
+    ChineseFontSize: projectCdrForm.value.ChineseFontSize,
+    EnglishFont: projectCdrForm.value.EnglishFont,
+    EnglishFontSize: projectCdrForm.value.EnglishFontSize,
+  });
+
+  // 如果轮询未启动，启动轮询
+  if (!isPollingActive.value) {
+    startPolling();
+  }
+};
+/**
+ * 下载项目所有PLT、CDR和PNG文件并打包为ZIP
+ */
+const DownloadProjectCDR = async () => {
+  try {
+    // 获取项目信息以获取GUID
+    const projectNode = findProjectNode(selectedProjectId.value);
+    if (
+      !projectNode ||
+      !projectNode.webProject ||
+      !projectNode.webProject.guid
+    ) {
+      ElMessage.error("无法获取项目GUID");
+      return;
+    }
+
+    const loading = ElLoading.service({ text: "正在准备下载文件..." });
+
+    // 调用后端API获取ZIP文件
+    const response = await fetch(`${config.ApiList[1]}PanelSelection/DownloadProjectCDR`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ GUID: projectNode.webProject.guid, UserName: getCurrentUser() })
+    });
+
+    if (!response.ok) {
+      throw new Error(`下载失败: ${response.statusText}`);
+    }
+
+    // 获取文件内容
+    const blob = await response.blob();
+
+    // 生成带日期时间的文件名
+    const now = new Date();
+    const dateStr = now.getFullYear() +
+      String(now.getMonth() + 1).padStart(2, '0') +
+      String(now.getDate()).padStart(2, '0');
+    const timeStr = String(now.getHours()).padStart(2, '0') +
+      String(now.getMinutes()).padStart(2, '0') +
+      String(now.getSeconds()).padStart(2, '0');
+
+    const fileName = `${projectNode.webProject.hotel_name}_${dateStr}_${timeStr}.zip`;
+
+    // 创建下载链接并触发下载
+    const url = window.URL.createObjectURL(blob);
+    const link = document.createElement('a');
+    link.href = url;
+    link.download = fileName;
+    document.body.appendChild(link);
+    link.click();
+
+    // 清理
+    document.body.removeChild(link);
+    window.URL.revokeObjectURL(url);
+
+    loading.close();
+    ElMessage.success("文件下载成功");
+  } catch (error) {
+    console.error("下载文件失败:", error);
+    ElMessage.error(`下载失败: ${error.message}`);
+  }
+}
+/**
+ * 下载项目所有PLT、CDR和PNG文件并打包为ZIP
+ */
+const downloadProjectPLTFiles = async () => {
   if (!selectedProjectId.value) {
     ElMessage.warning("请先选择项目");
     return;
   }
 
   try {
-    const loading = ElLoading.service({ text: "正在准备下载CDR文件..." });
+    const loading = ElLoading.service({ text: "正在准备下载文件..." });
 
     // 获取项目信息以获取GUID
     const projectNode = findProjectNode(selectedProjectId.value);
@@ -2478,8 +2913,9 @@ const downloadProjectCDRFiles = async () => {
     const projects = await fetchData("PanelSelection/GetWebProjectCDR", {
       GUID: projectNode.webProject.guid,
     });
+    console.log(projects);
     if (!projects || !Array.isArray(projects)) {
-      ElMessage.error("获取CDR文件地址失败");
+      ElMessage.error("获取文件地址失败");
       loading.close();
       return;
     }
@@ -2493,20 +2929,27 @@ const downloadProjectCDRFiles = async () => {
 
     // 创建JSZip实例
     const zip = new JSZip();
-    let filesAdded = 0;
+
+    // 创建PLT和CDR文件夹
+    const pltFolder = zip.folder("PLT");
+    const cdrFolder = zip.folder("CDR");
+
+    let pltFilesAdded = 0;
+    let cdrFilesAdded = 0;
+    let pngFilesAdded = 0;
     const totalFiles = projects.length;
 
     if (totalFiles === 0) {
-      ElMessage.warning("当前项目没有可下载的CDR文件");
+      ElMessage.warning("当前项目没有可下载的文件");
       loading.close();
       return;
     }
 
     // 更新loading文本
-    loading.setText(`正在下载文件... 0/${totalFiles}`);
+    loading.setText(`正在下载PLT文件... 0/${totalFiles}`);
 
-    // 下载所有文件并添加到zip
-    const downloadPromises = projects.map(async (address) => {
+    // 下载所有PLT文件并添加到zip的PLT文件夹
+    const pltDownloadPromises = projects.map(async (address) => {
       try {
         // 添加config.PicAds前缀
         const fullUrl = `${config.PicAds}${address.cdr_filename}`;
@@ -2514,32 +2957,118 @@ const downloadProjectCDRFiles = async () => {
         // 使用fetch下载文件
         const response = await fetch(fullUrl);
         if (!response.ok) {
-          throw new Error(`下载文件失败: ${address.cdr_filename}`);
+          throw new Error(`下载PLT文件失败: ${address.cdr_filename}`);
+        }
+
+        // 获取文件内容
+        const blob = await response.blob();
+        // 从地址中提取文件名，确保只保留文件名部分，不包含任何路径信息
+        const fileName = `数量${address.carving_quantity}_${projectNode.webProject.hotel_name}_${address.room_name
+          }_${address.panel_list_name}_${address.gang_series || "未知系列"
+          }_${formatNameFront12(address.model_type)}_${formatDate1(new Date())}.plt`;
+
+        // 将文件添加到ZIP的PLT文件夹
+        pltFolder.file(fileName, blob);
+
+        pltFilesAdded++;
+        loading.setText(`正在下载PLT文件... ${pltFilesAdded}/${totalFiles}`);
+      } catch (error) {
+        console.error("下载单个PLT文件失败:", error);
+        // 继续尝试下载其他文件
+      }
+    });
+
+    // 等待所有PLT文件下载完成
+    await Promise.all(pltDownloadPromises);
+
+    // 更新loading文本，开始下载CDR文件
+    loading.setText(`正在下载CDR文件... 0/${totalFiles}`);
+
+    // 下载所有CDR文件并添加到zip的CDR文件夹
+    const cdrDownloadPromises = projects.map(async (address) => {
+      try {
+        // 将路径最后3个字符"plt"修改为"cdr"
+        let cdrPath = address.cdr_filename;
+        if (cdrPath.length >= 3 && cdrPath.substring(cdrPath.length - 3).toLowerCase() === 'plt') {
+          cdrPath = cdrPath.substring(0, cdrPath.length - 3) + 'cdr';
+        }
+
+        // 添加config.PicAds前缀
+        const fullUrl = `${config.PicAds}${cdrPath}`;
+
+        // 使用fetch下载文件
+        const response = await fetch(fullUrl);
+        if (!response.ok) {
+          throw new Error(`下载CDR文件失败: ${cdrPath}`);
         }
 
         // 获取文件内容
         const blob = await response.blob();
         //console.log(address);
         // 从地址中提取文件名，确保只保留文件名部分，不包含任何路径信息
-        const fileName = `数量：${address.carving_quantity}_${projectNode.webProject.hotel_name}_${address.room_name
+        const fileName = `数量${address.carving_quantity}_${projectNode.webProject.hotel_name}_${address.room_name
           }_${address.panel_list_name}_${address.gang_series || "未知系列"
           }_${formatNameFront12(address.model_type)}_${formatDate1(new Date())}.cdr`;
 
-        // 将文件直接添加到ZIP的根目录，确保所有文件都在同一层级下
-        zip.file(fileName, blob);
+        // 将文件添加到ZIP的CDR文件夹
+        cdrFolder.file(fileName, blob);
 
-        filesAdded++;
-        loading.setText(`正在下载文件... ${filesAdded}/${totalFiles}`);
+        cdrFilesAdded++;
+        loading.setText(`正在下载CDR文件... ${cdrFilesAdded}/${totalFiles}`);
       } catch (error) {
-        console.error("下载单个文件失败:", error);
+        console.error("下载单个CDR文件失败:", error);
         // 继续尝试下载其他文件
       }
     });
 
-    // 等待所有下载完成
-    await Promise.all(downloadPromises);
+    // 等待所有CDR文件下载完成
+    await Promise.all(cdrDownloadPromises);
 
-    if (filesAdded === 0) {
+    // 更新loading文本，开始下载PNG文件
+    loading.setText(`正在下载PNG文件... 0/${totalFiles}`);
+
+    // 下载所有PNG文件并添加到zip的PNG文件夹
+    const pngDownloadPromises = projects.map(async (address) => {
+      try {
+        // 检查thumbnail_large是否存在
+        if (!address.thumbnail_large) {
+          console.warn(address, "PNG文件路径不存在，跳过下载");
+          return;
+        }
+
+        // 添加config.PicAds前缀
+        const fullUrl = `${config.PicAds}${address.thumbnail_large}`;
+
+        // 使用fetch下载文件
+        const response = await fetch(fullUrl);
+        if (!response.ok) {
+          throw new Error(`下载PNG文件失败: ${address.thumbnail_large}`);
+        }
+
+        // 获取文件内容
+        const blob = await response.blob();
+
+        // 使用与PLT文件相同的命名规则，但后缀为.png
+        const fileName = `数量${address.carving_quantity}_${projectNode.webProject.hotel_name}_${address.room_name
+          }_${address.panel_list_name}_${address.gang_series || "未知系列"
+          }_${formatNameFront12(address.model_type)}_${formatDate1(new Date())}.png`;
+
+        // 将文件添加到ZIP的PLT文件夹
+        pltFolder.file(fileName, blob);
+
+        pngFilesAdded++;
+        loading.setText(`正在下载PNG文件... ${pngFilesAdded}/${totalFiles}`);
+      } catch (error) {
+        console.error("下载单个PNG文件失败:", error);
+        // 继续尝试下载其他文件
+      }
+    });
+
+    // 等待所有PNG文件下载完成
+    await Promise.all(pngDownloadPromises);
+
+    // 检查是否有文件下载成功
+    if (pltFilesAdded === 0 && cdrFilesAdded === 0 && pngFilesAdded === 0) {
       ElMessage.error("所有文件下载失败");
       loading.close();
       return;
@@ -2561,9 +3090,26 @@ const downloadProjectCDRFiles = async () => {
     URL.revokeObjectURL(link.href);
 
     loading.close();
-    ElMessage.success(`成功下载 ${filesAdded}/${totalFiles} 个文件`);
+
+    // 显示下载结果
+    let successMessage = `成功下载 `;
+    const fileTypes = [];
+
+    if (pltFilesAdded > 0) {
+      fileTypes.push(`${pltFilesAdded}/${totalFiles} 个PLT文件`);
+    }
+    if (cdrFilesAdded > 0) {
+      fileTypes.push(`${cdrFilesAdded}/${totalFiles} 个CDR文件`);
+    }
+    if (pngFilesAdded > 0) {
+      fileTypes.push(`${pngFilesAdded}/${totalFiles} 个PNG文件`);
+    }
+
+    successMessage += fileTypes.join("，");
+
+    ElMessage.success(successMessage);
   } catch (error) {
-    console.error("下载项目CDR文件失败:", error);
+    console.error("下载项目文件失败:", error);
     ElMessage.error("下载失败，请稍后重试");
   }
 };
@@ -2572,6 +3118,7 @@ const downloadProjectCDRFiles = async () => {
  * 处理面板单元选择变化
  */
 const handlePanelUnitChange = async (index, panelUnitGuid) => {
+  console.log(index, panelUnitGuid);
   const selectedUnit = availablePanelUnits.value.find(
     (unit) => unit.guid === panelUnitGuid
   );
@@ -2584,6 +3131,7 @@ const handlePanelUnitChange = async (index, panelUnitGuid) => {
     await clearPanelGroupPreview();
     // 保存面板配置
     await savePanelConfig();
+    await SetProjectCdr();
   }
 };
 
@@ -2902,6 +3450,8 @@ const confirmAddPanel = async () => {
           carving_quantity: newPanelForm.value.carving_quantity,
           position: newPanelForm.value.position,
         });
+        // 调用GetProjectStatus更新项目状态
+        await GetProjectStatus();
         // 更新树节点
         const roomNode = findRoomNode(
           currentRoomData.value.projectId,
@@ -2922,7 +3472,7 @@ const confirmAddPanel = async () => {
           }
         }
 
-        ElMessage.success("面板组修改成功");
+        //ElMessage.success("面板组修改成功");
       }
     } else {
       // 新增模式
@@ -3138,11 +3688,6 @@ const loadPanelConfiguration = async (panelNode) => {
 
     initPanelConfigTable(panelNode);
 
-    // 注释掉清空单个面板配置表单和预览图的代码，以保持选择状态
-    // currentPanelUnit.value = null;
-    // panelUnitForm.value = [];
-    // singlePanelPreview.value = '';  // 新增：清除单面板预览图
-
     //ElMessage.success('面板配置加载成功');
   } catch (error) {
     console.error("加载面板配置失败:", error);
@@ -3298,7 +3843,7 @@ const editPanelConfig = async (index) => {
       panelConfig.panelUnitGuid = panelUnitGuid;
       await savePanelConfig();
       await loadPanelUnitConfiguration(panelUnitGuid, locations);
-      ElMessage.success("面板配置编辑已启动");
+      //ElMessage.success("面板配置编辑已启动");
     }
   } catch (error) {
     console.error("编辑面板配置失败:", error);
@@ -3373,7 +3918,7 @@ const savePanelConfig = async () => {
     const configData = {
       panelUnitGuids: panelConfigTable.value
         .map((item) => item.panelUnitGuid)
-        .filter((guid) => guid && guid.length === 32), // 只保留有效的GUID
+        .filter((guid) => guid), // 只保留有效的GUID
     };
 
     const panelInfo = await getPanelInfoByGuid(
@@ -3386,6 +3931,8 @@ const savePanelConfig = async () => {
         // 取消gang_material_id的绑定
         //gang_material_id: 0
       });
+      // 调用GetProjectStatus更新项目状态
+      await GetProjectStatus();
 
       currentPanelNode.value.panelInfo.panel_info_json =
         JSON.stringify(configData);
@@ -3445,6 +3992,7 @@ const showPreview = async (ProcessType) => {
 
     if (rs.data.isok) {
       const rsv = rs.data.response;
+
       if (rsv) {
         // 更新面板组信息
         if (panelInfo) {
@@ -3461,6 +4009,8 @@ const showPreview = async (ProcessType) => {
           updateData.design_status = "生成中";
 
           await updateDatabase("PanelSelection/WebPanelListUpdate", updateData);
+            // 调用GetProjectStatus更新项目状态
+            await GetProjectStatus();
         }
 
         // 添加生成记录到历史
@@ -3472,7 +4022,7 @@ const showPreview = async (ProcessType) => {
           const record = {
             id: Date.now() + Math.random().toString(36).substr(2, 9),
             guid: currentPanelNode.value.panelGuid,
-            name: `${project?.projectName || ""}_${currentPanelNode.value.panelInfo.panel_list_name || ""
+            name: `${project?.hotel_name || ""}_${currentPanelNode.value.panelInfo.panel_list_name || ""
               }`,
             type: GenerationType.PREVIEW,
             status: GenerationStatus.IN_PROGRESS,
@@ -3493,13 +4043,8 @@ const showPreview = async (ProcessType) => {
 
           generationHistory.value.unshift(record);
           pollingItems.value.panelLists.add(record.guid);
-        }
 
-        const MIN_EXECUTION_TIME = 555;
-        const elapsedTime = performance.now() - startTime;
-        const remainingTime = MIN_EXECUTION_TIME - elapsedTime;
-        if (remainingTime > 0)
-          await new Promise((resolve) => setTimeout(resolve, remainingTime));
+        }
 
         if (!isPollingActive.value) {
           startPolling();
@@ -3589,7 +4134,9 @@ const showSinglePanelPreview = async () => {
             }),
           };
           // 保存到数据库
-          await updateDatabase("PanelSelection/WebPanelUnitUpdate", saveData);
+        await updateDatabase("PanelSelection/WebPanelUnitUpdate", saveData);
+        // 调用GetProjectStatus更新项目状态
+        await GetProjectStatus();
         } catch (saveError) {
           console.error("保存单个面板预览对象到remark字段失败:", saveError);
         }
@@ -3601,7 +4148,7 @@ const showSinglePanelPreview = async () => {
         const record = {
           id: Date.now() + Math.random().toString(36).substr(2, 9),
           guid: currentPanelUnit.value,
-          name: `${project?.projectName || ""}_${panelUnit.panel_name || ""}`,
+          name: `${project?.hotel_name || ""}_${panelUnit.panel_name || ""}`,
           type: GenerationType.SINGLE_PANEL,
           status: GenerationStatus.IN_PROGRESS,
           progress: 0,
@@ -3628,12 +4175,6 @@ const showSinglePanelPreview = async () => {
           unitTableData.value[unitIndex].design_status = "生成中";
         }
 
-        const MIN_EXECUTION_TIME = 555;
-        const elapsedTime = performance.now() - startTime;
-        const remainingTime = MIN_EXECUTION_TIME - elapsedTime;
-        if (remainingTime > 0)
-          await new Promise((resolve) => setTimeout(resolve, remainingTime));
-
         ElMessage.success("设计图已经加入生成队列，请稍后！");
 
         if (!isPollingActive.value) {
@@ -4006,7 +4547,7 @@ const refreshPanelGroupPreview = async () => {
         ) {
           panelGroupPreview.value = config.PicAds + panelInfo.thumbnail_large;
           await reloadTreeData();
-          ElMessage.success("面板组预览图刷新成功");
+          //ElMessage.success("面板组预览图刷新成功");
         } else {
           panelGroupPreview.value = "";
           //ElMessage.info('面板组预览图仍在生成中');
@@ -4178,6 +4719,8 @@ const savePanelUnitConfig = async () => {
         cdr_filename: "",
       };
       await updateDatabase("PanelSelection/WebPanelUnitUpdate", updateData);
+        // 调用GetProjectStatus更新项目状态
+        await GetProjectStatus();
 
       // 保存成功后刷新面板单元列表
       if (projectGuid) {
@@ -4187,7 +4730,7 @@ const savePanelUnitConfig = async () => {
       // 清空当前预览图
       singlePanelPreview.value = "";
 
-      ElMessage.success("配置保存成功");
+      //ElMessage.success("配置保存成功");
 
       // 保存成功后重载树数据并重新选中当前节点
       await reloadTreeData();
@@ -4234,7 +4777,7 @@ const handleUnitRowClick = async (row) => {
     await updateSinglePanelPreviewFromUnit(row);
 
     hideLoading();
-    ElMessage.success(`已加载面板单元: ${row.panel_name}`);
+    //ElMessage.success(`已加载面板单元: ${row.panel_name}`);
   } catch (error) {
     hideLoading();
     console.error("加载面板单元配置失败:", error);
@@ -4577,7 +5120,7 @@ const updatePanelUnit = async () => {
     };
     await updateDatabase("PanelSelection/WebPanelUnitUpdate", updateData);
 
-    ElMessage.success("面板单元更新成功，预览图已重置");
+    //ElMessage.success("面板单元更新成功，预览图已重置");
     showAddPanelUnitDialog.value = false;
 
     // 刷新列表
@@ -4799,7 +5342,7 @@ const saveIconConfig = (iconData) => {
     updatePanelUnitFormFromMerged();
     savePanelUnitConfig();
     iconDialogVisible.value = false;
-    ElMessage.success("图标选择成功，已自动填充中英文内容");
+    //ElMessage.success("图标选择成功，已自动填充中英文内容");
   }
 };
 /**
@@ -5029,6 +5572,8 @@ const autoSavePanelUnitConfig = async () => {
       };
       // 保存到数据库
       await updateDatabase("PanelSelection/WebPanelUnitUpdate", saveData);
+      // 调用GetProjectStatus更新项目状态
+      await GetProjectStatus();
     }
   } catch (error) {
     console.error("自动保存单个面板配置失败:", error);
@@ -5067,6 +5612,8 @@ const autoSavePanelGroupConfig = async () => {
 
       // 保存到数据库
       await updateDatabase("PanelSelection/WebPanelListUpdate", saveData);
+      // 调用GetProjectStatus更新项目状态
+      await GetProjectStatus();
     }
   } catch (error) {
     console.error("自动保存面板组配置失败:", error);
@@ -5112,7 +5659,7 @@ const generateSinglePanelPreviewObject = async (generateImage = true) => {
     if (!projectNode || !projectNode.webProject) {
       return null;
     }
-    const projectName = projectNode.webProject.hotel_name;
+    const hotel_name = projectNode.webProject.hotel_name;
     const projectId = projectNode.webProject.report_id;
     const timestamp = Date.now().toString();
     const pictureNumSuffix = timestamp.slice(-8);
@@ -5125,7 +5672,7 @@ const generateSinglePanelPreviewObject = async (generateImage = true) => {
     );
     const panelUnit = panelUnits[0];
     if (!panelUnit) return null;
-    const pictureNum = `Unit_${projectName}_${panelUnit.panel_name}_${pictureNumSuffix}`;
+    const pictureNum = `Unit_${hotel_name}_${panelUnit.panel_name}_${pictureNumSuffix}`;
     let materialLibraryName = "";
     let templateName = "";
     let templateNameIndex = "";
@@ -5327,7 +5874,7 @@ const generateSinglePanelPreviewObject = async (generateImage = true) => {
       PictureNum: pictureNum,
       Process: generateImage ? 0 : -1, // -1表示只生成结构体
       ProjectId: projectId || "未知项目ID",
-      ProjectName: projectName || "未知酒店",
+      ProjectName: hotel_name || "未知酒店",
       TemplateName: templateName || "未找到模板",
       TemplateNameIndex: templateNameIndex || "未找到模板索引",
       User: currentUser || "未知用户",
@@ -5377,7 +5924,7 @@ const generatePanelGroupStructureData = async (generateImage = true) => {
       return null;
     }
 
-    const projectName = projectNode.webProject.hotel_name;
+    const hotel_name = projectNode.webProject.hotel_name;
     const projectId = projectNode.webProject.report_id;
     const timestamp = Date.now().toString();
     const pictureNumSuffix = timestamp.slice(-8);
@@ -5615,7 +6162,9 @@ const generatePanelGroupStructureData = async (generateImage = true) => {
       console.error("解析LOGO配置失败:", error);
       logoConfigValue = {};
     }
-    const pictureNum = `List_${projectName}_${currentPanelNode.value.panelInfo.panel_list_name}_${pictureNumSuffix}`;
+
+    var panelNode = currentPanelNode.value?.id.split('_').pop() || "";
+    const pictureNum = `List_${hotel_name}_${panelNode}_${currentPanelNode.value.panelInfo.panel_list_name}_${pictureNumSuffix}`;
 
     // 构建完整的previewObject结构体
     const previewObject = {
@@ -5624,7 +6173,7 @@ const generatePanelGroupStructureData = async (generateImage = true) => {
       PictureNum: pictureNum,
       Process: generateImage ? 0 : -1, // -1表示只生成结构体
       ProjectId: projectId || "未知项目ID",
-      ProjectName: projectName || "未知酒店",
+      ProjectName: hotel_name || "未知酒店",
       TemplateName: templateName || "未找到模板",
       TemplateNameIndex: templateNameIndex || "未找到模板索引",
       User: currentUser || "未知用户",
@@ -5675,10 +6224,12 @@ const handleLogoPositionChange = (position) => {
       selectedModel.value.LOGO_R?.toString() || "";
   } else {
     logoConfig.value.LogoIndexNumber = "";
+    logoConfig.value.LogoPosition = "";
+    logoConfig.value.LogoFileName = "";
   }
 
   selectedLogoPosition.value = position;
-
+  console.log(position, logoConfig.value)
   // 如果选择了"无图标"，清空选中的Logo
   if (position === "none") {
     selectedLogo.value = null;
@@ -6131,6 +6682,10 @@ onMounted(async () => {
   showLoading("页面加载中...");
 
   try {
+    const isNew = await localHttp.post("Huoban/GetAllProjectReportData");
+    if (isNew.data.isok) {
+      console.log(isNew.data.message);
+    }
     await getProject();
     const data = await fetchData("PanelSelection/SeriesQuery");
     seriesList.value = data;