zhangjie 2 éve
szülő
commit
c79be2f741

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 1
src/modules/paper-export/previewTemp.js


+ 184 - 216
src/modules/paper-export/views/lin.html

@@ -1357,6 +1357,79 @@
     display: none;
   }
 
+  .paper-page {
+    color: #000
+  }
+
+  .paper-page.is-view .page-box {
+    margin-top: 10px;
+    margin-bottom: 10px
+  }
+
+  .paper-page .page-box-A3.page-box-0 .page-main-inner {
+    padding: 60px 40px 60px 160px
+  }
+
+  .paper-page .page-box-A3.page-box-0 .page-main-inner.page-main-noside {
+    padding: 60px
+  }
+
+  .paper-page .page-box-A3.page-box-1 .page-main-inner {
+    padding: 60px 160px 60px 40px
+  }
+
+  .paper-page .page-box-A3.page-box-1 .page-main-inner.page-main-noside {
+    padding: 60px
+  }
+
+  .paper-page .page-box-A3.page-box-1 .page-column-side {
+    right: 10px;
+    left: auto
+  }
+
+  .paper-page .page-box-8K .page-column-side {
+    top: 40px;
+    bottom: 40px;
+    width: 110px;
+    left: 10px
+  }
+
+  .paper-page .page-box-8K.page-box-0 .page-main-inner {
+    padding: 40px 20px 40px 130px
+  }
+
+  .paper-page .page-box-8K.page-box-0 .page-main-inner.page-main-noside {
+    padding: 40px
+  }
+
+  .paper-page .page-box-8K.page-box-1 .page-main-inner {
+    padding: 40px 130px 40px 20px
+  }
+
+  .paper-page .page-box-8K.page-box-1 .page-main-inner.page-main-noside {
+    padding: 40px
+  }
+
+  .paper-page .page-box-8K.page-box-1 .page-column-side {
+    right: 10px;
+    top: 40px;
+    left: auto
+  }
+
+  .paper-page .page-box .page-column-body {
+    word-wrap: normal;
+    white-space: normal
+  }
+
+  .paper-page .page-column-side {
+    position: absolute;
+    top: 60px;
+    bottom: 60px;
+    width: 130px;
+    left: 10px;
+    z-index: 10
+  }
+
   .paper-page .page-column-side .column-side-body {
     position: absolute;
     top: 0;
@@ -1396,6 +1469,33 @@
     display: inline-block;
     white-space: pre-wrap
   }
+
+  .paper-template-design .topic-element-edit:last-child .element-item::before {
+    border-bottom: 1px dashed #333
+  }
+
+  .paper-template-design .page-column-side::before {
+    content: "";
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 8;
+    border: 1px dashed #333
+  }
+
+  .paper-template-design .page-column-element .element-item::before {
+    border: 1px dashed #333
+  }
+</style>
+<style>
+  .rich-text {
+    display: inline-block;
+    vertical-align: top;
+    line-height: 20px
+  }
 </style>
 
 <body>
@@ -1407,180 +1507,48 @@
             <div id="column-0-0" class="page-column-main">
               <div class="page-column-body">
                 <div class="topic-element-preview page-column-element">
-                  <div id="preview-element-e0u1f3loa7ns5eqo" data-type="PANE_BOX"
+                  <div id="preview-element-euadp168l2m0jvs4" data-type="PANE_BOX"
                     class="topic-preview element-item element-item-width element-item-pane-box"
-                    style="left: 0px; top: 0px; width: 673px; height: 286px;">
+                    style="left: 0px; top: 0px; width: 673px; height: 321px;">
                     <div class="elem-pane-box">
-                      <div class="elem-body" style="height: 286px;">
+                      <div class="elem-body" style="height: 321px;">
                         <div class="elem-pane-box-elements">
                           <div class="topic-element-preview elem-pane-box-element">
-                            <div id="preview-element-leheigu832v0k9ur" data-type="TEXT"
+                            <div id="preview-element-lj60241o5m1ni1sg" data-type="TEXT"
                               class="topic-preview element-item element-item-text"
-                              style="left: 201px; top: 106px; width: 200px; height: 50px; z-index: 9;">
+                              style="left: 229px; top: 33px; width: 200px; height: 50px; z-index: 9;">
                               <div class="elem-text" preview="">
                                 <div class="text-body"
                                   style="font-weight: 400; font-family: 宋体; font-size: 14px; color: rgb(0, 0, 0);"><span
-                                    class="cont-text">模板1</span></div>
+                                    class="cont-text">模版2的标题</span></div>
                               </div>
                             </div>
                           </div>
                           <div class="topic-element-preview elem-pane-box-element">
