ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

正式检测userPageId参数

Browse Source
This commit is contained in:
caozehui
2025-08-07 15:29:49 +08:00
parent 88f1876ef0
commit e66bcdb293
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/views/home/components/compareTestPopup.vue
View File

@@ -68,6 +68,7 @@ import socketClient from '@/utils/webSocketClient';
import {useCheckStore} from "@/stores/modules/check"; import {useCheckStore} from "@/stores/modules/check";
import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket' import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket'
import {useUserStore} from "@/stores/modules/user"; import {useUserStore} from "@/stores/modules/user";
import {JwtUtil} from "@/utils/jwtUtil";
const userStore = useUserStore() const userStore = useUserStore()
@@ -171,7 +172,7 @@ const handleSubmitFast = () => {
if (preTestStatus.value == 'waiting') { if (preTestStatus.value == 'waiting') {
if (checkStore.selectTestItems.preTest) { if (checkStore.selectTestItems.preTest) {
startPreTest({ startPreTest({
userPageId: "cdf", userPageId: JwtUtil.getLoginName(),
devIds: deviceIds, devIds: deviceIds,
planId: planId, planId: planId,
operateType: checkStore.reCheckType == 1 ? '1' : '2', operateType: checkStore.reCheckType == 1 ? '1' : '2',
@@ -196,7 +197,7 @@ const handleSubmitFast = () => {
if (TestStatus.value == "waiting") { if (TestStatus.value == "waiting") {
if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) { if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) {
startPreTest({ startPreTest({
userPageId: "cdf", userPageId: JwtUtil.getLoginName(),
devIds: deviceIds, devIds: deviceIds,
planId: planId, planId: planId,
operateType: checkStore.reCheckType == 1 ? '1' : '2', operateType: checkStore.reCheckType == 1 ? '1' : '2',
@@ -313,7 +314,7 @@ const sendResume = () => {
const sendReCheck = () => { const sendReCheck = () => {
console.log('发送重新检测指令') console.log('发送重新检测指令')
startPreTest({ startPreTest({
userPageId: "cdf", userPageId: JwtUtil.getLoginName(),
devIds: checkStore.devices.map((item) => item.deviceId), devIds: checkStore.devices.map((item) => item.deviceId),
planId: checkStore.plan.id, planId: checkStore.plan.id,
operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检 operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检

5
frontend/src/views/home/components/testPopup.vue
View File

@@ -80,6 +80,7 @@ import socketClient from '@/utils/webSocketClient';
import {useCheckStore} from "@/stores/modules/check"; import {useCheckStore} from "@/stores/modules/check";
import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket' import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket'
import {useUserStore} from "@/stores/modules/user"; import {useUserStore} from "@/stores/modules/user";
import {JwtUtil} from "@/utils/jwtUtil";
const userStore = useUserStore() const userStore = useUserStore()
const checkStore = useCheckStore(); const checkStore = useCheckStore();
@@ -199,6 +200,7 @@ const handleSubmitFast = () => {
if (preTestStatus.value == 'waiting') { if (preTestStatus.value == 'waiting') {
if (checkStore.selectTestItems.preTest) { if (checkStore.selectTestItems.preTest) {
startPreTest({ startPreTest({
userPageId:JwtUtil.getLoginName(),
devIds: deviceIds, devIds: deviceIds,
planId: planId, planId: planId,
operateType: checkStore.reCheckType == 1 ? '1' : '2', operateType: checkStore.reCheckType == 1 ? '1' : '2',
@@ -226,6 +228,7 @@ const handleSubmitFast = () => {
if (channelsTestStatus.value == 'waiting') { if (channelsTestStatus.value == 'waiting') {
if (!checkStore.selectTestItems.preTest && checkStore.selectTestItems.channelsTest) { if (!checkStore.selectTestItems.preTest && checkStore.selectTestItems.channelsTest) {
startPreTest({ startPreTest({
userPageId:JwtUtil.getLoginName(),
devIds: deviceIds, devIds: deviceIds,
planId: planId, planId: planId,
operateType: checkStore.reCheckType == 1 ? '1' : '2', operateType: checkStore.reCheckType == 1 ? '1' : '2',
@@ -251,6 +254,7 @@ const handleSubmitFast = () => {
if (TestStatus.value == "waiting") { if (TestStatus.value == "waiting") {
if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) { if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) {
startPreTest({ startPreTest({
userPageId:JwtUtil.getLoginName(),
devIds: deviceIds, devIds: deviceIds,
planId: planId, planId: planId,
operateType: checkStore.reCheckType == 1 ? '1' : '2', operateType: checkStore.reCheckType == 1 ? '1' : '2',
@@ -389,6 +393,7 @@ const sendResume = () => {
const sendReCheck = () => { const sendReCheck = () => {
console.log('发送重新检测指令') console.log('发送重新检测指令')
startPreTest({ startPreTest({
userPageId:JwtUtil.getLoginName(),
devIds: checkStore.devices.map((item) => item.deviceId), devIds: checkStore.devices.map((item) => item.deviceId),
planId: checkStore.plan.id, planId: checkStore.plan.id,
operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检 operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检