From 608b8aac59dd0ab5c93bc54d5a9bb8e7d9c8858a Mon Sep 17 00:00:00 2001 From: "lijie.hu" Date: Mon, 1 Apr 2024 16:01:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 6 ++ package.json | 1 + .../lj-text-dashboard.component.css | 10 +- .../lj-text-dashboard.component.html | 2 +- .../lj-text-dashboard.component.ts | 9 ++ .../data-v/second1/second1.component.html | 38 ++++++- .../data-v/second1/second1.component.less | 96 +++++++++++++++++- .../data-v/second1/second1.component.ts | 31 +----- .../lj-ag-grid-component.component.html | 8 +- .../lj-ag-grid-component.component.less | 7 ++ .../lj-ag-grid-component.component.ts | 10 +- src/assets/car-status-bg.png | Bin 0 -> 17311 bytes src/assets/lock.svg | 1 + src/assets/unLock.svg | 1 + yarn.lock | 5 + 15 files changed, 187 insertions(+), 38 deletions(-) create mode 100644 src/assets/car-status-bg.png create mode 100644 src/assets/lock.svg create mode 100644 src/assets/unLock.svg diff --git a/package-lock.json b/package-lock.json index 2bb4f8a..3f507de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,6 +31,7 @@ "@types/signalr": "^2.4.3", "@types/three": "^0.162.0", "ag-grid-angular": "^31.0.2", + "autofit.js": "^3.1.0", "echarts": "^5.5.0", "moment": "^2.30.1", "mqtt": "^5.3.6", @@ -5615,6 +5616,11 @@ "dev": true, "license": "MIT" }, + "node_modules/autofit.js": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/autofit.js/-/autofit.js-3.1.0.tgz", + "integrity": "sha512-zX/2VbpxdDcgDDCT1A0psuF8Phs8QbmFXstvLkqrrOcv33LQttCh2J6GVs84585+LfMAfacemxRXIidrFXu02g==" + }, "node_modules/autoprefixer": { "version": "10.4.16", "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.16.tgz", diff --git a/package.json b/package.json index 1c6198c..afb20ac 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "@types/signalr": "^2.4.3", "@types/three": "^0.162.0", "ag-grid-angular": "^31.0.2", + "autofit.js": "^3.1.0", "echarts": "^5.5.0", "moment": "^2.30.1", "mqtt": "^5.3.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 266fdf7..e257242 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 @@ -15,8 +15,8 @@ .chart-button { - width: 175px; -height: 51px; + width: 17rem; + height: 5; margin: 5px; font-size: 28px; line-height: 22px; @@ -29,4 +29,10 @@ height: 51px; background-size: contain; /* 或者可以使用 'contain' 根据你的需要 */ border-width: 0; } + + .chart-container { + width: 10rem; + height: 10rem; + } + \ No newline at end of file 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 adf5b20..0917fe1 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 @@ -1,6 +1,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 89e1aa2..c5a2e03 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 @@ -2,7 +2,9 @@ import { CommonModule } from '@angular/common'; import { Component, Input, OnInit, ViewChild, inject } from '@angular/core'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { SHARED_IMPORTS } from '@shared'; +import autofit from 'autofit.js'; import * as echarts from 'echarts'; + @Component({ selector: 'app-data-v-lj-text-dashboard', standalone: true, @@ -16,6 +18,13 @@ export class DataVLjTextDashboardComponent implements OnInit { ngOnInit(): void { // 使用 setTimeout 确保视图已经初始化 setTimeout(() => this.initCharts(), 0); + // autofit.init(); + // autofit.init({ + // dh: 1080, + // dw: 1920, + // el: 'body', + // resize: true + // }); } initCharts(): void { diff --git a/src/app/routes/data-v/second1/second1.component.html b/src/app/routes/data-v/second1/second1.component.html index 1e9b299..e489c6a 100644 --- a/src/app/routes/data-v/second1/second1.component.html +++ b/src/app/routes/data-v/second1/second1.component.html @@ -1,5 +1,5 @@
-
+
-
+ +
+ +
+ + + + + + +
+
+
+
+ Car Image +
+
+ Long Image +
+
+
车牌号: 苏E8888
+
卡车种类:重型火卡
+
重量:30吨
+
+
+
+
+ +
+
-
共1222 {{ pageRowTotal }} 项数据
+
共 {{ pageRowTotal }} 项数据
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 2386fb8..b10d4d7 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 @@ -2,6 +2,8 @@ @import 'ag-grid-community/styles/ag-grid.css'; @import 'ag-grid-community/styles/ag-theme-quartz.css'; + + .custom-label { display: inline-block; padding: 10px 20px; /* 内边距 */ @@ -32,3 +34,8 @@ width: 100%; height: 100%; } + +/* stylelint-disable-next-line selector-class-pattern */ +.paginationThemeClass{ + width: 100%; +} 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 bbcf95b..bc94f06 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 @@ -24,7 +24,8 @@ export class LjAgGridComponentComponent implements OnInit { // }; gridOptions: GridOptions = { - headerHeight: 0 + headerHeight: 0, + suppressHorizontalScroll: false // columnDefs="columnDefs" }; @@ -120,6 +121,13 @@ export class LjAgGridComponentComponent implements OnInit { }; } //每页数 + onGridReady(params: any) { + console.log('onGridReady'); + console.log(params); + setTimeout(() => { + params.api.sizeColumnsToFit(); + }, 100); + } nzPageSizeChange(_pageSize: any) { this.pageSize = _pageSize; } diff --git a/src/assets/car-status-bg.png b/src/assets/car-status-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..600777cb2f890f0e4572f235b856d803620e39af GIT binary patch literal 17311 zcmeHPdpK0<+g22v9CnEcW7jSn`Auny!DyFew-uf3oW^hLsFZPt!I&93AVOzjW5%W; z#SoF>D2K5T)s!>CV1@>RVaAx#x7s^d`}^zr>pNZR50~p=t!F*!dGF_b@ArA%XWcwz zk6N{S{c!&9u;gze#>FIh8;Wab3OQV^z!}J8K@dm?$xX82l^@BU&e{8RA(uI zp_Bxgyo)6!(y47+G1tnz5bdWX#|mMxzU~9QIXjkV8rp;_En2Lirde+|QB{nbK9<@x z{Y)@HNR>sj?38xFPqv7E9>@2fzFq}fZetL^eP~j`iJ&LpJY0*<#gXk4uXwbC)E{}- zrICKde_8w6Y?PaOTcb0py-+wg66;gxe^j6L=UTW9x@(5TNZrlb6S%Vf$d_k-b>jEU zc@?6h-mXf2;VTQb2b(b*w*XdKUGqLs%V*uHq=gIBOi#K8h*sN;%jcGG9c87Rn>cLm zwNi%P9wM(a8#ZnUHfoah?@!e%mx;I%YVOqImxr3VpYi4F_LD5Zr*w2q+o_TMouJFN zuL+jqn8k9b(jj_SAC{xwXUFH{7<0lt_afIJ#!@z@Bc##s*q)Nh9+P#?5ZS-inuGk( z+ZfUBk$I(D{6NR7vXs~HDT7}gBHwY^lJ+pVWHuXt3>lpcz*?3o!sEI8&=9-H!8iOh zh~i6G77E z)9p@pWtn0;(Scl;9)9X=A+9&GcvY`r%3b^&@nm zen8r=tGJIeKKIOyet&ATVWVgBX`GAo+@n3De@$fl5rqqV=S<^or<5yNFXl%(7DsqwQe0E~`=cx<({KL* zQ1I{$R^&T(f%ijUspkF-)0?kFCRo3qH98v4`Q%@CJD@7CW`RcT-A@q_*P?Xx(4@b? z-QT^7r?DocJrrKANq7YxHXN*~4=QhMbRGK}7yH}_tdkjPs7 zH4^{~yz`GZe(#BPX0xoAU_U9nXNN4FsB6qc-af9e9m64hE?QPyXHW2-s2{NKI(>Z2 zGtyi}x~NS9R*#oH1jWW?@#^N%tbP66u?YL=&iKUM?zxXIl3ZDH6-GkbsB%16M4ZNN zVjNA$_pBfGBgi%UC~p2H)EK)g!yn}|nGLYwCq|a=7-J=nx%_GhX$V$4f-xxwoGdNLgr4?ru!_jsWnP28- zN6|mc#FfByZ0g`gm$2;`Dag>#!F+;#d%>mS?*;YB=WufhP*f+3*XSZHpYfZ*qB}yS z04($xk%TB$Ggmo|Fgfa2<05|?)wT+T7@DnAcM`QH#Ez?$_1<{)uiYS4lkD*QAmQi? z*b^KWRDNgWxwg^=baLS!N#0*)kK7(dX31hz%TTwF7yQu)PKw!<*u8fA4i-+L4>H2X zMC{>`%JJ9meJ4dO*5|XebyGp( zs;t#6fW5Kg9-tb>>+Z`M@JepAuAHUtOr)sdW|HE@;~j_W$rcqfMtR=ne)dzU zbl9esR}4bD=2jsOd0os?rJ-jN6N%%Bp-!)wCdC^QgAL~W_nQ?Px#?Sfw3MCCzc?wH z1Vz!NFHL1ja~KI8(wY*_s+_6wE^DKO`pVhK#&ii)KCFl(hfvW|^;w6R&Eq`naKHs* zLHe&Dik#Z(f+*&stko_W0MrS->tuzT&B z^0>(BA>&cVlX|VBD(n5fZ1NPl7O&|FExYjD0_WHmCReQ!SUatRA#7`YTaD8K`FVKp z#w|Bnz%d(Ks|hcu{f9KT8yxF0YvCcce=x+{oeetzQWQRmwC*`~ z6F?sSuq>MVgEb5^*teZ+Y6jQhU?AI&OHh;`EI}Cu@e)Lp(1Zd_yO216^b({h7m8Vs z_J&p{(4q-iTK*3&z->Zmq~g1&8C&cT7tzH#>AZ&+XDsf6GPnew6rrp&ya!|86nu^z zvXNtBDFYWVe+P;PZ>!>sKy_`WMOr6wGMS)qQr20UnvW|-gBSQuC0kn){wdTV4pcXT zOnr$D6sx~B4j?cqRIZ7=nFe3Hfj48Z+x=9abnFp zZUJW+0IgJV2MzM!o#7%aX4<*nf1r~~rB z^knKY?5=36I`pHnjre!+KzgXMN#Hhwnjx&BdnX{s!?9kPlF}z78c6uCF+O z(DgN~{;SCdFqS;*&*tN+GxcB6%uK#6t*+Hgf*B!w#q>J3#;)=gEK9A`GHg}YLOwff zHpDo+G)@2=&9SMO-2kST(*RSP=1u(yO7DZW=%6%Kfs6prfMNpS#0JWp&BqMj^Cy3L z+fFs|OCPtlcJ*XOSb^&~L0=fDvDBV#=1^0JuXc0zrX~!@;nB;AjtwlxmuNsirDNMc zq;(Y#Q0^=Cs(<64h+*Jt%3S2zh0|(~nR&W~V)ISoLb#ci<4{h`FLEHFfQSN`V7|_z zP%=Qt03`#I43ND3TOL3%36e?wKi8T+*ftr&?xnvf`&ChM*L`OlxKRIe@nbE4Jb~rc z|DIu>5TO!MEsL0%Cb?+W=V$$KlMO{jkESxqzOAa%G}R3M|@d%eJT>r!=t%9abE ziGiuTSiXY$!JDr@XE<1nvGj;F;qe(X*V42vZDC8(;ETVl-WM%C`kk&tsEeO8NoNh? zhf(X+*bOOzIgR#^nGMUj9rmCVF03flR(Yp6rMhaL8wr*Q53 zv<=vF+U_eI;pzZQZ+XL{!M^y_<*(!;nL(G_NFC|PG#5e3Mvj@{6sN$IWw2K~jkHWx zR1xF~ku+EGIv3O9f%MsS&kJ;l(l={KWL(ljGm@~*D&!C&v%E-9Yvwk3HlUioN|D^C zKz`QU7Jw9H1jJkTur(44@Na7DjeJOdWd15?#K$C>S>v*}I3(y@cYR0pjJ|gy#J~ODn%b6d7y%ioQ}+502NUoJ}Z`PmvEZ zY2(QA6aA^i&Z2gQSPDu<8%v*@lUFkM|Aepqn{BoC1;)GL*TbI-n3`N3?kFS#w4ii) zf@@P%cTep{HBs!0XWR9SR>A_huWAiA{N6e8!AfD3L_ryBEt-CAc^fC*1$ygUYle}& z$KV%QYinPv;|7MwoUxT|m)s;ZI2~z%x#F|?p(8Qm3Z3Q(VebZ@MbB@nDkCyTnz@@t zbvZF@`QlZu;3Y|jMIp#$lE`@q2Kro=F4x;LRETK^f$dzXzOHpL5Ewlw;oLwei(e{^ zK^u&!Jvi7zX*3a!Ud>mI*Q-1~c>O8U!ioblBd@h;T&t7ZYK&|b{iAg@a@k5<(??|g zUey?&q4?9}Ic#~UU~E@QZn?M;+f-pOBYt4p)Em`Q!KtLhr36n=SL*F9A0WMaf*U$e zTaaLE478?M&B!W2N3;4gm+Rpgp0jI2ZfEp*N$w2C@>f1H+4{*pqF)R5S6QHy?rlAqc&gi5d^R(1=i+@~r-hdPc5Z2ZH%;YxeoKX8{(&(scJ;2xU0q zD#~Z#a(Jy_gnlyL8M~TMLSMIo$!tUYG9wbP@3xlgSy*8KXq?X%RXwDjP4Jk3 zYynj)L>KUZR?i@{>t;x@DO3Pqd!trNQw3-1u(q&g^86{99&pgfeu|^S+P{fXJM^!o+yx zC*>Bzk*u3cuQL-tsK4r*#q`G{;EMtKzkC#iqKD{vV>DBysf(enM0(+0rRt) zwlHkQL0dD1Md8smE6~h^-a0iSL(H3;k2VXT!vK56?UKC \ No newline at end of file diff --git a/src/assets/unLock.svg b/src/assets/unLock.svg new file mode 100644 index 0000000..aca8956 --- /dev/null +++ b/src/assets/unLock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 05d03f8..3bcfdb5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2931,6 +2931,11 @@ asynckit@^0.4.0: resolved "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== +autofit.js@^3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/autofit.js/-/autofit.js-3.1.0.tgz" + integrity sha512-zX/2VbpxdDcgDDCT1A0psuF8Phs8QbmFXstvLkqrrOcv33LQttCh2J6GVs84585+LfMAfacemxRXIidrFXu02g== + autoprefixer@10.4.16: version "10.4.16" resolved "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.16.tgz"