From 28199e41cb01f682c65c7de289f31f28538b441f Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Sun, 27 Sep 2020 19:57:57 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/my-paginator.ts                       | 29 +++++++++++++++++++
 .../basicinfo-look/basicinfo.component.html   |  4 +--
 .../basicinfo-look/basicinfo.component.scss   | 13 ++++++++-
 src/app/ui/ui.module.ts                       |  4 ++-
 src/styles.scss                               |  7 +++++
 5 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 src/app/my-paginator.ts

diff --git a/src/app/my-paginator.ts b/src/app/my-paginator.ts
new file mode 100644
index 0000000..9d5ecbb
--- /dev/null
+++ b/src/app/my-paginator.ts
@@ -0,0 +1,29 @@
+import { MatPaginatorIntl } from '@angular/material/paginator';
+
+
+const dutchRangeLabel = (page: number, pageSize: number, length: number) => {
+  if (length === 0 || pageSize === 0) { return `0 到 ${length}`; }
+  length = Math.max(length, 0);
+  const startIndex = page * pageSize;
+  const endIndex = startIndex < length ?
+    Math.min(startIndex + pageSize, length) :
+    startIndex + pageSize;
+  return `${startIndex + 1} - ${endIndex} / ${length}条`;
+
+}
+
+export function myPaginator() {
+
+  const paginatorIntl = new MatPaginatorIntl();
+
+  paginatorIntl.itemsPerPageLabel = '每页条数:';
+
+  paginatorIntl.nextPageLabel = '下一页:';
+
+  paginatorIntl.previousPageLabel = '上一页:';
+
+  paginatorIntl.getRangeLabel = dutchRangeLabel;
+
+  return paginatorIntl;
+
+}
diff --git a/src/app/ui/basicinfo-look/basicinfo.component.html b/src/app/ui/basicinfo-look/basicinfo.component.html
index 61556ec..045671a 100644
--- a/src/app/ui/basicinfo-look/basicinfo.component.html
+++ b/src/app/ui/basicinfo-look/basicinfo.component.html
@@ -111,11 +111,11 @@
 
     <!-- body -->
     <div class="bottombox" style="flex: 70%;overflow-y: auto;" >
-        <div class="houseinfobox" style="height: 100%; overflow-y: auto;padding-bottom: 64px; box-sizing:border-box">      
+        <div class="houseinfobox" style="height: 100%; overflow-y: auto; box-sizing:border-box">      
                 <!-- <button type="button" mat-icon-button class="addhouseinfo"><mat-icon style="font-size: 38px;">add_circle_outline</mat-icon></button> -->
                 <mat-tab-group style="height: 100%;;" >
                     <mat-tab [label]="item.username" *ngFor="let item of houses;let key = index">
-                        <form  style="height: 100%; overflow-y:auto; display: block;" (ngSubmit)="onSubmit2(form.value,item,key,form.invalid)" #form="ngForm" class="example-container">
+                        <form  style="height: 100%; overflow-y:auto; overflow-x: hidden;display: block;" (ngSubmit)="onSubmit2(form.value,item,key,form.invalid)" #form="ngForm" class="example-container">
                             
                             <!-- 正常建筑 -->
                             <div class="highinfo" *ngIf="item.tongyong">
diff --git a/src/app/ui/basicinfo-look/basicinfo.component.scss b/src/app/ui/basicinfo-look/basicinfo.component.scss
index 658074b..4a3260c 100644
--- a/src/app/ui/basicinfo-look/basicinfo.component.scss
+++ b/src/app/ui/basicinfo-look/basicinfo.component.scss
@@ -106,6 +106,7 @@
     }
 }
 .bottombox{
+    color: white!important;
     // height:400px;
     width: 100%;
     // background-color: skyblue;
@@ -204,7 +205,7 @@ table{
 .tankinfo{
     display: block;
     width: 100%;
-    // height: 45px;
+    border: 0px;
     text-align: center;
 }
 // .adddeviceinfo{
@@ -268,4 +269,14 @@ textarea {
 
   .mat-expansion-panel{
     background-color:transparent!important
+}
+
+textarea,table,td,th,tr,input{
+   background-color: transparent;
+   border-collapse: collapse!important;
+   color: white!important
+}
+.mat-tab-label-content{
+    color: white!important;
+    opacity: 1!important;
 }
\ No newline at end of file
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index 9f34a9e..fc56b05 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -75,6 +75,7 @@ import { KeySiteLookComponent } from './key-site-look/key-site.component';
 import { KeySiteImgs2 } from './key-site-look/keysiteimgs.component';
 import { RealisticPictureLookComponent, previewImg3 } from './realistic-picture-look/realistic-picture.component';
 import { ThreetypePlanComponent } from './threetype-plan/threetype-plan.component';
+import { myPaginator } from '../my-paginator';
 
 @NgModule({
   declarations: [SafeHtmlPipe,GisComponent,UiComponent,PersonaldataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent, DisposalNodeComponent, DangerousComponent, SimilarPlansComponent, RealCasesComponent, PlanAssistanceComponent,planComponent, DataPushComponent,BasicinfoLookComponent,LookMaster2,AllaroundComponent,ImgDetails,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,KeySiteLookComponent,KeySiteImgs2,previewBigImg2,RealisticPictureLookComponent,previewImg3, ThreetypePlanComponent],
@@ -133,6 +134,7 @@ import { ThreetypePlanComponent } from './threetype-plan/threetype-plan.componen
 
   exports:[
     CollectionToolsComponent
-  ]
+  ],
+  providers: [ { provide: MatPaginatorIntl, useValue: myPaginator() } ]
 })
 export class UiModule { }
diff --git a/src/styles.scss b/src/styles.scss
index 33b023e..a463f88 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -83,4 +83,11 @@ table td.mat-footer-cell:last-of-type{
 }
 .mat-tab-body-content{
 	overflow: hidden!important;
+}
+// .mat-tab-labe{
+// 	opacity: 1!important;
+// }
+.mat-tab-label-content{
+    color: white;
+    // opacity: 1!important;
 }
\ No newline at end of file