新需求

src/modules/card/assets/styles/card-preview.scss

@@ -811,7 +811,7 @@
     }
     &-notice {
       position: relative;
-      min-height: 160px;
+      min-height: 200px;
       width: 50%;
       left: 50%;
       border: none;
@@ -822,7 +822,7 @@
       left: 0;
       top: 0;
       width: 50%;
-      height: 65%;
+      height: 75%;
       z-index: 2;
       border-bottom: 1px solid #000;
 
@@ -848,7 +848,7 @@
       left: 0;
       bottom: 0;
       width: 50%;
-      height: 35%;
+      height: 25%;
       z-index: 2;
       border: none;
       padding: 0;

src/modules/card/assets/styles/card-temp.css

@@ -8,7 +8,6 @@
   -webkit-box-shadow: 0 0 4px #ddd;
   box-shadow: 0 0 4px #ddd;
 }
-
 .card-print {
   padding: 0;
 }
@@ -26,7 +25,6 @@
 .card-print .card-head .head-dynamic-rect {
   border-width: 0.5pt;
 }
-
 .page-box {
   position: relative;
   background: #fff;
@@ -238,7 +236,6 @@
   height: 14px;
   line-height: 14px;
 }
-
 .page-main-side {
   position: absolute;
   top: 60px;
@@ -259,7 +256,6 @@
   -webkit-transform-origin: 0 0;
   transform-origin: 0 0;
 }
-
 .page-main-inner {
   position: absolute;
   width: 100%;
@@ -270,7 +266,6 @@
   z-index: 9;
   font-size: 0;
 }
-
 .page-main-outer {
   position: absolute;
   top: 0;
@@ -281,7 +276,6 @@
   background-color: transparent;
   overflow: hidden;
 }
-
 .page-column {
   display: inline-block;
   vertical-align: middle;
@@ -411,7 +405,6 @@
   text-align: center;
   bottom: -26px;
 }
-
 .page-locator {
   position: absolute;
   left: 80px;
@@ -437,7 +430,6 @@
 .page-locator-item:nth-of-type(2) {
   right: 96px;
 }
-
 .page-box-1 .page-locator-bottom .page-locator-item:nth-of-type(1) {
   right: 0;
   left: auto;
@@ -448,7 +440,6 @@
 .page-box-1 .page-locator-item:nth-of-type(2) {
   right: 0;
 }
-
 .page-number-rect {
   position: absolute;
   bottom: 30px;
@@ -478,7 +469,6 @@
   height: 16px;
   line-height: 16px;
 }
-
 .elem-title {
   padding: 10px;
   font-size: 14px;
@@ -489,12 +479,10 @@
 .elem-body {
   padding: 10px;
 }
-
 .grid-container {
   margin-left: -10px;
   margin-right: -10px;
 }
-
 .grid-row {
   display: table;
   width: 100%;
@@ -514,7 +502,6 @@
   border-style: dashed;
   vertical-align: middle;
 }
-
 .card-head-title {
   text-align: center;
   color: #000;
@@ -649,7 +636,6 @@
   border-radius: 50%;
   background-color: #000;
 }
-
 .card-head-model-two .card-head-info {
   padding-bottom: 15px;
   text-align: center;
@@ -670,7 +656,7 @@
 }
 .card-head-model-two .card-head-notice {
   position: relative;
-  min-height: 160px;
+  min-height: 200px;
   width: 50%;
   left: 50%;
   border: none;
@@ -681,7 +667,7 @@
   left: 0;
   top: 0;
   width: 50%;
-  height: 65%;
+  height: 75%;
   z-index: 2;
   border-bottom: 1px solid #000;
 }
@@ -705,7 +691,7 @@
   left: 0;
   bottom: 0;
   width: 50%;
-  height: 35%;
+  height: 25%;
   z-index: 2;
   border: none;
   padding: 0;
@@ -739,7 +725,6 @@
   height: 12px;
   border: 1px solid #000;
 }
-
 .elem-topic-head {
   text-align: center;
 }
@@ -767,7 +752,6 @@
   white-space: nowrap;
   overflow: hidden;
 }
-
 .elem-line-horizontal {
   height: 100%;
   line-height: 30px;
@@ -778,7 +762,6 @@
   width: 100%;
   border-bottom: 1px solid #000;
 }
-
 .elem-line-vertical {
   height: 100%;
   text-align: center;
@@ -789,12 +772,10 @@
   height: 100%;
   border-left: 1px solid #000;
 }
-
 .elem-lines .line-item {
   display: inline-block;
   vertical-align: top;
 }
-
 .elem-rect .rect-body {
   position: absolute;
   width: 100%;
@@ -802,7 +783,6 @@
   top: 0;
   left: 0;
 }
-
 .elem-text .text-body {
   padding: 5px;
   line-height: 1.4;
@@ -822,7 +802,6 @@
   -webkit-transform-origin: 0 100%;
   transform-origin: 0 100%;
 }
-
 .elem-barcode {
   height: 100%;
   border-color: transparent;
@@ -839,7 +818,6 @@
   right: 0;
   margin: auto;
 }
-
 .elem-image {
   height: 100%;
   border-color: transparent;
@@ -871,7 +849,6 @@
   right: 0;
   margin: auto;
 }
-
 .elem-grids > table {
   table-layout: fixed;
   border-spacing: 0;
@@ -884,7 +861,6 @@
   table-layout: auto;
   width: 100%;
 }
-
 .elem-fill-question {
   white-space: normal;
   line-height: 1;
@@ -991,7 +967,6 @@
 .elem-fill-question-vertical .option-item:last-child {
   margin-bottom: 0 !important;
 }
-
 .elem-fill-area .option-item {
   display: inline-block;
   vertical-align: middle;
@@ -1008,7 +983,6 @@
 .elem-fill-area-vertical .option-item:last-child {
   margin-bottom: 0 !important;
 }
-
 .elem-fill-line {
   white-space: normal;
 }
@@ -1069,7 +1043,6 @@
   text-align: center;
   border: none;
 }
-
 .elem-explain .elem-title {
   padding-bottom: 0;
 }
@@ -1095,7 +1068,6 @@
 .elem-explain .elem-explain-element .explain-element-body {
   position: absolute;
 }
-
 .elem-composition .elem-title {
   padding-bottom: 0;
 }
@@ -1115,7 +1087,6 @@
   position: absolute;
   overflow: hidden;
 }
-
 .elem-fill-number {
   border: 1px solid #000;
 }
@@ -1168,7 +1139,6 @@
   transform: scale(0.67, 0.67);
   -webkit-transform: scale(0.67, 0.67);
 }
