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

src/modules/portal/views/tips/Tips.vue

@@ -1,6 +1,6 @@
 <template>
   <section class="content">
-    <div class=""><img src="./tips.jpg" /></div>
+    <div class=""><img src="./tips.png" /></div>
     <div class="text">
       <div v-for="(menu1, index) in instructions" :key="index" class="menu1">
         <h4 v-if="menu1.menu2.filter(m => m.canAccess).length > 0">

src/modules/questions/views/EditPaper.vue

@@ -20,11 +20,11 @@
           <span class="paper-top-title">试卷名称:</span>
           <el-tooltip class="item" effect="dark" placement="top-start">
             <div slot="content">{{ paper.name }}</div>
-          <input
-            class="paperName-input"
-            placeholder="试卷名称"
-            v-model="paper.name"
-          />
+            <input
+              class="paperName-input"
+              placeholder="试卷名称"
+              v-model="paper.name"
+            />
           </el-tooltip>
         </div>
         <div class="paper-top-div">
@@ -814,9 +814,8 @@ export default {
     savePaperDatail(editpaperDetail) {
       this.detailLoading = true;
       var paperId = this.paper.id;
-      var param = JSON.stringify(editpaperDetail);
       this.$http
-        .post(QUESTION_API + "/updatePaperDetail/" + paperId, param)
+        .post(QUESTION_API + "/updatePaperDetail/" + paperId, editpaperDetail)
         .then(() => {
           this.$notify({
             message: "保存成功",

src/modules/questions/views/ExtractPaperInfo.vue

@@ -579,6 +579,7 @@ export default {
     },
     //校验调卷规则数据
     verificationData() {
+      debugger;
       let myExamPaperList = [];
       let examPaperList = this.examPaperList;
       for (let i = 0; i < examPaperList.length; i++) {

src/modules/questions/views/GenPaperDetail.vue

@@ -1128,7 +1128,7 @@ export default {
     selectedIds() {
       var selectedIds = [];
       for (let paper of this.selectedPapers) {
-          selectedIds.push(paper.id);
+        selectedIds.push(paper.id);
       }
       return selectedIds;
     }

src/modules/questions/views/InsertPaperStructureInfo.vue

@@ -475,16 +475,24 @@
       <el-dialog title="题目数量" :visible.sync="propertyDialog">
         <el-row :gutter="20">
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">公开（简单）</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">公开（简单）</div>
+            </div>
           </el-col>
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">公开（中等）</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">公开（中等）</div>
+            </div>
           </el-col>
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">公开（困难）</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">公开（困难）</div>
+            </div>
           </el-col>
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">公开总数</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">公开总数</div>
+            </div>
           </el-col>
         </el-row>
         <!-- 第二列 -->
@@ -542,16 +550,24 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">非公开（简单）</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">非公开（简单）</div>
+            </div>
           </el-col>
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">非公开（中等）</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">非公开（中等）</div>
+            </div>
           </el-col>
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">非公开（困难）</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">非公开（困难）</div>
+            </div>
           </el-col>
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">非公开总数</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">非公开总数</div>
+            </div>
           </el-col>
         </el-row>
         <!-- 第四列 -->
@@ -609,16 +625,24 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">简单总数</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">简单总数</div>
+            </div>
           </el-col>
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">中等总数</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">中等总数</div>
+            </div>
           </el-col>
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">困难总数</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">困难总数</div>
+            </div>
           </el-col>
           <el-col :span="6">
-            <div class="grid-content bg-purple"><div class="form_font_size">总数</div></div>
+            <div class="grid-content bg-purple">
+              <div class="form_font_size">总数</div>
+            </div>
           </el-col>
         </el-row>
         <!-- 第六列 -->