Merge remote-tracking branch 'remotes/origin/dev' into test

src/views/publish/examRule/draft/editRule.vue

@@ -54,7 +54,6 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
 import { getLessonTypeNum, getCourseTypeList } from '@/api/management/exam';
 import { getDetailList } from '@/api/management/dictionary';
 
@@ -121,17 +120,12 @@ export default {
 					{ required: true, validator: mark, trigger: 'blur' }
 				]
 			},
-			options: this.course,
+			options: this.$store.state.app.course,
 			typeList: [],
 			operationTypeList: [],
 			trainingOperateTypeMap: {}
 		};
 	},
-	computed: {
-		...mapState([
-			'course'
-		])
-	},
 	watch: {
 		editCourse: function (val) {
 			this.title = '修改规则';
@@ -225,7 +219,7 @@ export default {
 		async refresh() {
 			await getCourseTypeList({ lessonId: this.courseId }).then(res => {
 				const list = [];
-				Array.sort(res.data);
+				res.data.sort();
 				res.data.forEach(ele => {
 					this.typeList.forEach(v => {
 						if (ele == v.code) {