diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
index 43a8407..36cb11d 100644
--- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
+++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
@@ -24,7 +24,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
//饼图
myChart
option = {
- color: ['#FF4B65', '#23D9FF', '#608AFF', '#B2FF6D', '#FFFF99', '#C4E2FC', '#FF7F00', '#0090FF', '#FFD634', '#105597', '#FF4B65', '#23D9FF', '#71FFF5', '#B2FF6D'],
+ color: ['#91CCFF', '#46DFFF', '#36A2FF', '#FF6181', '#B4C3FF', '#FF9963', '#5A9CFF', '#4BFFD4', '#46DFFF', '#91CCFF'],
tooltip: {
trigger: 'item'//触发类型
},
diff --git a/src/app/pages/criminal-records/criminal-records.component.ts b/src/app/pages/criminal-records/criminal-records.component.ts
index 6bb0763..73decb9 100644
--- a/src/app/pages/criminal-records/criminal-records.component.ts
+++ b/src/app/pages/criminal-records/criminal-records.component.ts
@@ -22,7 +22,7 @@ export class CriminalRecordsComponent implements OnInit {
myChart: any //左侧饼图
option = {
- color: ['#FF4B65', '#23D9FF', '#608AFF', '#B2FF6D', '#FFFF99', '#C4E2FC', '#FF7F00', '#0090FF', '#FFD634', '#105597', '#FF4B65', '#23D9FF', '#71FFF5', '#B2FF6D'],
+ color: ['#91CCFF', '#46DFFF', '#36A2FF', '#FF6181', '#B4C3FF', '#FF9963', '#5A9CFF', '#4BFFD4', '#46DFFF', '#91CCFF'],
tooltip: {
trigger: 'item'//触发类型
},
diff --git a/src/app/pages/plan-admin/file-license-list/file-license-list.component.html b/src/app/pages/plan-admin/file-license-list/file-license-list.component.html
index 7433900..bf4770a 100644
--- a/src/app/pages/plan-admin/file-license-list/file-license-list.component.html
+++ b/src/app/pages/plan-admin/file-license-list/file-license-list.component.html
@@ -1,4 +1,4 @@
-
+
@@ -29,13 +29,14 @@
-
+
-
+
@@ -47,12 +48,13 @@
-
+
- 序号 |
-
+ | 序号 |
+
{{item.name}}
|
@@ -60,9 +62,9 @@
- {{key + 1}} |
-
-
+ | {{key + 1}} |
+
@@ -70,7 +72,7 @@
- {{i.value}}
+ {{i.value}}
diff --git a/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts b/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts
index 516452a..5be13a4 100644
--- a/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts
+++ b/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts
@@ -24,9 +24,11 @@ export class FileLicenseListComponent implements OnInit {
constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private element: ElementRef, private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router, private message: NzMessageService) { }
tableScrollHeight
+ tableScrollWeight
resizeListener
async ngOnInit(): Promise {
this.tableScrollHeight = '100px'
+ this.tableScrollWeight = '100px'
// 页面监听
this.resizeListener = fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
@@ -171,6 +173,7 @@ export class FileLicenseListComponent implements OnInit {
setTimeout(() => {
let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
+ this.tableScrollWeight = (this.list[0].length + 1) * 100 + 'px'
}, 0);
diff --git a/src/app/pages/plan-admin/update-license-list/update-license-list.component.html b/src/app/pages/plan-admin/update-license-list/update-license-list.component.html
index 2b86619..a1b4c24 100644
--- a/src/app/pages/plan-admin/update-license-list/update-license-list.component.html
+++ b/src/app/pages/plan-admin/update-license-list/update-license-list.component.html
@@ -63,9 +63,9 @@
[nzScroll]="{ x: tableScrollWeight,y:tableScrollHeight}" [nzNoResult]='null' nzTableLayout="fixed">
- 序号 |
+ 序号 |
+ [nzLeft]=" k <=2 ? (k*120 + 60)+'px' : false" [nzWidth]="k <= 2 ? '120px' : '180px'">
{{item.name}}
|
@@ -75,7 +75,8 @@
{{key + 1}} |
-
+ |
- {{i.value}}
+ {{i.value}}
@@ -96,6 +97,5 @@
|
|
-
\ No newline at end of file
diff --git a/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts b/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts
index c4dfb6e..e42402c 100644
--- a/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts
+++ b/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts
@@ -169,7 +169,7 @@ export class UpdateLicenseListComponent implements OnInit {
setTimeout(() => {
let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
- this.tableScrollWeight = (this.list[0].length+1)*100 +'px'
+ this.tableScrollWeight = (this.list[0].length + 1) * 100 + 'px'
}, 0);
this.list = this.list.concat(arr);