diff --git a/frontend/src/api/check/interface/index.ts b/frontend/src/api/check/interface/index.ts
index ceaae68..9900276 100644
--- a/frontend/src/api/check/interface/index.ts
+++ b/frontend/src/api/check/interface/index.ts
@@ -94,9 +94,9 @@ export namespace CheckData {
planId: string; //计划Id
devType: string; //设备类型
- devVolt:number; //设备电压
- devCurr:number; //设备电流
- factorFlag:number; //是否支持系数校准
+ devVolt: number; //设备电压
+ devCurr: number; //设备电流
+ factorFlag: number; //是否支持系数校准
}
// 用来描述检测脚本类型
@@ -108,7 +108,7 @@ export namespace CheckData {
// 用来描述 检测数据-左侧树结构
export interface TreeItem {
- id:string | null,
+ id: string | null,
scriptTypeName: string | null,
sourceDesc: string | null,
harmNum: number | null,
@@ -124,7 +124,8 @@ export namespace CheckData {
SUCCESS = 1,
FAIL = 2,
TIMEOUT = 3,
- ERRORDATA = 4
+ ERRORDATA = 4,
+ NOT_PART_IN_ERROR = 5
}
export interface DeviceCheckResult {
@@ -155,7 +156,7 @@ export namespace CheckData {
*/
export interface ButtonResult {
color: ButtonColorEnum
- icon: 'Minus' | 'Loading' | 'Close' | 'CircleCheckFilled' | 'Link' | 'WarnTriangleFilled'
+ icon: 'More' | 'Loading' | 'Close' | 'CircleCheckFilled' | 'Link' | 'WarnTriangleFilled' | 'Minus'
}
/**
diff --git a/frontend/src/api/index.ts b/frontend/src/api/index.ts
index 1a67bc3..8f932d5 100644
--- a/frontend/src/api/index.ts
+++ b/frontend/src/api/index.ts
@@ -84,7 +84,7 @@ class RequestHttp {
}
}
// 登陆失效
- if (data.code == ResultEnum.OVERDUE) {
+ if (data.code === ResultEnum.OVERDUE) {
console.log("登陆失效")
userStore.setAccessToken('')
userStore.setRefreshToken('')
diff --git a/frontend/src/enums/httpEnum.ts b/frontend/src/enums/httpEnum.ts
index 6deff04..9a85fbe 100644
--- a/frontend/src/enums/httpEnum.ts
+++ b/frontend/src/enums/httpEnum.ts
@@ -4,8 +4,8 @@
export enum ResultEnum {
SUCCESS = "A0000",
ERROR = 500,
- ACCESSTOKEN_EXPIRED = 401,
- OVERDUE = 4001,
+ ACCESSTOKEN_EXPIRED = "A0024",
+ OVERDUE = "A0025",
TIMEOUT = 30000,
TYPE = "success"
}
diff --git a/frontend/src/views/home/components/dataCheckResultTable.vue b/frontend/src/views/home/components/dataCheckResultTable.vue
index 23c4598..c7bf355 100644
--- a/frontend/src/views/home/components/dataCheckResultTable.vue
+++ b/frontend/src/views/home/components/dataCheckResultTable.vue
@@ -22,6 +22,7 @@
符合
不符合
/
+ -
@@ -39,6 +40,7 @@
符合
不符合
/
+ -
@@ -56,6 +58,7 @@
符合
不符合
/
+ -
@@ -76,6 +79,7 @@
符合
不符合
/
+ -
diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
index ef9ebfc..b157255 100644
--- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
@@ -371,7 +371,7 @@ const updateTableData = async () => {
setCheckResultData(resCheckResult)
setRawData(resRawData)
checkList.length = 0
- checkList.push({value: keys1[0], label: resCheckResult.isData === 1 ? `${keys1[0]}` : resCheckResult.isData === 4 ? `${keys1[0]}(/)` : `${keys1[0]}(不符合)`})
+ checkList.push({value: keys1[0], label: resCheckResult.isData === 1 ? `${keys1[0]}` : resCheckResult.isData === 4 ? `${keys1[0]}(/)` : resCheckResult.isData === 5? `${keys1[0]}(-)`:`${keys1[0]}(不符合)`})
if (currentCheckItem.value == checkList[0].value) {
doCurrentCheckItemUpdate(checkList[0].value)
} else {
@@ -383,7 +383,7 @@ const updateTableData = async () => {
let hum = formatHarmNum(key)
tempCheckList.push({
value: key,
- label: value.isData === 1 ? hum : value.isData === 4 ? `${hum}(/)` : `${hum}(不符合)`
+ label: value.isData === 1 ? `${hum}`: value.isData === 4 ? `${hum}(/)` : value.isData === 5? `${hum}(-)`:`${hum}(不符合)`
})
}
diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue
index af80870..cd2de32 100644
--- a/frontend/src/views/home/components/test.vue
+++ b/frontend/src/views/home/components/test.vue
@@ -255,7 +255,7 @@ const checkResultView: ComputedRef = computed(()
for (let j = 0; j < device.chnResult.length; j++) {
switch (device.chnResult[j]) {
case CheckData.ChnCheckResultEnum.UNKNOWN:
- tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'Minus'})
+ tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'More'})
break;
case CheckData.ChnCheckResultEnum.LOADING:
tempChnBtnResult.push({color: CheckData.ButtonColorEnum.LOADING, icon: 'Loading'})
@@ -272,6 +272,9 @@ const checkResultView: ComputedRef = computed(()
case CheckData.ChnCheckResultEnum.ERRORDATA:
tempChnBtnResult.push({color: CheckData.ButtonColorEnum.WARNING, icon: 'WarnTriangleFilled'})
break;
+ case CheckData.ChnCheckResultEnum.NOT_PART_IN_ERROR:
+ tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'Minus'})
+ break;
default:
break;
}