diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts index 409ed4a..1252370 100644 --- a/src/router/modules/laboratory.ts +++ b/src/router/modules/laboratory.ts @@ -233,7 +233,7 @@ }, { path: 'businessLog', - name: 'BusinessLog', + name: 'LabBusinessLog', component: () => import('@/views/system/log/listLog.vue'), meta: { title: '业务日志', @@ -243,7 +243,7 @@ }, { path: 'error', - name: 'ErrorLog', + name: 'LabErrorLog', component: () => import('@/views/system/log/listErrorLog.vue'), meta: { title: '异常日志', @@ -253,7 +253,7 @@ }, { path: 'loginDiary', - name: 'LoginDiaryLog', + name: 'LabLoginDiaryLog', component: () => import('@/views/system/log/LoginLog.vue'), meta: { title: '登录日志', diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts index 409ed4a..1252370 100644 --- a/src/router/modules/laboratory.ts +++ b/src/router/modules/laboratory.ts @@ -233,7 +233,7 @@ }, { path: 'businessLog', - name: 'BusinessLog', + name: 'LabBusinessLog', component: () => import('@/views/system/log/listLog.vue'), meta: { title: '业务日志', @@ -243,7 +243,7 @@ }, { path: 'error', - name: 'ErrorLog', + name: 'LabErrorLog', component: () => import('@/views/system/log/listErrorLog.vue'), meta: { title: '异常日志', @@ -253,7 +253,7 @@ }, { path: 'loginDiary', - name: 'LoginDiaryLog', + name: 'LabLoginDiaryLog', component: () => import('@/views/system/log/LoginLog.vue'), meta: { title: '登录日志', diff --git a/src/views/laboratory/statement/environment/detail.vue b/src/views/laboratory/statement/environment/detail.vue index d3ffb1b..577e9c0 100644 --- a/src/views/laboratory/statement/environment/detail.vue +++ b/src/views/laboratory/statement/environment/detail.vue @@ -89,7 +89,7 @@ envConfigList.value = envConfigList.value.map((item: any) => ({ ...item, - recordTime: item.pickTime1 + item.pickTime2 + item.pickTime3 + item.pickTime4, + recordTime: [item.pickTime1, item.pickTime2, item.pickTime3, item.pickTime4].filter(item => item).join(','), })) console.log(envConfigList.value) @@ -103,7 +103,7 @@ console.log(envConfigList.value) envConfigList.value = envConfigList.value.map((item: any) => ({ ...item, - recordTime: `${item.pickTime1},${item.pickTime2},${item.pickTime3},${item.pickTime4}`, + recordTime: [item.pickTime1, item.pickTime2, item.pickTime3, item.pickTime4].filter(item => item).join(','), })) // 校验数据 diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts index 409ed4a..1252370 100644 --- a/src/router/modules/laboratory.ts +++ b/src/router/modules/laboratory.ts @@ -233,7 +233,7 @@ }, { path: 'businessLog', - name: 'BusinessLog', + name: 'LabBusinessLog', component: () => import('@/views/system/log/listLog.vue'), meta: { title: '业务日志', @@ -243,7 +243,7 @@ }, { path: 'error', - name: 'ErrorLog', + name: 'LabErrorLog', component: () => import('@/views/system/log/listErrorLog.vue'), meta: { title: '异常日志', @@ -253,7 +253,7 @@ }, { path: 'loginDiary', - name: 'LoginDiaryLog', + name: 'LabLoginDiaryLog', component: () => import('@/views/system/log/LoginLog.vue'), meta: { title: '登录日志', diff --git a/src/views/laboratory/statement/environment/detail.vue b/src/views/laboratory/statement/environment/detail.vue index d3ffb1b..577e9c0 100644 --- a/src/views/laboratory/statement/environment/detail.vue +++ b/src/views/laboratory/statement/environment/detail.vue @@ -89,7 +89,7 @@ envConfigList.value = envConfigList.value.map((item: any) => ({ ...item, - recordTime: item.pickTime1 + item.pickTime2 + item.pickTime3 + item.pickTime4, + recordTime: [item.pickTime1, item.pickTime2, item.pickTime3, item.pickTime4].filter(item => item).join(','), })) console.log(envConfigList.value) @@ -103,7 +103,7 @@ console.log(envConfigList.value) envConfigList.value = envConfigList.value.map((item: any) => ({ ...item, - recordTime: `${item.pickTime1},${item.pickTime2},${item.pickTime3},${item.pickTime4}`, + recordTime: [item.pickTime1, item.pickTime2, item.pickTime3, item.pickTime4].filter(item => item).join(','), })) // 校验数据 diff --git a/src/views/laboratory/statement/environment/list.vue b/src/views/laboratory/statement/environment/list.vue index 6c89d1e..90f7a5d 100644 --- a/src/views/laboratory/statement/environment/list.vue +++ b/src/views/laboratory/statement/environment/list.vue @@ -175,7 +175,10 @@ - +