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:
sjl
2025-02-26 13:58:56 +08:00
parent f87e268242 1aeceffe0b
commit 07cc26fa8d
7 changed files with 97 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/api/check/interface/index.ts
View File

@@ -95,6 +95,7 @@ export namespace CheckData {
devType: string; //设备类型
devVolt:number; //设备电压
devCurr:number; //设备电流
factorFlag:number; //是否支持系数校准
}
// 用来描述检测脚本类型

4
frontend/src/stores/modules/check.ts
View File

@@ -10,7 +10,7 @@ export const useCheckStore = defineStore("check", {
state: () => ({
devices: Array<CheckData.Device>(),
plan: Object<Plan.ResPlan>(),
selectTestItems: Object<CheckData.SelectTestItem>({preTest: true, timeTest: true, channelsTest: true, test: true}),
selectTestItems: Object<CheckData.SelectTestItem>({preTest: true, timeTest: true, channelsTest: false, test: true}),
checkType:1
}),
@@ -28,7 +28,7 @@ export const useCheckStore = defineStore("check", {
},
initSelectTestItems() {
this.selectTestItems.preTest = true
this.selectTestItems.channelsTest = true
this.selectTestItems.channelsTest = false
this.selectTestItems.test = true
},
setSelectTestItems(selectTestItems: CheckData.SelectTestItem) {

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

@@ -486,25 +486,25 @@ watch(webMsgSend, function (newValue, oldValue) {
break;
}
break;
case 'connect':
switch (newValue.operateCode) {
case "Source":
ElMessageBox.alert('源服务端连接失败', '源服务端连接失败', {
confirmButtonText: '确定',
type: 'error',
})
TableInit();
break;
case "Dev":
ElMessageBox.alert('设备服务端连接失败', '设备服务端连接失败', {
confirmButtonText: '确定',
type: 'error',
})
TableInit();
break;
}
break;
// case 'connect':
// switch (newValue.operateCode) {
// case "Source":
// ElMessageBox.alert('源服务端连接失败', '源服务端连接失败', {
// confirmButtonText: '确定',
// type: 'error',
// })
// TableInit();
// break;
// case "Dev":
// ElMessageBox.alert('设备服务端连接失败', '设备服务端连接失败', {
// confirmButtonText: '确定',
// type: 'error',
// })
// TableInit();
// break;
// }
//
// break;
}
}
})

23
frontend/src/views/home/components/selectTestItemPopup.vue
View File

@@ -30,6 +30,7 @@ import {dialogSmall} from "@/utils/elementBind";
import {ref} from "vue";
import {useCheckStore} from "@/stores/modules/check";
import type {CheckData} from "@/api/check/interface";
import {ElMessageBox} from "element-plus";
const emit = defineEmits(['openTestDialog'])
const checkStore = useCheckStore();
@@ -61,6 +62,28 @@ const handleStart = () => {
if (count === 0) {
ElMessage.warning('请选择测试内容！')
} else {
if(formContent.channelsTest){
const factorFlagArray = ref<string[]>([]) // 初始化为空数组
for (let i = 0; i < checkStore.devices.length; i++) {
const factorFlag = checkStore.devices[i].factorFlag
if (factorFlag !== undefined && factorFlag !== null && factorFlag === 0) {
factorFlagArray.value.push(checkStore.devices[i].deviceName.toString())
}
}
if (factorFlagArray.value.length > 0) {
const factorFlags = factorFlagArray.value.join(', ')
ElMessageBox.confirm(
factorFlags + '设备不支持系数校准，请重新选择',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
},
)
return
}
}
checkStore.setCheckType(0)
checkStore.setSelectTestItems({...formContent})
handleClose()

35
frontend/src/views/home/components/table.vue
View File

@@ -651,6 +651,7 @@ const handleSelectionChange = (selection: any[]) => {
deviceType: item.devType,
devVolt: item.devVolt,
devCurr: item.devCurr,
factorFlag: item.factorFlag,
}
})
@@ -962,7 +963,7 @@ const handleTest = async (val: string) => {
selectTestItemPopupRef.value?.open()
}
} else if (val === '系数校准') {
// // 检查 socketClient.Instance 是否存在
// if (!socketClient.Instance) {
@@ -970,22 +971,22 @@ const handleTest = async (val: string) => {
// return;
// }
socketClient.Instance.connect();
dataSocket.socketServe = socketClient.Instance;
dataSocket.socketServe.registerCallBack('aaa', (res: { code: number; }) => {
// 处理来自服务器的消息
//console.log('Received message:', res)
// 根据需要在这里添加更多的处理逻辑
if (res.code === 20000) {
ElMessage.error(message.message)
loading.close()
} else {
webMsgSend.value = res
}
})
// socketClient.Instance.connect();
// dataSocket.socketServe = socketClient.Instance;
// dataSocket.socketServe.registerCallBack('aaa', (res: { code: number; }) => {
// // 处理来自服务器的消息
// //console.log('Received message:', res)
// // 根据需要在这里添加更多的处理逻辑
// if (res.code === 20000) {
// ElMessage.error(message.message)
// loading.close()
// } else {
// webMsgSend.value = res
// }
// })
channelsTest.value?.open(channelsSelection.value, props.plan)
return
// channelsTest.value?.open(channelsSelection.value, props.plan)
// return
} else {
// 一键检测
checkStore.setCheckType(1)
@@ -1113,7 +1114,7 @@ onBeforeMount(async () => {
const handleQuitClicked = () => {
//console.log('handleQuitClicked')
dataSocket.socketServe.closeWs()
//dataSocket.socketServe.closeWs()
emit('batchGenerateClicked') // 触发事件
}

38
frontend/src/views/home/components/test.vue
View File

@@ -477,25 +477,25 @@ watch(webMsgSend, function (newValue, oldValue) {
break;
}
break;
case 'connect':
switch (newValue.operateCode) {
case "Source":
ElMessageBox.alert('源通讯失败，请检查源连接情况！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源通讯失败！`})
break;
case "Dev":
ElMessageBox.alert('设备通讯失败，请检查设备连接情况！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：设备通讯失败！`})
break;
}
emit('update:testStatus', 'test_init_fail')
break;
// case 'connect':
// switch (newValue.operateCode) {
// case "Source":
// ElMessageBox.alert('源通讯失败，请检查源连接情况！', '初始化失败', {
// confirmButtonText: '确定',
// type: 'error',
// })
// testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源通讯失败！`})
// break;
// case "Dev":
// ElMessageBox.alert('设备通讯失败，请检查设备连接情况！', '初始化失败', {
// confirmButtonText: '确定',
// type: 'error',
// })
// testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：设备通讯失败！`})
// break;
// }
// emit('update:testStatus', 'test_init_fail')
// break;
case 'yjc_ytxjy':
switch (newValue.operateCode) {
case 'INIT_GATHER':

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

@@ -208,21 +208,21 @@ const handleSubmit = () => {
break;
case 4:
if (TestStatus.value == "waiting") {
startPreTest({
userPageId: "cdf",
devIds: deviceIds,
planId: planId,
operateType: '2' // '1'为预检测、‘2‘为正式检测
}).then(res => {
console.log(res)
if (res.code === 'A001014') {
ElMessageBox.alert('装置配置异常', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
TestStatus.value = 'test_init_fail'
}
})
startPreTest({
userPageId: "cdf",
devIds: deviceIds,
planId: planId,
operateType: '2' // '1'为预检测、‘2‘为正式检测
}).then(res => {
console.log(res)
if (res.code === 'A001014') {
ElMessageBox.alert('装置配置异常', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
TestStatus.value = 'test_init_fail'
}
})
TestStatus.value = 'start'
} else if (TestStatus.value == 'paused') {
// 发送继续指令