diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index 850cb78af..c69af0a36 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -16,7 +16,7 @@
{{ $t('global.distributePermission') }} - {{ $t('demonstration.startSimulation') }} + {{ $t('demonstration.startSimulation') }}
@@ -78,9 +78,6 @@ export default { isComprehensive() { return this.courseModel.prdType === '03'; }, - isStartDemon() { - return (this.hasPermssion || this.tryTime > 0); - }, mapId() { return this.$route.query.mapId; }, diff --git a/src/views/organization/index.vue b/src/views/organization/index.vue index b97987d4c..20de68208 100644 --- a/src/views/organization/index.vue +++ b/src/views/organization/index.vue @@ -257,7 +257,7 @@ export default { const reg = new RegExp('[\\u4E00-\\u9FFF]+', 'g'); const studentIdJudge = !!studentId && !reg.test(studentId); if (studentIdJudge && name) { - students.push({account:dataList[1][i], name: dataList[2][i]}); + students.push({account:dataList[0][i], name: dataList[1][i]}); } else { if (!studentId && !name) { break; diff --git a/src/views/publish/examRule/draft/index.vue b/src/views/publish/examRule/draft/index.vue index bd3cc9196..b94ef046e 100644 --- a/src/views/publish/examRule/draft/index.vue +++ b/src/views/publish/examRule/draft/index.vue @@ -35,7 +35,7 @@ import { getPublishLessonList } from '@/api/jmap/lesson'; import RuleFrom from './rule'; import ExamFrom from './examFrom'; import { getPublishMapInfo } from '@/api/jmap/map'; -import { getExamLessonDetail, setCourseList, setCourseListGzb } from '@/api/management/exam'; +import { getExamLessonDetail, setCourseList } from '@/api/management/exam'; import { UrlConfig } from '@/scripts/ConstDic'; import { getSessionStorage } from '@/utils/auth'; @@ -71,9 +71,6 @@ export default { }, isFastCreate() { return this.display == 1 && this.$route.params.mode != 'edit' && Number(this.$route.params.ruleId); - }, - isGzbShow() { - return getSessionStorage('project').startsWith('gzb'); } }, watch: { @@ -103,6 +100,7 @@ export default { }); }, async definition(data) { + console.log(data, '===='); this.course = data; this.formData = {}; this.display = 2; @@ -140,11 +138,7 @@ export default { }; let res = {}; try { - if (this.isGzbShow) { - res = await setCourseListGzb(result); - } else { - res = await setCourseList(result); - } + res = await setCourseList(result); this.$message.success({ message: res.message }); this.$store.dispatch('exam/setRuleList', []); // 清空规则列表数据 const path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleManage}`; diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue index 1fc4fcb7a..a496ec88d 100644 --- a/src/views/publish/examRule/draft/rule.vue +++ b/src/views/publish/examRule/draft/rule.vue @@ -25,7 +25,7 @@