feat(detection): 添加检测锁机制防止多用户同时操作

- 新增 detectionLock store 管理检测锁状态
- 实现检测锁相关的弹窗提示功能
- 添加 DETECTION_BUSY 错误码处理多人竞争逻辑
- 在 websocket 中集成检测锁超时处理
- 修改程序源控制接口以同步锁状态
- 更新项目标题和图标配置
- 添加 docs 目录到忽略列表

.gitignore

@@ -9,3 +9,4 @@ public/electron/
 pnpm-lock.yaml
 CLAUDE.md
 /public/dist/
+/docs/

build/extraResources/java/application.yml.template

@@ -33,9 +33,9 @@ mybatis-plus:
     #驼峰命名
     map-underscore-to-camel-case: true
     #配置sql日志输出
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     #关闭日志输出
-  #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:
     db-config:
       #指定主键生成策略
@@ -55,30 +55,32 @@ webSocket:
 
 #源参数下发，暂态数据默认值
 Dip:
-  #暂态前时间（s）
+#  暂态前时间（s）
-  fPreTime: 2f
+#  fPreTime: 2f
   #写入时间（s）
   fRampIn: 0.001f
   #写出时间（s）
   fRampOut: 0.001f
-  #暂态后时间（s）
+#  暂态后时间（s）
-  fAfterTime: 3f
+#  fAfterTime: 3f
 
 
-Flicker:
+#Flicker:
-  waveFluType: CPM
+#  waveFluType: CPM
-  waveType: SQU
+#  waveType: SQU
-  fDutyCycle: 50f
+#  fDutyCycle: 50f
 
-log:
+#log:
-  homeDir: {{APP_DATA_PATH}}\logs
+#  homeDir: D:\logs
-  commonLevel: info
+#  commonLevel: info
 report:
-  template: {{APP_DATA_PATH}}\template
+#  template: D:\template
-  reportDir: {{APP_DATA_PATH}}\report
+#  reportDir: D:\report
   dateFormat: yyyy年MM月dd日
-data:
+#data:
-  homeDir: {{APP_DATA_PATH}}\data
+#  homeDir: D:\data
+#resource:
+#  videoDir: ${data.homeDir}\resources\videos
 qr:
   cloud: http://pqmcc.com:18082/api/file
   dev:

build/extraResources/mysql/data/DESKTOP-GBBSNH7.pid

@@ -1 +1 @@
-74476
+95428

build/extraResources/mysql/data/binlog.index

@@ -7,3 +7,10 @@
 .\binlog.000029
 .\binlog.000030
 .\binlog.000031
+.\binlog.000032
+.\binlog.000033
+.\binlog.000034
+.\binlog.000035
+.\binlog.000036
+.\binlog.000037
+.\binlog.000038

frontend/.env.development

@@ -19,7 +19,7 @@ VITE_API_URL=/api
 
 # 开发环境跨域代理，支持配置多个
 
-VITE_PROXY=[["/api","http://127.0.0.1:18092/"]]
+VITE_PROXY=[["/api","http://127.0.0.1:18093/"]]
 #VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
 #VITE_PROXY=[["/api","http://192.168.2.125:18092/"]]
 # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文

frontend/.env.production

@@ -23,6 +23,6 @@ VITE_PWA=true
 
 # 线上环境接口地址
 #VITE_API_URL="/api" # 打包时用
-VITE_API_URL="http://127.0.0.1:18092/"
+VITE_API_URL="http://127.0.0.1:18093/"
 # 开启激活验证
 VITE_ACTIVATE_OPEN=false

frontend/index.html

