绿色包，mysql处理成即用即启，而非服务的形式，因为注册服务需要管理员身份

# Conflicts:
#	frontend/src/views/machine/device/components/monitorTab.vue

.claude/settings.local.json

@@ -0,0 +1,16 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(dir:*)",
+      "Bash(\"build/extraResources/jre/bin/java.exe\" -version)",
+      "Bash(npm run build-frontend:*)",
+      "Bash(taskkill:*)",
+      "Bash(iconv:*)",
+      "Bash(powershell:*)",
+      "Bash(del:*)",
+      "Bash(git -C \"c:\\code\\gitea\\NPQS-9100\\pqs-9100_client\" log -1 --oneline)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

build/NPQS9100.bat

@@ -0,0 +1,18 @@
+@echo off
+chcp 65001 >nul
+
+REM 获取当前批处理文件所在目录
+cd /d "%~dp0"
+
+REM 检查是否有管理员权限
+net session >nul 2>&1
+if %errorlevel% == 0 (
+    REM 已有管理员权限，直接启动
+    start "" "NPQS9100.exe"
+    exit
+) else (
+    REM 没有管理员权限，使用 PowerShell 以管理员身份启动（隐藏窗口）
+    powershell -WindowStyle Hidden -Command "Start-Process '%~dp0NPQS9100.exe' -Verb RunAs"
+    exit
+)
+

build/README-升级回滚.txt

@@ -0,0 +1,46 @@
+========================================
+NPQS-9100 升级与回滚说明
+========================================
+
+一、升级步骤（超简单！）
+----------------------------------------
+1. 双击 upgrade.bat（首次会自动创建 upgrade 文件夹）
+2. 将升级文件放入 upgrade/ 目录：
+   - app.asar               （前端升级包 - 文件）
+   - app.asar.unpacked\     （前端升级包 - 文件夹）
+   - entrance.jar           （后端升级包）
+3. 再次双击 upgrade.bat 开始升级
+4. 等待完成后重启应用
+
+二、回滚步骤
+----------------------------------------
+如果升级后出现问题：
+1. 双击 rollback.bat
+2. 选择是否回滚数据库（谨慎！）
+3. 等待完成后重启应用
+
+三、重要提示
+----------------------------------------
+✓ 升级前会自动备份到 backup/ 目录
+✓ 数据库会自动备份到 mysql/data_backup/
+✓ 升级日志保存在 logs/upgrade.log
+✓ 多次升级时，backup/ 保存最后一次升级前的版本
+
+四、紧急情况
+----------------------------------------
+如果脚本无法运行，请手动操作：
+
+【恢复前端】
+copy /Y backup\app.asar resources\app.asar
+xcopy backup\app.asar.unpacked resources\app.asar.unpacked\ /E /I /Y
+
+【恢复后端】
+copy /Y backup\entrance.jar resources\extraResources\java\entrance.jar
+
+【恢复数据库】（慎用！）
+xcopy mysql\data_backup mysql\data\ /E /I /Y
+
+========================================
+详细文档请参考：doc/绿色包升级指南.md
+========================================
+

build/app.manifest

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="*"
+    name="NPQS9100"
+    type="win32"
+  />
+  <description>NPQS-9100自动检测平台</description>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 and Windows 11 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+    </application>
+  </compatibility>
+</assembly>

build/build.bat

@@ -0,0 +1,59 @@
+@echo off
+chcp 65001 >nul
+echo ========================================
+echo 清理并重新打包
+echo ========================================
+echo.
+
+echo [1/4] 删除 out 目录...
+cd /d "%~dp0.."
+if exist out (
+    rmdir /s /q out 2>nul
+    if exist out (
+        echo     删除失败，请手动删除 out 目录
+        pause
+        exit /b 1
+    ) else (
+        echo     out 目录已删除
+    )
+) else (
+    echo     out 目录不存在
+)
+echo.
+
+echo [2/4] 构建前端代码...
+call npm run build-frontend
+if %errorlevel% neq 0 (
+    echo     前端构建失败
+    pause
+    exit /b 1
+)
+echo     前端代码构建完成
+echo.
+
+echo [3/4] 构建 electron 代码...
+call npm run build-electron
+if %errorlevel% neq 0 (
+    echo     electron 构建失败
+    pause
+    exit /b 1
+)
+echo     electron 代码构建完成
+echo.
+
+echo [4/4] 打包 Windows 版本（包含代码加密）...
+call npm run build-w
+if %errorlevel% neq 0 (
+    echo     打包失败
+    pause
+    exit /b 1
+)
+echo.
+
+echo ========================================
+echo 打包完成！
+echo 输出目录: out\win-unpacked\
+echo ========================================
+echo.
+pause
+

build/clean-and-build.bat

@@ -9,40 +9,6 @@ echo [1/5] 结束所有相关进程...
 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
@@ -101,4 +67,3 @@ echo 输出目录: out\win-unpacked\
 echo ========================================
 echo.
 pause
-

build/diagnose-startup.bat

@@ -0,0 +1,69 @@
+@echo off
+chcp 65001 >nul
+echo ========================================
+echo NPQS9100 启动诊断工具
+echo ========================================
+echo.
+
+echo [1] 检查运行中的进程...
+echo.
+echo NPQS9100 进程:
+tasklist | findstr /i "NPQS9100.exe"
+if %errorlevel% neq 0 echo     未找到
+echo.
+
+echo MySQL 进程:
+tasklist | findstr /i "mysqld.exe"
+if %errorlevel% neq 0 echo     未找到
+echo.
+
+echo Java 进程:
+tasklist | findstr /i "java.exe"
+if %errorlevel% neq 0 echo     未找到
+echo.
+
+echo [2] 检查端口占用...
+echo.
+echo 3306 端口:
+netstat -ano | findstr ":3306" | findstr "LISTENING"
+if %errorlevel% neq 0 echo     未占用
+echo.
+
+echo 18092 端口:
+netstat -ano | findstr ":18092" | findstr "LISTENING"
+if %errorlevel% neq 0 echo     未占用
+echo.
+
+echo 7777 端口:
+netstat -ano | findstr ":7777" | findstr "LISTENING"
+if %errorlevel% neq 0 echo     未占用
+echo.
+
+echo [3] 查看最新日志...
+echo.
+set LOGDIR=%APPDATA%\NQPS9100\logs
+echo 日志目录: %LOGDIR%
+if exist "%LOGDIR%" (
+    echo.
+    echo 最新日志文件:
+    dir /b /o-d "%LOGDIR%\*.log" 2>nul
+    echo.
+) else (
+    echo 日志目录不存在
+)
+echo.
+
+echo [4] 检查 MySQL 服务...
+sc query mysql9100 >nul 2>&1
+if %errorlevel% equ 0 (
+    echo MySQL 服务存在
+    sc query mysql9100 | findstr "STATE"
+) else (
+    echo MySQL 服务不存在
+)
+echo.
+
+echo ========================================
+echo 诊断完成
+echo ========================================
+pause

build/extraResources/java/.gitignore

@@ -1,10 +0,0 @@
-# 自动生成的配置文件
-application.yml
-
-# 运行时端口记录
-.running-port
-
-# 日志文件
-logs/
-*.log
-

build/extraResources/java/README.txt

@@ -1,71 +1,20 @@
 ==========================================
-  NPQS9100 Java 后端服务说明
+  NPQS9100 Java 后端服务
 ==========================================
 
-一、目录结构
+目录说明
 ----------------------------------------
 entrance.jar            - Spring Boot 应用程序
 application.yml         - 应用配置文件（自动生成）
 application.yml.template - 配置模板
-kill-java-port.bat      - 智能清理Java端口占用（紧急用）
-.running-port           - 运行时端口记录（自动生成，勿删除）
 
 
-二、自动管理
+服务管理
 ----------------------------------------
-正常情况下，Java 后端服务由主应用自动管理：
+Java 后端服务由主应用自动管理：
-- 应用启动时自动启动 Java 服务
+- 应用启动时自动启动
-- 应用关闭时自动停止 Java 服务
+- 应用关闭时自动停止
-- 无需手动操作
+- 默认端口：18092（如被占用会自动切换）
-
-
-三、端口智能管理
-----------------------------------------
-- Java 服务默认使用端口：18092
-- 如果 18092 被占用，自动尝试：18093, 18094, ...
-- 启动成功后会记录实际端口到 .running-port 文件
-- kill-java-port.bat 会自动识别正确的端口进行清理
-
-
-四、手动清理工具
-----------------------------------------
-如果应用异常退出，Java 进程可能残留，导致：
-- 端口被占用，无法再次启动
-- 可以运行 kill-java-port.bat 清理残留进程
-
-使用方法：
-1. 双击运行：kill-java-port.bat
-2. 脚本会自动识别实际使用的端口
-3. 清理完成后即可重新启动应用
-
-
-五、安全说明
-----------------------------------------
-⚠️ 进程停止安全性：
-- 应用自动停止时，只会停止应用自己启动的 Java 进程
-- 通过进程引用精确停止，不会影响其他 Java 应用
-- kill-java-port.bat 只清理占用特定端口的进程
-- 完全不会影响您电脑上的其他 Java 程序
-
-⭐ 端口冲突处理：
-- 如果您的电脑上有其他应用占用了 18092 端口
-- 本应用会自动切换到其他端口（18093, 18094...）
-- kill-java-port.bat 会自动识别实际端口，精确清理
-
-
-六、常见问题
-----------------------------------------
-Q: Java 服务无法启动？
-A: 运行 kill-java-port.bat 清理残留进程
-
-Q: 端口被占用怎么办？
-A: 应用会自动切换端口，无需手动处理
-
-Q: 如何查看 Java 日志？
-A: 启动应用后，日志窗口会实时显示 Java 输出
-
-Q: 配置文件在哪里？
-A: application.yml 由应用自动生成，请勿手动修改
 
 
 ==========================================

build/extraResources/java/kill-java-port.bat

@@ -1,115 +0,0 @@
-@echo off
-chcp 65001 >nul
-color 0E
-title 清理NPQS9100 Java端口占用
-cls
-echo ==========================================
-echo   清理 NPQS9100 Java 端口占用
-echo ==========================================
-echo.
-
-REM 获取Java目录（脚本所在目录）
-set JAVA_HOME=%~dp0
-cd /d "%JAVA_HOME%"
-
-REM 读取实际运行的端口
-set PORT_FILE=.running-port
-set JAVA_PORT=
-
-if exist "%PORT_FILE%" (
-    set /p JAVA_PORT=<"%PORT_FILE%"
-    echo [√] 检测到运行记录：端口 %JAVA_PORT%
-    echo.
-) else (
-    echo [!] 未找到运行记录文件，使用默认端口 18092
-    echo.
-    set JAVA_PORT=18092
-)
-
-echo [1] 检查端口 %JAVA_PORT% 占用情况...
-echo.
-
-REM 查找占用该端口的连接
-netstat -ano | findstr ":%JAVA_PORT%" > "%TEMP%\java_port.txt"
-
-if %errorlevel% equ 0 (
-    echo 发现以下端口 %JAVA_PORT% 连接：
-    echo ----------------------------------------
-    type "%TEMP%\java_port.txt"
-    echo ----------------------------------------
-    echo.
-    
-    echo [2] 提取进程ID并结束进程...
-    echo.
-    
-    REM 提取所有LISTENING状态的PID
-    for /f "tokens=5" %%a in ('netstat -ano ^| findstr ":%JAVA_PORT%" ^| findstr "LISTENING"') do (
-        if not "%%a"=="0" (
-            echo 正在结束进程 PID: %%a
-            taskkill /F /PID %%a 2>nul
-            if errorlevel 1 (
-                echo    [失败] 无法结束进程 %%a
-            ) else (
-                echo    [成功] 已结束进程 %%a
-            )
-        )
-    )
-    
-    REM 如果还有其他状态的连接，也尝试结束
-    for /f "tokens=5" %%a in ('netstat -ano ^| findstr ":%JAVA_PORT%" ^| findstr /V "LISTENING"') do (
-        if not "%%a"=="0" (
-            echo 正在结束进程 PID: %%a
-            taskkill /F /PID %%a 2>nul
-            if errorlevel 1 (
-                echo    [已结束或无权限] 进程 %%a
-            ) else (
-                echo    [成功] 已结束进程 %%a
-            )
-        )
-    )
-    
-    echo.
-    echo [3] 清理完成
-    
-    REM 等待2秒让进程完全释放
-    timeout /t 2 /nobreak >nul
-    
-    echo.
-    echo [4] 再次检查端口 %JAVA_PORT%...
-    netstat -ano | findstr ":%JAVA_PORT%"
-    if errorlevel 1 (
-        echo    [√] 端口 %JAVA_PORT% 已完全释放
-        
-        REM 删除端口记录文件
-        if exist "%PORT_FILE%" (
-            del "%PORT_FILE%"
-            echo    [√] 已清理端口记录文件
-        )
-    ) else (
-        echo    [!] 仍有连接存在（可能是TIME_WAIT状态，会自动释放）
-    )
-    
-) else (
-    echo [√] 没有发现占用端口 %JAVA_PORT% 的进程
-    
-    REM 删除端口记录文件
-    if exist "%PORT_FILE%" (
-        del "%PORT_FILE%"
-        echo    [√] 已清理端口记录文件
-    )
-)
-
-REM 清理临时文件
-if exist "%TEMP%\java_port.txt" del "%TEMP%\java_port.txt"
-
-echo.
-echo ==========================================
-echo   清理完成
-echo ==========================================
-echo.
-echo 说明：
-echo - 此脚本只清理 NPQS9100 应用使用的 Java 端口
-echo - 不会影响您电脑上的其他 Java 应用
-echo.
-pause
-

build/extraResources/mysql/README.txt

@@ -1,85 +1,33 @@
 ==========================================
-  NPQS9100 MySQL 免安装版使用说明
+  NPQS9100 MySQL 数据库
 ==========================================
 
-一、快速开始
+目录说明
 ----------------------------------------
-1. 启动 MySQL:
+bin/        - MySQL 可执行文件
-   双击运行: startup.bat
+data/       - 数据库数据目录
-   (注意：不要关闭窗口，关闭会停止MySQL)
+share/      - 共享资源文件
-
+my.ini      - MySQL 配置文件
-2. 首次使用，如需重置密码和权限:
-   双击运行: reset-root-password.bat
-
-3. 停止 MySQL:
-   双击运行: stop.bat
 
 
-二、连接信息
+服务管理
 ----------------------------------------
-主机: 127.0.0.1 (或 localhost)
+MySQL 服务由主应用自动管理：
+- 应用启动时自动启动
+- 应用关闭时自动停止
+- 默认端口：3306（如被占用会自动切换）
+
+
+连接信息
+----------------------------------------
+主机: 127.0.0.1
 端口: 3306
 用户: root
 密码: njcnpqs
 字符集: utf8mb4
 
 
-三、脚本说明
-----------------------------------------
-startup.bat              - 启动 MySQL 服务
-stop.bat                 - 正常停止 MySQL 服务
-reset-root-password.bat  - 重置root密码和权限（解决1130错误）
-kill-running-port.bat    - 智能清理应用实际使用的端口（自动识别3306/3307/...）
-my.ini                   - MySQL 配置文件
-.running-port            - 运行时端口记录（自动生成，勿删除）
-
-bin/                     - MySQL 可执行文件
-data/                    - 数据库数据目录
-share/                   - 共享资源
-
-⚠️ 安全说明：
-- 应用自动停止MySQL时，只会停止应用自己启动的MySQL进程
-- 不会影响您电脑上安装的其他MySQL服务
-- kill-running-port.bat 会读取 .running-port 文件，精确清理实际使用的端口
-- 如果3306被占用，应用会自动使用3307，kill-running-port.bat 会智能识别
-
-⚙️ 停止机制：
-- 应用关闭时会自动使用 mysqladmin shutdown 优雅停止MySQL
-- 如果优雅停止失败，会自动尝试强制停止
-- 整个停止过程最多12秒，确保MySQL完全关闭
-
-⭐ 端口智能管理：
-- 应用启动时自动检测可用端口（3306 → 3307 → 3308...）
-- 启动成功后会记录实际端口到 .running-port 文件
-- 使用 kill-running-port.bat 可自动清理正确的端口
-
-
-四、注意事项
-----------------------------------------
-1. 启动后不要关闭命令行窗口，关闭窗口会停止 MySQL
-2. 正常停止请使用 stop.bat
-3. 如果出现 1130 或密码错误，运行 reset-root-password.bat
-4. 如果端口被占用无法启动，运行 kill-3306.bat
-5. 默认密码是 njcnpqs，不要随意修改
-
-
-五、常见问题
-----------------------------------------
-Q: 连接提示 1130 错误或密码错误？
-A: 运行 reset-root-password.bat 重置权限
-
-Q: 启动失败或端口被占用？
-A: 运行 kill-running-port.bat 清理端口（自动识别正确端口）
-
-Q: 如何重置密码？
-A: 运行 reset-root-password.bat（密码会重置为 njcnpqs）
-
-Q: 数据在哪里？
-A: 所有数据库数据在 data/ 目录下
-
-
 ==========================================
 南京灿能电气自动化有限公司
 2025
 ==========================================
-

build/extraResources/mysql/init_pwd.bat

@@ -0,0 +1,34 @@
+@echo off
+chcp 65001 >nul
+cd /d %~dp0
+
+taskkill /F /IM mysqld.exe 2>nul
+timeout /t 2 /nobreak >nul
+
+rmdir /s /q data 2>nul
+mkdir data
+
+echo 初始化数据库...
+bin\mysqld.exe --defaults-file=my.ini --initialize-insecure --console
+
+echo 启动 MySQL...
+start /B bin\mysqld.exe --defaults-file=my.ini
+timeout /t 8 /nobreak >nul
+
+echo 设置密码...
+bin\mysql.exe -h 127.0.0.1 -P 3306 -u root -e "ALTER USER '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; FLUSH PRIVILEGES;"
+
+if %errorlevel% NEQ 0 (
+    echo 第一次失败，重试...
+    timeout /t 3 /nobreak >nul
+    bin\mysql.exe -h localhost -P 3306 -u root -e "ALTER USER '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; FLUSH PRIVILEGES;"
+)
+
+taskkill /F /IM mysqld.exe 2>nul
+
+echo.
+echo ==========================================
+echo   完成！密码: njcnpqs
+echo ==========================================
+pause
+

build/extraResources/mysql/kill-running-port.bat

@@ -1,115 +0,0 @@
-@echo off
-chcp 65001 >nul
-color 0C
-title 清理NPQS9100 MySQL端口占用
-cls
-echo ==========================================
-echo   清理 NPQS9100 MySQL 端口占用
-echo ==========================================
-echo.
-
-REM 获取MySQL目录（脚本所在目录）
-set MYSQL_HOME=%~dp0
-cd /d "%MYSQL_HOME%"
-
-REM 读取实际运行的端口
-set PORT_FILE=.running-port
-set MYSQL_PORT=
-
-if exist "%PORT_FILE%" (
-    set /p MYSQL_PORT=<"%PORT_FILE%"
-    echo [√] 检测到运行记录：端口 %MYSQL_PORT%
-    echo.
-) else (
-    echo [!] 未找到运行记录文件，使用默认端口 3306
-    echo.
-    set MYSQL_PORT=3306
-)
-
-echo [1] 检查端口 %MYSQL_PORT% 占用情况...
-echo.
-
-REM 查找占用该端口的连接
-netstat -ano | findstr ":%MYSQL_PORT%" > "%TEMP%\mysql_port.txt"
-
-if %errorlevel% equ 0 (
-    echo 发现以下端口 %MYSQL_PORT% 连接：
-    echo ----------------------------------------
-    type "%TEMP%\mysql_port.txt"
-    echo ----------------------------------------
-    echo.
-    
-    echo [2] 提取进程ID并结束进程...
-    echo.
-    
-    REM 提取所有LISTENING状态的PID
-    for /f "tokens=5" %%a in ('netstat -ano ^| findstr ":%MYSQL_PORT%" ^| findstr "LISTENING"') do (
-        if not "%%a"=="0" (
-            echo 正在结束进程 PID: %%a
-            taskkill /F /PID %%a 2>nul
-            if errorlevel 1 (
-                echo    [失败] 无法结束进程 %%a
-            ) else (
-                echo    [成功] 已结束进程 %%a
-            )
-        )
-    )
-    
-    REM 如果还有其他状态的连接，也尝试结束
-    for /f "tokens=5" %%a in ('netstat -ano ^| findstr ":%MYSQL_PORT%" ^| findstr /V "LISTENING"') do (
-        if not "%%a"=="0" (
-            echo 正在结束进程 PID: %%a
-            taskkill /F /PID %%a 2>nul
-            if errorlevel 1 (
-                echo    [已结束或无权限] 进程 %%a
-            ) else (
-                echo    [成功] 已结束进程 %%a
-            )
-        )
-    )
-    
-    echo.
-    echo [3] 清理完成
-    
-    REM 等待2秒让进程完全释放
-    timeout /t 2 /nobreak >nul
-    
-    echo.
-    echo [4] 再次检查端口 %MYSQL_PORT%...
-    netstat -ano | findstr ":%MYSQL_PORT%"
-    if errorlevel 1 (
-        echo    [√] 端口 %MYSQL_PORT% 已完全释放
-        
-        REM 删除端口记录文件
-        if exist "%PORT_FILE%" (
-            del "%PORT_FILE%"
-            echo    [√] 已清理端口记录文件
-        )
-    ) else (
-        echo    [!] 仍有连接存在（可能是TIME_WAIT状态，会自动释放）
-    )
-    
-) else (
-    echo [√] 没有发现占用端口 %MYSQL_PORT% 的进程
-    
-    REM 删除端口记录文件
-    if exist "%PORT_FILE%" (
-        del "%PORT_FILE%"
-        echo    [√] 已清理端口记录文件
-    )
-)
-
-REM 清理临时文件
-if exist "%TEMP%\mysql_port.txt" del "%TEMP%\mysql_port.txt"
-
-echo.
-echo ==========================================
-echo   清理完成
-echo ==========================================
-echo.
-echo 说明：
-echo - 此脚本只清理 NPQS9100 应用使用的 MySQL 端口
-echo - 不会影响您电脑上的其他 MySQL 服务
-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;

build/extraResources/mysql/reset-root-password.bat

@@ -1,66 +0,0 @@
-@echo off
-chcp 65001 >nul
-color 0B
-title Reset MySQL Root Password
-cls
-echo ==========================================
-echo   Reset MySQL Root Password
-echo ==========================================
-echo.
-echo This script will reset root password and grant 127.0.0.1 access
-echo.
-echo IMPORTANT: Close any running MySQL windows first!
-echo.
-pause
-
-set MYSQL_HOME=%cd%
-set password=njcnpqs
-
-echo.
-echo [1] Stopping MySQL...
-taskkill /F /IM mysqld.exe >nul 2>&1
-timeout /t 2 >nul
-echo Done.
-
-echo.
-echo [2] Creating init file...
-(
-echo ALTER USER IF EXISTS 'root'@'localhost' IDENTIFIED BY '%password%';
-echo CREATE USER IF NOT EXISTS 'root'@'127.0.0.1' IDENTIFIED BY '%password%';
-echo GRANT ALL PRIVILEGES ON *.* TO 'root'@'127.0.0.1' WITH GRANT OPTION;
-echo CREATE USER IF NOT EXISTS 'root'@'%%' IDENTIFIED BY '%password%';
-echo GRANT ALL PRIVILEGES ON *.* TO 'root'@'%%' WITH GRANT OPTION;
-echo FLUSH PRIVILEGES;
-) > "%MYSQL_HOME%\reset-init.sql"
-echo Done.
-
-echo.
-echo [3] Starting MySQL with init-file...
-echo This will take about 30 seconds...
-echo.
-
-cd /d "%MYSQL_HOME%"
-"%MYSQL_HOME%\bin\mysqld.exe" --defaults-file="%MYSQL_HOME%\my.ini" --init-file="%MYSQL_HOME%\reset-init.sql" --console
-
-REM The above command runs in foreground and will exit when you press Ctrl+C
-
-echo.
-echo MySQL has stopped.
-echo.
-if exist "%MYSQL_HOME%\reset-init.sql" del "%MYSQL_HOME%\reset-init.sql"
-
-echo.
-echo ==========================================
-echo   Password reset completed!
-echo ==========================================
-echo.
-echo Connection info:
-echo   Host: 127.0.0.1
-echo   Port: 3306
-echo   User: root
-echo   Password: %password%
-echo.
-echo Now you can run startup.bat to start MySQL normally
-echo.
-pause
-

build/remove-mysql-service.bat

