Merge branch 'master' of http://192.168.1.22:3000/ClientApps/pqs-9100_client

build/clean-and-build.bat

@@ -1,52 +1,18 @@
 @echo off
 chcp 65001 >nul
 echo ========================================
-echo 清理并重新打包
+echo 清理并重新打包`r
 echo ========================================
 echo.
 
-echo [1/5] 结束所有相关进程...
+echo [1/5] 结束所有相关进<EFBFBD>?..
 echo     正在停止 NPQS9100...
 taskkill /F /IM NPQS9100.exe 2>nul
 
-echo     正在停止 MySQL...
-taskkill /F /IM mysqld.exe 2>nul
-timeout /t 2 /nobreak >nul
-
-REM 验证 MySQL 是否真的停止了
-tasklist | find /I "mysqld.exe" >nul 2>&1
-if %errorlevel% equ 0 (
-    echo     ! MySQL 进程还在运行，再次尝试...
-    taskkill /F /IM mysqld.exe 2>nul
-    timeout /t 2 /nobreak >nul
-    
-    REM 再次验证
-    tasklist | find /I "mysqld.exe" >nul 2>&1
-    if %errorlevel% equ 0 (
-        echo     ! MySQL 进程仍在运行，使用强制方法...
-        REM 找出所有 mysqld.exe 的 PID 并逐个杀死
-        for /f "tokens=2" %%a in ('tasklist ^| find /I "mysqld.exe"') do (
-            echo     强制结束 PID: %%a
-            taskkill /F /PID %%a 2>nul
-        )
-        timeout /t 2 /nobreak >nul
-    )
-)
-
-REM 最终验证
-tasklist | find /I "mysqld.exe" >nul 2>&1
-if %errorlevel% equ 0 (
-    echo     ✗ 警告：MySQL 进程可能仍在运行
-    echo     请手动运行 build\extraResources\mysql\kill-running-port.bat
-    pause
-) else (
-    echo     ✓ MySQL 已完全停止
-)
-
 echo     正在停止 Java...
 taskkill /F /IM java.exe 2>nul
 taskkill /F /IM javaw.exe 2>nul
-echo     ✓ 所有进程已结束
+echo     <EFBFBD>?所有进程已结束
 timeout /t 2 /nobreak >nul
 echo.
 
@@ -55,50 +21,49 @@ cd /d "%~dp0.."
 if exist out (
     rmdir /s /q out 2>nul
     if exist out (
-        echo     ✗ 删除失败，请手动删除 out 目录
+        echo     <EFBFBD>?删除失败，请手动删除 out 目录
         pause
         exit /b 1
     ) else (
-        echo     ✓ out 目录已删除
+        echo     <EFBFBD>?out 目录已删除`r
     )
 ) else (
-    echo     ✓ out 目录不存在
+    echo     <EFBFBD>?out 目录不存在`r
 )
 echo.
 
 echo [3/5] 构建前端代码...
 call npm run build-frontend
 if %errorlevel% neq 0 (
-    echo     ✗ 前端构建失败
+    echo     <EFBFBD>?前端构建失败
     pause
     exit /b 1
 )
-echo     ✓ 前端代码构建完成
+echo     <EFBFBD>?前端代码构建完成
 echo.
 
 echo [4/5] 构建 electron 代码...
 call npm run build-electron
 if %errorlevel% neq 0 (
-    echo     ✗ electron 构建失败
+    echo     <EFBFBD>?electron 构建失败
     pause
     exit /b 1
 )
-echo     ✓ electron 代码构建完成
+echo     <EFBFBD>?electron 代码构建完成
 echo.
 
 echo [5/5] 打包 Windows 版本（包含代码加密）...
 call npm run build-w
 if %errorlevel% neq 0 (
-    echo     ✗ 打包失败
+    echo     <EFBFBD>?打包失败
     pause
     exit /b 1
 )
 echo.
 
 echo ========================================
-echo ✓ 打包完成！
+echo <EFBFBD>?打包完成！`r
 echo 输出目录: out\win-unpacked\
 echo ========================================
 echo.
 pause
-

build/extraResources/mysql/reset-init.sql

@@ -1,6 +0,0 @@
-ALTER USER IF EXISTS 'root'@'localhost' IDENTIFIED BY 'njcnpqs';
-CREATE USER IF NOT EXISTS 'root'@'127.0.0.1' IDENTIFIED BY 'njcnpqs';
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'127.0.0.1' WITH GRANT OPTION;
-CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY 'njcnpqs';
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
-FLUSH PRIVILEGES;

cmd/builder.json

@@ -35,6 +35,10 @@
       "from": "build/extraResources/read.txt",
       "to": "extraResources/read.txt"
     },
