weiwenhai пре 6 година
родитељ
комит
8657668d9f

+ 8 - 0
src/modules/questions/styles/Common.css

@@ -85,3 +85,11 @@
   margin-left: 15px;
   padding-top: 7px;
 }
+
+.margin_left_30 {
+  margin-left: 30%;
+}
+
+.margin_left_40 {
+  margin-left: 40%;
+}

+ 3 - 1
src/modules/questions/styles/EditPaper.css

@@ -83,8 +83,10 @@ small {
   font-size: 14px;
 }
 .paper {
-  width: 80%;
   margin: 0 auto;
+  background-color: white;
+  padding-left: 10%;
+  padding-right: 10%;
 }
 .btnDiv {
   height: 30px;

+ 40 - 25
src/modules/questions/views/EditPaper.vue

@@ -39,22 +39,20 @@
             <i class="el-icon-delete"></i> 删除
           </el-button>
           <el-button
-            type="info"
+            type="primary"
             :loading="duplicateLoading"
             @click="getreduplicateQuestions"
             size="small"
-          >
-            查重
+            ><i class="el-icon-zoom-in"></i> 查重
           </el-button>
           <el-button
             v-show="parentView == 'import_paper'"
-            type="warning"
+            type="primary"
             @click="openDialog"
             size="small"
-          >
-            上传音频文件
+            ><i class="el-icon-upload2"></i> 上传音频文件
           </el-button>
-          <el-button @click="back" size="small" type="primary"
+          <el-button @click="back" size="small"
             ><i class="el-icon-arrow-left"></i> 返回</el-button
           >
         </div>
@@ -292,6 +290,7 @@
     <div class="text-left">
       <!-- 编辑大题弹框 -->
       <el-dialog
+        width="360px"
         @close="closeQuesDialog"
         title="大题名称编辑"
         v-loading.body="detailLoading"
@@ -306,7 +305,10 @@
           <el-row :gutter="10">
             <el-col :xs="10" :sm="10" :md="10" :lg="10">
               <el-form-item label="大题名称" placeholder="大题名称">
-                <el-input v-model="editpaperDetail.name" />
+                <el-input
+                  class="dialog_input_width"
+                  v-model="editpaperDetail.name"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -583,23 +585,33 @@
               </el-row>
             </div>
           </div>
-          <div>
-            <el-form-item>
-              <el-button
-                @click="addQuesOption"
-                v-if="
-                  paper.paperType == 'IMPORT' &&
-                    (quesModel.questionType == 'SINGLE_ANSWER_QUESTION' ||
-                      quesModel.questionType == 'MULTIPLE_ANSWER_QUESTION')
-                "
-              >
-                新增选项
-              </el-button>
-              <el-button type="primary" @click="savePaperDetailUnit()"
-                >保存</el-button
-              >
-              <el-button @click="closeQuesDialog">取消</el-button>
-            </el-form-item>
+          <div
+            :class="{
+              margin_left_30:
+                paper.paperType == 'IMPORT' &&
+                (quesModel.questionType == 'SINGLE_ANSWER_QUESTION' ||
+                  quesModel.questionType == 'MULTIPLE_ANSWER_QUESTION'),
+              margin_left_40: !(
+                paper.paperType == 'IMPORT' &&
+                (quesModel.questionType == 'SINGLE_ANSWER_QUESTION' ||
+                  quesModel.questionType == 'MULTIPLE_ANSWER_QUESTION')
+              )
+            }"
+          >
+            <el-button
+              type="primary"
+              @click="addQuesOption"
+              v-if="
+                paper.paperType == 'IMPORT' &&
+                  (quesModel.questionType == 'SINGLE_ANSWER_QUESTION' ||
+                    quesModel.questionType == 'MULTIPLE_ANSWER_QUESTION')
+              "
+              ><i class="el-icon-plus"></i> 新增选项
+            </el-button>
+            <el-button type="primary" @click="savePaperDetailUnit()"
+              >保存</el-button
+            >
+            <el-button @click="closeQuesDialog">取消</el-button>
           </div>
         </el-form>
       </el-dialog>
@@ -1623,5 +1635,8 @@ export default {
 .ck-toolbar {
   z-index: 9999;
 }
+#app {
+  background-color: white !important;
+}
 </style>
 <style scoped src="../styles/Common.css"></style>

