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

# Conflicts:
#	package.json

.gitignore

@@ -7,5 +7,6 @@ package-lock.json
 data/
 .vscode/launch.json
 public/electron/
-public/dist/
 pnpm-lock.yaml
+CLAUDE.md
+/public/dist/

.npmrc

@@ -2,3 +2,9 @@ registry=https://registry.npmmirror.com/
 disturl=https://registry.npmmirror.com/-/binary/node
 electron_mirror=https://npmmirror.com/mirrors/electron/
 electron-builder-binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/
+
+# 屏蔽警告配置
+legacy-peer-deps=true
+audit=false
+fund=false
+loglevel=error

.vscode/settings.json

@@ -1,16 +1,28 @@
 {
     "cSpell.words": [
+        "Analyse",
+        "CHNFACTOR",
+        "CHNPACTOR",
         "Chns",
+        "Combox",
+        "Datasource",
         "daterange",
         "devicedata",
         "errordata",
         "errordetail",
+        "Interharmonic",
+        "IRMS",
         "logdata",
+        "MSQI",
         "Pids",
         "plandata",
+        "PQDIF",
+        "Preinvestment",
         "resourcedata",
         "resourcename",
         "rmark",
-        "showtest"
+        "showtest",
+        "UNBAN",
+        "VRMS"
     ]
 }

README.md

@@ -1,61 +0,0 @@
-#### 项目简介
-
-#### 常用命令
-```shell
-
-# 运行项目
-npm run dev
-
-# 仅运行前端
-npm run dev-frontend
-
-# 仅运行后端
-npm run dev-electron
-
-
-# 预发布模式（环境变量为：prod），请先移动资源
-npm run start
-
-# 移动前端静态资源
-npm run rd
-
-# 移动资源，可配置
-npm run move
-
-# 代码加密
-npm run encrypt
-
-# 清除加密的代码
-npm run clean
-
-# 生成logo
-npm run icon
-
-# 打包 （windows版）
-npm run build-w (调整为64位)
-npm run build-w-32 (32位)
-npm run build-w-64 (64位)
-npm run build-w-arm64 (arm64)
-
-# 打包 （windows 免安装版）
-# ee > v2.2.1
-npm run build-wz (调整为64位)
-npm run build-wz-32 (32位)
-npm run build-wz-64 (64位)
-npm run build-wz-arm64 (arm64)
-
-# 打包 （mac版）
-npm run build-m
-npm run build-m-arm64 (m1芯片架构)
-
-# 打包 （linux版）
-# ee > v2.2.1
-npm run build-l (默认64位 deb包)
-npm run build-l-32 (32位 deb包)
-npm run build-l-64 (64位 deb包)
-npm run build-l-arm64 (64位 deb包 arm64)
-npm run build-l-armv7l (64位 deb包 armv7l)
-npm run build-lr-64 (64位 rpm包)
-npm run build-lp-64 (64位 pacman包)
-
-```

build/extraResources/chromeExtension/read.txt

@@ -1 +0,0 @@
-chrome应用商店ctx文件，解压后，放置在此目录中，打包时会将资源加入安装包内。

cmd/bin.js

@@ -0,0 +1,205 @@
+/**
+ * ee-bin 配置
+ * 仅适用于开发环境
+ */
+module.exports = {
+  /**
+   * development serve ("frontend" "electron" )
+   * ee-bin dev
+   */
+  dev: {
+    // frontend：前端服务
+    // 说明：该配置的意思是，进入 frontend 目录，执行 npm run dev
+    // 运行后的服务为 http://localhost:8080 
+    // 如果 protocol 属性为 'file://' 那么不会执行命令，项目直接加载 indexPath 对应的文件。
+    frontend: {
+      directory: './frontend',
+      cmd: 'npm',
+      args: ['run', 'dev'],
+      port: 18091,
+    },
+    // electron：主进程服务
+    // 说明：该配置的意思是，在根目录，执行 electron . --env=local
+    electron: {
+      directory: './',
+      cmd: 'electron',
+      args: ['.', '--env=local'],
+      watch: false,
+    }
+  },
+
+  /**
+   * 构建
+   * ee-bin build
+   */
+  build: {
+    frontend: {
+      directory: './frontend',
+      cmd: 'npm',
+      args: ['run', 'build'],
+    },
+    electron: {
+      type: 'javascript',
+      bundleType: 'copy'
+    },
+    win64: {
+      cmd: 'electron-builder',
+      directory: './',
+      args: ['--config=./cmd/builder.json', '-w=nsis', '--x64'],
+    },
+    win32: {
+      args: ['--config=./cmd/builder.json', '-w=nsis', '--ia32'],
+    },
+    win_e: {
+      args: ['--config=./cmd/builder.json', '-w=portable', '--x64'],
+    },
+    win_7z: {
+      args: ['--config=./cmd/builder.json', '-w=7z', '--x64'],
+    },
+    mac: {
+      args: ['--config=./cmd/builder-mac.json', '-m'],
+    },
+    mac_arm64: {
+      args: ['--config=./cmd/builder-mac-arm64.json', '-m', '--arm64'],
+    },
+    linux: {
+      args: ['--config=./cmd/builder-linux.json', '-l=deb', '--x64'],
+    },
+    linux_arm64: {
+      args: ['--config=./cmd/builder-linux.json', '-l=deb', '--arm64'],
+    },
+    go_w: {
+      directory: './go',
+      cmd: 'go',
+      args: ['build', '-o=../build/extraResources/goapp.exe'],
+    },
+    go_m: {
+      directory: './go',
+      cmd: 'go',
+      args: ['build', '-o=../build/extraResources/goapp'],
+    },
+    go_l: {
+      directory: './go',
+      cmd: 'go',
+      args: ['build', '-o=../build/extraResources/goapp'],
+    },
+    python: {
+      directory: './python',
+      cmd: 'python',
+      args: ['./setup.py', 'build'],
+    },
+  },
+
+  /**
+   * 移动资源
+   * ee-bin move 
+   */
+  move: {
+    frontend_dist: {
+      src: './frontend/dist',
+      dest: './public/dist'
+    },
+    go_static: {
+      src: './frontend/dist',
+      dest: './go/public/dist'
+    },
+    go_config: {
+      src: './go/config',
+      dest: './go/public/config'
+    },
+    go_package: {
+      src: './package.json',
+      dest: './go/public/package.json'
+    },
+    go_images: {
+      src: './public/images',
+      dest: './go/public/images'
+    },
+    python_dist: {
+      src: './python/dist',
+      dest: './build/extraResources/py'
+    },
+  },  
+
+  /**
+   * 预发布模式（prod）
+   * ee-bin start
+   */
+  start: {
+    directory: './',
+    cmd: 'electron',
+    args: ['.', '--env=prod']
+  },
+
+  /**
+   * 加密
+   */  
+  encrypt: {
+    frontend: {
+      type: 'none',
+      files: [
+        './public/dist/**/*.(js|json)',
+      ],
+      cleanFiles: ['./public/dist'],
+      confusionOptions: {
+        compact: true,      
+        stringArray: true,
+        stringArrayEncoding: ['none'],
+        stringArrayCallsTransform: true,
+        numbersToExpressions: true,
+        target: 'browser',
+      }
+    },
+    electron: {
+      type: 'confusion',
+      files: [
+        './public/electron/**/*.(js|json)',
+      ],
+      cleanFiles: ['./public/electron'],
+      specificFiles: [
+        './public/electron/main.js',
+        './public/electron/preload/bridge.js',
+      ],
+      confusionOptions: {
+        compact: true,      
+        stringArray: true,
+        stringArrayEncoding: ['rc4'],
+        deadCodeInjection: false,
+        stringArrayCallsTransform: true,
+        numbersToExpressions: true,
+        target: 'node',
+      }
+    }
+  },
+
+  /**
+   * 执行自定义命令
+   * ee-bin exec
+   */
+  exec: {
+    // 单独调试，air 实现 go 热重载
+    go: {
+      directory: './go',
+      cmd: 'air',
+      args: ['-c=config/.air.toml' ],
+    },
+    // windows 单独调试，air 实现 go 热重载 
+    go_w: {
+      directory: './go',
+      cmd: 'air',
+      args: ['-c=config/.air.windows.toml' ],
+    },    
+    // 单独调试，以基础方式启动 go
+    go2: {
+      directory: './go',
+      cmd: 'go',
+      args: ['run', './main.go', '--env=dev','--basedir=../', '--port=7073'],
+    },     
+    python: {
+      directory: './python',
+      cmd: 'python',
+      args: ['./main.py', '--port=7074'],
+      stdio: "inherit", // ignore
+    },
+  },  
+};

cmd/builder-linux.json

@@ -0,0 +1,40 @@
+{
+  "productName": "ee",
+  "appId": "com.bilibili.ee",
+  "copyright": "© 2025 duola Technology Co., Ltd.",
+  "directories": {
+    "output": "out"
+  },
+  "asar": true,
+  "files": [
+    "**/*",
+    "!cmd/",
+    "!data/",
+    "!electron/",
+    "!frontend/",
+    "!logs/",
+    "!out/",
+    "!go/",
+    "!python/"
+  ],
+  "extraResources": [
+    {
+      "from": "build/extraResources",
+      "to": "extraResources"
+    }
+  ],
+  "publish": [
+    {
+      "provider": "generic",
+      "url": ""
+    }
+  ],
+  "linux": {
+    "icon": "build/icons/icon.icns",
+    "artifactName": "${productName}-${os}-${version}-${arch}.${ext}",
+    "target": [
+      "deb"
+    ],
+    "category": "Utility"
+  }
+}

cmd/builder-mac-arm64.json

@@ -0,0 +1,38 @@
+{
+  "productName": "ee",
+  "appId": "com.bilibili.ee",
+  "copyright": "© 2025 duola Technology Co., Ltd.",
+  "directories": {
+    "output": "out"
+  },
+  "asar": true,
+  "files": [
+    "**/*",
+    "!cmd/",
+    "!data/",
+    "!electron/",
+    "!frontend/",
+    "!logs/",
+    "!out/",
+    "!go/",
+    "!python/"
+  ],
+  "extraResources": [
+    {
+      "from": "build/extraResources",
+      "to": "extraResources"
+    }
+  ],
+  "publish": [
+    {
+      "provider": "generic",
+      "url": ""
+    }
+  ],
+  "mac": {
+    "icon": "build/icons/icon.icns",
+    "artifactName": "${productName}-${os}-${version}-${arch}.${ext}",
+    "darkModeSupport": true,
+    "hardenedRuntime": false
+  }
+}

cmd/builder-mac.json

@@ -0,0 +1,38 @@
+{
+  "productName": "ee",
+  "appId": "com.bilibili.ee",
+  "copyright": "© 2025 duola Technology Co., Ltd.",
+  "directories": {
+    "output": "out"
+  },
+  "asar": true,
+  "files": [
+    "**/*",
+    "!cmd/",
+    "!data/",
+    "!electron/",
+    "!frontend/",
+    "!logs/",
+    "!out/",
+    "!go/",
+    "!python/"
+  ],
+  "extraResources": [
+    {
+      "from": "build/extraResources",
+      "to": "extraResources"
+    }
+  ],
+  "publish": [
+    {
+      "provider": "generic",
+      "url": ""
+    }
+  ],
+  "mac": {
+    "icon": "build/icons/icon.icns",
+    "artifactName": "${productName}-${os}-${version}-${arch}.${ext}",
+    "darkModeSupport": true,
+    "hardenedRuntime": false
+  }
+}

cmd/builder.json

@@ -1,17 +1,21 @@
 {
-  "productName": "pqs9100",
-  "appId": "com.njcn.pqs9100",
-  "copyright": "hongawen.com",
+  "productName": "NPQS9100",
+  "appId": "NQPS9100",
+  "copyright": "© 2025 南京灿能",
   "directories": {
     "output": "out"
   },
   "asar": true,
   "files": [
     "**/*",
+    "!cmd/",
+    "!data/",
+    "!electron/",
     "!frontend/",
-    "!run/",
     "!logs/",
-    "!data/"
+    "!out/",
+    "!go/",
+    "!python/"
   ],
   "extraResources": {
     "from": "build/extraResources/",
@@ -26,35 +30,15 @@
     "installerHeaderIcon": "build/icons/icon.ico",
     "createDesktopShortcut": true,
     "createStartMenuShortcut": true,
-    "shortcutName": "自动检测平台"
-  },
-  "publish": [
-    {
-      "provider": "generic",
-      "url": "http://www.shining-electric.com/"
-    }
-  ],
-  "mac": {
-    "icon": "build/icons/icon.icns",
-    "artifactName": "${productName}-${os}-${version}-${arch}.${ext}",
-    "darkModeSupport": true,
-    "hardenedRuntime": false
+    "shortcutName": "灿能检测"
   },
   "win": {
     "icon": "build/icons/icon.ico",
     "artifactName": "${productName}-${os}-${version}-${arch}.${ext}",
     "target": [
       {
-        "target": "nsis"
+        "target": "portable"
       }
     ]
-  },
-  "linux": {
-    "icon": "build/icons/icon.icns",
-    "artifactName": "${productName}-${os}-${version}-${arch}.${ext}",
-    "target": [
-      "deb"
-    ],
-    "category": "Utility"
   }
 }

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

@@ -0,0 +1,133 @@
+## 便携式 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

@@ -0,0 +1,436 @@
+# 应用打包方案对比与实现
+
+本文档详细说明 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*

doc/生命周期描述.md

