diff --git a/package.json b/package.json
index 6136693..5e25681 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
"jsencrypt": "3.0.0-rc.1",
+ "lodash": "^4.17.21",
"nprogress": "0.2.0",
"pinyin": "^4.0.0-alpha.2",
"qrcode": "^1.5.3",
diff --git a/src/components/pro-tabs/bns-timeline-tabs.vue b/src/components/pro-tabs/bns-timeline-tabs.vue
index 0cc36a0..fcb486b 100644
--- a/src/components/pro-tabs/bns-timeline-tabs.vue
+++ b/src/components/pro-tabs/bns-timeline-tabs.vue
@@ -208,19 +208,24 @@ export default {
// 根据审核状态以及审核结果添加样式
styleByType() {
return (item, index) => {
- if (this.items[index].status == '审核通过') return 'highlight'
- if (this.items[index].status == '审核驳回') return 'rejectHighlight'
- if (item.isActive != 1) return 'normal'
- if (item.isActive == 1) return 'currentLight'
+ // if (this.items[index].status == '审核通过') return 'highlight'
+ // if (this.items[index].status == '审核驳回') return 'rejectHighlight'
+ // if (item.isActive != 1) return 'normal'
+ // if (item.isActive == 1) return 'currentLight'
+ if (item.auditStatus == 1 || item.auditStatus == 3) return 'highlight'
+ if (item.auditStatus == 2) return 'rejectHighlight'
+ if (item.auditStatus == null) return 'normal'
+ if (item.auditStatus == 4) return 'currentLight'
}
},
+
// 根据审核状态以及审核结果添加符号
iconByType() {
return (item, index) => {
- if (this.items[index].status == '审核通过') return '√'
- if (this.items[index].status == '审核驳回') return 'X'
- if (this.items[index].status == '撤回' || (this.items[index].status == '' && item.isActive != 1)) return ''
- if (this.items[index].status == '' && item.isActive == 1) return '?'
+ if (item.auditStatus == 1 || item.auditStatus == 3) return '√'
+ if (item.auditStatus == 2) return 'X'
+ if (item.auditStatus == null) return ''
+ if (item.auditStatus == 4) return '?'
}
},
},
diff --git a/src/views/educationalTraining/resourceAdministration/testQuestionsStore/questionDetails.vue b/src/views/educationalTraining/resourceAdministration/testQuestionsStore/questionDetails.vue
index 5780a2e..39f80b6 100644
--- a/src/views/educationalTraining/resourceAdministration/testQuestionsStore/questionDetails.vue
+++ b/src/views/educationalTraining/resourceAdministration/testQuestionsStore/questionDetails.vue
@@ -5,7 +5,8 @@