@@ -0,0 +1,81 @@
+@echo off
+chcp 65001 >nul
+title 检查并清除 MySQL9100 服务
+color 0E
+
+echo ========================================
+echo   检查并清除 MySQL9100 服务
+echo ========================================
+echo.
+
+REM 检查是否有管理员权限
+net session >nul 2>&1
+if %errorlevel% neq 0 (
+    echo [错误] 需要管理员权限来操作 Windows 服务
+    echo.
+    echo 请右键点击此脚本，选择"以管理员身份运行"
+    echo.
+    pause
+    exit /b 1
+)
+
+echo [✓] 已具有管理员权限
+echo.
+
+REM 检查服务是否存在
+echo [1/4] 检查 mysql9100 服务是否存在...
+sc query mysql9100 >nul 2>&1
+if %errorlevel% equ 0 (
+    echo [✓] 发现 mysql9100 服务
+    echo.
+
+    REM 显示服务状态
+    echo [2/4] 服务状态信息:
+    sc query mysql9100
+    echo.
+
+    REM 停止服务
+    echo [3/4] 正在停止 mysql9100 服务...
+    sc stop mysql9100 >nul 2>&1
+    if %errorlevel% equ 0 (
+        echo [✓] 服务已停止
+    ) else (
+        echo [!] 服务可能已经停止或停止失败（继续删除）
+    )
+
+    REM 等待服务完全停止
+    timeout /t 2 /nobreak >nul
+    echo.
+
+    REM 删除服务
+    echo [4/4] 正在删除 mysql9100 服务...
+    sc delete mysql9100
+    if %errorlevel% equ 0 (
+        echo [✓] 服务已成功删除
+        echo.
+        echo ========================================
+        echo   清除完成！
+        echo ========================================
+    ) else (
+        echo [✗] 删除服务失败
+        echo.
+        echo 可能的原因：
+        echo   1. 服务仍在运行中（请重启电脑后重试）
+        echo   2. 权限不足
+        echo   3. 服务被其他程序锁定
+        echo.
+        pause
+        exit /b 1
+    )
+) else (
+    echo [!] 未发现 mysql9100 服务
+    echo.
+    echo 系统中没有名为 mysql9100 的服务，无需清除。
+)
+
+echo.
+echo 提示：如果需要完全清理，还可以：
+echo   1. 删除 MySQL 数据目录（mysql/data）
+echo   2. 删除 MySQL 配置文件（mysql/my.ini）
+echo.
+pause

build/rollback.bat

@@ -0,0 +1,143 @@
+@echo off
+chcp 65001 >nul
+echo ========================================
+echo NPQS9100 回滚工具
+echo ========================================
+echo.
+echo 【重要提示】
+echo 本工具用于回滚上次升级的内容
+echo 回滚后将恢复到升级前的状态
+echo.
+pause
+echo.
+
+echo [1/5] 停止 NPQS9100 进程...
+taskkill /F /IM NPQS9100.exe 2>nul
+if %errorlevel% equ 0 (
+    echo     NPQS9100 已停止
+    timeout /t 2 /nobreak >nul
+) else (
+    echo     NPQS9100 未运行
+)
+echo.
+
+echo [2/5] 检查备份文件...
+set hasBackup=0
+
+if exist backup\app.asar (
+    echo     发现前端备份（app.asar）
+    set hasBackup=1
+)
+
+if exist backup\app.asar.unpacked (
+    echo     发现前端备份（app.asar.unpacked）
+    set hasBackup=1
+)
+
+if exist backup\entrance.jar (
+    echo     发现后端备份
+    set hasBackup=1
+)
+
+if exist mysql\data_backup (
+    echo     发现数据库备份
+    set hasBackup=1
+)
+
+if %hasBackup%==0 (
+    echo     未发现任何备份文件！
+    echo     无法执行回滚操作
+    pause
+    exit /b 1
+)
+echo.
+
+echo [3/5] 回滚前端...
+set frontendRollback=0
+
+REM 回滚 app.asar
+if exist backup\app.asar (
+    echo     正在恢复 app.asar...
+    copy /Y backup\app.asar resources\app.asar >nul 2>&1
+    if %errorlevel% equ 0 (
+        echo     app.asar 已回滚
+        set frontendRollback=1
+    ) else (
+        echo     app.asar 回滚失败
+        pause
+        exit /b 1
+    )
+)
+
+REM 回滚 app.asar.unpacked
+if exist backup\app.asar.unpacked (
+    echo     正在恢复 app.asar.unpacked...
+    if exist resources\app.asar.unpacked (
+        rmdir /s /q resources\app.asar.unpacked 2>nul
+    )
+    xcopy backup\app.asar.unpacked resources\app.asar.unpacked\ /E /I /Y /Q >nul 2>&1
+    if %errorlevel% equ 0 (
+        echo     app.asar.unpacked 已回滚
+        set frontendRollback=1
+    ) else (
+        echo     app.asar.unpacked 回滚失败
+        pause
+        exit /b 1
+    )
+)
+
+if %frontendRollback%==0 (
+    echo     无前端备份，跳过
+)
+echo.
+
+echo [4/5] 回滚后端...
+if exist backup\entrance.jar (
+    echo     正在恢复 JAR 文件...
+    copy /Y backup\entrance.jar resources\extraResources\java\entrance.jar >nul 2>&1
+    if %errorlevel% equ 0 (
+        echo     后端已回滚
+    ) else (
+        echo     后端回滚失败
+        pause
+        exit /b 1
+    )
+) else (
+    echo     无后端备份，跳过
+)
+echo.
+
+echo [5/5] 回滚数据库...
+if exist mysql\data_backup (
+    echo     是否回滚数据库？（数据库回滚会丢失升级后的数据！）
+    echo     [Y] 是   [N] 否
+    choice /C YN /N /M "请选择："
+    if errorlevel 2 (
+        echo     已跳过数据库回滚
+    ) else (
+        echo     正在回滚数据库...
+        if exist mysql\data (
+            rmdir /s /q mysql\data 2>nul
+        )
+        xcopy mysql\data_backup mysql\data\ /E /I /Y /Q >nul 2>&1
+        if %errorlevel% equ 0 (
+            echo     数据库已回滚
+        ) else (
+            echo     数据库回滚失败
+            pause
+            exit /b 1
+        )
+    )
+) else (
+    echo     无数据库备份，跳过
+)
+echo.
+
+echo ========================================
+echo 回滚完成！
+echo ========================================
+echo.
+echo 您现在可以启动 NPQS9100 了
+echo.
+pause
+

build/upgrade.bat

@@ -0,0 +1,227 @@
+@echo off
+chcp 65001 >nul
+echo ========================================
+echo NPQS9100 升级工具
+echo ========================================
+echo.
+
+REM 检查并创建 upgrade 目录
+if not exist upgrade (
+    mkdir upgrade
+    echo 【首次使用】已自动创建 upgrade 目录
+    echo.
+    echo 请将升级文件放入 upgrade 目录：
+    echo   - app.asar                  （前端升级包 - 文件）
+    echo   - app.asar.unpacked\        （前端升级包 - 文件夹）
+    echo   - entrance.jar              （后端升级包）
+    echo.
+    echo 放置完成后，重新运行本脚本即可升级
+    echo.
+    pause
+    exit /b 0
+)
+
+REM 检查是否有升级文件
+set hasUpgrade=0
+if exist upgrade\app.asar set hasUpgrade=1
+if exist upgrade\app.asar.unpacked set hasUpgrade=1
+if exist upgrade\entrance.jar set hasUpgrade=1
+
+if %hasUpgrade%==0 (
+    echo 【提示】upgrade 目录为空！
+    echo.
+    echo 请将升级文件放入 upgrade 目录：
+    echo   - app.asar                  （前端升级包 - 文件）
+    echo   - app.asar.unpacked\        （前端升级包 - 文件夹）
+    echo   - entrance.jar              （后端升级包）
+    echo.
+    echo 放置完成后，重新运行本脚本即可升级
+    echo.
+    pause
+    exit /b 0
+)
+
+echo 【检测到升级文件】
+if exist upgrade\app.asar echo   - 前端升级（asar文件）： upgrade\app.asar
+if exist upgrade\app.asar.unpacked echo   - 前端升级（unpacked文件夹）： upgrade\app.asar.unpacked\
+if exist upgrade\entrance.jar echo   - 后端升级： upgrade\entrance.jar
+echo.
+echo 【重要提示】
+echo 1. 升级前会自动备份当前版本
+echo 2. 如升级失败可运行 rollback.bat 回滚
+echo 3. 数据库会自动备份到 mysql\data_backup\
+echo.
+pause
+echo.
+
+echo [1/6] 停止 NPQS9100 进程...
+taskkill /F /IM NPQS9100.exe 2>nul
+if %errorlevel% equ 0 (
+    echo     NPQS9100 已停止
+    timeout /t 2 /nobreak >nul
+) else (
+    echo     NPQS9100 未运行
+)
+echo.
+
+echo [2/6] 备份当前版本（用于回滚）...
+if not exist backup mkdir backup
+
+REM 备份前端（app.asar 和 app.asar.unpacked）
+if exist resources\app.asar (
+    echo     正在备份前端 app.asar...
+    if not exist backup mkdir backup
+    copy /Y resources\app.asar backup\app.asar >nul 2>&1
+    if %errorlevel% equ 0 (
+        echo     app.asar 备份完成
+    ) else (
+        echo     app.asar 备份失败
+    )
+)
+
+if exist resources\app.asar.unpacked (
+    echo     正在备份前端 app.asar.unpacked...
+    if exist backup\app.asar.unpacked (
+        rmdir /s /q backup\app.asar.unpacked 2>nul
+    )
+    xcopy resources\app.asar.unpacked backup\app.asar.unpacked\ /E /I /Y /Q >nul 2>&1
+    if %errorlevel% equ 0 (
+        echo     app.asar.unpacked 备份完成
+    ) else (
+        echo     app.asar.unpacked 备份失败
+    )
+)
+
+REM 备份后端
+if exist resources\extraResources\java\entrance.jar (
+    echo     正在备份后端...
+    copy /Y resources\extraResources\java\entrance.jar backup\entrance.jar >nul 2>&1
+    if %errorlevel% equ 0 (
+        echo     后端备份完成
+    ) else (
+        echo     后端备份失败
+    )
+)
+
+REM 备份数据库
+if exist mysql\data (
+    echo     正在备份数据库...
+    if exist mysql\data_backup (
+        rmdir /s /q mysql\data_backup 2>nul
+    )
+    xcopy mysql\data mysql\data_backup\ /E /I /Y /Q >nul 2>&1
+    if %errorlevel% equ 0 (
+        echo     数据库备份完成
+    ) else (
+        echo     数据库备份失败，请手动备份后继续
+        pause
+        exit /b 1
+    )
+)
+echo.
+
+echo [3/6] 记录版本信息...
+if not exist backup\version.txt (
+    echo 备份时间: %date% %time% > backup\version.txt
+    echo 升级前版本备份 >> backup\version.txt
+) else (
+    echo 上次备份时间: %date% %time% >> backup\version.txt
+)
+echo     版本信息已记录
+echo.
+
+echo [4/6] 升级前端...
+set frontendUpgraded=0
+
+REM 升级 app.asar
+if exist upgrade\app.asar (
+    echo     正在替换 app.asar...
+    copy /Y upgrade\app.asar resources\app.asar >nul 2>&1
+    if %errorlevel% equ 0 (
+        echo     app.asar 升级完成
+        set frontendUpgraded=1
+    ) else (
+        echo     app.asar 升级失败，正在回滚...
+        if exist backup\app.asar (
+            copy /Y backup\app.asar resources\app.asar >nul 2>&1
+            echo     已回滚到升级前版本
+        )
+        pause
+        exit /b 1
+    )
+)
+
+REM 升级 app.asar.unpacked
+if exist upgrade\app.asar.unpacked (
+    echo     正在替换 app.asar.unpacked...
+    if exist resources\app.asar.unpacked (
+        rmdir /s /q resources\app.asar.unpacked 2>nul
+    )
+    xcopy upgrade\app.asar.unpacked resources\app.asar.unpacked\ /E /I /Y /Q >nul 2>&1
+    if %errorlevel% equ 0 (
+        echo     app.asar.unpacked 升级完成
+        set frontendUpgraded=1
+    ) else (
+        echo     app.asar.unpacked 升级失败，正在回滚...
+        if exist backup\app.asar.unpacked (
+            rmdir /s /q resources\app.asar.unpacked 2>nul
+            xcopy backup\app.asar.unpacked resources\app.asar.unpacked\ /E /I /Y /Q >nul 2>&1
+            echo     已回滚到升级前版本
+        )
+        pause
+        exit /b 1
+    )
+)
+
+if %frontendUpgraded%==0 (
+    echo     无前端升级包，跳过
+)
+echo.
+
+echo [5/6] 升级后端...
+if exist upgrade\entrance.jar (
+    echo     正在替换 JAR 文件...
+    copy /Y upgrade\entrance.jar resources\extraResources\java\entrance.jar >nul 2>&1
+    if %errorlevel% equ 0 (
+        echo     后端升级完成
+    ) else (
+        echo     后端升级失败，正在回滚...
+        if exist backup\entrance.jar (
+            copy /Y backup\entrance.jar resources\extraResources\java\entrance.jar >nul 2>&1
+            echo     已回滚到升级前版本
+        )
+        pause
+        exit /b 1
+    )
+) else (
+    echo     无后端升级包，跳过
+)
+echo.
+
+echo [6/6] 记录升级日志...
+if not exist logs mkdir logs
+echo ========================================== >> logs\upgrade.log
+echo 升级时间: %date% %time% >> logs\upgrade.log
+if exist upgrade\dist (
+    echo 升级内容: 前端 >> logs\upgrade.log
+)
+if exist upgrade\entrance.jar (
+    echo 升级内容: 后端 >> logs\upgrade.log
+)
+echo ========================================== >> logs\upgrade.log
+echo     升级日志已记录
+echo.
+
+echo ========================================
+echo 升级完成！
+echo ========================================
+echo.
+echo 【提示】
+echo 1. 如需回滚，请运行 rollback.bat
+echo 2. 升级文件已使用，可删除 upgrade 目录
+echo.
+echo 您现在可以启动 NPQS9100 应用。
+echo.
+pause
+
+

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,33 @@
       "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",