-                            <div id="preview-element-q469mkn87ng7isqo" data-type="GRIDS"
-                              class="topic-preview element-item element-item-grids"
-                              style="left: 177px; top: 190px; width: 300px; height: 78px; z-index: 9;">
-                              <div class="elem-grids elem-grids-halving" preview="">
-                                <table>
-                                  <tr>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                  </tr><!---->
-                                  <tr>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                  </tr><!---->
-                                  <tr>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                    <td style="border-style: solid;">
-                                      <div style="padding-bottom: 100%;"></div>
-                                    </td>
-                                  </tr><!---->
-                                </table>
+                            <div id="preview-element-utijt0rovq9qf22g" data-type="LINES"
+                              class="topic-preview element-item element-item-lines"
+                              style="left: 132px; top: 173px; width: 394px; height: 112px; z-index: 9;">
+                              <div class="elem-lines" preview="">
+                                <div class="lines-body">
+                                  <div class="lines-item"
+                                    style="border-bottom: 1px solid rgb(0, 0, 0); padding-top: 20px; margin: 0px;">
+                                  </div>
+                                  <div class="lines-item"
+                                    style="border-bottom: 1px solid rgb(0, 0, 0); padding-top: 20px; margin: 0px;">
+                                  </div>
+                                  <div class="lines-item"
+                                    style="border-bottom: 1px solid rgb(0, 0, 0); padding-top: 20px; margin: 0px;">
+                                  </div>
+                                  <div class="lines-item"
+                                    style="border-bottom: 1px solid rgb(0, 0, 0); padding-top: 20px; margin: 0px;">
+                                  </div>
+                                  <div class="lines-item"
+                                    style="border-bottom: 1px solid rgb(0, 0, 0); padding-top: 20px; margin: 0px;">
+                                  </div>
+                                  <div class="lines-item"
+                                    style="border-bottom: 1px solid rgb(0, 0, 0); padding-top: 20px; margin: 0px;">
+                                  </div>
+                                </div>
                               </div>
                             </div>
                           </div>
@@ -1589,95 +1557,70 @@
                     </div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-smkjfn6ofal196l8"
+                <div class="elem-rich-text" id="rich-text-element-0a8gd78g7k4eu8so"
                   style="width: 100%; font-weight: 600;">
                   <div class="rich-text">
-                    <div>一、单择题</div>
-                  </div>
-                </div>
-                <div class="elem-rich-text" id="rich-text-element-j1mpfsaon0thnkcn" style="width: 100%;">
-                  <div class="rich-text">
-                    <div>1、(wl-mt2)2 + 2 = ?</div>
-                  </div>
-                </div>
-                <div class="elem-rich-text" id="rich-text-element-vtcu7b1g24iriacg" style="width: 25%;">
-                  <div class="rich-text">
-                    <div>A、1</div>
-                  </div>
-                </div>
-                <div class="elem-rich-text" id="rich-text-element-okkckcpgbhfi0n89" style="width: 25%;">
-                  <div class="rich-text">
-                    <div>B、2</div>
-                  </div>
-                </div>
-                <div class="elem-rich-text" id="rich-text-element-83m7jp2ot9ffsqh8" style="width: 25%;">
-                  <div class="rich-text">
-                    <div>C、3</div>
-                  </div>
-                </div>
-                <div class="elem-rich-text" id="rich-text-element-9anm8qhohv9ccaq8" style="width: 25%;">
-                  <div class="rich-text">
-                    <div>D、4</div>
+                    <div>一、1231</div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-qe8ffs6gm4ildk7g" style="width: 100%; height: 20px;">
+                <div class="elem-rich-text" id="rich-text-element-cl4iqk1psu6trk4g" style="width: 100%;">
                   <div class="rich-text">
-                    <div></div>
+                    <div>123</div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-gbd9ftrlt7m5hdlo" style="width: 100%;">
+                <div class="elem-rich-text" id="rich-text-element-uul5pfhjc68sg9vg" style="width: 100%;">
                   <div class="rich-text">
-                    <div>2、(wl-mt2)2 + 1 = ?</div>
+                    <div>1、选择题002</div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-2594gvhgm19btrjt" style="width: 25%;">
+                <div class="elem-rich-text" id="rich-text-element-cqvjcmoofg06dk6o" style="width: 25%;">
                   <div class="rich-text">
-                    <div>A、1</div>
+                    <div>A、11</div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-slkc1o387cr0m2lo" style="width: 25%;">
+                <div class="elem-rich-text" id="rich-text-element-a0lhhk88qnukd8jg" style="width: 25%;">
                   <div class="rich-text">
-                    <div>B、2</div>
+                    <div>B、22</div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-di7jd6280arh12n8" style="width: 25%;">
+                <div class="elem-rich-text" id="rich-text-element-7n5eg6dv40fh8quo" style="width: 25%;">
                   <div class="rich-text">
-                    <div>C、3</div>
+                    <div>C、33</div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-ulmmihuon8ka24ag" style="width: 25%;">
+                <div class="elem-rich-text" id="rich-text-element-37lh9dj8mgnmdnka" style="width: 25%;">
                   <div class="rich-text">
-                    <div>D、4</div>
+                    <div>D、122</div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-favgmj2okbpb612g" style="width: 100%; height: 20px;">
+                <div class="elem-rich-text" id="rich-text-element-8m9ivd783bjem1oo" style="width: 100%; height: 20px;">
                   <div class="rich-text">
                     <div></div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-cf7b2fa847ulpdno" style="width: 100%;">
