Merge branch 'exam' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into exam

src/views/exam/TestPaper.vue

@@ -224,12 +224,19 @@
     </el-dialog>
 	     <el-dialog title="查看试卷" append-to-body :visible.sync="viewVolumeShow" width="40%" custom-class="g-dialog">
             <div style="padding: 10px; font-size: 20px" v-for="(item, index) in viewShowData" :key="item.id">
-              <div class="test-info">{{index+1}}.【{{typeFilter(item.type)}}】{{item.title}}</div>
+              <div class="test-info">{{index+1}}.【{{typeFilter(item.type)}}】{{item.title}}
+                 <div v-if="item.images" class="tiganimg"><img :src="imageBaseUrl + item.images" alt=""> </div> 
+             </div>
+              
                 <div style="padding: 10px" v-if="item.type == 3">
                 <div class="test-info"><span>正确答案：{{item.answer=='true'? '正确': '错误'}}</span></div>
               </div>
               <div style="padding: 10px" v-else>
-                <div class="test-info" v-for="(cc,inx) in item.optionList" :key="inx"><span :class="(cc.isAnswer || cc.score > 0)?'right-key': ''">{{numberToLetter(inx+1)}}：{{cc.content}}</span></div>
+                <div class="test-info" v-for="(cc,inx) in item.optionList" :key="inx">
+                  <span :class="(cc.isAnswer || cc.score > 0)?'right-key': ''">{{numberToLetter(inx+1)}}：{{cc.content}}</span>
+                   <!-- <img :src="imageBaseUrl + cc.images" alt=""> -->
+                   <div v-if="cc.images" class="xuanxiangimg"><img :src="imageBaseUrl + cc.images" alt=""> </div> 
+                </div>
               </div>
               <!-- <div style="padding: 10px">
                 <div class="test-info">解析</div>
@@ -289,6 +296,8 @@ export default {
   name: 'articleItems',
   data() {
     return {
+      imageBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/xboe/sys/xuploader/file/upload", // 上传的图片服务器地址
       keyData:0,
       resOwnerListMap:[],
       numberToLetter:numberToLetter,
@@ -651,6 +660,7 @@ export default {
      apiPaper.detail(row.id).then(res=>{
          if(res.status === 200) {
             this.viewShowData = JSON.parse(res.result.paperContent);
+            console.log(this.viewShowData,'lll')
         } else {
             this.$message.error(res.message);
         }
@@ -761,6 +771,24 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.xuanxiangimg{
+   width: 150px;
+  // float: left;
+  height: 150px;
+  img{
+    width: 100%;
+    height: 100%;
+  }
+}
+.tiganimg{
+  width: 200px;
+  // float: left;
+  height: 180px;
+  img{
+    width: 100%;
+    height: 100%;
+  }
+}
 .el-input{
   .el-input__inner{
     padding: 0px 5px;