diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index 956aa1462..3aa52a590 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -30,9 +30,9 @@
- {{ $t('global.buy') }}
- {{ $t('global.distributePermission') }}
- {{ $t('global.transferQRCode') }}
+ {{ $t('global.buy') }}
+ {{ $t('global.distributePermission') }}
+ {{ $t('global.transferQRCode') }}
{{ $t('demonstration.startSimulation') }}
{{ $t('demonstration.createRoom') }}
{{ $t('demonstration.enterRoom') }}
diff --git a/src/views/display/demon/setTime.vue b/src/views/display/demon/setTime.vue
index 1c39f9e71..08753052f 100644
--- a/src/views/display/demon/setTime.vue
+++ b/src/views/display/demon/setTime.vue
@@ -16,7 +16,7 @@
@@ -34,7 +34,8 @@ export default {
loadNum: 1
},
maxNumber: 1,
- pickerOptions: { selectableRange: '00:00:00 - 23:59:59' }
+ pickerOptions: { selectableRange: '00:00:00 - 23:59:59' },
+ status: false
};
},
computed: {
@@ -77,6 +78,7 @@ export default {
this.show = true;
},
doClose() {
+ this.status = false;
this.show = false;
},
handleChange(initTime) {
@@ -96,6 +98,7 @@ export default {
handleSure() {
this.$refs.form.validate((valid) => {
if (valid) {
+ this.status = true;
const model = {
initTime: this.formatTime(this.formModel.initTime)
};
diff --git a/src/views/exam/detail/courseDetail.vue b/src/views/exam/detail/courseDetail.vue
index 0b40e9a29..b65f4c333 100644
--- a/src/views/exam/detail/courseDetail.vue
+++ b/src/views/exam/detail/courseDetail.vue
@@ -35,9 +35,9 @@
购买
- 权限分发(考试)
- 权限转赠
- 查看课程试卷
+ 权限分发(考试)
+ 权限转赠
+ 查看课程试卷
diff --git a/src/views/orderauthor/permission/index.vue b/src/views/orderauthor/permission/index.vue
index 1f1dafbd5..dad8b9317 100644
--- a/src/views/orderauthor/permission/index.vue
+++ b/src/views/orderauthor/permission/index.vue
@@ -210,7 +210,7 @@ export default {
// });
},
formatterDate(row, porpInfo) {
- return row[porpInfo.property];
+ return row[porpInfo.property] ? row[porpInfo.property] : '---';
},
queryFunction(params) {
return listPackagePermission(params);
diff --git a/src/views/orderauthor/rules/index.vue b/src/views/orderauthor/rules/index.vue
index e909ba95c..89b066f7e 100644
--- a/src/views/orderauthor/rules/index.vue
+++ b/src/views/orderauthor/rules/index.vue
@@ -166,7 +166,7 @@ export default {
});
},
formatterDate(row, porpInfo) {
- return row[porpInfo.property];
+ return row[porpInfo.property] ? row[porpInfo.property] : '---';
},
queryFunction(params) {
return listPermision(params);
diff --git a/src/views/package/index.vue b/src/views/package/index.vue
index c97f6139b..9062b66de 100644
--- a/src/views/package/index.vue
+++ b/src/views/package/index.vue
@@ -20,7 +20,7 @@ export default {
return {
param: '',
WhetherTypeList: [],
- EffectiveTypeList: [],
+ // EffectiveTypeList: [],
PermissionTypeList: [],
pagerConfig: {
pageSize: 'pageSize',
@@ -37,14 +37,14 @@ export default {
data: []
}
},
- 'status': {
- type: 'select',
- label: this.$t('permission.permissionStatus'),
- value: '1',
- config: {
- data: []
- }
- },
+ // 'status': {
+ // type: 'select',
+ // label: this.$t('permission.permissionStatus'),
+ // value: '1',
+ // config: {
+ // data: []
+ // }
+ // },
'canDistribute': {
type: 'select',
label: this.$t('permission.permissionUseType'),
@@ -121,18 +121,18 @@ export default {
prop: 'ownerName',
isShow: () => { return this.$store.state.user.roles.indexOf(superAdmin) != -1; }
},
- {
- title: this.$t('permission.permissionStatus'),
- prop: 'status',
- type: 'tag',
- columnValue: (row) => { return this.$convertField(row.status, this.EffectiveTypeList, ['value', 'label']); },
- tagType: (row) => {
- switch (row.status) {
- case '1': return 'success';
- default: return 'danger';
- }
- }
- },
+ // {
+ // title: this.$t('permission.permissionStatus'),
+ // prop: 'status',
+ // type: 'tag',
+ // columnValue: (row) => { return this.$convertField(row.status, this.EffectiveTypeList, ['value', 'label']); },
+ // tagType: (row) => {
+ // switch (row.status) {
+ // case '1': return 'success';
+ // default: return 'danger';
+ // }
+ // }
+ // },
{
type: 'button',
title: this.$t('global.operate'),
@@ -164,28 +164,26 @@ export default {
loadInitData() {
this.queryForm.queryObject.canDistribute.config.data = this.$ConstSelect.PermissionUseList;
- this.$Dictionary.effectiveType().then(list => {
- list.forEach(elem => {
- this.queryForm.queryObject.status.config.data.push({ value: elem.code, label: elem.name });
- });
- this.$convertList(list, this.EffectiveTypeList, elem => {
- return true;
- });
- });
+ // this.$Dictionary.effectiveType().then(list => {
+ // list.forEach(elem => {
+ // this.queryForm.queryObject.status.config.data.push({ value: elem.code, label: elem.name });
+ // });
+ // this.$convertList(list, this.EffectiveTypeList, elem => {
+ // return true;
+ // });
+ // });
this.$Dictionary.permissionType().then(list => {
list.forEach(elem => {
this.queryForm.queryObject.type.config.data.push({ value: elem.code, label: elem.name });
});
- console.log(list);
this.$convertList(list, this.PermissionTypeList, elem => {
return true;
});
- console.log(this.PermissionTypeList);
});
},
formatterDate(row, porpInfo) {
- return row[porpInfo.property];
+ return row[porpInfo.property] ? row[porpInfo.property] : '---';
},
queryFunction(params) {
return listUserPermision(params);
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index 288610f00..6d1b8eab9 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -42,8 +42,8 @@
{{ $t('teach.buy') }}
- {{ $t('teach.permissionDistribute') }}
- {{ $t('teach.authorityTransferred') }}
+ {{ $t('teach.permissionDistribute') }}
+ {{ $t('teach.authorityTransferred') }}