diff --git a/frontend/src/views/home/components/dataCheckResultTable.vue b/frontend/src/views/home/components/dataCheckResultTable.vue
index d7aaeb0..31ef7ac 100644
--- a/frontend/src/views/home/components/dataCheckResultTable.vue
+++ b/frontend/src/views/home/components/dataCheckResultTable.vue
@@ -49,13 +49,6 @@
-
-
-
-
-
-
-
@@ -73,13 +66,6 @@
-
-
-
-
-
-
-
diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
index 5c1d71d..1f89527 100644
--- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
@@ -41,7 +41,7 @@
@node-click="handleNodeClick" class="custom-tree" ref="treeRef">
- {{ data.scriptTypeName }}
+ {{ data.scriptTypeName }}
@@ -219,7 +219,7 @@ watch(currentHarmNum, (newVal, oldVal) => {
if (newVal !== '-1') {
let resCheckResult: CheckData.ResCheckResult = resTableData.resultData.get(newVal.toString())
setCheckResultData(resCheckResult)
- setRawData(resTableData.resultData.get(newVal.toString()))
+ setRawData(resTableData.rawData.get(newVal.toString()))
}
})
@@ -229,7 +229,7 @@ watch(currentCheckItem, (newVal, oldVal) => {
let key = newVal.toString() === 'Voltage' ? '电压幅值' : '持续时间'
let resCheckResult: CheckData.ResCheckResult = resTableData.resultData.get(key)
setCheckResultData(resCheckResult)
- setRawData(resTableData.resultData.get(key))
+ setRawData(resTableData.rawData.get(key))
}
})
@@ -432,13 +432,13 @@ const setCheckResultData = (data: CheckData.ResCheckResult) => {
}
const setRawData = (data: CheckData.RawDataItem[]) => {
+ console.log("原始数据", data)
data.forEach((item: CheckData.RawDataItem) => {
item.dataA = item.dataA == null || item.dataA == undefined ? '' : Number(item.dataA).toFixed(fixed).replace(/-/g, "")
item.dataB = item.dataB == null || item.dataB == undefined ? '' : Number(item.dataB).toFixed(fixed).replace(/-/g, "")
item.dataC = item.dataC == null || item.dataC == undefined ? '' : Number(item.dataC).toFixed(fixed).replace(/-/g, "")
item.dataT = item.dataT == null || item.dataT == undefined ? '' : Number(item.dataT).toFixed(fixed).replace(/-/g, "")
})
- console.log("原始数据", data)
Object.assign(rawTableData, data)
}
diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue
index 4a8f4ae..4cbed15 100644
--- a/frontend/src/views/home/components/test.vue
+++ b/frontend/src/views/home/components/test.vue
@@ -297,7 +297,7 @@ watch(testStatus, function (newValue, oldValue) {
percentage.value = 0
}
emit('update:testStatus', 'test_init')
- //startTimer() // todo 可移除
+ startTimer() // todo 可移除
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}:初始化开始!`})
}
})
@@ -340,25 +340,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':
@@ -386,7 +386,7 @@ watch(webMsgSend, function (newValue, oldValue) {
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}:初始化成功!`})
activeIndex = getNextActiveIndex() + 2
- //startTimer()
+ startTimer()
emit('update:testStatus', 'process')
}
@@ -419,7 +419,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('FREQ')
- //startTimer()
+ startTimer()
}
break;
case 'V_Start':
@@ -432,7 +432,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('V')
- //startTimer()
+ startTimer()
}
break;
case 'HV_Start':
@@ -445,7 +445,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('HV')
- //startTimer()
+ startTimer()
}
break;
case 'HI_Start':
@@ -458,7 +458,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('HI')
- //startTimer()
+ startTimer()
}
break;
case 'HP_Start':
@@ -471,7 +471,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('HP')
- //startTimer()
+ startTimer()
}
break;
case 'HSV_Start':
@@ -484,7 +484,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('HSV')
- //startTimer()
+ startTimer()
}
break;
case 'HSI_Start':
@@ -497,7 +497,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('HSI')
- //startTimer()
+ startTimer()
}
break;
case 'VOLTAGE_Start':
@@ -510,7 +510,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('VOLTAGE')
- //startTimer()
+ startTimer()
}
break;
case 'I_Start':
@@ -523,7 +523,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('I')
- //startTimer()
+ startTimer()
}
break;
case 'IMBV_Start':
@@ -536,7 +536,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('IMBV')
- //startTimer()
+ startTimer()
}
break;
case 'IMBA_Start':
@@ -549,7 +549,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('IMBA')
- //startTimer()
+ startTimer()
}
break;
case 'F_Start':
@@ -562,7 +562,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('F')
- //startTimer()
+ startTimer()
}
break;
case 'Quit':
@@ -633,13 +633,7 @@ const initScriptData = async () => {
}
// 初始化设备列表
const initDeviceList = () => {
- checkStore.devices.forEach(item => {
- deviceList.push({
- deviceId: item.deviceId,
- deviceName: item.deviceName,
- chnNum: item.chnNum,
- })
- })
+ Object.assign(deviceList, checkStore.devices)
}
// 初始化检测结果 (详细到通道)
@@ -667,6 +661,7 @@ const initCheckResult = () => {
})
Object.assign(checkResult, result)
}
+
// 更新检测结果(详细到通道)
const updateCheckResult = (data: CheckData.ScriptChnItem) => {
const {scriptType} = {...data}
@@ -796,11 +791,11 @@ const setErrorCheckItem = (scriptType: string, devices: any[]) => {
const updateCheckResultView = (scriptCode: string, isStart: boolean, devices: any[] = []) => {
let scriptType = scriptData.filter(item => item.code === scriptCode)[0]?.id
- // devices = [{
- // chnResult: [1, 1],
- // deviceId: "80b4b4f52a4c4064a18319525f8ac13c",
- // deviceName: "240002"
- // }]
+ devices = [{
+ chnResult: [1, 1],
+ deviceId: "80b4b4f52a4c4064a18319525f8ac13c",
+ deviceName: "240002"
+ }]
let temp = null
if (isStart) {
temp = getLoadingResult(scriptType)
@@ -1132,7 +1127,7 @@ const handleResumeTest = () => {
type: 'info',
log: `${new Date().toLocaleString()}:继续检测`,
})
- //startTimer()
+ startTimer()
console.log('开始继续检测')
};