+ 0 - 6
src/modules/questions/views/ExtractPaperInfo.vue

@@ -552,12 +552,6 @@ export default {
               });
             }
           );
-      } else {
-        this.$notify({
-          message: "试卷类型没有制定试卷",
-          type: "error",
-          duration: 2000
-        });
       }
     },
     //音频播放次数校验

+ 6 - 4
src/modules/questions/views/ImportPaperInfo.vue

@@ -89,18 +89,20 @@
               :auto-upload="false"
               :multiple="false"
             >
-              <el-button slot="trigger" type="primary">选择文件</el-button>
+              <el-button slot="trigger" type="primary"
+                ><i class="el-icon-search"></i> 选择文件</el-button
+              >
               <el-button
                 style="margin-left:10px;"
                 type="primary"
                 @click="submitUpload"
-                >确认上传
+                ><i class="el-icon-check"></i> 确认上传
               </el-button>
               <el-button
                 style="margin-left: 10px;"
-                type="danger"
+                type="primary"
                 @click="removeFile"
-                >清空文件
+                ><i class="el-icon-refresh"></i> 清空文件
               </el-button>
               <div slot="tip" class="el-upload__tip">只能上传docx文件</div>
             </el-upload>

+ 1 - 1
src/modules/questions/views/InsertPaperStructureInfo.vue

@@ -460,7 +460,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <div>
+              <div style="margin-left:45%">
                 <el-button
                   type="primary"
                   @click="editSubmitForm('paperUnitForm2')"

+ 118 - 125
src/modules/questions/views/InsertPaperTitle.vue

@@ -1,138 +1,131 @@
 <template>
   <section class="content">
-    <div class="box box-info box_width_lg">
-      <!-- 正文信息 -->
-      <div class="box-body">
-        <el-form
-          :inline="true"
-          :model="paperTitleForm"
-          label-width="150px"
-          class="demo-ruleForm"
-        >
-          <el-row>
-            <el-form-item label="课程名称(代码)" class="pull-left">
-              <el-select
-                class="dialog_input_width"
-                @change="searchGenPaper"
-                v-model="paperTitleForm.courseNo"
-                filterable
-                remote
-                placeholder="请输入课程名称(代码)"
-                :remote-method="queryCoursesByKeyword"
+    <!-- 正文信息 -->
+    <div class="box-body">
+      <el-form :inline="true" :model="paperTitleForm" label-width="150px">
+        <el-row>
+          <el-form-item label="课程名称(代码)" class="pull-left">
+            <el-select
+              class="dialog_input_width"
+              @change="searchGenPaper"
+              v-model="paperTitleForm.courseNo"
+              filterable
+              remote
+              placeholder="请输入课程名称(代码)"
+              :remote-method="queryCoursesByKeyword"
+            >
+              <el-option
+                v-for="item in courseInfoSelect"
+                :key="item.courseNo"
+                :label="item.courseInfo"
+                :value="item.courseNo"
               >
-                <el-option
-                  v-for="item in courseInfoSelect"
-                  :key="item.courseNo"
-                  :label="item.courseInfo"
-                  :value="item.courseNo"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
-          <el-row v-if="paperTitelDisable">
-            <el-form-item label="试卷名称" class="pull-left">
-              <el-select
-                class="dialog_input_width"
-                v-model="paperTitleForm.paperId"
-                filterable
-                placeholder="请选择"
-                @change="searchPaperDetail"
-                sytle="width:220px;"
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <el-row v-if="paperTitelDisable">
+          <el-form-item label="试卷名称" class="pull-left">
+            <el-select
+              class="dialog_input_width"
+              v-model="paperTitleForm.paperId"
+              filterable
+              placeholder="请选择"
+              @change="searchPaperDetail"
+              sytle="width:220px;"
+            >
+              <el-option
+                v-for="item in paperInfoSelect"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
               >
