Merge branch 'dev' into enterprise-wmp-dev

src/modules/viewer/components/common/upload.vue

@@ -10,23 +10,18 @@
       </template>
     </el-upload>
     <div class="file-list" v-if="fileList.length">
-      <div class="file-list-item" v-for="(fileUrl, index) in fileList" :key="index">
-        <a :href="fileUrl" target="_blank">
+      <div class="file-list-item" v-for="(item, index) in fileList" :key="index">
+        <a :href="item.url" :download="item.name" target="_blank">
           <i class="el-icon-document"></i>
-          {{ fileUrl | fileName }}
+          {{ item.name }}
         </a>
         <div>
-          <a
-            href="javascript:;"
-            @click="handleRemove(index)"
-            style="margin-right:10px;"
-            v-if="!disabled"
-          >
+          <a href="javascript:;" @click="handleRemove(index)" style="margin-right: 10px" v-if="!disabled">
             <el-tooltip effect="dark" content="删除">
               <i class="el-icon-delete"></i>
             </el-tooltip>
           </a>
-          <a :href="fileUrl" :download="fileUrl | fileName" target="_blank">
+          <a :href="item.url" :download="item.name" target="_blank">
             <el-tooltip effect="dark" content="下载">
               <i class="el-icon-download"></i>
             </el-tooltip>
@@ -55,36 +50,39 @@ export default {
     value: {
       immediate: true,
       handler(value) {
-        if (value) {
-          if (Array.isArray(value)) {
-            this.fileList = value.map(item => {
-              return item.url || item
-            })
-          } else {
-            this.fileList = [value]
-          }
+        if (!value) {
+          return
+        }
+        let fileList = []
+        if (Array.isArray(value)) {
+          fileList = value.map(item => {
+            return { name: item.name || item, url: item.url || item }
+          })
+        } else {
+          fileList.push({ name: '附件下载', url: value })
         }
+        this.fileList = fileList
       }
     }
   },
-  filters: {
-    fileName(value) {
-      return value ? value.split('/').pop() : ''
-    }
-  },
   methods: {
     httpRequest(xhr) {
-      api.uploadFile({ file: xhr.file }).then(response => {
-        if (response.success) {
-          if (Array.isArray(this.value)) {
-            this.fileList.push(response.url)
-            this.$emit('input', this.fileList)
-          } else {
-            this.fileList = [response.url]
-            this.$emit('input', response.url)
+      api
+        .uploadFile({ file: xhr.file })
+        .then(response => {
+          if (response.success) {
+            if (Array.isArray(this.value)) {
+              this.fileList.push({ name: xhr.file.name, url: response.url })
+              this.$emit('input', this.fileList)
+            } else {
+              this.fileList = [response.url]
+              this.$emit('input', response.url)
+            }
           }
-        }
-      })
+        })
+        .catch(error => {
+          this.$message.error(error.message)
+        })
     },
     handleRemove(index) {
       this.fileList.splice(index, 1)

src/modules/viewer/components/work/courseExam.vue

@@ -288,7 +288,7 @@ export default {
         const params = { answers: JSON.stringify(answers), type: 0 }
         // 请求接口
         this.handleSubmitRequest(params)
-      }, 10000)
+      }, 3000)
     },
     // 处理请求接口答案数据
     handleSubmitData() {

src/modules/viewer/components/work/examItem.vue

@@ -12,13 +12,17 @@
       <!-- 单选 -->
       <el-radio-group v-model="currentValue.user_answer" v-if="type === 1">
         <div class="q-option-item" v-for="item in currentOptions" :key="item.id">
-          <el-radio :class="genClass(item)" :label="item.id"><span v-html="item.abc_option"></span></el-radio>
+          <el-radio :class="genClass(item)" :label="item.id">
+            <div class="q-option-item__answer" v-html="item.abc_option"></div>
+          </el-radio>
         </div>
       </el-radio-group>
       <!-- 多选 -->
       <el-checkbox-group v-model="currentValue.user_answer" v-if="type === 2">
         <div class="q-option-item" v-for="item in currentOptions" :key="item.id">
-          <el-checkbox :class="genClass(item)" :label="item.id"><span v-html="item.abc_option"></span></el-checkbox>
+          <el-checkbox :class="genClass(item)" :label="item.id">
+            <div class="q-option-item__answer" v-html="item.abc_option"></div>
+          </el-checkbox>
         </div>
       </el-checkbox-group>
       <!-- 简答题 -->
@@ -224,6 +228,12 @@ export default {
   padding-left: 20px;
   margin-bottom: 14px;
 }
+.q-option-item__answer {
+  display: inline;
+  ::v-deep * {
+    display: inline;
+  }
+}
 .is-success {
   color: #090;
 }