From 0e54268b83810c64c071f98b89a915790d509d16 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Thu, 29 Aug 2024 16:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../course/examination/questionBank.vue       | 24 ++++++---
 .../course/examination/questionBank/add.vue   | 51 +++++++++++--------
 2 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/src/views/modules/course/examination/questionBank.vue b/src/views/modules/course/examination/questionBank.vue
index b519700..ba06d87 100644
--- a/src/views/modules/course/examination/questionBank.vue
+++ b/src/views/modules/course/examination/questionBank.vue
@@ -44,20 +44,19 @@
         style="display: inline-block;margin-left: 10px;"
         :limit="1"
         class="upload-demo"
-        :action="baseUrl + '/common/classExam/importSubject'"
-        :data="{
-          courseId: this.course.id
-        }"
+        :action="baseUrl + '/oss/fileoss'"        
         :show-file-list="false"
         multiple
         :on-exceed="handleExceed"
         :on-success="handleSuccess"
+        :before-upload="beforeUploadHandle"
         accept=".xlsx,.xls"
         :on-remove="handleRemoveNovel"
       >
-        <el-button size="small" type="primary" plain>导入考题</el-button>
+        <el-button size="small" type="primary" plain :loading="showLoadIcon">导入考题 {{loadText}}</el-button>
       </el-upload>
       <!-- </el-form-item> -->
+      <!-- <div :loading="showLoadIcon">{{loadText}}</div> -->
     </el-form>
     <el-table
       tooltip-effect="dark custom-tooltip-effect"
@@ -194,6 +193,8 @@ export default {
   props: ["course"],
   data() {
     return {
+      showLoadIcon:false,
+      loadText:'',
       baseUrl: global.baseUrl,
       selectType: [],
       shopTableVisible: false,
@@ -295,8 +296,19 @@ export default {
       str = numList.join(",");
       return str;
     },
+    beforeUploadHandle(){
+      // this.$message.info('正在上传中')
+      this.showLoadIcon = true
+      this.loadText = '正在上传中'
+    },
     handleSuccess(file, fileList) {
-      // this.form.imageList.push(file.url);
+      this.showLoadIcon = false
+      this.loadText = ''
+      console.log('fileurl', file.url)
+      // this.form.imageList.push('file.url',file.url);
+    },
+    handleRemoveNovel(){
+      console.log('删除文件')
     },
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 3 个文件`);
diff --git a/src/views/modules/course/examination/questionBank/add.vue b/src/views/modules/course/examination/questionBank/add.vue
index a61a2fe..f8696f8 100644
--- a/src/views/modules/course/examination/questionBank/add.vue
+++ b/src/views/modules/course/examination/questionBank/add.vue
@@ -17,7 +17,7 @@
     >
       <el-form-item label="题目名称" prop="content">
         <el-input
-        clearable
+          clearable
           v-model="dataForm.content"
           placeholder="题目名称"
           type="textarea"
@@ -31,21 +31,27 @@
           <el-radio :label="1">多选题</el-radio>
         </el-radio-group>
       </el-form-item>
-     
+
       <el-form-item label="章节名称" prop="chapter">
-        <el-input clearable v-model="dataForm.chapter" placeholder="章节名称"></el-input>
+        <el-input
+          clearable
+          v-model="dataForm.chapter"
+          placeholder="章节名称"
+        ></el-input>
       </el-form-item>
 
       <el-form-item label="音视频" prop="media">
         <div
           style="display: flex;align-items: center;justify-content: space-between;"
         >
-          <el-input clearable
+          <el-input
+            clearable
             v-model="dataForm.media"
             placeholder="音视频"
             style="width: calc(100% - 200px);"
           ></el-input>
-          <el-input clearable
+          <el-input
+            clearable
             style="width: 180px;"
             v-model="dataForm.mediaTime"
             placeholder="音视频时间"
@@ -53,7 +59,11 @@
         </div>
       </el-form-item>
       <el-form-item label="出题人" prop="createUser">
-        <el-input v-model="dataForm.createUser" clearable placeholder="出题人"></el-input>
+        <el-input
+          v-model="dataForm.createUser"
+          clearable
+          placeholder="出题人"
+        ></el-input>
       </el-form-item>
       <el-form-item
         label="答案选项"
@@ -400,31 +410,31 @@ export default {
       var selectIds = [];
       if (this.dataForm.type == 0) {
         var data = this.$refs.xTable.getRadioRecord();
-        if (data && data.id) {
-          selectIds.push(data.id);
-          console.log('selectIds.push at line 404:', selectIds.push)
+        console.log("data at line 402:", data);
+        if (data && (data.id || data._X_ROW_KEY)) {
+          selectIds.push(data.id || data._X_ROW_KEY);
+          console.log("selectIds.push at line 404:", selectIds);
         }
       } else {
         var data = this.$refs.xTable.getCheckboxRecords();
         selectIds = data.map(e => {
-          return e.id;
+          return e.id || e._X_ROW_KEY;
         });
         console.log("selectIds at line 369:", selectIds);
       }
 
-      console.log("list at line 363:", list);
       var list = [...this.tableData];
       list.map(e => {
         e.rightWrong = 0;
       });
       if (selectIds.length > 0) {
         list.map(e => {
-          if (selectIds.includes(e.id)) {
+          if (selectIds.includes(e.id || e._X_ROW_KEY)) {
             e.rightWrong = 1;
           }
         });
       }
-
+      console.log("list at line 428:", list);
       return list;
     },
 
@@ -491,6 +501,7 @@ export default {
       // console.log('editor ready!', quill)
     },
     init(row) {
+      this.tableData = [];
       console.log("11111", row);
       if (row && row.id) {
         this.courseId = row.id;
@@ -530,21 +541,22 @@ export default {
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           var list = this.getRadioEvent1();
-          if(list.length==0){
+          if (list.length == 0) {
             this.$message.error("请新增答案选项");
-            return false
+            return false;
           }
           var conditionMet = list.some(e => e.rightWrong == 1);
-          var conditionContent = list.some(e => e.content == '' ||!e.content);
+          var conditionContent = list.some(e => e.content == "" || !e.content);
           console.log("list at line 476:", conditionMet);
-       if (conditionContent) {
+          if (conditionContent) {
             this.$message.error("请输入选项");
             return false;
-          }    if (!conditionMet) {
+          }
+          if (!conditionMet) {
             this.$message.error("请选择正确答案");
             return false;
           }
-         
+
           this.$http({
             url: this.$http.adornUrl(
               `${
@@ -678,5 +690,4 @@ export default {
 /deep/ .vxe-table--render-default .vxe-cell--radio .vxe-radio--icon {
   color: #17b3a3 !important;
 }
-
 </style>