From 0d1ab8fb8791a211f2b7d4a09918cd6e4d29ea95 Mon Sep 17 00:00:00 2001 From: Yjhon Date: Wed, 23 Feb 2022 11:52:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=B0=83=E6=95=B4,=E7=BB=84=E5=8D=B7=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetail.vue | 8 ++++---- .../project/form/ProjectTestPaperFormationStrategy.vue | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/views/project/ProjectDetail.vue b/src/views/project/ProjectDetail.vue index f027b31..51c8e80 100644 --- a/src/views/project/ProjectDetail.vue +++ b/src/views/project/ProjectDetail.vue @@ -9,9 +9,9 @@ {{projectBasicInfo.trainType == 1 ? '必修课':'选修课'}} {{projectBasicInfo.trainClassName}} {{projectBasicInfo.trainWayName}} - {{projectBasicInfo.trainSdate + ' - ' + projectBasicInfo.trainEdate}} - {{projectBasicInfo.practiceSdate + ' - ' + projectBasicInfo.practiceEdate}} - {{projectBasicInfo.examSdate + ' - ' + projectBasicInfo.examEdate}} + {{projectBasicInfo.trainSdate + ' - ' + projectBasicInfo.trainEdate}} + {{projectBasicInfo.practiceSdate + ' - ' + projectBasicInfo.practiceEdate}} + {{projectBasicInfo.examSdate + ' - ' + projectBasicInfo.examEdate}} {{projectBasicInfo.examNumber + '次'}} {{projectBasicInfo.mockExam == 1 ? '允许':'不允许'}} {{projectBasicInfo.remark}} @@ -63,7 +63,7 @@ export default { personColumns: [ //人员列 { title: '序号', key: 'id', dataIndex: 'id', width: 60, scopedSlots: { customRender: 'serial' } }, { title: '姓名', dataIndex: 'name', key: 'name' }, - { title: '受训角色', dataIndex: 'role', key: 'role', }, + // { title: '受训角色', dataIndex: 'role', key: 'role', }, { title: '单位信息', key: 'company', dataIndex: 'company', }, { title: '部门信息', dataIndex: 'department', key: 'department', }, ], diff --git a/src/views/project/form/ProjectTestPaperFormationStrategy.vue b/src/views/project/form/ProjectTestPaperFormationStrategy.vue index d9e176d..59e132e 100644 --- a/src/views/project/form/ProjectTestPaperFormationStrategy.vue +++ b/src/views/project/form/ProjectTestPaperFormationStrategy.vue @@ -25,7 +25,7 @@ - +

考试开启条件：

@@ -69,6 +69,7 @@ // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等） // 例如：import 《组件名称》 from '《组件路径》' import { getQuestionNumByCourseIds } from '@/api/course/question/question' +import Item from '@/components/AvatarList/Item' export default { // import引入的组件需要注入到对象中才能使用 @@ -158,13 +159,13 @@ export default { methods: { //保存 toSave() { - this.form.testPaperTactics = this.tableData; + this.form.testPaperTactics = this.tableData.filter((Item) => {return Item.topicNum && Item.topicScore}); this.form.projectStatus = 1 this.$emit('executeSave', this.form) }, //发布 toIssue() { - this.form.testPaperTactics = this.tableData + this.form.testPaperTactics = this.tableData.filter((Item) => {return Item.topicNum && Item.topicScore}); this.form.projectStatus = 2 this.$emit('executeIssue', this.form) }, From 255e4d9433527b305d4031cc50128cab75d0d0b5 Mon Sep 17 00:00:00 2001 From: cgd_mac <349008059@qq.com> Date: Wed, 23 Feb 2022 14:34:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DbLearnCount/CourseCatalogue.vue | 153 ++++++++++++++++++ src/components/DbLearnCount/index.vue | 5 + src/views/mycourse/courseLearn/index.vue | 2 +- src/views/mycourse/index.vue | 13 -- .../mycourse/mycourseList/MyCourseList.vue | 2 +- src/views/myexam/index.vue | 19 ++- src/views/mypractice/index.vue | 48 +++--- 7 files changed, 201 insertions(+), 41 deletions(-) create mode 100644 src/components/DbLearnCount/CourseCatalogue.vue delete mode 100644 src/views/mycourse/index.vue diff --git a/src/components/DbLearnCount/CourseCatalogue.vue b/src/components/DbLearnCount/CourseCatalogue.vue new file mode 100644 index 0000000..a2b1918 --- /dev/null +++ b/src/components/DbLearnCount/CourseCatalogue.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/src/components/DbLearnCount/index.vue b/src/components/DbLearnCount/index.vue index 86b364f..2a12d37 100644 --- a/src/components/DbLearnCount/index.vue +++ b/src/components/DbLearnCount/index.vue @@ -23,12 +23,17 @@ 学习状态： {{ data.status }} + + + - - diff --git a/src/views/mycourse/mycourseList/MyCourseList.vue b/src/views/mycourse/mycourseList/MyCourseList.vue index 725900f..f492834 100644 --- a/src/views/mycourse/mycourseList/MyCourseList.vue +++ b/src/views/mycourse/mycourseList/MyCourseList.vue @@ -161,7 +161,7 @@ export default { }, // 获取列表 handleRefresh () { - + this.$refs.table.refresh() }, handleOk () { this.$refs.table.refresh() diff --git a/src/views/myexam/index.vue b/src/views/myexam/index.vue index beab10b..80fc4ce 100644 --- a/src/views/myexam/index.vue +++ b/src/views/myexam/index.vue @@ -13,7 +13,7 @@ ">
- + import { STable, SearchCom } from '@/components' import { reqExamList, reqExamAttendList, reqExamSubscribe } from '@/api/myexam/exam' +import { dictionaryDropDown } from '@/api/sys/dictionaryItem' +import { dictToTree } from '@/utils/util' export default { components: { STable, SearchCom }, @@ -87,10 +89,10 @@ export default { loading: false, activeTab: '1', queryParam: { - examType: '' // 课程分类 + examClassify: '' // 课程分类 }, queryOptions: [ - { type: 'select-dic-tree', placeholder: '考试分类', key: 'examType', options: [] } + { type: 'select-dic-tree', placeholder: '课程分类', key: 'examClassify', options: [] } ], examColumns: [ { @@ -186,15 +188,24 @@ export default { } }, mounted () { + this.dictionaryDropDown() }, methods: { + dictionaryDropDown () { + dictionaryDropDown({ dictionaryCode: '0006' }).then((res) => { + const result = dictToTree(res.data, [], 0) + this.queryOptions[0].options = result + this.loading = false + }) + }, // 搜索 handleRefresh () { const { activeTab } = this + console.log('activeTab', activeTab) if (activeTab === '1') { this.$refs.examTable.refresh() } else { - this.$refs.examDoneColumns.refresh() + this.$refs.examDoneTable.refresh() } }, // 预约考试 diff --git a/src/views/mypractice/index.vue b/src/views/mypractice/index.vue index f6dd9bb..309f035 100644 --- a/src/views/mypractice/index.vue +++ b/src/views/mypractice/index.vue @@ -22,28 +22,32 @@
- - - - - -

{{ j.courseName }}

-
- 开始答题 -
- - - - + + +