-
 .elem-fill-field {
   white-space: normal;
   overflow: hidden;
@@ -1180,7 +1150,6 @@
   -webkit-transform-origin: 0 100%;
   transform-origin: 0 100%;
 }
-
 .fill-field-item {
   display: inline-block;
   padding: 0 10px;
@@ -1218,7 +1187,6 @@
   width: 10px;
   background-color: #fff;
 }
-
 .elem-fill-pane {
   font-size: 0;
   white-space: normal;
@@ -1232,7 +1200,6 @@
 .elem-fill-pane .fill-pane-cont {
   border: 1px solid #000;
 }
-
 .elem-gutter {
   position: relative;
   width: 30px;
@@ -1262,7 +1229,6 @@
 .elem-pane {
   height: 100%;
 }
-
 .card-free-preview:not(.card-print) {
   padding: 10px 0;
   background-color: #f0f0f0;

src/modules/card/elements/card-head/CardHead.vue

@@ -25,6 +25,7 @@ export default {
   computed: {
     compName() {
       let name = this.data.modelType.toLowerCase().replace("_", "-");
+      name = "model-two";
       return `card-head-${name}`;
     },
     classes() {

src/modules/paper-export/views/paperTemplateBuildMixins.js

@@ -42,6 +42,16 @@ export default {
     buildElementsFromStruct() {
       let elementList = [];
       let structRelateElement = [];
+      // 考试说明
+      const { elements: descElements, elementIds: descElementIds } =
+        this.parseTitleOption(this.paperJson.examRemark, "");
+      elementList.push(...descElements);
+      structRelateElement.push({
+        title: descElementIds,
+        description: [],
+        questions: [],
+        options: [],
+      });
 
       this.paperJson.paperDetails.forEach((detail) => {
         let detailRelateElement = {

src/modules/question/components/QuestionStatisticsDialog.vue

@@ -51,12 +51,12 @@
         <el-table-column label="蓝图属性" width="520" fixed="left">
           <el-table-column
             label="一级属性"
-            width="260"
+            :width="propertyColWidth"
             prop="firstPropertyName"
           ></el-table-column>
           <el-table-column
             label="二级属性"
-            width="260"
+            :width="propertyColWidth"
             prop="secondPropertyName"
           ></el-table-column>
         </el-table-column>
@@ -113,6 +113,11 @@ export default {
       curBlueDataList: [],
     };
   },
+  computed: {
+    propertyColWidth() {
+      return this.blueQtypes.length ? 260 : undefined;
+    },
+  },
   methods: {
     visibleChange() {
       this.filter.courseId = this.courseId;
@@ -167,6 +172,7 @@ export default {
 
       this.blueDataList = res.data.map((mainGroup) => {
         let dataList = [];
+        let blueQtypes = [];
         mainGroup.distributeInfo.forEach((item) => {
           if (!item.children || !item.children.length) return;
           const rowspan = item.children.length;
@@ -180,8 +186,8 @@ export default {
             elem.distributeByQuestionTypeList.forEach((qt) => {
               nelem[qt.sourceDetailName] = this.getQuesDiffContent(qt);
             });
-            if (!this.blueQtypes.length) {
-              this.blueQtypes = elem.distributeByQuestionTypeList.map(
+            if (!blueQtypes.length) {
+              blueQtypes = elem.distributeByQuestionTypeList.map(
                 (qt) => qt.sourceDetailName
               );
             }
@@ -192,11 +198,13 @@ export default {
         return {
           name: mainGroup.coursePropertyName,
           dataList,
+          blueQtypes,
         };
       });
       if (!this.blueDataList.length) return;
       this.curProperty = this.blueDataList[0].name;
       this.curBlueDataList = this.blueDataList[0].dataList;
+      this.blueQtypes = this.blueDataList[0].blueQtypes;
     },
     propertyChange() {
       const data = this.blueDataList.find(
@@ -204,6 +212,7 @@ export default {
       );
       if (!data) return;
       this.curBlueDataList = data.dataList;
+      this.blueQtypes = data.blueQtypes;
     },
   },
 };

src/modules/questions/views/QuestionInfo.vue

@@ -72,6 +72,9 @@
 
       <div class="line-seperator"></div>
 
+      <el-form-item label="录入时间">
+        <span>{{ quesModel.creationTime }}</span>
+      </el-form-item>
       <el-form-item label="题型">
         <span>{{ quesModel.questionType | questionType }}</span>
       </el-form-item>