+    {
+      "from": "build/extraResources/使用说明.txt",
+      "to": "extraResources/使用说明.txt"
+    },
     {
       "from": "scripts/",
       "to": "scripts",
@@ -51,9 +55,30 @@
       "from": "build/extraResources/jre",
       "to": "jre",
       "filter": ["**/*"]
+    },
+    {
+      "from": "build/NPQS9100-启动器.bat",
+      "to": "NPQS9100-启动器.bat"
+    },
+    {
+      "from": "build/extraResources/使用说明.txt",
+      "to": "使用说明.txt"
+    },
+    {
+      "from": "build/upgrade.bat",
+      "to": "upgrade.bat"
+    },
+    {
+      "from": "build/rollback.bat",
+      "to": "rollback.bat"
+    },
+    {
+      "from": "build/README-升级回滚.txt",
+      "to": "README-升级回滚.txt"
     }
   ],
   "win": {
+    "icon": "public/images/icon.png",
     "artifactName": "${productName}-${os}-${version}-${arch}.${ext}",
     "target": [
       {

doc/便携式JRE集成指南.md

@@ -1,133 +0,0 @@
-## 便携式 JRE/JDK8 集成指南
-
-本指南介绍如何将 JRE 8 以“便携式”（解压即用、无需安装）的方式随应用打包，并在 Electron 主进程中通过绝对路径调用，从而避免要求用户在系统中安装 JDK/JRE。
-
-### 为什么选择便携式 JRE
-- 无需管理员权限与系统环境变量配置，用户无感知。
-- 不污染系统环境（不写入 JAVA_HOME/PATH）。
-- 跨平台一致，可精简体积、可控版本。
-
-### 适用场景
-- 运行 Java 程序或 JAR 包（仅需运行时）。
-- 不需要 javac/jcmd/jmap 等开发/诊断工具（若需要，请改为随包便携式 JDK）。
-
-### 推荐的 JRE 8 发行版（可再分发）
-- Azul Zulu 8 JRE（可选 ZuluFX 含 JavaFX）：[下载页面](https://www.azul.com/downloads/?version=java-8-lts&package=jre)
-- BellSoft Liberica 8 JRE（Standard/Full，Full 含 JavaFX）：[下载页面](https://bell-sw.com/pages/downloads/#/java-8-lts)
-- Eclipse Temurin 8 JRE（Adoptium）：[下载页面](https://adoptium.net/temurin/releases/?version=8)
-
-选择要点：
-- 需要 AWT/Swing/字体/打印 → 选择非 headless 包。
-- 需要 JavaFX → 选择 Liberica Full 或 ZuluFX。
-- 仅命令行/服务端 → 任意 JRE 8（headless 也可）。
-
-### 目录放置约定
-将解压后的 JRE 放入项目的 `build/extraResources/jre`，保证内部存在 `bin/java(.exe)`：
-
-```
-build/
-  extraResources/
-    jre/
-      bin/
-        java(.exe)
-      lib/
-      ...
-```
-
-构建后在生产环境可通过 `process.resourcesPath` 访问：
-`<app>/resources/extraResources/jre/bin/java(.exe)`。
-
-### 主进程调用示例
-在 `electron/preload/lifecycle.js` 或你的业务模块中封装 Java 运行工具（开发/生产两种路径）：
-
-```js
-const path = require('path');
-const { spawn } = require('child_process');
-
-function getExtraResourcesDir() {
-  // 开发态：使用项目目录；生产态：使用 asar/resources 目录
-  const isDev = !!process.env.EE_DEV || process.env.NODE_ENV === 'development';
-  return isDev
-    ? path.join(process.cwd(), 'build', 'extraResources')
-    : path.join(process.resourcesPath, 'extraResources');
-}
-
-function getJavaBinPath() {
-  const extraDir = getExtraResourcesDir();
-  const javaBinName = process.platform === 'win32' ? 'java.exe' : 'java';
-  return path.join(extraDir, 'jre', 'bin', javaBinName);
-}
-
-function runJavaJar(jarAbsPath, args = [], options = {}) {
-  const javaPath = getJavaBinPath();
-  const child = spawn(javaPath, ['-jar', jarAbsPath, ...args], {
-    stdio: 'inherit',
-    ...options,
-  });
-  return child;
-}
-
-async function ensureJavaVersion(logger) {
-  return new Promise((resolve) => {
-    const child = spawn(getJavaBinPath(), ['-version']);
-    let out = '';
-    let err = '';
-    child.stdout && child.stdout.on('data', (d) => (out += d.toString()))
-    child.stderr && child.stderr.on('data', (d) => (err += d.toString()))
-    child.on('close', () => {
-      const text = (out + '\n' + err).trim();
-      logger && logger.info('[java] version check:', text);
-      resolve(text.includes('1.8.0'));
-    });
-  });
-}
-
-module.exports = { getJavaBinPath, runJavaJar, ensureJavaVersion };
-```
-
-在生命周期中调用（示例）：
-
-```js
-const { logger } = require('ee-core/log');
-const path = require('path');
-const { runJavaJar, ensureJavaVersion } = require('./java-runner');
-
-class Lifecycle {
-  async ready() {
-    const ok = await ensureJavaVersion(logger);
-    if (!ok) {
-      logger.error('[java] 未检测到 JRE 8，请检查 extraResources/jre 是否存在');
-    }
-  }
-
-  async windowReady() {
-    const jarPath = path.join(process.resourcesPath || process.cwd(), 'extraResources', 'tools', 'your-app.jar');
-    // 示例：延后在某业务时机再启动 Java 进程
-    // const proc = runJavaJar(jarPath, ['--arg1', 'value']);
-  }
-}
-```
-
-注意：示例中的 `java-runner` 为上文工具函数文件，实际请按你的项目结构放置。
-
-### 验证清单
-- 运行 `jre/bin/java -version` 输出包含 `1.8.0_xxx`。
-- 若涉及 GUI/字体/打印，验证 AWT/Swing 中文渲染与打印。
-- 若需 JavaFX，验证 JavaFX Demo 启动。
-- 若涉及 TLS/HTTPS，验证 SSL 通信正常。
-
-### 许可与合规
-- Azul Zulu、Eclipse Temurin（Adoptium）、BellSoft Liberica 的 JRE/JDK 8 发行包均可免费再分发（GPLv2+CE 或厂商许可证）。
-- 建议在应用的“关于/许可证”中附上所选发行版的许可证链接与致谢。
-
-### 常见问题
-1) 是否“阉割”？
-— 上述 JRE 8 发行版均为标准运行时，通过兼容性测试；JRE 不包含开发者工具属于正常区别，不是删减。
-
-2) 何时需要 JDK 而不是 JRE？
-— 需要 `javac` 编译或 `jcmd/jmap` 等诊断工具，或你的 Java 组件依赖 `tools.jar` 时。
-
-3) 体积如何优化？
-— 选择 headless（若无 GUI 需求）、去除无用语言/字体包；或改用 JDK 9+ 使用 jlink（不适用于 8）。
-
-

doc/打包方案对比.md

@@ -1,436 +0,0 @@
-# 应用打包方案对比与实现
-
-本文档详细说明 ElectronEgg 应用的两种打包方案：纯绿色版方案 和 双版本方案。
-
----
-
-## 方案对比
-
-| 特性 | 方案一：纯绿色版 | 方案二：双版本打包 |
-|------|-----------------|-------------------|
-| **打包产物** | 单个便携版 exe | 安装版 exe + 便携版 exe |
-| **安装过程** | 无需安装 | 安装版需安装，便携版无需 |
-| **桌面快捷方式** | 应用内自动创建 | 安装版自动创建，便携版手动或自动 |
-| **开始菜单** | 无 | 安装版有 |
-| **卸载程序** | 无（直接删除） | 安装版有 |
-| **适用场景** | 临时使用、U盘携带 | 正式部署、企业分发 |
-| **用户体验** | 灵活、轻量 | 专业、完整 |
-| **打包时间** | 快 | 较慢（打包两次） |
-| **分发复杂度** | 简单（单文件） | 中等（两个文件） |
-
----
-
-## 方案一：纯绿色版 + 自动创建快捷方式
-
-### 特点
-- ✅ 单个 exe 文件，双击即用
-- ✅ 首次启动时询问是否创建桌面快捷方式
-- ✅ 无需安装，无需卸载
-- ✅ 适合快速分发和临时使用
-
-### 实现步骤
-
-#### 1. 修改打包配置
-
-**文件**：[cmd/builder.json](../cmd/builder.json)
-
-```json
-{
-  "productName": "南京灿能工具",
-  "appId": "com.canneng.tool",
-  "copyright": "© 2025 hongawen",
-  "directories": {
-    "output": "out"
-  },
-  "asar": true,
-  "files": [
-    "**/*",
-    "!cmd/",
-    "!data/",
-    "!electron/",
-    "!frontend/",
-    "!logs/",
-    "!out/",
-    "!go/",
-    "!python/"
-  ],
-  "extraResources": {
-    "from": "build/extraResources/",
-    "to": "extraResources"
-  },
-  "publish": [
-    {
-      "provider": "generic",
-      "url": "https://your-update-server.com"
-    }
-  ],
-  "win": {
-    "icon": "build/icons/icon.ico",
-    "artifactName": "${productName}-${os}-${version}-${arch}.${ext}",
-    "target": [
-      {
-        "target": "portable"
-      }
-    ]
-  }
-}
-```
-
-#### 2. 添加自动创建快捷方式功能
-
-**文件**：[electron/preload/lifecycle.js](../electron/preload/lifecycle.js)
-
-在 `windowReady()` 钩子中添加以下代码：
-
-```javascript
-const { logger } = require('ee-core/log');
-const { getConfig } = require('ee-core/config');
-const { getMainWindow } = require('ee-core/electron');
-
-class Lifecycle {
-
-  async ready() {
-    logger.info('[lifecycle] ready');
-  }
-
-  async electronAppReady() {
-    logger.info('[lifecycle] electron-app-ready');
-  }
-
-  async windowReady() {
-    logger.info('[lifecycle] window-ready');
-
-    // 延迟加载，无白屏
-    const { windowsOption } = getConfig();
-    if (windowsOption.show == false) {
-      const win = getMainWindow();
-      win.once('ready-to-show', () => {
-        win.show();
-        win.focus();
-      })
-    }
-
-    // 绿色版自动创建桌面快捷方式
-    await this.createDesktopShortcut();
-  }
-
-  /**
-   * 为绿色版创建桌面快捷方式
-   */
-  async createDesktopShortcut() {
-    const { app, dialog, shell } = require('electron');
-    const path = require('path');
-    const fs = require('fs');
-
-    // 判断是否为便携版（绿色版）
-    // 安装版通常在 C:\Program Files 或 AppData\Local\Programs
-    const isPortable = process.platform === 'win32' &&
-                       !process.execPath.includes('Program Files') &&
-                       !process.execPath.includes('AppData\\Local\\Programs');
-
-    if (!isPortable) {
-      logger.info('[lifecycle] 非便携版，跳过快捷方式创建');
-      return;
-    }
-
-    try {
-      const desktopPath = app.getPath('desktop');
-      const shortcutPath = path.join(desktopPath, '南京灿能工具.lnk');
-
-      // 如果快捷方式已存在，跳过
-      if (fs.existsSync(shortcutPath)) {
-        logger.info('[lifecycle] 桌面快捷方式已存在');
-        return;
-      }
-
-      // 询问用户是否创建快捷方式
-      const result = await dialog.showMessageBox({
-        type: 'question',
-        buttons: ['创建', '跳过'],
-        defaultId: 0,
-        title: '创建桌面快捷方式',
-        message: '是否在桌面创建快捷方式？',
-        detail: '方便您下次快速启动应用'
-      });
-
-      if (result.response === 0) {
-        // Windows 下创建快捷方式
-        const success = shell.writeShortcutLink(shortcutPath, {
-          target: process.execPath,
-          cwd: path.dirname(process.execPath),
-          description: '南京灿能C端工具',
-          icon: process.execPath,
-          iconIndex: 0
-        });
-
-        if (success) {
-          logger.info('[lifecycle] 桌面快捷方式创建成功');
-          await dialog.showMessageBox({
-            type: 'info',
-            title: '成功',
-            message: '桌面快捷方式已创建',
-            buttons: ['确定']
-          });
-        } else {
-          logger.error('[lifecycle] 桌面快捷方式创建失败');
-        }
-      } else {
-        logger.info('[lifecycle] 用户跳过创建快捷方式');
-      }
-    } catch (error) {
-      logger.error('[lifecycle] 创建快捷方式时出错:', error);
-    }
-  }
-
-  async beforeClose() {
-    logger.info('[lifecycle] before-close');
-  }
-}
-Lifecycle.toString = () => '[class Lifecycle]';
-
-module.exports = {
-  Lifecycle
-};
-```
-
-#### 3. 打包命令
-
-```bash
-npm run build        # 完整构建
-npm run build-w      # 打包 Windows 便携版
-```
-
-#### 4. 产物说明
-
-打包完成后，在 `out/` 目录下会生成：
-```
-out/
-└── 南京灿能工具-win-4.0.0-x64.exe  （便携版，约 150-200MB）
-```
-
----
-
-## 方案二：双版本打包（安装版 + 便携版）
-
-### 特点
-- ✅ 提供两种版本供用户选择
-- ✅ 安装版：专业、完整的安装体验
-- ✅ 便携版：灵活、轻量，无需安装
-- ✅ 适合正式产品发布
-
-### 实现步骤
-
-#### 1. 修改打包配置
-
-**文件**：[cmd/builder.json](../cmd/builder.json)
-
-```json
-{
-  "productName": "南京灿能工具",
-  "appId": "com.canneng.tool",
-  "copyright": "© 2025 hongawen",
-  "directories": {
-    "output": "out"
-  },
-  "asar": true,
-  "files": [
-    "**/*",
-    "!cmd/",
-    "!data/",
-    "!electron/",
-    "!frontend/",
-    "!logs/",
-    "!out/",
-    "!go/",
-    "!python/"
-  ],
-  "extraResources": {
-    "from": "build/extraResources/",
-    "to": "extraResources"
-  },
-  "nsis": {
-    "oneClick": false,
-    "allowElevation": true,
-    "allowToChangeInstallationDirectory": true,
-    "installerIcon": "build/icons/icon.ico",
-    "uninstallerIcon": "build/icons/icon.ico",
-    "installerHeaderIcon": "build/icons/icon.ico",
-    "createDesktopShortcut": true,
-    "createStartMenuShortcut": true,
-    "shortcutName": "南京灿能工具",
-    "artifactName": "${productName}-Setup-${version}.${ext}"
-  },
-  "portable": {
-    "artifactName": "${productName}-Portable-${version}.${ext}"
-  },
-  "publish": [
-    {
-      "provider": "generic",
-      "url": "https://your-update-server.com"
-    }
-  ],
-  "win": {
-    "icon": "build/icons/icon.ico",
-    "target": [
-      {
-        "target": "nsis",
-        "arch": ["x64"]
-      },
-      {
-        "target": "portable",
-        "arch": ["x64"]
-      }
-    ]
-  }
-}
-```
-
-#### 2. 便携版快捷方式功能（可选）
-
-如果希望便携版也能自动创建快捷方式，使用**方案一**中的 `createDesktopShortcut()` 代码。
-
-#### 3. 打包命令
-
-```bash
-npm run build        # 完整构建
-npm run build-w      # 打包两个版本
-```
-
-#### 4. 产物说明
-
-打包完成后，在 `out/` 目录下会生成：
-```
-out/
-├── 南京灿能工具-Setup-4.0.0.exe      （安装版，约 150MB）
-└── 南京灿能工具-Portable-4.0.0.exe  （便携版，约 150-200MB）
-```
-
-#### 5. 版本差异说明
-
-**安装版 (NSIS)**：
-- 需要安装到系统（默认 C:\Program Files）
-- 自动创建桌面快捷方式
-- 自动创建开始菜单项
-- 提供卸载程序
-- 支持自动更新
-- 适合企业部署、长期使用
-
-**便携版 (Portable)**：
-- 单个 exe 文件
-- 双击直接运行（首次会自解压）
-- 无需安装，无需卸载
-- 可放在 U 盘随身携带
-- 适合临时使用、测试环境
-
----
-
-## 快捷方式创建原理（技术细节）
-
-### Windows 快捷方式 (.lnk)
-
-```javascript
-shell.writeShortcutLink(shortcutPath, {
-  target: process.execPath,        // 目标程序路径
-  cwd: path.dirname(process.execPath), // 工作目录
-  description: '应用描述',          // 快捷方式描述
-  icon: process.execPath,           // 图标路径
-  iconIndex: 0,                     // 图标索引
-  args: '',                         // 启动参数（可选）
-  appUserModelId: 'com.app.id'     // Windows 应用 ID（可选）
-})
-```
-
-### 判断是否为便携版
-
-```javascript
-const isPortable = process.platform === 'win32' &&
-                   !process.execPath.includes('Program Files') &&
-                   !process.execPath.includes('AppData\\Local\\Programs');
-```
-
-**原理**：
-- 安装版通常安装在 `C:\Program Files\YourApp\`
-- 或者 `C:\Users\用户名\AppData\Local\Programs\YourApp\`
-- 便携版可以在任意位置运行
-
----
-
-## 推荐配置
-
-### 企业级应用（推荐方案二）
-```
-✅ 提供两个版本
-✅ 主推安装版（专业形象）
-✅ 提供便携版作为备选
-```
-
-### 轻量工具（推荐方案一）
-```
-✅ 只提供便携版
-✅ 应用内自动创建快捷方式
-✅ 简化分发流程
-```
-
----
-
-## 常见问题
-
-### Q1: 便携版首次启动为什么慢？
-**A**: 便携版是自解压程序，首次运行需要解压资源到临时目录（约 3-5 秒）。后续启动会快很多。
-
-### Q2: 便携版数据存储在哪里？
-**A**:
-- 用户数据：`C:\Users\用户名\AppData\Roaming\你的appId\`
-- 临时文件：`C:\Users\用户名\AppData\Local\Temp\`
-
-### Q3: 如何让便携版也支持自动更新？
-**A**: 需要配置 `electron-updater`，但便携版更新体验不如安装版。建议：
-- 安装版：使用自动更新
-- 便携版：提示用户下载新版本
-
-### Q4: 可以同时运行两个版本吗？
-**A**: 不建议。虽然技术上可行，但会导致数据冲突（共享同一个 userData 目录）。
-
-### Q5: 如何自定义快捷方式图标？
-**A**: 在 `build/icons/` 目录放置 `.ico` 文件，并在 `builder.json` 中配置：
-```json
-"win": {
-  "icon": "build/icons/custom-icon.ico"
-}
-```
-
----
-
-## 测试检查清单
-
-打包完成后，请进行以下测试：
-
-### 安装版测试
-- [ ] 安装到默认路径成功
-- [ ] 安装到自定义路径成功
-- [ ] 桌面快捷方式正常
-- [ ] 开始菜单项正常
-- [ ] 应用启动正常
-- [ ] 卸载程序正常
-
-### 便携版测试
-- [ ] 双击 exe 正常启动
-- [ ] 首次启动自动创建快捷方式（如已实现）
-- [ ] 桌面快捷方式可用
-- [ ] 应用功能正常
-- [ ] 关闭后再次启动正常
-- [ ] 可移动到其他目录运行
-
----
-
-## 参考资源
-
-- electron-builder 官方文档: https://www.electron.build/
-- NSIS 配置: https://www.electron.build/configuration/nsis
-- Portable 配置: https://www.electron.build/configuration/portable
-- Electron shell API: https://www.electronjs.org/docs/latest/api/shell
-
----
-
-*文档创建时间: 2025-10-14*
-*作者: hongawen*

electron/config/config.default.js

@@ -25,7 +25,7 @@ module.exports = () => {
             },
             frame: true,
             show: false, // 初始不显示，等待服务启动完成后再显示
-            icon: path.join(getBaseDir(), 'public', 'images', 'logo-32.png'),
+            icon: path.join(getBaseDir(), 'public', 'images', 'icon.png'),
         },
         logger: {
             level: 'INFO',

electron/controller/mysql.js

@@ -1,75 +0,0 @@
-const path = require('path');
-
-// 动态获取 scripts 目录路径
-function getScriptsPath(scriptName) {
-  // 开发环境
-  const devPath = path.join(__dirname, '../../scripts', scriptName);
-  // 生产环境（打包后）
-  const prodPath = path.join(process.resourcesPath, 'scripts', scriptName);
-  
-  try {
-    // 先尝试开发环境路径
-    require.resolve(devPath);
-    return devPath;
-  } catch (e) {
-    // 如果开发环境路径不存在，使用生产环境路径
-    return prodPath;
-  }
-}
-
-// 延迟加载 MySQLManager
-let MySQLManager = null;
-function getMySQLManager() {
-  if (!MySQLManager) {
-    MySQLManager = require(getScriptsPath('start-mysql'));
-  }
-  return MySQLManager;
-}
-
-class MySQLController {
-
-  /**
-   * 启动MySQL服务
-   */
-  async start() {
-    try {
-      const MySQLManagerClass = getMySQLManager();
-      const mysqlManager = new MySQLManagerClass();
-      await mysqlManager.start();
-      return { success: true, message: 'MySQL started successfully' };
-    } catch (error) {
-      return { success: false, message: error.message };
-    }
-  }
-
-  /**
-   * 停止MySQL服务
-   */
-  async stop() {
-    try {
-      const MySQLManagerClass = getMySQLManager();
-      const mysqlManager = new MySQLManagerClass();
-      await mysqlManager.stop();
-      return { success: true, message: 'MySQL stopped successfully' };
-    } catch (error) {
-      return { success: false, message: error.message };
-    }
-  }
-
-  /**
-   * 获取MySQL连接配置
-   */
-  async getConnectionConfig() {
-    try {
-      const MySQLManagerClass = getMySQLManager();
-      const mysqlManager = new MySQLManagerClass();
-      const config = mysqlManager.getConnectionConfig();
-      return { success: true, data: config };
-    } catch (error) {
-      return { success: false, message: error.message };
-    }
-  }
-}
-
-MySQLController.toString = () => '[class MySQLController]';
-module.exports = MySQLController;

electron/main.js

@@ -1,27 +1,127 @@
 const { ElectronEgg } = require('ee-core');
-const { app, Menu, ipcMain } = require('electron');
+const { app, Menu, ipcMain, Tray, dialog, BrowserWindow } = require('electron');
+const path = require('path');
 const lifecycle = require('./preload/lifecycle');
 const { preload } = require('./preload');
 
 // new app
 const electronApp = new ElectronEgg();
 
+// 全局变量
+let tray = null;
+let isQuitting = false;
+
+// 创建系统托盘
+function createTray() {
+  try {
+    // 开发环境和生产环境的图标路径
+    const isDev = !process.resourcesPath;
+    const iconPath = isDev
+      ? path.join(__dirname, '..', 'public', 'images', 'tray.png')
+      : path.join(process.resourcesPath, 'app.asar.unpacked', 'public', 'images', 'tray.png');
+    
+    console.log('[Tray] Icon path:', iconPath);
+    
+    // 检查图标文件是否存在
+    const fs = require('fs');
+    if (!fs.existsSync(iconPath)) {
+      console.error('[Tray] Icon file not found:', iconPath);
+      // 如果找不到，尝试使用备用路径（主图标）
+      const fallbackIcon = isDev
+        ? path.join(__dirname, '..', 'public', 'images', 'icon.png')
+        : path.join(process.resourcesPath, 'app.asar.unpacked', 'public', 'images', 'icon.png');
+      
+      if (fs.existsSync(fallbackIcon)) {
+        console.log('[Tray] Using fallback icon:', fallbackIcon);
+        tray = new Tray(fallbackIcon);
+      } else {
+        console.error('[Tray] No icon available, tray not created');
+        return;
+      }
+    } else {
+      tray = new Tray(iconPath);
+    }
+    
+    tray.setToolTip('NPQS-9100自动检测平台');
+    console.log('[Tray] Tray created successfully');
+  
+  // 创建托盘菜单
+  const contextMenu = Menu.buildFromTemplate([
+    {
+      label: '显示主窗口',
+      click: () => {
+        const mainWindow = BrowserWindow.getAllWindows()[0];
+        if (mainWindow) {
+          if (mainWindow.isMinimized()) {
+            mainWindow.restore();
+          }
+          mainWindow.show();
+          mainWindow.focus();
+        }
+      }
+    },
+    { type: 'separator' },
+    {
+      label: '退出',
+      click: async () => {
+        // 弹出确认对话框
+        const { response } = await dialog.showMessageBox({
+          type: 'question',
+          title: '退出确认',
+          message: '确定退出应用吗？',
+          buttons: ['取消', '确定退出'],
+          defaultId: 0,
+          cancelId: 0
+        });
+        
+        if (response === 1) {
+          // 用户点击了"确定退出"
+          isQuitting = true;
+          
+          // 获取主窗口
+          const mainWindow = BrowserWindow.getAllWindows()[0];
+          
+          // 移除所有 close 监听器，避免阻止关闭
+          if (mainWindow) {
+            mainWindow.removeAllListeners('close');
+          }
+          
+          // 执行清理
+          await lifecycle.cleanup();
+          
+          // 退出应用
+          app.quit();
+        }
+      }
+    }
+  ]);
+  
+  tray.setContextMenu(contextMenu);
+  
+  // 双击托盘图标显示窗口
+  tray.on('double-click', () => {
+    const mainWindow = BrowserWindow.getAllWindows()[0];
+    if (mainWindow) {
+      if (mainWindow.isMinimized()) {
+        mainWindow.restore();
+      }
+      mainWindow.show();
+      mainWindow.focus();
+    }
+  });
+  
+  } catch (error) {
+    console.error('[Tray] Failed to create tray:', error);
+    tray = null;
+  }
+}
+
 // 创建应用菜单
 function createApplicationMenu() {
   const template = [
     {
       label: '查看',
       submenu: [
-        {
-          label: '显示/隐藏服务日志',
-          accelerator: 'F12',
-          click: () => {
-            if (lifecycle.logWindowManager) {
-              lifecycle.logWindowManager.toggle();
-            }
-          }
-        },
-        { type: 'separator' },
         { role: 'reload', label: '刷新' },
         { role: 'forceReload', label: '强制刷新' },
         { type: 'separator' },
@@ -71,14 +171,87 @@ ipcMain.handle('toggle-log-window', () => {
   }
 });
 
+// 检查是否正在退出
+ipcMain.handle('is-quitting', () => {
+  return isQuitting;
+});
+
+// 处理单实例：当尝试启动第二个实例时，聚焦已有窗口
+app.on('second-instance', (event, commandLine, workingDirectory) => {
+  console.log('[Main] Second instance detected, focusing main window...');
+  
+  // 获取主窗口
+  const mainWindow = BrowserWindow.getAllWindows().find(win => {
+    return win.getTitle().includes('NPQS') || win.getTitle().includes('检测平台');
+  });
+  
+  if (mainWindow) {
+    // 如果窗口最小化，恢复它
+    if (mainWindow.isMinimized()) {
+      mainWindow.restore();
+    }
+    
+    // 如果窗口隐藏，显示它
+    if (!mainWindow.isVisible()) {
+      mainWindow.show();
+    }
+    
+    // 聚焦窗口
+    mainWindow.focus();
+    
+    console.log('[Main] Main window focused');
+  } else {
+    console.warn('[Main] Main window not found');
+  }
+});
+
+// 监听应用退出前事件（确保清理托盘）
+app.on('before-quit', () => {
+  console.log('[Main] App before-quit, destroying tray...');
+  
+  // 销毁托盘图标
+  if (tray && !tray.isDestroyed()) {
+    tray.destroy();
+    tray = null;
+  }
+});
+
+// 监听 will-quit 事件（强制退出时）
+app.on('will-quit', () => {
+  console.log('[Main] App will-quit');
+  
+  // 确保托盘被销毁
+  if (tray && !tray.isDestroyed()) {
+    tray.destroy();
+    tray = null;
+  }
+});
+
 // register lifecycle (绑定 this 上下文)
 electronApp.register("ready", lifecycle.ready.bind(lifecycle));
 electronApp.register("electron-app-ready", () => {
   lifecycle.electronAppReady.bind(lifecycle)();
   createApplicationMenu();
+  createTray(); // 创建系统托盘
 });
 electronApp.register("window-ready", lifecycle.windowReady.bind(lifecycle));
-electronApp.register("before-close", lifecycle.beforeClose.bind(lifecycle));
+electronApp.register("before-close", async () => {
+  // 如果不是真正退出，不执行清理
+  if (!isQuitting) {
+    console.log('[Main] Not quitting, skip cleanup');
+    return;
+  }
+  
+  console.log('[Main] Quitting, execute cleanup');
+  
+  // 销毁托盘图标
+  if (tray && !tray.isDestroyed()) {
+    tray.destroy();
+    tray = null;
+  }
+  
+  await lifecycle.beforeClose.bind(lifecycle)();
+});
 
 // register preload
 electronApp.register("preload", preload);

electron/preload/lifecycle.js

@@ -4,7 +4,7 @@ const path = require('path');
 const { logger } = require('ee-core/log');
 const { getConfig } = require('ee-core/config');
 const { getMainWindow } = require('ee-core/electron');
-const ps = require('ee-core/ps');
+const { getBaseDir } = require('ee-core/ps');
 const { app } = require('electron');
 
 // 动态获取 scripts 目录路径
@@ -12,7 +12,8 @@ function getScriptsPath(scriptName) {
   const fs = require('fs');
   
   // 判断是否是打包后的环境
-  const isProd = process.resourcesPath && process.resourcesPath.includes('win-unpacked');
+  // 只要 process.resourcesPath 存在，就是打包后的环境（无论在哪个目录）
+  const isProd = !!process.resourcesPath;
   
   if (isProd) {
     // 生产环境（打包后）：从 resources 目录
@@ -44,11 +45,11 @@ function getScriptsPath(scriptName) {
 }
 
 // 延迟加载 scripts
-let MySQLManager, JavaRunner, ConfigGenerator, PortChecker, StartupManager, LogWindowManager;
+let MySQLServiceManager, JavaRunner, ConfigGenerator, PortChecker, StartupManager, LogWindowManager;
 
 function loadScripts() {
-  if (!MySQLManager) {
+  if (!MySQLServiceManager) {
-    MySQLManager = require(getScriptsPath('start-mysql'));
+    MySQLServiceManager = require(getScriptsPath('mysql-service-manager'));
     JavaRunner = require(getScriptsPath('java-runner'));
     ConfigGenerator = require(getScriptsPath('config-generator'));
     PortChecker = require(getScriptsPath('port-checker'));
@@ -59,13 +60,14 @@ function loadScripts() {
 
 class Lifecycle {
   constructor() {
-    this.mysqlManager = null;
+    this.mysqlServiceManager = null;
     this.javaRunner = null;
     this.startupManager = null;
     this.logWindowManager = null;
     this.mysqlPort = null;
     this.javaPort = null;
     this.autoRefreshTimer = null;
+    this.isRestartingForAdmin = false; // 权限提升重启标记
   }
 
   /**
@@ -74,76 +76,73 @@ class Lifecycle {
   async ready() {
     logger.info('[lifecycle] ready');
     // 延迟加载 scripts
-    if (ps.isProd()) {
+    loadScripts();
-      loadScripts();
-    }
-
   }
 
   /**
    * 完整的应用启动流程
    */
   async startApplication() {
+    this.logWindowManager.addLog('system', '▶ 步骤1: 开始启动流程...');
+    logger.info('[lifecycle] Starting application...');
+    
+    this.logWindowManager.addLog('system', '▶ 步骤2: 加载配置信息...');
     const config = getConfig();
+    logger.info('[lifecycle] Config loaded:', JSON.stringify(config));
 
     // 步骤1: 初始化
+    this.logWindowManager.addLog('system', '▶ 步骤3: 初始化启动管理器...');
     this.startupManager.updateProgress('init');
     await this.sleep(500);
 
-    // 步骤2: 检测 MySQL 端口
+    // 步骤2-4: 确保 MySQL 服务运行
-    this.startupManager.updateProgress('check-mysql-port');
+    this.logWindowManager.addLog('system', '▶ 步骤4: 检查 MySQL 配置...');
-    this.logWindowManager.addLog('system', '正在检测可用的 MySQL 端口（从3306开始）...');
+    logger.info('[lifecycle] MySQL config check - enable:', config.mysql?.enable, 'autoStart:', config.mysql?.autoStart);
     
-    this.mysqlPort = await PortChecker.findAvailablePort(3306, 100);
-    
-    if (this.mysqlPort === -1) {
-      this.logWindowManager.addLog('error', 'MySQL 端口检测失败：3306-3405 全部被占用');
-      throw new Error('无法找到可用的 MySQL 端口（3306-3405 全部被占用）');
-    }
-    
-    if (this.mysqlPort !== 3306) {
-      this.logWindowManager.addLog('warn', `MySQL 默认端口 3306 已被占用，自动切换到端口: ${this.mysqlPort}`);
-    } else {
-      this.logWindowManager.addLog('success', `MySQL 将使用默认端口: ${this.mysqlPort}`);
-    }
-    
-    logger.info(`[lifecycle] MySQL will use port: ${this.mysqlPort}`);
-    this.startupManager.updateProgress('check-mysql-port', { mysqlPort: this.mysqlPort });
-    await this.sleep(500);
-
-    // 步骤3: 启动 MySQL
     if (config.mysql && config.mysql.enable && config.mysql.autoStart) {
-      this.startupManager.updateProgress('start-mysql', { mysqlPort: this.mysqlPort });
+      this.startupManager.updateProgress('check-mysql-port');
-      this.logWindowManager.addLog('mysql', `正在启动 MySQL，端口: ${this.mysqlPort}`);
+      this.logWindowManager.addLog('system', '▶ 步骤5: 启动 MySQL 服务管理器...');
       
-      this.mysqlManager = new MySQLManager();
+      this.mysqlServiceManager = new MySQLServiceManager(this.logWindowManager);
+      this.logWindowManager.addLog('system', '正在检查 MySQL 服务状态...');
       
-      // 监听 MySQL 输出
+      try {
-      const actualPort = await this.mysqlManager.start(this.mysqlPort);
+        // 使用服务管理器确保MySQL服务运行
-      this.setupMySQLLogging(this.mysqlManager.process);
+        this.logWindowManager.addLog('system', '▶ 步骤6: 确保 MySQL 服务运行中...');
+        this.mysqlPort = await this.mysqlServiceManager.ensureServiceRunning(
+          PortChecker.findAvailablePort.bind(PortChecker),
+          PortChecker.waitForPort.bind(PortChecker)
+        );
         
-      logger.info(`[lifecycle] MySQL started on port: ${actualPort}`);
+        logger.info(`[lifecycle] MySQL service running on port: ${this.mysqlPort}`);
-      this.logWindowManager.addLog('success', `MySQL 已启动，端口: ${actualPort}`);
+        this.logWindowManager.addLog('success', `✓ MySQL 服务已就绪，端口: ${this.mysqlPort}`);
+        this.startupManager.updateProgress('wait-mysql', { mysqlPort: this.mysqlPort });
+        await this.sleep(500);
+      } catch (error) {
+        logger.error('[lifecycle] MySQL service error:', error);
+        this.logWindowManager.addLog('error', `MySQL 服务错误: ${error.message}`);
+        // 检查是否是权限问题
+        if (error.message && (error.message.includes('administrator') || error.message.includes('Denied'))) {
+          logger.error('[lifecycle] Need administrator privileges');
+          this.logWindowManager.addLog('error', '检测到需要管理员权限来安装 MySQL 服务');
+          this.logWindowManager.addLog('system', '应用将自动请求管理员权限并重启...');
           
-      // 步骤4: 等待 MySQL 就绪
+          // 等待用户看清日志
-      this.startupManager.updateProgress('wait-mysql', { mysqlPort: actualPort });
+          await this.sleep(2000);
-      this.logWindowManager.addLog('mysql', '等待 MySQL 就绪...');
           
-      const mysqlReady = await PortChecker.waitForPort(actualPort, 30000);
+          // 自动以管理员身份重启应用
+          await this.restartAsAdmin();
           
-      if (!mysqlReady) {
+          // 退出当前实例
-        this.logWindowManager.addLog('error', `MySQL 启动超时（端口 ${actualPort} 未响应）`);
+          return;
-        throw new Error(`MySQL 启动超时（端口 ${actualPort} 未响应）`);
+        }
+        throw error;
       }
-      
-      logger.info('[lifecycle] MySQL is ready');
-      this.logWindowManager.addLog('success', 'MySQL 已就绪！');
-      await this.sleep(500);
     }
 
     // 步骤5: 检测 Java 端口
+    this.logWindowManager.addLog('system', '▶ 步骤7: 检测可用的 Java 端口（从18092开始）...');
     this.startupManager.updateProgress('check-java-port', { mysqlPort: this.mysqlPort });
-    this.logWindowManager.addLog('system', '正在检测可用的 Java 端口（从18092开始）...');
     
     this.javaPort = await PortChecker.findAvailablePort(18092, 100);
     
@@ -152,13 +151,30 @@ class Lifecycle {
       throw new Error('无法找到可用的后端服务端口（18092-18191 全部被占用）');
     }
     
+    // 步骤5.5: 检测 WebSocket 端口
+    this.logWindowManager.addLog('system', '▶ 步骤8: 检测可用的 WebSocket 端口（从7777开始）...');
+    
+    this.websocketPort = await PortChecker.findAvailablePort(7777, 100);
+    
+    if (this.websocketPort === -1) {
+      this.logWindowManager.addLog('error', 'WebSocket 端口检测失败：7777-7876 全部被占用');
+      throw new Error('无法找到可用的 WebSocket 端口（7777-7876 全部被占用）');
+    }
+    
     if (this.javaPort !== 18092) {
-      this.logWindowManager.addLog('warn', `Java 默认端口 18092 已被占用，自动切换到端口: ${this.javaPort}`);
+      this.logWindowManager.addLog('warn', `⚠ Java 默认端口 18092 已被占用，自动切换到端口: ${this.javaPort}`);
     } else {
-      this.logWindowManager.addLog('success', `Java 将使用默认端口: ${this.javaPort}`);
+      this.logWindowManager.addLog('success', `✓ Java 将使用默认端口: ${this.javaPort}`);
+    }
+    
+    if (this.websocketPort !== 7777) {
+      this.logWindowManager.addLog('warn', `⚠ WebSocket 默认端口 7777 已被占用，自动切换到端口: ${this.websocketPort}`);
+    } else {
+      this.logWindowManager.addLog('success', `✓ WebSocket 将使用默认端口: ${this.websocketPort}`);
     }
     
     logger.info(`[lifecycle] Spring Boot will use port: ${this.javaPort}`);
+    logger.info(`[lifecycle] WebSocket will use port: ${this.websocketPort}`);
     this.startupManager.updateProgress('check-java-port', { 
       mysqlPort: this.mysqlPort,
       javaPort: this.javaPort 
@@ -166,28 +182,35 @@ class Lifecycle {
     await this.sleep(500);
 
     // 步骤6: 生成配置文件
+    this.logWindowManager.addLog('system', '▶ 步骤9: 生成 Spring Boot 配置文件...');
     this.startupManager.updateProgress('generate-config', {
       mysqlPort: this.mysqlPort,
-      javaPort: this.javaPort
+      javaPort: this.javaPort,
+      websocketPort: this.websocketPort
     });
     
     const configGenerator = new ConfigGenerator();
     const { configPath, dataPath } = await configGenerator.generateConfig({
       mysqlPort: this.mysqlPort,
       javaPort: this.javaPort,
+      websocketPort: this.websocketPort,
       mysqlPassword: 'njcnpqs'
     });
     
     logger.info(`[lifecycle] Configuration generated at: ${configPath}`);
     logger.info(`[lifecycle] Data directory: ${dataPath}`);
+    this.logWindowManager.addLog('success', `✓ 配置文件已生成: ${configPath}`);
+    this.logWindowManager.addLog('system', `  数据目录: ${dataPath}`);
     this.startupManager.updateProgress('generate-config', {
       mysqlPort: this.mysqlPort,
       javaPort: this.javaPort,
+      websocketPort: this.websocketPort,
       dataPath: dataPath
     });
     await this.sleep(500);
 
     // 步骤7: 启动 Spring Boot
+    this.logWindowManager.addLog('system', '▶ 步骤10: 启动 Spring Boot 应用...');
     this.startupManager.updateProgress('start-java', {
       mysqlPort: this.mysqlPort,
       javaPort: this.javaPort,
@@ -197,6 +220,7 @@ class Lifecycle {
     await this.startSpringBoot(configPath);
     
     // 步骤8: 等待 Spring Boot 就绪
+    this.logWindowManager.addLog('system', '▶ 步骤11: 等待 Spring Boot 就绪（最多60秒）...');
     this.startupManager.updateProgress('wait-java', {
       mysqlPort: this.mysqlPort,
       javaPort: this.javaPort,
@@ -207,13 +231,16 @@ class Lifecycle {
     
     if (!javaReady) {
       logger.warn(`[lifecycle] Spring Boot 启动超时，但继续启动应用`);
+      this.logWindowManager.addLog('warn', '⚠ Spring Boot 启动超时（60秒），但应用将继续启动');
     } else {
       logger.info('[lifecycle] Spring Boot is ready');
+      this.logWindowManager.addLog('success', '✓ Spring Boot 启动成功！');
     }
     
     await this.sleep(1000);
 
     // 步骤9: 完成
+    this.logWindowManager.addLog('system', '▶ 步骤12: 启动完成，准备显示主窗口...');
     this.startupManager.updateProgress('done', {
       mysqlPort: this.mysqlPort,
       javaPort: this.javaPort,
@@ -225,6 +252,7 @@ class Lifecycle {
     this.logWindowManager.addLog('success', '✓ NPQS9100 启动完成！所有服务正常运行');
     this.logWindowManager.addLog('system', `✓ MySQL 端口: ${this.mysqlPort}`);
     this.logWindowManager.addLog('system', `✓ Java 端口: ${this.javaPort}`);
+    this.logWindowManager.addLog('system', `✓ WebSocket 端口: ${this.websocketPort}`);
     this.logWindowManager.addLog('system', `✓ 数据目录: ${dataPath}`);
     this.logWindowManager.addLog('system', '='.repeat(60));
     this.logWindowManager.addLog('system', '应用即将启动...');
@@ -241,9 +269,36 @@ class Lifecycle {
     win.focus();
     
     // 添加主窗口关闭事件监听
-    win.on('close', async () => {
+    win.on('close', async (event) => {
-      logger.info('[lifecycle] Main window closing, cleaning up...');
+      // 总是弹出确认对话框
-      await this.cleanup();
+      event.preventDefault();
+      
+      const { dialog } = require('electron');
+      const { app } = require('electron');
+      
+      const response = await dialog.showMessageBox(win, {
+        type: 'question',
+        title: '退出确认',
+        message: '确定要退出应用吗？',
+        buttons: ['取消', '退出'],
+        defaultId: 0,
+        cancelId: 0
+      });
+      
+      if (response.response === 1) {
+        // 用户确认退出
+        logger.info('[lifecycle] User confirmed exit');
+        
+        // 移除所有监听器避免循环
+        win.removeAllListeners('close');
+        
+        // 执行清理
+        await this.cleanup();
+        
+        // 退出应用
+        app.quit();
+      }
+      // 用户取消，什么都不做（已经 preventDefault）
     });
     
     // 立即刷新一次，确保显示最新内容
@@ -294,6 +349,12 @@ class Lifecycle {
   async cleanup() {
     logger.info('[lifecycle] Starting cleanup...');
 
+    // 如果是权限提升重启，跳过清理（服务需要继续运行）
+    if (this.isRestartingForAdmin) {
+      logger.info('[lifecycle] Restarting for admin, skip cleanup');
+      return;
+    }
+
     // 清除自动刷新定时器
     if (this.autoRefreshTimer) {
       clearTimeout(this.autoRefreshTimer);
@@ -323,10 +384,8 @@ class Lifecycle {
           this.logWindowManager.addLog('system', '正在停止 Spring Boot...');
         }
         
-        // 设置超时，3秒后强制继续
+        // 停止 Java 进程（内部已有完整的等待和清理逻辑）
-        const stopPromise = this.javaRunner.stopSpringBoot();
+        await this.javaRunner.stopSpringBoot();
-        const timeoutPromise = new Promise(resolve => setTimeout(resolve, 3000));
-        await Promise.race([stopPromise, timeoutPromise]);
         
         logger.info('[lifecycle] Spring Boot stopped');
         if (this.logWindowManager && this.logWindowManager.logWindow && !this.logWindowManager.logWindow.isDestroyed()) {
@@ -337,35 +396,12 @@ class Lifecycle {
       }
     }
 
-    // 停止 MySQL
+    // MySQL 作为Windows服务运行，应用关闭时保持运行
-    const config = getConfig();
+    logger.info('[lifecycle] MySQL service keeps running as Windows service');
-    if (config.mysql && config.mysql.enable && config.mysql.autoStart) {
+    if (this.logWindowManager && this.logWindowManager.logWindow && !this.logWindowManager.logWindow.isDestroyed()) {
-      try {
+      this.logWindowManager.addLog('system', 'MySQL 服务保持运行');
-        logger.info('[lifecycle] Stopping MySQL...');
+      this.logWindowManager.addLog('system', '清理完成，应用即将退出');
-        if (this.logWindowManager && this.logWindowManager.logWindow && !this.logWindowManager.logWindow.isDestroyed()) {
+      this.logWindowManager.addLog('system', '='.repeat(60));
-          this.logWindowManager.addLog('system', '正在停止 MySQL（最多等待10秒）...');
-        }
-        
-        if (this.mysqlManager) {
-          // MySQL 的 stop() 方法内部使用 mysqladmin shutdown（最多10秒）
-          // 设置12秒超时作为保险
-          const stopPromise = this.mysqlManager.stop();
-          const timeoutPromise = new Promise(resolve => setTimeout(resolve, 12000));
-          await Promise.race([stopPromise, timeoutPromise]);
-        }
-        
-        logger.info('[lifecycle] MySQL stopped');
-        if (this.logWindowManager && this.logWindowManager.logWindow && !this.logWindowManager.logWindow.isDestroyed()) {
-          this.logWindowManager.addLog('success', 'MySQL 已停止');
-          this.logWindowManager.addLog('system', '清理完成，应用即将退出');
-          this.logWindowManager.addLog('system', '='.repeat(60));
-        }
-      } catch (error) {
-        logger.error('[lifecycle] Failed to stop MySQL:', error);
-        if (this.logWindowManager && this.logWindowManager.logWindow && !this.logWindowManager.logWindow.isDestroyed()) {
-          this.logWindowManager.addLog('error', 'MySQL 停止失败: ' + error.message);
-        }
-      }
     }
 
     // 等待500ms让用户看到清理日志
@@ -384,35 +420,6 @@ class Lifecycle {
     logger.info('[lifecycle] Cleanup completed');
   }
 
-  /**
-   * 设置 MySQL 日志监听
-   */
-  setupMySQLLogging(mysqlProcess) {
-    if (!mysqlProcess) return;
-
-    mysqlProcess.stdout.on('data', (data) => {
-      const output = data.toString().trim();
-      if (output) {
-        // 根据内容判断日志类型
-        if (output.includes('[ERROR]') || output.includes('ERROR')) {
-          this.logWindowManager.addLog('error', `[MySQL] ${output}`);
-        } else if (output.includes('[Warning]') || output.includes('WARNING')) {
-          this.logWindowManager.addLog('warn', `[MySQL] ${output}`);
-        } else if (output.includes('ready for connections')) {
-          this.logWindowManager.addLog('success', `[MySQL] ${output}`);
-        } else {
-          this.logWindowManager.addLog('mysql', `[MySQL] ${output}`);
-        }
-      }
-    });
-
-    mysqlProcess.stderr.on('data', (data) => {
-      const output = data.toString().trim();
-      if (output) {
-        this.logWindowManager.addLog('warn', `[MySQL Error] ${output}`);
-      }
-    });
-  }
 
   /**
    * 启动 Spring Boot 应用
@@ -477,6 +484,80 @@ class Lifecycle {
     }
   }
 
+  /**
+   * 以管理员身份重启应用
+   */
+  async restartAsAdmin() {
+    const { app, dialog } = require('electron');
+    const { spawn } = require('child_process');
+    const path = require('path');
+    
+    logger.info('[lifecycle] Requesting administrator privileges...');
+    
+    try {
+      // 显示提示对话框
+      const { response } = await dialog.showMessageBox({
+        type: 'warning',
+        title: '需要管理员权限',
+        message: '安装 MySQL 服务需要管理员权限',
+        detail: '应用将以管理员身份重新启动',
+        buttons: ['取消', '确定'],
+        defaultId: 1,
+        cancelId: 0
+      });
+      
+      if (response === 0) {
+        // 用户取消，关闭应用
+        logger.info('[lifecycle] User cancelled admin elevation');
+        app.quit();
+        return;
+      }
+      
+      // 获取应用可执行文件路径
+      const exePath = app.getPath('exe');
+      logger.info('[lifecycle] Restarting with admin privileges:', exePath);
+      
+      // 使用 PowerShell 以管理员身份启动
+      const psCommand = `Start-Process -FilePath "${exePath}" -Verb RunAs`;
+      
+      const child = spawn('powershell.exe', ['-Command', psCommand], {
+        detached: true,
+        stdio: 'ignore',
+        windowsHide: true
+      });
+      
+      // 分离子进程，父进程退出不影响子进程
+      child.unref();
+      
+      // 立即退出当前实例，释放单实例锁
+      // 必须立即退出，否则新实例会因为单实例锁无法启动
+      logger.info('[lifecycle] Quitting current instance to release lock...');
+      
+      // 设置标记，跳过清理流程（这只是重启，不是真正退出）
+      this.isRestartingForAdmin = true;
+      
+      // 关闭所有窗口
+      const BrowserWindow = require('electron').BrowserWindow;
+      BrowserWindow.getAllWindows().forEach(win => {
+        try {
+          win.destroy();
+        } catch (e) {
+          // 忽略错误
+        }
+      });
+      
+      // 立即强制退出，释放锁
+      process.exit(0);
+    } catch (error) {
+      logger.error('[lifecycle] Failed to restart as admin:', error);
+      this.logWindowManager.addLog('error', '自动提升权限失败，请手动以管理员身份运行');
+      
+      // 等待5秒后关闭
+      await this.sleep(5000);
+      app.quit();
+    }
+  }
+
   /**
    * 睡眠函数
    */
@@ -495,56 +576,54 @@ class Lifecycle {
    * main window have been loaded
    */
   async windowReady() {
-    logger.info('[lifecycle] window-ready');
+    logger.info('[lifecycle] window-ready hook triggered');
-    if (ps.isProd()) {
-      // 创建日志窗口
-      this.logWindowManager = new LogWindowManager();
-      this.logWindowManager.createLogWindow();
-      this.logWindowManager.addLog('system', '='.repeat(60));
-      this.logWindowManager.addLog('system', 'NPQS9100 启动中...');
-      this.logWindowManager.addLog('system', '='.repeat(60));
 
-      // 创建 Loading 窗口
+    // 创建日志管理器（但不显示窗口，仅用于写日志文件）
-      this.startupManager = new StartupManager();
+    logger.info('[lifecycle] Creating log window manager...');
-      this.startupManager.createLoadingWindow();
+    this.logWindowManager = new LogWindowManager();
+    // this.logWindowManager.createLogWindow(); // ← 注释掉，不创建窗口
+    this.logWindowManager.addLog('system', '='.repeat(80));
+    this.logWindowManager.addLog('system', 'NPQS9100 应用启动');
+    this.logWindowManager.addLog('system', '='.repeat(80));
 
-      // 开始启动流程
+    // 创建 Loading 窗口
-      try {
+    logger.info('[lifecycle] Creating startup manager and loading window...');
-        await this.startApplication();
+    this.startupManager = new StartupManager();
-      } catch (error) {
+    this.startupManager.createLoadingWindow();
-        logger.error('[lifecycle] Failed to start application:', error);
+    this.logWindowManager.addLog('system', '='.repeat(60));
-        this.logWindowManager.addLog('error', `启动失败: ${error.message}`);
+    this.logWindowManager.addLog('system', 'NPQS9100 启动中...');
-        this.logWindowManager.addLog('system', '请检查日志窗口了解详细错误信息');
+    this.logWindowManager.addLog('system', '='.repeat(60));
-        this.startupManager.showError(error.message || '启动失败，请查看日志');
 
-        // 显示错误5秒后关闭Loading窗口，但不关闭日志窗口
+    // 开始启动流程
-        setTimeout(() => {
+    logger.info('[lifecycle] Starting application flow...');
-          this.startupManager.closeLoadingWindow();
+    try {
+      await this.startApplication();
+    } catch (error) {
+      logger.error('[lifecycle] Failed to start application:', error);
+      this.logWindowManager.addLog('error', `启动失败: ${error.message}`);
+      this.logWindowManager.addLog('system', '请检查日志窗口了解详细错误信息');
+      this.startupManager.showError(error.message || '启动失败，请查看日志');
       
-          // 即使启动失败，也显示主窗口（但用户可能需要手动修复问题）
+      // 显示错误5秒后关闭Loading窗口，但不关闭日志窗口
-          const win = getMainWindow();
+      setTimeout(() => {
-          win.show();
+        this.startupManager.closeLoadingWindow();
-          win.focus();
         
-          // 添加主窗口关闭事件监听
+        // 即使启动失败，也显示主窗口（但用户可能需要手动修复问题）
-          win.on('close', async () => {
+        const win = getMainWindow();
-            logger.info('[lifecycle] Main window closing (after error), cleaning up...');
+        win.show();
-            await this.cleanup();
+        win.focus();
-          });
         
-          this.logWindowManager.addLog('warn', '应用已启动，但部分服务可能未正常运行');
+        // 启动失败时，允许用户正常关闭窗口（不强制托盘）
-        }, 5000);
+        // 因为可能托盘未创建，或用户想直接退出
-      }
+        win.on('close', async (event) => {
-    } else {
+          logger.info('[lifecycle] Window closing (after error), cleaning up...');
-      const win = getMainWindow();
+          // 不阻止关闭，执行清理
-      const {windowsOption} = getConfig();
+          await this.cleanup();
-      if (windowsOption.show == false) {
+        });
-        win.once('ready-to-show', () => {
-          win.show();
-          win.focus();
-        })
-      }
         
+        this.logWindowManager.addLog('warn', '应用已启动，但部分服务可能未正常运行');
+        this.logWindowManager.addLog('system', '您可以点击 X 关闭应用');
+      }, 5000);
     }
 
     // 主窗口初始化但不显示，等待启动流程完成后再显示
@@ -556,10 +635,7 @@ class Lifecycle {
    */  
   async beforeClose() {
     logger.info('[lifecycle] before-close hook triggered');
-    if (ps.isProd()) {
+    await this.cleanup();
-      await this.cleanup();
-    }
-
   }
 }
 Lifecycle.toString = () => '[class Lifecycle]';

frontend/.env.development

@@ -20,8 +20,8 @@ VITE_API_URL=/api
 # 开发环境跨域代理，支持配置多个
 
 #VITE_PROXY=[["/api","http://127.0.0.1:18092/"]]
-VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
+#VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
-#VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
+VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
 # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文
 # 开启激活验证
-VITE_ACTIVATE_OPEN=false
+VITE_ACTIVATE_OPEN=true

frontend/.env.production

@@ -25,4 +25,4 @@ VITE_PWA=true
 #VITE_API_URL="/api" # 打包时用
 VITE_API_URL="http://127.0.0.1:18092/"
 # 开启激活验证
-VITE_ACTIVATE_OPEN=false
+VITE_ACTIVATE_OPEN=true

frontend/src/App.vue

@@ -1,5 +1,6 @@
 <template>
     <!--element-plus语言国际化，全局修改为中文-->
+    <!-- 测试升级功能 - 2025-10-24 -->
     <el-config-provider :locale="locale" :size="assemblySize" :button="buttonConfig">
         <router-view />
     </el-config-provider>

frontend/src/api/check/test/index.ts

@@ -82,8 +82,8 @@ export const reCalculate = (params: {
     errorSysId: string
     deviceId: string
     code: string
-    patternId: string
+    patternId: string,
-  
+    chnNum: string
 }) => {
     return http.post('/result/reCalculate', params, {loading: true})
 }
@@ -129,7 +129,8 @@ export const changeErrorSystem = (params: {
     errorSysId: string
     deviceId: string
     code: string
-    patternId: string
+    patternId: string,
+    chnNum: string
 }) => {
     return http.post('/result/changeErrorSystem', params, {loading: true})
 }

frontend/src/api/device/icd/index.ts

@@ -20,12 +20,12 @@ export const getICDAllList = (params: ICD.ResICD) => {
 
 //添加ICD
 export const addICD = (params: ICD.ResICD) => {
-    return http.post(`/icd/add`, params)
+    return http.upload(`/icd/add`, params)
   }
   
   //编辑ICD
   export const updateICD = (params: ICD.ResICD) => {
-    return http.post(`/icd/update`, params)
+    return http.upload(`/icd/update`, params)
   }
   
   //删除ICD

frontend/src/api/device/interface/icd.ts

@@ -26,6 +26,7 @@ export namespace ICD {
     updateTime?: string| null; //更新时间
     angle: number; // 是否支持电压相角、电流相角指标
     usePhaseIndex: number; // 角型接线时是否使用相别的指标来进行检测
+    mappingFile: string | null;//映射文件
   }
 
   /**

frontend/src/api/device/interface/monitor.ts

@@ -18,7 +18,7 @@ export namespace Monitor {
   export interface ResPqMon {
     id: string;     //监测点ID
     devId: string; //所属设备ID
-    busbar: string;//所属母线
+    busbar: string;//母线名称
     name: string; //监测点名称
     num: number; //线路号,监测点序号
     pt: string; //PT变比

frontend/src/api/device/interface/testScript.ts

@@ -29,6 +29,7 @@ export namespace TestScript {
         selectedValue?: string
         ratedCurr?: number
         ratedVolt?: number
+        fluke?:number|boolean
     }
 
     /**

frontend/src/api/index.ts

@@ -21,10 +21,10 @@ export interface CustomAxiosRequestConfig extends InternalAxiosRequestConfig {
 }
 
 const config = {
-    // 默认地址请求地址，可在 .env.** 文件中修改
+    // 默认地址请求地址，可在 .env 开头文件中修改
     baseURL: import.meta.env.VITE_API_URL as string,
-    // 设置超时时间
+    // 设置超时时间（60s）
-    timeout: ResultEnum.TIMEOUT as number,
+    timeout: 60000,
     // 跨域时候允许携带凭证
     withCredentials: true,
     // post请求指定数据类型以及编码

frontend/src/api/interface/index.ts

@@ -24,8 +24,8 @@ export interface ResultData<T = any> extends Result {
  * 分页请求参数
  */
 export interface ReqPage {
-  pageNum: number;
+  pageNum?: number;
-  pageSize: number;
+  pageSize?: number;
 }
 
 /**

frontend/src/api/system/versionRegister/index.ts

@@ -3,7 +3,7 @@ import { type VersionRegister } from '@/api/system/versionRegister/interface'
 
 //获取有效数据配置
 export const getRegRes = (params: { type: string }) => {
-    return http.get(`/sysRegRes/getRegResByType?id=${params.type}`)
+    return http.get(`/sysRegRes/getRegResByType?typeId=${params.type}`)
 }
 
 //编辑有效数据配置

frontend/src/layouts/components/Footer/index.vue

@@ -72,7 +72,15 @@ const handelOpen = async (item: string, key: string) => {
     // 强制刷新页面
     await tabsStore.closeMultipleTab()
     await initDynamicRouter()
-    await router.push({ path: '/home/index' })
+
+    // 只有当目标路径与当前路径不同时才跳转
+    if (router.currentRoute.value.path !== '/home/index') {
+        await router.push({ path: '/home/index' })
+    } else {
+        // 如果已在目标页面，手动触发组件更新
+        window.location.reload() // 或者采用其他方式刷新数据
+    }
+    
 }
 </script>
 <style scoped lang="scss">

frontend/src/utils/webSocketClient.ts

@@ -190,8 +190,8 @@ export default class SocketService {
      * WebSocket连接配置
      */
     private config: SocketConfig = {
-        //url: 'ws://127.0.0.1:7777/hello',
+        url: 'ws://127.0.0.1:7777/hello',
-        url: 'ws://192.168.1.124:7777/hello',
+        // url: 'ws://192.168.1.124:7777/hello',
         heartbeatInterval: 9000,        // 9秒心跳间隔
         reconnectDelay: 5000,           // 5秒重连延迟
         maxReconnectAttempts: 5,        // 最多重连5次
@@ -246,13 +246,13 @@ export default class SocketService {
     public connect(): Promise<void> | void {
         // 检查浏览器支持
         if (!window.WebSocket) {
-           // console.log('您的浏览器不支持WebSocket');
+            // console.log('您的浏览器不支持WebSocket');
             return;
         }
 
         // 防止重复连接
         if (this.connectionStatus === ConnectionStatus.CONNECTING || this.connected) {
-           // console.warn('WebSocket已连接或正在连接中');
+            // console.warn('WebSocket已连接或正在连接中');
             return;
         }
 
@@ -311,7 +311,7 @@ export default class SocketService {
             return;
         }
         this.callBackMapping[messageType] = callback;
-       // console.log(`注册消息处理器: ${messageType}`);
+        // console.log(`注册消息处理器: ${messageType}`);
     }
 
     /**
@@ -447,7 +447,7 @@ export default class SocketService {
         // 连接成功事件
         this.ws.onopen = () => {
             ElMessage.success("WebSocket连接服务端成功");
-           // console.log('WebSocket连接成功');
+            // console.log('WebSocket连接成功');
             this.connectionStatus = ConnectionStatus.CONNECTED;
             this.connectRetryCount = 0;
             this.startHeartbeat();
@@ -489,7 +489,7 @@ export default class SocketService {
         // 连接成功事件
         this.ws.onopen = () => {
             ElMessage.success("webSocket连接服务端成功了");
-           // console.log('连接服务端成功了');
+            // console.log('连接服务端成功了');
             this.connectionStatus = ConnectionStatus.CONNECTED;
             this.connectRetryCount = 0;
             this.startHeartbeat();
@@ -497,7 +497,7 @@ export default class SocketService {
 
         // 连接关闭事件
         this.ws.onclose = (event: CloseEvent) => {
-           // console.log('连接webSocket服务端关闭');
+            // console.log('连接webSocket服务端关闭');
             this.connectionStatus = ConnectionStatus.DISCONNECTED;
             this.clearHeartbeat();
 
@@ -530,7 +530,7 @@ export default class SocketService {
 
         // 心跳响应处理
         if (event.data === 'over') {
-           // console.log(`${new Date().toLocaleTimeString()} - 收到心跳响应`);
+            // console.log(`${new Date().toLocaleTimeString()} - 收到心跳响应`);
             this.lastResponseHeartTime = Date.now();
             return;
         }
@@ -553,7 +553,7 @@ export default class SocketService {
                 }
             } else {
                 // 非JSON格式的消息，作为普通文本处理
-               // console.log('收到非JSON格式消息:', event.data);
+                // console.log('收到非JSON格式消息:', event.data);
                 // 可以添加文本消息的处理逻辑
                 if (this.callBackMapping['text']) {
                     this.callBackMapping['text']({
@@ -587,7 +587,7 @@ export default class SocketService {
 
         const delay = this.config.reconnectDelay! * this.connectRetryCount;
 
-       // console.log(`尝试第${this.connectRetryCount}次重连，${delay}ms后开始...`);
+        // console.log(`尝试第${this.connectRetryCount}次重连，${delay}ms后开始...`);
 
         setTimeout(() => {
             try {
@@ -674,7 +674,7 @@ export default class SocketService {
      */
     private sendHeartbeat(): void {
         if (this.connected && this.ws) {
-           // console.log(`${new Date().toLocaleTimeString()} - 发送心跳消息`);
+            // console.log(`${new Date().toLocaleTimeString()} - 发送心跳消息`);
             this.ws.send('alive');
         }
     }

frontend/src/views/home/components/channelPairing.vue

@@ -37,6 +37,7 @@ import { jwtUtil } from '@/utils/jwtUtil'
 import { useCheckStore } from '@/stores/modules/check'
 import { ipc } from '@/utils/ipcRenderer'
 import { fa, tr } from 'element-plus/es/locale'
+import { CheckData } from '@/api/check/interface'
 const vueFlowElement = ref(442)
 const checkStore = useCheckStore()
 const dialogVisible = ref(false)
@@ -427,7 +428,7 @@ const standardDevIds = ref<string[]>()
 const open = async () => {
     edges.value = []
 
-    devIds.value = prop.devIdList.map(d => d.id)
+    //devIds.value = prop.devIdList.map(d => d.id)
     standardDevIds.value = prop.pqStandardDevList.map(d => d.id)
     planId.value = prop.planIdKey
     nodes.value = createNodes(prop.devIdList, prop.pqStandardDevList, prop.deviceMonitor)
@@ -447,11 +448,33 @@ const handleNext = async () => {
     let chnNumList: string[] = []
     await edges.value.forEach(edge => {
         const match = edge.source.split('-')
-
         if (match) {
-            chnNumList.push(match[2])
+            chnNumList.push(match[1] + '-'+ match[2])
         }
     })
+
+    const connectedDeviceIds = [...new Set(chnNumList.map(item => item.split('-')[0]))]
+    devIds.value = connectedDeviceIds
+    //可能存在勾选的被检设备未连线的情况，需要过滤掉
+     let devices: CheckData.Device[] = prop.devIdList
+        .filter((item: any) => connectedDeviceIds.includes(item.id))
+        .map((item: any) => {
+            return {
+                deviceId: item.id,
+                deviceName: item.name,
+                chnNum: item.devChns,
+                planId: item.planId,
+                deviceType: item.devType,
+                devVolt: item.devVolt,
+                devCurr: item.devCurr,
+                factorFlag: item.factorFlag,
+                checkResult: item.checkResult
+            }
+    })
+    checkStore.clearDevices()
+    checkStore.addDevices(devices)
+  
+
     const connections = edges.value.reduce(
         (map, edge) => {
             // 从source中提取设备ID和通道号: 被检通道-{deviceId}-{channelNum} => {deviceId}-{channelNum}

frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue

@@ -563,7 +563,8 @@ const handleErrorSysChange = async () => {
         errorSysId: formContent.errorSysId,
         deviceId: formContent.deviceId,
         code: checkStore.plan.code + '',
-        patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? ''
+        patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? '',
+        chnNum: formContent.chnNum
     }).then(res => {
         if (res.code === ResultEnum.SUCCESS) {
             ElMessage.success('切换误差体系成功')
@@ -579,7 +580,8 @@ const handleReCalculate = async () => {
         errorSysId: formContent.errorSysId,
         deviceId: formContent.deviceId,
         code: checkStore.plan.code + '',
-        patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? ''
+        patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? '',
+        chnNum: formContent.chnNum
     }).then(res => {
         if (res.code === ResultEnum.SUCCESS) {
             ElMessage.success('重新计算成功！')

frontend/src/views/home/components/compareTest.vue

@@ -37,9 +37,9 @@
                 align="center"
             >
               <el-table-column
-                  v-for="(chnItem, index2) in checkStore.chnNumList"
+                  v-for="(chnItem, index2) in checkStore.chnNumList.filter(c => c.startsWith(item.deviceId))"
                   :key="`${item.deviceId}${chnItem}`"
-                  :label="'通道' + chnItem"
+                  :label="'通道' + chnItem.split('-')[1]"
                   align="center"
               >
                 <template #default="{ row }">
@@ -129,6 +129,7 @@ import {useCheckStore} from '@/stores/modules/check'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import {getBigTestItem} from '@/api/check/test'
 import {getAutoGenerate} from '@/api/user/login'
+import { generateDevReport } from '@/api/plan/plan'
 import {useModeStore} from '@/stores/modules/mode' // 引入模式 store
 import {useDictStore} from '@/stores/modules/dict'
 const checkStore = useCheckStore()
@@ -668,19 +669,19 @@ const updatePercentage = async () => {
     percentage.value = 100
     emit('update:testStatus', 'success')
 
-    let {data: autoGenerate} = await getAutoGenerate()
+
+    // 检查是否需要自动生成报告
+    let { data: autoGenerate } = await getAutoGenerate()
     if (autoGenerate == 1) {
-      //调用自动生成报告接口
+      // 自动生成报告
       let devIdList = checkStore.devices.map(item => {
         return item.deviceId
       })
-
+      await generateDevReport({
-      // await generateDevReport({
+        'planId': checkStore.plan.id,
-      //     planId: checkStore.plan.id,
+        'devIdList': devIdList,
-      //     devIdList: devIdList,
+        'planCode': checkStore.plan.code + ''
-      //     scriptId: checkStore.plan.scriptId,
+      })
-      //     planCode: checkStore.plan.code + ''
-      // })
     }
     stopTimeCount(1)
     ElMessageBox.alert(
@@ -803,6 +804,7 @@ const initCheckResult = (defaultValue: CheckData.ChnCheckResultEnum) => {
   })
 
   Object.assign(checkResult, result)
+
 }
 
 const scrollToBottom = () => {

frontend/src/views/home/components/compareTestPopup.vue

@@ -278,7 +278,6 @@ const open = async (
     pairs.value = pair
     showSteps.value = true
     initOperate()
-    dialogTitle.value = title
     dialogVisible.value = true
 
     // 等待组件渲染完成

frontend/src/views/home/components/deviceConnectionPopup.vue

@@ -215,7 +215,7 @@ const planIdKey = ref<string>('')
 const deviceMonitor = ref<Map<string, any[]>>();
 const planIsOnlyWave = ref(false)
 const open = async (
-    
+    title: string,
     device: Device.ResPqDev[],
     standardDev: StandardDevice.ResPqStandardDevice[],
     fatherPlanId: string,
@@ -223,6 +223,7 @@ const open = async (
     checkType: string,
     isOnlyWave:boolean
 ) => {
+    dialogTitle.value = title
     planIsOnlyWave.value = isOnlyWave
     CompareTestVisible.value = false
     devIdList.value = device

frontend/src/views/home/components/table.vue

@@ -650,7 +650,7 @@ function tableHeaderInit(val: number) {
             break
         case 3: // 报告生成模式
             if (modeStore.currentMode === '比对式') {
-                checkStateTable.value = [1, 2, 3] // 显示检测中，检测完成和归档状态
+                checkStateTable.value = [2, 3] // 显示检测中，检测完成和归档状态
             } else {
                 checkStateTable.value = [2, 3] // 显示检测完成和归档状态
             }
@@ -845,8 +845,9 @@ const handleTest2 = async (val: string) => {
  
     // 检查数组长度是否为1且唯一元素是'wave_data'
     const isOnlyWave = targetPlan.datasourceIds.length === 1 && targetPlan.datasourceIds[0] === 'wave_data'
- 
+    dialogTitle.value = val
     deviceConnectionPopupRef.value?.open(
+        dialogTitle.value,
         filteredChannelsSelection,
         pqStandardDevList.value,
         props.id,
@@ -1018,9 +1019,7 @@ const handleTest = async (val: string) => {
             planId: checkStore.plan.id,
             devIdList: devIdList,
             scriptId: checkStore.plan.scriptId,
-            planCode: checkStore.plan.code + '',
+            planCode: checkStore.plan.code + ''
-            pageNum: 1,
-            pageSize: 999
         })
         emit('batchGenerateClicked') // 触发事件
         ElMessage.success({ message: `报告生成成功！` })
@@ -1060,9 +1059,7 @@ const openDrawer = async (title: string, row: any) => {
                 planId: checkStore.plan.id,
                 devIdList: [row.id],
                 scriptId: checkStore.plan.scriptId,
-                planCode: checkStore.plan.code + '',
+                planCode: checkStore.plan.code + ''
-                pageNum: 1,
-                pageSize: 999
             })
              emit('batchGenerateClicked') // 触发事件
             ElMessage.success({ message: `报告生成成功！` })

frontend/src/views/home/components/test.vue

@@ -706,9 +706,7 @@ const updatePercentage = async () => {
           'planId': checkStore.plan.id,
           'devIdList': devIdList,
           'scriptId': checkStore.plan.scriptId,
-          'planCode': checkStore.plan.code + '',
+          'planCode': checkStore.plan.code + ''
-          'pageNum': 1,
-          'pageSize': 999,
         })
       }
       // 提示检测完成

frontend/src/views/home/tabs/model.vue

@@ -18,13 +18,15 @@
                     <img :src="item.img" />
                 </div>
                 <div class="test_button">
-                    <el-button size="large" type="primary" @click="handelOpen(item)" :disabled="!item.activated">
+                    <el-button size="large" type="primary" @click="handelOpen(item)">
-                        进入检测
+                        {{ item.activated ? '进入检测' : '待激活' }}
                     </el-button>
                 </div>
             </el-carousel-item>
         </el-carousel>
     </div>
+    <!-- versionRegisterDialog -->
+    <VersionDialog ref="versionRegisterRef"></VersionDialog>
 </template>
 <script lang="ts" setup>
 import { useAuthStore } from '@/stores/modules/auth'
@@ -32,6 +34,8 @@ import { useAppSceneStore, useModeStore } from '@/stores/modules/mode' // 引入
 import { getCurrentScene } from '@/api/user/login'
 import { initDynamicRouter } from '@/routers/modules/dynamicRouter'
 import { useTabsStore } from '@/stores/modules/tabs'
+import VersionDialog from '@/views/system/versionRegister/index.vue'
+import { ref, onMounted } from 'vue'
 
 const authStore = useAuthStore()
 const modeStore = useModeStore() // 使用模式 store
@@ -39,6 +43,7 @@ const AppSceneStore = useAppSceneStore()
 const activateInfo = authStore.activateInfo
 const isActivateOpen = import.meta.env.VITE_ACTIVATE_OPEN
 const tabsStore = useTabsStore()
+const versionRegisterRef = ref<InstanceType<typeof VersionDialog> | null>(null)
 const modeList = [
     {
         name: '模拟式模块',
@@ -64,7 +69,8 @@ const modeList = [
 ]
 const handelOpen = async (item: any) => {
     if (!item.activated) {
-        ElMessage.warning(`${item.name}未激活`)
+        // 打开版本激活弹窗
+        versionRegisterRef.value?.openDialog()
         return
     }
     modeStore.setCurrentMode(item.code) // 将模式code存入 store

frontend/src/views/login/components/LoginForm.vue

@@ -24,7 +24,7 @@
                 </template>
             </el-input>
         </el-form-item>
-        <el-form-item prop="checked">
+        <el-form-item prop="checked" v-show="false">
             <el-checkbox v-model="loginForm.checked">记住我</el-checkbox>
         </el-form-item>
     </el-form>

frontend/src/views/machine/device/components/devicePopup.vue

@@ -26,7 +26,7 @@
                             <el-input
                                 v-model="formContent.name"
                                 placeholder="请输入设备名称"
-                                :disabled="scene === '1' || formContent.importFlag == 1"
+                                :disabled="scene === '1'"
                                 maxlength="32"
                                 show-word-limit
                             />
@@ -38,7 +38,7 @@
                                 clearable
                                 placeholder="请选择设备类型"
                                 @change="handleDevTypeChange"
-                                :disabled="formContent.importFlag == 1"
+                                
                             >
                                 <el-option
                                     v-for="item in devTypeOptions"
@@ -63,7 +63,7 @@
                                 v-model="formContent.manufacturer"
                                 clearable
                                 placeholder="请选择设备厂家"
-                                :disabled="formContent.importFlag == 1"
+                               
                             >
                                 <el-option
                                     v-for="item in dictStore.getDictData('Dev_Manufacturers')"
@@ -78,7 +78,7 @@
                                 v-model="formContent.createDate"
                                 :placeholder="`请选择${createDateTitle}`"
                                 :disabled-date="disabledDate"
-                                :disabled="formContent.importFlag == 1"
+                               
                             />
                         </el-form-item>
                         <el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
@@ -92,7 +92,7 @@
                                 v-model="formContent.inspectDate"
                                 placeholder="请选择定检日期"
                                 :disabled-date="disabledDate"
-                                :disabled="formContent.importFlag == 1"
+                               
                             />
                         </el-form-item>
                         <el-divider>参数信息</el-divider>
@@ -128,7 +128,7 @@
                                 v-model="formContent.protocol"
                                 clearable
                                 placeholder="请选择通讯协议"
-                                :disabled="formContent.importFlag == 1"
+                               
                             >
                                 <el-option
                                     v-for="item in dictStore.getDictData('Protocol')"
@@ -139,17 +139,17 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="IP地址" prop="ip" placeholder="请输入IP地址">
-                            <el-input v-model="formContent.ip" :disabled="formContent.importFlag == 1" />
+                            <el-input v-model="formContent.ip" />
                         </el-form-item>
                         <el-form-item label="端口号" prop="port" placeholder="请输入端口号">
-                            <el-input v-model="formContent.port" :disabled="formContent.importFlag == 1" />
+                            <el-input v-model="formContent.port"  />
                         </el-form-item>
                         <el-form-item label="是否加密" prop="encryptionFlag">
                             <el-select
                                 v-model="formContent.encryptionFlag"
                                 clearable
                                 placeholder="请选择是否加密"
-                                :disabled="formContent.importFlag == 1"
+                                
                             >
                                 <el-option label="是" :value="1"></el-option>
                                 <el-option label="否" :value="0"></el-option>
@@ -160,7 +160,7 @@
                                 v-model="formContent.series"
                                 placeholder="请输入识别码"
                                 show-password
-                                :disabled="formContent.importFlag == 1"
+                               
                             />
                         </el-form-item>
                         <el-form-item label="密钥" prop="devKey" clearable v-if="formContent.encryptionFlag">
@@ -168,7 +168,7 @@
                                 v-model="formContent.devKey"
                                 placeholder="请输入密钥"
                                 show-password
-                                :disabled="formContent.importFlag == 1"
+                              
                             />
                         </el-form-item>
                         <el-form-item label="样品编号" prop="sampleId" clearable v-if="DevIsShow && scene === '0'">
@@ -196,7 +196,7 @@
                                 v-model="formContent.cityName"
                                 clearable
                                 placeholder="请输入所属地市"
-                                :disabled="formContent.importFlag == 1"
+                              
                             />
                         </el-form-item>
                         <el-form-item label="所属供电公司" prop="gdName" v-if="MonIsShow">
@@ -204,7 +204,7 @@
                                 v-model="formContent.gdName"
                                 clearable
                                 placeholder="请输入所属供电公司"
-                                :disabled="formContent.importFlag == 1"
+                               
                             />
                         </el-form-item>
                         <el-form-item label="所属电站" prop="subName" v-if="MonIsShow">
@@ -212,7 +212,7 @@
                                 v-model="formContent.subName"
                                 clearable
                                 placeholder="请输入所属电站"
-                                :disabled="formContent.importFlag == 1"
+                               
                             />
                         </el-form-item>
                         <el-form-item
@@ -232,7 +232,7 @@
                             prop="harmSysId"
                             placeholder="请输入谐波系统设备id"
                         >
-                            <el-input v-model="formContent.harmSysId" :disabled="formContent.importFlag == 1" />
+                            <el-input v-model="formContent.harmSysId"  />
                         </el-form-item>
                     </el-form>
                 </div>

frontend/src/views/machine/device/components/monitorPopup.vue

@@ -11,17 +11,17 @@
         <div>
             <el-form :model="formContent" ref="dialogFormRef" :rules="rules" label-width="140" class="form-two">
                 <el-form-item label="名称" prop="name">
-                    <el-input clearable v-model="formContent.name" placeholder="请输入监测点名称" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
+                    <el-input clearable v-model="formContent.name" placeholder="请输入监测点名称" :disabled=" formContent.resultType!=null"/>
                 </el-form-item>
                 <el-form-item label="线路号" prop="num">
-                    <el-select v-model="formContent.num" placeholder="请选择线路号" @change="handleMonNumChange" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null">
+                    <el-select v-model="formContent.num" placeholder="请选择线路号" @change="handleMonNumChange" :disabled=" formContent.resultType!=null">
                         <el-option v-for="item in lineNum" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="所属母线" prop="busbar">
+                <el-form-item label="母线名称" prop="busbar">
-                    <el-input v-model="formContent.busbar" clearable placeholder="请输入所属母线" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
+                    <el-input v-model="formContent.busbar" clearable placeholder="请输入所属母线" :disabled=" formContent.resultType!=null"/>
                 </el-form-item>
-                <!-- <el-form-item label="所属母线" prop="busbar">
+                <!-- <el-form-item label="母线名称" prop="busbar">
                     <el-select
                         v-model="formContent.busbar"
                         clearable
@@ -38,7 +38,7 @@
                     </el-select>
                 </el-form-item> -->
                 <el-form-item label="接线方式" prop="connection">
-                    <el-select v-model="formContent.connection" clearable placeholder="请选择接线方式" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null">
+                    <el-select v-model="formContent.connection" clearable placeholder="请选择接线方式" :disabled=" formContent.resultType!=null">
                         <el-option
                             v-for="item in dictStore.getDictData('Dev_Connect')"
                             :key="item.id"
@@ -56,11 +56,11 @@
                     </template>
                     <div class="ratio-input-group">
                         <el-form-item prop="ptPrimary" class="ratio-form-item">
-                            <el-input v-model="ptPrimary" placeholder="一次侧" @input="handlePtInput" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
+                            <el-input v-model="ptPrimary" placeholder="一次侧" @input="handlePtInput" :disabled=" formContent.resultType!=null"/>
                         </el-form-item>
                         <div class="colon">:</div>
                         <el-form-item prop="ptSecondary" style="margin-left: 10px" class="ratio-form-item">
-                            <el-input v-model="ptSecondary" placeholder="二次侧" @input="handlePtInput" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
+                            <el-input v-model="ptSecondary" placeholder="二次侧" @input="handlePtInput" :disabled=" formContent.resultType!=null"/>
                         </el-form-item>
                     </div>
                 </el-form-item>
@@ -75,17 +75,17 @@
                     </template>
                     <div class="ratio-input-group">
                         <el-form-item prop="ctPrimary" class="ratio-form-item">
-                            <el-input v-model="ctPrimary" placeholder="一次侧" @input="handleCtInput" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
+                            <el-input v-model="ctPrimary" placeholder="一次侧" @input="handleCtInput" :disabled=" formContent.resultType!=null"/>
                         </el-form-item>
                         <div class="colon">:</div>
                         <el-form-item prop="ctSecondary" style="margin-left: 10px" class="ratio-form-item">
-                            <el-input v-model="ctSecondary" placeholder="二次侧" @input="handleCtInput" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
+                            <el-input v-model="ctSecondary" placeholder="二次侧" @input="handleCtInput" :disabled=" formContent.resultType!=null"/>
                         </el-form-item>
                     </div>
                 </el-form-item>
 
                 <el-form-item label="统计间隔" prop="statInterval">
-                    <el-select v-model="formContent.statInterval" clearable placeholder="请选择统计间隔" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null">
+                    <el-select v-model="formContent.statInterval" clearable placeholder="请选择统计间隔" :disabled=" formContent.resultType!=null">
                         <el-option
                             v-for="item in dictStore.getDictData('Dev_Chns')"
                             :key="item.id"
@@ -95,7 +95,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="谐波系统检测点id" prop="harmSysId" placeholder="请输入谐波系统检测点id">
-                    <el-input v-model="formContent.harmSysId" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
+                    <el-input v-model="formContent.harmSysId" :disabled=" formContent.resultType!=null"/>
                 </el-form-item>
                 <el-form-item label="是否参与检测" prop="checkFlag" placeholder="请输入CT编号">
                     <el-select v-model="formContent.checkFlag" :disabled="formContent.resultType!=null">

frontend/src/views/machine/device/components/monitorTab.vue

@@ -93,7 +93,7 @@ const columns = reactive<ColumnProps<Monitor.ResPqMon>[]>([
     },
     {
         prop: 'busbar',
-        label: '所属母线',
+        label: '母线名称',
         width: 200
     },
     {

frontend/src/views/machine/icd/components/icdPopup.vue

@@ -14,6 +14,23 @@
                         show-word-limit
                     />
                 </el-form-item>
+                <el-form-item label="映射文件" prop="mappingFile">
+                    <el-upload
+                        action="#"
+                        :limit="1"
+                        :on-change='MappingHandleChange'
+                        :auto-upload="false"
+                        :file-list="mappingFileList"
+                        :on-exceed="MappingHandleExceed"
+                        :on-remove="MappingHandleRemove"
+                        style="width: 100% !important;"
+                        accept=".txt"
+                        class="upload-container"
+                    >
+                        <el-button type="primary">选择文件</el-button>
+                    </el-upload>
+                    仅支持上传大小不超过1MB的.txt文件
+                </el-form-item>
                 <el-form-item label="是否支持电压相角、电流相角指标" prop="angle" label-width="auto">
                     <el-switch
                         v-model="formContent.angle"
@@ -46,7 +63,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ElMessage, type FormInstance, type FormItemRule } from 'element-plus'
+import { ElMessage, UploadFile, type FormInstance, type FormItemRule } from 'element-plus'
 import { computed, ref, Ref } from 'vue'
 import { type ICD } from '@/api/device/interface/icd'
 import { dialogSmall } from '@/utils/elementBind'
@@ -56,6 +73,17 @@ import { addICD, updateICD } from '@/api/device/icd'
 const dictStore = useDictStore()
 // 定义弹出组件元信息
 const dialogFormRef = ref()
+const mappingFileName = ref('')
+const mappingFileUrl = ref('')
+let excelFormData = new FormData()
+
+
+const mappingFileList = computed(() => {
+  if (mappingFileName.value && mappingFileUrl.value) {
+    return [{name: mappingFileName.value, url: mappingFileUrl.value}];
+  }
+  return [];
+});
 function useMetaInfo() {
     const dialogVisible = ref(false)
     const titleType = ref('add')
@@ -65,7 +93,8 @@ function useMetaInfo() {
         path: '',
         state: 1,
         angle: 0,
-        usePhaseIndex: 0
+        usePhaseIndex: 0,
+        mappingFile: ''
     })
     return { dialogVisible, titleType, formContent }
 }
@@ -80,7 +109,8 @@ const resetFormContent = () => {
         path: '',
         state: 1,
         angle: 0,
-        usePhaseIndex: 0
+        usePhaseIndex: 0,
+        mappingFile: ''
     }
 }
 
@@ -93,11 +123,13 @@ const formRuleRef = ref<FormInstance>()
 //定义校验规则
 const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
     name: [{ required: true, message: 'icd名称必填！', trigger: 'blur' }],
-    path: [{ required: true, message: 'icd存储地址必填！', trigger: 'blur' }]
+    path: [{ required: true, message: 'icd存储地址必填！', trigger: 'blur' }],
+    mappingFile: [{required: true, message: '请上传映射文件', trigger: 'change'}],
 })
 
 // 关闭弹窗
 const close = () => {
+    excelFormData = new FormData()
     dialogVisible.value = false
     // 清空dialogForm中的值
     resetFormContent()
@@ -110,10 +142,27 @@ const save = () => {
     try {
         dialogFormRef.value?.validate(async (valid: boolean) => {
             if (valid) {
+                // 清空 excelFormData
+                excelFormData.delete('name')
+                excelFormData.delete('path')
+                excelFormData.delete('angle')
+                excelFormData.delete('usePhaseIndex')
+
+                excelFormData.append('name', formContent.value.name)
+                excelFormData.append('path', formContent.value.path)
+                excelFormData.append('angle', formContent.value.angle)
+                excelFormData.append('usePhaseIndex', formContent.value.usePhaseIndex)
+
+                let baseFileFlag = handleFileLimit(excelFormData.get('mappingFile') as File)
+                if (!baseFileFlag) {
+                    return
+                }
+
                 if (formContent.value.id) {
-                    await updateICD(formContent.value)
+                     excelFormData.append('id', formContent.value.id)
+                    await updateICD(excelFormData)
                 } else {
-                    await addICD(formContent.value)
+                    await addICD(excelFormData)
                 }
                 ElMessage.success({ message: `${dialogTitle.value}成功！` })
                 close()
@@ -135,11 +184,66 @@ const open = async (sign: string, data: ICD.ResICD) => {
 
     if (data.id) {
         formContent.value = { ...data }
+        formContent.value.id = data.id
+        // 文件信息回显
+        if (data.mappingFile) {
+            mappingFileName.value = data.mappingFile.name
+            mappingFileUrl.value = data.mappingFile.url
+            // 模拟文件列表显示
+            formContent.value.mappingFile = data.mappingFile.name
+        }
+      
+
     } else {
+        mappingFileName.value = ''
+        mappingFileUrl.value = ''
         resetFormContent()
+        // 清空 excelFormData
+        excelFormData = new FormData();
     }
 }
 
+const MappingHandleChange = async (param: UploadFile) => {
+  mappingFileName.value = param.name;
+  mappingFileUrl.value = URL.createObjectURL(param.raw as Blob);
+  excelFormData.append('mappingFile', param.raw as Blob, param.name);
+
+  formContent.value.mappingFile = param.name;
+};
+
+const MappingHandleRemove = () => {
+  excelFormData.delete('mappingFile');
+  formContent.value.mappingFile = ''
+};
+
+const MappingHandleExceed = (files: File[]) => {
+  // 移除旧文件
+  excelFormData.delete('mappingFile');
+  // 添加新文件
+  if (files.length > 0) {
+    const newFile = files[0] as unknown as UploadFile;
+    mappingFileName.value = newFile.name;
+    excelFormData.append('mappingFile', newFile as Blob, newFile.name);
+
+    formContent.value.mappingFile = newFile.name
+  }
+
+};
+
+const fileSizeLimit = 1 * 1024 * 1024; // 1MB
+
+const handleFileLimit = (file: File) => {
+  if (file) {
+    if (file.size > fileSizeLimit) {
+      ElMessage.error({message: `文件大小不能超过${fileSizeLimit / 1024 / 1024}MB`});
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return true;
+}
+
 // 对外映射
 defineExpose({ open })
 const props = defineProps<{

frontend/src/views/machine/icd/index.vue

@@ -69,6 +69,14 @@
       label: '存储地址',
   
     },
+    {
+      prop: 'mappingFile',
+      label: '映射文件路径',
+      minWidth: 150,
+      render: scope => {
+        return scope.row.mappingFile.url
+      }
+    },
     {
       prop: 'createTime',
       label: '创建时间',

frontend/src/views/machine/testScript/components/testScriptPopup.vue

@@ -84,6 +84,13 @@
                         clearable
                     />
                 </el-form-item>
+
+                <el-form-item v-if="appSceneStore.currentScene=='1'" label="福禄克专用" prop="fluke">
+                <el-switch
+                    v-model="formContent.fluke"
+                    active-color="#13ce66"
+                />
+              </el-form-item>
             </el-form>
         </el-card>
         <el-card v-if="show">
@@ -102,6 +109,7 @@ import type { CascaderOption } from 'element-plus'
 import { Select, Close, ArrowDownBold, ArrowUpBold } from '@element-plus/icons-vue'
 import { pqScriptAdd, pqScriptUpdate } from '@/api/device/testScript'
 import { useRouter } from 'vue-router'
+import {useAppSceneStore} from "@/stores/modules/mode";
 const modeId = ref()
 const show = ref(false)
 const height = ref('125px')
@@ -113,6 +121,8 @@ const secondLevelOptions: any[] = []
 // 定义弹出组件元信息
 const dialogFormRef = ref()
 const dictStore = useDictStore()
+const appSceneStore = useAppSceneStore()
+
 function useMetaInfo() {
     const titleType = ref('add')
     const formContent = ref<TestScript.ResTestScript>({
@@ -124,7 +134,8 @@ function useMetaInfo() {
         standardTime: '',
         state: 1,
         ratedCurr: 0,
-        ratedVolt: 0
+        ratedVolt: 0,
+        fluke: 0,
     })
     return { titleType, formContent }
 }
@@ -140,7 +151,8 @@ const rules = {
     type: [{ required: true, message: '请选择模版类型', trigger: 'change' }],
     valueType: [{ required: true, message: '请选择检测脚本值类型', trigger: 'change' }],
     ratedCurr: [{ required: true, message: '请填写额定电流', trigger: 'change' }],
-    ratedVolt: [{ required: true, message: '请填写额定电压', trigger: 'change' }]
+    ratedVolt: [{ required: true, message: '请填写额定电压', trigger: 'change' }],
+  fluke: [{ required: true }],
 }
 
 const { titleType, formContent } = useMetaInfo()
@@ -160,7 +172,8 @@ const resetFormContent = () => {
         standardTime: '',
         state: 1,
         ratedCurr: 0,
-        ratedVolt: 0
+        ratedVolt: 0,
+        fluke: 0,
     }
     router.go(-1)
 }
@@ -190,7 +203,9 @@ const save = () => {
         if (valid) {
             if (titleType.value == '新增检测脚本') {
                 formContent.value.pattern = modeId.value
-                pqScriptAdd(formContent.value).then(res => {
+              let params = {...formContent.value}
+              params.fluke = params.fluke ? 1 : 0
+                pqScriptAdd(params).then(res => {
                     if (res.code === 'A0000') {
                         ElMessage.success({ message: res.message })
                         formContent.value.id = res.data
@@ -199,7 +214,9 @@ const save = () => {
                     }
                 })
             } else {
-                pqScriptUpdate(formContent.value).then(res => {
+              let params = {...formContent.value}
+              params.fluke = params.fluke ? 1 : 0
+                pqScriptUpdate(params).then(res => {
                     if (res.code === 'A0000') {
                         ElMessage.success({ message: res.message })
                     }
@@ -224,6 +241,7 @@ const open = async (title: string, row: any) => {
     } else {
         let list = JSON.parse(row)
         formContent.value = list
+      formContent.value.fluke = formContent.value.fluke == 1? true : false
         show.value = true
     }
     // 重置表单

frontend/src/views/plan/planList/components/devSelect.vue

@@ -235,7 +235,7 @@
                                         </el-icon>
                                     </el-tooltip>
                                     <el-button
-                                        v-if="!data.disabled && !props.disabled"
+                                        v-if="modeStore.currentMode === '比对式' ? !data.disabled : (!data.disabled && !props.disabled)"
                                         text
                                         circle
                                         @click="removeNode(data)"
@@ -252,7 +252,7 @@
     </el-row>
 </template>
 <script lang="ts" setup>
-import { nextTick, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, PropType, ref, useSlots, watch } from 'vue'
 import type {
     FilterNodeMethodFunction,
     RenderContentContext,
@@ -261,6 +261,7 @@ import type {
     TreeKey
 } from 'element-plus'
 import { Cpu, Lightning, Location, OfficeBuilding, Warning } from '@element-plus/icons-vue'
+import { useModeStore } from '@/stores/modules/mode' // 引入模式 store
 
 interface Tree {
     [key: string]: any
@@ -274,6 +275,7 @@ interface Device {
 type Data = RenderContentContext['data']
 const modelValue = defineModel<string[]>({ default: [] })
 const slots = useSlots()
+const modeStore = useModeStore()
 const props = defineProps({
     data: {
         type: Array as unknown as PropType<Device[]>,
@@ -298,7 +300,7 @@ const props = defineProps({
     expandAll: {
         type: Boolean,
         default: false
-    }
+    },
 })
 const leftTreeRef = ref<TreeInstance>()
 const rightTreeRef = ref<TreeInstance>()
@@ -353,6 +355,7 @@ watch(
 )
 
 const initTree = (data: Device[]) => {
+   
     // 禁用Key数据
     disabledKeys.value = data.filter(item => item.disabled).map(item => item.id)
     // 编辑逻辑
@@ -360,11 +363,14 @@ const initTree = (data: Device[]) => {
         modelValue.value = []
     }
     // 左侧树数据
-    leftTreeData.value = convertToTree(data, filter.value.groupBy)
+    leftTreeData.value = convertToTree(data, 0,filter.value.groupBy)
+
     // 右侧树数据
     rightTreeData.value = convertToTree(
         data.filter(item => item.checked),
+        1,
         filter.value.groupBy
+        
     )
     defaultCheckedKeys.value = data.filter(item => item.checked).map(item => item.id)
     modelValue.value = defaultCheckedKeys.value
@@ -393,7 +399,7 @@ const setCheckedStatus = (checked: boolean) => {
         })
     }
 }
-const convertToTree = (data: Device[], groupBy?: string | undefined) => {
+const convertToTree = (data: Device[], type: number,groupBy?: string | undefined) => {
     if (groupBy) {
         // 创建一个映射来存储每个分组
         const groupMap = new Map()
@@ -409,20 +415,56 @@ const convertToTree = (data: Device[], groupBy?: string | undefined) => {
 
         // 将分组转换为树形结构
         const treeData: Tree[] = []  
-        groupMap.forEach((items, groupName) => {
+
-            const groupNode: Tree = {
+        if(modeStore.currentMode == '比对式'){
-                id: `${groupBy}_${groupName}`,
+            groupMap.forEach((items, groupName) => {
-                label: groupName,
+                let groupNode: Tree;
-                children: (items as any[]).map((item: any) => ({
+                if(type === 0){
-                    ...item,
+                    // 只有当组内所有项目都禁用时，才将组节点设为禁用
-                    label: item.name,
+                    const allItemsDisabled = (items as any[]).every((item: any) => {
-                    children: [],
+                        return item.disabled === true ;
-                    disabled: item.disabled ? item.disabled : props.disabled
+                    });
-                })),
+                    groupNode = {
-                disabled: props.disabled
+                        id: `${groupBy}_${groupName}`,
-            }
+                        label: groupName,
-            treeData.push(groupNode)
+                        children: (items as any[]).map((item: any) => ({
-        })
+                            ...item,
+                            label: item.name,
+                            children: [],
+                            // disabled: item.disabled ? item.disabled : props.disabled
+                        })),
+                        // disabled: props.disabled
+                        disabled: allItemsDisabled
+                    }
+                }else{ 
+                    groupNode = {
+                        id: `${groupBy}_${groupName}`,
+                        label: groupName,
+                        children: (items as any[]).map((item: any) => ({
+                            ...item,
+                            label: item.name,
+                            children: [],
+                        })),
+                    }
+                }
+                treeData.push(groupNode)
+            })
+        }else{
+                groupMap.forEach((items, groupName) => {
+                const groupNode: Tree = {
+                    id: `${groupBy}_${groupName}`,
+                    label: groupName,
+                    children: (items as any[]).map((item: any) => ({
+                        ...item,
+                        label: item.name,
+                        children: [],
+                        disabled: item.disabled ? item.disabled : props.disabled
+                    })),
+                    disabled: props.disabled
+                }
+                treeData.push(groupNode)
+            })
+        }
 
         return treeData
     } else {
@@ -445,14 +487,17 @@ const filterNode: FilterNodeMethodFunction = (value: string, data: Tree) => {
     }
     return data.label.includes(value) || data.cityName.includes(value) || data.manufacturer.includes(value)
 }
+
 const handleCommand = (command: string) => {
     filter.value.groupBy = command
     const oldCheckedKeys = leftTreeRef.value?.getCheckedKeys() || []
-    leftTreeData.value = convertToTree(props.data, filter.value.groupBy)
+    leftTreeData.value = convertToTree(props.data,0, filter.value.groupBy)
     leftTreeRef.value?.setCheckedKeys(oldCheckedKeys)
     rightTreeData.value = convertToTree(
         props.data.filter(item => oldCheckedKeys.includes(item.id)),
+        1,
         filter.value.groupBy
+        
     )
     if (filter.value.checkAll) {
         setCheckedStatus(true)
@@ -467,10 +512,14 @@ const handleCheckChange = () => {
         .map(key => key.toString())
     rightTreeData.value = convertToTree(
         props.data.filter(item => checkedKeys.includes(item.id)),
-        filter.value.groupBy
+        1,
+        filter.value.groupBy,
+        
     )
     statistics.value.checked = checkedKeys.length || 0
     filter.value.checkAll = statistics.value.checked === statistics.value.total
+
+
 }
 const clearAll = () => {
     if (statistics.value.checked > 0) {
@@ -478,11 +527,44 @@ const clearAll = () => {
     }
 }
 const removeNode = (data: Data) => {
+
     nextTick(() => {
         leftTreeRef.value?.setChecked(data, false, true)
         rightTreeRef.value?.remove(data)
     })
 }
+
+// 获取当前右侧树中的设备ID
+const getSelectedDeviceIds = () => {
+  const extractDeviceIds = (treeData: Tree[]): string[] => {
+    const ids: string[] = [];
+    
+    const traverse = (nodes: Tree[]) => {
+      if (!Array.isArray(nodes)) return;
+      
+      nodes.forEach(node => {
+        // 如果节点有 children 且不为空，则递归遍历
+        if (node.children && Array.isArray(node.children) && node.children.length > 0) {
+          traverse(node.children);
+        } else {
+          // 只有叶子节点（设备节点）才添加到 ID 列表中
+          // 设备节点的 ID 不包含下划线
+          if (node.id && !node.id.toString().includes('_')) {
+            ids.push(node.id);
+          }
+        }
+      });
+    };
+    
+    traverse(treeData);
+    return ids;
+  };
+  
+  return extractDeviceIds(rightTreeData.value);
+};
+
+
+defineExpose({ getSelectedDeviceIds });
 </script>
 <style lang="scss">
 .card-header {

frontend/src/views/plan/planList/components/planPopup.vue

@@ -33,36 +33,23 @@
                             multiple
                             placeholder="请选择标准设备"
                         >
-                            <el-option
+<!--                            <el-option-->
-                                v-for="option in pqStandardDevArray"
+<!--                                v-for="option in pqStandardDevArray"-->
-                                :key="option.value"
+<!--                                :key="option.value"-->
-                                :disabled="subPlanBindStandardDev.includes(option.label) || option.disabled"
+<!--                                :disabled="subPlanBindStandardDev.includes(option.label) || option.disabled"-->
-                                :label="option.label"
+<!--                                :label="option.label"-->
-                                :value="option.value"
+<!--                                :value="option.value"-->
-                            />
+<!--                            />-->
-                        </el-select>
+                          <el-option
-                    </el-form-item>
+                              v-for="option in pqStandardDevArray"
-                    <el-form-item v-if="selectByMode" :label-width="110" label="检测项" prop="testItems">
+                              :key="option.value"
-                        <el-select
+                              :disabled="subPlanBindStandardDev.includes(option.label) || option.disabled"
-                            v-model="formContent.testItems"
+                              :label="option.label"
-                            :disabled="planType != 0 || allDisabled || !canEdited"
+                              :value="option.value"
-                            :max-collapse-tags="1"
+                          />
-                            clearable
-                            collapse-tags
-                            collapse-tags-tooltip
-                            filterable
-                            multiple
-                            placeholder="请选择检测项"
-                            @blur="handleTestItemChange"
-                        >
-                            <el-option
-                                v-for="(option, index) in secondLevelOptions"
-                                :key="index"
-                                :label="option.label"
-                                :value="option.value"
-                            />
                         </el-select>
                     </el-form-item>
+                    
                     <el-form-item v-if="!selectByMode" :label-width="110" label="检测源" prop="sourceIds">
                         <el-select
                             v-model="formContent.sourceIds"
@@ -72,6 +59,7 @@
                             collapse-tags
                             filterable
                             placeholder="请选择检测源"
+                            @change="handleSourceChange"
                         >
                             <el-option
                                 v-for="(option, index) in pqSourceArray"
@@ -118,6 +106,7 @@
                                 :key="index"
                                 :label="option.label"
                                 :value="option.value"
+                                :disabled="option.fluke!=1&&pqSourceArray?.find(item=>formContent.sourceIds==item.value)?.label.includes('FLUKE')"
                             />
                         </el-select>
                     </el-form-item>
@@ -139,6 +128,28 @@
                             />
                         </el-select>
                     </el-form-item>
+                    <el-form-item v-if="selectByMode" :label-width="110" label="检测项" prop="testItems">
+                        <el-select
+                            v-model="formContent.testItems"
+                            :disabled="planType != 0 || allDisabled || !canEdited"
+                            :max-collapse-tags="1"
+                            clearable
+                            collapse-tags
+                            collapse-tags-tooltip
+                            filterable
+                            multiple
+                            placeholder="请选择检测项"
+                            @blur="handleTestItemChange"
+                        >
+                            <el-option
+                                v-for="(option, index) in secondLevelOptions"
+                                :disabled="shouldDisableTestItem(option)"
+                                :key="index"
+                                :label="option.label"
+                                :value="option.value"
+                            />
+                        </el-select>
+                    </el-form-item>
                     <el-form-item :label-width="110" label="数据处理原则" prop="dataRule">
                         <el-select
                             v-model="formContent.dataRule"
@@ -232,6 +243,7 @@
                 </el-col>
                 <el-col :span="15">
                     <DevSelect
+                        ref="devSelectRef"
                         v-model="formContent.devIds"
                         :titles="['被检设备列表', '已选被检设备列表']"
                         filter-placeholder="请输入内容搜索"
@@ -448,12 +460,14 @@ import { getTestConfig } from '@/api/system/base'
 import { getRegRes } from '@/api/system/versionRegister'
 import DevSelect from '@/views/plan/planList/components/devSelect.vue'
 import { WarningFilled } from '@element-plus/icons-vue'
+import { el } from 'element-plus/es/locale'
 
 const modeStore = useModeStore()
 const AppSceneStore = useAppSceneStore()
 const dictStore = useDictStore()
 // 定义弹出组件元信息
 const dialogFormRef = ref()
+const devSelectRef = ref()
 const mode = ref()
 const selectByMode = ref(true)
 const pqSourceList = ref<TestSource.ResTestSource[]>([]) //获取指定模式下所有检测源
@@ -465,7 +479,7 @@ const pqStandardDevList = ref<StandardDevice.ResPqStandardDevice[]>([]) //获取
 const pqReportName = ref<{ name: string }[]>([])
 
 const pqSourceArray = ref<{ label: string; value: string }[]>()
-const pqScriptArray = ref<{ label: string; value: string }[]>()
+const pqScriptArray = ref<{ label: string; value: string,fluke?:number|boolean}[]>()
 const pqErrorArray = ref<{ label: string; value: string }[]>()
 const pqStandardDevArray = ref<{ label: string; value: string }[]>()
 const secondLevelOptions: any[] = []
@@ -485,6 +499,8 @@ const waveRecordSetting = ref(false)
 const realTimeSetting = ref(false)
 const statisticsSetting = ref(false)
 const flickerSetting = ref(false)
+
+
 const generateData = () => {
     const manufacturerDict = dictStore.getDictData('Dev_Manufacturers')
 
@@ -500,11 +516,20 @@ const generateData = () => {
             }
         }
         i.checked = boundPqDevIds.length > 0 ? boundPqDevIds.includes(i.id) : false
-        if (i.checkState && i.checkState != 0) {
+
-            i.disabled = true
+        if (mode.value === '比对式') {
-        }
+             if (i.checkState && i.checkState != 0) {
-        if (allDisabled.value) {
+                i.disabled = true
-            i.disabled = true
+            }else {
+                i.disabled = false
+            }
+        }else{
+            if (i.checkState && i.checkState != 0) {
+                i.disabled = true
+            }
+            if (allDisabled.value) {
+                i.disabled = true
+            }
         }
     })
     // 排序逻辑
@@ -520,8 +545,11 @@ const generateData = () => {
         // 最后按名称排序（升序）
         return a.name.localeCompare(b.name)
     })
+
 }
 
+
+
 function useMetaInfo() {
     const dialogVisible = ref(false)
     const titleType = ref('add')
@@ -591,6 +619,18 @@ watch(
     }
 )
 
+const handleSourceChange = () => {
+  let pqSource = pqSourceArray.value?.find(item => item.value === formContent.sourceIds)
+
+  if (pqSource?.label.includes('FLUKE')) {
+
+    let pqScript = pqScriptArray.value?.find(item => item.value === formContent.scriptId)
+    if (pqScript?.fluke!=1) {
+      formContent.scriptId = ''
+      ElMessage.warning('专用检测脚本只能使用福禄克检测源！')
+    }
+  }
+}
 // 清空formContent
 const resetFormContent = () => {
     Object.assign(formContent, {
@@ -729,6 +769,7 @@ const save = () => {
                             emit('update:tab')
                         } else {
                             formContent.sourceIds = null
+                            formContent.devIds = devSelectRef.value?.getSelectedDeviceIds() || [];
                             await updatePlan(formContent)
                         }
                     } else {
@@ -804,7 +845,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
             user_Result: any
 
         if (mode.value === '比对式') {
-            ;[
+            [
                 PqErrSys_Result,
                 pqDevList_Result,
                 pqReportName_Result,
@@ -849,7 +890,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
             const rule = dataRuleDict.find(item => item.code === 'Cp95_Value')
             formContent.dataRule = rule ? rule.id : ''
         } else {
-            ;[pqSource_Result, PqScript_Result, PqErrSys_Result, pqDevList_Result, pqReportName_Result] =
+            [pqSource_Result, PqScript_Result, PqErrSys_Result, pqDevList_Result, pqReportName_Result] =
                 await Promise.all([
                     getTestSourceList(data),
                     getPqScriptList(data),
@@ -886,6 +927,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
         formContent.datasourceIds = datasourceDicts
             .filter(item => ['real', 'wave_data'].includes(item.code))
             .map(item => item.code)
+     
         realTimeSetting.value = true
         waveRecordSetting.value = true
     } else {
@@ -964,7 +1006,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
                 }
             }
         } else {
-            ;[
+            [
                 pqSource_Result,
                 PqScript_Result,
                 PqErrSys_Result,
@@ -1040,7 +1082,10 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
             formContent.devIds = boundData.map((i: any) => i.id) // 已绑定设备id集合
         }
         handleDataSourceChange()
-        handleTestItemChange(false)
+        if (mode.value === '比对式'){
+            handleTestItemChange(false)
+        }
+     
     }
 
     pqToArray() //将对象转为数组
@@ -1054,6 +1099,13 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
                 formContent.testItems = data.testItems
             }
         }
+        //数据源选中录波，检测项禁止频率和闪变
+        if(formContent.datasourceIds.includes('wave_data')){
+             const frequencyOption = secondLevelOptions.find(option => option.label.includes('频率'));
+            if (frequencyOption && Array.isArray(formContent.testItems)) {
+                formContent.testItems = formContent.testItems.filter(id => id !== frequencyOption.value);
+            }
+        }
     }
 
     if (mode.value != '比对式') {
@@ -1189,7 +1241,8 @@ function pqToArray() {
     const sourceArray2 = Array.isArray(pqScriptList.value) ? pqScriptList.value : []
     pqScriptArray.value = sourceArray2.map(item => ({
         label: item.name || '',
-        value: item.id || ''
+        value: item.id || '',
+      fluke:item.fluke
     }))
 
     const sourceArray3 = Array.isArray(pqErrSysList.value) ? pqErrSysList.value : []
@@ -1296,11 +1349,48 @@ const handleDataSourceChange = () => {
     }
     if (hasLuBo) {
         waveRecordSetting.value = true
+
+       // 当选中录波数据源时，从已选检测项中移除频率和闪变项
+        const frequencyOption = secondLevelOptions.find(option => option.label.includes('频率'));
+        const flickerOption = secondLevelOptions.find(option => option.label.includes('闪变'));
+        
+        if (Array.isArray(formContent.testItems)) {
+        let filteredItems = [...formContent.testItems];
+        
+        if (frequencyOption) {
+            filteredItems = filteredItems.filter(id => id !== frequencyOption.value);
+        }
+        
+        if (flickerOption) {
+            filteredItems = filteredItems.filter(id => id !== flickerOption.value);
+        }
+        
+        formContent.testItems = filteredItems;
+        }
     } else {
         waveRecordSetting.value = false
     }
 }
 
+
+// 判断检测项是否应被禁用
+const shouldDisableTestItem = computed(() => {
+  return (option: { label: string; value: string }) => {
+    // 当数据源选中录波时，禁用频率和闪变选项
+    if (Array.isArray(formContent.datasourceIds)) {
+      const hasLuBo = formContent.datasourceIds.some(id => {
+        const dictItem = dictStore.getDictData(dataSourceType.value).find(item => item.code === id);
+        return dictItem ? dictItem.name.includes('录波') : false;
+      });
+      
+      if (hasLuBo && (option.label.includes('频率') || option.label.includes('闪变'))) {
+        return true;
+      }
+    }
+    return false;
+  };
+});
+
 //导入设备
 const deviceImportExcel = ref<InstanceType<typeof ImportExcel> | null>(null)
 

frontend/src/views/system/template/components/reportPopup.vue

@@ -239,7 +239,7 @@ const BaseHandleExceed = (files: File[]) => {
     baseFileName.value = newFile.name;
     excelFormData.append('baseFile', newFile as Blob, newFile.name);
 
-    formContent.value.detailFile = newFile.name
+    formContent.value.baseFile = newFile.name
   }
 
 };

public/html/loading.html

@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>NPQS9100 正在启动...</title>
+  <title>NPQS-9100自动检测平台 正在启动...</title>
   <style>
     * {
       margin: 0;
@@ -145,8 +145,8 @@
 </head>
 <body>
   <div class="loading-container">
-    <div class="logo">NPQS9100</div>
+    <div class="logo">NPQS-9100自动检测平台</div>
-    <div class="subtitle">南京灿能电气自动化 · 自动检测平台</div>
+    <div class="subtitle">南京灿能电力自动化股份有限公司</div>
     
     <div class="status-text" id="statusText">正在初始化应用...</div>
     

scripts/config-generator.js

@@ -32,10 +32,8 @@ class ConfigGenerator {
    * @returns {string} 数据目录路径
    */
   getDataPath(baseDir) {
-    // 获取应用所在盘符（例如：C:, D:, E:）
+    // 数据目录设置在应用目录内的 NPQS9100_Data 文件夹
-    const driveLetter = path.parse(baseDir).root;
+    return path.join(baseDir, 'NPQS9100_Data');
-    // 数据目录设置在盘符根目录下的 NPQS9100_Data 文件夹
-    return path.join(driveLetter, 'NPQS9100_Data');
   }
 
   /**
@@ -43,6 +41,7 @@ class ConfigGenerator {
    * @param {object} options - 配置选项
    * @param {number} options.mysqlPort - MySQL 端口
    * @param {number} options.javaPort - Java 应用端口
+   * @param {number} options.websocketPort - WebSocket 端口
    * @param {string} options.mysqlPassword - MySQL 密码
    */
   generateConfig(options = {}) {
@@ -74,6 +73,11 @@ class ConfigGenerator {
           template = template.replace(/port:\s*18092/g, `port: ${options.javaPort}`);
         }
         
+        // 替换 WebSocket 端口
+        if (options.websocketPort) {
+          template = template.replace(/port:\s*7777/g, `port: ${options.websocketPort}`);
+        }
+
         // 写入配置文件
         fs.writeFileSync(this.configPath, template, 'utf-8');
 
@@ -85,12 +89,14 @@ class ConfigGenerator {
         console.log('[ConfigGenerator] MySQL port:', options.mysqlPort || 3306);
         console.log('[ConfigGenerator] MySQL password:', options.mysqlPassword || 'njcnpqs');
         console.log('[ConfigGenerator] Java port:', options.javaPort || 18092);
+        console.log('[ConfigGenerator] WebSocket port:', options.websocketPort || 7777);
         
         resolve({
           configPath: this.configPath,
           dataPath: this.dataPath,
           mysqlPort: options.mysqlPort || 3306,
-          javaPort: options.javaPort || 18092
+          javaPort: options.javaPort || 18092,
+          websocketPort: options.websocketPort || 7777
         });
       } catch (error) {
         console.error('[ConfigGenerator] Failed to generate config:', error);

scripts/java-runner.js

@@ -206,39 +206,109 @@ class JavaRunner {
    * 停止 Spring Boot 应用
    */
   stopSpringBoot() {
-    return new Promise((resolve) => {
+    return new Promise(async (resolve) => {
+      const { exec } = require('child_process');
+      const killedPids = new Set();
+      let killAttempts = 0;
+      
+      // 方法1: 如果有进程引用，通过PID杀死
       if (this.springBootProcess && !this.springBootProcess.killed) {
-        // 设置3秒超时，如果进程没有正常退出，强制kill
+        const pid = this.springBootProcess.pid;
-        const timeout = setTimeout(() => {
+        console.log('[Java] Method 1: Stopping Spring Boot by PID:', pid);
-          console.log('[Java] Force killing Spring Boot process');
+        
-          try {
+        // 使用 /F 强制终止，/T 终止子进程树
-            this.springBootProcess.kill('SIGKILL');
+        const killCommand = `taskkill /F /T /PID ${pid}`;
-          } catch (e) {
+        console.log('[Java] Executing:', killCommand);
-            console.error('[Java] Error force killing:', e);
+        
+        exec(killCommand, (error, stdout, stderr) => {
+          if (error) {
+            console.error('[Java] taskkill by PID failed:', error);
+          } else {
+            console.log('[Java] taskkill by PID success:', stdout);
+            killedPids.add(pid);
           }
-          
+          killAttempts++;
-          // 清理端口记录文件
+          checkComplete();
-          this.cleanupJavaPortFile();
-          resolve();
-        }, 3000);
-        
-        this.springBootProcess.on('close', () => {
-          clearTimeout(timeout);
-          console.log('[Java] Spring Boot application stopped gracefully');
-          
-          // 清理端口记录文件
-          this.cleanupJavaPortFile();
-          resolve();
         });
-        
-        // 先尝试优雅关闭
-        console.log('[Java] Sending SIGTERM to Spring Boot');
-        this.springBootProcess.kill('SIGTERM');
       } else {
-        // 即使没有进程引用，也尝试清理端口记录文件
+        killAttempts++;
-        this.cleanupJavaPortFile();
-        resolve();
       }
+      
+      // 方法2: 通过端口杀死占用进程（精确定位，不会误杀其他Java进程）
+      const recordedPort = this.currentJavaPort || this.getRecordedJavaPort();
+      if (recordedPort) {
+        console.log(`[Java] Method 2: Killing process on port ${recordedPort} (precise targeting)`);
+        
+        // 查找占用端口的进程
+        const findCommand = `netstat -ano | findstr :${recordedPort}`;
+        exec(findCommand, (error, stdout) => {
+          if (!error && stdout) {
+            // 提取PID（最后一列）
+            const lines = stdout.trim().split('\n');
+            const pids = new Set();
+            
+            lines.forEach(line => {
+              const parts = line.trim().split(/\s+/);
+              const pid = parts[parts.length - 1];
+              if (pid && pid !== '0' && !killedPids.has(pid)) {
+                pids.add(pid);
+              }
+            });
+            
+            console.log(`[Java] Found PIDs on port ${recordedPort}:`, Array.from(pids));
+            
+            if (pids.size > 0) {
+              // 杀死所有找到的进程
+              let portsKilled = 0;
+              pids.forEach(pid => {
+                exec(`taskkill /F /T /PID ${pid}`, (err, out) => {
+                  portsKilled++;
+                  if (!err) {
+                    console.log(`[Java] Killed process ${pid} on port ${recordedPort}`);
+                  } else {
+                    console.warn(`[Java] Failed to kill process ${pid}:`, err);
+                  }
+                  
+                  if (portsKilled === pids.size) {
+                    killAttempts++;
+                    checkComplete();
+                  }
+                });
+              });
+            } else {
+              console.log(`[Java] No process found on port ${recordedPort} (already cleaned)`);
+              killAttempts++;
+              checkComplete();
+            }
+          } else {
+            console.log(`[Java] No process found on port ${recordedPort}`);
+            killAttempts++;
+            checkComplete();
+          }
+        });
+      } else {
+        console.log('[Java] No port recorded, skipping port-based kill');
+        killAttempts++;
+      }
+      
+      // 检查是否所有清理方法都已完成
+      function checkComplete() {
+        const expectedAttempts = recordedPort ? 2 : 1;
+        if (killAttempts >= expectedAttempts) {
+          // 清理端口记录文件
+          this.cleanupJavaPortFile();
+          
+          // 等待500ms确保进程完全终止
+          setTimeout(() => {
+            console.log('[Java] Spring Boot stop process completed');
+            console.log('[Java] Note: Other Java processes (like IDEA) are NOT affected');
+            resolve();
+          }, 500);
+        }
+      }
+      
+      // 绑定this上下文
+      checkComplete = checkComplete.bind(this);
     });
   }
   

scripts/log-window-manager.js

@@ -11,17 +11,108 @@ class LogWindowManager {
     this.logWindow = null;
     this.logs = [];
     this.maxLogs = 1000; // 最多保留1000条日志
+    
+    // 初始化日志文件路径
+    this.initLogFile();
+  }
+  
+  /**
+   * 初始化日志文件路径（按天滚动）
+   */
+  initLogFile() {
+    // 开发环境：项目根目录的 logs 文件夹
+    // 打包后：应用根目录的 logs 文件夹
+    const isDev = !process.resourcesPath;
+    const baseDir = isDev 
+      ? path.join(__dirname, '..') 
+      : path.dirname(process.resourcesPath);
+    
+    this.logsDir = path.join(baseDir, 'logs');
+    
+    // 确保 logs 目录存在
+    if (!fs.existsSync(this.logsDir)) {
+      fs.mkdirSync(this.logsDir, { recursive: true });
+    }
+    
+    // 生成当天的日志文件名：startup-YYYYMMDD.log
+    const today = new Date();
+    const dateStr = today.getFullYear() + 
+                   String(today.getMonth() + 1).padStart(2, '0') + 
+                   String(today.getDate()).padStart(2, '0');
+    this.logFilePath = path.join(this.logsDir, `startup-${dateStr}.log`);
+    
+    console.log('[LogWindowManager] Log file:', this.logFilePath);
+    
+    // 写入启动标记
+    this.writeToFile(new Date().toISOString().replace('T', ' ').substring(0, 19), 'SYSTEM', '=' .repeat(80));
+    this.writeToFile(new Date().toISOString().replace('T', ' ').substring(0, 19), 'SYSTEM', 'NPQS9100 应用启动');
+    this.writeToFile(new Date().toISOString().replace('T', ' ').substring(0, 19), 'SYSTEM', '=' .repeat(80));
+    
+    // 清理超过30天的旧日志
+    this.cleanOldLogs(30);
+  }
+  
+  /**
+   * 清理旧日志文件
+   * @param {number} days - 保留天数
+   */
+  cleanOldLogs(days) {
+    try {
+      const now = Date.now();
+      const maxAge = days * 24 * 60 * 60 * 1000; // 转换为毫秒
+      
+      const files = fs.readdirSync(this.logsDir);
+      let deletedCount = 0;
+      
+      files.forEach(file => {
+        if (file.startsWith('startup-') && file.endsWith('.log')) {
+          const filePath = path.join(this.logsDir, file);
+          const stats = fs.statSync(filePath);
+          const age = now - stats.mtimeMs;
+          
+          if (age > maxAge) {
+            fs.unlinkSync(filePath);
+            deletedCount++;
+            console.log(`[LogWindowManager] Deleted old log: ${file}`);
+          }
+        }
+      });
+      
+      if (deletedCount > 0) {
+        console.log(`[LogWindowManager] Cleaned up ${deletedCount} old log file(s)`);
+      }
+    } catch (error) {
+      console.error('[LogWindowManager] Failed to clean old logs:', error);
+    }
+  }
+  
+  /**
+   * 写入日志到文件
+   */
+  writeToFile(timestamp, type, message) {
+    try {
+      const logLine = `[${timestamp}] [${type.toUpperCase()}] ${message}\n`;
+      fs.appendFileSync(this.logFilePath, logLine, 'utf-8');
+    } catch (error) {
+      console.error('[LogWindowManager] Failed to write log to file:', error);
+    }
   }
 
   /**
    * 创建日志窗口
    */
   createLogWindow() {
+    const isDev = !process.resourcesPath;
+    const iconPath = isDev
+      ? path.join(__dirname, '..', 'public', 'images', 'icon.png')
+      : path.join(process.resourcesPath, 'app.asar.unpacked', 'public', 'images', 'icon.png');
+    
     this.logWindow = new BrowserWindow({
       width: 900,
       height: 600,
       title: 'NPQS9100 - 服务日志',
       backgroundColor: '#1e1e1e',
+      icon: iconPath,
       webPreferences: {
         nodeIntegration: true,
         contextIsolation: false
@@ -207,7 +298,10 @@ class LogWindowManager {
    * 添加日志
    */
   addLog(type, message) {
-    const timestamp = new Date().toLocaleTimeString();
+    const now = new Date();
+    const timestamp = now.toLocaleTimeString();
+    const fullTimestamp = now.toISOString().replace('T', ' ').substring(0, 19);
+    
     const logEntry = {
       timestamp,
       type,
@@ -221,6 +315,9 @@ class LogWindowManager {
       this.logs.shift();
     }
 
+    // 写入文件（使用完整时间戳）
+    this.writeToFile(fullTimestamp, type, message);
+
     // 发送到窗口
     if (this.logWindow && !this.logWindow.isDestroyed()) {
       this.logWindow.webContents.send('log-message', logEntry);

scripts/start-mysql.js

@@ -1,373 +0,0 @@
-const { spawn, exec } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-
-class MySQLManager {
-  constructor() {
-    // 在开发与打包后均可解析到应用根目录下的 mysql 目录
-    // 开发环境：项目根目录
-    // 打包后：应用根目录（win-unpacked）
-    const isDev = !process.resourcesPath;
-    const baseDir = isDev 
-      ? path.join(__dirname, '..') 
-      : path.dirname(process.resourcesPath);
-    this.mysqlPath = path.join(baseDir, 'mysql');
-    this.binPath = path.join(this.mysqlPath, 'bin');
-    this.dataPath = path.join(this.mysqlPath, 'data');
-    this.process = null;
-    this.currentPort = null;
-  }
-
-  // 检查MySQL是否已初始化
-  isInitialized() {
-    return fs.existsSync(this.dataPath) && fs.readdirSync(this.dataPath).length > 0;
-  }
-
-  // 初始化MySQL数据库
-  async initialize() {
-    if (this.isInitialized()) {
-      console.log('MySQL already initialized');
-      return Promise.resolve();
-    }
-
-    return new Promise(async (resolve, reject) => {
-      const mysqld = path.join(this.binPath, 'mysqld.exe');
-      
-      // 创建初始化SQL文件（授权127.0.0.1和所有主机）
-      const initSqlPath = path.join(this.mysqlPath, 'init_grant.sql');
-      const initSql = `
-CREATE USER IF NOT EXISTS 'root'@'127.0.0.1' IDENTIFIED BY '';
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'127.0.0.1' WITH GRANT OPTION;
-CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY '';
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
-FLUSH PRIVILEGES;
-`;
-      
-      try {
-        fs.writeFileSync(initSqlPath, initSql, 'utf-8');
-        console.log('[MySQL] Created init SQL file for granting permissions');
-      } catch (error) {
-        console.error('[MySQL] Failed to create init SQL file:', error);
-      }
-      
-      // 使用 --init-file 参数初始化并授权
-      const initProcess = spawn(mysqld, [
-        '--initialize-insecure',
-        `--init-file=${initSqlPath}`
-      ], {
-        cwd: this.mysqlPath,
-        stdio: 'inherit'
-      });
-
-      initProcess.on('close', (code) => {
-        if (code === 0) {
-          console.log('[MySQL] Initialized successfully with permissions granted');
-          // 删除临时SQL文件
-          try {
-            if (fs.existsSync(initSqlPath)) {
-              fs.unlinkSync(initSqlPath);
-            }
-          } catch (e) {
-            // 忽略删除失败
-          }
-          resolve();
-        } else {
-          reject(new Error(`MySQL initialization failed with code ${code}`));
-        }
-      });
-    });
-  }
-
-  // 启动MySQL服务
-  start(port = 3306) {
-    return new Promise(async (resolve, reject) => {
-      try {
-        // 确保数据库已初始化
-        await this.initialize();
-
-        const mysqld = path.join(this.binPath, 'mysqld.exe');
-
-        // 启动MySQL，指定端口
-        this.process = spawn(mysqld, [
-          '--console',
-          `--port=${port}`
-        ], {
-          cwd: this.mysqlPath,
-          stdio: ['ignore', 'pipe', 'pipe']
-        });
-
-        this.currentPort = port;
-        
-        // 将当前端口写入文件，供停止脚本使用
-        try {
-          const portFilePath = path.join(this.mysqlPath, '.running-port');
-          fs.writeFileSync(portFilePath, port.toString(), 'utf-8');
-          console.log(`[MySQL] Port ${port} recorded to ${portFilePath}`);
-        } catch (error) {
-          console.warn('[MySQL] Failed to record port:', error);
-        }
-
-        let output = '';
-        this.process.stdout.on('data', (data) => {
-          output += data.toString();
-          console.log('MySQL:', data.toString());
-
-          // MySQL启动完成的标志
-          if (output.includes('ready for connections') || output.includes('MySQL Community Server')) {
-            console.log(`MySQL started successfully on port ${port}`);
-            
-            // 自动授权 root 用户从任何主机连接
-            setTimeout(async () => {
-              try {
-                console.log('[MySQL] Waiting 3 seconds before granting permissions...');
-                await this.grantRootAccess();
-              } catch (error) {
-                console.warn('[MySQL] Failed to grant root access, but MySQL is running:', error.message);
-              }
-              resolve(port);
-            }, 3000);
-          }
-        });
-
-        this.process.stderr.on('data', (data) => {
-          console.error('MySQL Error:', data.toString());
-        });
-
-        this.process.on('close', (code) => {
-          console.log(`MySQL process exited with code ${code}`);
-          this.process = null;
-          this.currentPort = null;
-          
-          // 删除端口记录文件
-          try {
-            const portFilePath = path.join(this.mysqlPath, '.running-port');
-            if (fs.existsSync(portFilePath)) {
-              fs.unlinkSync(portFilePath);
-              console.log('[MySQL] Port record file removed');
-            }
-          } catch (error) {
-            console.warn('[MySQL] Failed to remove port record:', error);
-          }
-        });
-
-        // 超时处理
-        setTimeout(async () => {
-          if (this.process && !this.process.killed) {
-            console.log(`MySQL started on port ${port} (timeout reached, assuming success)`);
-            
-            // 自动授权 root 用户从任何主机连接
-            try {
-              console.log('[MySQL] Granting permissions...');
-              await this.grantRootAccess();
-            } catch (error) {
-              console.warn('[MySQL] Failed to grant root access, but MySQL is running:', error.message);
-            }
-            
-            resolve(port);
-          }
-        }, 18000);
-
-      } catch (error) {
-        reject(error);
-      }
-    });
-  }
-
-  // 授权 root 用户从 127.0.0.1 访问
-  grantRootAccess() {
-    return new Promise((resolve, reject) => {
-      // 创建 SQL 文件
-      const sqlFilePath = path.join(this.mysqlPath, 'grant_root.sql');
-      const sqlContent = `
-CREATE USER IF NOT EXISTS 'root'@'127.0.0.1' IDENTIFIED BY '';
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'127.0.0.1' WITH GRANT OPTION;
-CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY '';
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
-FLUSH PRIVILEGES;
-`;
-      
-      try {
-        fs.writeFileSync(sqlFilePath, sqlContent, 'utf-8');
-      } catch (error) {
-        console.error('[MySQL] Failed to create grant SQL file:', error);
-        return resolve(); // 继续启动
-      }
-      
-      const mysqlExe = path.join(this.binPath, 'mysql.exe');
-      const grantProcess = spawn(mysqlExe, [
-        '--host=localhost',
-        `--port=${this.currentPort}`,
-        '--user=root'
-      ], {
-        cwd: this.mysqlPath,
-        stdio: ['pipe', 'pipe', 'pipe']
-      });
-      
-      // 通过 stdin 输入 SQL
-      grantProcess.stdin.write(sqlContent);
-      grantProcess.stdin.end();
-
-      let output = '';
-      let errorOutput = '';
-
-      grantProcess.stdout.on('data', (data) => {
-        output += data.toString();
-      });
-
-      grantProcess.stderr.on('data', (data) => {
-        errorOutput += data.toString();
-      });
-
-      grantProcess.on('close', (code) => {
-        if (code === 0) {
-          console.log('[MySQL] Root user granted access from 127.0.0.1 and all hosts');
-          resolve();
-        } else {
-          console.error('[MySQL] Grant access failed (code:', code, ')');
-          console.error('[MySQL] Error output:', errorOutput);
-          console.error('[MySQL] Standard output:', output);
-          // 即使失败也 resolve，让应用继续启动
-          resolve();
-        }
-      });
-    });
-  }
-
-  // 获取当前MySQL端口
-  getCurrentPort() {
-    return this.currentPort || 3306;
-  }
-
-  // 停止MySQL服务
-  stop() {
-    return new Promise(async (resolve) => {
-      if (this.process && !this.process.killed) {
-        console.log('[MySQL] Stopping MySQL...');
-        
-        // 方法1: 尝试使用 mysqladmin shutdown 优雅关闭
-        try {
-          console.log('[MySQL] Trying mysqladmin shutdown...');
-          const mysqladmin = path.join(this.binPath, 'mysqladmin.exe');
-          
-          if (fs.existsSync(mysqladmin)) {
-            const shutdownProcess = spawn(mysqladmin, [
-              '-u', 'root',
-              '-pnjcnpqs',
-              '--port=' + this.currentPort,
-              'shutdown'
-            ], {
-              cwd: this.mysqlPath,
-              stdio: 'ignore'
-            });
-            
-            // 等待 mysqladmin 执行完成（最多5秒）
-            const shutdownPromise = new Promise((res) => {
-              shutdownProcess.on('close', (code) => {
-                console.log(`[MySQL] mysqladmin shutdown exited with code ${code}`);
-                res(code === 0);
-              });
-            });
-            
-            const timeoutPromise = new Promise((res) => setTimeout(() => res(false), 5000));
-            const shutdownSuccess = await Promise.race([shutdownPromise, timeoutPromise]);
-            
-            if (shutdownSuccess) {
-              console.log('[MySQL] Shutdown successful via mysqladmin');
-              // 等待进程真正退出
-              await new Promise((res) => {
-                if (this.process && !this.process.killed) {
-                  this.process.on('close', res);
-                  setTimeout(res, 2000); // 最多等2秒
-                } else {
-                  res();
-                }
-              });
-              this.cleanupPortFile();
-              return resolve();
-            }
-          }
-        } catch (error) {
-          console.warn('[MySQL] mysqladmin shutdown failed:', error.message);
-        }
-        
-        // 方法2: 如果 mysqladmin 失败，尝试 SIGTERM
-        console.log('[MySQL] Trying SIGTERM...');
-        const killTimeout = setTimeout(() => {
-          // 方法3: 5秒后强制 SIGKILL
-          console.log('[MySQL] Force killing with SIGKILL');
-          try {
-            if (this.process && !this.process.killed) {
-              this.process.kill('SIGKILL');
-            }
-          } catch (e) {
-            console.error('[MySQL] Error force killing:', e);
-          }
-          this.cleanupPortFile();
-          resolve();
-        }, 5000);
-        
-        this.process.on('close', () => {
-          clearTimeout(killTimeout);
-          console.log('[MySQL] Process closed');
-          this.cleanupPortFile();
-          resolve();
-        });
-        
-        try {
-          this.process.kill('SIGTERM');
-        } catch (e) {
-          console.error('[MySQL] Error sending SIGTERM:', e);
-          clearTimeout(killTimeout);
-          this.cleanupPortFile();
-          resolve();
-        }
-      } else {
-        // 没有进程引用，说明MySQL已经停止或不在我们控制下
-        console.log('[MySQL] No process reference, MySQL may already be stopped');
-        console.log('[MySQL] If MySQL is still running, please use kill-running-port.bat to clean up');
-        this.cleanupPortFile();
-        resolve();
-      }
-    });
-  }
-  
-  // 清理端口记录文件
-  cleanupPortFile() {
-    try {
-      const portFilePath = path.join(this.mysqlPath, '.running-port');
-      if (fs.existsSync(portFilePath)) {
-        fs.unlinkSync(portFilePath);
-        console.log('[MySQL] Port record file cleaned up');
-      }
-    } catch (error) {
-      console.warn('[MySQL] Failed to cleanup port record:', error);
-    }
-  }
-  
-  // 获取记录的运行端口
-  getRecordedPort() {
-    try {
-      const portFilePath = path.join(this.mysqlPath, '.running-port');
-      if (fs.existsSync(portFilePath)) {
-        const port = fs.readFileSync(portFilePath, 'utf-8').trim();
-        return parseInt(port);
-      }
-    } catch (error) {
-      console.warn('[MySQL] Failed to read port record:', error);
-    }
-    return null;
-  }
-
-  // 获取MySQL连接配置
-  getConnectionConfig() {
-    return {
-      host: 'localhost',
-      port: 3306,
-      user: 'root',
-      password: '',
-      database: 'app_db'
-    };
-  }
-}
-
-module.exports = MySQLManager;

scripts/startup-manager.js

@@ -10,9 +10,8 @@ class StartupManager {
     this.loadingWindow = null;
     this.steps = [
       { id: 'init', label: '正在初始化应用...', progress: 0 },
-      { id: 'check-mysql-port', label: '正在检测MySQL端口...', progress: 15 },
+      { id: 'check-mysql-port', label: '正在检查MySQL服务...', progress: 20 },
-      { id: 'start-mysql', label: '正在启动MySQL数据库...', progress: 30 },
+      { id: 'wait-mysql', label: '确保MySQL服务运行...', progress: 40 },
-      { id: 'wait-mysql', label: '等待MySQL就绪...', progress: 45 },
       { id: 'check-java-port', label: '正在检测后端服务端口...', progress: 60 },
       { id: 'generate-config', label: '正在生成配置文件...', progress: 70 },
       { id: 'start-java', label: '正在启动后端服务...', progress: 80 },
@@ -26,6 +25,11 @@ class StartupManager {
    * 创建 Loading 窗口
    */
   createLoadingWindow() {
+    const isDev = !process.resourcesPath;
+    const iconPath = isDev
+      ? path.join(__dirname, '..', 'public', 'images', 'icon.png')
+      : path.join(process.resourcesPath, 'app.asar.unpacked', 'public', 'images', 'icon.png');
+    
     this.loadingWindow = new BrowserWindow({
       width: 500,
       height: 300,
@@ -34,6 +38,7 @@ class StartupManager {
       resizable: false,
       alwaysOnTop: true,
       skipTaskbar: true, // 不在任务栏显示
+      icon: iconPath,
       webPreferences: {
         nodeIntegration: true,
         contextIsolation: false
@@ -41,7 +46,12 @@ class StartupManager {
     });
 
     // 加载 loading 页面
-    const loadingHtml = path.join(__dirname, '../public/html/loading.html');
+    const isDev2 = !process.resourcesPath;
+    const loadingHtml = isDev2
+      ? path.join(__dirname, '..', 'public', 'html', 'loading.html')
+      : path.join(process.resourcesPath, 'app.asar', 'public', 'html', 'loading.html');
+    
+    console.log('[StartupManager] Loading HTML from:', loadingHtml);
     this.loadingWindow.loadFile(loadingHtml);
 
     return this.loadingWindow;