Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

src/views/course/CourseAdd.vue

@@ -27,11 +27,11 @@
         </a-col>
 
         <!-- 课时 -->
-        <a-col :span="9">
+        <!-- <a-col :span="9">
           <a-form-item label="课时" :label-col="{ span: 4 }" :wrapper-col="{ span: 10 }">
             <a-input-number id="hour" v-model="dataValue" :min="1" :max="1000" :style="{ display: 'ln', width: '100%' }" />
           </a-form-item>
-        </a-col>
+        </a-col> -->
 
         <!-- 学习内容简介 -->
         <a-col :span="18" :offset="3">

src/views/course/CourseDetail.vue

@@ -8,7 +8,7 @@
       </a-descriptions-item>
       <a-descriptions-item label="课时">{{ detailData.hour }}</a-descriptions-item>
       <a-descriptions-item label="学习内容">{{ detailData.learningContent }}</a-descriptions-item>
-      <a-descriptions-item label="试题数量">{{ detailData.questionCount }}</a-descriptions-item>
+      <a-descriptions-item label="题⽬数量">{{ detailData.questionCount }}</a-descriptions-item>
       <a-descriptions-item label="备注">{{ detailData.remark }}</a-descriptions-item>
       <a-descriptions-item label="课程封面图">
         <div v-if="detailData.imagePath">

src/views/course/CourseList.vue

@@ -59,7 +59,7 @@ export default {
         { title: '课程名称', width: 'auto', align: 'center', dataIndex: 'courseName', key: 'courseName' },
         { title: '课程类别', width: 'auto', align: 'center', dataIndex: 'courseTypeName', key: 'courseTypeName' },
         { title: '课时/分', width: '160px', align: 'center', dataIndex: 'hour', key: 'hour' },
-        { title: '数量', width: '160px', align: 'center', dataIndex: 'questionCount', key: 'questionCount' },
+        { title: '题⽬数量', width: '160px', align: 'center', dataIndex: 'questionCount', key: 'questionCount' },
         { title: '操作', key: 'operation', width: '300px', align: 'center', scopedSlots: { customRender: 'action' } },
       ],
     }

src/views/course/CoursewareAddOrUpdate.vue

@@ -11,23 +11,19 @@
           <a-tab-pane key="1" tab="视频上传" :disabled="fileUpload.videoForm.disabled">
             <div v-if="fileUpload.tabkey == 1" style="background: #ececec; padding: 30px">
               <a-card title="视频上传" :bordered="false" style="width: 100%">
-                <div style="margin-bottom: 30px">
+                <div style="margin-bottom: 20px">
-                  课件名称：&nbsp;
+                  {{coursewareName}}：&nbsp;
                   <a-input placeholder="课件名称" v-model="fileUpload.videoForm.name" style="width: 40%" />
                 </div>
                 <!-- <div style="margin-bottom: 30px; margin-top: 20px">
                   课件分类：&nbsp;
                   <a-tree-select v-model="fileUpload.videoForm.classify" style="width: 300px" :tree-data="coursewareClassfiy" placeholder="请选择课程分类"></a-tree-select>
                 </div> -->
-                <div>课件学时：&nbsp;
+                <div v-if="ifResources == 0">课件学时：&nbsp;
                   <a-input-number :min="0" :max="100" :step="1" v-model="fileUpload.videoForm.learnHours" style="width: 140px" />
                 </div>
                 <br />
-                <!-- <div>课件学分：&nbsp;
+                <div style="margin-bottom: 20px;">{{bigOrSmall}}：&nbsp;
-                  <a-input-number :min="0" :max="100" :step="1" v-model="fileUpload.videoForm.learnScore" style="width: 140px" />
-                </div>
-                <br /> -->
-                <div>课件大小：&nbsp;
                   <a-input :disabled="true" :value="fileUpload.videoForm.sizeStr" style="width: 140px" />&nbsp;&nbsp;&nbsp; MB
                 </div>
                 <br />
