Merge branch 'dev'

@@ -194,12 +194,11 @@
           type: "html",
           type: "html",
           maxWidth: 800, // 最大宽度
           maxWidth: 800, // 最大宽度
           font_size: "", // 不设置则使用默认字体大小
           font_size: "", // 不设置则使用默认字体大小
-          style: `@font-face {
-          font-family: "STZHONGS";
-          src: url(${window.ttf}) format("truetype");
-        }`,
+
+
           // 继承原来的所有样式
           // 继承原来的所有样式
           targetStyles: ["*"],
           targetStyles: ["*"],
+          scanStyle:false,
         });
         });
         this.render = false
         this.render = false
       },
       },

@@ -12,7 +12,7 @@
       style="page-break-after: always">
       style="page-break-after: always">
       <div class="title">{{ title }}</div>
       <div class="title">{{ title }}</div>
       <div class="num">共{{ datass.length }}页，第{{ indexx + 1 }}页</div>
       <div class="num">共{{ datass.length }}页，第{{ indexx + 1 }}页</div>
-      <table class="xxTable">
+      <table class="xxxTable">
         <tr v-for="item in columns" :key="item.name">
         <tr v-for="item in columns" :key="item.name">
           <td>
           <td>
             {{ item.despriction }}
             {{ item.despriction }}
@@ -109,10 +109,12 @@
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+
   .tbalede {
   .tbalede {
     width: 100%;
     width: 100%;
     margin: auto;
     margin: auto;
     position: relative;
     position: relative;
+    background-color: salmon;
     .num {
     .num {
       position: absolute;
       position: absolute;
       right: 10px;
       right: 10px;
@@ -128,12 +130,12 @@
       position: relative;
       position: relative;
       margin: 0 3px;
       margin: 0 3px;
     }
     }
-    .xxTable {
+    .xxxTable {
       width: 100%;
       width: 100%;
       border-collapse: collapse;
       border-collapse: collapse;
 
 
       tr td {
       tr td {
-        border: 2px solid rgb(227, 226, 226);
+        border: 1px solid rgb(139, 137, 137);
         text-align: center;
         text-align: center;
         height: 40px;
         height: 40px;
         font-size: 13px;
         font-size: 13px;
@@ -148,4 +150,6 @@
       }
       }
     }
     }
   }
   }
+
+
 </style>
 </style>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-01-30 15:46:45
+ * @LastEditTime: 2024-03-04 16:30:49
 -->
 -->
 <template>
 <template>
   <div class="szxx">
   <div class="szxx">
@@ -29,7 +29,7 @@
           <span>{{ item.bdcdyh }}</span>
           <span>{{ item.bdcdyh }}</span>
         </div>
         </div>
         <div class="text color_iray">
         <div class="text color_iray">
-          <span>{{ item.zl }}</span>
+          <span style="word-break:break-all;">{{ item.zl }}</span>
         </div>
         </div>
         <div class="text color_red">
         <div class="text color_red">
           <span>{{ item.yt }}</span>
           <span>{{ item.yt }}</span>
@@ -298,7 +298,6 @@
   .text {
   .text {
     margin-bottom: 8px;
     margin-bottom: 8px;
     text-align: left;
     text-align: left;
-    text-indent: 16px;
   }
   }
   .text.tac {
   .text.tac {
     text-align: center;
     text-align: center;
@@ -323,9 +322,9 @@
   }
   }
 
 
   .card_padding {
   .card_padding {
-    padding-top: 8px;
     font-size: 14px;
     font-size: 14px;
     line-height: 22px;
     line-height: 22px;
+    padding: 8px 15px;
   }
   }
   /deep/.el-card__body {
   /deep/.el-card__body {
     padding: 0px;
     padding: 0px;