zhangjie hai 1 ano
pai
achega
50a700e9c6

+ 2 - 2
src/assets/styles/pages.scss

@@ -313,7 +313,7 @@
 
 
     &:hover {
     &:hover {
       > .edit-cont-action {
       > .edit-cont-action {
-        display: block;
+        visibility: visible;
       }
       }
     }
     }
 
 
@@ -346,7 +346,7 @@
       z-index: 8;
       z-index: 8;
       padding: 0 30px;
       padding: 0 30px;
       text-align: right;
       text-align: right;
-      display: none;
+      visibility: hidden;
     }
     }
 
 
     &-body {
     &-body {

+ 6 - 0
src/modules/paper-export/components/PaperBuildConfig.vue

@@ -18,6 +18,11 @@
           >是否显示大题序号</el-checkbox
           >是否显示大题序号</el-checkbox
         >
         >
       </el-form-item>
       </el-form-item>
+      <el-form-item>
+        <el-checkbox v-model="modalForm.showDetailScoreInfo"
+          >是否显示大题分值说明</el-checkbox
+        >
+      </el-form-item>
       <el-form-item>
       <el-form-item>
         <el-checkbox v-model="modalForm.showDetailScoreTable"
         <el-checkbox v-model="modalForm.showDetailScoreTable"
           >是否显示大题给分板</el-checkbox
           >是否显示大题给分板</el-checkbox
@@ -61,6 +66,7 @@
 <script>
 <script>
 const initModalForm = {
 const initModalForm = {
   showDetailNo: true,
   showDetailNo: true,
+  showDetailScoreInfo: true,
   showDetailScoreTable: false,
   showDetailScoreTable: false,
   pageCountMode: "SIMPLE",
   pageCountMode: "SIMPLE",
 };
 };

+ 1 - 0
src/modules/paper-export/views/PaperTemplateBuild.vue

@@ -134,6 +134,7 @@ export default {
       paperStructs: [],
       paperStructs: [],
       configModalForm: {
       configModalForm: {
         showDetailNo: true,
         showDetailNo: true,
+        showDetailScoreInfo: true,
         showDetailScoreTable: false,
         showDetailScoreTable: false,
         pageCountMode: "SIMPLE",
         pageCountMode: "SIMPLE",
       },
       },

+ 3 - 5
src/modules/paper-export/views/paperTemplateBuildMixins.js

@@ -526,11 +526,9 @@ export default {
       let blocks = [
       let blocks = [
         {
         {
           type: "text",
           type: "text",
-          value: data.selective
-            ? `${data.name}(选做题,${data.unitCount}选${
-                data.selectiveCount
-              },${SELECTIVE_RULE_TYPE[data.selectiveRule]})`
-            : `${data.name}(共${data.unitCount}小题,满分${data.score}分)`,
+          value: this.configModalForm.showDetailScoreInfo
+            ? `${data.name}(共${data.unitCount}小题,满分${data.score}分)`
+            : `${data.name}`,
         },
         },
       ];
       ];
       if (this.configModalForm.showDetailNo) {
       if (this.configModalForm.showDetailNo) {

+ 73 - 64
src/modules/paper/views/EditPaper.vue

@@ -181,76 +181,67 @@
               <h3>
               <h3>
                 <span>{{ paperDetail.cnNum }}</span> <span>.</span>
                 <span>{{ paperDetail.cnNum }}</span> <span>.</span>
                 <span>{{ paperDetail.name }}</span>
                 <span>{{ paperDetail.name }}</span>
-                <span v-if="!paperDetail.selective">
-                  ({{
-                    !paperDetail.title ? "本大题" : paperDetail.title + ","
-                  }}共{{ paperDetail.unitCount }}小题,满分{{
-                    paperDetail.score
-                  }}分)
-                </span>
-                <span v-else>
-                  ({{
-                    !paperDetail.title ? "本大题" : paperDetail.title + ","
-                  }}选做题,{{ paperDetail.unitCount }}选{{
-                    paperDetail.selectiveCount
-                  }},{{ paperDetail.selectiveRule | selectiveRuleTypeFilter }})
-                </span>
               </h3>
               </h3>
             </div>
             </div>
             <rich-text
             <rich-text
               class="edit-cont-body"
               class="edit-cont-body"
               :text-json="paperDetail.description"
               :text-json="paperDetail.description"
             ></rich-text>
             ></rich-text>
-            <div class="edit-cont-action">
-              <el-button
-                size="small"
-                type="primary"
-                plain
-                @click="toSelectPaperDetailQues(paperDetail)"
-                >选题
-              </el-button>
-              <el-button
-                size="small"
-                type="primary"
-                plain
-                @click="toEditPaperDetail(paperDetail)"
-                >编辑
-              </el-button>
-              <el-button
-                v-if="detailIndex"
-                size="small"
-                type="primary"
-                plain
-                @click="toMovePaperDetail(paperDetail, 'up')"
-                >上移
-              </el-button>
-              <el-button
-                v-if="detailIndex < paper.paperDetails.length - 1"
-                size="small"
-                type="primary"
-                plain
-                @click="toMovePaperDetail(paperDetail, 'down')"
-                >下移
-              </el-button>
-              <el-button
-                size="small"
-                type="danger"
-                @click="toDeletePaperDetail(paperDetail)"
-                >删除
-              </el-button>
-              <el-button
-                size="small"
-                type="primary"
-                plain
-                :icon="
-                  paperDetail.showQuestions
-                    ? 'el-icon-arrow-up'
-                    : 'el-icon-arrow-down'
-                "
-                @click.stop="
-                  paperDetail.showQuestions = !paperDetail.showQuestions
-                "
-              ></el-button>
+            <div class="edit-cont-action box-justify">
+              <div>
+                共{{ paperDetail.unitCount }}小题,满分{{ paperDetail.score }}分
+              </div>
+              <div>
+                <el-button
+                  size="small"
+                  type="primary"
+                  plain
+                  @click="toSelectPaperDetailQues(paperDetail)"
+                  >选题
+                </el-button>
+                <el-button
+                  size="small"
+                  type="primary"
+                  plain
+                  @click="toEditPaperDetail(paperDetail)"
+                  >编辑
+                </el-button>
+                <el-button
+                  v-if="detailIndex"
+                  size="small"
+                  type="primary"
+                  plain
+                  @click="toMovePaperDetail(paperDetail, 'up')"
+                  >上移
+                </el-button>
+                <el-button
+                  v-if="detailIndex < paper.paperDetails.length - 1"
+                  size="small"
+                  type="primary"
+                  plain
+                  @click="toMovePaperDetail(paperDetail, 'down')"
+                  >下移
+                </el-button>
+                <el-button
+                  size="small"
+                  type="danger"
+                  @click="toDeletePaperDetail(paperDetail)"
+                  >删除
+                </el-button>
+                <el-button
+                  size="small"
+                  type="primary"
+                  plain
+                  :icon="
+                    paperDetail.showQuestions
+                      ? 'el-icon-arrow-up'
+                      : 'el-icon-arrow-down'
+                  "
+                  @click.stop="
+                    paperDetail.showQuestions = !paperDetail.showQuestions
+                  "
+                ></el-button>
+              </div>
             </div>
             </div>
           </div>
           </div>
           <div v-show="quesTagShow" class="edit-property">
           <div v-show="quesTagShow" class="edit-property">
@@ -269,6 +260,24 @@
                   </div>
                   </div>
                 </div>
                 </div>
               </div>
               </div>
+              <template v-if="paperDetail.selective">
+                <div class="edit-property-item">
+                  <div class="edit-property-body edit-property-danger">
+                    <div class="edit-property-title">选做题数</div>
+                    <div class="edit-property-content">
+                      {{ paperDetail.selectiveCount }}
+                    </div>
+                  </div>
+                </div>
+                <div class="edit-property-item">
+                  <div class="edit-property-body edit-property-danger">
+                    <div class="edit-property-title">取分规则</div>
+                    <div class="edit-property-content">
+                      {{ paperDetail.selectiveRule | selectiveRuleTypeFilter }}
+                    </div>
+                  </div>
+                </div>
+              </template>
             </div>
             </div>
           </div>
           </div>
         </div>
         </div>