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

src/modules/oe/views/captureDetail.vue

@@ -10,10 +10,10 @@
         </el-col>
         <el-col :span="18">
           <el-row>
-            <el-col :span="16" class="capture-title">
+            <el-col :span="8" class="capture-title">
               <span>监考数据ID:{{ examRecordDataId }}</span>
             </el-col>
-            <el-col :span="8" style="text-align: right;">
+            <el-col :span="16" style="text-align: right;">
               <el-button
                 size="small"
                 v-if="showAudit"
@@ -35,7 +35,7 @@
               >
               <el-button
                 size="small"
-                icon="el-icon-back"
+                icon="el-icon-arrow-left"
                 type="primary"
                 @click="back"
               >
@@ -145,7 +145,13 @@
             >
               <div class="photo-pass" v-show="item.pass">通过</div>
               <div class="photo-nopass" v-show="!item.pass">不通过</div>
-              <img class="photo" :src="item.fileUrl" alt width="200" />
+              <img
+                class="photo"
+                :title="item.virtualCameraNames"
+                :src="item.fileUrl"
+                alt
+                width="200"
+              />
               <div class="photo-stranger" v-show="item.stranger">陌生人</div>
               <div
                 class="photo-facelivenessPass"

src/modules/questions/views/EditOtherQuestion.vue

@@ -355,7 +355,7 @@ export default {
       this.$http
         .get(QUESTION_API + "/courseProperty/code/" + code)
         .then(response => {
-          this.coursePropertyList = response.body;
+          this.coursePropertyList = response.data;
         });
     },
     //查询一级属性
@@ -379,7 +379,7 @@ export default {
       this.$http
         .get(QUESTION_API + "/property/second/" + this.firstPropertyId)
         .then(response => {
-          this.secondPropertyList = response.body;
+          this.secondPropertyList = response.data;
         });
     },
     //新增属性
@@ -500,7 +500,7 @@ export default {
       this.$http
         .get(QUESTION_API + "/courseProperty/enable/" + this.courseNo)
         .then(response => {
-          this.coursePropertyList = response.body;
+          this.coursePropertyList = response.data;
         });
     }
   },

src/modules/questions/views/EditPaper.vue

@@ -435,7 +435,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="属性名">
+              <el-form-item label="属性名" label-width="60px">
                 <el-select
                   v-model="coursePropertyName"
                   placeholder="属性名"
@@ -455,7 +455,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="一级">
+              <el-form-item label="一级" label-width="48px">
                 <el-select
                   v-model="firstPropertyId"
                   placeholder="一级"
@@ -475,7 +475,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="二级">
+              <el-form-item label="二级" label-width="48px">
                 <el-select
                   v-model="secondPropertyId"
                   placeholder="二级"
@@ -498,7 +498,7 @@
                 <el-button
                   type="primary"
                   @click="insertProperty"
-                  style="margin-left:-30px;"
+                  style="margin-left:-50px;"
                   :disabled="updatePorperty"
                   ><i class="el-icon-plus"></i>新增属性
                 </el-button>

src/modules/questions/views/ExportStructure.vue

@@ -279,7 +279,9 @@
           </el-form-item>
         </el-row>
         <el-row>
-          <div style=" color: #f56c6c; margin-bottom: -30px;">*</div>
+          <div style=" color: #f56c6c; margin-bottom: -30px;margin-top: 8px;">
+            *
+          </div>
           <el-form-item label="考试名称">
             <el-select
               v-model="exportStructure.examId"
@@ -302,7 +304,9 @@
           </el-form-item>
         </el-row>
         <el-row>
-          <div style=" color: #f56c6c; margin-bottom: -30px;">*</div>
+          <div style=" color: #f56c6c; margin-bottom: -30px;margin-top: 8px;">
+            *
+          </div>
           <el-form-item label="导出类型">
             <el-select
               v-model="exportStructure.exportType"
@@ -331,7 +335,7 @@
           >
             <el-row>
               <div
-                style=" color: #f56c6c; margin-bottom: -30px;margin-left: 26px;"
+                style=" color: #f56c6c; margin-bottom: -30px;margin-left: 26px;margin-top: 8px;"
               >
                 *
               </div>

src/modules/questions/views/GenPaper.vue

@@ -460,8 +460,8 @@ export default {
         if (course.code == courseNo) {
           return course;
         }
-        return "";
       }
+      return "";
     },
     exportGenPaper(row) {
       window.open(
@@ -681,7 +681,7 @@ export default {
               orgId = exam.rootOrgId;
             }
           }
-          if (orgId != "") {
+          if (orgId != "" || orgId == "0") {
             for (let printPid of this.rowIds) {
               this.$http.get(
                 QUESTION_API +

src/modules/questions/views/InsertBluePaperStructureInfo.vue

@@ -414,7 +414,7 @@ export default {
               this.$http
                 .get(QUESTION_API + "/property/" + blueStruct.coursePropertyId)
                 .then(response => {
-                  this.properties = response.body;
+                  this.properties = response.data;
                   this.init();
                 });
             } else {
@@ -478,7 +478,7 @@ export default {
         "&courseNo=" +
         this.blueStruct.courseNo;
       this.$http.get(url).then(response => {
-        this.quesNameList = response.body;
+        this.quesNameList = response.data;
       });
     },
     //查询来源大题名称
@@ -491,7 +491,7 @@ export default {
           "&courseNo=" +
           this.blueStruct.courseNo;
         this.$http.get(url).then(response => {
-          this.quesNameList = response.body;
+          this.quesNameList = response.data;
         });
       }
       this.paperDetailStruct.quesNames = [];

src/modules/questions/views/PreviewPaper.vue

@@ -285,9 +285,10 @@ small {
   font-size: 14px;
 }
 .paper {
-  width: 75%;
   margin: 0 auto;
   background-color: white;
+  padding-left: 10%;
+  padding-right: 10%;
 }
 .paper-input {
   font-size: 14px;

src/modules/questions/views/Question.vue

@@ -174,7 +174,7 @@
         style="width: 100%; border-bottom: 1px solid #ddd; margin: 10px 0;"
       ></div>
       <!-- 页面列表 -->
-      <el-table :data="tableData" border>
+      <el-table :data="tableData" border v-loading="loading">
         <el-table-column label="课程" width="180">
           <template slot-scope="scope">
             <span>{{ scope.row.course.name }}</span>
@@ -475,7 +475,7 @@ export default {
           .delete(QUESTION_API + "/paper/deleteQuestion/" + row.id)
           .then(
             response => {
-              if (response.body.length > 0) {
+              if (response.data.length > 0) {
                 this.loading = false;
                 this.deleteInfo =
                   "该试题被试卷：" +