diff --git a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
index 0783f165..9a72879f 100644
--- a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
+++ b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
@@ -88,16 +88,49 @@
审批详情
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -228,6 +261,7 @@ export default {
}
}
}
+ console.log("this.dataSource.data[0]========",this.dataSource.data[0][1])
},
// init () {
// this.visible = true
diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index e95ec4b3..75686078 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -38,7 +38,7 @@
-
+
审核状态:
-
-
+
+
+
@@ -371,8 +372,9 @@ export default {
{ name: '组件服务', key: 1 },
{ name: '应用资源', key: 2 },
{ name: '基础设施', key: 3 },
- { name: '数据资源', key: 3 },
- { name: '知识库', key: 3 }
+ { name: '数据资源', key: 4 },
+ { name: '知识库', key: 5 },
+ { name: '会议室', value: 6}
],
tableData: [],
tableData2: [
@@ -396,7 +398,8 @@ export default {
{ name: '图层服务', value: 2 },
{ name: '通用开发组件', value: 3 },
{ name: '页面开发组件', value: 4 },
- { name: '应用资源', value: 5 }
+ { name: '应用资源', value: 5 },
+ { name: '会议室', value: 6}
], // 类型备选列表
detailFlag: false, // 明细返回按钮显示标志位
startDate: '', // 开始时间
@@ -478,7 +481,9 @@ export default {
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
- this.status = '审核完成'
+ this.status = '通过'
+ }else if (this.examineStatus == '2') {
+ this.status = '不通过'
} else {
this.status = this.examineStatus
}
@@ -534,7 +539,9 @@ export default {
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
- this.status = '审核完成'
+ this.status = '通过'
+ } else if (this.examineStatus == '2') {
+ this.status = '不通过'
} else {
this.status = this.examineStatus
}
@@ -627,13 +634,15 @@ export default {
},
// 能力上架明细
getOneDetail (page) {
- var passAndReview = '' // 转变"审核完成"字段为通过
+ var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
this.status = '通过'
+ } else if (this.examineStatus == '2') {
+ this.status = '不通过'
} else {
this.status = this.examineStatus
}
@@ -657,13 +666,15 @@ export default {
},
// 能力使用明细
getTwoDetail (page) {
- var passAndReview = '' // 转变"审核完成"字段为通过
+ var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
this.status = '通过'
+ } else if (this.examineStatus == '2') {
+ this.status = '不通过'
} else {
this.status = this.examineStatus
}