bug fix

src/assets/styles/element-ui-costom.scss

@@ -219,24 +219,24 @@
 .el-input-number {
   .el-input-number__increase,
   .el-input-number__decrease {
-    height: 28px;
-    width: 28px;
-    line-height: 28px;
-    top: 4px;
-    border-radius: 6px;
-    border: none;
-    background-color: $--color-border-dark;
-    font-weight: 600;
-    font-size: 14px;
-    > i {
-      font-weight: 600;
-    }
+    // height: 28px;
+    // width: 28px;
+    // line-height: 28px;
+    // top: 4px;
+    // border-radius: 6px;
+    // border: none;
+    // background-color: $--color-border-dark;
+    // font-weight: 600;
+    // font-size: 14px;
+    // > i {
+    //   font-weight: 600;
+    // }
   }
   .el-input-number__increase {
-    right: 4px;
+    // right: 4px;
   }
   .el-input-number__decrease {
-    left: 4px;
+    // left: 4px;
   }
 
   &.align-left {

src/assets/styles/pages.scss

@@ -409,7 +409,7 @@
     > .edit-part {
       position: relative;
       &:first-child {
-        box-shadow: 0px 20px 20px 0px rgba(212, 220, 243, 0.2) inset;
+        // box-shadow: 0px 20px 20px 0px rgba(212, 220, 243, 0.2) inset;
         border-top: 1px solid #e0e6f7;
       }
       &:not(:first-child) {

src/modules/paper/views/BuildPaper.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="build-paper">
-    <div class="part-box">
-      <div class="part-box-header">
+    <div class="part-box" style="margin-bottom: 0; padding-bottom: 0">
+      <div class="part-box-header" style="border-bottom: none">
         <div class="part-box-header-left">
           <el-button
             class="is-back"
@@ -14,6 +14,12 @@
           <span>课程名称：{{ modalForm.courseName }}</span>
         </div>
         <div>
+          <el-checkbox
+            v-if="IS_AUTO_MODE"
+            v-model="isSaveStructInfo"
+            style="margin-right: 10px"
+            >同时保存为试卷结构模板</el-checkbox
+          >
           <el-button type="primary" size="small" @click="confirm"
             >确定</el-button
           >
@@ -27,121 +33,153 @@
           > -->
         </div>
       </div>
-      <el-form
-        ref="modalFormComp"
-        class="part-filter-form"
-        :model="modalForm"
-        :rules="rules"
-        inline
-      >
-        <el-form-item prop="paperName" label="试卷名称">
-          <el-input
-            v-model="modalForm.paperName"
-            placeholder="试卷名称"
-          ></el-input>
-        </el-form-item>
-        <el-form-item v-if="!IS_MANUAL_MODE" prop="paperCount" label="组卷套数">
-          <el-input-number
-            v-model="modalForm.paperCount"
-            :min="1"
-            :max="20"
-            :step="1"
-            step-strictly
-          ></el-input-number>
-        </el-form-item>
-        <el-form-item v-if="!IS_MANUAL_MODE" style="border: none">
-          <el-checkbox v-model="modalForm.checkRepeat"
-            >校验试卷重复率</el-checkbox
-          >
-        </el-form-item>
-        <el-form-item v-else></el-form-item>
-      </el-form>
-      <el-form>
-        <template v-if="modalForm.checkRepeat && !IS_MANUAL_MODE">
-          <el-form-item
-            label="校验重复率的试卷范围："
-            label-width="180px"
-            style="margin-bottom: 10px"
-          >
-            <el-radio-group v-model="modalForm.storage" size="small">
-              <el-radio-button :label="false">卷库列表试卷</el-radio-button>
-              <el-radio-button :label="true">试卷仓库试卷</el-radio-button>
+    </div>
+    <div class="page-body" style="padding: 15px">
+      <div class="part-box">
+        <el-form
+          ref="modalFormComp"
+          :model="modalForm"
+          :rules="rules"
+          label-width="120px"
+        >
+          <el-form-item label="组卷模式">
+            <el-radio-group v-model="genModelType" style="padding-left: 15px">
+              <el-radio
+                v-for="item in modelTypes"
+                :key="item.code"
+                :label="item.code"
+                >{{ item.name }}</el-radio
+              >
             </el-radio-group>
           </el-form-item>
-          <el-form-item
-            label="试卷间重复率不高于："
-            label-width="180px"
-            style="margin-bottom: 10px"
-          >
-            <el-input-number
-              v-model="modalForm.maxLimit"
-              style="width: 125px"
-              :min="0"
-              :max="100"
-              :step="1"
-              step-strictly
-              :controls="false"
-            ></el-input-number>
-            %
-            <el-checkbox v-model="modalForm.topicOnly"
-              >本次组的试卷间不允许重复</el-checkbox
-            >
-            <p class="tips-info">注：试卷间的重复率会小于等于设定值</p>
+          <el-form-item prop="paperName" label="试卷名称">
+            <el-input
+              style="width: 200px"
+              v-model="modalForm.paperName"
+              placeholder="试卷名称"
+            ></el-input>
           </el-form-item>
           <el-form-item
-            label="试卷重复率校验时间周期："
-            label-width="180px"
-            style="margin-bottom: 10px"
+            v-if="!IS_MANUAL_MODE"
+            prop="paperCount"
+            label="组卷套数"
           >
             <el-input-number
-              v-model="modalForm.timeLimit"
-              style="width: 125px"
+              v-model="modalForm.paperCount"
               :min="1"
-              :max="100"
+              :max="20"
               :step="1"
               step-strictly
-              :controls="false"
+              controls-position="right"
             ></el-input-number>
-            个月
-            <p class="tips-info">注：月份按照自然月计数，当前月份记为第1个月</p>
           </el-form-item>
-        </template>
-        <el-form-item label="组卷模式" style="margin: 0">
-          <el-radio-group v-model="genModelType" style="padding-left: 15px">
-            <el-radio
-              v-for="item in modelTypes"
-              :key="item.code"
-              :label="item.code"
-              >{{ item.name }}</el-radio
+          <el-form-item v-if="IS_AUTO_MODE" label="选择试卷结构">
+            <!-- <el-button type="success" size="small" @click="toSelectStruct"
+              >选择试卷结构</el-button
+            > -->
+            <div
+              @click="toSelectStruct"
+              style="color: #6d5ff6; cursor: pointer"
             >
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <div v-if="IS_AUTO_MODE" style="text-align: right">
-        <el-checkbox v-model="isSaveStructInfo" style="margin-right: 10px"
-          >同时保存为试卷结构模板</el-checkbox
-        >
-        <el-button type="success" size="small" @click="toSelectStruct"
-          >选择试卷结构</el-button
-        >
+              <i
+                class="el-icon-circle-plus"
+                style="font-size: 18px; vertical-align: middle"
+              ></i>
+              <span style="margin-left: 2px; vertical-align: middle">选择</span>
+            </div>
+          </el-form-item>
+          <!-- <el-form-item v-if="!IS_MANUAL_MODE" style="border: none">
+            <el-checkbox v-model="modalForm.checkRepeat"
+              >校验试卷重复率</el-checkbox
+            >
+          </el-form-item> -->
+          <el-form-item v-if="!IS_MANUAL_MODE" label="校验试卷重复率">
+            <el-radio-group v-model="modalForm.checkRepeat">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-else></el-form-item>
+        </el-form>
+        <el-form>
+          <template v-if="modalForm.checkRepeat && !IS_MANUAL_MODE">
+            <el-form-item
+              label="校验重复率的试卷范围："
+              label-width="180px"
+              style="margin-bottom: 10px"
+            >
+              <el-radio-group v-model="modalForm.storage" size="small">
+                <el-radio-button :label="false">卷库列表试卷</el-radio-button>
+                <el-radio-button :label="true">试卷仓库试卷</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item
+              label="试卷间重复率不高于："
+              label-width="180px"
+              style="margin-bottom: 10px"
+            >
+              <el-input-number
+                v-model="modalForm.maxLimit"
+                style="width: 125px"
+                :min="0"
+                :max="100"
+                :step="1"
+                step-strictly
+                :controls="false"
+              ></el-input-number>
+              %
+              <el-checkbox v-model="modalForm.topicOnly"
+                >本次组的试卷间不允许重复</el-checkbox
+              >
+              <p class="tips-info">注：试卷间的重复率会小于等于设定值</p>
+            </el-form-item>
+            <el-form-item
+              label="试卷重复率校验时间周期："
+              label-width="180px"
+              style="margin-bottom: 10px"
+            >
+              <el-input-number
+                v-model="modalForm.timeLimit"
+                style="width: 125px"
+                :min="1"
+                :max="100"
+                :step="1"
+                step-strictly
+                :controls="false"
+              ></el-input-number>
+              个月
+              <p class="tips-info">
+                注：月份按照自然月计数，当前月份记为第1个月
+              </p>
+            </el-form-item>
+          </template>
+        </el-form>
+        <!-- <div v-if="IS_AUTO_MODE" style="text-align: right">
+          <el-checkbox v-model="isSaveStructInfo" style="margin-right: 10px"
+            >同时保存为试卷结构模板</el-checkbox
+          >
+          <el-button type="success" size="small" @click="toSelectStruct"
+            >选择试卷结构</el-button
+          >
+        </div> -->
       </div>
-    </div>
 
-    <div class="part-box">
-      <component
-        :is="buildCompName"
-        ref="BuildPaperDetail"
+      <div class="part-box">
+        <component
+          :is="buildCompName"
+          ref="BuildPaperDetail"
+          :course-id="modalForm.courseId"
+        ></component>
+      </div>
+
+      <!-- AutoBuildPaperStructManage -->
+      <auto-build-paper-struct-manage
+        v-if="IS_AUTO_MODE"
+        ref="AutoBuildPaperStructManage"
         :course-id="modalForm.courseId"
-      ></component>
+        @selected="structSelected"
+      ></auto-build-paper-struct-manage>
     </div>
-
-    <!-- AutoBuildPaperStructManage -->
-    <auto-build-paper-struct-manage
-      v-if="IS_AUTO_MODE"
-      ref="AutoBuildPaperStructManage"
-      :course-id="modalForm.courseId"
-      @selected="structSelected"
-    ></auto-build-paper-struct-manage>
   </div>
 </template>
 

src/modules/questions/routes/routes.js

@@ -163,11 +163,11 @@ export const menuRoutes = [
         path: "import_paper_info", //导入试卷页面
         component: ImportPaperInfo,
       },
-      {
-        path: "gen_paper_detail", //组卷页面
-        name: "gen_paper_detail", //组卷页面
-        component: GenPaperDetail,
-      },
+      // {
+      //   path: "gen_paper_detail", //组卷页面
+      //   name: "gen_paper_detail", //组卷页面
+      //   component: GenPaperDetail,
+      // },
       {
         path: "export_template", //导出模板设定
         component: ExportTemplate,
@@ -249,4 +249,9 @@ export const otherRoutes = [
     name: "ViewPaper",
     component: ViewPaper,
   },
+  {
+    path: "/questions/gen_paper_detail", //组卷页面
+    name: "gen_paper_detail", //组卷页面
+    component: GenPaperDetail,
+  },
 ];

src/modules/questions/views/GenPaper.vue

@@ -851,10 +851,10 @@ export default {
     batchDeleteGenPaper() {
       var paperIds = this.paperIds;
       if (this.selectedPaperIds.length != 0) {
-        this.$confirm("确认删除试卷吗?", "提示", {
+        this.$confirm("确认删除试卷吗?", "系统通知", {
           type: "warning",
         }).then(() => {
-          this.loading = true;
+          // this.loading = true;
           this.$httpWithMsg
             .delete(QUESTION_API + "/paper/" + paperIds)
             .then(() => {