Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/package.json

@@ -79,7 +79,7 @@
     "vuex": "^3.0.1",
     "vuex-oidc": "^3.3.0",
     "vuex-router-sync": "^5.0.0",
-    "wangeditor": "^4.6.1",
+    "wangeditor": "^4.5.2",
     "webpack": "^4.46.0",
     "xlsx": "^0.17.1"
   },

TEAMModelOS/ClientApp/src/components/evaluation/ExerciseList.vue

@@ -551,7 +551,8 @@ export default {
         this.collapseList.splice(listIndex, 1);
       } else {
         this.collapseList.push(index);
-        let exerciseItemDom = e.path.filter(
+        let path = this.$tools.composedPath(e)
+        let exerciseItemDom = path.filter(
           (i) => i.className === "exercise-item"
         );
         if (exerciseItemDom.length) {

TEAMModelOS/ClientApp/src/router/routes.js

@@ -622,8 +622,8 @@ export const routes = [{
     {
         path: 'CusMgt',
         name: 'CusMgt',
-        // component: () => import(window.location.host === 'test.teammodel.cn' ? '@/view/coursemgt/NewCusMgt.vue' : '@/view/coursemgt/CusMgt.vue'),
-        component: () => import('@/view/coursemgt/CusMgt.vue'),
+        component: () => window.location.host === 'test.teammodel.cn' ? import('@/view/coursemgt/NewCusMgt.vue') : import('@/view/coursemgt/CusMgt.vue'),
+        // component: () => import('@/view/coursemgt/CusMgt.vue'),
         meta: {
             activeName: 'CusMgt'
         }

TEAMModelOS/ClientApp/src/utils/public.js

@@ -207,6 +207,23 @@ export default {
 		})
 
 	},
+	composedPath(e) {
+		// 存在则直接return
+		if (e.path) {
+			return e.path
+		}
+		// 不存在则遍历target节点
+		let target = e.target
+		e.path = []
+		while (target.parentNode !== null) {
+			e.path.push(target)
+			target = target.parentNode
+		}
+		// 最后补上document和window
+		e.path.push(document, window)
+		return e.path
+	},
+
 	/* 复制活动链接 */
 	async doCopyAcLink(type, acInfo) {
 		let shareContent = ''

TEAMModelOS/ClientApp/src/view/artexam/Create.vue

@@ -626,6 +626,7 @@ export default {
             simplePaper
           )
           if (fullPaper) {
+            console.error('xxxxxxxxxxxx',fullPaper)
             let apiPaper = {}
             apiPaper.id = fullPaper.id
             apiPaper.code = fullPaper.code
@@ -634,6 +635,7 @@ export default {
             apiPaper.scope = fullPaper.scope
             apiPaper.sheet = fullPaper.sheet //答题卡 //202108021讨论： 创建评测不需要传答题卡id，由更新答题卡id去做关联。
             apiPaper.multipleRule = fullPaper.multipleRule
+            apiPaper.periodId = fullPaper.periodId
             apiPaper.answers = []
             apiPaper.point = []
             apiPaper.knowledge = []

TEAMModelOS/ClientApp/src/view/coursemgt/NewCusMgt.vue

@@ -27,7 +27,7 @@
 				<div class="header" v-if="!isSearchView">
 					<span>课程列表({{ courseList.length }})</span>
 					<span class="tools">
-						<Poptip trigger="hover" title="筛选" placement="bottom" v-if="courseList.length">
+						<Poptip trigger="hover" title="筛选" placement="bottom" v-if="originCourseList.length">
 							<Icon type="ios-funnel" :title="$t('syllabus.search')" @click="doAction('search')" />
 							<div slot="content">
 								<p>关联年级</p>

TEAMModelOS/ClientApp/src/view/evaluation/bank/ExerciseList.vue

@@ -605,6 +605,7 @@ export default {
      * @param id
      */
     onQuestionToggle(index, id, e) {
+      console.log(e)
       let curClassName = e.target.className;
       if (
         curClassName === "item-tools" ||
@@ -620,7 +621,8 @@ export default {
         this.collapseList.splice(listIndex, 1);
       } else {
         this.collapseList.push(index);
-        let exerciseItemDom = e.path.filter(
+        let path = this.$tools.composedPath(e)
+        let exerciseItemDom = path.filter(
           (i) => i.className === "exercise-item"
         );
         if (exerciseItemDom.length) {