+                <div class="elem-rich-text" id="rich-text-element-e1gav4tgup209ong" style="width: 100%;">
                   <div class="rich-text">
-                    <div>3、(wl-mt2)2 + 3 = ?</div>
+                    <div>2、选择题0001</div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-610dnaegoknjeucg" style="width: 25%;">
+                <div class="elem-rich-text" id="rich-text-element-fp1edpngf8gh9c1g" style="width: 25%;">
                   <div class="rich-text">
-                    <div>A、2</div>
+                    <div>A、11</div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-tkae9g0gqmcm8vro" style="width: 25%;">
+                <div class="elem-rich-text" id="rich-text-element-k189f8j4c5t7t3jg" style="width: 25%;">
                   <div class="rich-text">
-                    <div>B、3</div>
+                    <div>B、22</div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-pqaepqpoodrrn1to" style="width: 25%;">
+                <div class="elem-rich-text" id="rich-text-element-vdiia5i4od7qldn8" style="width: 25%;">
                   <div class="rich-text">
-                    <div>C、4</div>
+                    <div>C、33</div>
                   </div>
                 </div>
-                <div class="elem-rich-text" id="rich-text-element-o1uoas6lcih49ria" style="width: 25%;">
+                <div class="elem-rich-text" id="rich-text-element-o6edj0jg4ep05ser" style="width: 25%;">
                   <div class="rich-text">
-                    <div>D、5</div>
+                    <div>D、44</div>
                   </div>
                 </div>
               </div>
@@ -1699,14 +1642,39 @@
       <div class="page-column-side">
         <div class="column-side-body">
           <div class="topic-element-preview page-side-element">
-            <div id="preview-element-dmdnojhocnphlvh8" data-type="TEXT"
+            <div id="preview-element-3vvhi7jg1hj1ueoo" data-type="GUTTER"
+              class="topic-preview element-item element-item-gutter"
+              style="left: 87px; top: 158px; width: 30px; height: 844px; z-index: 9;">
+              <div class="elem-gutter elem-gutter-left" preview="">
+                <p class="elem-gutter-content"><span>线</span><span>订</span><span>装</span></p>
+              </div>
+            </div>
+          </div>
+          <div class="topic-element-preview page-side-element">
+            <div id="preview-element-vvq4hduor2lg8nlo" data-type="TEXT"
               class="topic-preview element-item element-item-text"
-              style="left: 0px; top: 199px; width: 130px; height: 100px;">
+              style="left: 48px; top: 24px; width: 73px; height: 93px; z-index: 9;">
               <div class="elem-text" preview=""
-                style="position: absolute; width: 100px; height: 130px; transform: rotate(-90deg); transform-origin: 0px 100%; bottom: 0px; left: 130px;">
+                style="position: absolute; width: 93px; height: 73px; transform: rotate(-90deg); transform-origin: 0px 100%; bottom: 0px; left: 73px;">
                 <div class="text-body" style="font-weight: 400; font-family: 宋体; font-size: 14px; color: rgb(0, 0, 0);">
-                  <span class="cont-text">样例内容</span>
+                  <span class="cont-text">模板2的文字说明</span></div>
+              </div>
+            </div>
+          </div>
+          <div class="topic-element-preview page-side-element">
+            <div id="preview-element-5i86hkdrv6tdu1kv" data-type="FILL_FIELD"
+              class="topic-preview element-item element-item-fill-field"
+              style="left: 0px; top: 416px; width: 37px; height: 552px; z-index: 9;">
+              <div class="elem-fill-field" preview=""
+                style="position: absolute; width: 552px; height: 37px; transform: rotate(-90deg); transform-origin: 0px 100%; bottom: 0px; left: 37px;">
+                <div class="fill-field-item" style="width: 50%;">
+                  <div class="fill-field-content" style="height: 30px; padding-top: 4px;">
+                    <span>考号</span><span>:</span><span></span></div>
                 </div>
+                <div class="fill-field-item" style="width: 50%;">
+                  <div class="fill-field-content" style="height: 30px; padding-top: 4px;">
+                    <span>座位</span><span>:</span><span></span></div>
+                </div><!---->
               </div>
             </div>
           </div>

+ 3 - 3
src/modules/question/components/QuestionImportDialog.vue

@@ -95,7 +95,7 @@ const initModalForm = {
   courseId: null,
   name: "",
   useOriginalPaper: false,
-  totalScore: null,
+  totalScore: 0,
 };
 
 export default {
@@ -156,13 +156,13 @@ export default {
       handler(val) {
         if (!val) {
           this.modalForm.name = "";
-          this.modalForm.totalScore = null;
+          this.modalForm.totalScore = 0;
         }
       },
     },
     scoreCheck(val) {
       if (!val) {
-        this.modalForm.totalScore = null;
+        this.modalForm.totalScore = 0;
       }
     },
     importType(val) {

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott