Procházet zdrojové kódy

fix:题卡导出卡格式问题

zhangjie před 2 roky
rodič
revize
b02fa5b024

+ 60 - 25
card/assets/styles/card-temp.css

@@ -8,6 +8,7 @@
   -webkit-box-shadow: 0 0 4px #ddd;
   box-shadow: 0 0 4px #ddd;
 }
+
 .card-print {
   padding: 0;
 }
@@ -20,6 +21,7 @@
 .card-print .elem-fill-question-first::before {
   display: none;
 }
+
 .page-box {
   position: relative;
   background: #fff;
@@ -109,6 +111,7 @@
 .page-box-less .page-number-rect {
   display: none;
 }
+
 .page-main-inner {
   position: absolute;
   width: 100%;
@@ -119,6 +122,7 @@
   z-index: 9;
   font-size: 0;
 }
+
 .page-main-outer {
   position: absolute;
   top: 0;
@@ -129,6 +133,7 @@
   background-color: transparent;
   overflow: hidden;
 }
+
 .page-column {
   display: inline-block;
   vertical-align: middle;
@@ -145,7 +150,7 @@
   bottom: 0;
   right: 0;
   z-index: 1;
-  border: 1px solid #333;
+  border: 1px solid #000;
   overflow: hidden;
 }
 .page-column-forbid-area::before {
@@ -220,7 +225,7 @@
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   z-index: 2;
-  border: 1px solid #333;
+  border: 1px solid #000;
   border-top: 0;
 }
 .page-column-element .element-item > div {
@@ -241,15 +246,16 @@
   border-bottom-color: transparent;
 }
 .page-column-element .element-item-type-last::before {
-  border-bottom: 1px solid #333;
+  border-bottom: 1px solid #000;
 }
 .page-column-element:last-child .element-item::before {
-  border-bottom: 1px solid #333;
+  border-bottom: 1px solid #000;
 }
 .page-column-element:last-child
   .element-item-card-head.element-item-type-pre::before {
-  border-bottom: 0;
+  border-bottom: none;
 }
+
 .page-locator {
   position: absolute;
   left: 80px;
@@ -275,6 +281,7 @@
 .page-locator-item:nth-of-type(2) {
   right: 96px;
 }
+
 .page-number {
   position: absolute;
   bottom: 40px;
@@ -296,7 +303,7 @@
 }
 .page-number-rect-list li.rect-li-act {
   height: 0;
-  border: 0;
+  border: none;
   border-bottom: 16px solid #000;
 }
 .page-number-text {
@@ -306,6 +313,7 @@
   height: 16px;
   line-height: 16px;
 }
+
 .elem-title {
   padding: 10px;
   font-size: 14px;
@@ -316,10 +324,12 @@
 .elem-body {
   padding: 10px;
 }
+
 .grid-container {
   margin-left: -10px;
   margin-right: -10px;
 }
+
 .grid-row {
   display: table;
   width: 100%;
@@ -333,12 +343,13 @@
   display: table-cell;
   width: 50%;
   vertical-align: top;
-  border: 1px solid #333;
+  border: 1px solid #000;
 }
 .grid-row .grid-col-dash {
   border-style: dashed;
   vertical-align: middle;
 }
+
 .card-head-top {
   text-align: center;
   color: #000;
@@ -390,7 +401,7 @@
   display: block;
   position: absolute;
   width: 100%;
-  border-bottom: 1px solid #333;
+  border-bottom: 1px solid #000;
   bottom: 6px;
   left: 0;
   z-index: 1;
@@ -439,7 +450,7 @@
 .card-head-body .head-stdno .stdno-fill-rect {
   font-size: 0;
   height: 27px;
-  border-bottom: 1px solid #333;
+  border-bottom: 1px solid #000;
 }
 .card-head-body .head-stdno .stdno-fill-number {
   display: inline-block;
@@ -448,7 +459,7 @@
   height: 100%;
 }
 .card-head-body .head-stdno .stdno-fill-number:not(:last-child) {
-  border-right: 1px solid #333;
+  border-right: 1px solid #000;
 }
 .card-head-body .head-stdno .stdno-fill-head {
   position: absolute;
@@ -459,7 +470,7 @@
   z-index: 9;
 }
 .card-head-body .head-stdno .stdno-fill-head > h5 {
-  border-bottom: 1px solid #333;
+  border-bottom: 1px solid #000;
   line-height: 24px;
   font-size: 16px;
   font-weight: bold;
@@ -663,10 +674,10 @@
   text-align: center;
 }
 .card-head-body .head-dynamic-aorb .dynamic-aorb-item:not(:last-child) {
-  border-right: 1px solid #333;
+  border-right: 1px solid #000;
 }
 .card-head-body .head-dynamic-aorb-fill .dynamic-aorb-item:first-child {
-  border: 0;
+  border: none;
 }
 .card-head-body .head-dynamic-aorb .dynamic-aorb-title {
   width: 83px;
@@ -698,7 +709,7 @@
   padding: 16px 10px;
 }
 .card-head-part {
-  border: 1px solid #333;
+  border: 1px solid #000;
 }
 .card-head-part:not(:last-child) {
   margin-bottom: 10px;
@@ -717,6 +728,7 @@
 .card-head-handle.card-head-narrow .head-stdno {
   height: 286px;
 }
+
 .card-head-body-auto-resize {
   margin-left: -5px;
   margin-right: -5px;
@@ -740,21 +752,22 @@
   width: 424px;
 }
 .card-head-body-auto-resize .rect-col-item {
-  border: 1px solid #333;
+  border: 1px solid #000;
 }
 .card-head-body-auto-resize .rect-col-item:nth-of-type(2) {
   margin-top: 10px;
 }
 .card-head-body-auto-resize .rect-col-item-none {
-  border: 0;
+  border: none;
   margin: 0 !important;
 }
+
 .elem-topic-head {
   text-align: center;
 }
 .elem-topic-head .elem-body {
   padding: 0;
-  border: 1px solid #333;
+  border: 1px solid #000;
 }
 .elem-topic-head-pad {
   padding-top: 10px;
@@ -763,7 +776,7 @@
   font-size: 16px;
   height: 29px;
   line-height: 28px;
-  border-bottom: 1px dotted #333;
+  border-bottom: 1px dotted #000;
   font-weight: normal;
 }
 .elem-topic-head p {
@@ -773,6 +786,7 @@
   white-space: nowrap;
   overflow: hidden;
 }
+
 .elem-line-horizontal {
   height: 100%;
   line-height: 30px;
@@ -783,6 +797,7 @@
   width: 100%;
   border-bottom: 1px solid #000;
 }
+
 .elem-line-vertical {
   height: 100%;
   text-align: center;
@@ -793,10 +808,12 @@
   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%;
@@ -804,6 +821,7 @@
   top: 0;
   left: 0;
 }
+
 .elem-text .text-body {
   padding: 5px;
   line-height: 1.4;
@@ -817,6 +835,7 @@
   color: #a0a0a0;
   margin: 0 2px;
 }
+
 .elem-barcode {
   height: 100%;
   border-color: transparent;
@@ -833,6 +852,7 @@
   right: 0;
   margin: auto;
 }
+
 .elem-image {
   height: 100%;
   border-color: transparent;
@@ -864,18 +884,24 @@
   right: 0;
   margin: auto;
 }
+
 .elem-grids > table {
   table-layout: fixed;
   border-spacing: 0;
   border-collapse: collapse;
 }
 .elem-grids > table td {
-  border: 1px solid #333;
+  border: 1px solid #000;
 }
 .elem-grids-halving > table {
   table-layout: auto;
   width: 100%;
 }
+
+.elem-pane {
+  height: 100%;
+}
+
 .elem-fill-question {
   white-space: normal;
 }
@@ -964,6 +990,7 @@
 .elem-fill-question-vertical .option-item:last-child {
   margin-bottom: 0 !important;
 }
+
 .elem-fill-area .option-item {
   display: inline-block;
   vertical-align: middle;
@@ -980,6 +1007,7 @@
 .elem-fill-area-vertical .option-item:last-child {
   margin-bottom: 0 !important;
 }
+
 .elem-fill-line {
   white-space: normal;
 }
@@ -1017,7 +1045,7 @@
   min-width: 20px;
   text-align: left;
   background-color: #fff;
-  border: 0;
+  border: none;
 }
 .elem-fill-line .elem-fill-quesiton li.elem-fill-no span {
   display: block;
@@ -1038,8 +1066,9 @@
   padding-bottom: 4px;
   background-color: #fff;
   text-align: center;
-  border: 0;
+  border: none;
 }
+
 .elem-explain .elem-title {
   padding-bottom: 0;
 }
@@ -1065,6 +1094,7 @@
 .elem-explain .elem-explain-element .explain-element-body {
   position: absolute;
 }
+
 .elem-composition .elem-title {
   padding-bottom: 0;
 }
@@ -1084,13 +1114,14 @@
   position: absolute;
   overflow: hidden;
 }
+
 .elem-fill-number {
   border: 1px solid #000;
 }
 .elem-fill-number .fill-number-rect {
   font-size: 0;
   height: 27px;
-  border-bottom: 1px solid #333;
+  border-bottom: 1px solid #000;
 }
 .elem-fill-number .fill-number-number {
   display: inline-block;
@@ -1099,13 +1130,13 @@
   height: 100%;
 }
 .elem-fill-number .fill-number-number:not(:last-child) {
-  border-right: 1px solid #333;
+  border-right: 1px solid #000;
 }
 .elem-fill-number .fill-number-head {
   height: 51px;
 }
 .elem-fill-number .fill-number-head > h5 {
-  border-bottom: 1px solid #333;
+  border-bottom: 1px solid #000;
   line-height: 24px;
   font-size: 16px;
   font-weight: bold;
@@ -1136,10 +1167,12 @@
   -webkit-transform: scale(0.67, 0.67);
   transform: scale(0.67, 0.67);
 }
+
 .elem-fill-field {
   white-space: normal;
   overflow: hidden;
 }
+
 .fill-field-item {
   display: inline-block;
   padding: 0 10px;
@@ -1156,7 +1189,7 @@
   display: block;
   position: absolute;
   width: 100%;
-  border-bottom: 1px solid #333;
+  border-bottom: 1px solid #000;
   bottom: 2px;
   left: 0;
   z-index: 1;
@@ -1183,6 +1216,7 @@
   width: 10px;
   background-color: #fff;
 }
+
 .elem-fill-pane {
   font-size: 0;
   white-space: normal;
@@ -1196,6 +1230,7 @@
 .elem-fill-pane .fill-pane-cont {
   border: 1px solid #000;
 }
+
 .card-free-preview:not(.card-print) {
   padding: 10px 0;
   background-color: #f0f0f0;

+ 1 - 1
card/mixins/exchange.js

@@ -109,9 +109,9 @@ export default {
       dom
         .querySelector(".page-number-rect-list")
         .childNodes.forEach((item, index) => {
-          console.log(item);
           options[index] = this.getOffsetInfo(item);
         });
+      // console.log(options);
       return [
         {
           field: "pageNumber",

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
card/previewTemp.js


+ 1 - 1
src/components/base/SemesterSelect.vue

@@ -54,7 +54,7 @@ export default {
       const res = await unitQueryByType({}, "SEMESTER");
       this.optionList = res;
 
-      if (this.defaultSelectInUsed) this.selectDefault();
+      if (this.defaultSelectInUsed && !this.value) this.selectDefault();
     },
     select() {
       this.$emit("input", this.selected);

+ 0 - 2
src/modules/print/components/ModifyPrintPlan.vue

@@ -392,7 +392,6 @@ export default {
       isSubmit: false,
       modalForm: deepCopy(initModalForm),
       createTime: [],
-      semesters: [],
       PRINT_CONTENT_TYPE,
       DRAW_RULE_TYPE,
       PRINT_BACKUP_TYPE,
@@ -581,7 +580,6 @@ export default {
         modalForm.ordinaryContent = modalForm.ordinaryContent.filter(
           item => this.templateSources[item.type]
         );
-        modalForm.semesterId = this.semesters[0].id || "";
         this.modalForm = modalForm;
         this.createTime = [];
       }

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů