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

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventList.vue

@@ -609,8 +609,13 @@ import ArtTestReport from "./EventContentTypeTemplate/PaperViewBox/ArtTestReport
                 this.isLoad = true
                 this.eventList.length = 0
                 this.eventShow.length = 0
-                this.isListNoItem = true;
+                this.isListNoItem = true
 
+                if(this.$route.query.subIds && this.courseNow.subjectList) {
+                    this.nowSub = this.courseNow.subjectList.findIndex(item => {
+                        return this.$route.query.subIds.includes(item.id) || this.$route.query.subIds.includes(item.bindId)
+                    })
+                }
                 let params = {
                     groupListIds: [],
                     subjects: [],
@@ -711,7 +716,7 @@ import ArtTestReport from "./EventContentTypeTemplate/PaperViewBox/ArtTestReport
                                 }
                             })
                         } else {
-                            if(this.$route.query.aId && this.courseNow.subjectList) {
+                            /* if(this.$route.query.aId && this.courseNow.subjectList) {
                                 let info = this.eventList.find(item => {
                                     return item.id === this.$route.query.aId
                                 })
@@ -720,7 +725,7 @@ import ArtTestReport from "./EventContentTypeTemplate/PaperViewBox/ArtTestReport
                                         return info.subjects.includes(item.id) || info.subjects.includes(item.bindId)
                                     })
                                 }
-                            }
+                            } */
                             // 2023.11.09 评测列表展示: 科目($sotre.state.user.curPeriod.subjects) + 班级
                             /* this.eventShow = this.eventList.filter(eveList => {
                                 if(this.courseNow.subjectList) {

TEAMModelOS/ClientApp/src/components/student-web/HomeView/HomeView.vue

@@ -771,7 +771,7 @@ export default {
                     let path = item.type === 'Homework' ? '/studentWeb/homeworkView' : '/studentWeb/examView'
                     this.$router.push({
                         path,
-                        query: {aId: item.id}
+                        query: {aId: item.id, subIds: subjectIds}
                     })
                 }
             } else {

TEAMModelOS/ClientApp/src/view/evaluation/index/TestPaper.vue

@@ -75,6 +75,9 @@
         <TabPane :label="$t('evaluation.cpTip2')" name="name4" tab="newExerciseTab">
           <BasePaperItemPicker v-if="curModalTab === 'name4'" ref='paperPicker' :subjectCode="subjectCode" :periodCode="periodCode" :gradeCode="gradeCode"></BasePaperItemPicker>
         </TabPane>
+        <TabPane :label="$t('evaluation.cpTip3')" name="name5" tab="newExerciseTab">
+          <ManualCreateNew ref="syllabusPicker" :subjectCode="subjectCode" :periodCode="periodCode" :gradeCode="gradeCode" isAddModel></ManualCreateNew>
+        </TabPane>
       </Tabs>
       <div slot="footer">
         <Button @click="addNewModal = false">{{$t('evaluation.cancel')}}</Button>
@@ -104,11 +107,13 @@
 import blobTool from '@/utils/blobTool.js'
 import ExamPaperAnalysis from '@/view/learnactivity/ExamPaperAnalysis.vue'
 import ManualCreate from '@/view/learnactivity/ManualCreate.vue'
+import ManualCreateNew from '@/view/learnactivity/ManualCreateNew.vue'
 
 export default {
   components: {
     ManualCreate,
     ExamPaperAnalysis,
+    ManualCreateNew,
   },
   props: {
     paper: {
@@ -258,6 +263,8 @@ export default {
         this.$refs.bankPicker && (this.$refs.bankPicker.shoppingQuestionList = [])
         this.$refs.bankPicker && (this.$refs.bankPicker.$refs.exList.selectList = [])
         this.$refs.paperPicker && (this.$refs.paperPicker.checkList = [])
+        this.$refs.syllabusPicker && (this.$refs.syllabusPicker.shoppingQuestionList = [])
+        this.$refs.syllabusPicker && (this.$refs.syllabusPicker.$refs.syllabusTree.selectList = [])
       }
     },
     /* 退出预览 */
@@ -292,6 +299,9 @@ export default {
       } else if (this.curModalTab === 'name3') {
         let newItems = this.$refs.bankPicker.shoppingQuestionList
         this.onAddNewFinish(newItems)
+      } else if (this.curModalTab === 'name5') {
+        let newItems = this.$refs.syllabusPicker.shoppingQuestionList
+        this.onAddNewFinish(newItems)
       } else {
         this.$refs.newEdit.getContent(this.$refs.newEdit.exersicesType)
       }
@@ -708,6 +718,9 @@ export default {
             }
             this.viewModel = newValue.itemSort === 1 ? 'list' : 'type'
             console.log('TestPaper > paper', newValue)
+            if(newValue.createType === 'manual') {
+              this.$EventBus.$emit('onPaperItemChange', newValue.item)
+            }
           })
           this.curOrderTempIndex = newValue.orderTemp || 0
           this.paperInfo = newValue

TEAMModelOS/ClientApp/src/view/learnactivity/ManualCreateNew.vue

@@ -1,6 +1,6 @@
 <template>
     <div style="height: 100%; position: relative">
-		<Poptip padding="0px 0px" offset="10" placement="top-end" width="300" trigger="hover" :class="shoppingCarClass">
+		<Poptip padding="0px 0px" offset="10" placement="top-end" width="300" trigger="hover" :class="shoppingCarClass" v-if="!isAddModel">
 			<Badge type="primary" :count="shoppingQuestionList.length" show-zero :offset="[-3, -3]" @mouseenter.native="changeActive($event)" @mouseleave.native="removeActive($event)">
 				<Icon custom="iconfont icon-sp-car" color="#05C19C" size="50" />
 			</Badge>
@@ -58,7 +58,7 @@
 		<vuescroll ref="manualScroll">
 			<div class="manual-filter-wrap">
 				<Col style="width: 100%">
-                    <div class="manual-filter-item">
+                    <div class="manual-filter-item" v-if="!isAddModel">
                         <span class="manual-filter-label">{{ $t('learnActivity.mgtScEv.ftType') }}</span>
                         <Select v-model="manualFilter.source" size="small" style="display: inline-block; width: 150px" @on-change="checkAll($event, 'source')">
                             <Option value="quesBank">{{ $t('evaluation.cpTip1') }}</Option>
@@ -170,14 +170,20 @@ export default {
         ExerciseList, BasePaperItemPicker, SyllabusPicker
     },
     props: {
+        /* 是否阅卷专用 */
         isMarkModel: {
             type: Boolean,
             default: false
         },
+        /* 是否添加题目弹窗中显示 */
+        isAddModel: {
+            type: Boolean,
+            default: false
+        },
         selQue: {
             type: Array,
             default: () => {
-                return [];
+                return []
             }
         },
         gradeCode: {
@@ -243,6 +249,9 @@ export default {
         }
     },
     mounted() {
+        if(this.isAddModel) {
+            this.manualFilter.source = 'syllabus'
+        }
         console.error(this.selQue);
         if (this.selQue.length) {
             let data = this.selQue;