zhangjie %!s(int64=2) %!d(string=hai) anos
pai
achega
6c42af5dc3

+ 3 - 1
src/assets/styles/base.scss

@@ -177,7 +177,9 @@ body {
   }
   .el-input.is-disabled {
     .el-input__inner {
-      background-color: $--color-white;
+      background-color: #f0f2f6;
+      color: #999;
+      border-radius: 0;
     }
   }
   .el-input-number--medium {

+ 1 - 0
src/assets/styles/element-ui-costom.scss

@@ -172,6 +172,7 @@
 .el-button + .el-upload,
 .el-upload + .el-button,
 .el-button + .el-dropdown,
+.el-dropdown + .el-dropdown,
 .el-dropdown + .el-button {
   margin-left: 10px;
 }

+ 3 - 1
src/modules/card/views/CardBuild.vue

@@ -9,7 +9,9 @@
     ></card-view>
     <!-- all topics -->
     <div v-else class="topic-list">
-      <div :class="['page-box', `page-box-${cardConfig.pageSize}`]">
+      <div
+        :class="['page-box', `page-box-${cardConfig.pageSize}`, 'page-box-0']"
+      >
         <div class="page-main-inner">
           <div
             :class="['page-main', `page-main-${cardConfig.columnNumber}`]"

+ 5 - 10
src/modules/questions/views/CheckDuplicateList.vue

@@ -522,14 +522,11 @@ export default {
         sessionStorage.removeItem("question");
         sessionStorage.removeItem("question_currentPage");
         this.formSearch = {
+          basePaperId: "",
+          quesBodyText: "",
           questionType: "",
           courseNo: "",
-          courseLevel: "",
           courseName: "",
-          publicity: "",
-          coursePropertyName: "",
-          firstPropertyId: "",
-          secondPropertyId: "",
         };
         this.currentPage = 1;
       } else {
@@ -542,17 +539,15 @@ export default {
         this.getCourses(this.formSearch.courseName);
       } else {
         this.formSearch = {
+          basePaperId: "",
+          quesBodyText: "",
           questionType: "",
           courseNo: "",
-          courseLevel: "",
           courseName: "",
-          publicity: "",
-          coursePropertyName: "",
-          firstPropertyId: "",
-          secondPropertyId: "",
         };
         this.getCourses("");
       }
+      this.getPapers("");
       this.searchQues();
     },
   },

+ 14 - 7
src/modules/questions/views/EditPaper.vue

@@ -1057,6 +1057,7 @@
           <span v-show="uploadAudioLoading">正在上传中...</span>
         </el-button>
       </div>
+      <p class="tips-info"><i class="el-icon-info"></i>只能上传MP3文件</p>
       <p v-if="audioFileName" class="tips-info">文件: {{ audioFileName }}</p>
       <div v-if="checkResult" style="margin-top: 20px">
         <span>检查结果:</span><br /><br />
@@ -2644,12 +2645,14 @@ export default {
       var isGo = false;
       //取到所有文件的文件名
       for (var i = 0; i < files.length; i++) {
-        this.fileNameList.push(files[i].name);
-        if (files[i].size > 5 * 1024 * 1024) {
-          isGo = true;
-          break;
+        if (this.checkAudioFormat(files[i].name)) {
+          this.fileNameList.push(files[i].name);
+          if (files[i].size > 5 * 1024 * 1024) {
+            isGo = true;
+            break;
+          }
+          size = files[i].size + size;
         }
-        size = files[i].size + size;
       }
       if (isGo) {
         this.message = "上传单个文件不能超过5M";
@@ -2679,6 +2682,9 @@ export default {
           console.log(error);
         });
     },
+    checkAudioFormat(name) {
+      return name.endsWith(".mp3");
+    },
     // 音频文件
     selectAudioFile() {
       document.getElementById("radioFile").click();
@@ -2691,7 +2697,7 @@ export default {
         let names = [];
         for (var i = 0; i < fileList.length; i++) {
           var file = fileList[i];
-          names.push(file.name);
+          if (this.checkAudioFormat(file.name)) names.push(file.name);
         }
         this.audioFileName = names.join();
       }
@@ -2702,7 +2708,8 @@ export default {
       //循环添加到formData中
       for (var i = 0; i < fileList.length; i++) {
         var file = fileList[i];
-        param.append("files", file, file.name);
+        if (this.checkAudioFormat(file.name))
+          param.append("files", file, file.name);
       }
       let config = {
         headers: { "Content-Type": "multipart/form-data" },

+ 14 - 7
src/modules/questions/views/EditPaperPendingTrial.vue

@@ -1088,6 +1088,7 @@
           <span v-show="uploadAudioLoading">正在上传中...</span>
         </el-button>
       </div>
+      <p class="tips-info"><i class="el-icon-info"></i>只能上传MP3文件</p>
       <p v-if="audioFileName" class="tips-info">文件: {{ audioFileName }}</p>
       <div v-if="checkResult" style="margin-top: 20px">
         <span>检查结果:</span><br /><br />
@@ -2719,12 +2720,14 @@ export default {
       var isGo = false;
       //取到所有文件的文件名
       for (var i = 0; i < files.length; i++) {
-        this.fileNameList.push(files[i].name);
-        if (files[i].size > 5 * 1024 * 1024) {
-          isGo = true;
-          break;
+        if (this.checkAudioFormat(files[i].name)) {
+          this.fileNameList.push(files[i].name);
+          if (files[i].size > 5 * 1024 * 1024) {
+            isGo = true;
+            break;
+          }
+          size = files[i].size + size;
         }
-        size = files[i].size + size;
       }
       if (isGo) {
         this.message = "上传单个文件不能超过5M";
@@ -2754,6 +2757,9 @@ export default {
           console.log(error);
         });
     },
+    checkAudioFormat(name) {
+      return name.endsWith(".mp3");
+    },
     // 音频文件
     selectAudioFile() {
       document.getElementById("radioFile").click();
@@ -2766,7 +2772,7 @@ export default {
         let names = [];
         for (var i = 0; i < fileList.length; i++) {
           var file = fileList[i];
-          names.push(file.name);
+          if (this.checkAudioFormat(file.name)) names.push(file.name);
         }
         this.audioFileName = names.join();
       }
@@ -2777,7 +2783,8 @@ export default {
       //循环添加到formData中
       for (var i = 0; i < fileList.length; i++) {
         var file = fileList[i];
-        param.append("files", file, file.name);
+        if (this.checkAudioFormat(file.name))
+          param.append("files", file, file.name);
       }
       let config = {
         headers: { "Content-Type": "multipart/form-data" },

+ 1 - 1
src/modules/questions/views/PaperPendingTrial.vue

@@ -181,7 +181,7 @@
           prop="updateDate"
         >
         </el-table-column>
-        <el-table-column label="操作" width="270" fixed="right">
+        <el-table-column label="操作" width="255" fixed="right">
           <template slot-scope="scope">
             <div class="operate_left">
               <el-button