From fa86adfe87c91a5a6d1dca69639f2ef50c63d87d Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 6 Apr 2021 08:43:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E9=99=A4=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=86=E6=9E=90=E9=A1=B5=E9=9D=A2=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2pad=E7=AB=AF=E9=80=82?= =?UTF-8?q?=E9=85=8D=E4=BB=A5=E5=8F=8Aui=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 3 + src/app/app.component.ts | 16 +++++- src/app/app.module.ts | 4 +- .../fire-force/fire-force.component.html | 5 +- .../fire-force/fire-force.component.scss | 19 ++++++ .../fire-force/fire-force.component.ts | 6 ++ .../linkage-forces.component.html | 5 +- .../linkage-forces.component.scss | 18 ++++++ .../linkage-forces.component.ts | 6 ++ .../water-collection.component.html | 5 +- .../water-collection.component.scss | 19 ++++++ .../water-collection.component.ts | 8 +++ .../allaround/allaround.component.scss | 42 +++++++++++--- .../fire-facilities.component.scss | 23 +++++++- .../realistic-picture.component.scss | 31 +++++++++- .../gis-labeling/gis-labeling.component.html | 12 ++-- .../gis-labeling/gis-labeling.component.scss | 38 +++++++++--- .../key-site-look/key-site.component.scss | 30 +++++++++- .../plan-list/openPlanTool.scss | 8 ++- .../plan-list/plan-list.component.scss | 2 +- .../realistic-picture.component.scss | 31 +++++++++- src/app/home/home.component.ts | 1 + .../allaround/allaround.component.scss | 32 +++++++++-- .../basicinfo/basicinfo.component.html | 14 ++--- .../basicinfo/basicinfo.component.scss | 13 ++++- .../fire-fighting-device.component.scss | 54 +++++++++++++++--- .../fire-fighting-device.component.scss | 54 +++++++++++++++--- .../key-site-look/key-site.component.scss | 32 ++++++++++- .../key-unit/key-site/key-site.component.scss | 32 ++++++++++- .../key-unit-management.component.ts | 1 + .../realistic-picture.component.scss | 32 ++++++++++- .../realistic-picture.component.scss | 31 +++++++++- .../router-gis/router-gis.component.scss | 12 +++- .../water-road/water-road.component.scss | 2 +- src/app/navigation/navigation.component.html | 2 +- src/app/navigation/navigation.component.scss | 5 ++ .../delete-two/delete-two.component.scss | 2 +- .../home/home.component.html | 4 +- .../statistic-analysis/home/home.component.ts | 49 +++++++++++----- .../scheduled-updates.component.scss | 2 +- src/app/test/test.component.html | 1 + src/app/test/test.component.scss | 0 src/app/test/test.component.spec.ts | 25 ++++++++ src/app/test/test.component.ts | 17 ++++++ .../collection-tools.component.scss | 2 +- .../collection-tools.component.scss | 23 +++++++- .../editingFireControl.html | 2 +- .../fire-fighting-template.component.scss | 33 ++++++++++- .../newFireFighting.html | 2 +- .../material-bank.component.scss | 9 ++- .../material-bank/material-bank.component.ts | 2 +- src/assets/css/newStyle.css | 27 ++++++++- src/assets/images/向下收起.png | Bin 0 -> 890 bytes src/index.html | 1 + src/styles.scss | 5 ++ 55 files changed, 736 insertions(+), 118 deletions(-) create mode 100644 src/app/test/test.component.html create mode 100644 src/app/test/test.component.scss create mode 100644 src/app/test/test.component.spec.ts create mode 100644 src/app/test/test.component.ts create mode 100644 src/assets/images/向下收起.png diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index cb3680e..a034b60 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -17,6 +17,7 @@ import { PlanPassComponent } from '../app/plan-audit/plan-pass/plan-pass.compone import {AuthGuard} from './auth.guard' import {MTokenK1Component} from './m-token-k1/m-token-k1.component' //K1秘钥 import {ViewUnitDetailsPlanComponent} from './key-unit/view-unit-details-plan/view-unit-details-plan.component' +import { TestComponent } from './test/test.component'; const routes: Routes = [ @@ -40,6 +41,8 @@ const routes: Routes = [ { path:'keyUnit/viewunitinfoplans', component:ViewUnitDetailsPlanComponent,canActivate: [AuthGuard],}, {path:'getNoMToken',component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面 { path: 'planAudit/planpass', component: PlanPassComponent }, + { path: 'test', component: TestComponent }, + ]; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 254bcde..9ee49f3 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -37,7 +37,21 @@ export class AppComponent { this.token.startUp() }) } - + // console.log(1234,document.documentElement.clientWidth) + function addMeta(name,content){//手动添加mate标签 + + let meta = document.createElement('meta'); + +     meta.content=content; + +     meta.name=name; + +     document.getElementsByTagName('head')[0].appendChild(meta); + + } + if(document.documentElement.clientWidth < 800){ + addMeta('viewport','initial-scale=0.5, maximum-scale=0.5, minimum-scale=0.5, user-scalable=no,uc-fitscreen=yes,viewport-fit=cover') + } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index acf3ce5..d09bb8d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -22,12 +22,14 @@ import { CountdownModule } from 'ngx-countdown'; //倒计时插件 import { GISManagementModule } from './gis-management/gis-management.module'; import { DataCollectionModule } from './data-collection/data-collection.module'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { TestComponent } from './test/test.component'; @NgModule({ declarations: [ AppComponent, HomeComponent, - MTokenK1Component + MTokenK1Component, + TestComponent ], imports: [ BrowserModule, diff --git a/src/app/data-collection/fire-force/fire-force.component.html b/src/app/data-collection/fire-force/fire-force.component.html index ac53a0a..1a3a16d 100644 --- a/src/app/data-collection/fire-force/fire-force.component.html +++ b/src/app/data-collection/fire-force/fire-force.component.html @@ -105,7 +105,10 @@ -
+
+
+ +
请等待... diff --git a/src/app/data-collection/fire-force/fire-force.component.scss b/src/app/data-collection/fire-force/fire-force.component.scss index 76e67df..2e6718b 100644 --- a/src/app/data-collection/fire-force/fire-force.component.scss +++ b/src/app/data-collection/fire-force/fire-force.component.scss @@ -270,7 +270,15 @@ width: 100%; height:500px; position: relative; + transition: height 0.5s; + .putDown{ + position: absolute; + right: 0; + top: -40px; + cursor: pointer; + } .tabsbox{ + margin-top: 10px; width: 100%; height: 40px; overflow: hidden; @@ -515,6 +523,10 @@ } } } + .noHeight{ + height: 0px; + transition: height 0.5s; + } } @@ -611,7 +623,9 @@ } .detailsbox{ height:338px; + transition: height 0.5s; .tabsbox{ + margin-top: 5px; height: 38px; line-height: 38px; .tabs{ @@ -642,6 +656,7 @@ } .contant{ height:300px; + p{ padding-left: 20px; font-size: 14px; @@ -672,5 +687,9 @@ } } } + .noHeight{ + height: 0px; + transition: height 0.5s; + } } } \ No newline at end of file diff --git a/src/app/data-collection/fire-force/fire-force.component.ts b/src/app/data-collection/fire-force/fire-force.component.ts index 077a144..1801063 100644 --- a/src/app/data-collection/fire-force/fire-force.component.ts +++ b/src/app/data-collection/fire-force/fire-force.component.ts @@ -1163,6 +1163,12 @@ export class FireForceComponent implements OnInit { dialogRef.afterClosed().subscribe(); } } + + //收起展开列表 + isPutDown:boolean = false + putDown(){ + this.isPutDown = !this.isPutDown + } } diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.html b/src/app/data-collection/linkage-forces/linkage-forces.component.html index 37e0431..014e2b2 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.html +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.html @@ -83,7 +83,7 @@
-
+
请等待... @@ -97,6 +97,9 @@ 下载中...({{progressBarValue}}%)
+
+ +
diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.scss b/src/app/data-collection/linkage-forces/linkage-forces.component.scss index ddf644c..3aea706 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.scss +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.scss @@ -233,6 +233,13 @@ width: 100%; height:500px; position: relative; + transition: height 0.5s; + .putDown{ + position: absolute; + right: 0; + top: -40px; + cursor: pointer; + } .tabsbox{ width: 100%; height: 40px; @@ -242,6 +249,7 @@ display: flex; justify-content: space-between; font-size: 15px; + margin-top: 10px; .tabs{ div{ float: left; @@ -479,6 +487,10 @@ } } } + .noHeight{ + height: 0px; + transition: height 0.5s; + } } @@ -598,9 +610,11 @@ } .detailsbox{ height:338px; + transition: height 0.5s; .tabsbox{ height: 38px; line-height: 38px; + margin-top: 5px; .tabs{ div{ width: 90px; @@ -659,5 +673,9 @@ } } } + .noHeight{ + height: 0px; + transition: height 0.5s; + } } } \ No newline at end of file diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.ts b/src/app/data-collection/linkage-forces/linkage-forces.component.ts index f113b29..c909728 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.ts +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.ts @@ -896,6 +896,12 @@ export class LinkageForcesComponent implements OnInit { } } + + //收起展开列表 + isPutDown:boolean = false + putDown(){ + this.isPutDown = !this.isPutDown + } } diff --git a/src/app/data-collection/water-collection/water-collection.component.html b/src/app/data-collection/water-collection/water-collection.component.html index 2d07aa3..265fa73 100644 --- a/src/app/data-collection/water-collection/water-collection.component.html +++ b/src/app/data-collection/water-collection/water-collection.component.html @@ -70,7 +70,10 @@
-
+
+
+ +
diff --git a/src/app/data-collection/water-collection/water-collection.component.scss b/src/app/data-collection/water-collection/water-collection.component.scss index dd72757..5aee980 100644 --- a/src/app/data-collection/water-collection/water-collection.component.scss +++ b/src/app/data-collection/water-collection/water-collection.component.scss @@ -217,6 +217,14 @@ .detailsbox{ width: 100%; height:500px; + transition: height 0.5s; + position: relative; + .putDown{ + position: absolute; + right: 0; + top: -40px; + cursor: pointer; + } .tabsbox{ width: 100%; height: 40px; @@ -224,6 +232,7 @@ display: flex; justify-content: space-between; font-size: 15px; + margin-top: 10px; .tabs{ div{ float: left; @@ -323,6 +332,10 @@ } } } + .noHeight{ + height: 0px; + transition: height 0.5s; + } } .addWaterBox{ @@ -417,8 +430,10 @@ } .detailsbox{ height:338px; + transition: height 0.5s; .tabsbox{ height: 38px; + margin-top: 5px; line-height: 38px; .tabs{ div{ @@ -469,6 +484,10 @@ } } } + .noHeight{ + height: 0px; + transition: height 0.5s; + } } } diff --git a/src/app/data-collection/water-collection/water-collection.component.ts b/src/app/data-collection/water-collection/water-collection.component.ts index 3e6b7a7..9be0559 100644 --- a/src/app/data-collection/water-collection/water-collection.component.ts +++ b/src/app/data-collection/water-collection/water-collection.component.ts @@ -134,6 +134,7 @@ export class WaterCollectionComponent implements OnInit { } ngOnInit(): void { + console.log(88888,navigator.userAgent) this.getAllWaterData() setTimeout(() => { this.createMap() @@ -647,6 +648,13 @@ export class WaterCollectionComponent implements OnInit { })//取消 } } + + + //收起展开列表 + isPutDown:boolean = false + putDown(){ + this.isPutDown = !this.isPutDown + } } diff --git a/src/app/gis-management/allaround/allaround.component.scss b/src/app/gis-management/allaround/allaround.component.scss index 9f85c28..dd828a2 100644 --- a/src/app/gis-management/allaround/allaround.component.scss +++ b/src/app/gis-management/allaround/allaround.component.scss @@ -114,15 +114,41 @@ .rotateA {transform: rotate(90deg) scale(0.75);} .rotateB {transform: rotate(180deg)} .rotateC {transform: rotate(270deg) scale(0.75);} -@media screen and (max-width:1400px){ +@media screen and (max-width:1200px){ .bigimgbox{ - width:920px; - height: 600px; + width: 880px; + height: 580px; + //预览图片 + .previewImgBox { + width: 800px; + height: 475px; + text-align: center; + } } - //预览图片 - .previewImgBox { - width: 800px; - height: 500px; - text-align: center; +} +@media screen and (min-width:1200px) and (max-width:1400px){ + .bigimgbox{ + width:880px; + height: 610px; + //预览图片 + .previewImgBox { + width: 800px; + height: 500px; + text-align: center; + } + } + +} +@media screen and (min-width:1400px) and (max-width:1600px){ + .bigimgbox{ + width:1110px; + height: 660px; + //预览图片 + .previewImgBox { + width: 900px; + height: 550px; + text-align: center; + } } + } diff --git a/src/app/gis-management/fire-facilities/fire-facilities.component.scss b/src/app/gis-management/fire-facilities/fire-facilities.component.scss index 537daea..180645e 100644 --- a/src/app/gis-management/fire-facilities/fire-facilities.component.scss +++ b/src/app/gis-management/fire-facilities/fire-facilities.component.scss @@ -220,14 +220,31 @@ } } } - @media screen and (max-width:1300px){ + @media screen and (max-width:1200px){ .imageList{ - width:911px; - height:570px; + width: 880px; + height: 580px; + .imageListBox { + .imagesBox{ + width:262px; + } + } + } + } + @media screen and (min-width:1200px) and (max-width:1400px){ + .imageList{ + width: 880px; + height: 610px; .imageListBox { .imagesBox{ width:275px; } } } + } + @media screen and (min-width:1400px) and (max-width:1600px){ + .imageList{ + width:1110px; + height: 660px; + } } \ No newline at end of file diff --git a/src/app/gis-management/fire-facilities/realistic-picture.component.scss b/src/app/gis-management/fire-facilities/realistic-picture.component.scss index d340e20..9858e7f 100644 --- a/src/app/gis-management/fire-facilities/realistic-picture.component.scss +++ b/src/app/gis-management/fire-facilities/realistic-picture.component.scss @@ -177,10 +177,22 @@ margin: 20px auto; } } -@media screen and (max-width:1300px){ +@media screen and (max-width:1200px){ .imgDiaLogBox{ - width: 920px; - height: 600px; + width: 880px; + height: 580px; + //预览图片 + .previewImgBox { + width: 800px; + height: 475px; + text-align: center; + } + } +} +@media screen and (min-width:1200px) and (max-width:1400px){ + .imgDiaLogBox{ + width: 880px; + height: 610px; //预览图片 .previewImgBox { width: 800px; @@ -189,4 +201,17 @@ } } } +@media screen and (min-width:1400px) and (max-width:1600px){ + .imgDiaLogBox{ + width:1110px; + height: 660px; + //预览图片 + .previewImgBox { + width: 900px; + height: 550px; + text-align: center; + } + } +} + diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.html b/src/app/gis-management/gis-labeling/gis-labeling.component.html index 19fe6b8..bb452b1 100644 --- a/src/app/gis-management/gis-labeling/gis-labeling.component.html +++ b/src/app/gis-management/gis-labeling/gis-labeling.component.html @@ -22,18 +22,18 @@
- - - + + +
import_export
-
+
- +
@@ -41,7 +41,7 @@ - +
diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.scss b/src/app/gis-management/gis-labeling/gis-labeling.component.scss index cd26292..ef6b432 100644 --- a/src/app/gis-management/gis-labeling/gis-labeling.component.scss +++ b/src/app/gis-management/gis-labeling/gis-labeling.component.scss @@ -139,8 +139,8 @@ flex-direction: column; .routeHeader { width: 100%; - height: 130px; - min-height: 130px; + height: 140px; + min-height: 140px; position: relative; display: flex; align-items: center; @@ -166,9 +166,15 @@ left: 5px; } .routeClear { - top: 0px; - right: 18px; - font-size: 20px; + top: 5px; + right: 13px; + mat-icon{ + font-size: 22px; + width: 22px; + height: 22px; + color: #333333; + opacity: 0.16; + } } input { width: 80%; @@ -367,12 +373,28 @@ } } - -@media screen and (min-width:1200px) and (max-width:1300px){ +@media screen and (max-width:1200px){ + .leftDiv { + width: 320px; + } + #leftHide{ + left: 320px; + } + .rightTopBox{ + right: 8px; + } + .searchInput,.routeGIS{ + left: 18px; + } + .routeGIS{ + max-height: 539px; + } +} +@media screen and (min-width:1200px) and (max-width:1400px){ .leftDiv { width: 328px; } #leftHide{ left: 328px; } -} \ No newline at end of file +} diff --git a/src/app/gis-management/key-site-look/key-site.component.scss b/src/app/gis-management/key-site-look/key-site.component.scss index d609fe1..f085649 100644 --- a/src/app/gis-management/key-site-look/key-site.component.scss +++ b/src/app/gis-management/key-site-look/key-site.component.scss @@ -141,10 +141,22 @@ table { margin: 20px auto; } } -@media screen and (max-width:1300px){ +@media screen and (max-width:1200px){ .imgDiaLogBox{ - width: 920px; - height: 600px; + width: 880px; + height: 580px; + //预览图片 + .previewImgBox { + width: 800px; + height: 475px; + text-align: center; + } + } +} +@media screen and (min-width:1200px) and (max-width:1400px){ + .imgDiaLogBox{ + width: 880px; + height: 610px; //预览图片 .previewImgBox { width: 800px; @@ -153,3 +165,15 @@ table { } } } +@media screen and (min-width:1400px) and (max-width:1600px){ + .imgDiaLogBox{ + width:1110px; + height: 660px; + //预览图片 + .previewImgBox { + width: 900px; + height: 550px; + text-align: center; + } + } +} \ No newline at end of file diff --git a/src/app/gis-management/plan-list/openPlanTool.scss b/src/app/gis-management/plan-list/openPlanTool.scss index 2a259d1..9f1cb81 100644 --- a/src/app/gis-management/plan-list/openPlanTool.scss +++ b/src/app/gis-management/plan-list/openPlanTool.scss @@ -2,9 +2,15 @@ width: 1500px; height:850px } -@media screen and (min-width:1000px) and (max-width:1400px){ +@media screen and (max-width:1400px){ .divbox{ width: 950px; height: 618px; } +} +@media screen and (min-width:1400px) and (max-width:1600px){ + .divbox{ + width: 1100px; + height: 660px; + } } \ No newline at end of file diff --git a/src/app/gis-management/plan-list/plan-list.component.scss b/src/app/gis-management/plan-list/plan-list.component.scss index 7649972..fd8de1e 100644 --- a/src/app/gis-management/plan-list/plan-list.component.scss +++ b/src/app/gis-management/plan-list/plan-list.component.scss @@ -40,7 +40,7 @@ width: 110px; } } - @media screen and (min-width:1200px) and (max-width:1300px){ + @media screen and (max-width:1400px){ .contantitem{ margin-right: 30px; } diff --git a/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss b/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss index bb4a4e8..2354ca6 100644 --- a/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss +++ b/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss @@ -241,10 +241,22 @@ margin: 20px auto; } } -@media screen and (max-width:1300px){ +@media screen and (max-width:1200px){ .imgDiaLogBox{ - width: 920px; - height: 600px; + width: 880px; + height: 580px; + //预览图片 + .previewImgBox { + width: 800px; + height: 475px; + text-align: center; + } + } +} +@media screen and (min-width:1200px) and (max-width:1400px){ + .imgDiaLogBox{ + width: 880px; + height: 610px; //预览图片 .previewImgBox { width: 800px; @@ -252,4 +264,17 @@ text-align: center; } } +} +@media screen and (min-width:1400px) and (max-width:1600px){ + .imgDiaLogBox{ + width:1110px; + height: 660px; + //预览图片 + .previewImgBox { + width: 900px; + height: 550px; + text-align: center; + } + } + } \ No newline at end of file diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index d94f6df..5dd308d 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -28,6 +28,7 @@ export class HomeComponent implements OnInit { ngOnInit() { this.getVisualizationData() + } ngAfterViewInit(): void { diff --git a/src/app/key-unit/allaround/allaround.component.scss b/src/app/key-unit/allaround/allaround.component.scss index a180eb7..015e0c6 100644 --- a/src/app/key-unit/allaround/allaround.component.scss +++ b/src/app/key-unit/allaround/allaround.component.scss @@ -61,11 +61,22 @@ margin: 20px auto; } } - -@media screen and (max-width:1300px){ +@media screen and (max-width:1200px){ .imgDiaLogBox{ - width: 920px; - height: 600px; + width: 880px; + height: 580px; + //预览图片 + .previewImgBox { + width: 800px; + height: 475px; + text-align: center; + } + } +} +@media screen and (min-width:1200px) and (max-width:1400px){ + .imgDiaLogBox{ + width: 880px; + height: 610px; //预览图片 .previewImgBox { width: 800px; @@ -74,3 +85,16 @@ } } } +@media screen and (min-width:1400px) and (max-width:1600px){ + .imgDiaLogBox{ + width:1110px; + height: 660px; + //预览图片 + .previewImgBox { + width: 900px; + height: 550px; + text-align: center; + } + } + +} \ No newline at end of file diff --git a/src/app/key-unit/basicinfo/basicinfo.component.html b/src/app/key-unit/basicinfo/basicinfo.component.html index 96b0550..5efb467 100644 --- a/src/app/key-unit/basicinfo/basicinfo.component.html +++ b/src/app/key-unit/basicinfo/basicinfo.component.html @@ -171,14 +171,14 @@
-
+
建筑名称： *
-
+
建筑类型： @@ -191,7 +191,7 @@

{{element.name}}

-
+
{{i.propertyName}}({{i.physicalUnit}})： @@ -266,7 +266,7 @@

{{element.name}}

-
+
{{i.propertyName}}({{i.physicalUnit}})： @@ -332,13 +332,13 @@

自定义信息

- - -
+
-
+
diff --git a/src/app/navigation/navigation.component.scss b/src/app/navigation/navigation.component.scss index 3dad2b4..6287508 100644 --- a/src/app/navigation/navigation.component.scss +++ b/src/app/navigation/navigation.component.scss @@ -40,6 +40,11 @@ mat-sidenav{ z-index: 200; } + @media screen and (max-width:1400px){ + .shownav{ + top: 7px; + } + } .mat-accordion .mat-expansion-panel:first-of-type { border-top-right-radius:0px; border-top-left-radius:0px; diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss index 973695b..1719215 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss +++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss @@ -12,7 +12,7 @@ } #Line{ width: 80%; - height: 600px; + height: 610px; margin: 80px auto; } } diff --git a/src/app/statistic-analysis/home/home.component.html b/src/app/statistic-analysis/home/home.component.html index 547d2f5..a4c9a1c 100644 --- a/src/app/statistic-analysis/home/home.component.html +++ b/src/app/statistic-analysis/home/home.component.html @@ -10,7 +10,7 @@
-
+
计划完成情况
@@ -77,7 +77,7 @@
-
+
diff --git a/src/app/statistic-analysis/home/home.component.ts b/src/app/statistic-analysis/home/home.component.ts index 35d78bc..52ea61e 100644 --- a/src/app/statistic-analysis/home/home.component.ts +++ b/src/app/statistic-analysis/home/home.component.ts @@ -299,8 +299,11 @@ export class HomeComponent implements OnInit { planStateOptionsZhi = { title: { text: '预案状态统计（7005份）', - left: 'center', - + left: 'left', + textStyle:{ + color:'#fff', + fontWeight:'normal' + } }, tooltip: { trigger: 'item', @@ -325,9 +328,9 @@ export class HomeComponent implements OnInit { }, data: [ {value: 1585, name: '预案新增'}, - {value: 2000, name: '预案审核通过',itemStyle:{color:'#02A7F0'}}, + {value: 2000, name: '审核通过',itemStyle:{color:'#02A7F0'}}, {value: 2600, name: '预案编制'}, - {value: 1500, name: '预案审核退回'}, + {value: 1500, name: '审核退回'}, {value: 1800, name: '预案审核中'} ], emphasis: { @@ -343,8 +346,11 @@ export class HomeComponent implements OnInit { planStateOptionsZhong = { title: { text: '预案状态统计（895份）', - left: 'center', - + left: 'left', + textStyle:{ + color:'#fff', + fontWeight:'normal' + } }, tooltip: { trigger: 'item', @@ -368,9 +374,9 @@ export class HomeComponent implements OnInit { }, data: [ {value: 200, name: '预案新增'}, - {value: 234, name: '预案审核通过',itemStyle:{color:'#02A7F0'}}, + {value: 234, name: '审核通过',itemStyle:{color:'#02A7F0'}}, {value: 165, name: '预案编制'}, - {value: 189, name: '预案审核退回'}, + {value: 189, name: '审核退回'}, {value: 211, name: '预案审核中'} ], emphasis: { @@ -400,6 +406,10 @@ export class HomeComponent implements OnInit { text: '新增、删除单位统计', left: 0, top: 0, + textStyle:{ + color:'#fff', + fontWeight:'normal' + }, }, grid: { left: 30, @@ -488,6 +498,10 @@ export class HomeComponent implements OnInit { text: '新增、删除单位统计', left: 0, top: 0, + textStyle:{ + color:'#fff', + fontWeight:'normal' + }, }, grid: { left: 30, @@ -584,11 +598,12 @@ export class HomeComponent implements OnInit { chartZdgzqyOptionsZhi = { title: { text: '建筑类型统计（8900家）', - left: 'center', - top: -3, - // textStyle: { - // fontSize:31 - // } + top: -5, + left: 'left', + textStyle:{ + color:'#fff', + fontWeight:'normal' + } }, tooltip: { trigger: 'item', @@ -605,7 +620,7 @@ export class HomeComponent implements OnInit { name: '访问来源', type: 'pie', radius: '70%', - center: ['50%', '60%'], + center: ['50%', '61%'], label:{ show:true, // fontSize:13, @@ -647,7 +662,11 @@ export class HomeComponent implements OnInit { chartZdgzqyOptionsZhong = { title: { text: '建筑类型统计（1015家）', - left: 'center', + left: 'left', + textStyle:{ + color:'#fff', + fontWeight:'normal' + }, top: -3, // textStyle: { // fontSize:31 diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss index 88b7758..c6c873c 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss @@ -107,7 +107,7 @@ } font-size: 30px; width: 100%; - height: 600px; + height: 610px; overflow: auto; .tableHeader { font-size: 30px; diff --git a/src/app/test/test.component.html b/src/app/test/test.component.html new file mode 100644 index 0000000..367df6c --- /dev/null +++ b/src/app/test/test.component.html @@ -0,0 +1 @@ +

测试当前视图宽高

diff --git a/src/app/test/test.component.scss b/src/app/test/test.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/test/test.component.spec.ts b/src/app/test/test.component.spec.ts new file mode 100644 index 0000000..ef4e38c --- /dev/null +++ b/src/app/test/test.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TestComponent } from './test.component'; + +describe('TestComponent', () => { + let component: TestComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TestComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TestComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/test/test.component.ts b/src/app/test/test.component.ts new file mode 100644 index 0000000..9635ce6 --- /dev/null +++ b/src/app/test/test.component.ts @@ -0,0 +1,17 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-test', + templateUrl: './test.component.html', + styleUrls: ['./test.component.scss'] +}) +export class TestComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + alert(document.documentElement.clientWidth) + alert(document.documentElement.clientHeight) + } + +} diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.scss b/src/app/ui/collection-tools-plan/collection-tools.component.scss index 530106a..b927e44 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.scss +++ b/src/app/ui/collection-tools-plan/collection-tools.component.scss @@ -157,7 +157,7 @@ width: 235px; right: 0; } - @media screen and (min-width:1200px) and (max-width:1300px){ + @media screen and (max-width:1400px){ .functionalDomainLeft{ min-width: 195px; width: 195px; diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss index ed539b9..487c95c 100644 --- a/src/app/ui/collection-tools/collection-tools.component.scss +++ b/src/app/ui/collection-tools/collection-tools.component.scss @@ -572,7 +572,7 @@ div:focus { } .bigBox{ - width: 580px; + width: 590px; height: 40px; line-height: 40px; position: absolute; @@ -623,6 +623,25 @@ div:focus { } } } +@media screen and (min-width:1400px) and (max-width:1600px){ + .bigBox{ + z-index: 9999; + width: 479px; + right: 300px; + top: 35px; + .weatherBox{ + .name{ + font-size: 13px; + } + .weatherInput{ + width: 99px; + } + .weatherSelect{ + width: 88px; + } + } + } +} .open{ right: 0px; @@ -649,7 +668,7 @@ div:focus { } .orBox{ width: 500px; - height: 600px; + height: 610px; .treebox{ width: 100%; height: 552px; diff --git a/src/app/ui/fire-fighting-template/editingFireControl.html b/src/app/ui/fire-fighting-template/editingFireControl.html index ec6e028..648fb29 100644 --- a/src/app/ui/fire-fighting-template/editingFireControl.html +++ b/src/app/ui/fire-fighting-template/editingFireControl.html @@ -35,7 +35,7 @@
-
+
-
+