bug fix

public/pag.html

@@ -170,8 +170,21 @@
     margin: 0 -10px; }
     .page-box .page-main-3 .page-column {
       width: 33.33%; }
+    .page-box .page-main-3 .page-column-forbid-area::before {
+      transform: rotate(64.6555deg);
+    }
+    .page-box .page-main-3 .page-column-forbid-area::after {
+      transform: rotate(-64.6555deg);
+    }
+      
     .page-box .page-main-4 .page-column {
       width: 25%; }
+    .page-box .page-main-4 .page-column-forbid-area::before {
+      transform: rotate(70.3109deg);
+    }
+    .page-box .page-main-4 .page-column-forbid-area::after {
+      transform: rotate(-70.3109deg);
+    }
 
 .page-main-inner {
   position: absolute;
@@ -210,13 +223,40 @@
     z-index: 1;
     border: 1px solid #333;
     overflow: hidden;
-    background: linear-gradient(to top right, rgba(172, 172, 172, 0) 0%, rgba(172, 172, 172, 0) calc(50% - 1px), #acacac 50%, rgba(172, 172, 172, 0) calc(50% + 1px), rgba(172, 172, 172, 0) 100%), linear-gradient(to bottom right, rgba(172, 172, 172, 0) 0%, rgba(172, 172, 172, 0) calc(50% - 1px), #acacac 50%, rgba(172, 172, 172, 0) calc(50% + 1px), rgba(172, 172, 172, 0) 100%); }
+ }
+ .page-column-forbid-area::before {
+      content: "";
+      display: block;
+      position: absolute;
+      width: 1200px;
+      border-bottom: 1px solid #acacac;
+      top: 0;
+      left: 0;
+      -webkit-transform: rotate(54.216deg);
+              transform: rotate(54.216deg);
+      -webkit-transform-origin: left;
+              transform-origin: left;
+      z-index: 1; }
+    .page-column-forbid-area::after {
+      content: "";
+      display: block;
+      position: absolute;
+      width: 1200px;
+      border-bottom: 1px solid #acacac;
+      bottom: 0;
+      left: 0;
+      -webkit-transform: rotate(-54.216deg);
+              transform: rotate(-54.216deg);
+      -webkit-transform-origin: left;
+              transform-origin: left;
+      z-index: 1; }
     .page-column-forbid-area > p {
       color: #333;
       padding: 20px;
       position: absolute;
       top: 50%;
       left: 50%;
+      z-index: 9;
       -webkit-transform: translate(-50%, -50%);
               transform: translate(-50%, -50%);
       font-weight: bold;

src/assets/styles/base.scss

@@ -88,8 +88,8 @@ textarea:focus {
 
 /* browse style */
 ::-webkit-scrollbar {
-  width: 5px;
-  height: 5px;
+  width: 8px;
+  height: 8px;
   background: transparent;
 }
 ::-webkit-scrollbar-button {
@@ -99,8 +99,8 @@ textarea:focus {
   background: transparent;
 }
 ::-webkit-scrollbar-thumb {
-  border-radius: 5px;
-  background: $--color-text-secondary;
+  border-radius: 8px;
+  background: #666;
 }
 ::-webkit-scrollbar-corner {
   background: transparent;

src/assets/styles/card-preview.scss

@@ -41,41 +41,32 @@
     &-3 {
       .page-column {
         width: 33.33%;
-        // &:first-child {
-        //   width: 430px;
-        // }
-        // &:not(:first-child) {
-        //   width: 508.5px;
-        // }
+      }
+
+      .page-column-forbid-area {
+        &::before {
+          transform: rotate(64.6555deg);
+        }
+        &::after {
+          transform: rotate(-64.6555deg);
+        }
       }
     }
     &-4 {
       .page-column {
         width: 25%;
-        // &:first-child {
-        //   width: 420px;
-        // }
-        // &:not(:first-child) {
-        //   width: 340.5px;
-        // }
+      }
+
+      .page-column-forbid-area {
+        &::before {
+          transform: rotate(70.3109deg);
+        }
+        &::after {
+          transform: rotate(-70.3109deg);
+        }
       }
     }
   }
-
-  // &-1 {
-  //   .page-main {
-  //     &-3 {
-  //       .page-column {
-  //         width: 33.33% !important;
-  //       }
-  //     }
-  //     &-4 {
-  //       .page-column {
-  //         width: 25% !important;
-  //       }
-  //     }
-  //   }
-  // }
 }
 // 分栏间距，默认20px
 // page-main-inner
@@ -119,22 +110,30 @@
     z-index: 1;
     border: 1px solid #333;
     overflow: hidden;
-    background: linear-gradient(
-        to top right,
-        rgba(172, 172, 172, 0) 0%,
-        rgba(172, 172, 172, 0) calc(50% - 1px),
-        rgba(172, 172, 172, 1) 50%,
-        rgba(172, 172, 172, 0) calc(50% + 1px),
-        rgba(172, 172, 172, 0) 100%
-      ),
-      linear-gradient(
-        to bottom right,
-        rgba(172, 172, 172, 0) 0%,
-        rgba(172, 172, 172, 0) calc(50% - 1px),
-        rgba(172, 172, 172, 1) 50%,
-        rgba(172, 172, 172, 0) calc(50% + 1px),
-        rgba(172, 172, 172, 0) 100%
-      );
+    &::before {
+      content: "";
+      display: block;
+      position: absolute;
+      width: 1200px;
+      border-bottom: 1px solid rgba(172, 172, 172, 1);
+      top: 0;
+      left: 0;
+      transform: rotate(54.216deg);
+      transform-origin: left;
+      z-index: 1;
+    }
+    &::after {
+      content: "";
+      display: block;
+      position: absolute;
+      width: 1200px;
+      border-bottom: 1px solid rgba(172, 172, 172, 1);
+      bottom: 0;
+      left: 0;
+      transform: rotate(-54.216deg);
+      transform-origin: left;
+      z-index: 1;
+    }
 
     > p {
       color: #333;
@@ -142,6 +141,7 @@
       position: absolute;
       top: 50%;
       left: 50%;
+      z-index: 9;
       transform: translate(-50%, -50%);
       font-weight: bold;
       font-size: 30px;
@@ -193,6 +193,7 @@
     }
   }
 }
+
 // locator
 .page-locators {
   position: absolute;

src/modules/base/components/RuleCard.vue

@@ -69,7 +69,9 @@
           :rows="5"
           v-model="modalForm.attention"
         ></el-input>
-        <p class="tips-info">提示：换行之后，题卡注意事项会展示为多条内容。</p>
+        <p class="tips-info">
+          提示：换行之后，题卡注意事项会展示为多条内容，内容序号会被自动添加。
+        </p>
       </el-form-item>
       <el-form-item prop="objectiveAttention" label="客观题注意事项：">
         <el-input v-model="modalForm.objectiveAttention"></el-input>

src/modules/card/components/elementEdit/CardHeadBodyAutoResize.vue

@@ -72,7 +72,9 @@ export default {
       this.$nextTick(() => {
         const containers = ["stdinfo", "notice", "stdno", "dynamic"];
         containers.forEach(container => {
-          const dom = this.$refs[`${container}Container`].children[0];
+          const dom =
+            this.$refs[`${container}Container`] &&
+            this.$refs[`${container}Container`].firstChild;
           this.orgHeights[container] = dom ? dom.offsetHeight : 0;
         });
         this.heights = { ...this.orgHeights };

src/modules/card/previewTemp.js

@@ -122,10 +122,21 @@ const css =
 .page-box .page-main-3 .page-column {\
   width: 33.33%;\
 }\
+.page-box .page-main-3 .page-column-forbid-area::before {\
+  transform: rotate(64.6555deg);\
+}\
+.page-box .page-main-3 .page-column-forbid-area::after {\
+  transform: rotate(-64.6555deg);\
+}\
 .page-box .page-main-4 .page-column {\
   width: 25%;\
 }\
-\
+.page-box .page-main-4 .page-column-forbid-area::before {\
+  transform: rotate(70.3109deg);\
+}\
+.page-box .page-main-4 .page-column-forbid-area::after {\
+  transform: rotate(-70.3109deg);\
+}\
 .page-main-inner {\
   position: absolute;\
   width: 100%;\
@@ -166,36 +177,46 @@ const css =
   z-index: 1;\
   border: 1px solid #333;\
   overflow: hidden;\
-  background: linear-gradient(\
-      to top right,\
-      rgba(172, 172, 172, 0) 0%,\
-      rgba(172, 172, 172, 0) calc(50% - 1px),\
-      #acacac 50%,\
-      rgba(172, 172, 172, 0) calc(50% + 1px),\
-      rgba(172, 172, 172, 0) 100%\
-    ),\
-    linear-gradient(\
-      to bottom right,\
-      rgba(172, 172, 172, 0) 0%,\
-      rgba(172, 172, 172, 0) calc(50% - 1px),\
-      #acacac 50%,\
-      rgba(172, 172, 172, 0) calc(50% + 1px),\
-      rgba(172, 172, 172, 0) 100%\
-    );\
 }\
+.page-column-forbid-area::before {\
+  content: "";\
+  display: block;\
+  position: absolute;\
+  width: 1200px;\
+  border-bottom: 1px solid #acacac;\
+  top: 0;\
+  left: 0;\
+  -webkit-transform: rotate(54.216deg);\
+          transform: rotate(54.216deg);\
+  -webkit-transform-origin: left;\
+          transform-origin: left;\
+  z-index: 1; }\
+.page-column-forbid-area::after {\
+  content: "";\
+  display: block;\
+  position: absolute;\
+  width: 1200px;\
+  border-bottom: 1px solid #acacac;\
+  bottom: 0;\
+  left: 0;\
+  -webkit-transform: rotate(-54.216deg);\
+          transform: rotate(-54.216deg);\
+  -webkit-transform-origin: left;\
+          transform-origin: left;\
+  z-index: 1; }\
 .page-column-forbid-area > p {\
   color: #333;\
   padding: 20px;\
   position: absolute;\
   top: 50%;\
   left: 50%;\
+  z-index: 9;\
   -webkit-transform: translate(-50%, -50%);\
-  transform: translate(-50%, -50%);\
+          transform: translate(-50%, -50%);\
   font-weight: bold;\
   font-size: 30px;\
   color: #999;\
-  background-color: #fff;\
-}\
+  background-color: #fff; }\
 .page-column-main {\
   position: relative;\
   height: 100%;\

src/modules/card/views/CardDesign.vue

@@ -91,7 +91,7 @@
           <div class="action-part-title"><h2>阅卷参数</h2></div>
           <div class="action-part-body">
             <el-button type="primary" @click="modifyParams"
-              >上传阅卷参数（{{ paperParams.pageSumScore }}）</el-button
+              >上传阅卷参数（{{ paperParams["pageSumScore"] || 0 }}）</el-button
             >
           </div>
         </div>
@@ -386,6 +386,10 @@ export default {
     },
     async getCardConfig() {
       const data = await cardConfigInfos();
+      if (!data) {
+        this.$message.error("请先配置题卡规则！");
+        return;
+      }
       const aOrBSystem = getAOrBSystem(this.prepareTcPCard);
       let config = {
         ...transformField(data),