-                <el-option
-                  v-for="item in paperInfoSelect"
-                  :label="item.name"
-                  :value="item.id"
-                  :key="item.id"
-                >
-                </el-option>
-              </el-select>
-              <span style="padding-left:5px;">
-                <el-button type="primary" @click="insertPaper"
-                  ><i class="el-icon-plus"></i> 新增试卷</el-button
-                >
-              </span>
-            </el-form-item>
-          </el-row>
-          <el-row v-if="paperDetailDisable">
-            <el-form-item label="试卷大题" class="pull-left">
-              <el-select
-                class="dialog_input_width"
-                v-model="paperTitleForm.paperDetailId"
-                filterable
-                placeholder="请选择"
+              </el-option>
+            </el-select>
+            <span style="padding-left:5px;">
+              <el-button type="primary" @click="insertPaper"
+                ><i class="el-icon-plus"></i> 新增试卷</el-button
               >
-                <el-option
-                  v-for="item in paperDetailInfoSelect"
-                  :label="item.name"
-                  :value="item.id"
-                  :key="item.id"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
+            </span>
+          </el-form-item>
+        </el-row>
+        <el-row v-if="paperDetailDisable">
+          <el-form-item label="试卷大题" class="pull-left">
+            <el-select
+              class="dialog_input_width"
+              v-model="paperTitleForm.paperDetailId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in paperDetailInfoSelect"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="题型" class="pull-left">
+            <el-select
+              class="dialog_input_width"
+              v-model="paperTitleForm.value"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in quesTypes"
+                :label="item.label"
+                :value="item.value"
+                :key="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label=" " class="pull-left">
+            <el-button
+              type="primary"
+              :disabled="nextDisabled"
+              @click="submitForm"
+              >下一步
+            </el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
+
+      <!-- 添加试卷弹出框 -->
+      <el-dialog title="新增试卷" :visible.sync="paperDialog" width="500px">
+        <el-form
+          :model="paperForm"
+          ref="paperForm"
+          :rules="rules"
+          label-position="right"
+          label-width="120px"
+          inline-message
+        >
           <el-row>
-            <el-form-item label="题型" class="pull-left">
-              <el-select
+            <el-form-item label="试卷名称" label-width="120px" prop="name">
+              <el-input
                 class="dialog_input_width"
-                v-model="paperTitleForm.value"
-                filterable
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in quesTypes"
-                  :label="item.label"
-                  :value="item.value"
-                  :key="item.id"
-                >
-                </el-option>
-              </el-select>
+                v-model="paperForm.name"
+                placeholder="请输入试卷名称"
+              ></el-input>
             </el-form-item>
           </el-row>
-          <el-row>
-            <el-form-item label=" " class="pull-left">
-              <el-button
-                type="primary"
-                :disabled="nextDisabled"
-                @click="submitForm"
-                >下一步
-              </el-button>
-            </el-form-item>
+          <el-row class="margin_top_10 margin_left_120">
+            <el-button type="primary" @click="submitPaperForm('paperForm')"
+              >保 存</el-button
+            >
+            <el-button @click="resetPaperForm('paperForm')"
+              ><i class="el-icon-refresh"></i> 重 置</el-button
+            >
           </el-row>
         </el-form>
-
-        <!-- 添加试卷弹出框 -->
-        <el-dialog title="新增试卷" :visible.sync="paperDialog" width="500px">
-          <el-form
-            :model="paperForm"
-            ref="paperForm"
-            :rules="rules"
-            label-position="right"
-            label-width="120px"
-            inline-message
-          >
-            <el-row>
-              <el-form-item label="试卷名称" label-width="120px" prop="name">
-                <el-input
-                  class="dialog_input_width"
-                  v-model="paperForm.name"
-                  placeholder="请输入试卷名称"
-                ></el-input>
-              </el-form-item>
-            </el-row>
-            <el-row class="margin_top_10 margin_left_120">
-              <el-button type="primary" @click="submitPaperForm('paperForm')"
-                >保 存</el-button
-              >
-              <el-button @click="resetPaperForm('paperForm')"
-                ><i class="el-icon-refresh"></i> 重 置</el-button
-              >
-            </el-row>
-          </el-form>
-        </el-dialog>
-      </div>
+      </el-dialog>
     </div>
   </section>
 </template>
@@ -257,7 +250,7 @@ export default {
               this.paperDialog = false;
             })
             .catch(error => {
-              this.$notify({ type: "error", message: error.body.msg });
+              this.$notify({ type: "error", message: error.response.data.msg });
               this.paperDialog = false;
             });
         } else {