8f896ea9 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents beb9757d e8ee9cf0
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-22 10:09:05 4 * @LastEditTime: 2023-10-19 10:00:27
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
...@@ -394,7 +394,7 @@ ...@@ -394,7 +394,7 @@
394 // context.fillText(this.bdcqz.zl ? this.bdcqz.zl : '', 775, 325); 394 // context.fillText(this.bdcqz.zl ? this.bdcqz.zl : '', 775, 325);
395 395
396 let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : []; 396 let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : [];
397 if (getByteLen(this.bdcqz.zl) > 41) { 397 if (getByteLen(this.bdcqz.zl) >= 39) {
398 lines2.forEach((line, index) => { 398 lines2.forEach((line, index) => {
399 const y = 315 + (index * 20); // 每行文本的垂直位置 399 const y = 315 + (index * 20); // 每行文本的垂直位置
400 let currentLine = ''; 400 let currentLine = '';
......
...@@ -13,7 +13,14 @@ class data extends filter { ...@@ -13,7 +13,14 @@ class data extends filter {
13 { 13 {
14 label: '序号', 14 label: '序号',
15 type: 'index', 15 type: 'index',
16 width: '50' 16 width: '50',
17 render: (h, scope) => {
18 return (
19 <div>
20 {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
21 </div>
22 )
23 }
17 }, 24 },
18 { 25 {
19 prop: "ywlymc", 26 prop: "ywlymc",
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 14:04:47 4 * @LastEditTime: 2023-10-19 10:30:56
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 <!-- 表格 --> 46 <!-- 表格 -->
47 <div class="from-clues-content"> 47 <div class="from-clues-content">
48 <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort" 48 <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
49 :current-page.sync="pageData.current" :total="pageData.total" @size-change="handleSizeChange" 49 :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
50 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data"> 50 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
51 </lb-table> 51 </lb-table>
52 </div> 52 </div>
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-10-19 10:31:31
5 */
1 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
2 let vm = null 7 let vm = null
3 8
...@@ -8,12 +13,19 @@ class data extends filter { ...@@ -8,12 +13,19 @@ class data extends filter {
8 constructor() { 13 constructor() {
9 super() 14 super()
10 } 15 }
11 columns() { 16 columns () {
12 return [ 17 return [
13 { 18 {
14 label: '序号', 19 label: '序号',
15 type: 'index', 20 type: 'index',
16 width: '50' 21 width: '50',
22 render: (h, scope) => {
23 return (
24 <div>
25 {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
26 </div>
27 )
28 }
17 }, 29 },
18 { 30 {
19 prop: "qymc", 31 prop: "qymc",
......