@@ -48,15 +44,15 @@
             <!-- <a-tab-pane  key="2" tab="文本上传" :disabled="true"> -->
             <div v-if="fileUpload.tabkey == 2" style="background: #ececec; padding: 30px">
               <a-card title="文本上传" :bordered="false" style="width: 100%">
-                <div style="margin-bottom: 30px">
+                <div style="margin-bottom: 20px">
-                  课件名称：&nbsp;
+                  {{coursewareName}}：&nbsp;
                   <a-input placeholder="课件名称" v-model="fileUpload.textForm.name" style="width: 40%" />
                 </div>
                 <!-- <div style="margin-bottom: 30px; margin-top: 20px">
                   课件分类：&nbsp;
                   <a-tree-select v-model="fileUpload.textForm.classify" style="width: 300px" :tree-data="coursewareClassfiy" placeholder="请选择课程分类"></a-tree-select>
                 </div> -->
-                <div>课件学时：&nbsp;
+                <div v-if="ifResources == 0">课件学时：&nbsp;
                   <a-input-number :min="0" :max="10" :step="0.1" v-model="fileUpload.textForm.learnHours" style="width: 140px" />
                 </div>
                 <br />
@@ -64,7 +60,7 @@
                   <a-input-number :min="0" :max="10" :step="0.1" v-model="fileUpload.textForm.learnScore" style="width: 140px" />
                 </div>
                 <br /> -->
-                <div>课件大小：&nbsp;
+                <div style="margin-bottom: 20px;">{{bigOrSmall}}：&nbsp;
                   <a-input-number :disabled="true" v-model="fileUpload.textForm.sizeStr" :min="0" style="width: 140px" />&nbsp;&nbsp;&nbsp; MB
                 </div>
                 <br />
@@ -165,7 +161,8 @@ export default {
       pageName: '',
       // treeData: [],
       ifResources: this.$route.query.ifResources,
-      // coursewareClassfiy: [],
+      coursewareName: this.$route.query.ifResources == 1 ? '名称' : '课件名称',
+      bigOrSmall: this.$route.query.ifResources == 1 ? '大小' : '课件大小',
       courseware: {}, //课件详情
       queryParam: { coursewareId: this.$route.query.coursewareId }, //编辑传参
       successOssFile: [],
@@ -209,6 +206,7 @@ export default {
     //数据字典加载
     // this.dictionaryDropDown();
     //判断是否加载数据
+    console.log("11111",this.coursewareName);
     if (this.queryParam.coursewareId) this.load();
 
     // 是否资源库ifResources

src/views/course/question/QuestionAdd.vue

@@ -355,16 +355,7 @@ export default {
       } else if (!this.multiselect.answerC || this.multiselect.answerC === '') {
         this.$message.error('答案C不能为空！')
         return false
-      } else if (!this.multiselect.answerD || this.multiselect.answerD === '') {
+      } 
-        this.$message.error('答案D不能为空！')
-        return false
-      } else if (!this.multiselect.answerE || this.multiselect.answerD === '') {
-        this.$message.error('答案E不能为空！')
-        return false
-      } else if (!this.multiselect.answerF || this.multiselect.answerD === '') {
-        this.$message.error('答案F不能为空！')
-        return false
-      }
 
       let from = {}
       from = this.multiselect

src/views/course/question/QuestionList.vue

@@ -50,7 +50,7 @@
           <div class="answer">A. {{ questionDetail.answerA }}</div>
           <div class="answer">B. {{ questionDetail.answerB }}</div>
           <div class="answer">C. {{ questionDetail.answerC }}</div>
-          <div class="answer">D. {{ questionDetail.answerD }}</div>
+          <div v-if="questionDetail.answerD" class="answer">D. {{ questionDetail.answerD }}</div>
           <div v-if="questionDetail.answerE" class="answer">E. {{ questionDetail.answerE }}</div>
           <div v-if="questionDetail.answerF" class="answer">F. {{ questionDetail.answerF }}</div>
         </div>