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

微调

Browse Source
This commit is contained in:
caozehui
2025-03-28 09:31:46 +08:00
parent 67ef976739
commit ea38b4eb21
8 changed files with 59 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/package.json
View File

@@ -76,7 +76,6 @@
"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-pwa": "^0.16.5",
"vite-plugin-svg-icons": "^2.0.1",
"vue-tsc": "^2.0.21"

2
frontend/src/api/index.ts
View File

@@ -89,7 +89,7 @@ class RequestHttp {
userStore.setAccessToken('')
userStore.setRefreshToken('')
userStore.setIsRefreshToken(false)
userStore.setUserInfo({ name: '' })
userStore.setUserInfo({ id:'',name: '' })
await router.replace(LOGIN_URL)
if(isFirst){//临时处理token失效弹窗多次
ElMessage.error(data.message)

2
frontend/src/layouts/components/Header/components/Avatar.vue
View File

@@ -99,7 +99,7 @@ const logout = () => {
// 2.清除 Token
userStore.setAccessToken("");
userStore.setRefreshToken("");
userStore.setUserInfo({name: ""});
userStore.setUserInfo({id: "", name: ""});
userStore.setIsRefreshToken(false)
dictStore.setDictData([]);
modeStore.setCurrentMode('');

2
frontend/src/stores/interface/index.ts
View File

@@ -30,7 +30,7 @@ export interface UserState {
accessToken: string;
refreshToken: string;
isRefreshToken: boolean;
userInfo: { name: string };
userInfo: { id: string, name: string };
}
/* tabsMenuProps */

2
frontend/src/stores/modules/user.ts
View File

@@ -9,7 +9,7 @@ export const useUserStore = defineStore({
accessToken: "",
refreshToken: "",
isRefreshToken:false,
userInfo: { name: "admin" },
userInfo: {id:"", name: "admin" },
}),
getters: {},
actions: {

9
frontend/src/views/home/components/channelsTest.vue
View File

@@ -98,6 +98,7 @@ import { getCoefficientCheck } from '@/api/home/channelsTest/index'
import type { ChannelsTest } from '@/api/home/interface/channelsTest';
import type { Plan } from '@/api/plan/interface';
import { fa } from 'element-plus/es/locale';
import {useUserStore} from "@/stores/modules/user";
const activeIndex = ref(0)
@@ -138,6 +139,7 @@ const props = defineProps({
default: () => ({})
}
})
const userStore = useUserStore()
const tableDataMap = new Map<number, Ref<ChannelsTest.CoefficientVO[]>>([]);
const currentStepStatus = ref<'error' | 'finish' | 'wait' | 'success' | 'process'>('finish');
const webMsgSend = toRef(props, 'webMsgSend');
@@ -786,9 +788,10 @@ const handleSubmit = async () => {
userPageId: "cdf",
devIds:devIdArray.value,
planId:planId.value,
errorSysId: select_Plan.value?.errorSysId,
     scriptId: select_Plan.value?.scriptId,
operateType:'0' // '0'为预检测、‘1‘为正式检测
errorSysId:select_Plan.value?.errorSysId,
scriptId:select_Plan.value?.scriptId,
operateType:'0', // '0'为预检测、‘1‘为正式检测
userId:userStore.userInfo.id
})
active.value++;

6
frontend/src/views/home/components/factorTest.vue
View File

@@ -99,6 +99,7 @@ import {getCoefficientCheck} from '@/api/home/channelsTest/index'
import type {ChannelsTest} from '@/api/home/interface/channelsTest';
import type {Plan} from '@/api/plan/interface';
import {useCheckStore} from "@/stores/modules/check";
import {useUserStore} from "@/stores/modules/user";
const checkStore = useCheckStore()
const activeIndex = ref(0)
@@ -143,7 +144,7 @@ const props = defineProps({
default: () => ({})
},
})
const userStore = useUserStore()
const testStatus = toRef(props, 'testStatus');
const tableDataMap = new Map<number, Ref<ChannelsTest.CoefficientVO[]>>([]);
const currentStepStatus = ref<'error' | 'finish' | 'wait' | 'success' | 'process'>('finish');
@@ -720,7 +721,8 @@ const handleSubmit = async () => {
planId: planId.value,
errorSysId: select_Plan.value?.errorSysId,
scriptId: select_Plan.value?.scriptId,
operateType: '0' // '0'为预检测、‘1‘为正式检测
operateType: '0', // '0'为预检测、‘1‘为正式检测
userId:userStore.userInfo.id
})
active.value++;

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

@@ -93,7 +93,9 @@ import test from './test.vue'
import socketClient from '@/utils/webSocketClient';
import {useCheckStore} from "@/stores/modules/check";
import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket'
import {useUserStore} from "@/stores/modules/user";
const userStore = useUserStore()
const checkStore = useCheckStore();
const nextStepText = ref('下一步');
const dialogVisible = ref(false)
@@ -210,7 +212,8 @@ const handleSubmit = () => {
userPageId: "cdf",
devIds: deviceIds,
planId: planId,
operateType: '1' // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
operateType: '1', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
userId:userStore.userInfo.id
}).then(res => {
if (res.code === 'A001014') {
ElMessageBox.alert('装置配置异常', '检测失败', {
@@ -238,7 +241,8 @@ const handleSubmit = () => {
userPageId: "cdf",
devIds: deviceIds,
planId: planId,
operateType: checkStore.reCheckType ==1 ?'2':'8' // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
operateType: checkStore.reCheckType ==1 ?'2':'8', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
userId:userStore.userInfo.id
}).then(res => {
console.log(res)
if (res.code === 'A001014') {
@@ -360,7 +364,8 @@ const sendResume = () => {
userPageId: "cdf",
devIds: checkStore.devices.map((item) => item.deviceId),
planId: checkStore.plan.id,
operateType: '2' // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
userId:userStore.userInfo.id
})
Object.assign(webMsgSend.value, {
requestId: 'Resume_Success'
@@ -373,7 +378,8 @@ const sendReCheck = () => {
userPageId: "cdf",
devIds: checkStore.devices.map((item) => item.deviceId),
planId: checkStore.plan.id,
operateType: '2' // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
userId:userStore.userInfo.id
}).then(res => {
console.log(res)
if (res.code === 'A001014') {