+    "requestedExecutionLevel": "requireAdministrator",
+    "signAndEditExecutable": false,
+    "verifyUpdateCodeSignature": false,
     "artifactName": "${productName}-${os}-${version}-${arch}.${ext}",
     "target": [
       {

doc/NPQS-9100绿色包完整指南.md

@@ -0,0 +1,874 @@
+# NPQS-9100 绿色包完整指南
+
+本指南包含绿色包的打包、使用、升级和维护的完整说明。
+
+---
+
+## 📋 目录
+
+- [一、产品说明](#一产品说明)
+- [七、用户关心的文件](#七用户关心的文件重要)⭐
+- [二、打包指南](#二打包指南)
+- [三、启动流程](#三启动流程)
+- [四、升级指南](#四升级指南)
+- [五、测试清单](#五测试清单)
+- [六、常见问题](#六常见问题)
+
+---
+
+## 一、产品说明
+
+### 📦 产品特性
+
+绿色包是一个**免安装便携版**，包含：
+- ✅ 应用本体（Electron + Vue 3）
+- ✅ MySQL 数据库（免安装版，支持动态端口）
+- ✅ Java 运行环境（JRE 8）
+- ✅ Spring Boot 后端服务（entrance.jar）
+- ✅ 智能启动流程（端口检测、Loading界面）
+- ✅ **一键升级回滚机制** ⭐
+
+**用户体验**：解压即用，双击启动，无需任何配置
+
+---
+
+### 🎯 核心功能
+
+#### **1. 智能端口检测**
+- MySQL 端口：从 3306 开始自动检测（最多 100 个）
+- Java 端口：从 18092 开始自动检测（最多 100 个）
+- 自动更新配置文件
+
+#### **2. 盘符自动识别**
+- 应用在 C 盘 → 数据目录：`C:\NPQS9100_Data\`
+- 应用在 D 盘 → 数据目录：`D:\NPQS9100_Data\`
+- 自动创建所有必要的子目录
+
+#### **3. Loading 界面**
+- 紫色渐变背景
+- 流畅的进度条动画（0% → 100%）
+- 实时状态文字更新
+- 显示检测到的端口号和数据目录路径
+
+#### **4. 热更新机制** ⭐
+- 前端可独立升级
+- 后端可独立升级
+- 自动备份，支持一键回滚
+- 数据库数据完全保留
+
+#### **5. 简化配置管理**
+- 基于环境变量的配置方案
+- 需要修改配置时重新打包前端（upgrade.bat 升级）
+- 保证稳定性和可靠性
+
+---
+
+### 📁 目录结构
+
+```
+win-unpacked/                           # 绿色版目录（约 650-800 MB）
+├── NPQS9100.exe                        # 主程序（双击运行）⭐
+├── NPQS9100-启动器.bat                  # 管理员启动器（备用）
+├── upgrade.bat                         # 升级工具 ⭐
+├── rollback.bat                        # 回滚工具 ⭐
+├── uninstall-mysql-service.bat         # MySQL 服务卸载工具
+├── 使用说明.txt                         # 使用手册
+├── README-升级回滚.txt                  # 升级说明
+├── upgrade/                            # 升级包目录（首次使用自动创建）
+├── backup/                             # 自动备份目录
+│   ├── dist/                          # 前端备份
+│   ├── entrance.jar                   # 后端备份
+│   └── version.txt                    # 版本记录
+├── resources/
+│   ├── app.asar                       # Electron 主代码（加密）
+│   ├── app.asar.unpacked/
+│   │   └── public/
+│   │       └── dist/                  # 前端代码 ⭐ 可替换
+│   └── extraResources/
+│       ├── dll/
+│       └── java/
+│           ├── entrance.jar           # 后端 JAR ⭐ 可替换
+│           ├── application.yml.template
+│           └── application.yml        # 运行时生成
+├── scripts/                           # 启动管理脚本（⚠️ 不要修改）
+│   ├── config-generator.js
+│   ├── java-runner.js
+│   ├── mysql-service-manager.js
+│   ├── port-checker.js
+│   └── startup-manager.js
+├── mysql/                             # MySQL 数据库
+│   ├── bin/
+│   ├── data/                          # 数据库数据 ⚠️ 不要动
+│   ├── data_backup/                   # 自动备份
+│   ├── my.ini                         # 运行时生成
+│   └── README.txt
+├── jre/                               # Java 运行环境（⚠️ 不要修改）
+│   ├── bin/
+│   └── lib/
+└── logs/                              # 应用日志
+    ├── startup-YYYYMMDD.log
+    └── upgrade.log
+
+用户数据目录（首次运行自动创建）：
+X:\NPQS9100_Data\                      (X 是应用所在盘符)
+├── logs/                              # Spring Boot 日志
+├── template/                          # 报告模板
+├── report/                            # 生成的报告
+└── data/                              # 应用数据
+```
+
+---
+
+## 七、用户关心的文件（重要！）⭐
+
+### 📌 可以使用的工具
+
+| 文件 | 功能 | 使用场景 |
+|------|------|---------|
+| **NPQS9100.exe** | 主程序 | 日常启动 |
+| **NPQS9100-启动器.bat** | 管理员启动器 | 首次运行或权限问题时 |
+| **upgrade.bat** | 升级工具 | 收到升级包时使用 |
+| **rollback.bat** | 回滚工具 | 升级后出问题时使用 |
+| **uninstall-mysql-service.bat** | MySQL 服务卸载 | 完全卸载应用时使用 |
+| **使用说明.txt** | 使用手册 | 遇到问题时参考 |
+| **README-升级回滚.txt** | 升级说明 | 升级前阅读 |
+
+---
+
+### ⚠️ 不要修改的文件/目录
+
+| 路径 | 说明 | 误修改后果 |
+|------|------|----------|
+| **resources/** | 应用核心代码 | 应用无法启动 |
+| **scripts/** | 启动管理脚本 | 启动流程失败 |
+| **jre/** | Java 运行环境 | Java 服务无法启动 |
+| **mysql/bin/** | MySQL 可执行文件 | 数据库无法启动 |
+| **mysql/my.ini** | MySQL 配置 | 运行时自动生成，手动修改会被覆盖 |
+
+---
+
+### 📂 需要保护的数据
+
+| 路径 | 说明 | 备份建议 |
+|------|------|---------|
+| **mysql/data/** | 数据库数据 | ⚠️ 定期备份！ |
+| **backup/** | 升级备份 | 自动管理，无需手动操作 |
+| **X:\NPQS9100_Data/** | 用户数据目录 | 包含日志、模板、报告 |
+
+---
+
+## 二、打包指南
+
+### 🏗️ 打包步骤
+
+#### **步骤 1：清理并打包**
+
+```bash
+cd build
+clean-and-build.bat
+```
+
+**打包过程**：
+1. 停止 NPQS9100 进程
+2. 删除 out 目录
+3. 构建前端代码（Vue 3）
+4. 编译 Electron 主进程代码
+5. 复制 MySQL、JRE、Java 资源
+6. 生成 win-unpacked 绿色版目录
+
+**等待时间**：约 5-15 分钟
+
+---
+
+#### **步骤 2：测试运行**
+
+```bash
+cd out\win-unpacked
+NPQS9100.exe
+```
+
+**观察**：
+- ✅ Loading 界面正常显示（不在任务栏显示）
+- ✅ 启动进度正常更新（9个步骤）
+- ✅ MySQL 自动启动
+- ✅ Spring Boot 连接成功
+- ✅ 顺利进入主界面
+
+---
+
+#### **步骤 3：压缩发布包**
+
+```powershell
+cd out
+Compress-Archive -Path win-unpacked -DestinationPath "NPQS9100-v1.0.0-绿色版.zip" -Force
+```
+
+**压缩后大小**：约 350-450 MB
+
+---
+
+## 三、启动流程
+
+### 🔄 完整启动流程
+
+```
+用户解压 zip 并双击 NPQS9100.exe
+    ↓
+显示 Loading 界面（不在任务栏显示）
+    ↓
+[0%] 正在初始化应用...
+    ↓
+[15%] 检测 MySQL 端口 (3306 → 3307 → ...)
+    ├─ 找到可用端口（如 3307）
+    ↓
+[30%] 启动 MySQL 数据库（端口 3307）
+    ├─ 首次运行：自动初始化数据库
+    ├─ 自动设置 root 密码：njcnpqs
+    ├─ 自动授权 127.0.0.1 访问
+    ↓
+[45%] 等待 MySQL 就绪
+    ├─ 监听端口是否打开
+    ├─ 超时时间：30 秒
+    ↓
+[60%] 检测 Java 端口 (18092 → 18093 → ...)
+    ├─ 找到可用端口（如 18093）
+    ↓
+[70%] 检测应用所在盘符并生成配置文件
+    ├─ MySQL 连接：localhost:3307
+    ├─ MySQL 密码：njcnpqs  ⭐ 自动写入
+    ├─ Java 端口：18093
+    ├─ 数据路径：C:\NPQS9100_Data\
+    ├─ 创建所有必要目录（logs、template、report、data）
+    ↓
+[80%] 启动 Spring Boot 后端
+    ├─ 使用内置 JRE 8
+    ├─ 加载生成的配置文件
+    ├─ 连接 MySQL 数据库
+    ↓
+[90%] 等待 Spring Boot 就绪
+    ├─ 监听 18093 端口
+    ├─ 超时时间：60 秒
+    ↓
+[100%] 启动完成！
+    ├─ 等待 1.5 秒显示完成状态
+    ↓
+销毁 Loading 窗口（使用 destroy() 确保完全释放）
+    ↓
+显示主应用界面（任务栏只显示1个图标）
+```
+
+**预计启动时间**：
+- 首次运行：30-45 秒（需初始化 MySQL）
+- 后续启动：15-25 秒
+
+---
+
+### 🚪 关闭流程
+
+```
+用户关闭应用（点击X或托盘退出）
+    ↓
+显示退出确认对话框
+    ↓
+用户确认退出
+    ↓
+停止 Spring Boot 进程（通过PID和端口精确清理）
+    ↓
+停止 MySQL 服务（如果是服务模式）
+    ↓
+清理资源
+    ↓
+应用退出
+```
+
+---
+
+## 四、升级指南
+
+### 🎯 升级流程概览
+
+#### **升级流程**
+```
+1. 双击 upgrade.bat（首次自动创建 upgrade/ 目录）
+2. 将升级包放入 upgrade/ 目录
+3. 再次运行 upgrade.bat（自动备份 + 升级）
+4. 重启应用测试
+```
+
+#### **回滚流程**
+```
+1. 双击 rollback.bat
+2. 自动从 backup/ 恢复旧版本
+3. 重启应用
+```
+
+---
+
+### 🔧 升级操作步骤
+
+#### **方法 1：使用升级脚本（推荐）⭐**
+
+**第 1 步：准备升级包**
+
+1. 双击 `upgrade.bat`
+2. 脚本自动创建 `upgrade/` 文件夹并提示
+3. 将升级文件放入 `upgrade/` 目录：
+   - `dist/` - 前端升级包（可选）
+   - `entrance.jar` - 后端升级包（可选）
+4. 再次双击 `upgrade.bat` 开始升级
+
+**第 2 步：自动升级**
+
+脚本会自动：
+- ✅ 停止 NPQS9100 进程
+- ✅ **自动备份当前版本到 `backup/` 目录**
+- ✅ 备份数据库到 `mysql/data_backup/`
+- ✅ 替换前端文件（如果有）
+- ✅ 替换后端 JAR（如果有）
+- ✅ 记录升级日志到 `logs/upgrade.log`
+
+**第 3 步：重启应用**
+
+升级完成后，双击 `NPQS9100.exe` 启动应用。
+
+---
+
+#### **方法 2：手动升级**
+
+如果升级脚本失败，可以手动操作：
+
+**升级前端**：
+```batch
+taskkill /F /IM NPQS9100.exe
+rmdir /s /q resources\app.asar.unpacked\public\dist
+xcopy upgrade\dist resources\app.asar.unpacked\public\dist\ /E /I /Y
+```
+
+**升级后端**：
+```batch
+taskkill /F /IM NPQS9100.exe
+copy /Y upgrade\entrance.jar resources\extraResources\java\entrance.jar
+```
+
+---
+
+### 🔄 回滚操作
+
+#### **方法 1：使用回滚脚本（推荐）⭐**
+
+如果升级后出现问题，直接双击 `rollback.bat`：
+
+脚本会自动：
+- ✅ 停止 NPQS9100
+- ✅ 恢复前端（从 `backup/dist/`）
+- ✅ 恢复后端（从 `backup/entrance.jar`）
+- ✅ 询问是否恢复数据库（⚠️ 会丢失升级后的数据）
+
+#### **方法 2：手动回滚**
+
+```batch
+# 恢复前端
+rmdir /s /q resources\app.asar.unpacked\public\dist
+xcopy backup\dist resources\app.asar.unpacked\public\dist\ /E /I /Y
+
+# 恢复后端
+copy /Y backup\entrance.jar resources\extraResources\java\entrance.jar
+
+# 恢复数据库（⚠️ 谨慎！）
+rmdir /s /q mysql\data
+xcopy mysql\data_backup mysql\data\ /E /I /Y
+```
+
+---
+
+### 📋 升级清单
+
+| 升级类型 | 升级包来源 | 客户放置位置 | 最终替换位置 |
+|---------|-----------|-------------|-------------|
+| **前端** | `out/win-unpacked/resources/app.asar` + `app.asar.unpacked/` | `upgrade/app.asar` + `upgrade/app.asar.unpacked/` | `resources/app.asar` + `resources/app.asar.unpacked/` |
+| **后端** | `out/win-unpacked/resources/extraResources/java/entrance.jar` | `upgrade/entrance.jar` | `resources/extraResources/java/entrance.jar` |
+| **数据库** | ⚠️ **不升级，自动保留** | - | `mysql/data/` |
+
+---
+
+### 🛠️ 开发者升级流程（完整版）
+
+#### **前端升级完整流程**
+
+```bash
+# ============================================
+# 开发侧操作
+# ============================================
+
+# 1️⃣ 修改前端代码
+# 编辑 frontend/src/ 下的任何文件
+
+# 2️⃣ 如需修改配置（可选）
+# 编辑 frontend/.env
+VITE_API_URL=http://192.168.1.100:18092  # 修改 API 地址
+
+# 3️⃣ 构建前端
+npm run build-frontend
+
+# 4️⃣ 打包应用
+npm run build-w
+# 输出: out/win-unpacked/
+
+# 5️⃣ 准备升级包
+# 从 out/win-unpacked/resources/ 复制以下文件：
+#   - app.asar （文件）
+#   - app.asar.unpacked/ （整个文件夹）
+# 
+# 压缩成: NPQS9100-前端-v1.0.1.zip
+
+# 6️⃣ 发给客户
+
+
+# ============================================
+# 客户侧操作
+# ============================================
+
+# 1️⃣ 解压升级包
+# 解压 NPQS9100-前端-v1.0.1.zip
+# 得到:
+#   - app.asar
+#   - app.asar.unpacked/
+
+# 2️⃣ 复制到升级目录
+# 将两个文件都放到：win-unpacked/upgrade/
+#   - upgrade/app.asar
+#   - upgrade/app.asar.unpacked/
+
+# 3️⃣ 运行升级脚本
+# 双击: upgrade.bat
+
+# 4️⃣ 重启应用
+# 双击: NPQS9100.exe
+```
+
+#### **后端升级完整流程**
+
+```bash
+# ============================================
+# 开发侧操作
+# ============================================
+
+# 1️⃣ 获取新的 JAR 文件
+# 从后端开发人员获取新版本的 entrance.jar
+
+# 2️⃣ 替换 JAR 文件
+# 将新的 entrance.jar 复制到:
+# build/extraResources/java/entrance.jar
+
+# 3️⃣ 打包升级包
+# 直接压缩 entrance.jar 文件
+# 重命名为: NPQS9100-后端-v1.0.1.zip
+
+# 4️⃣ 发给客户
+# 发送 NPQS9100-后端-v1.0.1.zip
+
+
+# ============================================
+# 客户侧操作
+# ============================================
+
+# 1️⃣ 解压升级包
+# 解压 NPQS9100-后端-v1.0.1.zip
+# 得到 entrance.jar 文件
+
+# 2️⃣ 复制到升级目录
+# 将 entrance.jar 复制到:
+# win-unpacked/upgrade/entrance.jar
+
+# 3️⃣ 运行升级脚本
+# 双击: upgrade.bat
+
+# 4️⃣ 重启应用
+# 双击: NPQS9100.exe
+```
+
+#### **前后端同时升级**
+
+```bash
+# 开发侧：准备升级包
+NPQS9100-升级-v1.1.0.zip
+├── app.asar              # 前端升级包（文件）
+├── app.asar.unpacked/    # 前端升级包（文件夹）
+└── entrance.jar          # 后端升级包
+
+# 客户侧：复制到
+win-unpacked/upgrade/
+├── app.asar
+├── app.asar.unpacked/
+└── entrance.jar
+
+# 运行 upgrade.bat 即可一次性升级前后端
+```
+
+---
+
+## 五、测试清单
+
+### ✅ 打包验证
+
+- [ ] `out/win-unpacked` 目录存在
+- [ ] 目录大小约 650-800 MB
+- [ ] NPQS9100.exe 存在
+- [ ] NPQS9100-启动器.bat 存在
+- [ ] upgrade.bat 存在
+- [ ] rollback.bat 存在
+- [ ] uninstall-mysql-service.bat 存在
+- [ ] 使用说明.txt 存在
+- [ ] README-升级回滚.txt 存在
+- [ ] mysql/ 目录完整
+- [ ] jre/ 目录完整
+
+---
+
+### ✅ 基础功能测试
+
+- [ ] 双击 NPQS9100.exe 能正常启动
+- [ ] Loading 界面正常显示
+- [ ] **Loading 窗口不在任务栏显示** ⭐
+- [ ] 进度条流畅更新（0% → 100%）
+- [ ] 状态文字正确显示
+- [ ] 主界面正常显示
+- [ ] **任务栏只有1个窗口预览** ⭐
+
+---
+
+### ✅ 端口检测测试
+
+- [ ] 手动占用 3306，应用自动使用 3307
+- [ ] 手动占用 18092，应用自动使用 18093
+- [ ] Loading 界面显示检测到的端口号
+- [ ] 日志中显示正确的端口信息
+
+---
+
+### ✅ MySQL 测试
+
+- [ ] MySQL 自动启动成功
+- [ ] **首次运行自动初始化数据库** ⭐
+- [ ] 可以用 Navicat 连接（密码：njcnpqs）
+- [ ] 可以从 127.0.0.1 连接（不报 1130 错误）⭐
+- [ ] 数据库操作正常
+- [ ] 关闭应用后 MySQL 自动停止
+
+---
+
+### ✅ Spring Boot 测试
+
+- [ ] 后端服务自动启动
+- [ ] **能连接到 MySQL（不报密码错误）** ⭐
+- [ ] 日志无错误："HikariPool-1 - Start completed"
+- [ ] API 接口正常响应
+- [ ] 关闭应用后 Java 进程停止
+
+---
+
+### ✅ 配置生成测试
+
+- [ ] application.yml 自动生成
+- [ ] **MySQL 密码正确写入（njcnpqs）** ⭐
+- [ ] MySQL 端口正确
+- [ ] Java 端口正确
+- [ ] 数据路径正确（对应盘符）
+
+---
+
+### ✅ 数据目录测试
+
+- [ ] 数据目录在正确的盘符下创建
+- [ ] 所有子目录都自动创建
+- [ ] 配置文件路径正确
+- [ ] 日志文件正常写入
+
+---
+
+### ✅ 便携性测试
+
+- [ ] 可以解压到任意目录运行
+- [ ] 可以移动到其他目录运行
+- [ ] 可以在不同电脑上运行
+- [ ] 可以在不同盘符上运行（C/D/E...）
+- [ ] 删除目录即可完全卸载
+- [ ] **压缩成 zip 后用户可正常解压使用** ⭐
+
+---
+
+### ✅ 升级回滚测试
+
+- [ ] upgrade.bat 首次运行自动创建 upgrade/ 目录
+- [ ] upgrade.bat 检测到升级文件后正常升级
+- [ ] 升级前自动备份到 backup/ 目录
+- [ ] 升级后应用正常运行
+- [ ] 升级后数据库数据保留
+- [ ] rollback.bat 能正确回滚前端
+- [ ] rollback.bat 能正确回滚后端
+- [ ] 回滚后应用恢复正常
+
+---
+
+### ✅ 性能测试
+
+- [ ] 首次启动 < 45 秒
+- [ ] 后续启动 < 30 秒
+- [ ] Loading 界面流畅无卡顿
+- [ ] 内存占用合理（< 1GB）
+- [ ] CPU 占用正常
+
+---
+
+### ✅ 错误处理测试
+
+- [ ] 端口全部占用时显示友好错误
+- [ ] MySQL 启动失败时显示错误信息
+- [ ] Spring Boot 启动失败时不崩溃
+- [ ] 升级失败时自动回滚
+- [ ] 托盘图标显示正常
+- [ ] 退出确认对话框正常工作
+
+---
+
+## 六、常见问题
+
+### Q1: Loading 界面一直卡在某个步骤？
+
+**A**: 查看日志定位问题：
+```
+C:\Users\[用户名]\AppData\Roaming\NQPS9100\logs\
+├── 9100-YYYYMMDD.log          # 应用日志
+├── 9100-core-YYYYMMDD.log     # 核心日志
+└── 9100-error-YYYYMMDD.log    # 错误日志
+```
+
+常见原因：
+- MySQL 启动失败 → 检查端口是否可用
+- Java 启动失败 → 检查 JRE 是否完整
+- 配置生成失败 → 检查磁盘权限
+
+---
+
+### Q2: 显示"无法找到可用端口"错误？
+
+**A**: 
+- 检查是否有大量端口被占用
+- 尝试关闭其他占用端口的程序
+- 或修改起始端口（见开发者指南）
+
+---
+
+### Q3: MySQL 连接失败或提示 1130 错误？
+
+**A**: 
+- 确认 MySQL 已启动（任务管理器查看 mysqld.exe）
+- 确认端口正确（看 Loading 界面显示的端口）
+- 确认密码正确（njcnpqs，已自动配置）
+- 检查是否有杀毒软件拦截
+- 如有问题，重启应用即可（MySQL 会自动重新配置）
+
+---
+
+### Q4: 后端 API 无法访问？
+
+**A**: 
+- 确认 Spring Boot 已启动
+- 确认端口正确（看 Loading 界面）
+- 检查防火墙设置
+
+---
+
+### Q5: 打包后体积太大？
+
+**A**: 预期体积：
+- **解压后**：650-800 MB
+- **压缩后 (zip)**：350-450 MB
+
+主要组成：
+- 应用本体：~150 MB
+- MySQL 8.0：~400 MB
+- JRE 8：~100 MB
+
+优化建议：
+- 考虑使用 7z 格式（压缩率更高）
+- 可以精简 MySQL 的不必要组件
+
+---
+
+### Q6: 任务栏显示2个窗口预览？
+
+**A**: 已修复！现在 Loading 窗口使用 `skipTaskbar: true`，不会在任务栏显示。
+
+---
+
+### Q7: 升级后前端显示旧版本？
+
+**A**: 清除浏览器缓存，或强制刷新（Ctrl + F5）
+
+---
+
+### Q8: 升级后数据丢失？
+
+**A**: 检查 `mysql/data/` 目录是否完整，如有备份，从 `mysql/data_backup/` 恢复
+
+---
+
+### Q9: 升级脚本报错？
+
+**A**：
+1. 检查 `upgrade` 文件夹路径是否正确
+2. 手动执行升级步骤
+3. 查看 `logs/upgrade.log` 日志
+
+---
+
+### Q10: 回滚后还是有问题？
+
+**A**：
+1. 检查 `backup/` 目录是否有备份文件
+2. 查看 `backup/version.txt` 确认备份版本
+3. 手动执行回滚步骤（参考本文档）
+
+---
+
+### Q11: 多次升级后，backup 目录的内容是什么版本？
+
+**A**: `backup/` 目录保存的是**最后一次升级前**的版本（每次升级都会覆盖）
+
+---
+
+### Q12: 点击 X 关闭后，Java 进程还在运行？
+
+**A**: 已修复！现在使用精确的进程清理机制：
+- 通过 PID 清理（如果有进程引用）
+- 通过端口号清理（精确定位）
+- **不会误杀 IDEA 等其他 Java 进程** ⭐
+
+---
+
+### Q13: 如何修改 API 或 WebSocket 地址？
+
+**A**: 
+1. 修改 `frontend/.env` 文件中的 `VITE_API_URL`
+2. 重新构建前端：`npm run build-frontend`
+3. 将 `public/dist/` 打包为升级包
+4. 使用 `upgrade.bat` 升级
+
+**示例**：
+```env
+# frontend/.env
+VITE_API_URL=http://192.168.1.100:18092
+```
+
+**注意**：
+- 配置修改需要重新打包前端
+- 使用升级机制保证数据安全
+
+---
+
+### Q14: MySQL 服务如何卸载？
+
+**A**: 
+**方法 1：使用卸载脚本（推荐）**
+```batch
+双击: uninstall-mysql-service.bat
+```
+
+**方法 2：手动卸载**
+```batch
+# 停止服务
+net stop mysql9100
+
+# 删除服务
+sc delete mysql9100
+```
+
+**注意**：
+- 卸载服务不会删除数据库数据
+- 数据保存在 `mysql/data/` 目录
+- 下次启动应用会重新安装服务
+
+---
+
+## 📚 相关文档
+
+**用户文档**（随应用发布）：
+- `使用说明.txt` - 用户使用手册
+- `README-升级回滚.txt` - 简明升级说明
+
+**开发者文档**（doc/ 目录）：
+- `doc/NPQS-9100绿色包完整指南.md` - 本文档（完整指南）
+- `doc/打包前检查清单.md` - 逐项检查
+- `doc/管理员权限说明.md` - 权限问题处理
+- `doc/MySQL服务化方案说明.md` - MySQL 服务管理
+
+---
+
+## 📊 技术架构
+
+### 核心模块
+
+- `scripts/port-checker.js` - 端口检测工具
+- `scripts/startup-manager.js` - 启动状态管理
+- `scripts/config-generator.js` - 配置文件生成
+- `scripts/mysql-service-manager.js` - MySQL 服务管理器
+- `scripts/java-runner.js` - Java 运行器
+- `scripts/log-window-manager.js` - 日志窗口管理
+- `electron/preload/lifecycle.js` - 生命周期管理
+- `public/html/loading.html` - Loading 界面
+
+### 启动流程架构
+
+```
+lifecycle.js (入口)
+    ↓ 创建
+StartupManager (显示 Loading)
+    ↓ 调用
+PortChecker (检测端口)
+    ↓ 调用
+MySQLServiceManager (管理 MySQL 服务)
+    ↓ 调用
+ConfigGenerator (生成配置)
+    ↓ 调用
+JavaRunner (启动 Spring Boot)
+```
+
+---
+
+## 🎉 最新改进
+
+### 用户体验提升
+- ✅ **任务栏只显示1个图标** - Loading 窗口不在任务栏显示
+- ✅ **纯绿色版** - 只生成 win-unpacked 目录，压缩成 zip 即可发布
+- ✅ **一键解压即用** - 用户解压后双击即可运行
+- ✅ **热更新机制** - 前后端可独立升级，支持一键回滚
+
+### 技术改进
+- ✅ **MySQL 密码自动配置** - 配置生成器自动写入密码
+- ✅ **权限自动授权** - 支持 localhost 和 127.0.0.1 访问
+- ✅ **MySQL 服务化** - 使用 Windows 服务管理，开机自启
+- ✅ **窗口管理优化** - 使用 destroy() 确保窗口完全释放
+- ✅ **精确进程清理** - 不会误杀其他 Java 进程
+- ✅ **自动备份机制** - 升级前自动备份，支持回滚
+- ✅ **热更新机制** - 前后端独立升级，无需重装
+
+### 文档完善
+- ✅ **使用说明.txt** - 为用户提供详细的使用指南
+- ✅ **README-升级回滚.txt** - 简明升级操作说明
+- ✅ **完整指南** - 打包、启动、升级三合一文档
+
+---
+
+## 📞 技术支持
+
+如遇问题，请联系技术支持并提供：
+- 应用版本号
+- 错误日志（`logs/` 目录）
+- 操作步骤截图
+
+---
+
+*文档更新时间: 2025-10-23*  
+*南京灿能电力自动化股份有限公司*
+

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

@@ -12,7 +12,7 @@ module.exports = () => {
         singleLock: true,
         windowsOption: {
             title: 'NPQS9100-自动检测平台',
-            menuBarVisible: true,  // 显示菜单栏，方便查看日志
+            menuBarVisible: false,  // 隐藏菜单栏
             width: 1920,
             height: 1000,
             minWidth: 1024,
@@ -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,132 @@
 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();
 
-// 创建应用菜单
+// 全局变量
-function createApplicationMenu() {
+let tray = null;
-  const template = [
+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: '查看',
+      label: '显示主窗口',
-      submenu: [
-        {
-          label: '显示/隐藏服务日志',
-          accelerator: 'F12',
       click: () => {
-            if (lifecycle.logWindowManager) {
+        const mainWindow = BrowserWindow.getAllWindows()[0];
-              lifecycle.logWindowManager.toggle();
+        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() {
+  // 生产环境隐藏菜单栏
+  Menu.setApplicationMenu(null);
+
+  // 调试时可以使用下面的菜单（取消注释）
+  /*
+  const template = [
+    {
+      label: '查看',
+      submenu: [
         { role: 'reload', label: '刷新' },
         { role: 'forceReload', label: '强制刷新' },
         { type: 'separator' },
@@ -50,6 +155,7 @@ function createApplicationMenu() {
 
   const menu = Menu.buildFromTemplate(template);
   Menu.setApplicationMenu(menu);
+  */
 }
 
 // 注册 IPC 处理器
@@ -71,14 +177,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

@@ -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,7 +60,7 @@ function loadScripts() {
 
 class Lifecycle {
   constructor() {
-    this.mysqlManager = null;
+    this.mysqlServiceManager = null;
     this.javaRunner = null;
     this.startupManager = null;
     this.logWindowManager = null;
@@ -81,66 +82,51 @@ class Lifecycle {
    * 完整的应用启动流程
    */
   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 });
-      // 步骤4: 等待 MySQL 就绪
-      this.startupManager.updateProgress('wait-mysql', { mysqlPort: actualPort });
-      this.logWindowManager.addLog('mysql', '等待 MySQL 就绪...');
-      
-      const mysqlReady = await PortChecker.waitForPort(actualPort, 30000);
-      
-      if (!mysqlReady) {
-        this.logWindowManager.addLog('error', `MySQL 启动超时（端口 ${actualPort} 未响应）`);
-        throw new Error(`MySQL 启动超时（端口 ${actualPort} 未响应）`);
-      }
-      
-      logger.info('[lifecycle] MySQL is ready');
-      this.logWindowManager.addLog('success', 'MySQL 已就绪！');
         await this.sleep(500);
+      } catch (error) {
+        logger.error('[lifecycle] MySQL error:', error);
+        this.logWindowManager.addLog('error', `MySQL 错误: ${error.message}`);
+        throw error;
+      }
     }
 
     // 步骤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);
     
@@ -149,13 +135,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 
@@ -163,28 +166,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,
@@ -194,6 +204,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,
@@ -204,13 +215,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,
@@ -222,6 +236,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', '应用即将启动...');
@@ -237,10 +252,38 @@ class Lifecycle {
     win.show();
     win.focus();
 
-    // 添加主窗口关闭事件监听
+    // 窗口关闭时，使用 Electron 原生对话框确认
-    win.on('close', async () => {
+    win.on('close', async (event) => {
-      logger.info('[lifecycle] Main window closing, cleaning up...');
+      if (global.isConfirmedExit) {
+        logger.info('[lifecycle] Exit already confirmed, proceeding');
+        return;
+      }
+
+      event.preventDefault();
+      logger.info('[lifecycle] Window close intercepted, showing exit confirm dialog');
+
+      const { dialog } = require('electron');
+      const { response } = await dialog.showMessageBox(win, {
+        type: 'question',
+        buttons: ['取消', '退出'],
+        defaultId: 1,
+        cancelId: 0,
+        title: '退出确认',
+        message: '确定要退出应用吗？',
+        noLink: true
+      });
+
+      if (response === 1) {
+        logger.info('[lifecycle] User confirmed exit');
+        global.isConfirmedExit = true;
         await this.cleanup();
+        if (win && !win.isDestroyed()) {
+          win.destroy();
+        }
+        app.quit();
+      } else {
+        logger.info('[lifecycle] User cancelled exit');
+      }
     });
 
     // 立即刷新一次，确保显示最新内容
@@ -320,10 +363,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()) {
@@ -334,35 +375,28 @@ class Lifecycle {
       }
     }
 
-    // 停止 MySQL
+    // 停止 MySQL 进程（进程模式）
-    const config = getConfig();
+    if (this.mysqlServiceManager) {
-    if (config.mysql && config.mysql.enable && config.mysql.autoStart) {
       try {
-        logger.info('[lifecycle] Stopping MySQL...');
+        logger.info('[lifecycle] Stopping MySQL process...');
         if (this.logWindowManager && this.logWindowManager.logWindow && !this.logWindowManager.logWindow.isDestroyed()) {
-          this.logWindowManager.addLog('system', '正在停止 MySQL（最多等待10秒）...');
+          this.logWindowManager.addLog('system', '正在停止 MySQL...');
         }
 
-        if (this.mysqlManager) {
+        await this.mysqlServiceManager.stopMySQLProcess();
-          // 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');
+        logger.info('[lifecycle] MySQL process 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);
+      this.logWindowManager.addLog('system', '清理完成，应用即将退出');
-        }
+      this.logWindowManager.addLog('system', '='.repeat(60));
-      }
     }
 
     // 等待500ms让用户看到清理日志
@@ -381,35 +415,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 应用
@@ -492,20 +497,28 @@ class Lifecycle {
    * main window have been loaded
    */
   async windowReady() {
-    logger.info('[lifecycle] window-ready');
+    logger.info('[lifecycle] window-ready hook triggered');
 
-    // 创建日志窗口
+    // 进程模式不需要管理员权限检查
+
+    // 创建日志管理器（但不显示窗口，仅用于写日志文件）
+    logger.info('[lifecycle] Creating log window manager...');
     this.logWindowManager = new LogWindowManager();
-    this.logWindowManager.createLogWindow();
+    // this.logWindowManager.createLogWindow(); // ← 注释掉，不创建窗口
+    this.logWindowManager.addLog('system', '='.repeat(80));
+    this.logWindowManager.addLog('system', 'NPQS9100 应用启动');
+    this.logWindowManager.addLog('system', '='.repeat(80));
+
+    // 创建 Loading 窗口
+    logger.info('[lifecycle] Creating startup manager and loading window...');
+    this.startupManager = new StartupManager();
+    this.startupManager.createLoadingWindow();
     this.logWindowManager.addLog('system', '='.repeat(60));
     this.logWindowManager.addLog('system', 'NPQS9100 启动中...');
     this.logWindowManager.addLog('system', '='.repeat(60));
 
-    // 创建 Loading 窗口
-    this.startupManager = new StartupManager();
-    this.startupManager.createLoadingWindow();
-
     // 开始启动流程
+    logger.info('[lifecycle] Starting application flow...');
     try {
       await this.startApplication();
     } catch (error) {
@@ -523,13 +536,16 @@ class Lifecycle {
         win.show();
         win.focus();
         
-        // 添加主窗口关闭事件监听
+        // 启动失败时，允许用户正常关闭窗口（不强制托盘）
-        win.on('close', async () => {
+        // 因为可能托盘未创建，或用户想直接退出
-          logger.info('[lifecycle] Main window closing (after error), cleaning up...');
+        win.on('close', async (event) => {
+          logger.info('[lifecycle] Window closing (after error), cleaning up...');
+          // 不阻止关闭，执行清理
           await this.cleanup();
         });
         
         this.logWindowManager.addLog('warn', '应用已启动，但部分服务可能未正常运行');
+        this.logWindowManager.addLog('system', '您可以点击 X 关闭应用');
       }, 5000);
     }
 

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.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>
@@ -31,14 +32,6 @@ onMounted(() => {
     const language = globalStore.language ?? getBrowserLang()
     i18n.locale.value = language
     globalStore.setGlobalState('language', language as LanguageType)
-    // 移除 autofit，使用 CSS 自适应
-    // autofit.init({
-    //     el: '#app',
-    //     dw: 1440,
-    //     dh: 900,
-    //     resize: true,
-    //     limit: 0.1
-    // })
 })
 
 // element language

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

@@ -13,7 +13,8 @@ export const getBigTestItem = (params: {
 export const getScriptList = (params: {
     devId:string,
     chnNum:number,
-    num:number
+    num:number,
+    planId:string
 }) => {
     return http.post('/result/getCheckItem', params, {loading: false})
 }
@@ -81,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})
 }
@@ -128,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/device.ts

@@ -89,8 +89,8 @@ export namespace Device {
         boundPlanName?: string | null
         assign?: number ////是否分配给检测人员 0否 1是
         monitorList: Monitor.ResPqMon[]
-        checked: boolean // 是否已选择
+        checked?: boolean // 是否已选择
-        disabled: boolean // 是否禁用
+        disabled?: boolean // 是否禁用
     }
 
     export interface SelectOption {

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变比
@@ -27,6 +27,7 @@ export namespace Monitor {
     statInterval: number; //统计间隔
     harmSysId: string; //默认与谐波系统监测点ID相同
     checkFlag: number;//是否参与检测0否1是
+    resultType:string|null; //检测结果类型
   }
 
   /**

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/plan/plan.ts

@@ -141,9 +141,7 @@ export const importSubPlan = (params: Plan.ResPlan) => {
 
 // 导出计划检测结果数据
 export const exportPlanCheckData = (params: any) => {
-    return http.post(
+    return http.post(`/adPlan/exportPlanCheckData?planId=${params.id}&devIds=${params.devIds}&report=${params.report}`)
-        `/adPlan/exportPlanCheckData?planId=${params.id}&devIds=${params.devIds}&report=${params.report}`
-    )
 }
 
 //根据误差体系id获取测试项
@@ -158,5 +156,7 @@ export const getMemberList = (params: {id : string}) => {
 
 // 导入并合并子检测计划检测结果数据
 export const importAndMergePlanCheckData = (params: Plan.ResPlan) => {
-    return http.upload(`/adPlan/importAndMergePlanCheckData`, params)
+    return http.upload(`/adPlan/importAndMergePlanCheckData`, params, {
+        timeout: 60000 * 20
+    })
 }

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/components/ImportZip/index.vue

@@ -12,6 +12,7 @@
             action="#"
             class="upload"
             :limit="1"
+            :on-exceed="handleExceed"
             :http-request="uploadZip"
             accept=".zip"
             :auto-upload="!parameter.confirmMessage"
@@ -56,7 +57,15 @@
 
 <script setup lang="ts" name="ImportZip">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox, type UploadInstance, type UploadProps, type UploadRequestOptions } from 'element-plus'
+import {
+    ElMessage,
+    ElMessageBox,
+    genFileId,
+    type UploadInstance,
+    type UploadProps,
+    type UploadRawFile,
+    type UploadRequestOptions
+} from 'element-plus'
 import http from '@/api'
 
 export interface ZipParameterProps {
@@ -170,7 +179,12 @@ const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
         message: ''
     }
 }
-
+const handleExceed: UploadProps['onExceed'] = files => {
+    uploadRef.value!.clearFiles()
+    const file = files[0] as UploadRawFile
+    file.uid = genFileId()
+    uploadRef.value!.handleStart(file)
+}
 const progressData = ref({
     percentage: 0,
     status: '',

frontend/src/layouts/LayoutTransverse/index.vue

@@ -61,9 +61,12 @@ const menuList = computed(() => authStore.showMenuListGet)
 const showMenuFlag = computed(() => authStore.showMenuFlagGet)
 const activeMenu = computed(() => (route.meta.activeMenu ? route.meta.activeMenu : route.path) as string)
 
-const handleClickMenu = (subItem: Menu.MenuOptions) => {
+const handleClickMenu = async (subItem: Menu.MenuOptions) => {
-    if (subItem.meta.isLink) return window.open(subItem.meta.isLink, '_blank')
+    if (subItem.meta?.isLink) {
-    router.push(subItem.path)
+        window.open(subItem.meta.isLink, '_blank')
+        return
+    }
+    await router.push(subItem.path)
 }
 </script>
 

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

@@ -28,8 +28,14 @@
 import { computed } from 'vue'
 import { useAuthStore } from '@/stores/modules/auth'
 import { useModeStore } from '@/stores/modules/mode' // 引入模式 store
+import { useTabsStore } from '@/stores/modules/tabs'
+import { useRouter } from 'vue-router'
+import { initDynamicRouter } from '@/routers/modules/dynamicRouter'
+
+const router = useRouter()
 const authStore = useAuthStore()
 const modeStore = useModeStore()
+const tabsStore = useTabsStore()
 
 const title = computed(() => {
     return modeStore.currentMode === '' ? '选择模块' : modeStore.currentMode + '模块'
@@ -64,7 +70,17 @@ const handelOpen = async (item: string, key: string) => {
     await authStore.setShowMenu()
     modeStore.setCurrentMode(item) // 将模式code存入 store
     // 强制刷新页面
-    window.location.reload()
+    await tabsStore.closeMultipleTab()
+    await initDynamicRouter()
+
+    // 只有当目标路径与当前路径不同时才跳转
+    if (router.currentRoute.value.path !== '/home/index') {
+        await router.push({ path: '/home/index' })
+    } else {
+        // 如果已在目标页面，手动触发组件更新
+        window.location.reload() // 或者采用其他方式刷新数据
+    }
+    
 }
 </script>
 <style scoped lang="scss">

frontend/src/layouts/components/Header/components/Avatar.vue

@@ -1,12 +1,4 @@
 <template>
-    <!--  <div class="userInfo">-->
-    <!--    <div class="icon">-->
-    <!--      <Avatar/>-->
-    <!--    </div>-->
-    <!--    <div class="username">-->
-    <!--      {{ username }}-->
-    <!--    </div>-->
-    <!--  </div>-->
     <el-dropdown trigger="click">
         <div class="userInfo">
             <div class="icon">
@@ -22,10 +14,10 @@
                     <el-icon><Sunny /></el-icon>
                     {{ t('header.changeTheme') }}
                 </el-dropdown-item>
-                <el-dropdown-item @click="openDialog('infoRef')">
+                <!--                <el-dropdown-item @click="openDialog('infoRef')">
                     <el-icon><User /></el-icon>
                     {{ t('header.personalData') }}
-                </el-dropdown-item>
+                </el-dropdown-item>-->
                 <el-dropdown-item @click="openDialog('passwordRef')">
                     <el-icon><Edit /></el-icon>
                     {{ t('header.changePassword') }}
@@ -80,7 +72,6 @@
 import { computed, ref } from 'vue'
 import { LOGIN_URL } from '@/config'
 import { useRouter } from 'vue-router'
-import { logoutApi } from '@/api/user/login'
 import { useUserStore } from '@/stores/modules/user'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import InfoDialog from './InfoDialog.vue'
@@ -90,10 +81,9 @@ import VersionDialog from '@/views/system/versionRegister/index.vue'
 import { Avatar, Sunny, Switch, Tools } from '@element-plus/icons-vue'
 import { useAuthStore } from '@/stores/modules/auth'
 import { useDictStore } from '@/stores/modules/dict'
-import { useAppSceneStore, useModeStore } from '@/stores/modules/mode'
+import { useAppSceneStore } from '@/stores/modules/mode'
-import { useTheme } from '@/hooks/useTheme'
 import { useI18n } from 'vue-i18n'
-import { updateScene } from '@/api/system/base/index'
+import { updateScene } from '@/api/system/base'
 
 const userStore = useUserStore()
 const dictStore = useDictStore()
@@ -101,10 +91,6 @@ const username = computed(() => userStore.userInfo.name)
 
 const router = useRouter()
 const authStore = useAuthStore()
-const modeStore = useModeStore()
-const AppSceneStore = useAppSceneStore()
-
-const { changePrimary } = useTheme()
 
 // 初始化 i18n
 const { t } = useI18n() // 使用 t 方法替代 $t
@@ -116,21 +102,8 @@ const logout = () => {
         cancelButtonText: '取消',
         type: 'warning'
     }).then(async () => {
-        // 1.执行退出登录接口
-        await logoutApi()
-        // 2.清除 Token
-        userStore.setAccessToken('')
-        userStore.setRefreshToken('')
-        userStore.setExp(0)
-        userStore.setUserInfo({ id: '', name: '' })
-        userStore.setIsRefreshToken(false)
-        dictStore.setDictData([])
-        modeStore.setCurrentMode('')
-        AppSceneStore.setCurrentMode('')
-        // 3.重定向到登陆页
         ElMessage.success('退出登录成功！')
-        //重置菜单/导航栏权限
+        await userStore.logout()
-        await authStore.resetAuthStore()
         await router.push(LOGIN_URL)
     })
 }
@@ -157,8 +130,9 @@ const changeScene = async (value: string) => {
 }
 
 //模式切换
-const changeMode = () => {
+const changeMode = async () => {
     authStore.changeModel()
+    await router.push('/home/index')
 }
 </script>
 

frontend/src/layouts/components/Header/components/PasswordDialog.vue

@@ -1,22 +1,150 @@
 <template>
     <el-dialog v-model="dialogVisible" title="修改密码" width="500px" draggable>
-    <span>This is Password</span>
+        <div>
+            <el-form :model="formContent" ref="dialogFormRef" :rules="rules">
+                <el-form-item label="原密码" prop="oldPassword" :label-width="100">
+                    <el-input
+                        type="oldPassword"
+                        v-model="formContent.oldPassword"
+                        show-password
+                        placeholder="请输入原密码"
+                        autocomplete="off"
+                        maxlength="32"
+                        show-word-limit
+                    />
+                </el-form-item>
+                <el-form-item label="新密码" prop="newPassword" :label-width="100">
+                    <el-input
+                        type="newPassword"
+                        v-model="formContent.newPassword"
+                        show-password
+                        placeholder="请输入新密码"
+                        autocomplete="off"
+                        maxlength="32"
+                        show-word-limit
+                    />
+                </el-form-item>
+                <el-form-item label="确认密码" prop="surePassword" :label-width="100">
+                    <el-input
+                        type="surePassword"
+                        v-model="formContent.surePassword"
+                        show-password
+                        placeholder="请再次输入确认密码"
+                        autocomplete="off"
+                        maxlength="32"
+                        show-word-limit
+                    />
+                </el-form-item>
+            </el-form>
+        </div>
         <template #footer>
-      <span class="dialog-footer">
+            <div class="dialog-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button @click="close()">取消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确认</el-button>
+                <el-button type="primary" @click="save()">保存</el-button>
-      </span>
+            </div>
         </template>
     </el-dialog>
 </template>
 
-<script setup lang="ts">
+<script lang="ts" setup>
-import { ref } from "vue";
+import { ref, type Ref } from 'vue'
+import { ElMessage, type FormItemRule } from 'element-plus'
+import { updatePassWord } from '@/api/user/user'
+import { type User } from '@/api/user/interface/user'
+import { useUserStore } from '@/stores/modules/user'
+import { LOGIN_URL } from '@/config'
+import { useRouter } from 'vue-router'
 
-const dialogVisible = ref(false);
+const userStore = useUserStore()
-const openDialog = () => {
+const router = useRouter()
-  dialogVisible.value = true;
+// 定义弹出组件元信息
-};
+const dialogFormRef = ref()
+function useMetaInfo() {
+    const dialogVisible = ref(false)
+    const formContent = ref<User.ResPassWordUser>({
+        id: '', //用户ID，作为唯一标识
+        oldPassword: '', //密码
+        newPassword: '', //
+        surePassword: ''
+    })
+    return { dialogVisible, formContent }
+}
 
-defineExpose({ openDialog });
+const { dialogVisible, formContent } = useMetaInfo()
+// 清空formContent
+const resetFormContent = () => {
+    formContent.value = {
+        id: '', //用户ID，作为唯一标识
+        oldPassword: '', //密码
+        newPassword: '', //
+        surePassword: ''
+    }
+}
+
+// 定义规则
+const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+    oldPassword: [{ required: true, message: '原密码必填！', trigger: 'blur' }],
+    newPassword: [
+        { required: true, message: '新密码必填！', trigger: 'blur' },
+        {
+            pattern: /^(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]).{8,16}$/,
+            message: '密码长度为8-16，需包含特殊字符',
+            trigger: 'blur'
+        }
+    ],
+    surePassword: [
+        { required: true, message: '确认密码必填！', trigger: 'blur' },
+        {
+            validator: (rule: FormItemRule, value: string, callback: Function) => {
+                if (value !== formContent.value.newPassword) {
+                    callback(new Error('两次输入的密码不一致！'))
+                } else {
+                    callback()
+                }
+            },
+            trigger: 'blur'
+        }
+    ]
+})
+
+// 关闭弹窗
+const close = () => {
+    dialogVisible.value = false
+    // 清空dialogForm中的值
+    resetFormContent()
+    // 重置表单
+    dialogFormRef.value?.resetFields()
+}
+
+// 保存数据
+const save = () => {
+    try {
+        dialogFormRef.value?.validate(async (valid: boolean) => {
+            if (valid) {
+                if (formContent.value.id) {
+                    await updatePassWord(formContent.value)
+                    ElMessage.success('修改密码成功，请重新登录！')
+                    setTimeout(async () => {
+                        await userStore.logout()
+                        await router.push(LOGIN_URL)
+                    }, 2000)
+                }
+                close()
+            }
+        })
+    } catch (err) {
+        console.error('验证过程中出现错误', err)
+    }
+}
+
+// 打开弹窗是编辑
+const openDialog = async () => {
+    // 重置表单
+    dialogFormRef.value?.resetFields()
+    dialogVisible.value = true
+    formContent.value.id = userStore.userInfo.id
+}
+
+// 对外映射
+defineExpose({ openDialog })
 </script>

frontend/src/layouts/components/Menu/SubMenu.vue

@@ -20,17 +20,17 @@
     </template>
 </template>
 <script setup lang="ts">
-import { onBeforeMount } from "vue";
+import { useRouter } from 'vue-router'
-import { useRouter } from "vue-router";
-defineProps<{ menuList: Menu.MenuOptions[] }>();
-const router = useRouter();
-const handleClickMenu = (subItem: Menu.MenuOptions) => {
-  //console.log('1456----------------',subItem);
-  if (subItem.meta.isLink) return window.open(subItem.meta.isLink, "_blank");
-  router.push(subItem.path);
-};
-
 
+defineProps<{ menuList: Menu.MenuOptions[] }>()
+const router = useRouter()
+const handleClickMenu = async (subItem: Menu.MenuOptions) => {
+    if (subItem.meta?.isLink) {
+        window.open(subItem.meta.isLink, '_blank')
+        return
+    }
+    await router.push(subItem.path)
+}
 </script>
 <style lang="scss">
 .el-sub-menu .el-sub-menu__title:hover {
@@ -40,7 +40,6 @@ const handleClickMenu = (subItem: Menu.MenuOptions) => {
     //background-color: #5274a5 !important; //一级导航选中背景色
 
     background-color: var(--el-color-primary-light-3) !important;
-
 }
 .el-menu--collapse {
     .is-active {
@@ -70,7 +69,7 @@ const handleClickMenu = (subItem: Menu.MenuOptions) => {
             top: 0;
             bottom: 0;
             width: 4px;
-      content: "";
+            content: '';
             background-color: var(--el-color-primary);
         }
     }

frontend/src/routers/index.ts

@@ -6,6 +6,9 @@ import { initDynamicRouter } from '@/routers/modules/dynamicRouter'
 import { staticRouter } from '@/routers/modules/staticRouter'
 import NProgress from '@/config/nprogress'
 
+// 白名单转换为 Set 提高性能
+const WHITE_LIST_SET = new Set(ROUTER_WHITE_LIST)
+
 const mode = import.meta.env.VITE_ROUTER_MODE
 
 const routerMode = {
@@ -30,11 +33,9 @@ const routerMode = {
  * @param meta.isKeepAlive ==> 当前路由是否缓存
  * */
 const router = createRouter({
-    history: routerMode[mode](),
+    history: routerMode[mode]?.() || createWebHashHistory(), // 默认 fallback 到 hash 模式
     routes: [...staticRouter],
-    // 不区分路由大小写，非严格模式下提供了更宽松的路径匹配
     strict: false,
-    // 页面刷新时，滚动条位置还原
     scrollBehavior: () => ({ left: 0, top: 0 })
 })
 
@@ -44,38 +45,52 @@ const router = createRouter({
 router.beforeEach(async (to, from, next) => {
     const userStore = useUserStore()
     const authStore = useAuthStore()
+
     // 1.NProgress 开始
     NProgress.start()
+
     // 2.动态设置标题
     const title = import.meta.env.VITE_GLOB_APP_TITLE
     document.title = to.meta.title ? `${to.meta.title} - ${title}` : title
 
-    // 3.判断是访问登陆页，有 Token 就在当前页面，没有 Token 重置路由到登陆页
+    // 3.判断是访问登陆页，有 Token 就留在当前页，没有 Token 重置路由到登陆页
     if (to.path.toLocaleLowerCase() === LOGIN_URL) {
-        if (userStore.accessToken) return next(from.fullPath)
+        if (userStore.accessToken) {
+            // 已登录则不再回到登录页，直接跳过
+            return next('/')
+        }
         resetRouter()
         return next()
     }
 
     // 4.判断访问页面是否在路由白名单地址(静态路由)中，如果存在直接放行
-    if (ROUTER_WHITE_LIST.includes(to.path)) return next()
+    if (WHITE_LIST_SET.has(to.path)) return next()
 
     // 5.判断是否有 Token，没有重定向到 login 页面
     if (!userStore.accessToken) return next({ path: LOGIN_URL, replace: true })
 
     // 6.如果没有菜单列表，就重新请求菜单列表并添加动态路由
     if (!authStore.authMenuListGet.length) {
+        try {
             await initDynamicRouter()
             return next({ ...to, replace: true })
+        } catch (error) {
+            console.error('动态路由加载失败:', error)
+            // 清除 token 并跳转登录页
+            await userStore.logout()
+            return next({ path: LOGIN_URL, replace: true })
+        }
     }
 
     // 7.存储 routerName 做按钮权限筛选
     await authStore.setRouteName(to.name as string)
+
     // 8. 当前页面是否有激活信息，没有就刷新
     const activateInfo = authStore.activateInfo
     if (!Object.keys(activateInfo).length) {
         await authStore.setActivateInfo()
     }
+
     // 9.正常访问页面
     next()
 })
@@ -96,7 +111,7 @@ export const resetRouter = () => {
  * */
 router.onError(error => {
     NProgress.done()
-    //console.warn('路由错误', error.message)
+    console.warn('路由错误', error.message)
 })
 
 /**

frontend/src/routers/modules/dynamicRouter.ts

@@ -1,60 +1,117 @@
-import router from "@/routers/index";
+import router from '@/routers'
-import { LOGIN_URL } from "@/config";
+import { LOGIN_URL } from '@/config'
-import { RouteRecordRaw } from "vue-router";
+import { type RouteRecordRaw } from 'vue-router'
-import { ElNotification } from "element-plus";
+import { ElNotification } from 'element-plus'
-import { useUserStore } from "@/stores/modules/user";
+import { useUserStore } from '@/stores/modules/user'
-import { useAuthStore } from "@/stores/modules/auth";
+import { useAuthStore } from '@/stores/modules/auth'
 
 // 引入 views 文件夹下所有 vue 文件
-const modules = import.meta.glob("@/views/**/*.vue");
+const modules = import.meta.glob('@/views/**/*.vue')
+
+let isInitializing = false
+
+/**
+ * 清除已有的动态路由
+ */
+const clearDynamicRoutes = () => {
+    const routes = router.getRoutes()
+    routes.forEach(route => {
+        if (route.name && route.name !== 'layout' && route.name !== 'login' && route.name !== 'testScriptAdd') {
+            router.removeRoute(route.name)
+        }
+    })
+}
+
+/**
+ * 根据 component 路径查找对应的模块
+ * @param path 组件路径
+ */
+const resolveComponentModule = async (path: string) => {
+    // 规范化路径，去除首尾斜杠
+    let normalizedPath = path.trim()
+    if (!normalizedPath.startsWith('/')) {
+        normalizedPath = '/' + normalizedPath
+    }
+    if (normalizedPath.endsWith('.vue')) {
+        normalizedPath = normalizedPath.slice(0, -4)
+    }
+
+    const fullPath = `/src/views${normalizedPath}.vue`
+    return modules[fullPath]
+}
 
 /**
  * @description 初始化动态路由
  */
 export const initDynamicRouter = async () => {
-  const userStore = useUserStore();
+    if (isInitializing) return Promise.reject(new Error('Dynamic router initialization in progress'))
-  const authStore = useAuthStore();
+
+    isInitializing = true
+    const userStore = useUserStore()
+    const authStore = useAuthStore()
 
     try {
         // 1. 获取菜单列表 && 按钮权限列表
-    await authStore.getAuthMenuList();
+        await authStore.getAuthMenuList()
-    await authStore.getAuthButtonList();
+        await authStore.getAuthButtonList()
 
         // 2. 判断当前用户有没有菜单权限
         if (!authStore.authMenuListGet.length) {
             ElNotification({
-        title: "无权限访问",
+                title: '无权限访问',
-        message: "当前账号无任何菜单权限，请联系系统管理员！",
+                message: '当前账号无任何菜单权限，请联系系统管理员！',
-        type: "warning",
+                type: 'warning',
                 duration: 3000
-      });
+            })
-      userStore.setAccessToken("");
+            userStore.setAccessToken('')
-      userStore.setRefreshToken("");
+            userStore.setRefreshToken('')
             userStore.setExp(0)
-      router.replace(LOGIN_URL);
+            await router.replace(LOGIN_URL)
-      return Promise.reject("No permission");
+            return Promise.reject('No permission')
         }
 
-    // 3.添加动态路由
+        // 3. 清理之前的动态路由
-    authStore.flatMenuListGet.forEach(item => {
+        clearDynamicRoutes()
-      item.children && delete item.children;
 
-      if (item.component && typeof item.component == "string") {
+        // 4. 添加动态路由
-        item.component = modules["/src/views" + item.component + ".vue"];
+        for (const item of authStore.flatMenuListGet) {
-      }
+            // 删除 children 避免冗余嵌套
+            if (item.children) delete item.children
 
-      if (item.meta.isFull) {
+            // 处理组件映射
-        router.addRoute(item as unknown as RouteRecordRaw);
+            if (item.component && typeof item.component === 'string') {
+                const moduleLoader = await resolveComponentModule(item.component)
+                if (moduleLoader) {
+                    item.component = moduleLoader
                 } else {
-        router.addRoute("layout", item as unknown as RouteRecordRaw);
+                    console.warn(`未能找到组件: ${item.component}`)
+                    continue
+                }
+            }
+
+            // 类型守卫：确保满足 RouteRecordRaw 接口要求
+            if (
+                typeof item.path === 'string' &&
+                (typeof item.component === 'function' || typeof item.redirect === 'string')
+            ) {
+                const routeItem = item as unknown as RouteRecordRaw
+                if (item.meta.isFull) {
+                    router.addRoute(routeItem)
+                } else {
+                    router.addRoute('layout', routeItem)
+                }
+            } else {
+                console.warn('Invalid route item:', item)
+            }
         }
-    });
     } catch (error) {
         // 当按钮 || 菜单请求出错时，重定向到登陆页
-    userStore.setAccessToken("");
+        userStore.setAccessToken('')
-    userStore.setRefreshToken("");
+        userStore.setRefreshToken('')
         userStore.setExp(0)
-    router.replace(LOGIN_URL);
+        await router.replace(LOGIN_URL)
-    return Promise.reject(error);
+        return Promise.reject(error)
+    } finally {
+        isInitializing = false
+    }
 }
-};

frontend/src/stores/interface/index.ts

@@ -1,65 +1,69 @@
-export type LayoutType = 'vertical' | 'classic' | 'transverse' | 'columns';
+import { type Activate } from '@/api/activate/interface'
 
-export type AssemblySizeType = 'large' | 'default' | 'small';
+export type LayoutType = 'vertical' | 'classic' | 'transverse' | 'columns'
 
-export type LanguageType = 'zh' | 'en' | null;
+export type AssemblySizeType = 'large' | 'default' | 'small'
+
+export type LanguageType = 'zh' | 'en' | null
 
 /* GlobalState */
 export interface GlobalState {
-    layout: LayoutType;
+    layout: LayoutType
-    assemblySize: AssemblySizeType;
+    assemblySize: AssemblySizeType
-    language: LanguageType;
+    language: LanguageType
-    maximize: boolean;
+    maximize: boolean
-    primary: string;
+    primary: string
-    isDark: boolean;
+    isDark: boolean
-    isGrey: boolean;
+    isGrey: boolean
-    isWeak: boolean;
+    isWeak: boolean
-    asideInverted: boolean;
+    asideInverted: boolean
-    headerInverted: boolean;
+    headerInverted: boolean
-    isCollapse: boolean;
+    isCollapse: boolean
-    accordion: boolean;
+    accordion: boolean
-    breadcrumb: boolean;
+    breadcrumb: boolean
-    breadcrumbIcon: boolean;
+    breadcrumbIcon: boolean
-    tabs: boolean;
+    tabs: boolean
-    tabsIcon: boolean;
+    tabsIcon: boolean
-    footer: boolean;
+    footer: boolean
 }
 
 /* UserState */
 export interface UserState {
-    accessToken: string;
+    accessToken: string
-    refreshToken: string;
+    refreshToken: string
-    isRefreshToken: boolean;
+    isRefreshToken: boolean
-    userInfo: { id: string, name: string,loginName:string };
+    exp: number
+    userInfo: { id: string; name: string; loginName: string }
 }
 
 /* tabsMenuProps */
 export interface TabsMenuProps {
-    icon: string;
+    icon: string
-    title: string;
+    title: string
-    path: string;
+    path: string
-    name: string;
+    name: string
-    close: boolean;
+    close: boolean
-    isKeepAlive: boolean;
+    isKeepAlive: boolean
-    unshift?: boolean;
+    unshift?: boolean
 }
 
 /* TabsState */
 export interface TabsState {
-    tabsMenuList: TabsMenuProps[];
+    tabsMenuList: TabsMenuProps[]
 }
 
 /* AuthState */
 export interface AuthState {
-    routeName: string;
+    routeName: string
     authButtonList: {
-        [key: string]: string[];
+        [key: string]: string[]
-    };
+    }
-    authMenuList: Menu.MenuOptions[];
+    authMenuList: Menu.MenuOptions[]
-    showMenuFlag: boolean;
+    showMenuFlag: boolean
+    activateInfo: Activate.ActivationCodePlaintext
 }
 
 /* KeepAliveState */
 export interface KeepAliveState {
-    keepAliveName: string[];
+    keepAliveName: string[]
 }

frontend/src/stores/modules/auth.ts

@@ -1,15 +1,13 @@
 import { defineStore } from 'pinia'
-import { AuthState } from '@/stores/interface'
+import { type AuthState } from '@/stores/interface'
 import { getAuthButtonListApi, getAuthMenuListApi } from '@/api/user/login'
 import { getAllBreadcrumbList, getFlatMenuList, getShowMenuList } from '@/utils'
-import { useRouter } from 'vue-router'
 import { AUTH_STORE_KEY } from '@/stores/constant'
 import { useModeStore } from '@/stores/modules/mode'
 import { getLicense } from '@/api/activate'
 import type { Activate } from '@/api/activate/interface'
 
-export const useAuthStore = defineStore({
+export const useAuthStore = defineStore(AUTH_STORE_KEY, {
-    id: AUTH_STORE_KEY,
     state: (): AuthState => ({
         // 按钮权限列表
         authButtonList: {},
@@ -19,8 +17,7 @@ export const useAuthStore = defineStore({
         routeName: '',
         //登录不显示菜单栏和导航栏，点击进入测试的时候显示
         showMenuFlag: JSON.parse(localStorage.getItem('showMenuFlag') as string),
-        router: useRouter(),
+        activateInfo: {} as Activate.ActivationCodePlaintext
-        activateInfo: {}
     }),
     getters: {
         // 按钮权限列表
@@ -72,10 +69,9 @@ export const useAuthStore = defineStore({
             localStorage.setItem('showMenuFlag', 'true')
         },
         //更改模式
-        async changeModel() {
+        changeModel() {
             this.showMenuFlag = false
             localStorage.removeItem('showMenuFlag')
-            this.router.push({ path: '/home/index' })
         },
         async setActivateInfo() {
             const license_result = await getLicense()

frontend/src/stores/modules/check.ts

@@ -1,32 +1,37 @@
-import {defineStore} from "pinia";
+import { defineStore } from 'pinia'
-import {CHECK_STORE_KEY} from "@/stores/constant";
+import { CHECK_STORE_KEY } from '@/stores/constant'
-import type {CheckData} from "@/api/check/interface";
+import type { CheckData } from '@/api/check/interface'
 import type { Plan } from '@/api/plan/interface'
-import {useAppSceneStore} from "@/stores/modules/mode";
+import { useAppSceneStore } from '@/stores/modules/mode'
 
 export const useCheckStore = defineStore(CHECK_STORE_KEY, {
     state: () => ({
         devices: [] as CheckData.Device[],
         plan: {} as Plan.ResPlan,
-        selectTestItems: {preTest: true, timeTest: false, channelsTest: false, test: true} as CheckData.SelectTestItem,
+        selectTestItems: {
+            preTest: true,
+            timeTest: false,
+            channelsTest: false,
+            test: true
+        } as CheckData.SelectTestItem,
         checkType: 1, // 0:手动检测 1:自动检测
         reCheckType: 1, // 0:不合格项复检 1:全部复检
         showDetailType: 0, // 0:数据查询 1:误差体系跟换 2：正式检测
         temperature: 0,
         humidity: 0,
-        chnNumList: [],//连线数据
+        chnNumList: [] as string[], //连线数据
-        nodesConnectable: true,//设置是能可以连线
+        nodesConnectable: true //设置是能可以连线
     }),
     getters: {},
     actions: {
         addDevices(device: CheckData.Device[]) {
-            this.devices.push(...device);
+            this.devices.push(...device)
         },
         setPlan(plan: Plan.ResPlan) {
             this.plan = plan
         },
         clearDevices() {
-            this.devices = [];
+            this.devices = []
         },
         initSelectTestItems() {
             const appSceneStore = useAppSceneStore()
@@ -61,7 +66,6 @@ export const useCheckStore = defineStore(CHECK_STORE_KEY, {
         },
         setNodesConnectable(nodesConnectable: boolean) {
             this.nodesConnectable = nodesConnectable
-        },
-
         }
-});
+    }
+})

frontend/src/stores/modules/dict.ts

@@ -5,11 +5,9 @@ import { DICT_STORE_KEY } from '@/stores/constant'
 // 模拟数据
 //import dictData from '@/api/system/dictData'
 
-
+export const useDictStore = defineStore(DICT_STORE_KEY, {
-export const useDictStore = defineStore({
-    id: DICT_STORE_KEY,
     state: () => ({
-        dictData: [] as Dict[],
+        dictData: [] as Dict[]
     }),
     getters: {},
     actions: {
@@ -27,7 +25,7 @@ export const useDictStore = defineStore({
         // 初始化获取全部字典数据并缓存
         async initDictData(initData: Dict[]) {
             this.dictData = initData
+        }
     },
-    },
+    persist: piniaPersistConfig(DICT_STORE_KEY)
-    persist: piniaPersistConfig(DICT_STORE_KEY),
 })

frontend/src/stores/modules/global.ts

@@ -1,17 +1,16 @@
-import { defineStore } from "pinia";
+import { defineStore } from 'pinia'
-import { type GlobalState } from "@/stores/interface";
+import { type GlobalState } from '@/stores/interface'
-import { DEFAULT_PRIMARY} from "@/config";
+import { DEFAULT_PRIMARY } from '@/config'
-import piniaPersistConfig from "@/stores/helper/persist";
+import piniaPersistConfig from '@/stores/helper/persist'
-import {GLOBAL_STORE_KEY} from "@/stores/constant";
+import { GLOBAL_STORE_KEY } from '@/stores/constant'
 
-export const useGlobalStore = defineStore({
+export const useGlobalStore = defineStore(GLOBAL_STORE_KEY, {
-  id: GLOBAL_STORE_KEY,
     // 修改默认值之后，需清除 localStorage 数据
     state: (): GlobalState => ({
         // 布局模式 (纵向：vertical | 经典：classic | 横向：transverse | 分栏：columns)
-    layout: "transverse",
+        layout: 'transverse',
         // element 组件大小
-    assemblySize: "default",
+        assemblySize: 'default',
         // 当前系统语言
         language: null,
         // 当前页面是否全屏
@@ -42,14 +41,13 @@ export const useGlobalStore = defineStore({
         tabsIcon: true,
         // 页脚
         footer: false
-  
     }),
     getters: {},
     actions: {
         // Set GlobalState
         setGlobalState(...args: ObjToKeyValArray<GlobalState>) {
-      this.$patch({ [args[0]]: args[1] });
+            this.$patch({ [args[0]]: args[1] })
         }
     },
     persist: piniaPersistConfig(GLOBAL_STORE_KEY)
-});
+})

frontend/src/stores/modules/keepAlive.ts

@@ -1,24 +1,23 @@
-import {defineStore} from "pinia";
+import { defineStore } from 'pinia'
-import {KeepAliveState} from "@/stores/interface";
+import { type KeepAliveState } from '@/stores/interface'
 import { KEEP_ALIVE_STORE_KEY } from '@/stores/constant'
 
-export const useKeepAliveStore = defineStore({
+export const useKeepAliveStore = defineStore(KEEP_ALIVE_STORE_KEY, {
-  id: KEEP_ALIVE_STORE_KEY,
     state: (): KeepAliveState => ({
         keepAliveName: []
     }),
     actions: {
         // Add KeepAliveName
         async addKeepAliveName(name: string) {
-      !this.keepAliveName.includes(name) && this.keepAliveName.push(name);
+            !this.keepAliveName.includes(name) && this.keepAliveName.push(name)
         },
         // Remove KeepAliveName
         async removeKeepAliveName(name: string) {
-      this.keepAliveName = this.keepAliveName.filter(item => item !== name);
+            this.keepAliveName = this.keepAliveName.filter(item => item !== name)
         },
         // Set KeepAliveName
         async setKeepAliveName(keepAliveName: string[] = []) {
-      this.keepAliveName = keepAliveName;
+            this.keepAliveName = keepAliveName
         }
     }
-});
+})

frontend/src/stores/modules/mode.ts

@@ -1,29 +1,17 @@
 // src/stores/modules/mode.ts
-import { defineStore } from 'pinia';
+import { defineStore } from 'pinia'
-
-// export const useModeStore = defineStore('mode', {
-//   state: () => ({
-//     currentMode: '' as string,
-//   }),
-//   actions: {
-//     setCurrentMode(modeName: string) {
-//       this.currentMode = modeName;
-//     },
-//   },
-// });
-
 
 export const useModeStore = defineStore('mode', {
     state: () => ({
-      currentMode: localStorage.getItem('currentMode') || '' as string,
+        currentMode: localStorage.getItem('currentMode') || ('' as string)
     }),
     actions: {
         setCurrentMode(modeName: string) {
-        this.currentMode = modeName;
+            this.currentMode = modeName
-        localStorage.setItem('currentMode', modeName); // 保存到 localStorage
+            localStorage.setItem('currentMode', modeName) // 保存到 localStorage
-      },
+        }
-    },
+    }
-  });
+})
 
   export const useAppSceneStore = defineStore('scene', {
     state: () => ({

frontend/src/stores/modules/tabs.ts

@@ -1,81 +1,77 @@
-import router from "@/routers";
+import router from '@/routers'
-import { defineStore } from "pinia";
+import { defineStore } from 'pinia'
-import { getUrlWithParams } from "@/utils";
+import { getUrlWithParams } from '@/utils'
-import { useKeepAliveStore } from "./keepAlive";
+import { useKeepAliveStore } from './keepAlive'
-import { TabsState, TabsMenuProps } from "@/stores/interface";
+import type { TabsMenuProps, TabsState } from '@/stores/interface'
-import piniaPersistConfig from "@/stores/helper/persist";
+import { TABS_STORE_KEY } from '@/stores/constant'
-import {TABS_STORE_KEY} from "@/stores/constant";
 
-const keepAliveStore = useKeepAliveStore();
+const keepAliveStore = useKeepAliveStore()
 
-export const useTabsStore = defineStore({
+export const useTabsStore = defineStore(TABS_STORE_KEY, {
-  id: TABS_STORE_KEY,
     state: (): TabsState => ({
         tabsMenuList: []
     }),
     actions: {
         // Add Tabs
         async addTabs(tabItem: TabsMenuProps) {
-
             if (this.tabsMenuList.every(item => item.path !== tabItem.path)) {
                 if (tabItem?.unshift) {
-          this.tabsMenuList.unshift(tabItem);
+                    this.tabsMenuList.unshift(tabItem)
                 } else {
-          this.tabsMenuList.push(tabItem);
+                    this.tabsMenuList.push(tabItem)
-
                 }
             }
             if (!keepAliveStore.keepAliveName.includes(tabItem.name) && tabItem.isKeepAlive) {
-        keepAliveStore.addKeepAliveName(tabItem.name);
+                await keepAliveStore.addKeepAliveName(tabItem.name)
             }
         },
         // Remove Tabs
         async removeTabs(tabPath: string, isCurrent: boolean = true) {
             if (isCurrent) {
                 this.tabsMenuList.forEach((item, index) => {
-          if (item.path !== tabPath) return;
+                    if (item.path !== tabPath) return
-          const nextTab = this.tabsMenuList[index + 1] || this.tabsMenuList[index - 1];
+                    const nextTab = this.tabsMenuList[index + 1] || this.tabsMenuList[index - 1]
-          if (!nextTab) return;
+                    if (!nextTab) return
-          router.push(nextTab.path);
+                    router.push(nextTab.path)
-        });
+                })
             }
-      this.tabsMenuList = this.tabsMenuList.filter(item => item.path !== tabPath);
+            this.tabsMenuList = this.tabsMenuList.filter(item => item.path !== tabPath)
             // remove keepalive
-      const tabItem = this.tabsMenuList.find(item => item.path === tabPath);
+            const tabItem = this.tabsMenuList.find(item => item.path === tabPath)
-      tabItem?.isKeepAlive && keepAliveStore.removeKeepAliveName(tabItem.name);
+            tabItem?.isKeepAlive && (await keepAliveStore.removeKeepAliveName(tabItem.name))
         },
         // Close Tabs On Side
-    async closeTabsOnSide(path: string, type: "left" | "right") {
+        async closeTabsOnSide(path: string, type: 'left' | 'right') {
-      const currentIndex = this.tabsMenuList.findIndex(item => item.path === path);
+            const currentIndex = this.tabsMenuList.findIndex(item => item.path === path)
             if (currentIndex !== -1) {
-        const range = type === "left" ? [0, currentIndex] : [currentIndex + 1, this.tabsMenuList.length];
+                const range = type === 'left' ? [0, currentIndex] : [currentIndex + 1, this.tabsMenuList.length]
                 this.tabsMenuList = this.tabsMenuList.filter((item, index) => {
-          return index < range[0] || index >= range[1] || !item.close;
+                    return index < range[0] || index >= range[1] || !item.close
-        });
+                })
             }
             // set keepalive
-      const KeepAliveList = this.tabsMenuList.filter(item => item.isKeepAlive);
+            const KeepAliveList = this.tabsMenuList.filter(item => item.isKeepAlive)
-      keepAliveStore.setKeepAliveName(KeepAliveList.map(item => item.name));
+            await keepAliveStore.setKeepAliveName(KeepAliveList.map(item => item.name))
         },
         // Close MultipleTab
         async closeMultipleTab(tabsMenuValue?: string) {
             this.tabsMenuList = this.tabsMenuList.filter(item => {
-        return item.path === tabsMenuValue || !item.close;
+                return item.path === tabsMenuValue || !item.close
-      });
+            })
             // set keepalive
-      const KeepAliveList = this.tabsMenuList.filter(item => item.isKeepAlive);
+            const KeepAliveList = this.tabsMenuList.filter(item => item.isKeepAlive)
-      keepAliveStore.setKeepAliveName(KeepAliveList.map(item => item.name));
+            await keepAliveStore.setKeepAliveName(KeepAliveList.map(item => item.name))
         },
         // Set Tabs
         async setTabs(tabsMenuList: TabsMenuProps[]) {
-      this.tabsMenuList = tabsMenuList;
+            this.tabsMenuList = tabsMenuList
         },
         // Set Tabs Title
         async setTabsTitle(title: string) {
             this.tabsMenuList.forEach(item => {
-        if (item.path == getUrlWithParams()) item.title = title;
+                if (item.path == getUrlWithParams()) item.title = title
-      });
+            })
         }
     }
     // persist: piniaPersistConfig(TABS_STORE_KEY)
-});
+})

frontend/src/stores/modules/user.ts

@@ -1,36 +1,57 @@
-import {defineStore} from "pinia";
+import { defineStore } from 'pinia'
-import {UserState} from "@/stores/interface";
+import { type UserState } from '@/stores/interface'
-import piniaPersistConfig from "@/stores/helper/persist";
+import piniaPersistConfig from '@/stores/helper/persist'
-import {USER_STORE_KEY} from "@/stores/constant";
+import { USER_STORE_KEY } from '@/stores/constant'
+import { logoutApi } from '@/api/user/login'
+import { useAuthStore } from '@/stores/modules/auth'
+import { useAppSceneStore, useModeStore } from '@/stores/modules/mode'
+import { useDictStore } from '@/stores/modules/dict'
 
-export const useUserStore = defineStore({
+export const useUserStore = defineStore(USER_STORE_KEY, {
-  id: USER_STORE_KEY,
     state: (): UserState => ({
-    accessToken: "",
+        accessToken: '',
-    refreshToken: "",
+        refreshToken: '',
         isRefreshToken: false,
         exp: Number(0),
-    userInfo: {id:"", name: "" ,loginName:""},
+        userInfo: { id: '', name: '', loginName: '' }
     }),
     getters: {},
     actions: {
         // Set Token
         setAccessToken(accessToken: string) {
-      this.accessToken = accessToken;
+            this.accessToken = accessToken
         },
         setRefreshToken(refreshToken: string) {
-      this.refreshToken = refreshToken;
+            this.refreshToken = refreshToken
         },
         setIsRefreshToken(isRefreshToken: boolean) {
-      this.isRefreshToken = isRefreshToken;
+            this.isRefreshToken = isRefreshToken
         },
         // Set setUserInfo
-    setUserInfo(userInfo: UserState["userInfo"]) {
+        setUserInfo(userInfo: UserState['userInfo']) {
-      this.userInfo = userInfo;
+            this.userInfo = userInfo
         },
         setExp(exp: number) {
-      this.exp = exp;
+            this.exp = exp
+        },
+        async logout() {
+            const authStore = useAuthStore()
+            const modeStore = useModeStore()
+            const appSceneStore = useAppSceneStore()
+            const dictStore = useDictStore()
+            // 1.执行退出登录接口
+            await logoutApi()
+            // 2.清除 Token
+            this.setAccessToken('')
+            this.setRefreshToken('')
+            this.setExp(0)
+            this.setUserInfo({ id: '', name: '', loginName: '' })
+            this.setIsRefreshToken(false)
+            dictStore.setDictData([])
+            modeStore.setCurrentMode('')
+            appSceneStore.setCurrentMode('')
+            await authStore.resetAuthStore()
         }
     },
-  persist: piniaPersistConfig(USER_STORE_KEY),
+    persist: piniaPersistConfig(USER_STORE_KEY)
-});
+})

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次

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

@@ -8,7 +8,7 @@
                 :prevent-scrolling="true" :fit-view="true" :min-zoom="1" :max-zoom="1"
                 :nodesConnectable="checkStore.nodesConnectable" :elements-selectable="false" auto-connect
                 @connect="handleConnect" @connect-start="handleConnectStart" @connect-end="handleConnectEnd"
-                @pane-ready="onPaneReady" v-on:pane-mouse-move="false"></VueFlow>
+                @pane-ready="onPaneReady" @node-double-click="handleNodeDoubleClick" v-on:pane-mouse-move="false"></VueFlow>
         </div>
 
         <!-- 底部操作按钮 -->
@@ -36,6 +36,8 @@ import CustomEdge from './RemoveableEdge.vue' // 导入自定义连接线组件
 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)
@@ -68,12 +70,144 @@ const prop = defineProps({
 const dialogHeight = ref(600)
 
 // 初始化 VueFlow，注册自定义连线类型
-const { edges, setViewport } = useVueFlow({
+const { edges, setViewport,removeEdges  } = useVueFlow({
     edgeTypes: {
         default: CustomEdge
     }
 })
 
+
+const handleNodeDoubleClick = (event: any) => {
+  const { node } = event
+  
+  // 判断节点类型
+  if (node.type === 'input') {
+    // 被检通道节点，检查是否已经连接
+    const isConnected = edges.value.some(edge => edge.source === node.id)
+    
+    if (isConnected) {
+      ElMessage.warning('该被检通道已经连接，不能重复连接')
+      return
+    }
+    
+    // 寻找未连接的标准通道节点（优先寻找未被连接的标准通道）
+    const targetNodes = nodes.value.filter(n => n.type === 'output')
+    
+    // 首先尝试连接尚未被连接的标准通道
+    for (const targetNode of targetNodes) {
+      const isTargetConnected = edges.value.some(edge => edge.target === targetNode.id)
+      
+      if (!isTargetConnected) {
+        // 检查是否已存在连接（虽然这里应该不会存在）
+        const isAlreadyConnected = edges.value.some(edge => 
+          edge.source === node.id && edge.target === targetNode.id
+        )
+        
+        if (!isAlreadyConnected) {
+          const newEdge = {
+            id: `edge-${node.id}-${targetNode.id}`,
+            source: node.id,
+            target: targetNode.id,
+            type: 'default'
+          }
+          edges.value.push(newEdge)
+          return
+        }
+      }
+    }
+    
+    // 如果所有标准通道都已被连接，尝试连接已被连接但连接的是其他被检通道的标准通道
+    for (const targetNode of targetNodes) {
+      // 检查是否已存在连接
+      const isAlreadyConnected = edges.value.some(edge => 
+        edge.source === node.id && edge.target === targetNode.id
+      )
+      
+      if (!isAlreadyConnected) {
+        const isTargetConnected = edges.value.some(edge => edge.target === targetNode.id)
+        
+        // 如果标准通道已被连接，但不是连接到当前被检通道，则不能连接
+        if (isTargetConnected) {
+          continue
+        }
+        
+        const newEdge = {
+          id: `edge-${node.id}-${targetNode.id}`,
+          source: node.id,
+          target: targetNode.id,
+          type: 'default'
+        }
+        edges.value.push(newEdge)
+        ElMessage.success(`已自动连接到 ${targetNode.data.label.children[1].children[0].children[0].replace('设备名称：', '')} 的标准通道`)
+        return
+      }
+    }
+    
+    ElMessage.warning('没有可用的标准通道进行连接')
+  } else if (node.type === 'output') {
+    // 标准通道节点，检查是否已经连接
+    const isConnected = edges.value.some(edge => edge.target === node.id)
+    
+    if (isConnected) {
+      ElMessage.warning('该标准通道已经连接，不能重复连接')
+      return
+    }
+    
+    // 寻找未连接的被检通道节点（优先寻找未被连接的被检通道）
+    const sourceNodes = nodes.value.filter(n => n.type === 'input')
+    
+    // 首先尝试连接尚未被连接的被检通道
+    for (const sourceNode of sourceNodes) {
+      const isSourceConnected = edges.value.some(edge => edge.source === sourceNode.id)
+      
+      if (!isSourceConnected) {
+        // 检查是否已存在连接（虽然这里应该不会存在）
+        const isAlreadyConnected = edges.value.some(edge => 
+          edge.source === sourceNode.id && edge.target === node.id
+        )
+        
+        if (!isAlreadyConnected) {
+          const newEdge = {
+            id: `edge-${sourceNode.id}-${node.id}`,
+            source: sourceNode.id,
+            target: node.id,
+            type: 'default'
+          }
+          edges.value.push(newEdge)
+          return
+        }
+      }
+    }
+    
+    // 如果所有被检通道都已被连接，尝试连接已被连接但连接的是其他标准通道的被检通道
+    for (const sourceNode of sourceNodes) {
+      // 检查是否已存在连接
+      const isAlreadyConnected = edges.value.some(edge => 
+        edge.source === sourceNode.id && edge.target === node.id
+      )
+      
+      if (!isAlreadyConnected) {
+        const isSourceConnected = edges.value.some(edge => edge.source === sourceNode.id)
+        
+        // 如果被检通道已被连接，但不是连接到当前标准通道，则不能连接
+        if (isSourceConnected) {
+          continue
+        }
+        
+        const newEdge = {
+          id: `edge-${sourceNode.id}-${node.id}`,
+          source: sourceNode.id,
+          target: node.id,
+          type: 'default'
+        }
+        edges.value.push(newEdge)
+        return
+      }
+    }
+    
+    ElMessage.warning('没有可用的被检通道进行连接')
+  }
+}
 // 初始化时锁定画布位置
 const onPaneReady = () => {
     setViewport({ x: 0, y: 0, zoom: 1 })
@@ -81,7 +215,6 @@ const onPaneReady = () => {
 
 // 提取公共的label渲染函数
 const createLabel = (device:any, Key: number) => {
-    console.log('-=-=',device)
     return h(
         'div',
         {
@@ -163,50 +296,125 @@ const createLabel3 = (text: string) => {
 
 const handleConnectStart = (params: any) => {
     onPaneReady()
+    
 }
 
+// const handleConnectEnd = (params: any) => {
+//     console.log('handleConnectEnd',edges.value,edges.value.length)
+//     onPaneReady()
+// }
+
+// const handleConnect = (params: any) => {
+//     const sourceNode = nodes.value.find(node => node.id === params.source)
+//     const targetNode = nodes.value.find(node => node.id === params.target)
+//     const isValidConnection = sourceNode?.type === 'input' && targetNode?.type === 'output'
+//      if (!isValidConnection) {
+//         removeEdge(params)
+//         ElMessage.warning('只能从被检通道连接到标准通道')
+//         return
+//     }
+      
+
+//     // 过滤掉当前连接，检查是否还有重复的
+//     const existingEdges = edges.value.filter(edge => edge.source === params.source || edge.target === params.target)
+   
+//     // 如果同源或同目标的连接超过1个，说明有重复
+//     if (existingEdges.length > 1) {
+//         const duplicateSource = existingEdges.filter(edge => edge.source === params.source).length > 1
+//         const duplicateTarget = existingEdges.filter(edge => edge.target === params.target).length > 1
+
+//         if (duplicateSource) {
+//             removeEdge(params)
+//             ElMessage.warning('该被检通道已经连接，不能重复连接')
+//             return
+//         }
+
+//         if (duplicateTarget) {
+//             removeEdge(params)
+//             ElMessage.warning('该标准通道已经连接，不能重复连接')
+//             return
+//         }
+//     } 
+// }
+
+// // 删除不合法连接
+// const removeEdge = (params: any) => {
+//     // console.log('删除不合法连接:', params);
+//     // console.log('删除连接信息:', edges.value);
+//     // console.log('11111===', edges.value.length);
+//     const edgeIndex = edges.value.findIndex(edge => edge.source === params.source && edge.target === params.target)
+//     console.log('删除连接索引:', edgeIndex);
+//      if (edgeIndex !== -1) {
+//          edges.value.splice(edgeIndex , 1)
+//      }
+ 
+// }
+
+
+
+// 添加一个响应式变量来存储需要删除的连接信息
+const pendingRemoveEdge = ref<any>(null)
+
 const handleConnectEnd = (params: any) => {
+    // 在连接结束时检查是否有待删除的连接
+    if (pendingRemoveEdge.value) {
+        removeEdge(pendingRemoveEdge.value)
+        pendingRemoveEdge.value = null // 清空待删除连接
+    }
+    
     onPaneReady()
 }
 
 const handleConnect = (params: any) => {
     const sourceNode = nodes.value.find(node => node.id === params.source)
     const targetNode = nodes.value.find(node => node.id === params.target)
-
-    // 连接规则验证
     const isValidConnection = sourceNode?.type === 'input' && targetNode?.type === 'output'
     
     if (!isValidConnection) {
-        removeEdge(params)
+        // 设置待删除连接而不是立即删除
+        pendingRemoveEdge.value = params
         ElMessage.warning('只能从被检通道连接到标准通道')
         return
     }
 
-    // 过滤掉当前连接，检查是否还有重复的
+    // 检查是否已经存在完全相同的连接（精确匹配源和目标）
-    const existingEdges = edges.value.filter(edge => edge.source === params.source || edge.target === params.target)
+    const isAlreadyConnected = edges.value.some(edge => 
+        edge.source === params.source && edge.target === params.target
+    )
     
-    // 如果同源或同目标的连接超过1个，说明有重复
+    if (isAlreadyConnected) {
-    if (existingEdges.length > 1) {
+        // 设置待删除连接而不是立即删除
-        const duplicateSource = existingEdges.filter(edge => edge.source === params.source).length > 1
+        pendingRemoveEdge.value = params
-        const duplicateTarget = existingEdges.filter(edge => edge.target === params.target).length > 1
+        ElMessage.warning('这两个通道已经连接，不能重复连接')
+        return
+    }
 
-        if (duplicateSource) {
+    // 检查源节点是否已经被连接（一个被检通道只能连接一个标准通道）
-            removeEdge(params)
+    const isSourceConnected = edges.value.some(edge => edge.source === params.source)
+    if (isSourceConnected) {
+        // 设置待删除连接而不是立即删除
+        pendingRemoveEdge.value = params
         ElMessage.warning('该被检通道已经连接，不能重复连接')
         return
     }
 
-        if (duplicateTarget) {
+    // 检查目标节点是否已经被连接（一个标准通道只能连接一个被检通道）
-            removeEdge(params)
+    const isTargetConnected = edges.value.some(edge => edge.target === params.target)
+    if (isTargetConnected) {
+        // 设置待删除连接而不是立即删除
+        pendingRemoveEdge.value = params
         ElMessage.warning('该标准通道已经连接，不能重复连接')
         return
     }
-    }
+    
+    // 如果没有问题，清空待删除连接
+    pendingRemoveEdge.value = null
 }
 
 // 删除不合法连接
 const removeEdge = (params: any) => {
     const edgeIndex = edges.value.findIndex(edge => edge.source === params.source && edge.target === params.target)
+
     if (edgeIndex !== -1) {
         edges.value.splice(edgeIndex, 1)
     }
@@ -220,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)
@@ -240,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}
@@ -350,19 +580,19 @@ const generateChannelMapping = () => {
 
 
 // 计算基于 dialogWidth 的位置参数 - 确保最小距离
-const deviceWidthVal = computed(() => {
+ const standardWidthVal = computed(() => {
   return Math.max(0, 50)
  })
  
  const inputChannelXVal = computed(() => {
-  return Math.max(300, deviceWidthVal.value + 300)
+  return Math.max(300, standardWidthVal.value + 300)
  })
  
  const outputChannelXVal = computed(() => {
-  return Math.max(650, prop.dialogWidth - 470)
+  return Math.max(600, prop.dialogWidth - 500)
  })
  
-const standardWidthVal = computed(() => {
+ const deviceWidthVal = computed(() => {
   return Math.max(800, prop.dialogWidth - 350)
  })
 
@@ -404,10 +634,10 @@ const createNodes = (device: Device.ResPqDev[], standardDev: StandardDevice.ResP
     // const inputChannelX = 350
     // const outputChannelX = 1050
     // const standardWidth = 1170
-    const deviceWidth = deviceWidthVal.value
-    const inputChannelX = inputChannelXVal.value
-    const outputChannelX = outputChannelXVal.value
    const standardWidth = standardWidthVal.value
+   const outputChannelX = inputChannelXVal.value
+   const inputChannelX = outputChannelXVal.value
+   const deviceWidth = deviceWidthVal.value
 
     // 添加被检通道
     // let currentYPosition = 50; // 初始Y位置
@@ -463,7 +693,7 @@ const createNodes = (device: Device.ResPqDev[], standardDev: StandardDevice.ResP
                 type: 'input',
                 data: { label: createLabel3(`被检通道${channelNum}`+ statusText) },
                 position: { x: inputChannelX, y: yPosition + index * 50 },
-                sourcePosition: 'right',
+                sourcePosition: 'left',
                 style: { width: '160px', border: 'none', boxShadow: 'none' }
             });
 
@@ -499,7 +729,7 @@ const createNodes = (device: Device.ResPqDev[], standardDev: StandardDevice.ResP
                 type: 'output',
                 data: { label: createLabel3(`标准通道${i}`) },
                 position: { x: outputChannelX, y: yPosition2 + (i - 1) * 50 },
-                targetPosition: 'left',
+                targetPosition: 'right',
                 style: { width: '120px', border: 'none', boxShadow: 'none' }
             });
 

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

@@ -11,13 +11,7 @@
     >
       <el-table-column type="index" label="序号" width="70" fixed="left"/>
 
-      <el-table-column prop="dataA" :label="'被检设备'">
+      
-        <el-table-column prop="timeDev" label="数据时间" width="200"/>
-        <el-table-column prop="uaDev" :label="'A相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.uaDev != null"/>
-        <el-table-column prop="ubDev" :label="setB+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ubDev != null"/>
-        <el-table-column prop="ucDev" :label="'C相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ucDev != null"/>
-        <el-table-column prop="utDev" :label="setT+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData[0]?.utDev != null"/>
-      </el-table-column>
       <el-table-column prop="dataA" :label="'标准设备'">
         <el-table-column prop="timeStdDev" label="数据时间" width="200"/>
         <el-table-column prop="uaStdDev" :label="'A相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.uaStdDev != null"/>
@@ -25,6 +19,13 @@
         <el-table-column prop="ucStdDev" :label="'C相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ucStdDev != null"/>
         <el-table-column prop="utStdDev" :label="setT+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData[0]?.utStdDev != null"/>
       </el-table-column>
+      <el-table-column prop="dataA" :label="'被检设备'">
+        <el-table-column prop="timeDev" label="数据时间" width="200"/>
+        <el-table-column prop="uaDev" :label="'A相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.uaDev != null"/>
+        <el-table-column prop="ubDev" :label="setB+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ubDev != null"/>
+        <el-table-column prop="ucDev" :label="'C相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ucDev != null"/>
+        <el-table-column prop="utDev" :label="setT+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData[0]?.utDev != null"/>
+      </el-table-column>
     </el-table>
   </div>
 </template>

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

@@ -8,19 +8,24 @@
     >
 <!--      <el-table-column type="index" label="序号" width="70" fixed="left" />-->
       <el-table-column label="A相" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataA">
-        <el-table-column prop="stdA" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+        
-          <template #default="{ row }">
-            {{ row.dataA.data }}
-          </template>
-        </el-table-column>
         <el-table-column prop="dataA" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
           <template #default="{ row }">
             {{ row.dataA.resultData }}
           </template>
         </el-table-column>
+        <el-table-column prop="stdA" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+          <template #default="{ row }">
+            {{ row.dataA.data }}
+          </template>
+        </el-table-column>
         <el-table-column prop="isDataA" label="检测结果">
           <template #default="{ row }">
-            <el-tooltip effect="dark" placement="bottom">
+             <template v-if="row.dataA.isData === 4 || row.dataA.isData === 5">
+              <el-tag type="warning" v-if="row.dataA.isData === 4">/</el-tag>
+              <el-tag type="info" v-if="row.dataA.isData === 5">-</el-tag>
+            </template>
+            <el-tooltip v-else effect="dark" placement="bottom">
               <template #content>
                 误差范围：{{ addPercentSigns(row.dataA.radius, row.dataA.unit) }}
                 <br/>
@@ -28,26 +33,30 @@
               </template>
               <el-tag type="success" v-if="row.dataA.isData === 1">符合</el-tag>
               <el-tag type="danger" v-if="row.dataA.isData === 2">不符合</el-tag>
-              <el-tag type="warning" v-if="row.dataA.isData === 4">/</el-tag>
+           
-              <el-tag type="info" v-if="row.dataA.isData === 5">-</el-tag>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table-column>
       <el-table-column :label="setB" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataB">
-        <el-table-column prop="stdB" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+        
-          <template #default="{ row }">
-            {{ row.dataB.data }}
-          </template>
-        </el-table-column>
         <el-table-column prop="dataB" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
           <template #default="{ row }">
             {{ row.dataB.resultData }}
           </template>
         </el-table-column>
+        <el-table-column prop="stdB" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+          <template #default="{ row }">
+            {{ row.dataB.data }}
+          </template>
+        </el-table-column>
         <el-table-column prop="isDataB" label="检测结果">
           <template #default="{ row }">
-            <el-tooltip effect="dark" placement="bottom">
+            <template v-if="row.dataB.isData === 4 || row.dataB.isData === 5">
+              <el-tag type="warning" v-if="row.dataB.isData === 4">/</el-tag>
+              <el-tag type="info" v-if="row.dataB.isData === 5">-</el-tag>
+            </template>
+            <el-tooltip  v-else effect="dark" placement="bottom">
               <template #content>
                 误差范围：{{ addPercentSigns(row.dataB.radius, row.dataB.unit) }}
                 <br/>
@@ -55,26 +64,29 @@
               </template>
               <el-tag type="success" v-if="row.dataB.isData === 1">符合</el-tag>
               <el-tag type="danger" v-if="row.dataB.isData === 2">不符合</el-tag>
-              <el-tag type="warning" v-if="row.dataB.isData === 4">/</el-tag>
-              <el-tag type="info" v-if="row.dataB.isData === 5">-</el-tag>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="C相" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataC">
-        <el-table-column prop="stdC" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+        
-          <template #default="{ row }">
-            {{ row.dataC.data }}
-          </template>
-        </el-table-column>
         <el-table-column prop="dataC" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
           <template #default="{ row }">
             {{ row.dataC.resultData }}
           </template>
         </el-table-column>
+        <el-table-column prop="stdC" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+          <template #default="{ row }">
+            {{ row.dataC.data }}
+          </template>
+        </el-table-column>
         <el-table-column prop="isDataC" label="检测结果">
           <template #default="{ row }">
-            <el-tooltip effect="dark" placement="bottom">
+            <template v-if="row.dataC.isData === 4 || row.dataC.isData === 5">
+              <el-tag type="warning" v-if="row.dataC.isData === 4">/</el-tag>
+              <el-tag type="info" v-if="row.dataC.isData === 5">-</el-tag>
+            </template>
+            <el-tooltip v-else effect="dark" placement="bottom">
               <template #content>
                 误差范围：{{ addPercentSigns(row.dataC.radius, row.dataC.unit) }}
                 <br/>
@@ -82,26 +94,29 @@
               </template>
               <el-tag type="success" v-if="row.dataC.isData === 1">符合</el-tag>
               <el-tag type="danger" v-if="row.dataC.isData === 2">不符合</el-tag>
-              <el-tag type="warning" v-if="row.dataC.isData === 4">/</el-tag>
-              <el-tag type="info" v-if="row.dataC.isData === 5">-</el-tag>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table-column>
       <el-table-column :label="setT" v-if="prop.tableData[0].dataT">
-        <el-table-column prop="stdT" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+       
-          <template #default="{ row }">
-            {{ row.dataT.data }}
-          </template>
-        </el-table-column>
         <el-table-column prop="dataT" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
           <template #default="{ row }">
             {{ row.dataT.resultData }}
           </template>
+        </el-table-column>
+         <el-table-column prop="stdT" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+          <template #default="{ row }">
+            {{ row.dataT.data }}
+          </template>
         </el-table-column>
         <el-table-column prop="isDataT" label="检测结果">
           <template #default="{ row }">
-            <el-tooltip effect="dark" placement="bottom">
+            <template v-if="row.dataT.isData === 4 || row.dataT.isData === 5">
+              <el-tag type="warning" v-if="row.dataT.isData === 4">/</el-tag>
+              <el-tag type="info" v-if="row.dataT.isData === 5">-</el-tag>
+            </template>
+            <el-tooltip v-else effect="dark" placement="bottom">
               <template #content>
                 误差范围：{{ addPercentSigns(row.dataT.radius, row.dataT.unit) }}
                 <br/>
@@ -109,8 +124,7 @@
               </template>
               <el-tag type="success" v-if="row.dataT.isData === 1">符合</el-tag>
               <el-tag type="danger" v-if="row.dataT.isData === 2">不符合</el-tag>
-              <el-tag type="warning" v-if="row.dataT.isData === 4">/</el-tag>
+    
-              <el-tag type="info" v-if="row.dataT.isData === 5">-</el-tag>
             </el-tooltip>
           </template>
         </el-table-column>

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

@@ -298,7 +298,7 @@ const initGetResult = async () => {
         scriptNameOptions.value = selectScript.value.map(item => ({
             label: item.scriptName,
             value: item.scriptName,
-            resultFlag: item.resultFlag
+            resultFlag: item.resultFlag?? 0
         }))
 
         // 默认选中第一个选项
@@ -322,7 +322,8 @@ const initScriptData = async () => {
     let response: any = await getScriptList({
         devId: formContent.deviceId,
         chnNum: formContent.chnNum,
-        num: formContent.num
+        num: formContent.num,
+        planId: checkStore.plan.id
     })
 
     // 格式化脚本数据
@@ -477,7 +478,8 @@ const handleNodeClick = (data: any) => {
             //.filter(item => item.code !== 'wave_data' && item.code !== 'FREQ')
             .map(item => ({
                 label: item.scriptName,
-                value: item.scriptName
+                value: item.scriptName,
+                resultFlag: item.resultFlag ?? 0
             }))
 
         // 每次选中录波数据时都重置为第一个选项并触发getResults
@@ -521,7 +523,6 @@ const getResults = async (code: any) => {
         }
         currentCheckItem.value = list[0]
         tesList.value = list
-        console.log('checkResultData:', tesList.value)
         checkResultData.value = res.data.resultMap
         rawTableData.value = res.data.rawDataMap
     })
@@ -562,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('切换误差体系成功')
@@ -578,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('重新计算成功！')
@@ -603,16 +606,13 @@ defineExpose({
     }
     
     // 根据 resultFlag 设置不同颜色
-    &[data-result-flag="1"] {
-      color: #67c23a; // 绿色 - 符合
-    }
     
     &[data-result-flag="2"] {
-      color: #f56c6c; // 红色 - 不符合
+      color: #ee6666; // 红色 - 不符合
     }
     
     &[data-result-flag="4"] {
-      color: #e6a23c; // 橙色 - 警告
+      color: #fac858; // 橙色 - 警告
     }
   }
 }

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

@@ -563,6 +563,7 @@ watch(ts, function (newValue, oldValue) {
 
 // 定义一个初始化参数的方法
 function initializeParameters() {
+  collapseActiveName.value = '1'
   activeIndex.value = 0
   step1.value = 'wait'
   step2.value = 'wait'

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 }">
@@ -69,7 +69,7 @@
                                             "
                         :color="row.devices[index1].chnResult[index2].color"
                         size="small"
-                        @click="handleClick(row, chnItem, row.scriptType)"
+                        @click="handleClick(row, chnItem.split('-')[1], row.scriptType)"
                         style="align-self: center"
                     >
                       <el-icon
@@ -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()
     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
 
     // 等待组件渲染完成
@@ -323,7 +322,8 @@ const handleSubmitAgain = async () => {
     }
     stepsTotalNum.value = count + 1
 
-    // 通知子组件清空并重新初始化
+    // 等待组件渲染完成
+    await nextTick()
     if (preTestRef.value) {
         preTestRef.value.initializeParameters()
     }
@@ -342,7 +342,6 @@ const handleSubmitAgain = async () => {
         standardDevIds: standardDevIds.value,
         pairs: pairs.value,
         testItemList: [checkStore.selectTestItems.preTest, false, checkStore.selectTestItems.test],
-
         userId: userStore.userInfo.id
     })
 

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

@@ -17,7 +17,11 @@
                 <el-table-column prop="dataA" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
                 <el-table-column prop="isDataA" label="检测结果">
                     <template #default="scope">
-                        <el-tooltip effect="dark" placement="bottom">
+                         <template v-if="scope.row.isDataA === 4 || scope.row.isDataA === 5">
+                            <el-tag type="warning" v-if="scope.row.isDataA === 4">/</el-tag>
+                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+                        </template>
+                        <el-tooltip v-else effect="dark" placement="bottom">
                             <template #content>
                                 误差范围：{{ scope.row.maxErrorA }}
                                 <br />
@@ -25,8 +29,6 @@
                             </template>
                             <el-tag type="success" v-if="scope.row.isDataA === 1">符合</el-tag>
                             <el-tag type="danger" v-if="scope.row.isDataA === 2">不符合</el-tag>
-                            <el-tag type="warning" v-if="scope.row.isDataA === 4">/</el-tag>
-                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
                         </el-tooltip>
                     </template>
                 </el-table-column>
@@ -36,7 +38,11 @@
                 <el-table-column prop="dataB" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
                 <el-table-column prop="isDataB" label="检测结果">
                     <template #default="scope">
-                        <el-tooltip effect="dark" placement="bottom">
+                        <template v-if="scope.row.isDataB === 4 || scope.row.isDataB === 5"> 
+                             <el-tag type="warning" v-if="scope.row.isDataB === 4">/</el-tag>
+                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+                        </template>
+                        <el-tooltip v-else effect="dark" placement="bottom">
                             <template #content>
                                 误差范围：{{ scope.row.maxErrorB }}
                                 <br />
@@ -44,8 +50,7 @@
                             </template>
                             <el-tag type="success" v-if="scope.row.isDataB === 1">符合</el-tag>
                             <el-tag type="danger" v-if="scope.row.isDataB === 2">不符合</el-tag>
-                            <el-tag type="warning" v-if="scope.row.isDataB === 4">/</el-tag>
+                           
-                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
                         </el-tooltip>
                     </template>
                 </el-table-column>
@@ -55,7 +60,11 @@
                 <el-table-column prop="dataC" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
                 <el-table-column prop="isDataC" label="检测结果">
                     <template #default="scope">
-                        <el-tooltip effect="dark" placement="bottom">
+                        <template v-if="scope.row.isDataC === 4 || scope.row.isDataC === 5"> 
+                             <el-tag type="warning" v-if="scope.row.isDataC === 4">/</el-tag>
+                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+                        </template>
+                        <el-tooltip v-else effect="dark" placement="bottom">
                             <template #content>
                                 误差范围： {{ scope.row.maxErrorC }}
                                 <br />
@@ -63,8 +72,7 @@
                             </template>
                             <el-tag type="success" v-if="scope.row.isDataC === 1">符合</el-tag>
                             <el-tag type="danger" v-if="scope.row.isDataC === 2">不符合</el-tag>
-                            <el-tag type="warning" v-if="scope.row.isDataC === 4">/</el-tag>
+         
-                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
                         </el-tooltip>
                     </template>
                 </el-table-column>
@@ -75,7 +83,11 @@
                 <el-table-column prop="dataT" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
                 <el-table-column prop="isDataT" label="检测结果">
                     <template #default="scope">
-                        <el-tooltip effect="dark" placement="bottom">
+                        <template v-if="scope.row.isDataT === 4 || scope.row.isDataT === 5"> 
+                             <el-tag type="warning" v-if="scope.row.isDataT === 4">/</el-tag>
+                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+                        </template>
+                        <el-tooltip v-else effect="dark" placement="bottom">
                             <template #content>
                                 误差范围： {{ scope.row.maxErrorT }}
                                 <br />
@@ -83,8 +95,6 @@
                             </template>
                             <el-tag type="success" v-if="scope.row.isDataT === 1">符合</el-tag>
                             <el-tag type="danger" v-if="scope.row.isDataT === 2">不符合</el-tag>
-                            <el-tag type="warning" v-if="scope.row.isDataT === 4">/</el-tag>
-                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
                         </el-tooltip>
                     </template>
                 </el-table-column>

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/reportResultPopup.vue

@@ -8,7 +8,7 @@
         :close-on-click-modal="false"
         @close="handleClose"
     >
-        <el-tabs v-if="dialogVisible" v-model="activeName" @tab-click="handleTabClick">
+        <el-tabs v-if="dialogVisible" v-model="activeName" @tab-change="handleTabChange">
             <el-tab-pane
                 v-for="(result, index) in resultData"
                 :key="result.monitorId"
@@ -76,7 +76,7 @@
                             <el-text type="info">检测结论：</el-text>
                         </template>
                         <el-tag disable-transitions v-if="result.checkResult === 1" type="success">符合</el-tag>
-                        <el-tag disable-transitions v-else-if="result.checkResult === 2" type="danger">不符合</el-tag>
+                        <el-tag disable-transitions v-else-if="result.checkResult === 0" type="danger">不符合</el-tag>
                         <el-tag disable-transitions v-else-if="result.checkResult === 4" type="danger">无法比较</el-tag>
                     </el-descriptions-item>
                     <el-descriptions-item label-align="right">
@@ -114,9 +114,12 @@
                                 >
                                     符合
                                 </el-tag>
-                                <el-tag disable-transitions v-if="currentWhichTimeData.checkResult === 2" type="danger">
+                                <el-tag disable-transitions v-if="currentWhichTimeData.checkResult === 0" type="danger">
                                     不符合
                                 </el-tag>
+                                <el-tag disable-transitions v-if="currentWhichTimeData.checkResult === 4" type="danger">
+                                    无法比较
+                                </el-tag>
                             </div>
                         </template>
                         <el-option
@@ -128,7 +131,8 @@
                             <div style="display: flex; align-items: center; justify-content: space-between">
                                 <el-text>{{ '第' + item.time + '次' }}</el-text>
                                 <el-tag v-if="item.checkResult === 1" type="success">符合</el-tag>
-                                <el-tag v-if="item.checkResult === 2" type="danger">不符合</el-tag>
+                                <el-tag v-if="item.checkResult === 0" type="danger">不符合</el-tag>
+                                <el-tag v-if="item.checkResult === 4" type="danger">无法比较</el-tag>
                             </div>
                         </el-option>
                     </el-select>
@@ -146,7 +150,7 @@
                                 <el-tag disable-transitions v-if="submitSourceData.checkResult === 1" type="success">
                                     符合
                                 </el-tag>
-                                <el-tag disable-transitions v-if="submitSourceData.checkResult === 2" type="danger">
+                                <el-tag disable-transitions v-if="submitSourceData.checkResult === 0" type="danger">
                                     不符合
                                 </el-tag>
                                 <el-tag disable-transitions v-if="submitSourceData.checkResult === 4" type="info">
@@ -163,7 +167,8 @@
                             <div style="display: flex; align-items: center; justify-content: space-between">
                                 <el-text>{{ item.dataSourceName }}</el-text>
                                 <el-tag v-if="item.checkResult === 1" type="success">符合</el-tag>
-                                <el-tag v-if="item.checkResult === 2" type="danger">不符合</el-tag>
+                                <el-tag v-if="item.checkResult === 0" type="danger">不符合</el-tag>
+                                <el-tag v-if="item.checkResult === 4" type="danger">无法比较</el-tag>
                             </div>
                         </el-option>
                     </el-select>
@@ -228,8 +233,8 @@ const getResultData = async () => {
     dialogVisible.value = true
 }
 
-const handleTabClick = (tab: any) => {
+const handleTabChange = (name: any) => {
-    activeName.value = tab.name
+    activeName.value = name
 }
 const handleChooseClick = async () => {
     const currentResult = resultData.value[activeName.value]
@@ -245,7 +250,7 @@ const handleChooseClick = async () => {
             whichTimeData.value = Object.keys(resultSourceData.value).map(time => {
                 // 检测结果只要有一个合格就算合格
                 const checkResult = resultSourceData.value[time].find((item: any) => item.checkResult === 1)
-                return { time, checkResult: checkResult ? 1 : 2 }
+                return { time, checkResult: checkResult ? 1 : 0 }
             })
             currentWhichTimeData.value = whichTimeData.value.find((item: any) => item.time == currentResult.whichTime)
             sourceData.value = resultSourceData.value[currentResult.whichTime]

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,
@@ -958,7 +959,7 @@ const handleTest = async (val: string) => {
             checkStore.setCheckType(1)
             checkStore.initSelectTestItems()
             // 一键检测
-            if (testType === 'reTest') {
+            if (testType === 'reTest' && modeStore.currentMode != '比对式') {
                 ElMessageBox.confirm('请选择复检检测方式', '设备复检', {
                     distinguishCancelAndClose: true,
                     confirmButtonText: '不合格项复检',
@@ -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,25 +18,32 @@
                     <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'
 import { useAppSceneStore, useModeStore } from '@/stores/modules/mode' // 引入模式 store
 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
 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: '模拟式模块',
@@ -62,17 +69,18 @@ const modeList = [
 ]
 const handelOpen = async (item: any) => {
     if (!item.activated) {
-        ElMessage.warning(`${item.name}未激活`)
+        // 打开版本激活弹窗
+        versionRegisterRef.value?.openDialog()
         return
     }
     modeStore.setCurrentMode(item.code) // 将模式code存入 store
     const { data: scene } = await getCurrentScene() // 获取当前场景
     AppSceneStore.setCurrentMode(scene + '') //0：省级平台，1：设备出厂，2：研发自测
     await authStore.setShowMenu()
-    await authStore.getAuthMenuList()
+    await tabsStore.closeMultipleTab()
+    await initDynamicRouter()
     return
 }
-const handleSelect = (key: string, keyPath: string[]) => {}
 onMounted(() => {})
 </script>
 <style lang="scss" scoped>

frontend/src/views/log/index.vue

@@ -3,8 +3,8 @@
         <ProTable ref="proTable" :columns="columns" :request-api="getTableList">
             <!-- 表格 header 按钮 -->
             <template #tableHeader>
-                <el-button type="primary" :icon="DataAnalysis">分析</el-button>
+                <!--                <el-button type="primary" :icon="DataAnalysis">分析</el-button>-->
-                <el-button type="primary" :icon="Upload" @click="handleExport">导出csv</el-button>
+                <el-button type="primary" icon="Download" @click="handleExport">导出csv</el-button>
             </template>
         </ProTable>
     </div>
@@ -13,7 +13,6 @@
 // 根据实际路径调整
 import TimeControl from '@/components/TimeControl/index.vue'
 import ProTable from '@/components/ProTable/index.vue'
-import { DataAnalysis, Upload } from '@element-plus/icons-vue'
 import type { ColumnProps, ProTableInstance } from '@/components/ProTable/interface'
 import { reactive, ref } from 'vue'
 import { exportCsv, getAuditLog } from '@/api/system/log'

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,47 +78,21 @@
                                 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'">
-                            <el-select
+                            <el-input v-model="formContent.hardwareVersion" clearable placeholder="请输入固件版本" />
-                                v-model="formContent.hardwareVersion"
-                                clearable
-                                placeholder="请选择固件版本"
-                                filterable
-                                allow-create
-                            >
-                                <el-option
-                                    v-for="item in selectOptions['hardwareVersion']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
                         </el-form-item>
                         <el-form-item label="软件版本" prop="softwareVersion" v-if="scene === '0'">
-                            <el-select
+                            <el-input v-model="formContent.softwareVersion" clearable placeholder="请输入软件版本" />
-                                v-model="formContent.softwareVersion"
-                                clearable
-                                placeholder="请选择软件版本"
-                                filterable
-                                allow-create
-                            >
-                                <el-option
-                                    v-for="item in selectOptions['softwareVersion']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
                         </el-form-item>
                         <el-form-item label="定检日期" prop="inspectDate" v-if="MonIsShow">
                             <el-date-picker
                                 v-model="formContent.inspectDate"
                                 placeholder="请选择定检日期"
                                 :disabled-date="disabledDate"
-                                :disabled="formContent.importFlag == 1"
+                               
                             />
                         </el-form-item>
                         <el-divider>参数信息</el-divider>
@@ -154,7 +128,7 @@
                                 v-model="formContent.protocol"
                                 clearable
                                 placeholder="请选择通讯协议"
-                                :disabled="formContent.importFlag == 1"
+                               
                             >
                                 <el-option
                                     v-for="item in dictStore.getDictData('Protocol')"
@@ -165,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>
@@ -186,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">
@@ -194,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'">
@@ -218,55 +192,28 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="所属地市" prop="cityName" v-if="MonIsShow">
-                            <el-select
+                            <el-input
                                 v-model="formContent.cityName"
                                 clearable
-                                placeholder="请选择所属地市"
+                                placeholder="请输入所属地市"
-                                :disabled="formContent.importFlag == 1"
+                              
-                                filterable
-                                allow-create
-                            >
-                                <el-option
-                                    v-for="item in selectOptions['cityName']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
                             />
-                            </el-select>
                         </el-form-item>
                         <el-form-item label="所属供电公司" prop="gdName" v-if="MonIsShow">
-                            <el-select
+                            <el-input
                                 v-model="formContent.gdName"
                                 clearable
-                                placeholder="请选择所属供电公司"
+                                placeholder="请输入所属供电公司"
-                                :disabled="formContent.importFlag == 1"
+                               
-                                filterable
-                                allow-create
-                            >
-                                <el-option
-                                    v-for="item in selectOptions['gdName']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
                             />
-                            </el-select>
                         </el-form-item>
                         <el-form-item label="所属电站" prop="subName" v-if="MonIsShow">
-                            <el-select
+                            <el-input
                                 v-model="formContent.subName"
                                 clearable
-                                placeholder="请选择所属电站"
+                                placeholder="请输入所属电站"
-                                :disabled="formContent.importFlag == 1"
+                               
-                                filterable
-                                allow-create
-                            >
-                                <el-option
-                                    v-for="item in selectOptions['subName']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
                             />
-                            </el-select>
                         </el-form-item>
                         <el-form-item
                             v-auth.device="'factorFlag'"
@@ -279,6 +226,14 @@
                                 <el-radio :value="0">否</el-radio>
                             </el-radio-group>
                         </el-form-item>
+                        <el-form-item
+                            v-if="scene === '1'"
+                            label="谐波系统设备id"
+                            prop="harmSysId"
+                            placeholder="请输入谐波系统设备id"
+                        >
+                            <el-input v-model="formContent.harmSysId"  />
+                        </el-form-item>
                     </el-form>
                 </div>
             </el-tab-pane>
@@ -312,7 +267,7 @@ import dayjs from 'dayjs'
 import MonitorTable from '@/views/machine/device/components/monitorTab.vue'
 import { useAppSceneStore } from '@/stores/modules/mode'
 import { generateUUID } from '@/utils'
-import { Monitor } from '@/api/device/interface/monitor'
+import { type Monitor } from '@/api/device/interface/monitor'
 
 const AppSceneStore = useAppSceneStore()
 const MonIsShow = ref(false)
@@ -382,6 +337,7 @@ function useMetaInfo() {
         gdName: '',
         subName: '',
         importFlag: 0,
+        harmSysId: '',
         inspectChannel: [],
         monitorList: []
     })
@@ -421,6 +377,7 @@ const resetFormContent = () => {
         subName: '',
         importFlag: 0,
         inspectChannel: [],
+        harmSysId: '',
         monitorList: []
     })
 }
@@ -486,8 +443,10 @@ const rules = computed(() => {
     }
     if (scene.value !== '0') {
         dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }]
-        dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必选！', trigger: 'change' }]
+        // dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必选！', trigger: 'change' }]
-        dynamicRules.softwareVersion = [{ required: true, message: '软件版本必选！', trigger: 'change' }]
+        // dynamicRules.softwareVersion = [{ required: true, message: '软件版本必选！', trigger: 'change' }]
+        dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必填！', trigger: 'blur' }]
+        dynamicRules.softwareVersion = [{ required: true, message: '软件版本必填！', trigger: 'blur' }]
         dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选！', trigger: 'change' }]
     }
 
@@ -498,9 +457,12 @@ const rules = computed(() => {
 
     if (mode.value === '比对式') {
         dynamicRules.inspectDate = [{ required: true, message: '定检日期必填！', trigger: 'blur' }]
-        dynamicRules.cityName = [{ required: true, message: '所属地市必选！', trigger: 'change' }]
+        // dynamicRules.cityName = [{ required: true, message: '所属地市必选！', trigger: 'change' }]
-        dynamicRules.gdName = [{ required: true, message: '所属供电公司必选！', trigger: 'change' }]
+        // dynamicRules.gdName = [{ required: true, message: '所属供电公司必选！', trigger: 'change' }]
-        dynamicRules.subName = [{ required: true, message: '所属电站必选！', trigger: 'change' }]
+        // dynamicRules.subName = [{ required: true, message: '所属电站必选！', trigger: 'change' }]
+        dynamicRules.cityName = [{ required: true, message: '所属地市必填！', trigger: 'blur' }]
+        dynamicRules.gdName = [{ required: true, message: '所属供电公司必填！', trigger: 'blur' }]
+        dynamicRules.subName = [{ required: true, message: '所属电站必填！', trigger: 'blur' }]
     }
 
     return dynamicRules
@@ -656,6 +618,7 @@ const open = async (
         }
         monitor.value = data.monitorList
     } else {
+        monitor.value = []
         resetFormContent()
         //只有比对式设备ID由前端传
         if (currentMode === '比对式') formContent.id = generateUUID().replaceAll('-', '')

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

@@ -1,22 +1,27 @@
 <template>
     <!-- 基础信息弹出框 -->
-    <el-dialog :model-value="dialogVisible" :title="dialogTitle" v-bind="dialogMiddle" @close="close" align-center>
+    <el-dialog
+        :model-value="dialogVisible"
+        :title="dialogTitle"
+        v-bind="dialogMiddle"
+        width="50%"
+        @close="close"
+        align-center
+    >
         <div>
-            <el-form :model="formContent" ref="dialogFormRef" :rules="rules" class="form-two">
+            <el-form :model="formContent" ref="dialogFormRef" :rules="rules" label-width="140" class="form-two">
                 <el-form-item label="名称" prop="name">
-                    <el-input v-model="formContent.name" placeholder="请输入监测点名称" />
+                    <el-input clearable v-model="formContent.name" placeholder="请输入监测点名称" :disabled=" formContent.resultType!=null"/>
                 </el-form-item>
                 <el-form-item label="线路号" prop="num">
-                    <el-select
+                    <el-select v-model="formContent.num" placeholder="请选择线路号" @change="handleMonNumChange" :disabled=" formContent.resultType!=null">
-                        v-model="formContent.num"
-                        clearable
-                        placeholder="请选择线路号"
-                        @change="handleMonNumChange"
-                    >
                         <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=" formContent.resultType!=null"/>
+                </el-form-item>
+                <!-- <el-form-item label="母线名称" prop="busbar">
                     <el-select
                         v-model="formContent.busbar"
                         clearable
@@ -31,33 +36,9 @@
                             :value="item.value"
                         />
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
-                <el-form-item label="PT变比" required>
-                    <div class="ratio-input-group">
-                        <el-form-item prop="ptPrimary" class="ratio-form-item">
-                            <el-input v-model="ptPrimary" placeholder="一次侧" @input="handlePtInput" />
-                        </el-form-item>
-                        <span class="colon">:</span>
-                        <el-form-item prop="ptSecondary" class="ratio-form-item">
-                            <el-input v-model="ptSecondary" placeholder="二次侧" @input="handlePtInput" />
-                        </el-form-item>
-                    </div>
-                </el-form-item>
-
-                <!-- 修改CT变比部分 -->
-                <el-form-item label="CT变比" required>
-                    <div class="ratio-input-group">
-                        <el-form-item prop="ctPrimary" class="ratio-form-item">
-                            <el-input v-model="ctPrimary" placeholder="一次侧" @input="handleCtInput" />
-                        </el-form-item>
-                        <span class="colon">:</span>
-                        <el-form-item prop="ctSecondary" class="ratio-form-item">
-                            <el-input v-model="ctSecondary" placeholder="二次侧" @input="handleCtInput" />
-                        </el-form-item>
-                    </div>
-                </el-form-item>
                 <el-form-item label="接线方式" prop="connection">
-                    <el-select v-model="formContent.connection" clearable placeholder="请选择接线方式">
+                    <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"
@@ -66,8 +47,45 @@
                         />
                     </el-select>
                 </el-form-item>
+                <el-form-item required>
+                    <template #label>
+                        <div style="display: flex; align-items: center">
+                            <el-icon style="color: var(--el-color-error)"><WarningFilled /></el-icon>
+                            <span>PT变比</span>
+                        </div>
+                    </template>
+                    <div class="ratio-input-group">
+                        <el-form-item prop="ptPrimary" class="ratio-form-item">
+                            <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=" formContent.resultType!=null"/>
+                        </el-form-item>
+                    </div>
+                </el-form-item>
+
+                <!-- 修改CT变比部分 -->
+                <el-form-item required>
+                    <template #label>
+                        <div style="display: flex; align-items: center">
+                            <el-icon style="color: var(--el-color-error)"><WarningFilled /></el-icon>
+                            <span>CT变比</span>
+                        </div>
+                    </template>
+                    <div class="ratio-input-group">
+                        <el-form-item prop="ctPrimary" class="ratio-form-item">
+                            <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=" formContent.resultType!=null"/>
+                        </el-form-item>
+                    </div>
+                </el-form-item>
+
                 <el-form-item label="统计间隔" prop="statInterval">
-                    <el-select v-model="formContent.statInterval" clearable placeholder="请选择统计间隔">
+                    <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"
@@ -77,10 +95,10 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="谐波系统检测点id" prop="harmSysId" placeholder="请输入谐波系统检测点id">
-                    <el-input v-model="formContent.harmSysId" />
+                    <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" clearable placeholder="请选择是否加密">
+                    <el-select v-model="formContent.checkFlag" :disabled="formContent.resultType!=null">
                         <el-option label="是" :value="1"></el-option>
                         <el-option label="否" :value="0"></el-option>
                     </el-select>
@@ -88,9 +106,8 @@
             </el-form>
         </div>
         <el-alert
-            show-icon
             title="注意：PT和CT变比请输入正常值，不可以缩小相同的倍数！"
-            type="warning"
+            type="error"
             :closable="false"
         ></el-alert>
         <template #footer>
@@ -103,7 +120,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ElMessage, type FormItemRule } from 'element-plus'
+import { ElMessage, ElMessageBox, type FormItemRule } from 'element-plus'
 import { computed, ref, type Ref } from 'vue'
 import { type Monitor } from '@/api/device/interface/monitor'
 import { dialogMiddle } from '@/utils/elementBind'
@@ -123,6 +140,11 @@ const ptSecondary = ref<string>('')
 const ctPrimary = ref<string>('')
 const ctSecondary = ref<string>('')
 
+// 定义 props
+const props = defineProps<{
+  DevFormContent: Device.ResPqDev
+}>()
+
 // 定义弹出组件元信息
 const dialogFormRef = ref()
 function useMetaInfo() {
@@ -160,7 +182,8 @@ const resetFormContent = () => {
         connection: '',
         statInterval: 1,
         harmSysId: '',
-        checkFlag: 1
+        checkFlag: 1,
+      resultType: null
     }
 }
 
@@ -178,7 +201,8 @@ const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
     name: [{ required: true, message: '监测点名称必填！', trigger: 'blur' }],
     num: [{ required: true, message: '线路号必选', trigger: 'change' }],
     connection: [{ required: true, message: '接线方式必选！', trigger: 'change' }],
-    busbar: [{ required: true, message: '所属母线必选！', trigger: 'change' }],
+    //busbar: [{ required: true, message: '所属母线必选！', trigger: 'change' }],
+    busbar: [{ required: true, message: '所属母线必填！', trigger: 'blur' }],
     // harmSysId : [{ required: true, message: '谐波系统检测点id必填！', trigger: 'blur' }],
     checkFlag: [{ required: true, message: '是否参与检测必选！', trigger: 'change' }]
 })
@@ -376,7 +400,6 @@ const open = async (sign: string, data: Monitor.ResPqMon, device: Device.ResPqDe
             name: id.toString()
         }
     }).filter(item => !usedNums.has(item.id)) // 过滤掉已被使用的线路号
-
     if (sign == 'edit') {
         formContent.value = { ...data }
         originalNum.value = data.num // 记录原始线路号
@@ -395,15 +418,22 @@ const open = async (sign: string, data: Monitor.ResPqMon, device: Device.ResPqDe
             ctSecondary.value = secondary
         }
     } else {
-        // 重置表单
-        dialogFormRef.value?.resetFields()
-        resetFormContent()
-        originalNum.value = null
         // 清空PT和CT的临时变量
         ptPrimary.value = ''
         ptSecondary.value = ''
         ctPrimary.value = ''
         ctSecondary.value = ''
+
+        // 重置表单内容，但保留devId
+        const devId = formContent.value.devId
+        resetFormContent()
+        formContent.value.devId = devId
+        originalNum.value = null
+
+        // 使用nextTick确保DOM更新后再清除验证
+        setTimeout(() => {
+            dialogFormRef.value?.clearValidate()
+        }, 0)
         // 设置默认选中第一个线路号
         if (lineNum.value.length > 0) {
             formContent.value.num = lineNum.value[0].id
@@ -436,15 +466,15 @@ defineExpose({ open })
 .ratio-input-group {
     display: flex;
     align-items: center;
-    gap: 10px;
+    justify-content: space-between;
 }
 
 .ratio-form-item {
-    flex: 1;
     margin-bottom: 0 !important;
 }
 
 .colon {
+    text-align: center;
     font-size: 16px;
     font-weight: bold;
 }

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

@@ -15,7 +15,6 @@
                     type="primary"
                     :icon="CirclePlus"
                     @click="openDialog('add')"
-                    :disabled="props.DevFormContent.importFlag == 1"
                 >
                     新增
                 </el-button>
@@ -38,7 +37,6 @@
                     link
                     :icon="EditPen"
                     :model-value="false"
-                    :disabled="props.DevFormContent.importFlag == 1"
                     @click="openDialog('edit', scope.row)"
                 >
                     编辑
@@ -49,13 +47,14 @@
                     link
                     :icon="Delete"
                     @click="handleDelete(scope.row.id)"
+                    :disabled="scope.row.resultType!=null"
                 >
                    删除
                 </el-button>
             </template>
         </ProTable>
     </div>
-    <MonitorPopup @getParameter="getParameter" ref="monitorPopup" />
+    <MonitorPopup @getParameter="getParameter" ref="monitorPopup" :DevFormContent="props.DevFormContent"/>
 </template>
 
 <script setup lang="ts">
@@ -94,7 +93,7 @@ const columns = reactive<ColumnProps<Monitor.ResPqMon>[]>([
     },
     {
         prop: 'busbar',
-        label: '所属母线',
+        label: '母线名称',
         width: 200
     },
     {

frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue

@@ -14,12 +14,12 @@
             :style="{ height: '400px', maxHeight: '400px', overflow: 'hidden' }"
             @selection-change="handleSelectionChange"
         >
-            <el-table-column type="selection" width="55" />
+            <el-table-column type="selection" width="40" fixed="left" />
-            <el-table-column prop="sort" label="序号" width="60" />
+            <el-table-column prop="sort" label="序号" width="55" fixed="left" />
             <el-table-column prop="type" label="误差类型" min-width="180">
                 <template #default="{ row }">
                     <el-cascader
-                        style="min-width: 180px"
+                        style="min-width: 170px"
                         :options="errorOptions"
                         v-model="row.errorType"
                         :props="{ checkStrictly: false, emitPath: false }"
@@ -28,10 +28,10 @@
                     />
                 </template>
             </el-table-column>
-            <el-table-column prop="type" label="脚本类型" min-width="230">
+            <el-table-column prop="type" label="脚本类型" min-width="240">
                 <template #default="{ row }">
                     <el-cascader
-                        style="min-width: 230px"
+                        style="min-width: 220px"
                         :options="scriptOptions"
                         v-model="row.scriptType"
                         :props="{ checkStrictly: false, emitPath: false }"
@@ -48,7 +48,7 @@
                                 <el-select
                                     v-model="row.startFlag"
                                     placeholder="选择起始值"
-                                    style="width: 70px"
+                                    style="width: 60px"
                                     @change="value => handleStartFlagChange(row, value)"
                                 >
                                     <el-option label="无" :value="2"></el-option>
@@ -57,7 +57,8 @@
                                 </el-select>
                             </el-col>
                             <el-col :span="12">
-                                <el-input
+                                <el-input-number
+                                    :controls="false"
                                     v-model="row.startValue"
                                     style="width: 60px"
                                     :disabled="isStartValueDisabled[row.sort]"
@@ -73,7 +74,7 @@
                                 <el-select
                                     v-model="row.endFlag"
                                     placeholder="选择结束值"
-                                    style="width: 70px"
+                                    style="width: 60px"
                                     @change="value => handleEndFlagChange(row, value)"
                                 >
                                     <el-option label="无" :value="2"></el-option>
@@ -82,7 +83,8 @@
                                 </el-select>
                             </el-col>
                             <el-col :span="12">
-                                <el-input
+                                <el-input-number
+                                    :controls="false"
                                     v-model="row.endValue"
                                     style="width: 60px"
                                     :disabled="isEndValueDisabled[row.sort]"
@@ -91,7 +93,7 @@
                         </el-row>
                     </template>
                 </el-table-column>
-                <el-table-column label="单位" width="130">
+                <el-table-column label="单位" width="120">
                     <template #default="{ row }">
                         <el-select v-model="row.conditionType" placeholder="选择单位">
                             <el-option
@@ -107,7 +109,7 @@
             <el-table-column label="最大误差">
                 <el-table-column prop="maxErrorValue" label="最大误差值" width="100">
                     <template #default="{ row }">
-                        <el-input v-model="row.maxErrorValue" style="width: 70px" />
+                        <el-input-number :controls="false" v-model="row.maxErrorValue" style="width: 70px" />
                     </template>
                 </el-table-column>
                 <el-table-column label="误差类型" width="170">
@@ -119,13 +121,13 @@
                         />
                     </template>
                 </el-table-column>
-                <el-table-column label="误差单位" width="100" prop="errorUnit">
+                <el-table-column label="误差单位" width="90" prop="errorUnit">
                     <template #default="{ row }">
                         <span>{{ row.errorUnit }}</span>
                     </template>
                 </el-table-column>
             </el-table-column>
-            <el-table-column label="操作" min-width="150">
+            <el-table-column label="操作" min-width="150" fixed="right">
                 <template #default="{ row }">
                     <el-button type="primary" link :icon="CopyDocument" @click="copyRow(row)">复制</el-button>
                     <el-button type="primary" link :icon="Delete" @click="deleteRow(row)">删除</el-button>

frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue

@@ -1,12 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog :title="dialogTitle" v-model="dialogVisible" @close="close" v-bind="dialogBig" width="100%" align-center>
-        :title="dialogTitle"
-        v-model="dialogVisible"
-        @close="close"
-        v-bind="dialogBig"
-        width="1660px"
-        align-center
-    >
         <el-tabs type="border-card">
             <el-tab-pane label="基础信息">
                 <div>

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,9 +184,64 @@ const open = async (sign: string, data: ICD.ResICD) => {
 
     if (data.id) {
         formContent.value = { ...data }
-    } else {
+        formContent.value.id = data.id
-        resetFormContent()
+        // 文件信息回显
+        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;
 }
 
 // 对外映射

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/testScriptHarmTab.vue

@@ -106,7 +106,7 @@
                 type="number"
                 placeholder="含有率"
                 style="width: 80px"
-                onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
+                onkeypress="return (/[\d.-]/.test(String.fromCharCode(event.keyCode)))"
                 @input="validateInput('famp',1)"
                 clearable
             />

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/childrenPlan.vue

@@ -184,10 +184,9 @@
                 v-if="progressData.status === 'success'"
                 type="primary"
                 title="点击打开目录"
-                :href="progressData.message"
                 @click="openDownloadLocation"
             >
-                {{ progressData.message }}
+                {{ filePath }}
             </el-link>
         </el-row>
         <el-progress
@@ -692,6 +691,7 @@ const exportPlan = async () => {
 }
 
 const exportPlanCheckResultData = async (selectedListIds: string[]) => {
+    filePath.value = ''
     const params = {
         id: planFormContent.value.id,
         report: downloadReport.value,
@@ -773,10 +773,6 @@ const openDownloadLocation = () => {
             if (filePath.value) {
                 // 打开指定文件所在的目录，并选中该文件
                 Renderer.shell.showItemInFolder(filePath.value)
-            } else {
-                // 使用默认下载路径
-                const downloadPath = Renderer.app.getPath('downloads')
-                Renderer.shell.openPath(downloadPath)
             }
         } else {
             ElMessage.warning('当前运行环境不支持，请复制路径自行打开')

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,6 +415,41 @@ const convertToTree = (data: Device[], groupBy?: string | undefined) => {
 
         // 将分组转换为树形结构
         const treeData: Tree[] = []  
+
+        if(modeStore.currentMode == '比对式'){
+            groupMap.forEach((items, groupName) => {
+                let groupNode: Tree;
+                if(type === 0){
+                    // 只有当组内所有项目都禁用时，才将组节点设为禁用
+                    const allItemsDisabled = (items as any[]).every((item: any) => {
+                        return item.disabled === true ;
+                    });
+                    groupNode = {
+                        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
+                        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}`,
@@ -423,6 +464,7 @@ const convertToTree = (data: Device[], groupBy?: string | undefined) => {
                 }
                 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,6 +33,13 @@
                             multiple
                             placeholder="请选择标准设备"
                         >
+<!--                            <el-option-->
+<!--                                v-for="option in pqStandardDevArray"-->
+<!--                                :key="option.value"-->
+<!--                                :disabled="subPlanBindStandardDev.includes(option.label) || option.disabled"-->
+<!--                                :label="option.label"-->
+<!--                                :value="option.value"-->
+<!--                            />-->
                           <el-option
                               v-for="option in pqStandardDevArray"
                               :key="option.value"
@@ -42,27 +49,7 @@
                           />
                         </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"
-                                :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="请输入内容搜索"
@@ -293,7 +305,7 @@
                                         />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="8">
+                                <el-col :span="8" v-if="waveRecordSetting">
                                     <el-form-item
                                         :label-width="140"
                                         label="录波数据有效组数"
@@ -311,7 +323,7 @@
                                         />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="8">
+                                <el-col :span="8" v-if="realTimeSetting">
                                     <el-form-item
                                         :label-width="140"
                                         label="实时数据有效组数"
@@ -329,7 +341,7 @@
                                         />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="8">
+                                <el-col :span="8" v-if="statisticsSetting">
                                     <el-form-item
                                         :label-width="140"
                                         label="统计数据有效组数"
@@ -347,7 +359,7 @@
                                         />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="8">
+                                <el-col :span="8" v-if="flickerSetting">
                                     <el-form-item
                                         :label-width="140"
                                         label="闪变数据有效组数"
@@ -378,12 +390,45 @@
             </div>
         </template>
         <ImportExcel ref="deviceImportExcel" @result="importResult" />
+        <transition name="fade">
+            <div
+                v-if="shanBianDialogVisible"
+                style="
+                    width: 100%;
+                    height: 100%;
+                    position: absolute;
+                    z-index: 999999999;
+                    top: 0;
+                    left: 0;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    background-color: rgba(0, 0, 0, 0.5);
+                "
+            >
+                <div
+                    style="
+                        padding: 10px;
+                        border: 1px solid var(--el-color-warning);
+                        border-radius: 5px;
+                        user-select: none;
+                        background-color: var(--el-color-danger-light-9);
+                    "
+                >
+                    <el-text style="font-weight: bold" type="warning" size="large">
+                        <el-icon><WarningFilled /></el-icon>
+                        闪变耗时较长，不推荐批量被检设备在检测过程中采集该指标
+                        <el-icon @click="() => (shanBianDialogVisible = false)"><Close /></el-icon>
+                    </el-text>
+                </div>
+            </div>
+        </transition>
     </el-dialog>
 </template>
 
 <script lang="ts" setup>
 import { type CascaderOption, ElMessage, type FormItemRule } from 'element-plus'
-import { computed, reactive, ref } from 'vue'
+import { computed, reactive, ref, watch } from 'vue'
 import { dialogBig } from '@/utils/elementBind'
 import { type Plan } from '@/api/plan/interface'
 import {
@@ -414,12 +459,15 @@ import { downloadTemplate, importPqDev } from '@/api/device/device'
 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[]>([]) //获取指定模式下所有检测源
@@ -431,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[] = []
@@ -444,8 +492,15 @@ const planType = ref<number>(0)
 const subPlanBindStandardDev = ref<any>([]) //哪些标准设备已经被子计划绑定
 const activeNames = ref(['1'])
 const allDisabled = ref(false)
+const shanBianDialogVisible = ref(false)
 const leaderData = ref<any[]>([])
 const memberData = ref<any[]>([])
+const waveRecordSetting = ref(false)
+const realTimeSetting = ref(false)
+const statisticsSetting = ref(false)
+const flickerSetting = ref(false)
+
+
 const generateData = () => {
     const manufacturerDict = dictStore.getDictData('Dev_Manufacturers')
 
@@ -461,12 +516,21 @@ const generateData = () => {
             }
         }
         i.checked = boundPqDevIds.length > 0 ? boundPqDevIds.includes(i.id) : false
+
+        if (mode.value === '比对式') {
+             if (i.checkState && i.checkState != 0) {
+                i.disabled = true
+            }else {
+                i.disabled = false
+            }
+        }else{
             if (i.checkState && i.checkState != 0) {
                 i.disabled = true
             }
             if (allDisabled.value) {
                 i.disabled = true
             }
+        }
     })
     // 排序逻辑
     devData.value = allPqDevList.sort((a, b) => {
@@ -481,8 +545,11 @@ const generateData = () => {
         // 最后按名称排序（升序）
         return a.name.localeCompare(b.name)
     })
+
 }
 
+
+
 function useMetaInfo() {
     const dialogVisible = ref(false)
     const titleType = ref('add')
@@ -552,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, {
@@ -690,6 +769,7 @@ const save = () => {
                             emit('update:tab')
                         } else {
                             formContent.sourceIds = null
+                            formContent.devIds = devSelectRef.value?.getSelectedDeviceIds() || [];
                             await updatePlan(formContent)
                         }
                     } else {
@@ -747,6 +827,10 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
     titleType.value = sign
     isSelectDisabled.value = false
     planType.value = plan
+    waveRecordSetting.value = false
+    statisticsSetting.value = false
+    realTimeSetting.value = false
+    flickerSetting.value = false
     if (sign == 'add') {
         resetFormContent()
         allDisabled.value = false
@@ -761,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,
@@ -800,8 +884,13 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
                         .map((user: any) => ({ ...user, disabled: false }))
                 }
             }
+
+            // 默认选择 cp95值 作为数据处理原则
+            const dataRuleDict = dictStore.getDictData('Data_Rule')
+            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),
@@ -838,6 +927,9 @@ 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 {
         //编辑时先给表单赋值（这会没接收被检设备），需要手动再给被检设备复制后整体表单赋值
 
@@ -914,7 +1006,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
                 }
             }
         } else {
-            ;[
+            [
                 pqSource_Result,
                 PqScript_Result,
                 PqErrSys_Result,
@@ -989,6 +1081,11 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
             }
             formContent.devIds = boundData.map((i: any) => i.id) // 已绑定设备id集合
         }
+        handleDataSourceChange()
+        if (mode.value === '比对式'){
+            handleTestItemChange(false)
+        }
+     
     }
 
     pqToArray() //将对象转为数组
@@ -1002,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 != '比对式') {
@@ -1011,9 +1115,9 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
             formContent.sourceIds = formContent.sourceIds.join(',')
         }
         // 将 formContent.sourceIds 从数组转换为字符串
-        /*if (Array.isArray(formContent.datasourceIds)) {
+        if (Array.isArray(formContent.datasourceIds)) {
             formContent.datasourceIds = formContent.datasourceIds.join(',')
-        }*/
+        }
     }
 
     if (AppSceneStore.currentScene == '1') {
@@ -1036,13 +1140,21 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
 }
 
 // 检测项选择变化时的处理函数
-const handleTestItemChange = () => {
+const handleTestItemChange = (showTip: boolean = true) => {
     if (formContent.testItems.length > 0) {
         const hasShanBian = secondLevelOptions
             .filter(option => formContent.testItems.includes(option.value))
             .find(option => option.label === '闪变')
         if (hasShanBian) {
-            ElMessage.warning('闪变耗时较长，不推荐批量被检设备在检测过程中采集该指标')
+            flickerSetting.value = true
+            if (showTip) {
+                shanBianDialogVisible.value = true
+                setTimeout(() => {
+                    shanBianDialogVisible.value = false
+                }, 5000)
+            }
+        } else {
+            flickerSetting.value = false
         }
     }
 }
@@ -1129,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 : []
@@ -1195,19 +1308,119 @@ const handleDataSourceChange = () => {
     // 判断是否同时包含 '3s' 和 '分钟'
     const hasThreeSeconds = selectedLabels.some(label => label.includes('3s'))
     const hasMinuteStats = selectedLabels.some(label => label.includes('分钟'))
+    const hasLuBo = selectedLabels.some(label => label.includes('录波'))
+
 
     if (hasThreeSeconds && hasMinuteStats) {
         ElMessage.warning('3s实时数据与分钟统计数据不能同时选择')
         formContent.datasourceIds = []
+        realTimeSetting.value = false
+        statisticsSetting.value = false
+        waveRecordSetting.value = false
+        return
+    }
+
+    if (hasLuBo && hasMinuteStats) {
+        ElMessage.warning('录波数据与分钟统计数据不能同时选择')
+        formContent.datasourceIds = []
+        realTimeSetting.value = false
+        statisticsSetting.value = false
+        waveRecordSetting.value = false
+        return
     }
     // 判断是否选择了多个“分钟统计数据”项
     const minuteStatLabels = selectedLabels.filter(label => label.includes('分钟'))
     if (minuteStatLabels.length > 1) {
         ElMessage.warning('分钟统计数据不能多选')
         formContent.datasourceIds = []
+        realTimeSetting.value = false
+        statisticsSetting.value = false
+        waveRecordSetting.value = false
+        return
+    }
+    if (hasThreeSeconds) {
+        realTimeSetting.value = true
+    } else {
+        realTimeSetting.value = false
+    }
+    if (hasMinuteStats) {
+        statisticsSetting.value = true
+    } else {
+        statisticsSetting.value = false
+    }
+    if (hasLuBo && selectedLabels.length === 1) {
+        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 if (hasLuBo && selectedLabels.length > 1) { 
+         waveRecordSetting.value = true
+        //数据源有多个且包含录波数据源时，从已选检测项中移除闪变项
+        const flickerOption = secondLevelOptions.find(option => option.label.includes('闪变'));
+        
+        if (Array.isArray(formContent.testItems)) {
+        let filteredItems = [...formContent.testItems];
+
+        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 }) => {
+    // 获取当前选中的 datasourceIds，并确保为数组
+    const values = Array.isArray(formContent.datasourceIds)
+        ? formContent.datasourceIds
+        : [formContent.datasourceIds].filter(Boolean) // 转为数组并过滤空值
+
+    const selectedLabels = values.map(value => {
+      const dictItem = dictStore.getDictData(dataSourceType.value).find(item => item.code === value);
+      return dictItem ? dictItem.name : '';
+    });
+
+    const hasLuBo = selectedLabels.some(label => label.includes('录波'));
+
+    // 当只勾选录波数据源时，禁用频率和闪变选项
+    if (hasLuBo && selectedLabels.length === 1) {
+      if (option.label.includes('频率') || option.label.includes('闪变')) {
+        return true;
+      }
+    } 
+    // 当数据源有多个且包含录波数据源时，只禁用闪变选项
+    else if (hasLuBo && selectedLabels.length > 1) {
+      if (option.label.includes('闪变')) {
+        return true;
+      }
+    }
+    
+    return false;
+  };
+});
+
+
+
 //导入设备
 const deviceImportExcel = ref<InstanceType<typeof ImportExcel> | null>(null)
 
@@ -1260,4 +1473,12 @@ const props = defineProps<{
     justify-content: center;
     align-items: center;
 }
+.fade-enter-active,
+.fade-leave-active {
+    transition: opacity 0.5s;
+}
+.fade-enter-from,
+.fade-leave-to {
+    opacity: 0;
+}
 </style>

frontend/src/views/system/base/index.vue

@@ -69,7 +69,7 @@
           <el-button type="primary" @click="submitForm()">保存配置</el-button>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="日志配置">
+<!--      <el-tab-pane label="日志配置">
         <div>
           <el-row :gutter="24">
             <el-col :span="8">
@@ -181,7 +181,7 @@
         <div class="dialog-footer">
           <el-button type="primary">保存配置</el-button>
         </div>
-      </el-tab-pane>
+      </el-tab-pane>-->
     </el-tabs>
   </div>
 </template>
@@ -194,7 +194,7 @@ import {type VersionRegister} from '@/api/system/versionRegister/interface'
 import { getTestConfig, updateTestConfig } from '@/api/system/base/index'
 import { getRegRes, updateRegRes } from '@/api/system/versionRegister/index'
 import { ElMessage, FormItemRule } from 'element-plus'
-import {useModeStore} from '@/stores/modules/mode'; // 引入模式 store
+import { useModeStore } from '@/stores/modules/mode' // 引入模式 store
 defineOptions({
   name: 'base'
 })

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
   }
 
 };

package.json

@@ -14,11 +14,12 @@
     "encrypt": "ee-bin encrypt",
     "icon": "ee-bin icon",
     "re-sqlite": "electron-rebuild -f -w better-sqlite3",
-    "build-w": "ee-bin build --cmds=win64",
+    "build-w": "ee-bin build --cmds=win64 && npm run rename-output",
     "build-we": "ee-bin build --cmds=win_e",
     "build-m": "ee-bin build --cmds=mac",
     "build-m-arm64": "ee-bin build --cmds=mac_arm64",
-    "build-l": "ee-bin build --cmds=linux"
+    "build-l": "ee-bin build --cmds=linux",
+    "rename-output": "node -e \"const fs=require('fs'); const oldPath='out/win-unpacked'; const newPath='out/NPQS-9100'; if(fs.existsSync(oldPath)){if(fs.existsSync(newPath)) fs.rmSync(newPath,{recursive:true}); fs.renameSync(oldPath, newPath); console.log('Renamed to NPQS-9100');}\""
   },
   "repository": "https://github.com/dromara/electron-egg.git",
   "keywords": [
@@ -37,15 +38,13 @@
     "electron-builder": "^25.1.8"
   },
   "dependencies": {
-
     "autofit.js": "^3.2.8",
     "dayjs": "^1.10.7",
-    "ee-core": "2.10.0",
+    "ee-core": "4.1.5",
     "electron-updater": "^5.3.0",
     "event-source-polyfill": "^1.0.31",
     "lodash": "^4.17.21",
     "mqtt": "^5.10.1",
     "sass": "^1.80.4"
-
   }
 }

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();
+        });
+      } else {
+        killAttempts++;
       }
       
