From 1db3179f12219ed43340cfa6d26a0ee92b4f763d Mon Sep 17 00:00:00 2001 From: "lijie.hu" Date: Wed, 3 Apr 2024 16:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=A1=A8=E6=A0=BC=E7=9A=84?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lj-car-ag-grid-componentcomponent.less | 36 +++- .../lj-car-info-table.component.css | 6 +- .../lj-car-info-table.component.ts | 60 +++++- .../data-v/lj-card/lj-card.component.less | 2 +- .../lj-dashboard/lj-dashboard.component.css | 1 + .../lj-dashboard/lj-dashboard.component.html | 4 +- .../lj-text-dashboard.component.css | 14 +- .../lj-text-dashboard.component.html | 3 +- .../lj-text-dashboard.component.ts | 3 + .../data-v/second1/second1.component.html | 16 +- .../data-v/second1/second1.component.less | 16 +- .../data-v/second1/second1.component.ts | 174 ++++++++++++++++-- .../lj-ag-grid-component.component.html | 1 + .../lj-ag-grid-component.component.less | 1 + .../lj-ag-grid-component.component.ts | 4 +- .../workstation/workstation.component.less | 2 +- 16 files changed, 295 insertions(+), 48 deletions(-) diff --git a/src/app/routes/data-v/lj-car-info-table/lj-car-ag-grid-component/lj-car-ag-grid-componentcomponent.less b/src/app/routes/data-v/lj-car-info-table/lj-car-ag-grid-component/lj-car-ag-grid-componentcomponent.less index 7a247bd..9149f57 100644 --- a/src/app/routes/data-v/lj-car-info-table/lj-car-ag-grid-component/lj-car-ag-grid-componentcomponent.less +++ b/src/app/routes/data-v/lj-car-info-table/lj-car-ag-grid-component/lj-car-ag-grid-componentcomponent.less @@ -1,3 +1,37 @@ /* Core Grid CSS */ @import 'ag-grid-community/styles/ag-grid.css'; -@import 'ag-grid-community/styles/ag-theme-quartz.css'; \ No newline at end of file +@import 'ag-grid-community/styles/ag-theme-quartz.css'; +.ag-cell { + padding-right: 5px !important; + padding-left: 5px !important; + } + ::-webkit-scrollbar { + width:12px; + color: black; +} +::-webkit-scrollbar-thumb { + border-radius:10px; + background:rgba(0,0,0,0.1); + -webkit-box-shadow:inset006pxrgba(0,0,0,0.5); +} +::-webkit-scrollbar-thumb:window-inactive { + background:rgba(255,0,0,0.4); + } + .ag-body-horizontal-scroll-viewport::-webkit-scrollbar-thumb { + background-color: rgba(0,0,0,0.1); + + width:10px; +} + +/* 定义垂直滚动条的宽度和背景颜色 */ +.ag-body-vertical-scroll::-webkit-scrollbar { + width: 12px; + background-color: #f5f5f5; /* 滚动条背景颜色 */ +} + +/* 定义滚动条滑块的样式 */ +.ag-body-vertical-scroll::-webkit-scrollbar-thumb { + background-color: #4CAF50; /* 滚动条滑块颜色 */ + border-radius: 6px; /* 滚动条滑块圆角 */ + border: 3px solid #f5f5f5; /* 滚动条滑块边框 */ +} diff --git a/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.css b/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.css index 2c110f3..a050816 100644 --- a/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.css +++ b/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.css @@ -121,6 +121,7 @@ border-radius: 3px; .table-header span { flex: 1; /* 每个元素占据等宽 */ font-size: 12px; + color: #75F9FD; text-align: center; /* 文本居中 */ } @@ -148,4 +149,7 @@ border-radius: 3px; - \ No newline at end of file +.ag-cell { + padding-right: 5px !important; + padding-left: 5px !important; +} diff --git a/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.ts b/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.ts index 6c1d9b6..8e883e6 100644 --- a/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.ts +++ b/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.ts @@ -78,19 +78,59 @@ export class DataVLjCarInfoTableComponent implements OnInit { valueGetter: function (params: any) { return parseInt(params.node.id) + 1; }, - width: 20, - cellStyle: { 'font-size': '8px' }, + width: 50, + cellStyle: { 'font-size': '13px' }, field: 'xh' }, - { headerName: '时间', field: 'time', width: 60, cellStyle: { 'font-size': '8px' } }, - { headerName: '车牌', field: 'carNo', width: 60, cellStyle: { 'font-size': '8px' } }, - { headerName: '车型', field: 'carType', width: 50, cellStyle: { 'font-size': '8px' } }, - { headerName: '卡号', field: 'no', width: 50, cellStyle: { 'font-size': '8px' } }, - { headerName: '供应商', width: 50, field: 'supplier', cellStyle: { 'font-size': '8px' } }, - { headerName: '毛重', width: 50, field: 'grossWeight', cellStyle: { 'font-size': '8px' } }, - { headerName: '上报热值', width: 50, field: 'reportHotValue', cellStyle: { 'font-size': '8px' } }, - { headerName: '估算热值', width: 50, field: 'estimateValue', cellStyle: { 'font-size': '8px' } } + { + headerName: '时间', + field: 'time', + width: 60, + cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' } + }, + { + headerName: '车牌', + field: 'carNo', + width: 50, + cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' } + }, + { + headerName: '车型', + field: 'carType', + width: 50, + cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' } + }, + { + headerName: '卡号', + field: 'no', + width: 50, + cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' } + }, + { + headerName: '供应商', + width: 55, + field: 'supplier', + cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' } + }, + { + headerName: '毛重', + width: 55, + field: 'grossWeight', + cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' } + }, + { + headerName: '上报热值', + width: 55, + field: 'reportHotValue', + cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' } + }, + { + headerName: '估算热值', + width: 55, + field: 'estimateValue', + cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' } + } // { headerName: '操作', width: 90, field: 'cz', cellRenderer: GridButtonValueRenderer } ]; 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 43ebe78..6d0f3dc 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 @@ -34,7 +34,7 @@ border-radius: 3px; .card-content { overflow: hidden; - height: 250px; + // height: 100%; margin-bottom: 0.5rem; padding: 1rem 1.5rem; padding: 1rem; diff --git a/src/app/routes/data-v/lj-dashboard/lj-dashboard.component.css b/src/app/routes/data-v/lj-dashboard/lj-dashboard.component.css index f736ef5..74a6b81 100644 --- a/src/app/routes/data-v/lj-dashboard/lj-dashboard.component.css +++ b/src/app/routes/data-v/lj-dashboard/lj-dashboard.component.css @@ -19,6 +19,7 @@ .ag-header-center .ag-header-group-cell-label, .ag-header-center .ag-header-cell-label { display: grid; + justify-content: center; width: 100%; text-align: center; } \ No newline at end of file diff --git a/src/app/routes/data-v/lj-dashboard/lj-dashboard.component.html b/src/app/routes/data-v/lj-dashboard/lj-dashboard.component.html index b5ce63a..21001d4 100644 --- a/src/app/routes/data-v/lj-dashboard/lj-dashboard.component.html +++ b/src/app/routes/data-v/lj-dashboard/lj-dashboard.component.html @@ -1,6 +1,6 @@
- - + +
diff --git a/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.css b/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.css index 83f7461..7054192 100644 --- a/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.css +++ b/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.css @@ -1,10 +1,12 @@ - .chart-card { - display: flex; - flex-direction: column; - align-items: center; - text-align: center; - } +.chart-card { + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-around; /* 或者使用 space-between 根据您的喜好 */ + text-align: center; +} + .chart-text { margin: 0; diff --git a/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.html b/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.html index 0917fe1..9354ee1 100644 --- a/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.html +++ b/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.html @@ -3,5 +3,6 @@

{{ text }}

- + + diff --git a/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.ts b/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.ts index c5a2e03..e20334e 100644 --- a/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.ts +++ b/src/app/routes/data-v/lj-text-dashboard/lj-text-dashboard.component.ts @@ -15,6 +15,9 @@ import * as echarts from 'echarts'; export class DataVLjTextDashboardComponent implements OnInit { @Input() chartId: string = ''; @Input() text: string = ''; + @Input() locationTitle1: string = ''; + + @Input() locationTitle2: string = ''; ngOnInit(): void { // 使用 setTimeout 确保视图已经初始化 setTimeout(() => this.initCharts(), 0); diff --git a/src/app/routes/data-v/second1/second1.component.html b/src/app/routes/data-v/second1/second1.component.html index 5798ae5..a838380 100644 --- a/src/app/routes/data-v/second1/second1.component.html +++ b/src/app/routes/data-v/second1/second1.component.html @@ -2,18 +2,17 @@
@@ -36,7 +35,12 @@
Car Image
-
2.5D图
+
正在处理，请稍候...
+
Car Image
@@ -52,7 +56,7 @@