Explorar el Código

Merge branch '03/03Lebao' into test

lex-xin hace 4 años
padre
commit
a97c6d51d4
Se han modificado 1 ficheros con 5 adiciones y 3 borrados
  1. 5 3
      src/views/reaplceMusicPlayer/answerList.vue

+ 5 - 3
src/views/reaplceMusicPlayer/answerList.vue

@@ -26,7 +26,7 @@
       </save-form>
       <el-card class="box-card" v-for="item in tableList" :key="item.id">
           <el-row>
-            <el-col :xs="24" :sm="24" :md="6" :lg="4" :xl="4">
+            <el-col :xs="24" :sm="24" :md="6" :lg="5" :xl="5">
               <el-form label-position="left" inline label-width="90px" class="demo-table-expand">
                 <el-form-item label="学生编号">
                   <span><copy-text>{{ item.userId}}</copy-text></span>
@@ -44,12 +44,14 @@
                 <el-col :span="24" style="padding-bottom: 8px">学生手机号:<copy-text>{{ item.phone}}</copy-text></el-col>
               </el-row> -->
             </el-col>
-            <el-col :xs="24" :sm="24" :md="18" :lg="20" :xl="20">
+            <el-col :xs="24" :sm="24" :md="18" :lg="19" :xl="19">
               <el-collapse>
                 <el-collapse-item title="查看答案" name="1">
                   <div v-for="(o, index) in item.questionnaireResultDtoList" :key="index" class="text item">
                     <el-alert :title="o.content" type="info" :closable="false"></el-alert>
-                    <div style="padding: 8px 20px; font-size: 14px;">{{ o.answerValue ? o.answerValue : o.additionalValue }}</div>
+                    <div style="padding: 8px 20px; font-size: 14px;" v-if="o.answerValue || o.additionalValue">{{ o.answerValue ? o.answerValue : o.additionalValue }}</div>
+                    <!-- <div style="padding: 8px 20px; font-size: 14px;" v-else>未答题</div> -->
+                    <el-tag style="margin: 8px 20px; font-size: 14px;" type="danger" v-else>未答题</el-tag>
                   </div>
                 </el-collapse-item>
               </el-collapse>