解决冲突

This commit is contained in:
wangshiming
2022-04-07 19:51:54 +08:00
parent df9fda1057
commit f0cfb3b874
4 changed files with 28 additions and 20 deletions

View File

@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
* @Author : Shiming
* @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 19:24:15
* @LastEditTime : 2022-04-07 19:48:19
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -136,11 +136,11 @@ export class DatatableDatascreenComponent implements OnInit {
}
initOrderST() {
this.orderColumns = [
{ title: '运单号', index: 'wayCode', className: 'text-center', width: '120px' },
{ title: '运单号', index: 'wayCode', className: 'text-center', width: '150px' },
{ title: '司机/车辆', index: 'carNo', className: 'text-center', width: '120px' },
{ title: '货主', index: 'shipperName', className: 'text-center', width: '70px' },
{ title: '时间', index: 'createTime', className: 'text-center', width: '200px' },
{ title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '90px' }
{ title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '120px' }
];
}