Merge branch 'dev'

@@ -340,7 +340,7 @@
       .el-icon-close {
       .el-icon-close {
         width: 16px;
         width: 16px;
         height: 16px;
         height: 16px;
-        vertical-align: 2px;
+        vertical-align: 1px;
         border-radius: 50%;
         border-radius: 50%;
         text-align: center;
         text-align: center;
         transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
         transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
@@ -349,7 +349,7 @@
         &:before {
         &:before {
           transform: scale(0.6);
           transform: scale(0.6);
           display: inline-block;
           display: inline-block;
-          vertical-align: -3px;
+          vertical-align: 0px;
         }
         }
 
 
         &:hover {
         &:hover {

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-22 16:27:52
+ * @LastEditTime: 2023-08-25 09:50:48
  :show-message="false"
  :show-message="false"
 -->
 -->
 <template>
 <template>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 09:23:55
+ * @LastEditTime: 2023-08-25 09:31:57
 -->
 -->
 <template>
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -148,7 +148,7 @@
           context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386);
           context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386);
           // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
           // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
           // qlqtzk
           // qlqtzk
-          const maxWidth = 336; // 最大宽度限制
+          const maxWidth = 333; // 最大宽度限制
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
           lines.forEach((line, index) => {
           lines.forEach((line, index) => {
             const y = 463 + (index * 40); // 每行文本的垂直位置
             const y = 463 + (index * 40); // 每行文本的垂直位置
@@ -190,30 +190,50 @@
             })
             })
           })
           })
           let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
           let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
-          lines3.forEach((line, index) => {
-            const y = 423 + (index * 27); // 每行文本的垂直位置
-            let currentLine = '';
-            let arr = [];
-            for (let word of line) {
-              const testLine = currentLine + word;
-              const lineWidth = context.measureText(testLine).width;
-              if (lineWidth <= 315) {
-                currentLine = testLine;
-              } else {
-                arr.push(currentLine);
-                currentLine = word;
+          if (lines3.length >= 22) {
+            lines3.forEach((line, index) => {
+              const y = 423 + (index * 27); // 每行文本的垂直位置
+              let currentLine = '';
+              let arr = [];
+              for (let word of line) {
+                const testLine = currentLine + word;
+                const lineWidth = context.measureText(testLine).width;
+                if (lineWidth <= 315) {
+                  currentLine = testLine;
+                } else {
+                  arr.push(currentLine);
+                  currentLine = word;
+                }
               }
               }
-            }
-            arr.push(currentLine);
-            arr.forEach((line, index) => {
-              context.fillText(line, 129, y + (index * 20)); // 调整行高
+              arr.push(currentLine);
+              arr.forEach((line, index) => {
+                context.fillText(line, 129, y + (index * 20)); // 调整行高
+              })
             })
             })
-          })
-
-
+          } else {
+            lines3.forEach((line, index) => {
+              const y = 430 + (index * 27); // 每行文本的垂直位置
+              let currentLine = '';
+              let arr = [];
+              for (let word of line) {
+                const testLine = currentLine + word;
+                const lineWidth = context.measureText(testLine).width;
+                if (lineWidth <= 315) {
+                  currentLine = testLine;
+                } else {
+                  arr.push(currentLine);
+                  currentLine = word;
+                }
+              }
+              arr.push(currentLine);
+              arr.forEach((line, index) => {
+                context.fillText(line, 129, y + (index * 20)); // 调整行高
+              })
+            })
+          }
 
 
           let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : [];
           let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : [];
-          if (lines2.length > 22) {
+          if (lines2.length >= 22) {
             lines2.forEach((line, index) => {
             lines2.forEach((line, index) => {
               const y = 170 + (index * 20); // 每行文本的垂直位置
               const y = 170 + (index * 20); // 每行文本的垂直位置
               let currentLine = '';
               let currentLine = '';
@@ -221,7 +241,7 @@
               for (let word of line) {
               for (let word of line) {
                 const testLine = currentLine + word;
                 const testLine = currentLine + word;
                 const lineWidth = context.measureText(testLine).width;
                 const lineWidth = context.measureText(testLine).width;
-                if (lineWidth <= 360) {
+                if (lineWidth <= 336) {
                   currentLine = testLine;
                   currentLine = testLine;
                 } else {
                 } else {
                   arr.push(currentLine);
                   arr.push(currentLine);
@@ -241,7 +261,7 @@
               for (let word of line) {
               for (let word of line) {
                 const testLine = currentLine + word;
                 const testLine = currentLine + word;
                 const lineWidth = context.measureText(testLine).width;
                 const lineWidth = context.measureText(testLine).width;
-                if (lineWidth <= 360) {
+                if (lineWidth <= 336) {
                   currentLine = testLine;
                   currentLine = testLine;
                 } else {
                 } else {
                   arr.push(currentLine);
                   arr.push(currentLine);

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-17 16:43:18
+ * @LastEditTime: 2023-08-25 09:53:27
 -->
 -->
 <template>
 <template>
   <div>
   <div>
@@ -35,7 +35,7 @@
       },
       },
       disabled: {
       disabled: {
         type: Boolean,
         type: Boolean,
-        default: false
+        default: true
       }
       }
     },
     },
     data () {
     data () {