@@ -4,7 +4,8 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1.0, minimum-scale=1.0" />
-    <title></title>
+    <link rel="icon" type="image/x-icon" href="/favicon.ico">
+    <title>NPQS-9100</title>
     <!-- 优化：vue渲染未完成之前，先加一个css动画 -->
     <style>
       #loadingPage {

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "0.0.1",
+  "version": "2.0.1",
   "private": true,
   "type": "module",
   "scripts": {

frontend/src/api/detection/lock.ts

@@ -0,0 +1,15 @@
+import http from '@/api'
+import type { DetectionLockHolder } from '@/stores/modules/detectionLock'
+
+/**
+ * 查询当前检测锁持有状态
+ * - data 为 null  → 锁空闲
+ * - data 非 null  → 锁被某账号持有
+ *
+ * 本接口只读,不抢锁、不会返回 DETECTION_BUSY
+ */
+export const getCurrentLock = () => {
+    return http.get<DetectionLockHolder | null>('/detection/lock/current', undefined, {
+        loading: false
+    })
+}

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

@@ -1,6 +1,7 @@
 
 import type { controlSource } from '@/api/device/interface/controlSource'
 import http from '@/api'
+import { useDetectionLockStore } from '@/stores/modules/detectionLock'
 
 /**
  * @name 程控源管理模块
@@ -17,8 +18,11 @@ export const startSimulateTest = (params: controlSource.ResControl) => {
 }
 
 //停止
-export const closeSimulateTest = (params: controlSource.ResControl) => {
+export const closeSimulateTest = async (params: controlSource.ResControl) => {
-  return http.post(`/prepare/closeSimulateTest`,params,{loading:false})
+  const result = await http.post(`/prepare/closeSimulateTest`,params,{loading:false})
+  // 主动终止 → 释放本地持锁标记
+  useDetectionLockStore().clearHolder()
+  return result
 }
 
 

frontend/src/api/index.ts

@@ -12,6 +12,12 @@ import { type ResultData } from '@/api/interface'
 import { ResultEnum } from '@/enums/httpEnum'
 import { checkStatus } from './helper/checkStatus'
 import { useUserStore } from '@/stores/modules/user'
+import { useDetectionLockStore, type DetectionLockHolder } from '@/stores/modules/detectionLock'
+import {
+    showForceReleasedDialog,
+    showLockBusyDialog,
+    showLockNotStartedToast
+} from '@/utils/detectionLockDialog'
 import router from '@/routers'
 import { refreshToken } from '@/api/user/login'
 import { EventSourcePolyfill } from 'event-source-polyfill'
@@ -107,6 +113,32 @@ class RequestHttp {
                     }
                     return Promise.reject(data)
                 }
+                // 单用户检测互斥:命中 DETECTION_BUSY 时根据 data 和本地持锁状态分发到 4 种文案
+                if (data.code === ResultEnum.DETECTION_BUSY) {
+                    const lockStore = useDetectionLockStore()
+                    const holder = (data.data ?? null) as DetectionLockHolder | null
+                    const currentUserId = userStore.userInfo?.id
+                    const localDetecting = lockStore.iAmHolder
+
+                    if (!localDetecting && holder) {
+                        // S1:他人持锁
+                        showLockBusyDialog(holder)
+                    } else if (!localDetecting && !holder) {
+                        // S2:未开始检测就调中间接口
+                        showLockNotStartedToast()
+                    } else if (localDetecting && holder && holder.holderUserId !== currentUserId) {
+                        // S4-a:被强释 + 别人接手
+                        showForceReleasedDialog(holder)
+                        lockStore.clearHolder()
+                    } else if (localDetecting && !holder) {
+                        // S4-b:被强释,无人接手
+                        showForceReleasedDialog(null)
+                        lockStore.clearHolder()
+                    }
+                    // 阻断默认错误提示,不再走下面的 ElMessage.error
+                    return Promise.reject(data)
+                }
+
                 // 全局错误信息拦截（防止下载文件的时候返回数据流，没有 code 直接报错）
                 if (data.code && data.code !== ResultEnum.SUCCESS) {
                     if (data.message.includes('&')) {

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

@@ -69,5 +69,30 @@ export namespace Plan {
         maxTime: number;
     }
 
+    export interface PlanStatisticsItem {
+        itemId: string;
+        itemName: string;
+        unqualifiedCount: number;
+    }
+
+    export interface PlanStatistics {
+        planId: string;
+        planName: string;
+        totalCheckCount: number;
+        checkedDeviceCount: number;
+        uncheckedDeviceCount: number;
+        firstQualifiedDeviceCount: number;
+        secondQualifiedDeviceCount: number;
+        thirdOrMoreQualifiedDeviceCount: number;
+        qualifiedDeviceCount: number;
+        unqualifiedDeviceCount: number;
+        unqualifiedItemCount: number;
+        firstPassRate: number;
+        secondPassRate: number;
+        thirdOrMorePassRate: number;
+        unqualifiedRate: number;
+        itemDistributions: PlanStatisticsItem[];
+    }
+
   
   }

frontend/src/api/plan/plan.ts

@@ -94,6 +94,10 @@ export const staticsAnalyse = (params: { id: string[] }) => {
     return http.download('/adPlan/analyse', params)
 }
 
+export const getPlanStatistics = (params: { planId: string; manufacturer?: string; devType?: string }) => {
+    return http.post<Plan.PlanStatistics>(`/adPlan/statistics`, params)
+}
+
 //根据计划id分页查询被检设
 export const getDevListByPlanId = (params: any) => {
     return http.post(`/adPlan/listDevByPlanId`, params)

frontend/src/api/resourceManage/index.ts

@@ -0,0 +1,18 @@
+import http from '@/api'
+import type { ResourceManage } from '@/api/resourceManage/interface'
+
+export const getResourceManageList = (params: ResourceManage.ReqResourceManageParams) => {
+    return http.post<ResourceManage.ResResourceManagePage>('/resourceManage/list', params)
+}
+
+export const addResourceManage = (params: FormData) => {
+    return http.upload('/resourceManage/add', params)
+}
+
+export const updateResourceManage = (params: ResourceManage.ReqUpdateResourceManage) => {
+    return http.post('/resourceManage/update', params)
+}
+
+export const getResourceManagePlayUrl = (id: string) => {
+    return http.get<ResourceManage.PlayVO>(`/resourceManage/play?id=${id}`)
+}

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

@@ -0,0 +1,34 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+
+export namespace ResourceManage {
+    export interface ReqResourceManageParams extends ReqPage {
+        name?: string
+        fileName?: string
+    }
+
+    export interface ResResourceManage {
+        id: string
+        name: string
+        fileName: string
+        fileSize: number
+        relativePath: string
+        remark: string
+        state: number
+        createBy?: string | null
+        createTime?: string | null
+        updateBy?: string | null
+        updateTime?: string | null
+    }
+
+    export interface ResResourceManagePage extends ResPage<ResResourceManage> {}
+
+    export interface ReqUpdateResourceManage {
+        id: string
+        name: string
+        remark: string
+    }
+
+    export interface PlayVO {
+        url: string
+    }
+}

frontend/src/api/socket/socket.ts

@@ -1,8 +1,12 @@
 import http from '@/api'
+import { useDetectionLockStore } from '@/stores/modules/detectionLock'
 
 
-export const startPreTest = (params) => {
+export const startPreTest = async (params) => {
-    return http.post(`/prepare/startPreTest`, params, {loading: false})
+    const result = await http.post(`/prepare/startPreTest`, params, {loading: false})
+    // 抢锁成功 → 标记本地为持锁者
+    useDetectionLockStore().setAsHolder()
+    return result
 }
 
 export const closePreTest = (params) => {
@@ -37,8 +41,11 @@ export const resumeTest = (params) => {
  * 比对式通道配对
  * @param params
  */
-export const contrastTest = (params: any) => {
+export const contrastTest = async (params: any) => {
-    return http.post(`/prepare/startContrastTest`,params)
+    const result = await http.post(`/prepare/startContrastTest`, params)
+    // 抢锁成功 → 标记本地为持锁者
+    useDetectionLockStore().setAsHolder()
+    return result
 }
 
 export const exportAlignData= () => {

frontend/src/enums/httpEnum.ts

@@ -6,6 +6,7 @@ export enum ResultEnum {
   ERROR = 500,
   ACCESSTOKEN_EXPIRED = "A0024",
   OVERDUE = "A0025",
+  DETECTION_BUSY = "A020042",
   TIMEOUT = 30000,
   TYPE = "success"
 }

frontend/src/stores/constant.ts

@@ -19,3 +19,6 @@ export  const  DICT_STORE_KEY = "cn-dictData";
 
 export const CHECK_STORE_KEY = "cn-check";
 
+// pinia中detectionLock store的key
+export const DETECTION_LOCK_STORE_KEY = "cn-detectionLock";
+

frontend/src/stores/modules/detectionLock.ts

@@ -0,0 +1,33 @@
+import { defineStore } from 'pinia'
+import { DETECTION_LOCK_STORE_KEY } from '@/stores/constant'
+
+export interface DetectionLockHolder {
+    holderUserId: string
+    holderUserName: string
+    acquireTime: string
+    expireAt: string
+}
+
+export const useDetectionLockStore = defineStore(DETECTION_LOCK_STORE_KEY, {
+    state: () => ({
+        iAmHolder: false,
+        holder: null as DetectionLockHolder | null
+    }),
+    actions: {
+        setAsHolder(holder?: Partial<DetectionLockHolder> | null) {
+            this.iAmHolder = true
+            if (holder) {
+                this.holder = {
+                    holderUserId: holder.holderUserId ?? '',
+                    holderUserName: holder.holderUserName ?? '',
+                    acquireTime: holder.acquireTime ?? '',
+                    expireAt: holder.expireAt ?? ''
+                }
+            }
+        },
+        clearHolder() {
+            this.iAmHolder = false
+            this.holder = null
+        }
+    }
+})

frontend/src/utils/detectionLockDialog.ts

@@ -0,0 +1,72 @@
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { DetectionLockHolder } from '@/stores/modules/detectionLock'
+
+/**
+ * S1:他人正在做检测,自己抢锁被挡
+ */
+export const showLockBusyDialog = (holder: DetectionLockHolder) => {
+    ElMessageBox.confirm(
+        `「${holder.holderUserName}」正在做检测,请稍后。`,
+        '检测进行中',
+        {
+            confirmButtonText: '观看检测视频教学',
+            cancelButtonText: '我知道了',
+            type: 'warning',
+            distinguishCancelAndClose: true,
+            customClass: 'detection-lock-busy-dialog'
+        }
+    )
+        .then(() => {
+            // 视频教学跳转 URL 暂未配置,先用 Toast 兜底
+            ElMessage.info('视频教学功能开发中,敬请期待')
+        })
+        .catch(() => {
+            // 用户点了"我知道了"或关闭,什么都不做
+        })
+}
+
+/**
+ * S2:未开始检测就调中间接口
+ */
+export const showLockNotStartedToast = () => {
+    ElMessage.warning('请先点击"开始检测"按钮启动本轮检测')
+}
+
+/**
+ * S3:自己暂停超 10 分钟,被 WS 推 STOP_TIMEOUT 强制结束
+ */
+export const showPauseTimeoutDialog = () => {
+    ElMessageBox.alert('暂停超过 10 分钟未恢复,系统已自动结束本次检测。\n\n如需继续,请重新发起检测。', '本次检测已结束', {
+        confirmButtonText: '我知道了',
+        type: 'warning'
+    }).catch(() => {})
+}
+
+/**
+ * S4:被管理员强制释放
+ * - holder 为 null  → 强释后无人接手
+ * - holder 非 null → 强释后被别人立刻抢占
+ */
+export const showForceReleasedDialog = (holder: DetectionLockHolder | null) => {
+    if (holder) {
+        ElMessageBox.confirm(
+            `当前「${holder.holderUserName}」正在做检测,您无法继续检测,请稍后。`,
+            '检测已被中止',
+            {
+                confirmButtonText: '观看检测视频教学',
+                cancelButtonText: '我知道了',
+                type: 'warning',
+                distinguishCancelAndClose: true
+            }
+        )
+            .then(() => {
+                ElMessage.info('视频教学功能开发中,敬请期待')
+            })
+            .catch(() => {})
+    } else {
+        ElMessageBox.alert('您的检测已被管理员强制结束。\n如需继续,请重新发起检测。', '检测已被中止', {
+            confirmButtonText: '我知道了',
+            type: 'warning'
+        }).catch(() => {})
+    }
+}

frontend/src/utils/webSocketClient.ts

@@ -9,6 +9,8 @@
 
 import { ElMessage } from "element-plus";
 import { jwtUtil } from "./jwtUtil";
+import { useDetectionLockStore } from "@/stores/modules/detectionLock";
+import { showPauseTimeoutDialog } from "@/utils/detectionLockDialog";
 
 // ============================================================================
 // 类型定义 (Types & Interfaces)
@@ -190,8 +192,8 @@ export default class SocketService {
      * WebSocket连接配置
      */
     private config: SocketConfig = {
-        url: 'ws://127.0.0.1:7778/hello',
+        // url: 'ws://127.0.0.1:7778/hello',
-        //url: 'ws://192.168.1.124:7777/hello',
+        url: 'ws://127.0.0.1:7777/hello',
         heartbeatInterval: 9000,        // 9秒心跳间隔
         reconnectDelay: 5000,           // 5秒重连延迟
         maxReconnectAttempts: 5,        // 最多重连5次
@@ -546,6 +548,18 @@ export default class SocketService {
             // 检查是否为JSON格式
             if (typeof event.data === 'string' && (event.data.startsWith('{') || event.data.startsWith('['))) {
                 const message: WebSocketMessage = JSON.parse(event.data);
+
+                // 全局拦截:暂停 10 分钟超时,后端推 STOP_TIMEOUT 表示锁已被释放
+                // 不管页面是否注册了对应回调,都要做"清本地持锁标记 + 弹窗告知"
+                if (message?.operateCode === 'STOP_TIMEOUT') {
+                    try {
+                        useDetectionLockStore().clearHolder();
+                        showPauseTimeoutDialog();
+                    } catch (e) {
+                        console.error('STOP_TIMEOUT 全局处理失败:', e);
+                    }
+                }
+
                 if (message?.type && this.callBackMapping[message.type]) {
                     this.callBackMapping[message.type](message);
                 } else {

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

@@ -91,7 +91,7 @@
                             type="primary"
                             icon="Clock"
                             @click="handleTest('手动检测')"
-                            v-if="form.activeTabs === 0 && modeStore.currentMode == '模拟式'"
+                            v-if="form.activeTabs === 0 && modeStore.currentMode != '比对式'"
                         >
                             手动检测
                         </el-button>
@@ -483,7 +483,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
         sortable: true,
         isShow: checkStateShow,
         render: scope => {
-            return scope.row.checkState === 0 ? '未检' : scope.row.checkState === 1 ? '检测中' : '检测完成'
+            return scope.row.checkState === 0 ? '未检' : scope.row.checkState === 1 ? '检测中' : scope.row.checkState === 2 ? '检测完成':'归档'
         }
     },
     {
@@ -494,10 +494,12 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
         render: scope => {
             if (scope.row.checkResult === 0) {
                 return <el-tag type="danger">不符合</el-tag>
+            } else if (scope.row.checkResult === 0) {
+                return '不符合'
             } else if (scope.row.checkResult === 1) {
                 return '符合'
-            } else if (scope.row.checkResult === 2) {
+            }else if(scope.row.checkResult === 2) {
-                return '未检'
+              return '未检'
             }
             return ''
         }
@@ -539,7 +541,6 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
     { prop: 'operation', label: '操作', fixed: 'right', minWidth :200,isShow: operationShow }
 ])
 let testType = 'test' // 检测类型：'test'-检测 'reTest'-复检
-let qualifiedCount = 0 //合格数量
 
 
 //比对单个报告生成
@@ -575,8 +576,6 @@ const handleSelectionChange = (selection: any[]) => {
     } else {
         testType = 'reTest'
     }
-    qualifiedCount=selection.filter(item => item.checkResult == 1).length
-
     let devices: CheckData.Device[] = selection.map((item: any) => {
         return {
             deviceId: item.id,
@@ -599,6 +598,19 @@ const handleSelectionChange = (selection: any[]) => {
     }
 }
 
+const isUncheckedDevice = (device: Device.ResPqDev) => Number(device.checkState) === 0 || Number(device.checkResult) === 2
+
+const hasCheckedSelectedDevice = () => channelsSelection.value.some(device => !isUncheckedDevice(device))
+
+const hasUncheckedSelectedDevice = () => channelsSelection.value.some(device => isUncheckedDevice(device))
+
+const hasCheckedUnqualifiedSelectedDevice = () =>
+    channelsSelection.value.some(device => !isUncheckedDevice(device) && Number(device.checkResult) === 0)
+
+const shouldShowRecheckModeDialog = () => hasCheckedSelectedDevice()
+
+const canUseUnqualifiedItemRecheck = () => hasCheckedUnqualifiedSelectedDevice() && !hasUncheckedSelectedDevice()
+
 //查询
 const handleSearch = () => {
     proTable.value?.getTableList()
@@ -923,12 +935,12 @@ const handleTest = async (val: string) => {
         dialogTitle.value = val
         if (val === '手动检测') {
             checkStore.setShowDetailType(2)
-            if (testType === 'reTest') {
+            if (shouldShowRecheckModeDialog()) {
                 ElMessageBox.confirm('请选择复检检测方式', '设备复检', {
                     distinguishCancelAndClose: true,
                     confirmButtonText: '不合格项复检',
                     cancelButtonText: '全部复检',
-                    showConfirmButton:qualifiedCount<=0,
+                    showConfirmButton: canUseUnqualifiedItemRecheck(),
                     type: 'warning'
                 })
                     .then(() => {
@@ -963,11 +975,12 @@ const handleTest = async (val: string) => {
             checkStore.setCheckType(1)
             checkStore.initSelectTestItems()
             // 一键检测
-            if (testType === 'reTest' && modeStore.currentMode != '比对式') {
+            if (shouldShowRecheckModeDialog() && modeStore.currentMode != '比对式') {
                 ElMessageBox.confirm('请选择复检检测方式', '设备复检', {
                     distinguishCancelAndClose: true,
                     confirmButtonText: '不合格项复检',
                     cancelButtonText: '全部复检',
+                    showConfirmButton: canUseUnqualifiedItemRecheck(),
                     type: 'warning'
                 })
                     .then(() => {
@@ -1087,7 +1100,7 @@ const openDrawer = async (title: string, row: any) => {
 
     if (title === '检测数据查询') {
         checkStore.setShowDetailType(0)
-        if (modeStore.currentMode == '模拟式') {
+        if (modeStore.currentMode == '模拟式'||modeStore.currentMode == '数字式') {
             dataCheckPopupRef.value?.open(row.id, '-1', null)
         } else if (modeStore.currentMode == '比对式') {
             dataCheckSingleChannelSingleTestPopupRef.value?.open(row, null, row.id, 2)
@@ -1095,7 +1108,7 @@ const openDrawer = async (title: string, row: any) => {
     }
     if (title === '误差体系更换') {
         checkStore.setShowDetailType(1)
-        if (modeStore.currentMode == '模拟式') {
+        if (modeStore.currentMode == '模拟式'||modeStore.currentMode == '数字式') {
             dataCheckPopupRef.value?.open(row.id, '-1', null)
         } else if (modeStore.currentMode == '比对式') {
             dataCheckSingleChannelSingleTestPopupRef.value?.open(row, null, row.id, 2)

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

@@ -29,7 +29,7 @@
                 @node-click="handleNodeClick"
             >
                 <template #default="{ node, data }">
-                    <span class="custom-tree-node" style="display: flex; align-items: center;">
+                    <span class="custom-tree-node">
                         <!-- 父节点图标 -->
                         <Platform
                             v-if="!data.pid"
@@ -39,50 +39,52 @@
                             }"
                         />
                         <!-- 节点名称 -->
-                        <span>{{ node.label }}</span>
+                        <span class="node-label">{{ node.label }}</span>
-                        <!-- 子节点右侧图标 + tooltip -->
+                        <span class="node-actions">
-                        <el-tooltip
+                            <PieChart
-                            v-if="
+                                v-if="isCompletedPlanNode(node.data)"
-                                node.label != '未检' &&
+                                class="node-action-icon"
-                                node.label != '检测中' &&
+                                @click.stop="openStatistics(node.data)"
-                                node.label != '检测完成' &&
+                                style="margin-right: 8px"
-                                hasChildrenInPlanTable(node.data)
-                            "
-                            placement="top"
-                            :manual="true"
-                            content="子计划信息"
-                        >
-                            <List
-                                @click.stop="childDetail(node.data)"
-                                style="
-                                    width: 16px;
-                                    height: 16px;
-                                    margin-left: 8px;
-                                    cursor: pointer;
-                                    color: var(--el-color-primary);
-                                "
                             />
-                        </el-tooltip>
+                            <!-- 子节点右侧图标 + tooltip -->
+                            <el-tooltip
+                                v-if="
+                                    node.label != '未检' &&
+                                    node.label != '检测中' &&
+                                    node.label != '检测完成' &&
+                                    hasChildrenInPlanTable(node.data)
+                                "
+                                placement="top"
+                                :manual="true"
+                                content="子计划信息"
+                            >
+                                <List class="node-action-icon" @click.stop="childDetail(node.data)" />
+                            </el-tooltip>
+                        </span>
                     </span>
                 </template>
             </el-tree>
         </div>
     </div>
     <SourceOpen ref="openSourceView" :width="width" :height="height + 175"></SourceOpen>
+    <PlanStatisticsPopup ref="planStatisticsPopupRef" />
 </template>
 <script lang="ts" setup>
 import { type Plan } from '@/api/plan/interface'
-import { List, Menu, Platform } from '@element-plus/icons-vue'
+import { List, Menu, PieChart, Platform } from '@element-plus/icons-vue'
 import { nextTick, onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { useCheckStore } from '@/stores/modules/check'
 import { ElTooltip } from 'element-plus'
 import SourceOpen from '@/views/plan/planList/components/childrenPlan.vue'
+import PlanStatisticsPopup from '@/views/plan/planList/components/planStatisticsPopup.vue'
 import { getPlanList } from '@/api/plan/plan.ts'
 import { useModeStore } from '@/stores/modules/mode' // 引入模式 store
 import { useDictStore } from '@/stores/modules/dict'
 
 const openSourceView = ref()
+const planStatisticsPopupRef = ref<InstanceType<typeof PlanStatisticsPopup> | null>(null)
 const router = useRouter()
 const checkStore = useCheckStore()
 const filterText = ref('')
@@ -211,6 +213,14 @@ const childDetail = (data: Plan.ResPlan) => {
     }
 }
 
+const isCompletedPlanNode = (data: Partial<Plan.ResPlan>) => {
+    return [1, 2].includes(Number(data.testState))
+}
+
+const openStatistics = (data: Partial<Plan.ResPlan>) => {
+    planStatisticsPopupRef.value?.open(data)
+}
+
 function buildTree(flatList: any[]): any[] {
     const map = new Map()
     const tree: any[] = []
@@ -293,6 +303,40 @@ defineExpose({ getTreeData, clickTableToTree })
     margin-top: 12px;
 }
 
+:deep(.el-tree-node__content) {
+    padding-right: 6px;
+}
+
+.custom-tree-node {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    min-width: 0;
+}
+
+.node-label {
+    flex: 1;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.node-actions {
+    flex: none;
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+    margin-left: 8px;
+}
+
+.node-action-icon {
+    width: 16px;
+    height: 16px;
+    cursor: pointer;
+    color: var(--el-color-primary);
+}
+
 //.filter-tree span {
 //  font-size: 16px;
 //  display:block;

frontend/src/views/machine/controlSource/components/controlSourceDetail.vue

@@ -261,7 +261,7 @@ const dictStore = useDictStore()
 const activeName = ref('')
 const childActiveName = ref('')
 const childActiveIndex = ref(0)
-const firstName = 'first'
+const firstName = ref('first')
 const viewRowRef = ref()
 const communicationList = ref<[]>([])
 const testProjectPopupRef = ref()

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

@@ -228,7 +228,7 @@ const unit = [
     },
   {
     label: '功率',
-    unit: 'W'
+    unit: props.valueCode == 'Absolute' ? 'W' : '%Un*In'
   },
     {
         label: '电压偏差',

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

@@ -260,7 +260,7 @@ const viewDialog = ref(false)
 const dictStore = useDictStore()
 const activeName = ref('')
 const childActiveName = ref('')
-const firstName = 'first'
+const firstName = ref('first')
 const viewRowRef = ref()
 const communicationList = ref([])
 const testProjectPopupRef = ref()

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

@@ -933,7 +933,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
         const datasourceDicts = dictStore.getDictData('Datasource')
 
         formContent.datasourceIds = datasourceDicts
-            .filter(item => ['real', 'wave_data'].includes(item.code))
+            .filter(item => ['real'].includes(item.code))
             .map(item => item.code)
      
         realTimeSetting.value = true