Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-admin-web

src/modules/basic/view/school.vue

@@ -264,6 +264,7 @@
             </el-popover>
           </template>
         </el-table-column>
+        <el-table-column prop="code" width="190" label="学校代码" />
         <el-table-column prop="domainName" width="190" label="学校域名" />
         <el-table-column
           sortable

src/modules/oe/views/examPaperDetail.vue

@@ -383,4 +383,3 @@ export default {
   padding: 5px;
 }
 </style>
-

src/modules/portal/views/Login.vue

@@ -36,7 +36,7 @@
         <button class="login-btn" @click="login">登 录</button>
       </div>
       <footer class="login-footer">
-        Copyright &copy; 2019 <a href="javascript:void(0)">讯飞启明</a>.
+        Copyright &copy; 2019 <a href="javascript:void(0)">武汉启明软件</a>.
       </footer>
     </main>
 

src/modules/print/view/CourseStatistic.vue

@@ -732,9 +732,9 @@ export default {
               let params = {};
               params.orgId = this.selectElements[0].orgId;
               params.examId = this.selectElements[0].examId;
-              params.couses = [];
+              params.courses = [];
               this.selectElements.forEach(element => {
-                params.couses.push({
+                params.courses.push({
                   courseId: element.courseId,
                   paperType: element.paperType
                 });

src/modules/questions/views/PreviewPaper.vue

@@ -35,8 +35,8 @@
       </small>
       <small class="paper-title">
         <el-button-group>
-          <el-button size="small" v-if="isBack"
-            ><span class="titlefont" @click="back">返回</span></el-button
+          <el-button size="small" v-if="isBack" @click="back" class="titlefont"
+            ><i class="el-icon-arrow-left"></i>返回</el-button
           >
         </el-button-group>
       </small>