-          // 清理端口记录文件
+      // 方法2: 通过端口杀死占用进程（精确定位，不会误杀其他Java进程）
-          this.cleanupJavaPortFile();
+      const recordedPort = this.currentJavaPort || this.getRecordedJavaPort();
-          resolve();
+      if (recordedPort) {
-        }, 3000);
+        console.log(`[Java] Method 2: Killing process on port ${recordedPort} (precise targeting)`);
         
-        this.springBootProcess.on('close', () => {
+        // 查找占用端口的进程
-          clearTimeout(timeout);
+        const findCommand = `netstat -ano | findstr :${recordedPort}`;
-          console.log('[Java] Spring Boot application stopped gracefully');
+        exec(findCommand, (error, stdout) => {
+          if (!error && stdout) {
+            // 提取PID（最后一列）
+            const lines = stdout.trim().split('\n');
+            const pids = new Set();
             
-          // 清理端口记录文件
+            lines.forEach(line => {
-          this.cleanupJavaPortFile();
+              const parts = line.trim().split(/\s+/);
-          resolve();
+              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));
-        console.log('[Java] Sending SIGTERM to Spring Boot');
+            
-        this.springBootProcess.kill('SIGTERM');
+            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);
-        this.cleanupJavaPortFile();
-        resolve();
                   }
+                  
+                  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/mysql-service-manager.js

@@ -0,0 +1,389 @@
+const { spawn, exec } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+
+/**
+ * MySQL 进程管理器
+ * 使用进程模式启动 MySQL，无需管理员权限
+ */
+class MySQLServiceManager {
+  constructor(logWindowManager = null) {
+    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.configFile = path.join(this.mysqlPath, 'my.ini');
+    this.logWindowManager = logWindowManager;
+
+    // 进程模式：保存 MySQL 进程引用
+    this.mysqlProcess = null;
+    this.currentPort = null;
+  }
+
+  // 睡眠函数
+  sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+
+  // 日志输出辅助方法
+  log(type, message) {
+    console.log(`[MySQL] ${message}`);
+    if (this.logWindowManager) {
+      this.logWindowManager.addLog(type, `[MySQL] ${message}`);
+    }
+  }
+
+  /**
+   * 执行命令并返回Promise
+   */
+  execCommand(command) {
+    return new Promise((resolve, reject) => {
+      exec(command, { encoding: 'utf8' }, (error, stdout, stderr) => {
+        if (error) {
+          const err = new Error(error.message || stderr || stdout || 'Command execution failed');
+          err.code = error.code;
+          err.stdout = stdout;
+          err.stderr = stderr;
+          reject(err);
+        } else {
+          resolve({ stdout, stderr });
+        }
+      });
+    });
+  }
+
+  /**
+   * 读取配置文件中的端口
+   */
+  readPortFromConfig() {
+    try {
+      if (fs.existsSync(this.configFile)) {
+        const content = fs.readFileSync(this.configFile, 'utf-8');
+        const match = content.match(/port\s*=\s*(\d+)/);
+        return match ? parseInt(match[1]) : 3306;
+      }
+    } catch (error) {
+      console.error('[MySQL] Failed to read port from config:', error);
+    }
+    return 3306;
+  }
+
+  /**
+   * 生成 my.ini 配置文件
+   */
+  generateMyIni(port) {
+    const basedir = this.mysqlPath.replace(/\\/g, '/');
+    const datadir = this.dataPath.replace(/\\/g, '/');
+
+    const config = `[mysqld]
+# 基础路径配置
+basedir=${basedir}
+datadir=${datadir}
+
+# 网络配置
+port=${port}
+bind-address=0.0.0.0
+
+# 字符集配置
+character-set-server=utf8mb4
+collation-server=utf8mb4_unicode_ci
+
+# 性能优化
+max_connections=200
+innodb_buffer_pool_size=128M
+innodb_log_file_size=64M
+
+# 日志配置
+log_error=${basedir}/mysql_error.log
+slow_query_log=1
+slow_query_log_file=${basedir}/mysql_slow.log
+long_query_time=2
+
+# 安全配置
+sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
+
+[client]
+default-character-set=utf8mb4
+`;
+
+    fs.writeFileSync(this.configFile, config, 'utf-8');
+    this.log('system', `生成配置文件，端口: ${port}`);
+  }
+
+  /**
+   * 初始化数据库
+   */
+  async initializeDatabase() {
+    return new Promise((resolve, reject) => {
+      this.log('system', '正在初始化 MySQL 数据库...');
+
+      const mysqld = path.join(this.binPath, 'mysqld.exe');
+      const initProcess = spawn(mysqld, [
+        '--defaults-file=' + this.configFile,
+        '--initialize-insecure'
+      ], {
+        cwd: this.mysqlPath,
+        stdio: 'pipe'
+      });
+
+      initProcess.stdout.on('data', (data) => {
+        this.log('system', data.toString().trim());
+      });
+
+      initProcess.stderr.on('data', (data) => {
+        this.log('system', data.toString().trim());
+      });
+
+      initProcess.on('close', (code) => {
+        if (code === 0) {
+          this.log('success', '数据库初始化成功');
+          resolve();
+        } else {
+          reject(new Error(`数据库初始化失败，退出码: ${code}`));
+        }
+      });
+
+      initProcess.on('error', (err) => {
+        reject(err);
+      });
+    });
+  }
+
+  /**
+   * 检查数据库是否已初始化
+   */
+  isDatabaseInitialized() {
+    return fs.existsSync(this.dataPath) && fs.readdirSync(this.dataPath).length > 0;
+  }
+
+  /**
+   * 检查是否有残留的 mysqld 进程
+   */
+  async checkAndKillOrphanProcess() {
+    try {
+      // 检查是否有 mysqld.exe 进程在运行
+      const { stdout } = await this.execCommand('tasklist /FI "IMAGENAME eq mysqld.exe" /FO CSV /NH');
+
+      if (stdout.includes('mysqld.exe')) {
+        this.log('warn', '检测到残留的 MySQL 进程，正在清理...');
+
+        // 尝试优雅关闭
+        try {
+          const mysqladmin = path.join(this.binPath, 'mysqladmin.exe');
+          await this.execCommand(`"${mysqladmin}" -u root shutdown`);
+          await this.sleep(2000);
+          this.log('success', '残留进程已优雅关闭');
+        } catch (e) {
+          // 优雅关闭失败，强制杀死
+          this.log('warn', '优雅关闭失败，强制终止...');
+          await this.execCommand('taskkill /F /IM mysqld.exe');
+          await this.sleep(1000);
+          this.log('success', '残留进程已强制终止');
+        }
+      }
+    } catch (error) {
+      // tasklist 命令失败通常意味着没有找到进程，这是正常的
+    }
+  }
+
+  /**
+   * 进程模式：启动 MySQL 进程
+   */
+  async startMySQLProcess() {
+    return new Promise((resolve, reject) => {
+      const mysqld = path.join(this.binPath, 'mysqld.exe');
+
+      this.log('system', '正在启动 MySQL 进程...');
+      this.log('system', `可执行文件: ${mysqld}`);
+      this.log('system', `配置文件: ${this.configFile}`);
+
+      // 检查文件是否存在
+      if (!fs.existsSync(mysqld)) {
+        return reject(new Error(`mysqld.exe 不存在: ${mysqld}`));
+      }
+      if (!fs.existsSync(this.configFile)) {
+        return reject(new Error(`配置文件不存在: ${this.configFile}`));
+      }
+
+      this.mysqlProcess = spawn(mysqld, [
+        `--defaults-file=${this.configFile}`,
+        '--console'
+      ], {
+        cwd: this.mysqlPath,
+        stdio: ['ignore', 'pipe', 'pipe'],
+        windowsHide: true
+      });
+
+      let startupComplete = false;
+      let startupTimeout = null;
+
+      // 监听 stderr（MySQL 主要输出在 stderr）
+      this.mysqlProcess.stderr.on('data', (data) => {
+        const msg = data.toString().trim();
+        if (msg) {
+          // 检查启动成功标志
+          if (msg.includes('ready for connections') || msg.includes('port:')) {
+            if (!startupComplete) {
+              startupComplete = true;
+              if (startupTimeout) clearTimeout(startupTimeout);
+              this.log('success', 'MySQL 进程已就绪');
+              resolve(true);
+            }
+          }
+
+          // 输出日志（过滤一些不重要的信息）
+          if (!msg.includes('[Note]') || msg.includes('error') || msg.includes('ready')) {
+            this.log('system', `[mysqld] ${msg}`);
+          }
+        }
+      });
+
+      this.mysqlProcess.stdout.on('data', (data) => {
+        const msg = data.toString().trim();
+        if (msg) {
+          this.log('system', `[mysqld] ${msg}`);
+        }
+      });
+
+      this.mysqlProcess.on('error', (err) => {
+        this.log('error', `MySQL 进程启动失败: ${err.message}`);
+        this.mysqlProcess = null;
+        reject(err);
+      });
+
+      this.mysqlProcess.on('exit', (code, signal) => {
+        this.log('system', `MySQL 进程退出，代码: ${code}, 信号: ${signal}`);
+        this.mysqlProcess = null;
+
+        // 如果还没完成启动就退出了，说明启动失败
+        if (!startupComplete) {
+          reject(new Error(`MySQL 进程异常退出，代码: ${code}`));
+        }
+      });
+
+      // 超时处理（30秒）
+      startupTimeout = setTimeout(() => {
+        if (!startupComplete && this.mysqlProcess) {
+          // 进程还在运行，认为启动成功
+          startupComplete = true;
+          this.log('success', 'MySQL 进程启动完成（超时检测）');
+          resolve(true);
+        }
+      }, 30000);
+    });
+  }
+
+  /**
+   * 进程模式：停止 MySQL 进程
+   */
+  async stopMySQLProcess() {
+    if (!this.mysqlProcess) {
+      this.log('system', 'MySQL 进程未运行');
+      return;
+    }
+
+    this.log('system', '正在停止 MySQL 进程...');
+
+    try {
+      // 方式1：通过 mysqladmin 优雅关闭
+      const mysqladmin = path.join(this.binPath, 'mysqladmin.exe');
+      await this.execCommand(`"${mysqladmin}" -u root shutdown`);
+
+      // 等待进程退出
+      await this.sleep(3000);
+
+      if (this.mysqlProcess && !this.mysqlProcess.killed) {
+        // 如果还没退出，强制杀死
+        this.log('warn', '优雅关闭超时，强制终止...');
+        this.mysqlProcess.kill('SIGTERM');
+      }
+
+      this.log('success', 'MySQL 进程已关闭');
+    } catch (error) {
+      // mysqladmin 关闭失败，强制杀死进程
+      this.log('warn', `优雅关闭失败: ${error.message}，强制终止...`);
+
+      if (this.mysqlProcess) {
+        this.mysqlProcess.kill('SIGTERM');
+      }
+
+      // 确保进程被杀死
+      try {
+        await this.execCommand('taskkill /F /IM mysqld.exe');
+      } catch (e) {
+        // 忽略
+      }
+    }
+
+    this.mysqlProcess = null;
+    this.currentPort = null;
+  }
+
+  /**
+   * 检查 MySQL 进程是否在运行
+   */
+  isMySQLRunning() {
+    return this.mysqlProcess !== null && !this.mysqlProcess.killed;
+  }
+
+  /**
+   * 主流程：确保 MySQL 运行（进程模式）
+   * @param {function} findAvailablePort - 查找可用端口的函数
+   * @param {function} waitForPort - 等待端口就绪的函数
+   * @returns {Promise<number>} 返回 MySQL 运行的端口
+   */
+  async ensureServiceRunning(findAvailablePort, waitForPort) {
+    this.log('system', '开始 MySQL 进程检查流程（进程模式）');
+    this.log('system', `MySQL 路径: ${this.mysqlPath}`);
+    this.log('system', `配置文件: ${this.configFile}`);
+
+    // 1. 检查是否已有 MySQL 进程在运行
+    if (this.isMySQLRunning()) {
+      const port = this.currentPort || this.readPortFromConfig();
+      this.log('success', `MySQL 进程已在运行，端口: ${port}`);
+      return port;
+    }
+
+    // 2. 检查并清理残留进程
+    await this.checkAndKillOrphanProcess();
+
+    // 3. 查找可用端口
+    const port = await findAvailablePort(3306, 100);
+    this.log('system', `找到可用端口: ${port}`);
+
+    // 4. 检查数据库是否已初始化
+    if (!this.isDatabaseInitialized()) {
+      this.log('system', '数据库未初始化，开始初始化...');
+      this.generateMyIni(port);
+      await this.initializeDatabase();
+    } else {
+      this.log('system', '检测到已有数据库目录');
+      // 更新配置文件（可能端口变了）
+      this.generateMyIni(port);
+    }
+
+    // 5. 启动 MySQL 进程
+    this.log('system', '启动 MySQL 进程...');
+    await this.startMySQLProcess();
+
+    // 6. 等待端口就绪
+    const finalPort = this.readPortFromConfig();
+    this.currentPort = finalPort;
+
+    this.log('system', `等待端口 ${finalPort} 就绪...`);
+    const portReady = await waitForPort(finalPort, 30000);
+
+    if (!portReady) {
+      throw new Error(`MySQL 端口 ${finalPort} 未能在 30 秒内就绪`);
+    }
+
+    this.log('success', `MySQL 进程启动成功，端口: ${finalPort}`);
+    return finalPort;
+  }
+}
+
+module.exports = MySQLServiceManager;