diff --git a/src/app/routes/data-v/lj-card/lj-card.component.html b/src/app/routes/data-v/lj-card/lj-card.component.html index 33ca012..bbb591f 100644 --- a/src/app/routes/data-v/lj-card/lj-card.component.html +++ b/src/app/routes/data-v/lj-card/lj-card.component.html @@ -1,9 +1,11 @@
- -
-
{{ title }}
-
+
+
+
{{ title }}
+
+
diff --git a/src/app/routes/data-v/lj-card/lj-card.component.less b/src/app/routes/data-v/lj-card/lj-card.component.less index 3e1fb0b..8856d97 100644 --- a/src/app/routes/data-v/lj-card/lj-card.component.less +++ b/src/app/routes/data-v/lj-card/lj-card.component.less @@ -1,4 +1,7 @@ .card-content-title { + display: flex; + align-items: center; /* 确保子元素垂直居中 */ + justify-content: space-between; width:fit-content; height:fit-content; padding: 5px 20px 0; /* 文本的内边距 */ @@ -12,6 +15,15 @@ box-shadow: inset 0 0 10px #1f6f97; /* 内阴影效果 */ } + +.card-top-content{ + display: grid; + grid-template-columns: auto auto; + align-items: center; + justify-content: space-between; + + } + .card-content { overflow: hidden; margin-bottom: 0.5rem; @@ -23,9 +35,7 @@ background-position: center; // background-position: top; background-size: 100% 100%; - // background-size: cover; - // background-size: cover; - // background-size: contain; /* 保证背景图片完整显示 */ + .card-content-title { display: flex; diff --git a/src/app/routes/data-v/navigation/navigation.component.less b/src/app/routes/data-v/navigation/navigation.component.less index 09f867a..b32056e 100644 --- a/src/app/routes/data-v/navigation/navigation.component.less +++ b/src/app/routes/data-v/navigation/navigation.component.less @@ -5,6 +5,7 @@ // flex-flow: row wrap; /* 允许换行 */ flex-wrap: nowrap; /* 不允许换行 */ // width: 100%; + margin-top:10px; padding-left: 2rem; white-space: nowrap; /* 防止菜单项换行 */ // white-space: normal; diff --git a/src/app/routes/data-v/navigation/navigation.component.ts b/src/app/routes/data-v/navigation/navigation.component.ts index bd2c8c8..6f03d0c 100644 --- a/src/app/routes/data-v/navigation/navigation.component.ts +++ b/src/app/routes/data-v/navigation/navigation.component.ts @@ -126,22 +126,22 @@ export class DataVNavigationComponent implements OnInit { // 设置当前菜单为选中状态 menu.selected = true; this.selectedParentMenu = menu; - if (menu.link) - this.router.navigate([menu.link, menu.id], { - state: { menu: menu.children } - }); + + this.router.navigate([menu.link ?? '/404', menu.id], { + state: { menu: menu.children } + }); } else if (menu.menuCode == 'Home') { menu.selected = true; this.selectedParentMenu = menu; - if (menu.link) this.router.navigateByUrl(menu.link); + this.router.navigateByUrl(menu.link ?? '/404'); } else { menu.selected = true; console.log('路由'); console.log(menu.link); - if (menu.link) - this.router.navigate([menu.link, menu.id], { - state: { menu: menu.children } - }); + + this.router.navigate([menu.link ?? '/404', menu.id], { + state: { menu: menu.children } + }); } // 根据新的选中项更新要显示的菜单列表 this.updateVisibleMenuList(); diff --git a/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html b/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html index 6a4035f..af5de5b 100644 --- a/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html +++ b/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html @@ -1,5 +1,5 @@ - +
diff --git a/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.less b/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.less index bde9ad9..f736ef5 100644 --- a/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.less +++ b/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.less @@ -15,4 +15,10 @@ font-size: 16px; font-weight: bold; } - \ No newline at end of file + + .ag-header-center .ag-header-group-cell-label, +.ag-header-center .ag-header-cell-label { + display: grid; + width: 100%; + text-align: center; +} \ No newline at end of file diff --git a/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.ts b/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.ts index 43e919b..6a8ad23 100644 --- a/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.ts +++ b/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.ts @@ -14,7 +14,8 @@ import { LJDataVCardComponent } from '../../lj-card/lj-card.component'; export class LjAgGridComponentComponent implements OnInit { [x: string]: any; @ViewChild('myGrid') grid!: AgGridAngular; - + public title = ''; + public showSetting = true; /**每页数 */ public pageSize!: number; /**当前页 */ @@ -26,7 +27,9 @@ export class LjAgGridComponentComponent implements OnInit { @Input() defaultColDef: ColDef = { width: 130, editable: false, - cellStyle: { 'font-weight': 'bold' } + headerClass: 'ag-header-center', + + cellStyle: { 'font-weight': 'bold', textAlign: 'center', 'justify-content': 'center', 'line-height': '38px' } }; /** 列头 */ @Input() columnDefs: ColDef[] = []; @@ -40,6 +43,7 @@ export class LjAgGridComponentComponent implements OnInit { /**初始化 */ ngOnInit() { console.log('-----表格初始化-----'); + this.title = '代办任务'; this.pageSize = 10; this.pageIndex = 1; this.pageRowTotal = this.rowData.length; diff --git a/src/app/routes/data-v/workstation/workstation.component.ts b/src/app/routes/data-v/workstation/workstation.component.ts index c225c96..f9ae9b4 100644 --- a/src/app/routes/data-v/workstation/workstation.component.ts +++ b/src/app/routes/data-v/workstation/workstation.component.ts @@ -51,16 +51,18 @@ export class DataVWorkstationComponent implements OnInit, AfterViewInit { return parseInt(params.node.id) + 1; }, width: 90, + // flex: 2, sortable: true, unSortIcon: true, field: 'xh' }, - { headerName: '任务名称', unSortIcon: true, field: 'rwmc' }, - { headerName: '任务描述', unSortIcon: true, field: 'rwms', minWidth: 170, flex: 1 }, - { headerName: '开始时间', unSortIcon: true, field: 'kssj', minWidth: 170, flex: 1 }, - { headerName: '计划完成时间', unSortIcon: true, field: 'jhwcsj', minWidth: 170, flex: 1 }, - { headerName: '超期', width: 80, field: 'sfcq' }, - { headerName: '操作', autoHeight: true, width: 110, field: 'cz', cellRenderer: GridButtonValueRenderer } + + { headerName: '任务名称', unSortIcon: true, width: 120, field: 'rwmc' }, + { headerName: '任务描述', unSortIcon: true, field: 'rwms', width: 120 }, + { headerName: '开始时间', unSortIcon: true, field: 'kssj', width: 180 }, + { headerName: '计划完成时间', unSortIcon: true, field: 'jhwcsj', width: 180 }, + { headerName: '超期', width: 70, field: 'sfcq' }, + { headerName: '操作', width: 90, autoHeaderHeight: true, field: 'cz', cellRenderer: GridButtonValueRenderer } ]; colDefs2: ColDef[] = [ diff --git a/src/assets/dashboard/setting.svg b/src/assets/dashboard/setting.svg new file mode 100644 index 0000000..4684810 --- /dev/null +++ b/src/assets/dashboard/setting.svg @@ -0,0 +1 @@ + \ No newline at end of file