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-01-10 10:47:08 +08:00
parent ead1feb379
commit 5ebb8549bf
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,8 +205,8 @@ watch(() => formContent.chnNum, async (newVal, oldVal) => {
scriptType: scriptType, scriptType: scriptType,
code: parseInt(checkStore.planCode) code: parseInt(checkStore.planCode)
}) })
updateTreeFly(resTreeDataTemp, 4)
updateTreeFly(resTreeDataTemp, 2) updateTreeFly(resTreeDataTemp, 2)
updateTreeFly(resTreeDataTemp, 4)
Object.assign(treeDataAll, resTreeDataTemp) Object.assign(treeDataAll, resTreeDataTemp)
@@ -368,7 +368,8 @@ const open = async (_deviceId: string, chnNum: string, _scriptType: string | nul
chnList = resFormContent.chnList.map((item: { value: string, label: string }) => ({ chnList = resFormContent.chnList.map((item: { value: string, label: string }) => ({
value: item.value, value: item.value,
label: item.label == '1' ? `${item.value}` : `${item.value}（不符合）` label: item.value
// label: item.label == '1' ? `${item.value}` : `${item.value}（不符合）`
})) }))
let dataRuleName = dictStore.getDictData('Data_Rule').find(item => item.id == resFormContent.dataRule)?.name let dataRuleName = dictStore.getDictData('Data_Rule').find(item => item.id == resFormContent.dataRule)?.name

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

@@ -931,7 +931,7 @@ const handleTest = async (val:string) => {
const data = reactive({ const data = reactive({
socketServe: socketClient.Instance, socketServe: socketClient.Instance,
}); });
const url = 'ws://192.168.1.127:7777/hello?name=cdf'; const url = 'ws://localhost:7777/hello?name=cdf';
socketClient.Instance.connect(url); socketClient.Instance.connect(url);
data.socketServe = socketClient.Instance; data.socketServe = socketClient.Instance;
data.socketServe.registerCallBack('aaa', (res: { code: number; }) => { data.socketServe.registerCallBack('aaa', (res: { code: number; }) => {

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

@@ -247,15 +247,15 @@ const checkResultView: ComputedRef<CheckData.ScriptChnViewItem[]> = computed(()
} }
} else { } else {
let tempChnResult: CheckData.ChnCheckResultEnum = device.chnResult[0] let tempChnResult: CheckData.ChnCheckResultEnum = device.chnResult[0]
if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.FAIL)) {
tempChnResult = CheckData.ChnCheckResultEnum.FAIL
}
if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.ERRORDATA)) { if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.ERRORDATA)) {
tempChnResult = CheckData.ChnCheckResultEnum.ERRORDATA tempChnResult = CheckData.ChnCheckResultEnum.ERRORDATA
} }
if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.TIMEOUT)) { if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.TIMEOUT)) {
tempChnResult = CheckData.ChnCheckResultEnum.TIMEOUT tempChnResult = CheckData.ChnCheckResultEnum.TIMEOUT
} }
if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.FAIL)) {
tempChnResult = CheckData.ChnCheckResultEnum.FAIL
}
switch (tempChnResult) { switch (tempChnResult) {
case CheckData.ChnCheckResultEnum.UNKNOWN: case CheckData.ChnCheckResultEnum.UNKNOWN:
tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'Minus'}) tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'Minus'})
@@ -824,6 +824,9 @@ const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckRes
tempChnResult.push(...devices[i].chnResult) tempChnResult.push(...devices[i].chnResult)
} }
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) {
type = CheckData.ChnCheckResultEnum.FAIL
}
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.TIMEOUT)) { if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.TIMEOUT)) {
type = CheckData.ChnCheckResultEnum.TIMEOUT type = CheckData.ChnCheckResultEnum.TIMEOUT
for (let i = 0; i < devices.length; i++) { for (let i = 0; i < devices.length; i++) {
@@ -838,9 +841,6 @@ const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckRes
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) { if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) {
type = CheckData.ChnCheckResultEnum.ERRORDATA type = CheckData.ChnCheckResultEnum.ERRORDATA
} }
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) {
type = CheckData.ChnCheckResultEnum.FAIL
}
errorCheckItem.push({scriptType, type: type}) errorCheckItem.push({scriptType, type: type})
} }