Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-22 10:09:05
+ * @LastEditTime: 2023-10-19 10:00:27
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -394,7 +394,7 @@
           // context.fillText(this.bdcqz.zl ? this.bdcqz.zl : '', 775, 325);
 
           let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : [];
-          if (getByteLen(this.bdcqz.zl) > 41) {
+          if (getByteLen(this.bdcqz.zl) >= 39) {
             lines2.forEach((line, index) => {
               const y = 315 + (index * 20); // 每行文本的垂直位置
               let currentLine = '';

@@ -13,7 +13,14 @@ class data extends filter {
       {
         label: '序号',
         type: 'index',
-        width: '50'
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
       },
       {
         prop: "ywlymc",

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 14:04:47
+ * @LastEditTime: 2023-10-19 10:30:56
 -->
 <template>
   <div class="from-clues">
@@ -46,7 +46,7 @@
     <!-- 表格 -->
     <div class="from-clues-content">
       <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
-        :current-page.sync="pageData.current" :total="pageData.total" @size-change="handleSizeChange"
+        :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
       </lb-table>
     </div>

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-10-19 10:31:31
+ */
 import filter from '@/utils/filter.js'
 let vm = null
 
@@ -8,12 +13,19 @@ class data extends filter {
   constructor() {
     super()
   }
-  columns() {
+  columns () {
     return [
       {
         label: '序号',
         type: 'index',
-        width: '50'
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
       },
       {
         prop: "qymc",