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

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

@@ -441,7 +441,7 @@ const sendResume = () => {
     console.log('发起继续检测请求')
 
     resumeTest({
-        userPageId: 'cdf',
+        userPageId: JwtUtil.getLoginName(),
         devIds: checkStore.devices.map(item => item.deviceId),
         planId: checkStore.plan.id,
         reCheckType: '2', //  0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检

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

@@ -230,6 +230,7 @@ import { scriptDtlsCheckDataList } from '@/api/device/testScript/index'
 import ViewRow from '@/views/machine/testScript/components/viewRow.vue'
 import { startSimulateTest, closeSimulateTest } from '@/api/device/controlSource/index.ts'
 import { controlSource } from '@/api/device/interface/controlSource'
+import {JwtUtil} from "@/utils/jwtUtil";
 interface TabOption {
     label?: string
     name?: string
@@ -464,7 +465,7 @@ const startLoading = async () => {
     emit('update:pauseDisabled', true)
     ElMessage.success({ message: '启动中...', duration: 6000 })
     // 启动加载逻辑
-    controlContent.value.userPageId = 'cdf'
+    controlContent.value.userPageId = JwtUtil.getLoginName()
     controlContent.value.scriptId = props.formControl.scriptId
     controlContent.value.scriptIndex = childActiveIndex.value
     controlContent.value.sourceId = props.formControl.sourceId
@@ -476,7 +477,7 @@ const startLoading = async () => {
 // 定义 startLoading 方法
 const stopLoading = async () => {
     // 启动加载逻辑
-    controlContent.value.userPageId = 'cdf'
+    controlContent.value.userPageId = JwtUtil.getLoginName()
     controlContent.value.scriptId = props.formControl.scriptId
     controlContent.value.scriptIndex = childActiveIndex.value
     controlContent.value.sourceId = props.formControl.sourceId

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

@@ -67,6 +67,7 @@ import socketClient from '@/utils/webSocketClient'
 import { checkSimulate } from '@/api/device/controlSource/index.ts'
 import { controlSource } from '@/api/device/interface/controlSource'
 import {getPqScriptList} from '@/api/plan/plan.ts'
+import {JwtUtil} from "@/utils/jwtUtil";
 
 const show = ref(false)
 const router = useRouter()
@@ -322,7 +323,7 @@ const handleScriptChange = (value: string) => {
 }
 const start = async () => {
  
-  controlContent.value.userPageId = 'cdf'
+  controlContent.value.userPageId = JwtUtil.getLoginName()
   controlContent.value.scriptIndex = scriptIndex.value
   await checkSimulate(controlContent.value)
 }