projects/mesxc-zhp #354

Merged
juzi merged 4 commits from projects/mesxc-zhp into projects/mesxc-test 2024-04-24 13:50:45 +08:00
4 changed files with 11 additions and 11 deletions
Showing only changes of commit 1f54c9179d - Show all commits

View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 14:08:46
* @LastEditTime: 2024-04-23 16:18:27
* @LastEditTime: 2024-04-23 16:47:13
* @LastEditors: zhp
* @Description:
-->
@ -145,7 +145,7 @@ export default {
endPlaceholder: '结束时间',
param: 'checkTime',
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
width: 250
width: 350
},
{
type:'button',
@ -157,7 +157,7 @@ export default {
type:'button',
btnName: '导出',
name: 'export',
color: 'success',
color: 'primary',
plain: true
},
],
@ -212,7 +212,7 @@ export default {
}
}
if (columnIndex === 1) {
if (rowIndex === 1 || rowIndex === 3 || rowIndex === 5 || rowIndex === 7 || rowIndex === 9 || rowIndex === 11) {
if (rowIndex %2 == 1) {
return {
rowspan: 1,
colspan: 2
@ -220,7 +220,7 @@ export default {
}
}
if (columnIndex === 4 || columnIndex === 5 || columnIndex === 6 || columnIndex === 7 || columnIndex === 8 || columnIndex === 9 || columnIndex === 10 || columnIndex === 11 || columnIndex === 12 || columnIndex === 13) {
if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) {
if (rowIndex % 2 == 0) {
return {
rowspan: 2,
colspan: 1

View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 14:08:46
* @LastEditTime: 2024-04-23 15:08:44
* @LastEditTime: 2024-04-23 16:43:18
* @LastEditors: zhp
* @Description:
-->
@ -234,7 +234,7 @@ export default {
type: 'button',
btnName: '导出',
name: 'export',
color: 'success',
color: 'primary',
plain: true
},
],

View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 10:01:33
* @LastEditTime: 2024-04-23 15:15:45
* @LastEditTime: 2024-04-23 16:42:53
* @LastEditors: zhp
* @Description:
-->
@ -154,7 +154,7 @@ export default {
type:'button',
btnName: '导出',
name: 'export',
color: 'success',
color: 'primary',
plain: true
},
],

View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 15:07:53
* @LastEditTime: 2024-04-23 15:15:52
* @LastEditTime: 2024-04-23 16:42:58
* @LastEditors: zhp
* @Description:
-->
@ -153,7 +153,7 @@ export default {
type:'button',
btnName: '导出',
name: 'export',
color: 'success',
color: 'primary',
plain: true
},
],