Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/questiontype/v-readingcomprehensio.vue

@@ -16,6 +16,7 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+    margin-top:10px;
   }
 
   .v_readingComprehensioQuestion .clozeTest_question_tit i {
@@ -44,7 +45,7 @@
         <tbody>
           <tr>
             <td colspan="3">
-              <div v-html="item.SubTitle"></div>
+              <div style="margin:16px 0;" v-html="item.SubTitle"></div>
             </td>
           </tr>
           <!--选择题-->

src/pages/enterprise/addchannelcode.vue

@@ -209,8 +209,8 @@
                             <div v-for="(item,index) in x.lsMsg" :key="index+'a1'" class="weekstyle2_item"
                                 style="width: 100%;;display: flex;flex-direction: column;align-items: center;border-bottom: 1px solid #e8e8e8;">
                                 <div>{{item.StartHours}}~{{item.EndHours}}</div>
-                                <el-tooltip class="item" effect="dark" :content="item.EmpName" placement="top">
-                                    <div
+                                <el-tooltip class="item" effect="dark" :content="item.EmpName" placement="top" v-if="item.EmpName!=''">
+                                    <div v-if="item.EmpName!=''"
                                         style="width: 100%; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;cursor: pointer;text-align: center;">
                                         <span>{{item.EmpName}}</span>
                                     </div>

src/pages/exam/paperInfo.vue

@@ -11,7 +11,7 @@
   .Exam-main {
     height: auto !important;
     overflow: hidden;
-    margin: 20px 100px;
+    margin: 0 100px;
   }
 
   .Exam-left {
@@ -263,11 +263,13 @@
           <div class="pGNameDiv"><span class="pGroupName">{{NoToChinese(gIndex+1)}}、{{gItem.GroupName}}</span> （共
             {{gItem.DetailsList.length}} 题，{{gItem.GScore}}分）</div>
           <div v-for="(dItem,dIndex) in gItem.DetailsList" :key="dIndex">
-            <span>{{dIndex+1}}、</span>
-            <span class="paper_Title" v-html="dItem.Title"></span>
-            <span style="margin:10px 0;display:inline-block;">
-              ({{dItem.Score}}分)
-            </span>
+            <div style="display:flex;align-items:top;margin:20px 0;">
+              <span>{{dIndex+1}}、</span>
+              <span class="paper_Title" v-html="dItem.Title"></span>
+              <span style="display:inline-block;min-width:40px;">
+                ({{dItem.Score}}分)
+              </span>
+            </div>
             <!--单选题-->
             <v-single v-if="dItem.QuestionTypeKey=='single'||dItem.QuestionTypeKey=='single-number'"
               :questionObj="dItem" :isShowAnswer="isShowAnswer">