@@ -0,0 +1,459 @@
+# ElectronEgg 生命周期详解
+
+本文档详细说明 ElectronEgg 框架的应用生命周期机制及其在项目中的实现。
+
+## 生命周期流程图
+
+```
+┌─────────────┐
+│    new      │  创建 ElectronEgg 实例
+└──────┬──────┘
+       │
+┌──────▼──────┐
+│   ready     │  core app 加载完成（ee-core 框架初始化）
+└──────┬──────┘
+       │
+┌──────▼─────────────┐
+│ electronAppReady   │  Electron app 加载完成
+└──────┬─────────────┘
+       │
+       ├─────────────────┐
+       │                 │
+┌──────▼──────┐   ┌─────▼────────┐
+│ mainWindow  │   │ windowReady  │  主窗口创建完成
+└──────┬──────┘   └─────▲────────┘
+       │                 │
+       └─────────────────┘
+       │
+┌──────▼──────┐
+│   running   │  应用运行中
+└──────┬──────┘
+       │
+┌──────▼──────┐
+│beforeClose  │  退出之前触发
+└──────┬──────┘
+       │
+┌──────▼──────┐
+│    quit     │  应用退出
+└─────────────┘
+```
+
+## 生命周期钩子详解
+
+### 1. new - 实例创建
+
+**触发时机**：调用 `new ElectronEgg()` 时
+
+**实现位置**：[electron/main.js](electron/main.js#L6)
+
+```javascript
+const { ElectronEgg } = require('ee-core');
+const app = new ElectronEgg();
+```
+
+**作用**：
+- 创建 ElectronEgg 应用实例
+- 初始化框架核心模块
+- 准备生命周期管理器
+
+---
+
+### 2. ready - 核心应用就绪
+
+**触发时机**：ee-core 框架加载完成，Electron app 启动之前
+
+**实现位置**：
+- 注册：[electron/main.js](electron/main.js#L10)
+- 实现：[electron/preload/lifecycle.js](electron/preload/lifecycle.js#L12-L14)
+
+```javascript
+// 注册
+app.register("ready", life.ready);
+
+// 实现
+async ready() {
+  logger.info('[lifecycle] ready');
+  // 在这里可以做：
+  // - 初始化数据库连接
+  // - 加载配置文件
+  // - 初始化全局变量
+}
+```
+
+**适用场景**：
+- ✅ 初始化数据库连接
+- ✅ 加载应用配置
+- ✅ 注册全局服务
+- ✅ 初始化日志系统
+- ❌ 不能操作窗口（窗口还未创建）
+
+---
+
+### 3. electronAppReady - Electron 应用就绪
+
+**触发时机**：Electron 的 `app.ready` 事件触发后，主窗口创建之前
+
+**实现位置**：
+- 注册：[electron/main.js](electron/main.js#L11)
+- 实现：[electron/preload/lifecycle.js](electron/preload/lifecycle.js#L19-L21)
+
+```javascript
+// 注册
+app.register("electron-app-ready", life.electronAppReady);
+
+// 实现
+async electronAppReady() {
+  logger.info('[lifecycle] electron-app-ready');
+  // 在这里可以做：
+  // - 注册全局快捷键
+  // - 设置应用菜单
+  // - 初始化托盘图标
+  // - 注册协议处理
+}
+```
+
+**适用场景**：
+- ✅ 注册全局快捷键 (globalShortcut)
+- ✅ 创建应用菜单 (Menu)
+- ✅ 创建系统托盘 (Tray)
+- ✅ 注册自定义协议 (protocol)
+- ⚠️ 可以创建窗口，但通常在框架内部自动创建
+
+---
+
+### 4. mainWindow - 主窗口创建
+
+**触发时机**：框架创建主窗口时（内部流程，不需要手动注册）
+
+**说明**：
+- 这是框架内部自动执行的步骤
+- 根据 `electron/config/config.*.js` 中的 `windowsOption` 配置创建窗口
+- 窗口创建完成后会触发 `windowReady` 钩子
+
+**配置示例**：
+```javascript
+// electron/config/config.default.js
+windowsOption: {
+  width: 1200,
+  height: 800,
+  show: false, // 设置为 false 可实现无白屏启动
+  webPreferences: {
+    contextIsolation: false,
+    nodeIntegration: true
+  }
+}
+```
+
+---
+
+### 5. windowReady - 窗口就绪
+
+**触发时机**：主窗口创建完成，页面加载完毕
+
+**实现位置**：
+- 注册：[electron/main.js](electron/main.js#L12)
+- 实现：[electron/preload/lifecycle.js](electron/preload/lifecycle.js#L26-L37)
+
+```javascript
+// 注册
+app.register("window-ready", life.windowReady);
+
+// 实现
+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(); // 聚焦窗口
+    })
+  }
+
+  // 在这里可以做：
+  // - 向渲染进程发送初始化数据
+  // - 检查更新
+  // - 加载用户配置
+}
+```
+
+**适用场景**：
+- ✅ 操作主窗口 (show/hide/maximize 等)
+- ✅ 向渲染进程发送消息
+- ✅ 执行自动更新检查
+- ✅ 加载用户数据并同步到前端
+- ✅ 实现无白屏启动（配合 `show: false`）
+
+---
+
+### 6. running - 应用运行中
+
+**触发时机**：窗口显示后，应用正常运行期间
+
+**说明**：
+- 这不是一个独立的生命周期钩子
+- 表示应用的正常运行状态
+- 此时所有功能都可用
+
+**可用操作**：
+- IPC 通信（前后端交互）
+- 业务逻辑处理
+- 数据库操作
+- 网络请求
+- 文件系统操作
+
+---
+
+### 7. beforeClose - 关闭前钩子
+
+**触发时机**：用户点击关闭按钮或调用 `app.quit()` 之前
+
+**实现位置**：
+- 注册：[electron/main.js](electron/main.js#L13)
+- 实现：[electron/preload/lifecycle.js](electron/preload/lifecycle.js#L42-L44)
+
+```javascript
+// 注册
+app.register("before-close", life.beforeClose);
+
+// 实现
+async beforeClose() {
+  logger.info('[lifecycle] before-close');
+  // 在这里可以做：
+  // - 保存用户数据
+  // - 关闭数据库连接
+  // - 清理临时文件
+  // - 释放系统资源
+  // - 确认是否退出
+}
+```
+
+**适用场景**：
+- ✅ 保存应用状态
+- ✅ 关闭数据库连接
+- ✅ 清理临时资源
+- ✅ 询问用户是否确认退出
+- ✅ 上传日志或统计数据
+
+**阻止关闭示例**：
+```javascript
+async beforeClose(args, event) {
+  const { dialog } = require('electron');
+  const result = await dialog.showMessageBox({
+    type: 'question',
+    buttons: ['取消', '退出'],
+    message: '确定要退出应用吗？'
+  });
+
+  if (result.response === 0) {
+    // 阻止关闭
+    return false;
+  }
+
+  // 允许关闭
+  return true;
+}
+```
+
+---
+
+### 8. quit - 应用退出
+
+**触发时机**：`beforeClose` 完成后，应用进程终止
+
+**说明**：
+- 这是最终状态，不可逆
+- 所有资源清理应在 `beforeClose` 中完成
+- 退出后进程结束，无法执行代码
+
+---
+
+## 额外生命周期：preload
+
+### preload - 预加载模块
+
+**触发时机**：应用启动时，在所有其他钩子之前
+
+**实现位置**：
+- 注册：[electron/main.js](electron/main.js#L16)
+- 实现：[electron/preload/index.js](electron/preload/index.js#L7-L9)
+
+```javascript
+// 注册
+app.register("preload", preload);
+
+// 实现
+function preload() {
+  logger.info('[preload] load 1');
+  // 在这里可以做：
+  // - 加载环境变量
+  // - 注册原生模块
+  // - 设置全局异常处理
+}
+```
+
+**适用场景**：
+- ✅ 加载环境变量
+- ✅ 注册 Node.js 原生模块
+- ✅ 设置全局错误处理
+- ✅ 初始化第三方 SDK
+
+---
+
+## 实际开发示例
+
+### 示例 1：数据库初始化
+
+```javascript
+// electron/preload/lifecycle.js
+const Database = require('better-sqlite3');
+let db;
+
+class Lifecycle {
+  async ready() {
+    // 在 ready 钩子中初始化数据库
+    const path = require('path');
+    const dbPath = path.join(app.getPath('userData'), 'app.db');
+    db = new Database(dbPath);
+    logger.info('[lifecycle] database initialized');
+  }
+
+  async beforeClose() {
+    // 在关闭前关闭数据库连接
+    if (db) {
+      db.close();
+      logger.info('[lifecycle] database closed');
+    }
+  }
+}
+```
+
+### 示例 2：自动更新检查
+
+```javascript
+// electron/preload/lifecycle.js
+const { autoUpdater } = require('electron-updater');
+
+class Lifecycle {
+  async windowReady() {
+    // 窗口就绪后检查更新
+    const { getMainWindow } = require('ee-core/electron');
+    const win = getMainWindow();
+
+    autoUpdater.checkForUpdates();
+
+    autoUpdater.on('update-available', () => {
+      win.webContents.send('update-available');
+    });
+
+    logger.info('[lifecycle] update check started');
+  }
+}
+```
+
+### 示例 3：托盘图标
+
+```javascript
+// electron/preload/lifecycle.js
+const { Tray, Menu } = require('electron');
+let tray;
+
+class Lifecycle {
+  async electronAppReady() {
+    // 在 Electron 就绪后创建托盘
+    const path = require('path');
+    const iconPath = path.join(__dirname, '../../public/images/tray-icon.png');
+
+    tray = new Tray(iconPath);
+    const contextMenu = Menu.buildFromTemplate([
+      { label: '打开主窗口', click: () => {
+        const { getMainWindow } = require('ee-core/electron');
+        getMainWindow().show();
+      }},
+      { label: '退出', click: () => {
+        const { app } = require('electron');
+        app.quit();
+      }}
+    ]);
+
+    tray.setContextMenu(contextMenu);
+    logger.info('[lifecycle] tray created');
+  }
+}
+```
+
+### 示例 4：无白屏启动
+
+```javascript
+// electron/config/config.default.js
+windowsOption: {
+  width: 1200,
+  height: 800,
+  show: false, // 关键配置：初始不显示
+  backgroundColor: '#ffffff'
+}
+
+// electron/preload/lifecycle.js
+class Lifecycle {
+  async windowReady() {
+    // 页面加载完成后再显示，避免白屏
+    const { getMainWindow } = require('ee-core/electron');
+    const win = getMainWindow();
+
+    win.once('ready-to-show', () => {
+      win.show();
+      win.focus();
+    });
+  }
+}
+```
+
+---
+
+## 生命周期执行顺序总结
+
+```
+1. preload()              # 预加载模块
+2. new ElectronEgg()      # 创建应用实例
+3. ready()                # 核心框架就绪
+4. electronAppReady()     # Electron 就绪
+5. [创建主窗口]           # 框架内部创建窗口
+6. windowReady()          # 窗口就绪
+7. [应用运行中]           # 正常运行状态
+8. beforeClose()          # 关闭前钩子
+9. [应用退出]             # 进程结束
+```
+
+---
+
+## 注意事项
+
+1. **异步支持**：所有生命周期钩子都支持 `async/await`，可以执行异步操作
+
+2. **错误处理**：建议在每个钩子中添加 try-catch 错误处理
+
+3. **顺序依赖**：不要在早期钩子中访问尚未初始化的资源（如在 `ready` 中操作窗口）
+
+4. **性能优化**：避免在钩子中执行耗时操作，会阻塞应用启动
+
+5. **资源清理**：在 `beforeClose` 中务必清理所有资源，避免内存泄漏
+
+6. **日志记录**：建议在每个钩子中记录日志，方便排查问题
+
+---
+
+## 相关文件
+
+- 生命周期注册：[electron/main.js](electron/main.js)
+- 生命周期实现：[electron/preload/lifecycle.js](electron/preload/lifecycle.js)
+- 预加载模块：[electron/preload/index.js](electron/preload/index.js)
+- 窗口配置：[electron/config/config.default.js](electron/config/config.default.js)
+
+---
+
+## 参考资源
+
+- ElectronEgg 官方文档：https://www.kaka996.com/pages/987b1c/
+- Electron 官方文档：https://www.electronjs.org/zh/docs/latest/

electron/README.md

@@ -1,11 +0,0 @@
-#### 基础配置
-    主进程的配置文件在./config文件夹下
-```shell
-# 说明
-bin.js          // 开发配置
-config.default.js // 默认配置文件，开发环境和生产环境都会加载
-config.local.js   // 开发环境配置文件，追加和覆盖default配置文件
-config.prod.js    // 生产环境配置文件，追加和覆盖default配置文件
-nodemon.json      // 开发环境，代码（监控）热加载
-builder.json      // 打包配置
-```

electron/addon/autoUpdater/index.js

@@ -1,170 +0,0 @@
-const { app: electronApp } = require('electron');
-const { autoUpdater } = require("electron-updater");
-const is = require('ee-core/utils/is');
-const Log = require('ee-core/log');
-const Conf = require('ee-core/config');
-const CoreWindow = require('ee-core/electron/window');
-const Electron = require('ee-core/electron');
-
-/**
- * 自动升级插件
- * @class
- */
-class AutoUpdaterAddon {
-
-  constructor() {
-  }
-
-  /**
-   * 创建
-   */
-  create () {
-    Log.info('[addon:autoUpdater] load');
-    const cfg = Conf.getValue('addons.autoUpdater');
-    if ((is.windows() && cfg.windows)
-        || (is.macOS() && cfg.macOS)
-        || (is.linux() && cfg.linux))
-    {
-      // continue
-    } else {
-      return
-    }
-
-    // 是否检查更新
-    if (cfg.force) {
-      this.checkUpdate();
-    }
-
-    const status = {
-      error: -1,
-      available: 1,
-      noAvailable: 2,
-      downloading: 3,
-      downloaded: 4,
-    }
-
-    const version = electronApp.getVersion();
-    Log.info('[addon:autoUpdater] current version: ', version);
-  
-    // 设置下载服务器地址
-    let server = cfg.options.url;
-    let lastChar = server.substring(server.length - 1);
-    server = lastChar === '/' ? server : server + "/";
-    //Log.info('[addon:autoUpdater] server: ', server);
-    cfg.options.url = server;
-  
-    // 是否后台自动下载
-    autoUpdater.autoDownload = cfg.force ? true : false;
-  
-    try {
-      autoUpdater.setFeedURL(cfg.options);
-    } catch (error) {
-      Log.error('[addon:autoUpdater] setFeedURL error : ', error);
-    }
-  
-    autoUpdater.on('checking-for-update', () => {
-      //sendStatusToWindow('正在检查更新...');
-    })
-    autoUpdater.on('update-available', (info) => {
-      info.status = status.available;
-      info.desc = '有可用更新';
-      this.sendStatusToWindow(info);
-    })
-    autoUpdater.on('update-not-available', (info) => {
-      info.status = status.noAvailable;
-      info.desc = '没有可用更新';
-      this.sendStatusToWindow(info);
-    })
-    autoUpdater.on('error', (err) => {
-      let info = {
-        status: status.error,
-        desc: err
-      }
-      this.sendStatusToWindow(info);
-    })
-    autoUpdater.on('download-progress', (progressObj) => {
-      let percentNumber = parseInt(progressObj.percent);
-      let totalSize = this.bytesChange(progressObj.total);
-      let transferredSize = this.bytesChange(progressObj.transferred);
-      let text = '已下载 ' + percentNumber + '%';
-      text = text + ' (' + transferredSize + "/" + totalSize + ')';
-  
-      let info = {
-        status: status.downloading,
-        desc: text,
-        percentNumber: percentNumber,
-        totalSize: totalSize,
-        transferredSize: transferredSize
-      }
-      Log.info('[addon:autoUpdater] progress: ', text);
-      this.sendStatusToWindow(info);
-    })
-    autoUpdater.on('update-downloaded', (info) => {
-      info.status = status.downloaded;
-      info.desc = '下载完成';
-      this.sendStatusToWindow(info);
-
-      // 托盘插件默认会阻止窗口关闭，这里设置允许关闭窗口
-      Electron.extra.closeWindow = true;
-      
-      autoUpdater.quitAndInstall();
-      // const mainWindow = CoreWindow.getMainWindow();
-      // if (mainWindow) {
-      //   mainWindow.destroy()
-      // }
-      // electronApp.appQuit()
-    });
-  }
-
-  /**
-   * 检查更新
-   */
-  checkUpdate () {
-    autoUpdater.checkForUpdates();
-  }
-  
-  /**
-   * 下载更新
-   */
-  download () {
-    autoUpdater.downloadUpdate();
-  }
-
-  /**
-   * 向前端发消息
-   */
-  sendStatusToWindow(content = {}) {
-    const textJson = JSON.stringify(content);
-    const channel = 'app.updater';
-    const win = CoreWindow.getMainWindow();
-    win.webContents.send(channel, textJson);
-  }
-  
-  /**
-   * 单位转换
-   */
-  bytesChange (limit) {
-    let size = "";
-    if(limit < 0.1 * 1024){                            
-      size = limit.toFixed(2) + "B";
-    }else if(limit < 0.1 * 1024 * 1024){            
-      size = (limit/1024).toFixed(2) + "KB";
-    }else if(limit < 0.1 * 1024 * 1024 * 1024){        
-      size = (limit/(1024 * 1024)).toFixed(2) + "MB";
-    }else{                                            
-      size = (limit/(1024 * 1024 * 1024)).toFixed(2) + "GB";
-    }
-
-    let sizeStr = size + "";                        
-    let index = sizeStr.indexOf(".");                    
-    let dou = sizeStr.substring(index + 1 , index + 3);            
-    if(dou == "00"){
-        return sizeStr.substring(0, index) + sizeStr.substring(index + 3, index + 5);
-    }
-
-    return size;
-  }  
-}
-
-AutoUpdaterAddon.toString = () => '[class AutoUpdaterAddon]';
-module.exports = AutoUpdaterAddon;

electron/addon/awaken/index.js

@@ -1,67 +0,0 @@
-const { app: electronApp } = require('electron');
-const Log = require('ee-core/log');
-const Conf = require('ee-core/config');
-
-/**
- * 唤醒插件
- * @class
- */
-class AwakenAddon {
-
-  constructor() {
-    this.protocol = '';
-  }
-
-  /**
-   * 创建
-   */
-  create () {
-    Log.info('[addon:awaken] load');
-
-    const cfg = Conf.getValue('addons.awaken');
-    this.protocol = cfg.protocol;
-  
-    electronApp.setAsDefaultProtocolClient(this.protocol);
-  
-    this.handleArgv(process.argv);
-    electronApp.on('second-instance', (event, argv) => {
-      if (process.platform === 'win32') {
-        this.handleArgv(argv)
-      }
-    })
-  
-    // 仅用于macOS
-    electronApp.on('open-url', (event, urlStr) => {
-      this.handleUrl(urlStr)
-    })
-  }
-
-  /**
-   * 参数处理
-   */  
-  handleArgv(argv) {
-    const offset = electronApp.isPackaged ? 1 : 2;
-    const url = argv.find((arg, i) => i >= offset && arg.startsWith(this.protocol));
-    this.handleUrl(url)
-  }
-
-  /**
-   * url解析
-   */
-  handleUrl(awakeUrlStr) {
-    if (!awakeUrlStr || awakeUrlStr.length === 0) {
-      return
-    }
-    const {hostname, pathname, search} = new URL(awakeUrlStr);
-    let awakeUrlInfo = {
-      urlStr: awakeUrlStr,
-      urlHost: hostname,
-      urlPath: pathname,
-      urlParams: search && search.slice(1)
-    }
-    Log.info('[addon:awaken] awakeUrlInfo:', awakeUrlInfo);
-  }
-}
-
-AwakenAddon.toString = () => '[class AwakenAddon]';
-module.exports = AwakenAddon;

electron/addon/chromeExtension/index.js

@@ -1,94 +0,0 @@
-const { app, session } = require('electron');
-const _ = require('lodash');
-const fs = require('fs');
-const path = require('path');
-const Log = require('ee-core/log');
-
-/**
- * 扩展插件 （electron自身对该功能并不完全支持，官方也不建议使用）
- * @class
- */
-class ChromeExtensionAddon {
-
-  constructor() {
-  }
-
-  /**
-   * 创建
-   */
-  async create () {
-    Log.info('[addon:chromeExtension] load');
-
-    const extensionIds = this.getAllIds();
-    for (let i = 0; i < extensionIds.length; i++) {
-      await this.load(extensionIds[i]);
-    }
-  }
-
-  /**
-   * 获取扩展id列表（crx解压后的目录名，即是该扩展的id）
-   */
-  getAllIds () {
-    const extendsionDir = this.getDirectory();
-    const ids = this.getDirs(extendsionDir);
-
-    return ids;
-  }
-
-  /**
-   * 扩展所在目录
-   */
-  getDirectory () {
-    let extensionDirPath = '';
-    let variablePath = 'build'; // 打包前路径
-    if (app.isPackaged) {
-      variablePath = '..'; // 打包后路径
-    }
-    extensionDirPath = path.join(app.getAppPath(), variablePath, "extraResources", "chromeExtension");
-  
-    return extensionDirPath;
-  }
-
-  /**
-   * 加载扩展
-   */
-  async load (extensionId = '') {
-    if (_.isEmpty(extensionId)) {
-      return false
-    }
-    
-    try {
-      const extensionPath = path.join(this.getDirectory(), extensionId);
-      Log.info('[addon:chromeExtension] extensionPath:', extensionPath);
-      await session.defaultSession.loadExtension(extensionPath, { allowFileAccess: true });
-    } catch (e) {
-      Log.info('[addon:chromeExtension] load extension error extensionId:%s, errorInfo:%s', extensionId, e.toString());
-      return false
-    }
-  
-    return true
-  }
-  
-  /**
-   * 获取目录下所有文件夹
-   */
-  getDirs(dir) {
-    if (!dir) {
-      return [];
-    }
-
-    const components = [];
-    const files = fs.readdirSync(dir);
-    files.forEach(function(item, index) {
-      const stat = fs.lstatSync(dir + '/' + item);
-      if (stat.isDirectory() === true) {
-        components.push(item);
-      }
-    });
-
-    return components;
-  };
-}
-
-ChromeExtensionAddon.toString = () => '[class ChromeExtensionAddon]';
-module.exports = ChromeExtensionAddon;

electron/addon/security/index.js

@@ -1,33 +0,0 @@
-const Log = require('ee-core/log');
-const EE = require('ee-core/ee');
-
-/**
- * 安全插件
- * @class
- */
-class SecurityAddon {
-
-  constructor() {
-  }
-
-  /**
-   * 创建
-   */
-  create () {
-    Log.info('[addon:security] load');
-    const { CoreApp } = EE;
-    const runWithDebug = process.argv.find(function(e){
-      let isHasDebug = e.includes("--inspect") || e.includes("--inspect-brk") || e.includes("--remote-debugging-port");
-      return isHasDebug;
-    })
-  
-    // 不允许远程调试
-    if (runWithDebug) {
-      Log.error('[error] Remote debugging is not allowed,  runWithDebug:', runWithDebug);
-      CoreApp.appQuit();
-    }
-  }
-}
-
-SecurityAddon.toString = () => '[class SecurityAddon]';
-module.exports = SecurityAddon;

electron/addon/tray/index.js

@@ -1,72 +0,0 @@
-const { Tray, Menu } = require('electron');
-const path = require('path');
-const Ps = require('ee-core/ps');
-const Log = require('ee-core/log');
-const Electron = require('ee-core/electron');
-const CoreWindow = require('ee-core/electron/window');
-const Conf = require('ee-core/config');
-const EE = require('ee-core/ee');
-
-/**
- * 托盘插件
- * @class
- */
-class TrayAddon {
-
-  constructor() {
-    this.tray = null;
-  }
-
-  /**
-   * 创建托盘
-   */
-  create () {
-    // 开发环境，代码热更新开启时，会导致托盘中有残影
-    if (Ps.isDev() && Ps.isHotReload()) return;
-    
-    Log.info('[addon:tray] load');
-    const { CoreApp } = EE;
-    const cfg = Conf.getValue('addons.tray');
-    const mainWindow = CoreWindow.getMainWindow();
-
-    // 托盘图标
-    let iconPath = path.join(Ps.getHomeDir(), cfg.icon);
-  
-    // 托盘菜单功能列表
-    let trayMenuTemplate = [
-      {
-        label: '显示',
-        click: function () {
-          mainWindow.show();
-        }
-      },
-      {
-        label: '退出',
-        click: function () {
-          CoreApp.appQuit();
-        }
-      }
-    ]
-  
-    // 点击关闭，最小化到托盘
-    mainWindow.on('close', (event) => {
-      if (Electron.extra.closeWindow == true) {
-        return;
-      }
-      mainWindow.hide();
-      event.preventDefault();
-    });
-    
-    // 实例化托盘
-    this.tray = new Tray(iconPath);
-    this.tray.setToolTip(cfg.title);
-    const contextMenu = Menu.buildFromTemplate(trayMenuTemplate);
-    this.tray.setContextMenu(contextMenu);
-    this.tray.on('double-click', () => {
-      mainWindow.show()
-    })
-  }
-}
-
-TrayAddon.toString = () => '[class TrayAddon]';
-module.exports = TrayAddon;

electron/config/bin.js

@@ -1,108 +0,0 @@
-/**
- * ee-bin 配置
- * 仅适用于开发环境
- */
-module.exports = {
-  /**
-   * development serve ("frontend" "electron" )
-   * ee-bin dev
-   */
-  dev: {
-    frontend: {
-      directory: './frontend',
-      cmd: 'npm',
-      args: ['run', 'dev'],
-      protocol: 'http://',
-      hostname: 'localhost',
-      port: 18091,
-      indexPath: 'index.html'
-    },
-    electron: {
-      directory: './',
-      cmd: 'electron',
-      args: ['.', '--env=local', '--color=always'], // --env: local|prod; '--color=always' 控制台颜色
-    }
-  },
-
-  /**
-   * 构建
-   * ee-bin build
-   */
-  build: {
-    frontend: {
-      directory: './frontend',
-      cmd: 'npm',
-      args: ['run', 'build'],
-    }
-  },
-
-  /**
-   * 移动资源
-   * ee-bin move 
-   */
-  move: {
-    frontend_dist: {
-      dist: './frontend/dist',
-      target: './public/dist'
-    }
-  },  
-
-  /**
-   * 预发布模式（prod）
-   * ee-bin start
-   */
-  start: {
-    directory: './',
-    cmd: 'electron',
-    args: ['.', '--env=prod']
-  },
-
-  /**
-   * 加密
-   */  
-  encrypt: {
-    // confusion - 压缩混淆加密
-    // bytecode - 字节码加密
-    // strict - 先混淆加密，然后字节码加密
-    type: 'confusion',
-    // 文件匹配
-    // ! 符号开头的意思是过滤
-    files: [
-      'electron/**/*.(js|json)',
-      '!electron/config/encrypt.js',
-      '!electron/config/nodemon.json',
-      '!electron/config/builder.json',
-      '!electron/config/bin.json',
-    ],
-    // 需要加密的文件后缀，暂时只支持js
-    fileExt: ['.js'],
-    // 混淆加密配置
-    confusionOptions: {
-      // 压缩成一行
-      compact: true,
-      // 删除字符串文字并将其放置在一个特殊数组中
-      stringArray: true,
-      // 对stringArray的所有字符串文字进行编码，值：'none' | 'base64' | 'rc4'
-      stringArrayEncoding: ['none'],
-      // 注入死代码，注：影响性能
-      deadCodeInjection: false,
-    }
-  },
-
-  /**
-   * 执行自定义命令
-   * ee-bin exec
-   */
-  exec: {
-    node_v: {
-      directory: './',
-      cmd: 'node',
-      args: ['-v'],
-    },
-    npm_v: {
-      directory: './',
-      cmd: 'npm',
-      args: ['-v'],
-    },
-  },   
-};

electron/config/config.default.js

@@ -1,90 +1,59 @@
 'use strict';
 
 const path = require('path');
+const {getBaseDir} = require('ee-core/ps');
 
 /**
  * 默认配置
  */
-module.exports = (appInfo) => {
-
-  const config = {};
-
-  /**
-   * 开发者工具
-   */
-  config.openDevTools = false;
-
-  /**
-   * 应用程序顶部菜单
-   */
-  config.openAppMenu = true;
-
-  /**
-   * 1.507
-   * 主窗口
-   */
-  config.windowsOption = {
-    title: '自动检测平台',
-    width: 1280,
-    height: 850,
-    minWidth: 1280,
-    minHeight: 850,
+module.exports = () => {
+    return {
+        openDevTools: false,
+        singleLock: true,
+        windowsOption: {
+            title: 'NPQS9100-自动检测平台',
+            menuBarVisible: false,
+            width: 1920,
+            height: 1000,
+            minWidth: 1024,
+            minHeight: 640,
             webPreferences: {
                 //webSecurity: false,
                 contextIsolation: false, // false -> 可在渲染进程中使用electron的api，true->需要bridge.js(contextBridge)
                 nodeIntegration: true,
-      //preload: path.join(appInfo.baseDir, 'preload', 'bridge.js'),
+                //preload: path.join(getElectronDir(), 'preload', 'bridge.js'),
             },
             frame: true,
-    show: false,
-    icon: path.join(appInfo.home, 'public', 'images', 'logo-32.png'),
-  };
-
-  /**
-   * ee框架日志
-   */  
-  config.logger = {
-    encoding: 'utf8',
+            show: true,
+            icon: path.join(getBaseDir(), 'public', 'images', 'logo-32.png'),
+        },
+        logger: {
             level: 'INFO',
             outputJSON: false,
-    buffer: true,
-    enablePerformanceTimer: false,
-    rotator: 'day',
-    appLogName: 'pqs9100.log',
-    coreLogName: 'pqs9100-core.log',
-    errorLogName: 'pqs9100-error.log'
-  }
-
-  /**
-   * 远程模式-web地址
-   */    
-  config.remoteUrl = {
-    enable: false,
-    url: 'http://electron-egg.kaka996.com/'
-  };
-
-  /**
-   * 内置socket服务
-   */   
-  config.socketServer = {
-    enable: false, // 是否开启
-    port: 7070,// 默认端口
-    path: "/socket.io/", // 默认路径名称
-    connectTimeout: 45000, // 客户端连接超时时间
-    pingTimeout: 30000, // 心跳检测超时时间
-    pingInterval: 25000, // 心跳检测间隔时间
-    maxHttpBufferSize: 1e8, // 每条消息的数据最大值
-    transports: ["polling", "websocket"], // http轮询和websocket
-    cors: {
-      origin: true, // http协议时，需要设置允许跨域
+            appLogName: '9100.log',
+            coreLogName: '9100-core.log',
+            errorLogName: '9100-error.log'
         },
-    channel: 'c1' // 默认频道c1，可以自定义
-  };
-
-  /**
-   * 内置http服务
-   */     
-  config.httpServer = {
+        // 远程web地址
+        remote: {
+            enable: false,
+            url: ''
+        },
+        socketServer: {
+            enable: false,
+            port: 7070,
+            path: "/socket.io/",
+            connectTimeout: 45000,
+            pingTimeout: 30000,
+            pingInterval: 25000,
+            maxHttpBufferSize: 1e8,
+            transports: ["polling", "websocket"],
+            cors: {
+                origin: true,
+            },
+            channel: 'socket-channel'
+        },
+        httpServer: {
             enable: false,
             https: {
                 enable: false,
@@ -93,93 +62,10 @@ module.exports = (appInfo) => {
             },
             host: '127.0.0.1',
             port: 7071,
-    cors: {
-      origin: "*" // 默认允许跨域
         },
-    body: {
-      multipart: true,
-      formidable: {
-        keepExtensions: true
-      }
-    },
-    filterRequest: {
-      uris:  [
-        'favicon.ico' // 默认过滤的uri favicon.ico
-      ],
-      returnData: ''
-    }
-  };
-
-  /**
-   * 主进程
-   */     
-  config.mainServer = {
-    protocol: 'file://',
+        mainServer: {
             indexPath: '/public/dist/index.html',
-  }; 
-
-  /**
-   * 硬件加速
-   */
-  config.hardGpu = {
-    enable: true
-  };
-
-  /**
-   * 异常捕获
-   */
-  config.exception = {
-    mainExit: false, // 主进程退出时是否捕获异常
-    childExit: true,
-    rendererExit: true,
-  };
-
-  /**
-   * jobs
-   */
-  config.jobs = {
-    messageLog: true // 是否打印进程间通信的消息log
-  };
-
-  /**
-   * 插件功能
-   * @param window 官方内置插件
-   * @param tray 托盘插件
-   * @param security 安全插件
-   * @param awaken 唤醒插件
-   * @param autoUpdater 自动升级插件
-   */
-  config.addons = {
-    window: {
-      enable: true,
-    },
-    tray: {
-      enable: true,
-      title: '自动检测平台',
-      icon: '/public/images/tray.png'
-    },
-    security: {
-      enable: true,
-    },
-    awaken: {
-      enable: true,
-      protocol: 'ee',
-      args: []
-    },
-    autoUpdater: {
-      enable: true,
-      windows: false, 
-      macOS: false, 
-      linux: false,
-      options: {
-        provider: 'generic', 
-        url: 'http://kodo.qiniu.com/'
-      },
-      force: false,
+            channelSeparator: '/',
+        }
     }
-  };
-
-  return {
-    ...config
-  };
 }

electron/config/config.local.js

@@ -1,31 +1,13 @@
 'use strict';
 
 /**
- * 开发环境配置，覆盖 config.default.js
+ * Development environment configuration, coverage config.default.js
  */
-module.exports = (appInfo) => {
-  const config = {};
-
-  /**
-   * 开发者工具
-   */
-  config.openDevTools = {
-    mode: 'undocked'
-  };
-
-  /**
-   * 应用程序顶部菜单
-   */
-  config.openAppMenu = false;
-
-  /**
-   * jobs
-   */
-  config.jobs = {
-    messageLog: true
-  };   
-
+module.exports = () => {
   return {
-    ...config
+    openDevTools: false,
+    jobs: {
+      messageLog: false
+    }
   };
 };

electron/config/config.prod.js

@@ -1,29 +1,10 @@
 'use strict';
 
 /**
- * 生产环境配置，覆盖 config.default.js
+ *  coverage config.default.js
  */
-module.exports = (appInfo) => {
-  const config = {};
-
-  /**
-   * 开发者工具
-   */
-  config.openDevTools = true;
-
-  /**
-   * 应用程序顶部菜单
-   */
-  config.openAppMenu = false;
-
-  /**
-   * jobs
-   */
-  config.jobs = {
-    messageLog: false
-  }; 
-
+module.exports = () => {
   return {
-    ...config
+    openDevTools: false,
   };
 };

electron/config/nodemon.json

@@ -1,13 +0,0 @@
-{
-  "watch": [
-    "electron/",
-    "main.js"
-  ],
-  "ignore": [],
-  "ext": "js,json",
-  "verbose": true,
-  "exec": "electron . --env=local --hot-reload=1",
-  "restartable": "hr",
-  "colours": true,
-  "events": {}
-}

electron/controller/example.js

@@ -1,19 +1,13 @@
 'use strict';
 
-const { Controller } = require('ee-core');
-const Log = require('ee-core/log');
-const Services = require('ee-core/services');
+const { logger } = require('ee-core/log');
+const { exampleService } = require('../service/example');
 
 /**
  * example
  * @class
  */
-class ExampleController extends Controller {
-
-  constructor(ctx) {
-    super(ctx);
-  }
-
+class ExampleController {
 
   /**
    * 所有方法接收两个参数
@@ -25,12 +19,12 @@ class ExampleController extends Controller {
    * test
    */
   async test () {
-    const result = await Services.get('example').test('electron');
-    Log.info('service result:', result);
+    const result = await exampleService.test('electron');
+    logger.info('service result:', result);
 
     return 'hello electron-egg';
   }
 }
-
 ExampleController.toString = () => '[class ExampleController]';
+
 module.exports = ExampleController; 

electron/index.js

@@ -1,50 +0,0 @@
-const { Application } = require('ee-core');
-
-class Index extends Application {
-
-  constructor() {
-    super();
-    // this === eeApp;
-  }
-
-  /**
-   * core app have been loaded
-   */
-  async ready () {
-    // do some things
-  }
-
-  /**
-   * electron app ready
-   */
-  async electronAppReady () {
-    // do some things
-  }
-
-  /**
-   * main window have been loaded
-   */
-  async windowReady () {
-    // do some things
-    // 延迟加载，无白屏
-    const winOpt = this.config.windowsOption;
-    if (winOpt.show == false) {
-      const win = this.electron.mainWindow;
-      win.once('ready-to-show', () => {
-        win.show();
-        win.focus();
-      })
-    }
-  }
-
-  /**
-   * before app close
-   */  
-  async beforeClose () {
-    // do some things
-
-  }
-}
-
-Index.toString = () => '[class Index]';
-module.exports = Index;

electron/jobs/example/hello.js

@@ -1,5 +0,0 @@
-const Log = require('ee-core/log');
-
-exports.welcome = function () {
-  Log.info('[child-process] [jobs/example/hello] welcome ! ');
-}

electron/jobs/example/timer.js

@@ -1,29 +0,0 @@
-const Job = require('ee-core/jobs/baseJobClass');
-const Log = require('ee-core/log');
-const Ps = require('ee-core/ps');
-
-/**
- * example - TimerJob
- * @class
- */
-class TimerJob extends Job {
-
-  constructor(params) {
-    super();
-    this.params = params;
-  }
-
-  /**
-   * handle()方法是必要的，且会被自动调用
-   */
-  async handle () {
-    Log.info("[child-process] TimerJob params: ", this.params);
-
-    if (Ps.isChildJob()) {
-      Ps.exit();
-    }
-  }   
-}
-
-TimerJob.toString = () => '[class TimerJob]';
-module.exports = TimerJob;

electron/main.js

@@ -0,0 +1,19 @@
+const { ElectronEgg } = require('ee-core');
+const { Lifecycle } = require('./preload/lifecycle');
+const { preload } = require('./preload');
+
+// new app
+const app = new ElectronEgg();
+
+// register lifecycle
+const life = new Lifecycle();
+app.register("ready", life.ready);
+app.register("electron-app-ready", life.electronAppReady);
+app.register("window-ready", life.windowReady);
+app.register("before-close", life.beforeClose);
+
+// register preload
+app.register("preload", preload);
+
+// run
+app.run();

electron/preload/index.js

@@ -1,14 +1,16 @@
 /*************************************************
  ** preload为预加载模块，该文件将会在程序启动时加载 **
  *************************************************/
-const Addon = require('ee-core/addon');
 
-/**
-* 预加载模块入口
-*/
-module.exports = async () => {
+ const { logger } = require('ee-core/log');
  
-  // 示例功能模块，可选择性使用和修改
-  Addon.get('tray').create();
-  Addon.get('security').create();
-}
+ function preload() {
+   logger.info('[preload] load 1');
+ }
+ 
+ /**
+ * 预加载模块入口
+ */
+ module.exports = {
+   preload
+ }

electron/preload/lifecycle.js

@@ -0,0 +1,58 @@
+'use strict';
+
+const { logger } = require('ee-core/log');
+const { getConfig } = require('ee-core/config');
+const { getMainWindow } = require('ee-core/electron');
+
+class Lifecycle {
+
+  /**
+   * core app have been loaded
+   */
+  async ready() {
+    logger.info('[lifecycle] ready');
+    // 在这里可以做：
+    // - 初始化数据库连接
+    // - 加载配置文件
+    // - 初始化全局变量
+  }
+
+  /**
+   * electron app ready
+   */
+  async electronAppReady() {
+    logger.info('[lifecycle] electron-app-ready');
+  }
+
+  /**
+   * main window have been loaded
+   */
+  async windowReady() {
+    logger.info('[lifecycle] window-ready');
+
+    // 延迟加载，无白屏
+    const win = getMainWindow();
+    const { windowsOption } = getConfig();
+    if (windowsOption.show == false) {
+      win.once('ready-to-show', () => {
+        win.show();
+        win.focus();
+      })
+    } else {
+      win.show();
+      win.focus();
+    }
+  }
+
+  /**
+   * before app close
+   */  
+  async beforeClose() {
+    logger.info('[lifecycle] before-close');
+  }
+}
+Lifecycle.toString = () => '[class Lifecycle]';
+
+module.exports = {
+  Lifecycle
+};

electron/service/example.js

@@ -1,16 +1,12 @@
 'use strict';
 
-const { Service } = require('ee-core');
+const { logger } = require('ee-core/log');
 
 /**
- * 示例服务（service层为单例）
+ * 示例服务
  * @class
  */
-class ExampleService extends Service {
-
-  constructor(ctx) {
-    super(ctx);
-  }
+class ExampleService {
 
   /**
    * test
@@ -21,9 +17,14 @@ class ExampleService extends Service {
       params: args
     }
 
+    logger.info('ExampleService obj:', obj);
+
     return obj;
   }
 }
-
 ExampleService.toString = () => '[class ExampleService]';
-module.exports = ExampleService;
+
+module.exports = {
+  ExampleService,
+  exampleService: new ExampleService()
+};

frontend/.env.development

@@ -19,7 +19,9 @@ VITE_API_URL=/api
 
 # 开发环境跨域代理，支持配置多个
 
-# VITE_PROXY=[["/api","http://192.168.1.122:18092/"]]
- VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]洪圣文
+#VITE_PROXY=[["/api","http://127.0.0.1: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

frontend/.env.production

@@ -22,4 +22,7 @@ VITE_DROP_CONSOLE=true
 VITE_PWA=true
 
 # 线上环境接口地址
+#VITE_API_URL="/api" # 打包时用
 VITE_API_URL="http://192.168.1.125:18092/"
+# 开启激活验证
+VITE_ACTIVATE_OPEN=false

frontend/.prettierrc

@@ -0,0 +1,11 @@
+{
+    "singleQuote": true,
+    "trailingComma": "none",
+    "tabWidth": 4,
+    "printWidth": 120,
+    "useTabs": false,
+    "semi": false,
+    "arrowParens": "avoid",
+    "endOfLine": "lf",
+    "htmlWhitespaceSensitivity": "ignore"
+}

frontend/package.json

@@ -14,7 +14,10 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
+    "@types/event-source-polyfill": "^1.0.5",
+    "@vue-flow/core": "^1.45.0",
     "@vueuse/core": "^10.4.1",
+    "autofit.js": "^3.2.8",
     "axios": "^1.7.3",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.9",
@@ -22,9 +25,12 @@
     "echarts": "^5.4.3",
     "echarts-liquidfill": "^3.1.0",
     "element-plus": "^2.7.8",
+    "event-source-polyfill": "^1.0.31",
+    "html2canvas": "^1.4.1",
     "md5": "^2.3.0",
     "mitt": "^3.0.1",
     "mkdirp": "^3.0.1",
+    "node-forge": "^1.3.1",
     "nprogress": "^0.2.0",
     "pinia": "^2.2.1",
     "pinia-plugin-persistedstate": "^3.2.1",
@@ -41,11 +47,14 @@
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.8.0",
     "@tsconfig/node20": "^20.1.4",
+    "@types/html2canvas": "^1.0.0",
     "@types/md5": "^2.3.2",
     "@types/node": "^20.14.14",
+    "@types/node-forge": "^1.3.11",
     "@types/nprogress": "^0.2.0",
     "@types/qs": "^6.9.8",
     "@types/sortablejs": "^1.15.2",
+    "@types/xlsx": "^0.0.36",
     "@typescript-eslint/eslint-plugin": "^6.7.0",
     "@typescript-eslint/parser": "^6.7.0",
     "@vitejs/plugin-vue": "^5.0.5",
@@ -67,11 +76,11 @@
     "unplugin-auto-import": "^0.18.3",
     "unplugin-vue-components": "^0.27.4",
     "unplugin-vue-setup-extend-plus": "^1.0.0",
-    "vite": "^5.3.1",
+    "vite": "^5.4.19",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
-    "vite-plugin-node-polyfills": "^0.22.0",
+    "vite-plugin-node-polyfills": "^0.24.0",
     "vite-plugin-pwa": "^0.16.5",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-tsc": "^2.0.21"

frontend/src/App.vue

@@ -1,27 +1,24 @@
 <template>
     <!--element-plus语言国际化，全局修改为中文-->
-  <el-config-provider
-    :locale='locale'
-    :size='assemblySize'
-    :button='buttonConfig'
-  >
-    <router-view :key='$route.fullPath' />
+    <el-config-provider :locale="locale" :size="assemblySize" :button="buttonConfig">
+        <router-view />
     </el-config-provider>
 </template>
 
-<script lang='ts' setup>
-defineOptions({
-  name: 'App',
-})
+<script lang="ts" setup>
 import { useI18n } from 'vue-i18n'
 import { getBrowserLang } from '@/utils'
 import { useTheme } from '@/hooks/useTheme'
 import { ElConfigProvider } from 'element-plus'
-import { LanguageType } from './stores/interface'
+import { type LanguageType } from './stores/interface'
 import { useGlobalStore } from '@/stores/modules/global'
 import en from 'element-plus/es/locale/lang/en'
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 
+defineOptions({
+    name: 'App'
+})
+
 const globalStore = useGlobalStore()
 
 // init theme
@@ -34,6 +31,14 @@ 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
@@ -51,4 +56,10 @@ const buttonConfig = reactive({ autoInsertSpace: false })
 
 document.getElementById('loadingPage')?.remove()
 </script>
-<style scoped></style>
+<style scoped>
+#app {
+    width: 100vw;
+    height: 100vh;
+    overflow: hidden;
+}
+</style>

frontend/src/api/activate/index.ts

@@ -0,0 +1,14 @@
+import http from '@/api'
+import type { Activate } from '@/api/activate/interface'
+
+export const generateApplicationCode = (params: Activate.ApplicationCodePlaintext) => {
+    return http.post(`/activate/generateApplicationCode`, params)
+}
+
+export const verifyActivationCode = (activationCode: string) => {
+    return http.post(`/activate/verifyActivationCode`, { activationCode })
+}
+
+export const getLicense = () => {
+    return http.post(`/activate/getLicense`)
+}

frontend/src/api/activate/interface/index.ts

@@ -0,0 +1,55 @@
+//激活模块
+export namespace Activate {
+
+    export interface ApplicationModule {
+        /**
+         * 是否申请 1是 0否
+         */
+        apply: number;
+    }
+
+    export interface ActivateModule extends ApplicationModule {
+        /**
+         * 是否永久 1是 0否
+         */
+        permanently: number;
+    }
+
+    export interface ApplicationCodePlaintext {
+
+        /**
+         * 模拟式模块
+         */
+        simulate: ApplicationModule;
+
+        /**
+         * 数字式模块
+         */
+        digital: ApplicationModule;
+
+        /**
+         * 比对式模块
+         */
+        contrast: ApplicationModule;
+    }
+    export interface ActivationCodePlaintext {
+
+        /**
+         * 模拟式模块
+         */
+        simulate: ActivateModule;
+
+        /**
+         * 数字式模块
+         */
+        digital: ActivateModule;
+
+        /**
+         * 比对式模块
+         */
+        contrast: ActivateModule;
+    }
+
+
+
+}

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

@@ -0,0 +1,240 @@
+export namespace CheckData {
+    export interface DataCheck {
+        scriptName: string
+        errorSysId: string
+        dataRule: string
+        deviceName: string
+        chnNum: string
+        deviceId: string
+        num?: string | number
+    }
+
+    export interface PhaseCheckResult {
+        // 检测源定值-标准值
+        resultData: number
+        // 装置原始数据-被检值
+        data: number
+
+        // 误差值
+        errorData: number
+        // 第几次谐波
+        num?: number
+        //符合、不符合
+        isData?: number
+        //最大误差值
+        radius?: string
+        unit?: string
+    }
+    export interface DataItem {
+        num: number
+        isData: number
+        data: number
+        resultData: number
+        radius: string
+        errorData: number
+        unit: string
+    }
+
+    export interface TableRow {
+        isData: number
+        harmNum: number
+        radius: string
+        dataA: DataItem
+        dataB: DataItem
+        dataC: DataItem
+        dataT: DataItem | null
+        unit: string
+        timeDev?: string
+        uaDev?: string | number
+        ubDev?: string | number
+        ucDev?: string | number
+        utDev?: string | number
+        uaStdDev?: string | number
+        ubStdDev?: string | number
+        ucStdDev?: string | number
+        utStdDev?: string | number
+    }
+
+    /**
+     * 用于定义 查看（设备）通道检测结果响应数据 类型
+     */
+    export interface ResCheckResult {
+        dataA?: PhaseCheckResult | null
+        dataB?: PhaseCheckResult | null
+        dataC?: PhaseCheckResult | null
+        dataT?: PhaseCheckResult | null
+
+        // 第几次谐波
+        //num: number | null,
+        //符合、不符合
+        isData?: number
+        //最大误差值
+        radius?: string
+        //单位
+        unit?: string
+    }
+
+    /**
+     * 用于定义 查看（设备）通道检测结果表格展示数据 类型
+     */
+    export interface CheckResult {
+        stdA?: string
+        dataA?: string
+        errorA?: string
+        maxErrorA?: string
+        isDataA?: number
+        unitA?: string
+        stdB?: string
+        dataB?: string
+        errorB?: string
+        maxErrorB?: string
+        isDataB?: number
+        unitB?: string
+        stdC?: string
+        dataC?: string
+        errorC?: string
+        maxErrorC?: string
+        isDataC?: number
+        unitC?: string
+        stdT?: string
+        dataT?: string
+        errorT?: string
+        maxErrorT?: string
+        isDataT?: number
+        unitT?: string
+
+        //最大误差值
+        maxError?: string
+        unit?: string
+        //符合、不符合
+        result?: number
+    }
+
+    /**
+     * 用于定义 具体通道的原始数据类型
+     */
+    export interface RawDataItem {
+        time?: string
+        harmNum?: number | null
+        dataA?: string
+        dataB?: string
+        dataC?: string
+        dataT?: string
+        unit?: string | null
+    }
+
+    export interface Device {
+        deviceId: string //装置序号Id
+        deviceName: string //设备名称
+        chnNum: number //设备通道数
+
+        planId: string //计划Id
+        devType: string //设备类型
+        devVolt: number //设备电压
+        devCurr: number //设备电流
+        factorFlag: number //是否支持系数校准
+        checkResult: number //检测结果
+        chnNumList: string[] //连线存储数据
+    }
+
+    // 用来描述检测脚本类型
+    export interface ScriptItem {
+        id: string
+        code: string
+        scriptName: string
+    }
+
+    // 用来描述 检测数据-左侧树结构
+    export interface TreeItem {
+        id: string | null
+        scriptTypeName: string | null
+        sourceDesc: string | null
+        harmNum: number | null
+        index: number | null
+        fly: number | null
+        children: TreeItem[] | null
+    }
+
+    // 用来描述 通道检测结果
+    export enum ChnCheckResultEnum {
+        UNKNOWN = -1,
+        LOADING = 0,
+        SUCCESS = 1,
+        FAIL = 2,
+        TIMEOUT = 3,
+        ERRORDATA = 4,
+        NOT_PART_IN_ERROR = 5
+    }
+
+    export interface DeviceCheckResult {
+        deviceId: string
+        deviceName: string
+        code?: string
+        chnResult: ChnCheckResultEnum[] //通道检测结果
+    }
+
+    //用来描述 某个脚本测试项对所有通道的检测结果
+    export interface ScriptChnItem {
+        scriptType: string
+        scriptName?: string //可以不要该属性，有点多余
+        code?: string
+        // 设备
+        devices: Array<DeviceCheckResult>
+    }
+
+    export enum ButtonColorEnum {
+        INFO = '#909399',
+        LOADING = 'var(--el-color-primary)',
+        SUCCESS = '#91cc75',
+        WARNING = '#e6a23c',
+        DANGER = '#f56c6c'
+    }
+
+    /**
+     * 用于描述 （设备）通道检测结果展示的按钮类型
+     */
+    export interface ButtonResult {
+        color: ButtonColorEnum
+        icon: 'More' | 'Loading' | 'Close' | 'CircleCheckFilled' | 'Link' | 'WarnTriangleFilled' | 'Minus'
+    }
+
+    /**
+     * 用于描述 脚本检测结果展示的按钮类型
+     */
+    export interface ScriptChnViewItem {
+        scriptType: string
+        scriptName?: string //脚本项名称，可以不要该属性，有点多余
+
+        // 设备
+        devices: Array<{
+            deviceId: string
+            deviceName: string
+            chnResult: ButtonResult[]
+        }>
+    }
+
+    /**
+     * 定义检测日志类型
+     */
+    export interface LogItem {
+        type: 'info' | 'warning' | 'error'
+        log: string
+    }
+
+    /**
+     * 定义手动检测时，勾选的测试项
+     */
+    export interface SelectTestItem {
+        preTest: boolean
+        timeTest: boolean
+        channelsTest: boolean
+        test: boolean
+    }
+
+    //描述比对式检测项描述
+    export interface CompareTestItem {
+        id: string
+        code: string
+        name: string
+    }
+}

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

@@ -0,0 +1,143 @@
+import { pa } from 'element-plus/es/locale/index.mjs';
+import http from '@/api'
+import {CheckData} from '@/api/check/interface'
+
+export const getBigTestItem = (params: {
+    reCheckType: number
+    planId: string
+    devIds: string[]
+    patternId: string
+}) => {
+    return http.post(`/adPlan/getBigTestItem`, params, {loading: false})
+}
+
+export const getScriptList = (params: {
+    devId:string,
+    chnNum:number,
+    num:number
+}) => {
+    return http.post('/result/getCheckItem', params, {loading: false})
+}
+
+/**
+ * 获取弹出框表单数据
+ * @param params 当为scriptType为null时，表示查询所有脚本类型，否则只查询指定脚本类型。当为chnNum为-1时，表示查询所有通道，否则只查询指定通道。
+ */
+export const getFormData = (params: {
+    planId: string
+    deviceId: string
+    chnNum: string
+    scriptType: string | null
+}) => {
+    return http.post('/result/formContent/', params, {loading: false})
+}
+
+/**
+ * 获取树形结构数据
+ * @param params
+ */
+export const getTreeData = (params: {
+    scriptId?: string
+    devId?: string
+    devNum?: string
+    scriptType?: string | null
+    code?: string
+}) => {
+    return http.post<CheckData.TreeItem[]>('/result/treeData/', params, {loading: false})
+}
+
+/**
+ * 获取检查数据
+ * @param params
+ */
+export const getTableData = (params: {
+    scriptType: string | null
+    scriptId: string
+    devId: string
+    devNum: string
+    code: string
+    index: number
+}) => {
+    return http.post('/result/resultData/', params, {loading: false})
+}
+
+export const exportRawData = (params: {
+    scriptType: string | null
+    scriptId: string
+    devId: string
+    devNum: string
+    code: string
+    index: number
+}) => {
+    return http.download('/result/exportRawData', params, {loading: false})
+}
+
+/**
+ * 重新计算
+ * @param params
+ */
+export const reCalculate = (params: {
+    planId: string
+    scriptId: string
+    errorSysId: string
+    deviceId: string
+    code: string
+    patternId: string
+  
+}) => {
+    return http.post('/result/reCalculate', params, {loading: true})
+}
+
+/**
+ * 获取数据获取基本信息
+ * @param params
+ */
+export const getContrastFormContent = (params: {
+    planId: string
+    scriptType: string
+    deviceId: string
+    chnNum: string
+    num: number | null
+    patternId: string
+}) => {
+    return http.post('/result/getContrastFormContent', params, {loading: false})
+}
+/**
+ * 获取检测结果
+ * @param params
+ */
+export const getContrastResult = (params: {
+    planId: string
+    scriptType: string
+    deviceId: string
+    chnNum: string | number
+    num: number | string | null
+    waveNum: number | null
+    isWave: boolean
+    patternId: string
+}) => {
+    return http.post('/result/getContrastResult', params, {loading: true})
+}
+
+/**
+ * 更换误差体系
+ * @param params
+ */
+export const changeErrorSystem = (params: {
+    planId: string
+    scriptId: string
+    errorSysId: string
+    deviceId: string
+    code: string
+    patternId: string
+}) => {
+    return http.post('/result/changeErrorSystem', params, {loading: true})
+}
+
+/**
+ * 删除（误差体系切换时产生的）临时表
+ * @param code
+ */
+export const deleteTempTable = (code: string) => {
+    return http.get(`/result/deleteTempTable?code=${code}`, null, {loading: false})
+}

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

@@ -0,0 +1,24 @@
+
+import type { controlSource } from '@/api/device/interface/controlSource'
+import http from '@/api'
+
+/**
+ * @name 程控源管理模块
+ */
+
+//通讯校验
+export const checkSimulate = (params: controlSource.ResControl) => {
+  return http.post(`/prepare/ytxCheckSimulate`,params)
+}
+
+//启动
+export const startSimulateTest = (params: controlSource.ResControl) => {
+  return http.post(`prepare/startSimulateTest`,params,{loading:false})
+}
+
+//停止
+export const closeSimulateTest = (params: controlSource.ResControl) => {
+  return http.post(`/prepare/closeSimulateTest`,params,{loading:false})
+}
+
+

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

@@ -0,0 +1,29 @@
+import type { DevType } from '@/api/device/interface/devType'
+import http from '@/api'
+
+/**
+ * @name 设备类型管理模块
+ */
+
+//获取设备类型
+export const getDevTypeList = (params: DevType.ReqPqDevTypeParams) => {
+  return http.post(`/devType/list`, params)
+}
+
+//添加设备类型
+export const addDevType = (params: DevType.ResPqDevType) => {
+    return http.post(`/devType/add`, params)
+  }
+  
+  //编辑设备类型
+  export const updateDevType = (params: DevType.ResPqDevType) => {
+    return http.post(`/devType/update`, params)
+  }
+  
+  //删除设备类型
+  export const deleteDevType = (params: string[]) => {
+    return http.post(`/devType/delete`, params)
+  }
+
+
+

frontend/src/api/device/device.ts

@@ -1,18 +0,0 @@
-import { ResPage } from '@/api/interface'
-import { Device } from './interface'
-import { ADMIN as rePrefix } from '@/api/config/serviceName'
-import http from '@/api'
-
-/**
- * @name 被检设备管理模块
- */
-// 获取检测脚本列表
-export const getDeviceList = (params: Device.ReqDeviceParams) => {
-   return http.post<ResPage<Device.ResDeviceList>>(`/RoleList_Post`, params)
-  // return http.post<ResPage<Role.ResRoleList>>(`${rePrefix}/device/list`, params)
-}
-
-export const getPlan_DeviceList = (params: Device.DeviceList) => {
-  //return http.post<ResPage<Device.ResDeviceList>>(`/RoleList_Post`, params)
- // return http.post<ResPage<Role.ResRoleList>>(`${rePrefix}/device/list`, params)
-}

frontend/src/api/device/device/deviceData.ts

@@ -0,0 +1,269 @@
+const data = [
+    {
+      id: 'device1',
+      deviceName:"模拟装置1",
+      deviceType:"PQS882B4电能质量监测装置",
+      deviceChannels:"4",
+      planName: "沧州220kV留古等4座变电站电能质量检测",
+      deviceUn: "57.74",
+      deviceIn: "5",
+      deviceCompany: "南京灿能电力自动化股份有限公司",
+      deviceModel: "模拟式",
+      },
+      {
+        id: 'device2',
+        deviceName:"模拟装置2",
+        deviceType:"PQS882A电能质量监测装置",
+        deviceChannels:"1",
+        planName: "邯郸220kV团城站等4座站电能质量检测",
+        deviceUn: "57.74",
+        deviceIn: "5",
+        deviceCompany: "南京灿能电力自动化股份有限公司",
+        deviceModel: "模拟式",
+      },
+      {
+        id: 'device3',
+        deviceName:"模拟装置3",
+        deviceType:"PQS882A电能质量监测装置",
+        deviceChannels:"1",
+        planName: "衡水冀州光伏电站配套出口工程",
+        deviceUn: "57.74",
+        deviceIn: "1",
+        deviceCompany: "南京灿能电力自动化股份有限公司",
+        deviceModel: "模拟式",
+    },
+    {
+        id: 'device4',
+        deviceName:"模拟装置4",
+        deviceType:"PMC-680M-22-22-00-115ANBC电能质量监测装置",
+        deviceChannels:"4",
+        planName: "深圳市中电软件有限公司委托送检",
+        deviceUn: "57.74",
+        deviceIn: "5",
+        deviceCompany: "深圳中电电力技术股份有限公司",
+        deviceModel: "模拟式",
+    },
+    ]
+    const plan_devicedata = [
+      {
+        id: '1',     //装置序号ID
+        name: '240001', //设备名称
+        dev_Type: 'PQS-882B4',//设备类型
+        dev_Chns: 4,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+      {
+        id: '2',     //装置序号ID
+        name: '240002', //设备名称
+        dev_Type: 'PQS-882B4',//设备类型
+        dev_Chns: 4,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+      {
+        id: '3',     //装置序号ID
+        name: '240003', //设备名称
+        dev_Type: 'PQS-882B4',//设备类型
+        dev_Chns: 4,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+      {
+        id: '4',     //装置序号ID
+        name: '240004', //设备名称
+        dev_Type: 'PQS-882B4',//设备类型
+        dev_Chns: 4,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+      {
+        id: '5',     //装置序号ID
+        name: '240005', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '不符合', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'检测完成',//检测状态
+        reCheck_Num: 1, //复检次数
+      },
+      {
+        id: '6',     //装置序号ID
+        name: '240006', //设备名称
+        dev_Type: 'PQS-882B4',//设备类型
+        dev_Chns: 4,  //设备通道数
+        check_Result: '不符合', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'检测完成',//检测状态
+        reCheck_Num: 1, //复检次数
+      },
+      {
+        id: '7',     //装置序号ID
+        name: '240007', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '符合', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'检测完成',//检测状态
+        reCheck_Num: 1, //复检次数
+      },
+      {
+        id: '8',     //装置序号ID
+        name: '240008', //设备名称
+        dev_Type: 'PQS-882B4',//设备类型
+        dev_Chns: 4,  //设备通道数
+        check_Result: '符合', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'检测完成',//检测状态
+        reCheck_Num: 1, //复检次数
+      },
+      {
+        id: '9',     //装置序号ID
+        name: '240009', //设备名称
+        dev_Type: 'PQS-882B4',//设备类型
+        dev_Chns: 4,  //设备通道数
+        check_Result: '不符合', //检测结果
+        report_State: '已生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'检测完成',//检测状态
+        reCheck_Num: 1, //复检次数
+      },
+      {
+        id: '10',     //装置序号ID
+        name: '240010', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '符合', //检测结果
+        report_State: '已生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'检测完成',//检测状态
+        reCheck_Num: 2, //复检次数
+      },
+      {
+        id: '11',     //装置序号ID
+        name: '240011', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '符合', //检测结果
+        report_State: '已生成', //报告状态
+        document_State: '已归档', //归档状态
+        check_State:'检测完成',//检测状态
+        reCheck_Num: 1, //复检次数
+      },
+      {
+        id: '12',     //装置序号ID
+        name: '240012', //设备名称
+        dev_Type: 'PQS-882B4',//设备类型
+        dev_Chns: 4,  //设备通道数
+        check_Result: '符合', //检测结果
+        report_State: '已生成', //报告状态
+        document_State: '已归档', //归档状态
+        check_State:'检测完成',//检测状态
+        reCheck_Num: 2, //复检次数
+      },
+      {
+        id: '13',     //装置序号ID
+        name: '240013', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+      {
+        id: '14',     //装置序号ID
+        name: '240014', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+      {
+        id: '15',     //装置序号ID
+        name: '240015', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+      {
+        id: '16',     //装置序号ID
+        name: '240016', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+      {
+        id: '17',     //装置序号ID
+        name: '240017', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+      {
+        id: '18',     //装置序号ID
+        name: '240018', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+      {
+        id: '19',     //装置序号ID
+        name: '240019', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+      {
+        id: '20',     //装置序号ID
+        name: '240020', //设备名称
+        dev_Type: 'PQS-882A',//设备类型
+        dev_Chns: 1,  //设备通道数
+        check_Result: '未检', //检测结果
+        report_State: '未生成', //报告状态
+        document_State: '未归档', //归档状态
+        check_State:'未检',//检测状态
+        reCheck_Num: 0, //复检次数
+      },
+    ]
+  export default {data,plan_devicedata}

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

@@ -0,0 +1,74 @@
+import { pa } from 'element-plus/es/locale/index.mjs';
+import type {Device} from '@/api/device/interface/device'
+import http from '@/api'
+
+/**
+ * @name 被检设备管理模块
+ */
+
+//获取被检设备
+export const getPqDevList = (params: Device.ReqPqDevParams) => {
+    return http.post(`/pqDev/list`, params)
+}
+
+//添加被检设备
+export const addPqDev = (params: Device.ResPqDev) => {
+    return http.post(`/pqDev/add`, params)
+}
+
+//编辑被检设备
+export const updatePqDev = (params: Device.ResPqDev) => {
+    return http.post(`/pqDev/update`, params)
+}
+
+//删除被检设备
+export const deletePqDev = (params: string[]) => {
+    return http.post(`/pqDev/delete`, params)
+}
+
+//导出被检设备
+export const exportPqDev = (params: Device.ReqPqDevParams) => {
+    return http.download(`/pqDev/export`, params)
+}
+// 下载导入文件模板
+export const downloadTemplate = (params: { pattern: string }) => {
+    return http.download(`/pqDev/downloadTemplate`,params)
+}
+
+//导入被检设备
+export const importPqDev = (params: Device.ReqPqDevParams) => {
+    return http.uploadExcel(`/pqDev/import`, params)
+}
+
+//导入比对式被检设备
+export const importContrastPqDev = (params: Device.ReqPqDevParams) => {
+    return http.upload(`/pqDev/importContrast`, params)
+}
+
+// //导出灿能二楼设备
+// export const exportCNDev = (params: Device.ReqPqDevParams) => {
+//     return http.download(`/pqDev/exportCNDev`, params)
+// }
+//
+// // 下载灿能二楼设备导入文件模板
+// export const downloadCNDevTemplate = () => {
+//     return http.download(`/pqDev/downloadCNDevTemplate`)
+// }
+//
+// //导入灿能二楼设备
+// export const importCNDev = (params: Device.ReqPqDevParams) => {
+//     return http.uploadExcel(`/pqDev/importCNDev`, params)
+// }
+
+export const getPqDevById = (params: Device.ReqPqDevParams) => {
+    return http.get(`/pqDev/getById?id=${params.id}`)
+}
+
+//根据设备类型决定（电源、icd、模板、通道数、额定电压、额定电流）；
+export const getPqDev = () => {
+    return http.get(`/devType/listAll`)
+}
+
+export const getSelectOptions = (params:{ pattern: string }) => {
+    return http.get(`/pqDev/getSelectOptions`, params)
+}

frontend/src/api/device/deviceData.ts

@@ -1,95 +0,0 @@
-const data = [
-    {
-      id: 'device1',
-      devicename:"模拟装置1",
-      deviceType:"PQS882B4电能质量监测装置",
-      deviceChannels:"4",
-      Planname: "沧州220kV留古等4座变电站电能质量检测",
-      deviceUn: "57.74",
-      deviceIn: "5",
-      deviceCompany: "南京灿能电力自动化股份有限公司",
-      deviceModel: "模拟式",
-      },
-      {
-        id: 'device2',
-        devicename:"模拟装置2",
-        deviceType:"PQS882A电能质量监测装置",
-        deviceChannels:"1",
-        Planname: "邯郸220kV团城站等4座站电能质量检测",
-        deviceUn: "57.74",
-        deviceIn: "5",
-        deviceCompany: "南京灿能电力自动化股份有限公司",
-        deviceModel: "模拟式",
-      },
-      {
-        id: 'device3',
-        devicename:"模拟装置3",
-        deviceType:"PQS882A电能质量监测装置",
-        deviceChannels:"1",
-        Planname: "衡水冀州光伏电站配套出口工程",
-        deviceUn: "57.74",
-        deviceIn: "1",
-        deviceCompany: "南京灿能电力自动化股份有限公司",
-        deviceModel: "模拟式",
-    },
-    {
-        id: 'device4',
-        devicename:"模拟装置4",
-        deviceType:"PMC-680M-22-22-00-115ANBC电能质量监测装置",
-        deviceChannels:"4",
-        Planname: "深圳市中电软件有限公司委托送检",
-        deviceUn: "57.74",
-        deviceIn: "5",
-        deviceCompany: "深圳中电电力技术股份有限公司",
-        deviceModel: "模拟式",
-    },
-    ]
-  
-    const plan_devicedata = [
-      {
-        id: '1',     //装置序号ID
-        name: '设备1', //设备名称
-        dev_Type: 'PQS882A',//设备类型
-        dev_Chns: 1,  //设备通道数
-        check_Result: '合格', //检测结果
-        report_State: '已生成', //报告状态
-        document_State: '归档', //归档状态
-        check_State:'检测完成',//检测状态
-        reCheck_Num: 0, //复检次数
-      },
-      {
-        id: '2',     //装置序号ID
-        name: '设备2', //设备名称
-        dev_Type: 'PQS882B4',//设备类型
-        dev_Chns: 4,  //设备通道数
-        check_Result: '/', //检测结果
-        report_State: '未生成', //报告状态
-        document_State: '未归档', //归档状态
-        check_State:'未检',//检测状态
-        reCheck_Num: 0, //复检次数
-      },
-      {
-        id: '3',     //装置序号ID
-        name: '设备3', //设备名称
-        dev_Type: 'PQS882B4',//设备类型
-        dev_Chns: 4,  //设备通道数
-        check_Result: '/', //检测结果
-        report_State: '未生成', //报告状态
-        document_State: '未归档', //归档状态
-        check_State:'检测中',//检测状态
-        reCheck_Num: 0, //复检次数
-      },
-      {
-        id: '4',     //装置序号ID
-        name: '设备4', //设备名称
-        dev_Type: 'PQS882B4',//设备类型
-        dev_Chns: 4,  //设备通道数
-        check_Result: '不合格', //检测结果
-        report_State: '未生成', //报告状态
-        document_State: '未归档', //归档状态
-        check_State:'检测完成',//检测状态
-        reCheck_Num: 1, //复检次数
-      },
-    ]
-
-  export default {data,plan_devicedata}

frontend/src/api/device/error/errorData.ts

@@ -0,0 +1,423 @@
+import type {ErrorSystem} from "@/api/device/interface/error"
+
+const errordata = ref<ErrorSystem.ErrorSystemList[]>([
+      {
+        id: '1',
+        name: 'Q/GDW 1650.2-2016-A',
+        standard_Name:'Q/GDW 1650.2-2016',
+        standard_Time:'2016',
+        dev_Level:'A级',
+        enable:1,
+        state:1,
+      },
+      {
+        id: '2',
+        name: 'Q/GDW 1650.2-2021-A',
+        standard_Name:'Q/GDW 1650.2-2021',
+        standard_Time:'2021',
+        dev_Level:'A级',
+        enable:1,
+        state:1,
+      },
+      {
+        id: '3',
+        name: 'GBT 19862-2016-A',
+        standard_Name:'GBT 19862-2016',
+        standard_Time:'2016',
+        dev_Level:'A级',
+        enable:1,
+        state:1,
+      },
+    ])
+
+    const errorADetail = ref<ErrorSystem.Error_detail[]>([
+      {
+           col1: '电压偏差',
+           col2: '',
+           deviceLevel: 'A', 
+           measurementType:'电压',
+           condition: '10%~150%标称电压', 
+           maxErrorValue: '±0.1%Un' 
+      },
+      {
+          col1:'频率偏差',
+          col2: '',
+           deviceLevel: 'A',
+           measurementType:'频率',
+           condition: '42.5~57.5 Hz',
+           maxErrorValue: '±0.01Hz'
+      },
+      {
+          col1:'三相不平衡度',
+          col2: '',
+         deviceLevel: 'A',
+         measurementType:'电压',
+         condition: '0.5%~5%',
+         maxErrorValue: '±0.15%'
+      },
+      {
+          col1:'三相不平衡度',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'电压',
+        condition: '5%（不包含）~ 40%',
+        maxErrorValue: '±0.3%'
+     },
+     {
+         col1:'三相不平衡度',
+         col2: '',
+      deviceLevel: 'A',
+      measurementType:'电流',
+      condition: '',
+      maxErrorValue: '±1%'
+      },
+      {
+          col1:'电压波动',
+          col2: '电压幅值',
+        deviceLevel: 'A',
+        measurementType:'电压',
+        condition: '',
+        maxErrorValue: '±0.2%Un'
+      },
+      {
+          col1:'电压波动',
+          col2: '持续时间',
+        deviceLevel: 'A',
+        measurementType:'时间',
+        condition: '',
+        maxErrorValue: '±1周波'
+      },
+      {
+          col1:'闪变',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'短时间闪变',
+        condition: 'Pst：0.2~10',
+        maxErrorValue: '±5%'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'电压',
+        condition: 'Uh≥1%Un',
+        maxErrorValue: '±5%Uh'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'电压',
+        condition: 'Uh＜1%Un',
+        maxErrorValue: '±0.05%Un'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'电流',
+        condition: 'In≥3%In',
+        maxErrorValue: '±5%Ih'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'电流',
+        condition: 'In＜3%In',
+        maxErrorValue: '±0.15%In'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'相角',
+        condition: '',
+        maxErrorValue: 'h≤5,±1°*h'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'相角',
+        condition: '',
+        maxErrorValue: 'h>5,±5°'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'功率',
+        condition: 'Ph≥150W',
+        maxErrorValue: '±1%Ph'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'功率',
+        condition: 'Ph＜150W',
+        maxErrorValue: '±1.5W'
+      },
+      {
+          col1:'高频次谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'电压',
+        condition: 'Uh≥1%Un',
+        maxErrorValue: '±5%Uh'
+      },
+      {
+          col1:'高频次谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'电压',
+        condition: 'Uh＜1%Un',
+        maxErrorValue: '±0.05%Un'
+      },
+      {
+          col1:'高频次谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'电流',
+        condition: 'In≥3%In',
+        maxErrorValue: '±5%Ih'
+      },
+      {
+          col1:'高频次谐波',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'电流',
+        condition: 'In＜3%In',
+        maxErrorValue: '±0.15%In'
+      },
+      {
+          col1:'功率',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'功率',
+        condition: '',
+        maxErrorValue: '±0.5%'
+      },
+      {
+          col1:'电流',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'电流',
+        condition: 'I≥0.05In',
+        maxErrorValue: '±0.5%'
+      },
+      {
+          col1:'电流',
+          col2: '',
+        deviceLevel: 'A',
+        measurementType:'电流',
+        condition: '0.01In≤I＜0.05In',
+        maxErrorValue: '±1%'
+      },
+      {
+        col1: '电压暂降、电压暂升和短时中断',
+          col2: '电压幅值',
+        deviceLevel: 'A',
+        measurementType:'电压',
+        condition: '',
+        maxErrorValue: '±0.2%Un'
+      },
+      {
+        col1: '电压暂降、电压暂升和短时中断',
+        col2: '持续时间',
+        deviceLevel: 'A',
+        measurementType:'时间',
+        condition: '',
+        maxErrorValue: '±1周波'
+      },
+    ])
+    
+    const errorSDetail = ref<ErrorSystem.Error_detail[]>([
+      {
+           col1: '电压偏差',
+           col2: '',
+           deviceLevel: 'S', 
+           measurementType:'电压',
+           condition: '20%~120%标称电压', 
+           maxErrorValue: '±0.5%' 
+      },
+      {
+          col1:'频率偏差',
+          col2: '',
+           deviceLevel: 'S',
+           measurementType:'频率',
+           condition: '42.5~57.5 Hz',
+           maxErrorValue: '±0.05Hz'
+      },
+      {
+          col1:'三相不平衡度',
+          col2: '',
+         deviceLevel: 'S',
+         measurementType:'电压',
+         condition: '1%~5%',
+         maxErrorValue: '±0.2%'
+      },
+      {
+          col1:'三相不平衡度',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'电压',
+        condition: '5%（不包含）~ 40%',
+        maxErrorValue: '±0.6%'
+     },
+     {
+         col1:'三相不平衡度',
+         col2: '',
+         deviceLevel: 'S',
+         measurementType:'电流',
+         condition: '',
+         maxErrorValue: '±1%'
+      },
+      {
+          col1:'电压波动',
+          col2: '电压幅值',
+        deviceLevel: 'S',
+        measurementType:'电压',
+        condition: '',
+        maxErrorValue: '±1.0%Un'
+      },
+      {
+          col1:'电压波动',
+          col2: '持续时间',
+        deviceLevel: 'S',
+        measurementType:'时间',
+        condition: '使用半波刷新方均根值',
+        maxErrorValue: '±1周波'
+      },
+      {
+        col1:'电压波动',
+        col2: '持续时间',
+      deviceLevel: 'S',
+      measurementType:'时间',
+      condition: '使用全波刷新方均根值',
+      maxErrorValue: '±2周波'
+    },
+      {
+          col1:'闪变',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'短时间闪变',
+        condition: 'Pst：0.4~4',
+        maxErrorValue: '±10%'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'电压',
+        condition: 'Uh≥3%Un',
+        maxErrorValue: '±5%Uh'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'电压',
+        condition: 'Uh＜3%Un',
+        maxErrorValue: '±0.15%Un'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'电流',
+        condition: 'In≥10%In',
+        maxErrorValue: '±5%Ih'
+      },
+      {
+          col1:'谐波和间谐波',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'电流',
+        condition: 'In＜10%In',
+        maxErrorValue: '±0.5%In'
+      },
+      {
+          col1:'高频次谐波',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'电压',
+        condition: 'Uh≥3%Un',
+        maxErrorValue: '±5%Uh'
+      },
+      {
+          col1:'高频次谐波',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'电压',
+        condition: 'Uh＜3%Un',
+        maxErrorValue: '±0.15%Un'
+      },
+      {
+          col1:'高频次谐波',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'电流',
+        condition: 'In≥10%In',
+        maxErrorValue: '±5%Ih'
+      },
+      {
+          col1:'高频次谐波',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'电流',
+        condition: 'In＜10%In',
+        maxErrorValue: '±0.5%In'
+      },
+      {
+          col1:'功率',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'功率',
+        condition: '',
+        maxErrorValue: '±0.5%'
+      },
+      {
+          col1:'电流',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'电流',
+        condition: 'I≥0.05In',
+        maxErrorValue: '±0.5%'
+      },
+      {
+          col1:'电流',
+          col2: '',
+        deviceLevel: 'S',
+        measurementType:'电流',
+        condition: '0.01In≤I＜0.05In',
+        maxErrorValue: '±1%'
+      },
+      {
+        col1: '电压暂降、电压暂升和短时中断',
+          col2: '电压幅值',
+        deviceLevel: 'S',
+        measurementType:'电压',
+        condition: '',
+        maxErrorValue: '±1.0%Un'
+      },
+      {
+        col1: '电压暂降、电压暂升和短时中断',
+        col2: '持续时间',
+        deviceLevel: 'S',
+        measurementType:'时间',
+        condition: '使用半波刷新方均根值',
+        maxErrorValue: '±1周波'
+      },
+      {
+        col1: '电压暂降、电压暂升和短时中断',
+        col2: '持续时间',
+        deviceLevel: 'S',
+        measurementType:'时间',
+        condition: '使用全波刷新方均根值',
+        maxErrorValue: '±2周波'
+      },
+    ])
+    
+    export default {errordata,errorADetail,errorSDetail}

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

@@ -0,0 +1,36 @@
+import type { ErrorSystem } from '@/api/device/interface/error'
+import http from '@/api'
+
+/**
+ * @name 误差体系管理模块
+ */
+
+//获取误差体系
+export const getPqErrSysList = (params: ErrorSystem.ErrorSystemList) => {
+  return http.post(`/pqErrSys/list`, params)
+}
+
+//根据id查询误差体系
+export const getPqErrSysListById = (params: ErrorSystem.ErrorSystemList) => {
+  return http.get(`/pqErrSys/getById?id=${params.id}`)
+}
+
+//添加误差体系
+export const addPqErrSys = (params: ErrorSystem.ErrorSystemList) => {
+  return http.post(`/pqErrSys/add`, params)
+}
+
+//编辑误差体系
+export const updatePqErrSys = (params: ErrorSystem.ErrorSystemList) => {
+  return http.post(`/pqErrSys/update`, params)
+}
+
+//删除误差体系
+export const deletePqErrSys = (params: string[]) => {
+  return http.post(`/pqErrSys/delete`, params)
+}
+
+//复制误差体系
+export const copyPqErrSys = (params: ErrorSystem.ErrorSystemList) => {
+  return http.get(`/pqErrSys/copy?id=${params.id}`)
+}

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

@@ -0,0 +1,38 @@
+import type { ICD } from '@/api/device/interface/icd'
+import http from '@/api'
+import { pa } from 'element-plus/es/locale/index.mjs'
+
+/**
+ * @name ICD管理模块
+ */
+
+
+
+//获取ICD分页
+export const getICDList = (params: ICD.ReqICDParams) => {
+    return http.post(`/icd/list`,params)
+}
+
+
+//获取ICD
+export const getICDAllList = (params: ICD.ResICD) => {
+    return http.get(`/icd/listAll`,params)
+}
+
+//添加ICD
+export const addICD = (params: ICD.ResICD) => {
+    return http.post(`/icd/add`, params)
+  }
+  
+  //编辑ICD
+  export const updateICD = (params: ICD.ResICD) => {
+    return http.post(`/icd/update`, params)
+  }
+  
+  //删除ICD
+  export const deleteICD = (params: string[]) => {
+    return http.post(`/icd/delete`, params)
+  }
+
+
+

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

@@ -0,0 +1,15 @@
+import type { ReqPage,ResPage } from '@/api/interface'
+
+// 被检设备模块
+export namespace controlSource {
+  
+    /**
+   * 被检设备新增、修改、根据id查询返回的对象
+   */
+    export interface ResControl {
+        userPageId: string;   
+        scriptId: string;  
+        scriptIndex: number;  
+        sourceId: string;
+    }
+  }

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

@@ -0,0 +1,41 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+
+// 设备类型模块
+export namespace DevType {
+
+  /**
+   * 设备类型数据表格分页查询参数
+   */
+  export interface ReqPqDevTypeParams extends ReqPage {
+    id: string; // 装置序号id 必填
+    devType?: string; // 设备名称
+    createTime?: string; //创建时间
+  }
+
+  /**
+   * 设备类型新增、修改、根据id查询返回的对象
+   */
+  export interface ResPqDevType {
+    id: string;     //设备类型ID
+    name: string;//设备类型名称
+    icd: string| null;//设备关联的ICD
+    power: string| null;//工作电源
+    devVolt: number;   //额定电压（V）
+    devCurr: number;   //额定电流（A）
+    devChns: number;   //设备通道数
+    reportName: string| null;//报告模版名称
+    state: number;
+    waveCmd:string| null;//录波指令
+    createBy?: string| null; //创建用户
+    createTime?: string| null; //创建时间
+    updateBy?: string| null; //更新用户
+    updateTime?: string| null; //更新时间
+  }
+
+  /**
+   * 设备类型表格查询分页返回的对象；
+   */
+  export interface ResPqDevTypePage extends ResPage<ResPqDevType> {
+
+  }
+}

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

@@ -0,0 +1,119 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+import type { Monitor } from './monitor'
+
+// 被检设备模块
+export namespace Device {
+    /**
+     *  被检设备表格分页查询参数
+     */
+    export interface ReqPqDevParams extends ReqPage {
+        id: string // 装置序号id 必填
+        name: string //设备名称
+        devType?: string // 设备名称
+        createTime?: string //创建时间
+        pattern: string
+    }
+
+    /**
+     *  被检设备表格分页查询参数
+     */
+    export interface ReqDevReportParams extends ReqPage {
+        planId?: string // 计划id
+        devId?: string // 装置id
+        scriptId?: string // 脚本id
+        planCode?: string
+        devIdList?: string[] // 装置id列表
+    }
+
+    /**
+     * 被检设备新增、修改、根据id查询返回的对象
+     */
+    export interface ResPqDev {
+        id: string //装置序号ID
+        name: string //设备名称
+        pattern: string //设备模式 模拟 数字 比对
+        devType: string //设备类型
+        manufacturer?: string | null //生产厂家
+        createDate: string //生产日期
+        createId: string //出厂编号
+        hardwareVersion: string //固件版本
+        softwareVersion: string //软件版本
+        protocol: string //通讯协议
+        ip: string //IP地址
+        port: number //端口号
+        encryptionFlag: number //装置是否为加密版本
+        series?: string | null //装置识别码（3ds加密）
+        devKey?: string | null //装置秘钥（3ds加密）
+        sampleId?: string | null //样品编号
+        arrivedDate?: string //送样日期
+        cityName?: string | null //所属地市名称
+        gdName?: string | null //所属供电公司名称
+        subName?: string | null //所属电站名称
+        reportPath?: string | null //报告路径
+        planId?: string //检测计划Id
+        factorFlag?: number //是否支持系数校准(0:不支持,1:支持)
+        preinvestmentPlan: string | null //预投计划
+        delegate: string | null //委托方
+        inspectChannel?: string[] | string //被检通道
+        inspectDate?: string | null //定检日期
+        harmSysId?: string | null //谐波系统设备id
+        importFlag?: number //是否为导入设备 0否 1是
+        state: number //状态
+        createBy?: string | null //创建用户
+        createTime?: string | null //创建时间
+        updateBy?: string | null //更新用户
+        updateTime?: string | null //更新时间
+
+        devChns: number //设备通道数
+        devVolt: number //额定电压（V）
+        devCurr: number //额定电流（A）
+        icdId: string | null
+        power: string | null //工作电源
+
+        devId?: number
+        checkState?: number | null //检测状态(0:未检，1:检测中，2:检测完成 3:归档)
+        checkResult?: number | null //检测结果(0:不符合，1:符合，2:未检)
+        reportState?: number | null //报告状态(0:未生成，1:已生成，2:未检)
+        recheckNum: number //复检次数
+        timeCheckResult?: number //守时检测结果(0:不符合1:符合)
+        factorCheckResult?: number //系数校准结果(0:不合格，1:合格，2:未检)
+        realtimeResult?: number //实时数据结论(0:不符合，1:符合，2:未检)
+        statisticsResult?: number //统计数据结论(0:不符合，1:符合，2:未检)
+        recordedResult?: number //录波数据结论(0:不符合，1:符合，2:未检)
+        checkBy?: string | null //检测人
+        checkTime?: string | null //检测时间
+        preDetectTime?: number //预检测耗时
+        coefficientTime?: number //系数校准耗时
+        formalCheckTime?: number //正式检测耗时
+
+        boundPlanName?: string | null
+        assign?: number ////是否分配给检测人员 0否 1是
+        monitorList: Monitor.ResPqMon[]
+        checked: boolean // 是否已选择
+        disabled: boolean // 是否禁用
+    }
+
+    export interface SelectOption {
+        label: string
+        value: string | number
+    }
+
+    export interface ResDev {
+        id: string
+        name: string
+        icd: string
+        power: string
+        devVolt: number
+        devCurr: number
+        devChns: number
+    }
+
+    export interface ResTH {
+        temperature: number | null //温度
+        humidity: number | null //湿度
+    }
+    /**
+     * 被检设备表格查询分页返回的对象；
+     */
+    export interface ResPqDevPage extends ResPage<ResPqDev> {}
+}

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

@@ -0,0 +1,50 @@
+import type { ReqPage } from "@/api/interface";
+
+// 误差体系模块
+export namespace ErrorSystem  {
+
+  // 误差体系列表
+  export interface ErrorSystemList {
+    id: string;//误差体系表Id
+    name: string;//误差体系名称
+    standardName:string;//参照标准名称
+    standardTime:string;//标准推行时间
+    devLevel:string;//使用设备等级
+    enable:number;//状态：0-不启用 1-启用
+    state:number;//0-删除 1-正常
+    createBy?:string;//创建用户
+    createTime?:string;//创建时间
+    updateBy?:string;//修改用户
+    updateTime?:string;//修改时间
+    pqErrSysDtlsList?: ErrorSystemDetail[];//误差体系子表列表
+  }
+
+
+    // 查看详细误差体系
+    export interface ErrorSystemDetail {
+        sort: number;
+        id:string;//误差体系子表ID
+        errorSysId:string;//所属误差体系ID
+        errorType: string;//误差类型,树形字典表（没有树形表则需要拆分字段）
+        scriptType: string;//脚本类型
+        startValue?:number | null;//误差判断起始值（误差范围）
+        startFlag?:number;//是否包含起始值
+        endValue?:number | null;//;误差判断结束值（误差范围）
+        endFlag?:number;//是否包含结束值
+        conditionType?:string;//判断条件值类型（包括值类型，绝对值、相对值）
+        maxErrorValue:number;//误差最大值
+        errorValueType:any;//误差值类型（0标称值、1标准值、2值类型）
+        valueType:number;//值类型（1绝对值、2相对值）
+        errorUnit:string;//误差单位
+    }
+
+    //查看详细误差体系
+    export interface Error_detail {
+      col1: string;
+      col2: string;
+      deviceLevel: string;
+      measurementType:string;
+      condition: string; 
+      maxErrorValue: string;
+  }
+}

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

@@ -0,0 +1,37 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+
+// ICD模块
+export namespace ICD {
+
+  /**
+   * ICD表格分页查询参数
+   */
+  export interface ReqICDParams extends ReqPage {
+    id: string; // 装置序号id 必填
+    devType?: string; // 设备名称
+    createTime?: string; //创建时间
+  }
+
+  /**
+   * ICD新增、修改、根据id查询返回的对象
+   */
+  export interface ResICD {
+    id: string;     //icdID
+    name: string;//icd名称
+    path: string;//icd存储地址
+    state: number;
+    createBy?: string| null; //创建用户
+    createTime?: string| null; //创建时间
+    updateBy?: string| null; //更新用户
+    updateTime?: string| null; //更新时间
+    angle: number; // 是否支持电压相角、电流相角指标
+    usePhaseIndex: number; // 角型接线时是否使用相别的指标来进行检测
+  }
+
+  /**
+   * ICD表格查询分页返回的对象；
+   */
+  export interface ResICDPage extends ResPage<ResICD> {
+
+  }
+}

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

@@ -1,68 +0,0 @@
-import type { ReqPage } from '@/api/interface'
-
-// 被检设备模块
-export namespace Device {
-
-    // 被检设备列表
-    export interface ResDeviceList {
-        id: string;     //被检设备ID
-        deviceName: string; //检测设备名称
-        deviceType: string; //检测设备类型
-        deviceChannels: string;//设备通道数
-        PlanName: string;   //所属计划名称
-        deviceUn: string;   //设备额定电压
-        deviceIn: string;   //设备额定电流
-        deviceCompany: string;//设备厂家
-        deviceModel: string; //设备模式 模拟 数字 比对
-    }
-  
-    // 被检设备参数
-    export interface ReqDeviceParams extends ReqPage {
-        id: string;     //被检设备ID
-        deviceName: string; //检测设备名称
-        deviceType: string; //检测设备类型
-        deviceChannels: string;//设备通道数
-        PlanName: string;   //所属计划名称
-        deviceUn: string;   //设备额定电压
-        deviceIn: string;   //设备额定电流
-        deviceCompany: string;//设备厂家
-        deviceModel: string; //设备模式 模拟 数字 比对
-    }
-
-    // 被检设备列表
-    export interface DeviceList {
-        id: string;     //装置序号ID
-        name: string; //设备名称
-        pattern?: string; //设备模式 模拟 数字 比对
-        dev_Type: string;//设备类型
-        dev_Chns: number;   //设备通道数
-        dev_Volt?: number;   //额定电压（V）
-        dev_Curr?: number;   //额定电流（A）
-        manufacturer?: string;//生产厂家
-        createDate?: string; //生产日期
-        createId?: string; //出厂编号
-        hardware_Version?: string; //固件版本
-        software_Version?: string; //软件版本
-        iP?: string; //IP地址
-        port?: number; //端口号
-        isEncryption?: string; //装置是否为加密版本
-        series?: string; //装置识别码（3ds加密）
-        dev_Key?: string; //装置秘钥（3ds加密）
-        sampleID?: string; //样品编号
-        arrived_Date?: string; //送样日期
-        city_Name?: string; //所属地市名称
-        gD_Name?: string; //所属供电公司名称
-        sub_Name?: string; //所属电站名称
-        check_State: string; //检测状态
-        check_Result: string; //检测结果
-        report_State: string; //报告状态
-        document_State: string; //归档状态
-        reCheck_Num: number; //复检次数
-        state?: number; //状态
-        create_By?: string; //创建用户
-        create_Time?: string; //创建时间
-        update_By?: string; //更新用户
-        update_Time?: string; //更新时间
-        
-    }
-  }

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

@@ -0,0 +1,38 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+
+// 监测点模块
+export namespace Monitor {
+
+  /**
+   * 监测点表格分页查询参数
+   */
+  export interface ReqPqMonParams extends ReqPage {
+    id: string; // 装置序号id 必填
+    name?: string; // 设备名称
+    
+  }
+
+  /**
+   * 监测点新增、修改、根据id查询返回的对象
+   */
+  export interface ResPqMon {
+    id: string;     //监测点ID
+    devId: string; //所属设备ID
+    busbar: string;//所属母线
+    name: string; //监测点名称
+    num: number; //线路号,监测点序号
+    pt: string; //PT变比
+    ct: string; //CT变比
+    connection: string; //接线方式，字典表
+    statInterval: number; //统计间隔
+    harmSysId: string; //默认与谐波系统监测点ID相同
+    checkFlag: number;//是否参与检测0否1是
+  }
+
+  /**
+   * 监测点表格查询分页返回的对象；
+   */
+  export interface ResPqMonPage extends ResPage<ResPqMon> {
+
+  }
+}

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

@@ -0,0 +1,39 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+import type { UploadFile } from 'element-plus';
+
+// 报告模版接口
+export namespace PqReport {
+
+  /**
+   * 报告模版表格分页查询参数
+   */
+  export interface ReqReportParams extends ReqPage {
+    id: string; // 装置序号id 必填
+    name?: string; // 设备名称
+    createTime?: string; //创建时间
+  }
+
+  /**
+   * 报告模版新增、修改、根据id查询返回的对象
+   */
+  export interface ResReport {
+    id: string;     //报告模板id
+    name: string;//报告模板名称
+    version:string;//版本号
+    baseFile?:string;//基础模板文件路径
+    detailFile?:string;//检测项模版文件路径
+    description:string;//描述信息
+    state:number;//状态:8-删除 1-正常
+    createBy?: string| null; //创建用户
+    createTime?: string| null; //创建时间
+    updateBy?: string| null; //更新用户
+    updateTime?: string| null; //更新时间
+  }
+
+  /**
+   * 报告模版表格查询分页返回的对象；
+   */
+  export interface ResReportPage extends ResPage<ResReport> {
+
+  }
+}

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

@@ -0,0 +1,47 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+
+// 标准设备模块
+export namespace StandardDevice {
+
+    /**
+     *  标准设备表格分页查询参数
+     */
+    export interface ReqPqStandardDeviceParams extends ReqPage {
+        id: string; // 装置序号id 必填
+        name: string; //设备名称
+        devType?: string; // 设备名称
+        createTime?: string; //创建时间
+    }
+
+
+    /**
+     * 标准设备新增、修改、根据id查询返回的对象
+     */
+    export interface ResPqStandardDevice {
+        id: string;     //装置序号ID
+        name: string; //设备名称
+        devType: string;//设备类型
+        manufacturer?: string | null;//生产厂家
+        protocol: string;//通讯协议
+        ip: string; //IP地址
+        port: number; //端口号
+        inspectChannel:string[] |string;//可检通道数
+        encryptionFlag: number; //装置是否为加密版本
+        series?: string | null; //装置识别码（3ds加密）
+        devKey?: string | null; //装置秘钥（3ds加密）
+        state: number; //状态
+        createBy?: string | null; //创建用户
+        createTime?: string | null; //创建时间
+        updateBy?: string | null; //更新用户
+        updateTime?: string | null; //更新时间
+        disabled?: boolean;
+    }
+
+
+    /**
+     * 标准设备表格查询分页返回的对象；
+     */
+    export interface ResPqStandardDevicePage extends ResPage<ResPqStandardDevice> {
+
+    }
+}

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

@@ -0,0 +1,38 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+
+// 检测脚本模块
+export namespace TestScript {
+    /**
+     * 检测脚本表格分页查询参数
+     */
+    export interface ReqTestScriptParams extends ReqPage {
+        id: string // 装置序号id 必填
+        name: string
+        type: string
+        pattern: string
+    }
+
+    // 检测脚本接口
+    export interface ResTestScript {
+        id?: string //检测脚本ID
+        name: string //检测脚本名称
+        type: string //设定0为脚本，1为模板
+        pattern: string //检测脚本模式(字典表Code字段，数字、模拟、比对)
+        valueType?: string //脚本值类型(字典表Code字段，相对值脚本、绝对值脚本、无)
+        standardName: string //参照标准名称
+        standardTime: string //标准推行时间
+        state?: number //
+        createBy?: string
+        createTime?: string
+        updateBy?: string
+        updateTime?: string
+        selectedValue?: string
+        ratedCurr?: number
+        ratedVolt?: number
+    }
+
+    /**
+     * 检测脚本查询分页返回的对象；
+     */
+    export interface ResTestScriptPage extends ResPage<ResTestScript> {}
+}

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

@@ -0,0 +1,44 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+
+// 检测源模块
+export namespace TestSource {
+
+     /**
+   * 检测脚本表格分页查询参数
+   */
+ export interface ReqTestSourceParams extends ReqPage{
+    id: string; // 装置序号id 必填
+    name: string; 
+    pattern: string;
+  }
+
+    // 检测源接口
+    export interface ResTestSource {
+        id: string;     //检测源ID
+        name?: string;    //检测源名称（检测源类型 + 设备类型 + 数字自动生成）
+        pattern: string;//检测源模式(字典表Code字段，数字、模拟、比对)
+        type: string;   //检测源类型(字典表Code字段，标准源、高精度设备)
+        devType: string;//检测源设备类型(字典表Code字段)
+        parameter?: string;//源参数（JSON字符串）
+        state:number;//
+        createBy?: string;
+        createTime?: string;
+        updateBy?: string;
+        updateTime?: string;
+    }
+  
+    /* 检测脚本查询分页返回的对象；
+    */
+   export interface ResTestSourcePage extends ResPage<ResTestSource> {
+ 
+   }
+    export interface ParameterType{
+        id:string;
+        type:string;
+        desc:string;
+        value:string|null;
+        sort:number;
+        pId:string;
+        children?:ParameterType[];
+    }
+  }

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

@@ -0,0 +1,13 @@
+import http from '@/api'
+
+/**
+ * @name 监测点管理模块
+ */
+
+//获取监测点
+export const getPqMonList = (param:any) => {
+  return http.post(`/pqMonitor/list`, param)
+}
+
+
+

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

@@ -0,0 +1,51 @@
+import type {PqReport} from '@/api/device/interface/report'
+import http from '@/api'
+
+/**
+ * @name 报告模版模块
+ */
+
+//获取报告模版
+export const getPqReportList = (params: PqReport.ReqReportParams) => {
+    return http.post(`/report/list`, params)
+}
+
+//新增报告模版
+export const addPqReport = (params: PqReport.ResReport) => {
+    return http.upload(`/report/add`, params)
+}
+
+//删除报告模版
+export const deletePqReport = (params: string[]) => {
+    return http.post(`/report/delete`, params)
+}
+
+//查询报告模板详情
+export const getPqReportById = (params: PqReport.ResReport) => {
+    return http.get(`/report/getById?id=${params.id}`)
+}
+
+//修改报告模板
+export const updatePqReport = (params: PqReport.ResReport) => {
+    return http.upload(`/report/update`, params)
+}
+
+//查询所有报告模板名称
+export const getPqReportAllName = () => {
+    return http.get(`/report/listAllName`)
+}
+
+//根据名称查询指定报告模板的所有版本
+export const getPqReportAllVersion = (params:any) => {
+    return http.get(`/report/listAllVersion?name=${params.name}`)
+}
+
+//被检设备归档
+export const documentedPqDev = (ids: string[]) => {
+    return http.post(`/report/documented`, ids)
+}
+
+//上传报告到云端
+export const uploadReportToCloud = (deviceIds: string[]) => {
+    return http.post(`/report/uploadReportToCloud`, deviceIds)
+}

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

@@ -0,0 +1,55 @@
+import type { StandardDevice } from '@/api/device/interface/standardDevice'
+import http from '@/api'
+
+/**
+ * @name 标准设备管理模块
+ */
+
+//获取标准设备
+export const getPqStandardDevList = (params: StandardDevice.ReqPqStandardDeviceParams) => {
+    return http.post(`/pqStandardDev/list`, params)
+}
+
+//根据id查询标准设备
+export const getPqStandardDevById = (params: StandardDevice.ReqPqStandardDeviceParams) => {
+    return http.get(`/pqStandardDev/getById?id=${params.id}`)
+}
+
+//添加标准设备
+export const addPqStandardDev = (params: StandardDevice.ResPqStandardDevice) => {
+    return http.post(`/pqStandardDev/add`, params)
+}
+
+//编辑标准设备
+export const updatePqStandardDev = (params: StandardDevice.ResPqStandardDevice) => {
+    return http.post(`/pqStandardDev/update`, params)
+}
+
+//删除标准设备
+export const deletePqStandardDev = (params: string[]) => {
+    return http.post(`/pqStandardDev/delete`, params)
+}
+
+//导出标准设备
+export const exportPqStandardDev = (params: StandardDevice.ReqPqStandardDeviceParams) => {
+    return http.download(`/pqStandardDev/export`, params)
+}
+// 下载导入文件模板
+export const downloadTemplate = () => {
+    return http.download(`/pqStandardDev/downloadTemplate`)
+}
+
+//导入标准设备
+export const importPqStandardDev = (params: StandardDevice.ReqPqStandardDeviceParams) => {
+    return http.uploadExcel(`/pqStandardDev/import`, params)
+}
+
+//获取所有标准设备
+export const getAllPqStandardDev = () => {
+    return http.get(`/pqStandardDev/getAll`)
+}
+
+//获取可以绑定的标准设备
+export const canBindingList = () => {
+    return http.get(`/pqStandardDev/canBindingList`)
+}

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

@@ -0,0 +1,53 @@
+import type { TestScript } from '@/api/device/interface/testScript'
+import http from '@/api'
+import { Loading } from '@element-plus/icons-vue'
+
+/**
+ * @name 检测脚本管理模块
+ */
+// 新增脚本
+export const pqScriptAdd = (params: TestScript.ResTestScript) => {
+    return http.post(`/pqScript/add`, params)
+}
+// 修改脚本
+export const pqScriptUpdate = (params: TestScript.ResTestScript) => {
+    return http.post(`/pqScript/update`, params)
+}
+// 获取检测脚本列表
+export const getPqScriptList = (params: TestScript.ReqTestScriptParams) => {
+    return http.post(`/pqScript/list`, params)
+}
+
+//升级为模版
+export const updatePqScript = (params: TestScript.ResTestScript) => {
+    return http.get(`/pqScript/upgradeToTemplate?id=${params.id}`)
+}
+
+//删除检测脚本
+export const deletePqScript = (params: string[]) => {
+    return http.post(`/pqScript/delete`, params)
+}
+//添加检测脚本
+export const addScriptDtls = (params: any) => {
+    return http.post(`/pqScript/addScriptDtls`, params)
+}
+//根据脚本id查询检测脚本详情
+export const dlsDetails = (params: any) => {
+    return http.post(`/pqScript/dlsDetails`, params)
+}
+// 删除脚本
+export const deleteDtls = (params: any) => {
+    return http.post(`/pqScript/deleteDtls`, params)
+}
+// 启用关闭脚本
+export const updateDtls = (params: any) => {
+    return http.post(`/pqScript/updateDtls`, params)
+}
+// 根据通讯参数生成装置下发原始数据公式
+export const scriptDtlsCheckDataList = (params: any) => {
+    return http.post(`/pqScript/scriptDtlsCheckDataList`, params,{loading: false})
+}
+// 通讯脚本回显
+export const checkDataList = (params: any) => {
+    return http.post(`/pqScript/checkDataList`, params, { loading: true })
+}

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

@@ -0,0 +1,31 @@
+import type { ResPage } from '@/api/interface'
+import type { TestSource } from '@/api/device/interface/testSource'
+import http from '@/api'
+
+/**
+ * @name 检测源管理模块
+ */
+// 获取检测源列表
+export const getTestSourceList = (params: TestSource.ReqTestSourceParams) => {
+  return http.post(`/pqSource/list`, params)
+}
+
+//根据id查询检测源
+export const getTestSourceById = (params: TestSource.ResTestSource) => {
+  return http.get(`/pqSource/getById?id=${params.id}`)
+}
+
+//添加检测源
+export const addTestSource = (params: TestSource.ResTestSource) => {
+  return http.post(`/pqSource/add`, params)
+}
+
+//编辑检测源
+export const updateTestSource = (params: TestSource.ResTestSource) => {
+  return http.post(`/pqSource/update`, params)
+}
+
+//删除检测源
+export const deleteTestSource = (params: string[]) => {
+  return http.post(`/pqSource/delete`, params)
+}

frontend/src/api/error/errorData.ts

@@ -1,212 +0,0 @@
-import type {ErrorSystem} from "./interface"
-
-const errordata = ref<ErrorSystem.ErrorSystemList[]>([
-      {
-        id: '1',
-        name: 'Q/GDW 1650.2-2016-A',
-        standard_Name:'Q/GDW 1650.2-2016',
-        standard_Time:'2016',
-        dev_Level:'A级',
-        enable:1,
-        state:1,
-      },
-      {
-        id: '2',
-        name: 'Q/GDW 1650.2-2021-A',
-        standard_Name:'Q/GDW 1650.2-2021',
-        standard_Time:'2021',
-        dev_Level:'A级',
-        enable:1,
-        state:1,
-      },
-      {
-        id: '3',
-        name: 'GBT 19862-2016-A',
-        standard_Name:'GBT 19862-2016',
-        standard_Time:'2016',
-        dev_Level:'A级',
-        enable:1,
-        state:1,
-      },
-    ])
-
-    const errordetail = ref<ErrorSystem.Error_detail[]>([
-      {
-           measured: '电压偏差',
-           deviceLevel: 'A', 
-           measurementType:'电压',
-           condition: '10%~150%标称电压', 
-           maxErrorValue: '±0.1%Un' 
-      },
-      {
-           measured: '频率偏差', 
-           deviceLevel: 'A', 
-           measurementType:'频率',
-           condition: '42.5~57.5 Hz', 
-           maxErrorValue: '±0.01Hz' 
-      },
-      {
-         measured: '三相不平衡度', 
-         deviceLevel: 'A', 
-         measurementType:'电压',
-         condition: '0.5%~5%', 
-         maxErrorValue: '±0.15%' 
-      },
-      {
-        measured: '三相不平衡度', 
-        deviceLevel: 'A', 
-        measurementType:'电压',
-        condition: '5%（不包含）~ 40%', 
-        maxErrorValue: '±0.3%' 
-     },
-     {
-      measured: '三相不平衡度', 
-      deviceLevel: 'A', 
-      measurementType:'电流',
-      condition: '', 
-      maxErrorValue: '±1%' 
-      },
-      {
-        measured: '电压波动幅值', 
-        deviceLevel: 'A', 
-        measurementType:'电压',
-        condition: '', 
-        maxErrorValue: '±0.2%Un' 
-      },
-      {
-        measured: '电压波动持续时间', 
-        deviceLevel: 'A', 
-        measurementType:'时间',
-        condition: '', 
-        maxErrorValue: '±1周波' 
-      },
-      {
-        measured: '闪变', 
-        deviceLevel: 'A', 
-        measurementType:'短时间闪变',
-        condition: 'Pst：0.2~10', 
-        maxErrorValue: '±5%' 
-      },
-      {
-        measured: '谐波和间谐波', 
-        deviceLevel: 'A', 
-        measurementType:'电压',
-        condition: 'Uh≥1%Un', 
-        maxErrorValue: '±5%Uh' 
-      },
-      {
-        measured: '谐波和间谐波', 
-        deviceLevel: 'A', 
-        measurementType:'电压',
-        condition: 'Uh＜1%Un', 
-        maxErrorValue: '±0.05%Un' 
-      },
-      {
-        measured: '谐波和间谐波', 
-        deviceLevel: 'A', 
-        measurementType:'电流',
-        condition: 'In≥3%In', 
-        maxErrorValue: '±5%Ih' 
-      },
-      {
-        measured: '谐波和间谐波', 
-        deviceLevel: 'A', 
-        measurementType:'电流',
-        condition: 'In＜3%In', 
-        maxErrorValue: '±0.15%In' 
-      },
-      {
-        measured: '谐波和间谐波', 
-        deviceLevel: 'A', 
-        measurementType:'相角',
-        condition: '', 
-        maxErrorValue: 'h≤5,±1°*h' 
-      },
-      {
-        measured: '谐波和间谐波', 
-        deviceLevel: 'A', 
-        measurementType:'相角',
-        condition: '', 
-        maxErrorValue: 'h>5,±5°' 
-      },
-      {
-        measured: '谐波和间谐波', 
-        deviceLevel: 'A', 
-        measurementType:'功率',
-        condition: 'Ph≥150W', 
-        maxErrorValue: '±1%Ph' 
-      },
-      {
-        measured: '谐波和间谐波', 
-        deviceLevel: 'A', 
-        measurementType:'功率',
-        condition: 'Ph＜150W', 
-        maxErrorValue: '±1.5W' 
-      },
-      {
-        measured: '高频次谐波', 
-        deviceLevel: 'A', 
-        measurementType:'电压',
-        condition: 'Uh≥1%Un', 
-        maxErrorValue: '±5%Uh' 
-      },
-      {
-        measured: '高频次谐波', 
-        deviceLevel: 'A', 
-        measurementType:'电压',
-        condition: 'Uh＜1%Un', 
-        maxErrorValue: '±0.05%Un' 
-      },
-      {
-        measured: '高频次谐波', 
-        deviceLevel: 'A', 
-        measurementType:'电流',
-        condition: 'In≥3%In', 
-        maxErrorValue: '±5%Ih' 
-      },
-      {
-        measured: '高频次谐波', 
-        deviceLevel: 'A', 
-        measurementType:'电流',
-        condition: 'In＜3%In', 
-        maxErrorValue: '±0.15%In' 
-      },
-      {
-        measured: '功率', 
-        deviceLevel: 'A', 
-        measurementType:'功率',
-        condition: '', 
-        maxErrorValue: '±0.5%' 
-      },
-      {
-        measured: '电流', 
-        deviceLevel: 'A', 
-        measurementType:'电流',
-        condition: 'I≥0.05In', 
-        maxErrorValue: '±0.5%' 
-      },
-      {
-        measured: '电流', 
-        deviceLevel: 'A', 
-        measurementType:'电流',
-        condition: '0.01In≤I＜0.05In', 
-        maxErrorValue: '±1%' 
-      },
-      {
-        measured: '暂态电压幅值', 
-        deviceLevel: 'A', 
-        measurementType:'电压',
-        condition: '', 
-        maxErrorValue: '±0.2%Un' 
-      },
-      {
-        measured: '暂态持续时间', 
-        deviceLevel: 'A', 
-        measurementType:'时间',
-        condition: '', 
-        maxErrorValue: '±1周波' 
-      },
-    ])
-    
-    
-    export default {errordata,errordetail}

frontend/src/api/error/interface/index.ts

@@ -1,41 +0,0 @@
-// 误差体系模块
-export namespace ErrorSystem  {
-    // 误差体系列表
-    export interface ErrorSystemList {
-      id: string;//误差体系表Id
-      name: string;//误差体系名称
-      standard_Name:string;//参照标准名称
-      standard_Time:string;//标准推行时间
-      dev_Level:string;//使用设备等级
-      enable?:number;//状态：0-不启用 1-启用
-      state:number;//0-删除 1-正常
-      create_By?:string;//创建用户
-      create_Time?:string;//创建时间
-      update_By?:string;//修改用户
-      update_Time?:string;//修改时间
-    }
-
-
-      // 查看详细误差体系
-      export interface ErrorSystemDetail {
-          id:string;//误差体系子表ID
-          error_Sys_Id:string;//所属误差体系ID
-          type: string;//检测脚本类型,树形字典表（没有树形表则需要拆分字段）
-          JudgeConditionStart?:number;//误差判断起始值（误差范围）
-          IsContainStart?:number;//是否包含起始值
-          JudgeConditionEnd?:number;//误差判断结束值（误差范围）
-          IsContainEnd?:number;//是否包含结束值
-          JudgeConditionType?:string;//判断条件值类型（包括值类型，绝对值、相对值）
-          MaxErrorValue:number;//误差最大值
-          ErrorValueType:string;//误差值类型（包括值类型，绝对值、相对值1、相对值2）
-      }
-
-      // 查看详细误差体系
-      export interface Error_detail {
-        measured: string;
-        deviceLevel: string;
-        measurementType:string;
-        condition: string; 
-        maxErrorValue: string;
-    }
-  }

frontend/src/api/function/functionExample.ts

@@ -1,265 +0,0 @@
-import type { Function } from "./interface"
-
-export const functionList : Function.ResFunction[] = [
-    {
-      'id': '1',
-      'pid':'0',
-      'pids':'',
-      'name': '检测计划',
-      'code':'route',
-      'path':'/plan/planList/index',
-      'icon':'',
-      'sort':100,
-      'type':0,
-      'remark': '检测计划描述',
-      'state':1,
-    },
-    {
-      id: '2',
-      pid:'0',
-      pids:'',
-      name: '台账管理',
-      code:'route',
-      path:'/machine',
-      icon:'',
-      sort:100,
-      type:0,
-      remark: '台账管理描述',
-      state:1,
-      children:[{
-                id: '21',
-                pid:'11',
-                pids:'',
-                name: '检测脚本',
-                code:'route',
-                path:'/machine/testScript/index',
-                icon:'',
-                sort:100,
-                type:1,
-                remark: '检测脚本描述',
-                state:1,
-                },
-                {
-                  id: '22',
-                  pid:'22',
-                  pids:'',
-                  name: '被检设备',
-                  code:'route',
-                  path:'/plan/planList/index',
-                  icon:'',
-                  sort:100,
-                  type:1,
-                  remark: '被检设备描述',
-                  state:1,
-                  },
-                  {
-                    id: '23',
-                    pid:'23',
-                    pids:'',
-                    name: '误差体系',
-                    code:'route',
-                    path:'/plan/planList/index',
-                    icon:'',
-                    sort:100,
-                    type:1,
-                    remark: '误差体系描述',
-                    state:1,
-                    },
-                    {
-                      id: '24',
-                      pid:'24',
-                      pids:'',
-                      name: '检测源',
-                      code:'route',
-                      path:'/plan/planList/index',
-                      icon:'',
-                      sort:100,
-                      type:1,
-                      remark: '检测源描述',
-                      state:1,
-                }]
-    },
- {
-        id: '3',
-        pid:'0',
-        pids:'',
-        name: '权限管理',
-        code:'route',
-        path:'/plan/planList/index',
-        icon:'',
-        sort:100,
-        type:0,
-        remark: '权限管理描述',
-        state:1,
-        children:[{
-                  id: '31',
-                  pid:'1',
-                  pids:'',
-                  name: '用户管理',
-                  code:'route',
-                  path:'/plan/planList/index',
-                  icon:'',
-                  sort:100,
-                  type:0,
-                  remark: '用户管理描述',
-                  state:1,
-                  },
-                  {
-                    id: '32',
-                    pid:'2',
-                    pids:'',
-                    name: '角色管理',
-                    code:'route',
-                    path:'/plan/planList/index',
-                    icon:'',
-                    sort:100,
-                    type:0,
-                    remark: '角色管理描述',
-                    state:1,
-                    },
-                    {
-                      id: '33',
-                      pid:'3',
-                      pids:'',
-                      name: '菜单管理',
-                      code:'route',
-                      path:'/plan/planList/index',
-                      icon:'',
-                      sort:100,
-                      type:0,
-                      remark: '菜单管理描述',
-                      state:1,
-                      }]
-      },
-      {
-        id: '4',
-        pid:'0',
-        pids:'',
-        name: '系统配置',
-        code:'route',
-        path:'/plan/planList/index',
-        icon:'',
-        sort:100,
-        type:0,
-        remark: '系统配置描述',
-        state:1,
-        children:[{
-                  id: '41',
-                  pid:'1',
-                  pids:'',
-                  name: '通用配置',
-                  code:'route',
-                  path:'/plan/planList/index',
-                  icon:'',
-                  sort:100,
-                  type:0,
-                  remark: '通用配置描述',
-                  state:1,
-                  },
-                  {
-                    id: '42',
-                    pid:'2',
-                    pids:'',
-                    name: '数据字典',
-                    code:'route',
-                    path:'/plan/planList/index',
-                    icon:'',
-                    sort:100,
-                    type:0,
-                    remark: '数据字典描述',
-                    state:1,
-                    },
-                    {
-                      id: '43',
-                      pid:'3',
-                      pids:'',
-                      name: '报告模版',
-                      code:'route',
-                      path:'/plan/planList/index',
-                      icon:'',
-                      sort:100,
-                      type:0,
-                      remark: '报告模版描述',
-                      state:1,
-                      },
-                      {
-                        id: '44',
-                        pid:'4',
-                        pids:'',
-                        name: '版本注册',
-                        code:'route',
-                        path:'/plan/planList/index',
-                        icon:'',
-                        sort:100,
-                        type:0,
-                        remark: '版本注册描述',
-                        state:1,
-                        },]
-      },
-      {
-        id: '5',
-        pid:'0',
-        pids:'',
-        name: '日志管理',
-        code:'route',
-        path:'/plan/planList/index',
-        icon:'',
-        sort:100,
-        type:0,
-        remark: '日志管理描述',
-        state:1,
-      },
-      {
-        id: '6',
-        pid:'0',
-        pids:'',
-        name: '统计分析',
-        code:'route',
-        path:'/plan/planList/index',
-        icon:'',
-        sort:100,
-        type:0,
-        remark: '统计分析描述',
-        state:1,
-      },
-      {
-        id: '7',
-        pid:'0',
-        pids:'',
-        name: '示例',
-        code:'route',
-        path:'/plan/planList/index',
-        icon:'',
-        sort:100,
-        type:0,
-        remark: '示例描述',
-        state:0,
-        children:[{
-                id: '71',
-                pid:'1',
-                pids:'',
-                name: '普通表格',
-                code:'route',
-                path:'/plan/planList/index',
-                icon:'',
-                sort:100,
-                type:0,
-                remark: '普通表格描述',
-                state:0,
-                },
-                {
-                  id: '71',
-                  pid:'1',
-                  pids:'',
-                  name: '表格树',
-                  code:'route',
-                  path:'/plan/planList/index',
-                  icon:'',
-                  sort:100,
-                  type:0,
-                  remark: '表格树描述',
-                  state:0,
-                  }]
-      }, 
-]
-

frontend/src/api/function/index.ts

@@ -1,26 +0,0 @@
-import http from "@/api";
-import { ADMIN as rePrefix } from "@/api/config/serviceName";
-import type { Function } from "@/api/function/interface";
-
-//获取菜单列表
-export const getFunctionList = (params: Function.ReqFunctionParams) => {
-    return http.post(`${rePrefix}/function/list`, params);
-  };
-  
-  //添加菜单列表
-  export const addFunction = (params: Function.ReqFunctionParams) => {
-    return http.post(`${rePrefix}/function/add`,params);
-  };
-  
-  //删除菜单列表
-  export const deleteFunction = (params: { id: string[] }) => {
-    return http.post(`${rePrefix}/function/delete`, { data: params });
-  };
-  
-  //编辑菜单列表
-  export const updateFunction = (params: Function.ReqFunctionParams) => {
-    return http.post(`${rePrefix}/function/update`, params);
-  };
-  
-  
-

frontend/src/api/helper/checkStatus.ts

@@ -10,9 +10,9 @@ export const checkStatus = (status: number) => {
     case 400:
       ElMessage.error("请求失败！请您稍后重试");
       break;
-    case 401:
-      ElMessage.error("登录失效！请您重新登录");
-      break;
+    // case 401:
+    //   ElMessage.error("登录失效！请您重新登录");
+    //   break;
     case 403:
       ElMessage.error("当前账号无权限访问！");
       break;

frontend/src/api/home/channelsTest/index.ts

@@ -0,0 +1,6 @@
+import http from "@/api";
+
+//系数校准发送基本信息
+export const getCoefficientCheck = (params: any) => {
+    return http.post(`/prepare/coefficientCheck`, params,{loading: false})
+  }

frontend/src/api/home/interface/channelsTest.ts

@@ -0,0 +1,31 @@
+// 系数校准模块
+export namespace ChannelsTest  {
+
+  // 系数校准列表
+  export interface CoefficientVO {
+  devName?: string;//设备名称
+    type?:string;//区分大小电压
+    monitorNum: string;//监测点序号
+    desc: string;//描述
+    aVuData:string;//电压通道A数据
+    aVuXi:string;//电压通道A系数
+    bVuData:string;//电压通道B数据
+    bVuXi:string;//电压通道B系数
+    cVuData:string;//电压通道C数据
+    cVuXi:string;//电压通道C系数
+    aIeData:string;//电流通道A数据
+    aIeXi:string;//电流通道A系数
+    bIeData:string;//电流通道B数据
+    bIeXi:string;//电流通道B系数
+    cIeData:string;//电流通道C数据
+    cIeXi:string;//电流通道C系数
+    loading: boolean;
+    aV:string;
+    bV:string;
+    cV:string;
+    aI:string;
+    bI:string;
+    cI:string;
+  }
+
+}

frontend/src/api/index.ts

@@ -1,15 +1,23 @@
-import axios, { AxiosInstance, AxiosError, AxiosRequestConfig, InternalAxiosRequestConfig, AxiosResponse } from "axios";
-import { showFullScreenLoading, tryHideFullScreenLoading } from "@/components/Loading/fullScreen";
-import { LOGIN_URL } from "@/config";
-import { ElMessage } from "element-plus";
-import { ResultData } from "@/api/interface";
-import { ResultEnum } from "@/enums/httpEnum";
-import { checkStatus } from "./helper/checkStatus";
-import { useUserStore } from "@/stores/modules/user";
-import router from "@/routers";
+import { ElMessage } from 'element-plus'
+import axios, {
+    AxiosError,
+    type AxiosInstance,
+    type AxiosRequestConfig,
+    type AxiosResponse,
+    type InternalAxiosRequestConfig
+} from 'axios'
+import { showFullScreenLoading, tryHideFullScreenLoading } from '@/components/Loading/fullScreen'
+import { LOGIN_URL } from '@/config'
+import { type ResultData } from '@/api/interface'
+import { ResultEnum } from '@/enums/httpEnum'
+import { checkStatus } from './helper/checkStatus'
+import { useUserStore } from '@/stores/modules/user'
+import router from '@/routers'
+import { refreshToken } from '@/api/user/login'
+import { EventSourcePolyfill } from 'event-source-polyfill'
 
 export interface CustomAxiosRequestConfig extends InternalAxiosRequestConfig {
-  loading?: boolean;
+    loading?: boolean
 }
 
 const config = {
@@ -21,13 +29,14 @@ const config = {
     withCredentials: true,
     // post请求指定数据类型以及编码
     headers: { 'Content-Type': 'application/json;charset=utf-8' }
-};
+}
 
 class RequestHttp {
-  service: AxiosInstance;
+    service: AxiosInstance
+
     public constructor(config: AxiosRequestConfig) {
         // 创建实例
-    this.service = axios.create(config);
+        this.service = axios.create(config)
 
         /**
          * @description 请求拦截器
@@ -36,77 +45,198 @@ class RequestHttp {
          */
         this.service.interceptors.request.use(
             (config: CustomAxiosRequestConfig) => {
-        const userStore = useUserStore();
+                isFirst = true
+                const userStore = useUserStore()
                 // 当前请求不需要显示 loading，在 api 服务中通过指定的第三个参数: { loading: false } 来控制
-        config.loading ?? (config.loading = true);
-        config.loading && showFullScreenLoading();
-        if (config.headers && typeof config.headers.set === "function") {
-          config.headers.set("x-access-token", userStore.token);
+                config.loading ?? (config.loading = true)
+                config.loading && showFullScreenLoading()
+                if (config.headers && typeof config.headers.set === 'function') {
+                    config.headers.set('Authorization', 'Bearer ' + userStore.accessToken)
+                    config.headers.set('Is-Refresh-Token', userStore.isRefreshToken + '')
                 }
-        return config;
+                return config
             },
             (error: AxiosError) => {
-        return Promise.reject(error);
+                return Promise.reject(error)
             }
-    );
+        )
 
+        let isFirst = true
         /**
          * @description 响应拦截器
          *  服务器换返回信息 -> [拦截统一处理] -> 客户端JS获取到信息
          */
         this.service.interceptors.response.use(
-      (response: AxiosResponse) => {
-        const { data } = response;
-        const userStore = useUserStore();
-        tryHideFullScreenLoading();
+            async (response: AxiosResponse) => {
+                const { data } = response
+                const userStore = useUserStore()
+                tryHideFullScreenLoading()
+
+                if (data.code === ResultEnum.ACCESSTOKEN_EXPIRED) {
+                    // 用长token去换短token
+                    userStore.setAccessToken(userStore.refreshToken)
+                    userStore.setIsRefreshToken(true)
+                    const result = await refreshToken()
+                    if (result) {
+                        //获取新token成功的话
+                        // 有新的token后，重新请求
+                        userStore.setAccessToken(result.data.accessToken)
+                        userStore.setRefreshToken(result.data.refreshToken)
+                        userStore.setIsRefreshToken(false)
+                        userStore.setExp(1000 * 60 * 60 * 24 * 30)
+                        response.config.headers.Authorization = `Bearer ${result.data.accessToken}` //重新请求前需要将更新后的新token更换掉之前无效的token,不然会死循环
+                        const resp = await this.service.request(response.config)
+                        return resp
+                    } else {
+                        // 刷新失效，跳转登录页
+                    }
+                }
                 // 登陆失效
-        if (data.code == ResultEnum.OVERDUE) {
-          userStore.setToken("");
-          router.replace(LOGIN_URL);
-          ElMessage.error(data.message);
-          return Promise.reject(data);
+                if (data.code === ResultEnum.OVERDUE) {
+                    //console.log('登陆失效')
+                    userStore.setAccessToken('')
+                    userStore.setRefreshToken('')
+                    userStore.setIsRefreshToken(false)
+                    userStore.setUserInfo({ id: '', name: '' })
+                    userStore.setExp(0)
+                    await router.replace(LOGIN_URL)
+                    if (isFirst) {
+                        //临时处理token失效弹窗多次
+                        ElMessage.error(data.message)
+                        isFirst = false
+                    }
+                    return Promise.reject(data)
                 }
                 // 全局错误信息拦截（防止下载文件的时候返回数据流，没有 code 直接报错）
                 if (data.code && data.code !== ResultEnum.SUCCESS) {
-          ElMessage.error(data.message);
-          return Promise.reject(data);
+                    if (data.message.includes('&')) {
+                        let formattedMessage = data.message.split('&').join('<br>')
+                        if (data.message.includes(':')) {
+                            formattedMessage = formattedMessage.replace(':', '')
+                        }
+                        ElMessage.error({ message: formattedMessage, dangerouslyUseHTMLString: true })
+                        return Promise.reject(data)
+                    }
+
+                    ElMessage.error(data.message)
+                    return Promise.reject(data)
                 }
                 // 成功请求（在页面上除非特殊情况，否则不用处理失败逻辑）
-        return data;
+
+                if (userStore.exp <= Date.now() && userStore.exp !== 0) {
+                    userStore.setAccessToken('')
+                    userStore.setRefreshToken('')
+                    userStore.setIsRefreshToken(false)
+                    userStore.setUserInfo({ id: '', name: '' })
+                    userStore.setExp(0)
+                    ElMessage.error('登录已过期，请重新登录!')
+                    await router.replace(LOGIN_URL)
+                    return Promise.reject(data)
+                }
+                // 对于blob类型的响应，返回完整的response对象以保留响应头
+                if (response.config.responseType === 'blob') {
+                    return response
+                }
+                return data
             },
             async (error: AxiosError) => {
-        const { response } = error;
-        tryHideFullScreenLoading();
+                const { response } = error
+                tryHideFullScreenLoading()
+                //console.log('error', error.message)
                 // 请求超时 && 网络错误单独判断，没有 response
-        if (error.message.indexOf("timeout") !== -1) ElMessage.error("请求超时！请您稍后重试");
-        if (error.message.indexOf("Network Error") !== -1) ElMessage.error("网络错误！请您稍后重试");
+                if (error.message.indexOf('timeout') !== -1) ElMessage.error('请求超时！请您稍后重试')
+                if (error.message.indexOf('Network Error') !== -1) ElMessage.error('网络错误！请您稍后重试')
                 // 根据服务器响应的错误状态码，做不同的处理
-        if (response) checkStatus(response.status);
+                if (response) checkStatus(response.status)
                 // 服务器结果都没有返回(可能服务器错误可能客户端断网)，断网处理:可以跳转到断网页面
-        if (!window.navigator.onLine) router.replace("/500");
-        return Promise.reject(error);
+                if (!window.navigator.onLine) router.replace('/500')
+                return Promise.reject(error)
             }
-    );
+        )
     }
 
     /**
      * @description 常用请求方法封装
      */
     get<T>(url: string, params?: object, _object = {}): Promise<ResultData<T>> {
-    return this.service.get(url, { params, ..._object });
+        return this.service.get(url, { params, ..._object })
     }
+
     post<T>(url: string, params?: object | string, _object = {}): Promise<ResultData<T>> {
-    return this.service.post(url, params, _object);
+        return this.service.post(url, params, _object)
     }
+
     put<T>(url: string, params?: object, _object = {}): Promise<ResultData<T>> {
-    return this.service.put(url, params, _object);
+        return this.service.put(url, params, _object)
     }
+
     delete<T>(url: string, params?: any, _object = {}): Promise<ResultData<T>> {
-    return this.service.delete(url, { params, ..._object });
+        return this.service.delete(url, { params, ..._object })
     }
+
     download(url: string, params?: object, _object = {}): Promise<BlobPart> {
-    return this.service.post(url, params, { ..._object, responseType: "blob" });
+        return this.service.post(url, params, { ..._object, responseType: 'blob' }).then(res => res.data)
+    }
+
+    downloadWithHeaders(url: string, params?: object, _object = {}): Promise<AxiosResponse<Blob>> {
+        return this.service.post(url, params, { ..._object, responseType: 'blob' })
+    }
+
+    upload(url: string, params?: object, _object = {}): Promise<BlobPart> {
+        return this.service.post(url, params, {
+            ..._object,
+            headers: { 'Content-Type': 'multipart/form-data' }
+        })
+    }
+
+    /**
+     * 针对excel的上传，默认返回的是blob类型，Excel没问题时返回json特殊处理
+     */
+    uploadExcel(url: string, params?: object, _object = {}): Promise<BlobPart> {
+        return this.service
+            .post(url, params, {
+                ..._object,
+                headers: { 'Content-Type': 'multipart/form-data' },
+                responseType: 'blob'
+            })
+            .then(res => res.data)
+    }
+
+    // 添加SSE连接方法
+    sse(url: string, params?: any): EventSource {
+        const userStore = useUserStore()
+        // 构造带参数的URL
+        let requestUrl = config.baseURL + url
+        if (params) {
+            const searchParams = new URLSearchParams()
+            for (const key in params) {
+                if (Object.prototype.hasOwnProperty.call(params, key)) {
+                    searchParams.append(key, String(params[key]))
+                }
+            }
+            requestUrl += '?' + searchParams.toString()
+        }
+
+        // 创建EventSource连接
+        const eventSource = new EventSourcePolyfill(requestUrl, {
+            headers: {
+                Authorization: 'Bearer ' + userStore.accessToken
+            },
+            // 增加超时时间到1200秒
+            heartbeatTimeout: 1200000
+        })
+
+        // 设置默认的Authorization头部
+        eventSource.addEventListener('open', function () {
+            //console.log('SSE连接已建立')
+        })
+        // 添加错误处理
+        eventSource.addEventListener('error', function (err) {
+            console.error('SSE连接错误:', err)
+        })
+
+        return eventSource
     }
 }
 
-export default new RequestHttp(config);
+export default new RequestHttp(config)

frontend/src/api/interface/index.ts

@@ -1,3 +1,4 @@
+import { storeToRefs } from 'pinia';
 /**
  * 该接口声明文件用来声明通用的接口定义，比如 请求参数Base、响应Base、分页等
  */
@@ -14,6 +15,7 @@ export interface Result {
  * 请求响应参数（包含data）
  */
 export interface ResultData<T = any> extends Result {
+  map(arg0: (item: any) => { label: any; value: any; }): { label: string; value: string; }[] | { label: string; value: string; }[];
   data: T;
 }
 
@@ -44,8 +46,11 @@ export interface ResPage<T> {
  */
 export interface Dict {
   id: string;
-  label: string;
+  name: string;
   code: string;
+  value?: string;
+  sort?:number;
+  algoDescribe?: string;
   children?: Dict[];
 }
 

frontend/src/api/log/interface/index.ts

@@ -1,15 +0,0 @@
-// 审计日志管理模块
-export namespace Sys_Log_Audit {
-    // 日志列表
-    export interface Audit_LogList {
-      id: string;//日志表Id
-      operate_Type:string;//日志类型
-      ip:string;//操作IP
-      result: string;//事件结果
-      remark: string;//事件描述
-      warn:number;//告警标志
-      create_By:string;//创建用户
-      create_Time:string;//创建时间
-    }
-
-  }

frontend/src/api/plan/autoTest.json

@@ -2,61 +2,62 @@
   "code": "A0000",
   "data": [
     {
-            "id": 0,
-            "name": "频率准备度检测",
+      "id": "1",
+      "pid": "0",
+      "name": "频率准确度检测",
       "children": [
         {
-                    "pid": 0,
-                    "id": "0-1",
+          "id": "1-1",
+          "pid": "1",
           "name": "额定工作条件下的检测",
           "children": [
             {
-                            "pid": "0-1",
-                            "id": "0-1-1",
+              "id": "1-1-1",
+              "pid": "1-1",
               "name": "输入：频率 42.5Hz..."
             },
             {
-                            "pid": "0-1",
-                            "id": "0-1-2",
+              "id": "1-1-2",
+              "pid": "1-1",
               "name": "输入：频率 50.0Hz..."
             },
             {
-                            "pid": "0-1",
-                            "id": "0-1-3",
-                            "name": "输入：频率 50.05Hz..."
+              "id": "1-1-3",
+              "pid": "1-1",
+              "name": "输入：频率 50.05Hz...."
             }
           ]
         },
         {
-                    "pid": 0,
-                    "id": "0-2",
+          "id": "1-2",
+          "pid": "1",
           "name": "电压对频率测量的影响",
           "children": [
             {
-                            "pid": "0-2",
-                            "id": "0-2-1",
+              "id": "1-2-1",
+              "pid": "1-2",
               "name": "输入：频率 50.05Hz Ua =10%Un..."
             },
             {
-                            "pid": "0-2",
-                            "id": "0-2-1",
+              "id": "1-2-1",
+              "pid": "1-2",
               "name": "输入：频率 51.05Hz Ua =10%Un..."
             },
             {
-                            "pid": "0-2",
-                            "id": "0-2-2",
+              "id": "1-2-2",
+              "pid": "1-2",
               "name": "输入：频率 52.05Hz Ua =10%Un..."
             }
           ]
         },
         {
-                    "pid": 0,
-                    "id": "0-3",
+          "id": "1-3",
+          "pid": "1",
           "name": "谐波对频率测量的影响",
           "children": [
             {
-                            "pid": "0-3",
-                            "id": "0-3-1",
+              "id": "1-3-1",
+              "pid": "1-3",
               "name": "输入：频率 50.05Hz Ua =100%Un..."
             }
           ]
@@ -64,124 +65,125 @@
       ]
     },
     {
-            "id": 1,
+      "id": "2",
+      "pid": "0",
       "name": "电压准确度检测",
       "children": [
         {
-                    "pid": 1,
-                    "id": "1-1",
-                    "name": "额定工作条件下的检测",
-                    "children": [
-                        {
-                            "pid": "1-1",
-                            "id": "1-1-1",
-                            "name": "输入：频率 42.5Hz..."
-                        },
-                        {
-                            "pid": "1-1",
-                            "id": "1-1-2",
-                            "name": "输入：频率 50.0Hz..."
-                        },
-                        {
-                            "pid": "1-1",
-                            "id": "1-1-3",
-                            "name": "输入：频率 50.05Hz..."
-                        }
-                    ]
-                },
-                {
-                    "pid": 0,
-                    "id": "1-2",
-                    "name": "电压对频率测量的影响",
-                    "children": [
-                        {
-                            "pid": "1-2",
-                            "id": "1-2-1",
-                            "name": "输入：频率 50.05Hz Ua =10%Un..."
-                        },
-                        {
-                            "pid": "1-2",
-                            "id": "1-2-1",
-                            "name": "输入：频率 51.05Hz Ua =10%Un..."
-                        },
-                        {
-                            "pid": "1-2",
-                            "id": "1-2-2",
-                            "name": "输入：频率 52.05Hz Ua =10%Un..."
-                        }
-                    ]
-                },
-                {
-                    "pid": 0,
-                    "id": "0-3",
-                    "name": "谐波对频率测量的影响",
-                    "children": [
-                        {
-                            "pid": "0-3",
-                            "id": "0-3-1",
-                            "name": "输入：频率 50.05Hz Ua =100%Un..."
-                        }
-                    ]
-                }
-            ]
-        },
-
-        {
-            "id": 2,
-            "name": "谐波准确度检测",
-            "children": [
-                {
-                    "pid": 2,
+          "pid": "2",
           "id": "2-1",
           "name": "额定工作条件下的检测",
           "children": [
             {
-                            "pid": "2-1",
               "id": "2-1-1",
+              "pid": "2-1",
               "name": "输入：频率 42.5Hz..."
             },
             {
-                            "pid": "2-1",
               "id": "2-1-2",
+              "pid": "2-1",
               "name": "输入：频率 50.0Hz..."
             },
             {
-                            "pid": "2-1",
               "id": "2-1-3",
+              "pid": "2-1",
               "name": "输入：频率 50.05Hz..."
             }
           ]
         },
         {
-                    "pid": 2,
+          "pid": "2",
           "id": "2-2",
           "name": "电压对频率测量的影响",
           "children": [
             {
-                            "pid": "2-2",
               "id": "2-2-1",
+              "pid": "2-2",
               "name": "输入：频率 50.05Hz Ua =10%Un..."
             },
             {
-                            "pid": "2-2",
               "id": "2-2-1",
+              "pid": "2-2",
               "name": "输入：频率 51.05Hz Ua =10%Un..."
             },
             {
-                            "pid": "2-2",
               "id": "2-2-2",
+              "pid": "2-2",
               "name": "输入：频率 52.05Hz Ua =10%Un..."
             }
           ]
         },
         {
-                    "pid": 2,
+          "pid": "2",
           "id": "2-3",
           "name": "谐波对频率测量的影响",
           "children": [
             {
-                            "pid": "2-3",
               "id": "2-3-1",
+              "pid": "2-3",
+              "name": "输入：频率 50.05Hz Ua =100%Un..."
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "3",
+      "pid": "0",
+      "name": "谐波准确度检测",
+      "children": [
+        {
+          "id": "3-1",
+          "pid": "3",
+          "name": "额定工作条件下的检测",
+          "children": [
+            {
+              "id": "3-1-1",
+              "pid": "3-1",
+              "name": "输入：频率 42.5Hz..."
+            },
+            {
+              "id": "3-1-2",
+              "pid": "3-1",
+              "name": "输入：频率 50.0Hz..."
+            },
+            {
+              "id": "3-1-3",
+              "pid": "3-1",
+              "name": "输入：频率 50.05Hz..."
+            }
+          ]
+        },
+        {
+          "id": "3-2",
+          "pid": "3",
+          "name": "电压对频率测量的影响",
+          "children": [
+            {
+              "id": "3-2-1",
+              "pid": "3-2",
+              "name": "输入：频率 50.05Hz Ua =10%Un..."
+            },
+            {
+              "id": "3-2-1",
+              "pid": "3-2",
+              "name": "输入：频率 51.05Hz Ua =10%Un..."
+            },
+            {
+              "id": "3-2-2",
+              "pid": "3-2",
+              "name": "输入：频率 52.05Hz Ua =10%Un..."
+            }
+          ]
+        },
+        {
+          "id": "3-3",
+          "pid": "3",
+          "name": "谐波对频率测量的影响",
+          "children": [
+            {
+              "id": "3-3-1",
+              "pid": "3-3",
               "name": "输入：频率 50.05Hz Ua =100%Un..."
             }
           ]

frontend/src/api/plan/interface/index.ts

@@ -1,44 +1,73 @@
 import type { ReqPage } from '@/api/interface'
-import type { DatetimeFormatProps } from 'vue-i18n';
 
 // 检测计划模块
 export namespace Plan {
 
-    // 检测计划列表
-    export interface PlanList {
+    // 检测计划接口
+    export interface ResPlan {
         id: string;     //检测计划ID
         name: string; //检测计划名称
-        pattern: string; //模式，字典表（数字、模拟、比对）
-        father_Plan_Id: string;   //父计划ID
-        dataSource_Id: string;   //数据源ID
-        script_Id: string;   //检测脚本ID
-        error_Sys_Id: string;//误差体系ID
-        test_State: string; //检测状态
-        report_State: string;   //报告生成状态
-        result: string;//检测结果
-        state: number; //状态
-        create_By?: string;   //创建用户
-        create_Time?: string;//创建时间
-        update_By?: string; //更新用户
-        update_Time?: string; //更新时间
+        pattern?: string; //模式，字典表（数字、模拟、比对）
+        fatherPlanId?: string;   //父计划ID
+        dataSourceId: string;   //数据源ID
+        scriptId: string;   //检测脚本ID
+        errorSysId: string;//误差体系ID
+        timeCheck:number;//守时检测:0否，1。是
+        testState: number; //检测状态:0:未检、1：检测中、2：检测完成,默认为 0
+        reportState: number;   //报告生成状态:0:未生成、1：部分生成、2：全部生成,默认为 0
+        result: number;//检测结果:0:不符合、1:符合、2：/,默认为 2
+        code:number; //自动生成，用于生成数据表后缀
+        state: number;//;状态：0-删除 1-正常
+        createBy?:string; //创建用户
+        createTime?:string; //创建时间
+        updateBy?:string; //更新用户
+        updateTime?:string; //更新时间
+        
+        associateReport:number;//是否关联报告模板 0否 1是
+        reportTemplateName:string;
+        reportTemplateVersion:string;
+        dataRule:string;//数据处理原则
+
+        standardDevIds:string[];
+        standardDevMap:Map<string,number>;//标准设备
+        testItems:string[];//测试项
+        Check_By?:string;//计划检测人
+        progress?: number; // 进度百分比，例如 75
+        children?: ResPlan[];
+        testConfig?: PlanTestConfig;
+        importFlag?: number; // 导入标识，0-否，1-是
+        leader?: string; // 负责人
+        memberIds?: string | string[]; //成员
+        members?: string; //成员字符串
     }
 
-    // 被检设备参数
-    export interface ReqPlanParams extends ReqPage {
-        id: string;     //检测计划ID
-        name: string; //检测计划名称
-        pattern: string; //模式，字典表（数字、模拟、比对）
-        father_Plan_Id: string;   //父计划ID
-        dataSource_Id: string;   //数据源ID
-        script_Id: string;   //检测脚本ID
-        error_Sys_Id: string;//误差体系ID
-        test_State: string; //检测状态
-        report_State: string;   //报告生成状态
-        result: string;//检测结果
-        state: number; //状态
-        create_By?: string;   //创建用户
-        create_Time?: string;//创建时间
-        update_By?: string; //更新用户
-        update_Time?: string; //更新时间
+    // 检测计划 + 分页
+    export interface ReqPlanParams extends ReqPage,ResPlan {
+        
     }
+
+
+
+    export interface ReqPlan extends ResPlan {
+        datasourceIds:string | string[];
+        sourceIds: string | null;
+        planId:string;
+        scriptName: string ; 
+        errorSysName: string;
+        sourceName: string ;
+        standardDevNameStr: string;
+        testItemNameStr:string;
+        devIds: string[];
+    }
+
+    export interface PlanTestConfig {
+        planId: string;
+        waveRecord: number;
+        realTime: number;
+        statistics: number;
+        flicker: number;
+        maxTime: number;
+    }
+
+  
   }

frontend/src/api/plan/plan.ts

@@ -0,0 +1,162 @@
+import type { Plan } from './interface'
+import http from '@/api'
+import type { ErrorSystem } from '../device/interface/error'
+import type { Device } from '../device/interface/device'
+
+/**
+ * @name 检测计划管理模块
+ */
+// 获取检测计划列表
+export const getPlanList = (params: Plan.ReqPlanParams) => {
+    return http.post(`/adPlan/list`, params)
+}
+
+// 新增检测计划
+export const addPlan = (params: any) => {
+    return http.post(`/adPlan/add`, params)
+}
+
+// 编辑检测计划
+export const updatePlan = (params: any) => {
+    return http.post(`/adPlan/update`, params)
+}
+
+// 删除检测计划
+export const deletePlan = (params: { id: string[]; pattern: string }) => {
+    return http.post(`/adPlan/delete?pattern=${params.pattern}`, params.id)
+}
+
+// 获取指定模式下所有检测源
+export const getTestSourceList = (params: Plan.ReqPlan) => {
+    return http.get(`/pqSource/getAll?patternId=${params.pattern}`)
+}
+
+// 获取指定模式下所有检测脚本
+export const getPqScriptList = (params: Plan.ReqPlan) => {
+    return http.get(`/pqScript/getAll?patternId=${params.pattern}`)
+}
+
+//获取所有误差体系
+export const getPqErrSysList = () => {
+    return http.get<ErrorSystem.ErrorSystemList>(`/pqErrSys/getAll`)
+}
+
+//获取指定模式下所有未绑定的设备
+export const getUnboundPqDevList = (params: { pattern: string}) => {
+    return http.get(`/pqDev/listUnbound?pattern=${params.pattern}`)
+}
+
+//根据检测计划id查询出所有已绑定的设备
+export const getBoundPqDevList = (params: any) => {
+    return http.post(`/adPlan/listByPlanId`, params)
+}
+
+//检测计划绑定设备
+// export const BindPqDevList = (params: any) => {
+//   return http.post(`/pqDev/bindDev`,params)
+// }
+
+// 按照模式查询检测计划（用于首页展示）
+export const getPlanListByPattern = (params: Plan.ReqPlan) => {
+    return http.get(`/adPlan/listByPattern?pattern=${params.pattern}`)
+}
+
+// 导出检测计划
+export const exportPlan = (params: Device.ReqPqDevParams) => {
+    return http.download(`/adPlan/export`, params)
+}
+
+// 下载模板
+export const downloadTemplate = (params: { patternId: string }) => {
+    return http.download(`/adPlan/downloadTemplate`, params)
+}
+// 导入检测计划
+export const importPlan = (params: Device.ReqPqDevParams) => {
+    return http.uploadExcel(`/adPlan/import`, params)
+}
+
+// 装置检测报告生成
+export const generateDevReport = (params: Device.ReqDevReportParams) => {
+    return http.post(`/report/generateReport`, params)
+}
+
+// 装置检测报告下载
+export const downloadDevData = (params: Device.ReqDevReportParams) => {
+    return http.download(`/report/downloadReport`, params)
+}
+
+// 装置检测报告下载（带响应头）
+export const downloadDevDataWithHeaders = (params: Device.ReqDevReportParams) => {
+    return http.downloadWithHeaders(`/report/downloadReport`, params)
+}
+
+export const staticsAnalyse = (params: { id: string[] }) => {
+    return http.download('/adPlan/analyse', params)
+}
+
+//根据计划id分页查询被检设
+export const getDevListByPlanId = (params: any) => {
+    return http.post(`/adPlan/listDevByPlanId`, params)
+}
+
+//修改子计划名称
+export const updateSubPlanName = (params: Plan.ReqPlan) => {
+    return http.get(`/adPlan/updateSubPlanName?planId=${params.id}&name=${params.name}`)
+}
+
+//子计划绑定/解绑标准设备
+export const subPlanBindStandardDevList = (params: Plan.ReqPlan) => {
+    return http.post(`/adPlan/updateBindStandardDev`, params)
+}
+
+//子计划绑定/解绑被检设备
+export const subPlanBindDev = (params: Plan.ReqPlan) => {
+    return http.post(`/adPlan/updateBindDev`, params)
+}
+
+//根据父计划ID获取未被子计划绑定的标准设备
+export const getUnboundStandardDevList = (params: Plan.ResPlan) => {
+    return http.get(`/adPlan/getUnBoundStandardDev?fatherPlanId=${params.fatherPlanId}`)
+}
+
+//根据计划ID获取已绑定的标准设备
+export const getBoundStandardDevList = (params: Plan.ResPlan) => {
+    return http.get(`/adPlan/getBoundStandardDev?planId=${params.id}`)
+}
+
+//根据计划ID获取已绑定的所有标准设备
+export const getBoundStandardDevAllList = (params: { id: string }) => {
+    return http.get(`/adPlan/getBoundStandardDev?planId=${params.id}&all=1`)
+}
+
+// 导出子计划
+export const exportSubPlan = (params: Plan.ResPlan) => {
+    return http.download(`/adPlan/exportSubPlan?planId=${params.id}`)
+}
+
+// 导入子检测计划
+export const importSubPlan = (params: Plan.ResPlan) => {
+    return http.upload(`/adPlan/importSubPlan`, params)
+}
+
+// 导出计划检测结果数据
+export const exportPlanCheckData = (params: any) => {
+    return http.post(
+        `/adPlan/exportPlanCheckData?planId=${params.id}&devIds=${params.devIds}&report=${params.report}`
+    )
+}
+
+//根据误差体系id获取测试项
+export const getPqErrSysTestItemList = (params: {errorSysId : string}) => {
+    return http.get(`/pqErrSys/getTestItems?id=${params.errorSysId}`)
+}
+
+// 获取计划项目成员
+export const getMemberList = (params: {id : string}) => {
+    return http.get(`/adPlan/getMemberList?planId=${params.id}`)
+}
+
+// 导入并合并子检测计划检测结果数据
+export const importAndMergePlanCheckData = (params: Plan.ResPlan) => {
+    return http.upload(`/adPlan/importAndMergePlanCheckData`, params)
+}

frontend/src/api/plan/planData.ts

@@ -1,125 +1,489 @@
 import type {Plan} from "./interface"
 
-const plandata = ref<Plan.PlanList[]>([
+/**
+ *  Dict 字典属性
+ *  id: 唯一标识
+ *  label: 名称
+ */
+interface Dict {
+  id: string;
+  label: string;
+}
+
+const dictPattern: Dict[] = [
+  {
+    id: "0",
+    label: '数字',
+  },
+  {
+    id: "1",
+    label: '模拟',
+  },
+  {
+    id: "2",
+    label: '比对',
+  },
+]
+
+const dictTestState: Dict[] = [
+  {
+    id: "0",
+    label: '未检',
+  },
+  {
+    id: "1",
+    label: '检测中',
+  },
+  {
+    id: "2",
+    label: '检测完成',
+  },
+]
+
+const dictReportState: Dict[] = [
+  {
+    id: "0",
+    label: '未生成',
+  },
+  {
+    id: "1",
+    label: '部分生成',
+  },
+  {
+    id: "2",
+    label: '全部生成',
+  },
+]
+
+const dictResult: Dict[] = [
+  {
+    id: "0",
+    label: '不符合',
+  },
+  {
+    id: "1",
+    label: '符合',
+  },
+  {
+    id: "2",
+    label: '/',
+  },
+]
+
+//全部检测计划名称与ID
+const testPlanDataList: Dict[] = [
+  {
+    id: "1",
+    label: '模拟检测计划1',
+  },
+  {
+    id: "2",
+    label: '模拟检测计划2',
+  }, 
+   {
+    id: "3",
+    label: '模拟检测计划3',
+  },
+]
+
+//全部数据源名称与ID
+const testSoureDataList: Dict[] = [
+  {
+    id: "1",
+    label: '实时数据',
+  },
+  {
+    id: "2",
+    label: '分钟统计数据最大值',
+  }, 
+   {
+    id: "3",
+    label: '分钟统计数据最小值',
+  },
+  {
+    id: "4",
+    label: '分钟统计数据平均值',
+  }, 
+   {
+    id: "5",
+    label: '分钟统计数据CP95值',
+  },
+  {
+    id: "6",
+    label: '录波数据',
+  },
+]
+
+//全部检测脚本名称与ID
+const testScriptDataList: Dict[] = [
+  {
+    id: "1",
+    label: '国网入网检测脚本（单影响量-模拟式）',
+  },
+  {
+    id: "2",
+    label: '国网入网检测脚本（Q/GDW 10650.4 - 2021) 模拟式',
+  }, 
+   {
+    id: "3",
+    label: '国网入网检测脚本（Q/GDW 1650.4 - 2016) 模拟式',
+  },
+  {
+    id: "4",
+    label: 'GBT 19862 - 2016 模拟式',
+  }, 
+   {
+    id: "5",
+    label: '北京比对检测脚本',
+  },
+]
+
+//全部误差体系名称与ID
+const testErrSystDataList: Dict[] = [
+  {
+    id: "1",
+    label: 'Q/GDW 1650.2- 2016',
+  },
+  {
+    id: "2",
+    label: 'Q/GDW 10650.2 - 2021',
+  }, 
+   {
+    id: "3",
+    label: 'GBT 19862 - 2016',
+  },
+]
+
+//父计划ID及名称
+const testFatherPlanList: Dict[] = [
+  {
+    id: "1",
+    label: '检测计划1',
+  },
+  {
+    id: "2",
+    label: '检测子计划2',
+  }, 
+   {
+    id: "3",
+    label: '检测子计划1-2',
+  },
+]
+
+//检测源ID及名称
+const sourceDataList: Dict[] = [
+  {
+    id: "1",
+    label: '标准源-FLUKE.6100A电能功率标准源-1',
+  },
+  {
+    id: "2",
+    label: '标准源-ANGLI-FP2高性能数字信号源-1',
+  }, 
+   {
+    id: "3",
+    label: '标准源-DKLN-1电能质量测试分析仪智能检定装置-1',
+  },
+  {
+    id: "4",
+    label: '标准源-PQC600A高精度电能功率标准源-1',
+  },
+  {
+    id: "5",
+    label: '高精度设备-PQV-520便携式电能质量监测装置-1',
+  },
+  {
+    id: "6",
+    label: '高精度设备-PQV-520便携式电能质量监测装置-2',
+  },
+  {
+    id: "7",
+    label: '高精度设备-PQV-520便携式电能质量监测装置-3',
+  },
+  {
+    id: "8",
+    label: '高精度设备-PQV-520便携式电能质量监测装置-4',
+  },
+]
+
+//被检设备ID及名称
+const deviceDataList: Dict[] = [
+  {
+    id: "1",
+    label: '240001',
+  },
+  {
+    id: "2",
+    label: '240002',
+  }, 
+   {
+    id: "3",
+    label: '240003',
+  },
+  {
+    id: "4",
+    label: '240004',
+  },
+  {
+    id: "5",
+    label: '240005',
+  },
+  {
+    id: "6",
+    label: '240006',
+  },
+  {
+    id: "7",
+    label: '240007',
+  },
+  {
+    id: "8",
+    label: '240008',
+  },
+]
+// const deviceDataList: Dict[] = [
+//   {
+//     id: "1",
+//     label: '模拟装置1',
+//   },
+//   {
+//     id: "2",
+//     label: '模拟装置2',
+//   }, 
+//    {
+//     id: "3",
+//     label: '模拟装置3',
+//   },
+//   {
+//     id: "4",
+//     label: '模拟装置4',
+//   },
+//   {
+//     id: "5",
+//     label: '中电送检装置',
+//   },
+//   {
+//     id: "6",
+//     label: '易司拓测试装置',
+//   },
+//   {
+//     id: "7",
+//     label: '山大电力测试装置1',
+//   },
+//   {
+//     id: "8",
+//     label: '山大电力测试装置2',
+//   },
+
+// ]
+
+const planData = ref<Plan.PlanAndSourceBO[]>([
   {
     'id': '1',
-        'name': '检测计划1',
-        'pattern':'模拟式',
-        'father_Plan_Id':'/',
-        'dataSource_Id':'分钟统计数据最大值',
-        'script_Id':'国网入网检测脚本（单影响量-模拟式）',
-        'error_Sys_Id':'Q/GDW 1650.2- 2016',
-        'test_State':'未检',
-        'report_State':'未生成',
-        'result':'符合',
-        'state': 1,
-        'create_By':'',
-        'create_Time':'',
-        'update_By':'',
-        'update_Time':'',
+    'name': '沧州110kV东光站装置送检',
+    'pattern':'1',
+    "source_Id" : ['1'],
+    "testSourceName":'标准源-FLUKE.6100A电能功率标准源-1',
+    'dataSource_Id':['1'],
+    'dataSource_Ids':'实时数据',
+    'script_Id':'1',
+    'error_Sys_Id':'1',
+    'test_State':'1',
+    'report_State':'1',
+    'result':'1',
   },
   {
     'id': '2',
-        'name': '检测子计划1-1',
-        'pattern':'模拟式',
-        'father_Plan_Id':'检测计划1',
-        'dataSource_Id':'分钟统计数据最大值',
-        'script_Id':'国网入网检测脚本（单影响量-模拟式）',
-        'error_Sys_Id':'Q/GDW 1650.2- 2016',
-        'test_State':'未检',
-        'report_State':'未生成',
-        'result':'符合',
-        'state': 1,
-        'create_By':'',
-        'create_Time':'',
-        'update_By':'',
-        'update_Time':'',
+    'name': '邯郸2台安徽振兴终端送检',
+    'pattern':'1',
+    "source_Id" : ['5','6','7','8'],
+    "testSourceName":'高精度设备-PQV-520便携式电能质量监测装置-1',
+    'father_Plan_Id':'1',
+    'dataSource_Id':['1'],
+    'dataSource_Ids':'实时数据',
+    'script_Id':'2',
+    'error_Sys_Id':'2',
+    'test_State':'2',
+    'report_State':'2',
+    'result':'0',
+    "testSourceList":[
+      '高精度设备-PQV-520便携式电能质量监测装置-2','高精度设备-PQV-520便携式电能质量监测装置-3','高精度设备-PQV-520便携式电能质量监测装置-4'
+    ]
   },
   {
     'id': '3',
-        'name': '检测子计划1-2',
-        'pattern':'模拟式',
-        'father_Plan_Id':'检测计划1',
-        'dataSource_Id':'分钟统计数据最大值',
-        'script_Id':'国网入网检测脚本（单影响量-模拟式）',
-        'error_Sys_Id':'Q/GDW 1650.2- 2016',
-        'test_State':'未检',
-        'report_State':'未生成',
-        'result':'符合',
-        'state': 1,
-        'create_By':'',
-        'create_Time':'',
-        'update_By':'',
-        'update_Time':'',
-      },
-      {
-        'id': '4',
-        'name': '检测计划2',
-        'pattern':'模拟式',
-        'father_Plan_Id':'/',
-        'dataSource_Id':'分钟统计数据最小值',
-        'script_Id':'国网入网检测脚本（单影响量-模拟式）',
-        'error_Sys_Id':'Q/GDW 10650.2 - 2021',
-        'test_State':'检测完成',
-        'report_State':'部分生成',
-        'result':'不符合',
-        'state': 1,
-        'create_By':'',
-        'create_Time':'',
-        'update_By':'',
-        'update_Time':'',
-      },
-      {
-        'id': '5',
-        'name': '检测计划3',
-        'pattern':'模拟式',
-        'father_Plan_Id':'/',
-        'dataSource_Id':'分钟统计数据最大值',
-        'script_Id':'/',
-        'error_Sys_Id':'/',
-        'test_State':'未检',
-        'report_State':'未生成',
-        'result':'符合',
-        'state': 1,
-        'create_By':'',
-        'create_Time':'',
-        'update_By':'',
-        'update_Time':'',
-      },
-      {
-        'id': '6',
-        'name': '检测子计划4',
-        'pattern':'模拟式',
-        'father_Plan_Id':'/',
-        'dataSource_Id':'分钟统计数据CP95值',
-        'script_Id':'国网入网检测脚本（单影响量-模拟式）',
-        'error_Sys_Id':'Q/GDW 1650.2- 2016',
-        'test_State':'未检',
-        'report_State':'未生成',
-        'result':'符合',
-        'state': 1,
-        'create_By':'',
-        'create_Time':'',
-        'update_By':'',
-        'update_Time':'',
-      },
-      {
-        'id': '7',
-        'name': '检测子计划4-1',
-        'pattern':'模拟式',
-        'father_Plan_Id':'检测计划4',
-        'dataSource_Id':'分钟统计数据CP95值',
-        'script_Id':'国网入网检测脚本（单影响量-模拟式）',
-        'error_Sys_Id':'Q/GDW 1650.2- 2016',
-        'test_State':'未检',
-        'report_State':'未生成',
-        'result':'符合',
-        'state': 1,
-        'create_By':'',
-        'create_Time':'',
-        'update_By':'',
-        'update_Time':'',
+    'name': '浙江分布式光伏电能质量试点',
+    'pattern':'1',
+    "source_Id" : ['3'],
+    "testSourceName":'标准源-DKLN-1电能质量测试分析仪智能检定装置-1',
+    'father_Plan_Id':'1',
+    'dataSource_Id':['1'],
+    'dataSource_Ids':'实时数据',
+    'script_Id':'4',
+    'error_Sys_Id':'3',
+    'test_State':'1',
+    'report_State':'1',
+    'result':'1',
   },
 ])
+// const planData = ref<Plan.PlanBO[]>([
+//   {
+//       'id': '1',
+//       'name': '检测计划1',
+//       'pattern':'1',
+//       'dataSource_Id':'1',
+//       'script_Id':'1',
+//       'error_Sys_Id':'1',
+//       'test_State':'1',
+//       'report_State':'1',
+//       'result':'1',
+//     },
+//     {
+//       'id': '2',
+//       'name': '检测子计划2',
+//       'pattern':'1',
+//       'father_Plan_Id':'1',
+//       'dataSource_Id':'2',
+//       'script_Id':'2',
+//       'error_Sys_Id':'2',
+//       'test_State':'2',
+//       'report_State':'2',
+//       'result':'0',
+//     },
+//     {
+//       'id': '3',
+//       'name': '检测子计划1-2',
+//       'pattern':'1',
+//       'father_Plan_Id':'1',
+//       'dataSource_Id':'3',
+//       'script_Id':'3',
+//       'error_Sys_Id':'3',
+//       'test_State':'1',
+//       'report_State':'1',
+//       'result':'1',
+//     },
+// ])
 
-export default plandata
+// const plandata = ref<Plan.PlanList[]>([
+//     {
+//         'id': '1',
+//         'name': '检测计划1',
+//         'pattern':'模拟式',
+//         'father_Plan_Id':'/',
+//         'dataSource_Id':'分钟统计数据最大值',
+//         'script_Id':'国网入网检测脚本（单影响量-模拟式）',
+//         'error_Sys_Id':'Q/GDW 1650.2- 2016',
+//         'test_State':'未检',
+//         'report_State':'未生成',
+//         'result':'符合',
+//         'state': 1,
+//         'create_By':'',
+//         'create_Time':'',
+//         'update_By':'',
+//         'update_Time':'',
+//       },
+//       {
+//         'id': '2',
+//         'name': '检测子计划1-1',
+//         'pattern':'模拟式',
+//         'father_Plan_Id':'检测计划1',
+//         'dataSource_Id':'分钟统计数据最大值',
+//         'script_Id':'国网入网检测脚本（单影响量-模拟式）',
+//         'error_Sys_Id':'Q/GDW 1650.2- 2016',
+//         'test_State':'未检',
+//         'report_State':'未生成',
+//         'result':'符合',
+//         'state': 1,
+//         'create_By':'',
+//         'create_Time':'',
+//         'update_By':'',
+//         'update_Time':'',
+//       },
+//       {
+//         'id': '3',
+//         'name': '检测子计划1-2',
+//         'pattern':'模拟式',
+//         'father_Plan_Id':'检测计划1',
+//         'dataSource_Id':'分钟统计数据最大值',
+//         'script_Id':'国网入网检测脚本（单影响量-模拟式）',
+//         'error_Sys_Id':'Q/GDW 1650.2- 2016',
+//         'test_State':'未检',
+//         'report_State':'未生成',
+//         'result':'符合',
+//         'state': 1,
+//         'create_By':'',
+//         'create_Time':'',
+//         'update_By':'',
+//         'update_Time':'',
+//       },
+//       {
+//         'id': '4',
+//         'name': '检测计划2',
+//         'pattern':'模拟式',
+//         'father_Plan_Id':'/',
+//         'dataSource_Id':'分钟统计数据最小值',
+//         'script_Id':'国网入网检测脚本（单影响量-模拟式）',
+//         'error_Sys_Id':'Q/GDW 10650.2 - 2021',
+//         'test_State':'检测完成',
+//         'report_State':'部分生成',
+//         'result':'不符合',
+//         'state': 1,
+//         'create_By':'',
+//         'create_Time':'',
+//         'update_By':'',
+//         'update_Time':'',
+//       },
+//       {
+//         'id': '5',
+//         'name': '检测计划3',
+//         'pattern':'模拟式',
+//         'father_Plan_Id':'/',
+//         'dataSource_Id':'分钟统计数据最大值',
+//         'script_Id':'/',
+//         'error_Sys_Id':'/',
+//         'test_State':'未检',
+//         'report_State':'未生成',
+//         'result':'符合',
+//         'state': 1,
+//         'create_By':'',
+//         'create_Time':'',
+//         'update_By':'',
+//         'update_Time':'',
+//       },
+//       {
+//         'id': '6',
+//         'name': '检测子计划4',
+//         'pattern':'模拟式',
+//         'father_Plan_Id':'/',
+//         'dataSource_Id':'分钟统计数据CP95值',
+//         'script_Id':'国网入网检测脚本（单影响量-模拟式）',
+//         'error_Sys_Id':'Q/GDW 1650.2- 2016',
+//         'test_State':'未检',
+//         'report_State':'未生成',
+//         'result':'符合',
+//         'state': 1,
+//         'create_By':'',
+//         'create_Time':'',
+//         'update_By':'',
+//         'update_Time':'',
+//       },
+//       {
+//         'id': '7',
+//         'name': '检测子计划4-1',
+//         'pattern':'模拟式',
+//         'father_Plan_Id':'检测计划4',
+//         'dataSource_Id':'分钟统计数据CP95值',
+//         'script_Id':'国网入网检测脚本（单影响量-模拟式）',
+//         'error_Sys_Id':'Q/GDW 1650.2- 2016',
+//         'test_State':'未检',
+//         'report_State':'未生成',
+//         'result':'符合',
+//         'state': 1,
+//         'create_By':'',
+//         'create_Time':'',
+//         'update_By':'',
+//         'update_Time':'',
+//       },  
+// ])
+
+export {planData,dictPattern,dictTestState,dictReportState,dictResult,testPlanDataList,sourceDataList,deviceDataList,testSoureDataList,testScriptDataList,testErrSystDataList,testFatherPlanList}

frontend/src/api/plan/planList.ts

@@ -2,6 +2,7 @@ import http from "@/api";
 
 //获取计划列表
 export const getPlanList = (data: any) => {
+  return null;
     return http.post<Static.planData>(
       "http://192.168.1.123:4523/m1/2573730-0-default/plan/planList/list",
       data,

frontend/src/api/plan/static.json

@@ -2,22 +2,22 @@
     "code": "200",
     "data": [
         {
-            "name": "未检测",
+            "name": "未检",
             "children": [
                 {
                     "id": 4,
                     "pid": 1,
-                    "name": "检测计划1"
+                    "name": "邯郸220kV团城站电能质量检测"
                 },
                 {
                     "id": 5,
                     "pid": 1,
-                    "name": "检测计划2"
+                    "name": "衡水冀州光伏电站配套出口工程"
                 },
                 {
                     "id": 6,
                     "pid": 1,
-                    "name": "检测计划3"
+                    "name": "深圳市中电公司委托送检"
                 }
             ],
             "id": 1
@@ -28,17 +28,17 @@
                 {
                     "id": 7,
                     "pid": 2,
-                    "name": "检测计划4"
+                    "name": "沧州220kV留古站电能质量检测"
                 },
                 {
                     "id": 8,
                     "pid": 2,
-                    "name": "检测计划5"
+                    "name": "沧州110kV东光站装置送检"
                 },
                 {
                     "id": 9,
                     "pid": 2,
-                    "name": "检测计划6"
+                    "name": "浙江分布式光伏电能质量试点"
                 }
             ],
             "id": 2
@@ -49,12 +49,12 @@
                 {
                     "id": 10,
                     "pid": 3,
-                    "name": "检测计划7"
+                    "name": "邯郸2台安徽振兴终端送检"
                 },
                 {
                     "id": 11,
                     "pid": 3,
-                    "name": "检测计划8"
+                    "name": "深圳2台中电终端委托送检"
                 }
             ],
             "id": 3

frontend/src/api/result/interface/index.ts

@@ -0,0 +1,51 @@
+
+export interface MonitorResult {
+    /**
+     * 监测点id
+     */
+    monitorId: string;
+
+    /**
+     * 监测点序号
+     */
+    monitorNum: number;
+
+    /**
+     * 总检测次数
+     */
+    totalNum: number;
+
+    /**
+     * 合格检测次数
+     */
+    qualifiedNum: number;
+
+    /**
+     * 不合格检测次数
+     */
+    unQualifiedNum: number;
+
+    /**
+     * 误差体系名称
+     */
+    errorSysName: string;
+
+    /**
+     * 检测结果
+     */
+    checkResult: number;
+
+    /**
+     * 哪次
+     */
+    whichTime: string;
+
+    /**
+     * 结论来源
+     */
+    resultOrigin: string;
+    /**
+     * 来源类型
+     */
+    resultType: string;
+}

frontend/src/api/result/result.ts

@@ -0,0 +1,7 @@
+import http from '@/api'
+
+export const getMonitorResult = (devId: string) => http.post(`/result/getMonitorResult?devId=${devId}`)
+export const getMonitorDataSourceResult = (monitorId: string) =>
+    http.get(`/result/getMonitorDataSourceResult?monitorId=${monitorId}`)
+
+export const updateMonitorResult = (data: any) => http.post('/result/updateMonitorResult', data)

frontend/src/api/role/role.ts

@@ -1,94 +0,0 @@
-import { ResPage } from '@/api/interface'
-import { Role } from './interface'
-import { ADMIN as rePrefix } from '@/api/config/serviceName'
-import http from '@/api'
-
-/**
- * @name 角色管理模块
- */
-// 获取角色列表
-export const getRoleList = (params: Role.ReqRoleParams) => {
-    return http.post<ResPage<Role.RoleBO>>(`/role/list`, params)
-
-  //  return http.post<ResPage<Role.ResRoleList>>(`/RoleList_Post`, params)
-  // return http.post<ResPage<Role.ResRoleList>>(`${rePrefix}/role/list`, params)
-}
-
-// 新增角色
-export const addRole = (params: Role.RoleBO) => {
-  return http.post(`/role/add`, params)
-}
-
-// 编辑角色
-export const editRole = (params: Role.RoleBO) => {
-  return http.post(`/role/edit`, params)
-}
-
-// 删除角色
-export const deleteRole = (params: { id: string[] }) => {
-  return http.post(`/role/del`, params)
-}
-
-
-// 编辑角色资源
-export const editRoleAndPermission = (params: Role.ReqRoleAndPermission) => {
-  return http.post(`/role/edit_RoleAndPermission`, params)
-}
-
-
-
-
-
-
-
-
-
-
-// // 获取树形用户列表
-// export const getRoleTreeList = (params: Role.ReqRoleParams) => {
-//   return http.post<ResPage<Role.ResRoleList>>(`${rePrefix}/role/tree/list`, params)
-// }
-
-// export const addRole = (params: { id: string ; rolename: string;status: number; describe:string; }) => {
-//   return http.post(`/RoleList_Add`, params)
-// }
-
-// 批量添加角色
-// export const BatchAddRole = (params: FormData) => {
-//   return http.post(`${rePrefix}/role/import`, params)
-// }
-
-// // 切换角色状态
-// export const changeRoleStatus = (params: { id: string; status: number }) => {
-//   return http.post(`${rePrefix}/role/change`, params)
-// }
-
-// 重置用户密码
-// export const resetUserPassWord = (params: { id: string }) => {
-//   return http.post(`${rePrefix}/role/rest_password`, params)
-// }
-
-// 导出角色数据
-// export const exportRoleInfo = (params: Role.ReqRoleParams) => {
-//   return http.download(`${rePrefix}/role/export`, params)
-// }
-
-// 获取角色状态字典
-// export const getRoleStatus = () => {
-//   return http.get<Role.ResStatus[]>(`${rePrefix}/role/status`)
-// }
-
-// 获取用户性别字典
-// export const getUserGender = () => {
-//   return http.get<User.ResGender[]>(`${rePrefix}/user/gender`)
-// }
-
-// 获取角色权限列表
-// export const getRoleDepartment = () => {
-//   return http.get<Role.ResPermissionList[]>(`${rePrefix}/role/permission`)
-// }
-
-// 获取用户角色字典
-// export const getUserRole = () => {
-//   return http.get<User.ResRole[]>(`${rePrefix}/user/role`)
-// }

frontend/src/api/role/roleData.ts

@@ -1,70 +0,0 @@
-const data = [
-    {
-      rolename:"操作员1",
-      id: 'operator_role',
-      status:1,
-      describe:"可以对待检设备的台账进行操作并执行检测功能",
-      permissionList: [
-        {
-          label: "台账管理",
-          key: "dataManager",
-          disable: false,
-        },
-        {
-          label: "系统配置",
-          key: "sysManager",
-          disable: false,
-        },
-        {
-          label: "设备检测",
-          key: "devTest",
-          disable: true,
-        },
-      ]},
-      {
-        rolename:"管理员2",
-        id: 'manager_role',
-        status:1,
-        describe:"可以设置检测脚本、误差体系、新增操作人员",
-        permissionList: [
-        {
-          label: "台账管理",
-          key: "dataManager",
-          disable: true,
-        },
-        {
-          label: "系统配置",
-          key: "sysManager",
-          disable: false,
-        },
-        {
-          label: "设备检测",
-          key: "devTest",
-          disable: true,
-        },
-      ]},
-      {
-        rolename:"超级管理员3",
-        id: 'superManager_role',
-        status:0,
-        describe:"可以修改程序的底层配置，例如检测指标的具体类型",
-        permissionList: [
-        {
-          label: "台账管理",
-          key: "dataManager",
-          disable: true,
-        },
-        {
-          label: "系统配置",
-          key: "sysManager",
-          disable: true,
-        },
-        {
-          label: "设备检测",
-          key: "devTest",
-          disable: true,
-        },
-      ]},
-    ]
-  
-  export default data

frontend/src/api/socket/socket.ts

@@ -0,0 +1,46 @@
+import http from '@/api'
+
+
+export const startPreTest = (params) => {
+    return http.post(`/prepare/startPreTest`, params, {loading: false})
+}
+
+export const closePreTest = (params) => {
+    return http.post(`/prepare/closePreTest`, params,{ loading: false })
+}
+
+/**
+ * 开始正式检测
+ * @param params
+ */
+// export const startTest = (params) => {
+//     return http.post(`/prepare/startTest`, params, {loading: false})
+// }
+
+/**
+ * 暂停正式检测
+ * @param params
+ */
+export const pauseTest = () => {
+    return http.get(`/prepare/closePreTest`, {loading: false})
+}
+
+/**
+ * 继续正式检测
+ * @param params
+ */
+export const resumeTest = (params) => {
+    return http.post(`/prepare/restartTemTest/`, params, {loading: false})
+}
+
+/**
+ * 比对式通道配对
+ * @param params
+ */
+export const contrastTest = (params: any) => {
+    return http.post(`/prepare/startContrastTest`,params)
+}
+
+export const exportAlignData= () => {
+    return http.download(`/prepare/exportAlignData`)
+}

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

@@ -0,0 +1,22 @@
+
+import http from '@/api'
+import {type Base} from '@/api/system/base/interface'
+
+//获取检测配置
+export const getTestConfig = () => {
+    return http.get(`/sysTestConfig/getConfig`)
+}
+
+
+//编辑检测配置
+export const updateTestConfig = (params: Base.ResTestConfig) => {
+    return http.post(`/sysTestConfig/update`, params)
+}
+
+//场景切换
+export const updateScene = (params: any) => {
+    return http.post(`/sysTestConfig/update`,params)
+}
+
+
+

frontend/src/api/system/base/interface/index.ts

@@ -0,0 +1,19 @@
+// 检测配置表模块
+export namespace Base {
+  
+    /**
+   * 检测配置表查询返回的对象
+   */
+    export interface ResTestConfig {
+        id: string;     //系统配置表Id
+        autoGenerate:number;//检测报告是否自动生成0 否；1是
+        maxTime:number;//最大复检次数，默认3次
+        state: number; //状态
+        scale:number;//小数位
+        createBy?: string| null; //创建用户
+        createTime?: string| null; //创建时间
+        updateBy?: string| null; //更新用户
+        updateTime?: string| null; //更新时间
+        
+    }
+  }