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..ebcbf44 100644 --- a/src/app/data-collection/fire-force/fire-force.component.ts +++ b/src/app/data-collection/fire-force/fire-force.component.ts @@ -311,7 +311,7 @@ export class FireForceComponent implements OnInit { this.http.get(`/api/FireForceDetail/${type}/${node.id}`).subscribe((data:any) => { this.isMasklayer = false this.FireForceDetailInfo = data - console.log(888,data) + // console.log(888,data) if(data.location && data.location.x){//如果已经标注单位坐标 this.positionLngLat = data.location this.map.setCenter([data.location.x,data.location.y]); @@ -416,7 +416,7 @@ export class FireForceComponent implements OnInit { //删除某条消防队 deleteFireForce(item,e){ e.stopPropagation() - console.log(this.dataSource.data) + // console.log(this.dataSource.data) let isDelete = window.confirm(`确定要删除${item.name}吗`) if(isDelete){ // this.http.delete(`/api/CustomFireForce/${item.id}`).subscribe(data => { @@ -647,7 +647,7 @@ export class FireForceComponent implements OnInit { } this.FireForceDetailInfo.jurisdictionArea = Number(this.FireForceDetailInfo.jurisdictionArea) this.FireForceDetailInfo.relevantInfomationData = JSON.stringify(this.AttachmentArr) - console.log(1111,this.FireForceDetailInfo) + // console.log(1111,this.FireForceDetailInfo) //如果是总支大中 this.FireForceDetailInfo.location = {x:'',y:''} if(this.atLastPositionLngLat.x){ @@ -674,7 +674,7 @@ export class FireForceComponent implements OnInit { this.FireForceDetailInfo.contactData = JSON.stringify(this.DaZhongcontactData) this.FireForceDetailInfo.dutyForceData = null } - console.log('body',body) + // console.log('body',body) this.http.put(`/api/FireForceDetail/0/${this.selectedFireForce.id}`,body).subscribe(data => { let config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -745,7 +745,7 @@ export class FireForceComponent implements OnInit { submitAudit(){ let isTrue = window.confirm('请确认保存后提交审核，否则将无法审核最新内容，是否继续？') if(isTrue){ - console.log('提交审核的消防力量',this.FireForceDetailInfo) + // console.log('提交审核的消防力量',this.FireForceDetailInfo) let body = { title: this.FireForceDetailInfo.stationName, operation: this.selectedFireForce.contentVerify ? 1 : 0,//操作方式 @@ -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..8fd3859 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.ts +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.ts @@ -81,7 +81,7 @@ export class LinkageForcesComponent implements OnInit { createMarker(list){ let markerArrcluster = [] this.cluster ? this.cluster.setData([]) : null - console.log(678,list) + // console.log(678,list) list.forEach((item) => { let image if(item.linkageForceType == 0){//消火栓 @@ -175,7 +175,7 @@ export class LinkageForcesComponent implements OnInit { ngOnInit(): void { this.getAllFireForce() setTimeout(() => { - console.log(document.documentElement.clientWidth) + // console.log(document.documentElement.clientWidth) let slidesPerView if(document.documentElement.clientWidth < 1400){ slidesPerView = 5 @@ -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..214d005 100644 --- a/src/app/data-collection/water-collection/water-collection.component.ts +++ b/src/app/data-collection/water-collection/water-collection.component.ts @@ -119,7 +119,7 @@ export class WaterCollectionComponent implements OnInit { this.cluster.on('click',(e)=>{ if(e.clusterData.length == 1){ let item = e.clusterData[0].data - console.log(item) + // console.log(item) this.selectedLiIndex = null this.clearData() this.selectedWaterTypeIndex = item.waterSourceType//点击的水源类型 @@ -134,6 +134,7 @@ export class WaterCollectionComponent implements OnInit { } ngOnInit(): void { + // console.log(88888,navigator.userAgent) this.getAllWaterData() setTimeout(() => { this.createMap() @@ -447,7 +448,7 @@ export class WaterCollectionComponent implements OnInit { this.waterData.location.x = this.atLastPositionLngLat.x this.waterData.location.y = this.atLastPositionLngLat.y } - console.log(666,this.waterData) + // console.log(666,this.waterData) this.http.put(`/api/WaterSources/${this.waterData.id}`,this.waterData).subscribe(data => { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -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 @@

自定义信息

- - -
+
!res.has(a.propertyName) && res.set(a.propertyName, 1)) element.propertyInfos.forEach(ele => { diff --git a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss index f44e577..f5b4a14 100644 --- a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss +++ b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss @@ -143,15 +143,51 @@ textarea { } } - -@media screen and (max-width:1300px){ - .imageList{ - width: 920px; - height: 600px; - .imageListBox { - .imagesBox { - width: 270px; - } +@media screen and (max-width:1200px){ + .imgDiaLogBox{ + width: 880px; + height: 580px; + //预览图片 + .previewImgBox { + width: 800px; + height: 475px; + text-align: center; + } + } + .imageList { + width:880px; + height:580px; + } +} +@media screen and (min-width:1200px) and (max-width:1400px){ + .imgDiaLogBox{ + width: 880px; + height: 610px; + //预览图片 + .previewImgBox { + width: 800px; + height: 500px; + text-align: center; } } + .imageList { + width:880px; + height: 610px; + } +} +@media screen and (min-width:1400px) and (max-width:1600px){ + .imgDiaLogBox{ + width:1110px; + height: 660px; + //预览图片 + .previewImgBox { + width: 900px; + height: 550px; + text-align: center; + } + } + .imageList { + width: 1110px; + height: 660px; + } } \ No newline at end of file diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss index f071e6e..8669fda 100644 --- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss +++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss @@ -145,15 +145,51 @@ textarea { } -@media screen and (max-width:1300px){ - .imageList{ - width: 920px; - height: 600px; - .imageListBox { - .imagesBox { - width: 270px; - } +@media screen and (max-width:1200px){ + .imgDiaLogBox{ + width: 880px; + height: 580px; + //预览图片 + .previewImgBox { + width: 800px; + height: 475px; + text-align: center; } } + .imageList { + width:880px; + height:580px; + } } - +@media screen and (min-width:1200px) and (max-width:1400px){ + .imgDiaLogBox{ + width: 880px; + height: 610px; + //预览图片 + .previewImgBox { + width: 800px; + height: 500px; + text-align: center; + } + } + .imageList { + width:880px; + height: 610px; + } +} +@media screen and (min-width:1400px) and (max-width:1600px){ + .imgDiaLogBox{ + width:1110px; + height: 660px; + //预览图片 + .previewImgBox { + width: 900px; + height: 550px; + text-align: center; + } + } + .imageList { + width: 1110px; + height: 660px; + } +} \ No newline at end of file diff --git a/src/app/key-unit/key-site-look/key-site.component.scss b/src/app/key-unit/key-site-look/key-site.component.scss index 774c314..b544dc1 100644 --- a/src/app/key-unit/key-site-look/key-site.component.scss +++ b/src/app/key-unit/key-site-look/key-site.component.scss @@ -64,10 +64,23 @@ table { } } -@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; @@ -75,4 +88,17 @@ table { 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/key-unit/key-site/key-site.component.scss b/src/app/key-unit/key-site/key-site.component.scss index 56e3a25..a02dd0d 100644 --- a/src/app/key-unit/key-site/key-site.component.scss +++ b/src/app/key-unit/key-site/key-site.component.scss @@ -62,10 +62,23 @@ table { } } -@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 +87,16 @@ 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/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts index afacdf5..9d8f3e5 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts @@ -221,6 +221,7 @@ export class KeyUnitManagementComponent implements OnInit { this.getAllKeyUnit(); } ngOnInit(): void { + // alert(document.documentElement.clientHeight) this.getunitdata(); this.getOrganizations(); this.getUnittype(); diff --git a/src/app/key-unit/know-route/know-route.component.ts b/src/app/key-unit/know-route/know-route.component.ts index af22b8b..4632c44 100644 --- a/src/app/key-unit/know-route/know-route.component.ts +++ b/src/app/key-unit/know-route/know-route.component.ts @@ -85,11 +85,11 @@ export class KnowRouteComponent implements OnInit { this.isspinner = false this.imgUrl = data.objectName this.imgsrc = `/api/Objects/PlanPlatform/${this.imgUrl}?x-oss-process=image/resize,m_fill,h_170,w_299` - console.log(this.imgsrc) + // console.log(this.imgsrc) this.uploadSucced[this.chooseid].src=this.imgsrc this.inputShow=false - console.log(this.uploadSucced) + // console.log(this.uploadSucced) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 diff --git a/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss b/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss index e3d207b..bc7edcb 100644 --- a/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss +++ b/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss @@ -175,11 +175,24 @@ margin: 20px auto; } } +@media screen and (max-width:1200px){ + .imgDiaLogBox{ + width: 880px; + height: 580px; + //预览图片 + .previewImgBox { + width: 800px; + height: 475px; + text-align: center; + } + } +} -@media screen and (max-width:1300px){ + +@media screen and (min-width:1200px) and (max-width:1400px){ .imgDiaLogBox{ - width: 920px; - height: 600px; + width: 880px; + height: 610px; //预览图片 .previewImgBox { width: 800px; @@ -187,4 +200,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/key-unit/realistic-picture/realistic-picture.component.scss b/src/app/key-unit/realistic-picture/realistic-picture.component.scss index 8e3fdbe..01acbee 100644 --- a/src/app/key-unit/realistic-picture/realistic-picture.component.scss +++ b/src/app/key-unit/realistic-picture/realistic-picture.component.scss @@ -178,10 +178,23 @@ } } -@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 +202,16 @@ 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/key-unit/router-gis/router-gis.component.scss b/src/app/key-unit/router-gis/router-gis.component.scss index af4eedc..b80ba3b 100644 --- a/src/app/key-unit/router-gis/router-gis.component.scss +++ b/src/app/key-unit/router-gis/router-gis.component.scss @@ -106,11 +106,21 @@ } } } -@media screen and (max-width:1400px){ +@media screen and (max-width:1200px){ + .routeGIS{ + max-height: 490px; + } +} +@media screen and (min-width:1200px) and (max-width:1400px){ .routeGIS{ max-height: 520px; } } +@media screen and (min-width:1400px) and (max-width:1600px){ + .routeGIS{ + max-height: 628px; + } +} .routeGISPublicIcon { position: absolute; color: #fff; font-size: 14px; } //导航 定位部分公共样式 //选择路线 方案 button diff --git a/src/app/key-unit/training-recordinfo/training-recordinfo.component.ts b/src/app/key-unit/training-recordinfo/training-recordinfo.component.ts index 5c4e584..6a366cf 100644 --- a/src/app/key-unit/training-recordinfo/training-recordinfo.component.ts +++ b/src/app/key-unit/training-recordinfo/training-recordinfo.component.ts @@ -19,7 +19,7 @@ export class TrainingRecordinfoComponent implements OnInit { } } onCustom($event){ - console.log($event);//data from child + // console.log($event);//data from child this.tabsSelectedIndex = 1 } selectedtab(e){ diff --git a/src/app/key-unit/water-road/water-road.component.scss b/src/app/key-unit/water-road/water-road.component.scss index 937e087..a9378a2 100644 --- a/src/app/key-unit/water-road/water-road.component.scss +++ b/src/app/key-unit/water-road/water-road.component.scss @@ -38,7 +38,7 @@ .dialogbox{ width: 800px; - height: 600px; + height: 610px; .title{ span{ font-size: 16px; diff --git a/src/app/key-unit/water-road/water-road.component.ts b/src/app/key-unit/water-road/water-road.component.ts index a1b8c38..3b2583b 100644 --- a/src/app/key-unit/water-road/water-road.component.ts +++ b/src/app/key-unit/water-road/water-road.component.ts @@ -128,9 +128,9 @@ export class WaterRoadComponent implements OnInit { Distance : Distance, WaterSourceTypes :this.selectedWaterList } - console.log('paramsdata',paramsdata) + // console.log('paramsdata',paramsdata) this.http.get("/api/WaterSources",{params:paramsdata}).subscribe((data:any) => { - console.log('所有水源',data) + // console.log('所有水源',data) this.createwaterMarker(data.items) }) } diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 8d46dc3..1a14c5d 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -57,7 +57,7 @@
-
+
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/pages/homedetail/homedetail.component.ts b/src/app/pages/homedetail/homedetail.component.ts index c46e4a3..567ea93 100644 --- a/src/app/pages/homedetail/homedetail.component.ts +++ b/src/app/pages/homedetail/homedetail.component.ts @@ -470,11 +470,11 @@ export class HomedetailComponent implements OnInit { this.chartYalxtj = echarts.init(this.element.nativeElement.querySelector('#chartYalxtj'),'skinUpp'); this.chartYalxtj.setOption(this.chartYalxtjOption); this.chartMap = echarts.init(this.element.nativeElement.querySelector('#chartMap')); - console.log(this.chartMapOption) + // console.log(this.chartMapOption) this.chartMap.setOption(this.chartMapOption); this.mapInit() //初始化地图 }, 0); - console.log(echarts) + // console.log(echarts) } mapInit () { @@ -553,7 +553,7 @@ export class HomedetailComponent implements OnInit { // //切换聚焦区域 // switch2AreaNode(props.adcode); // // } - console.log(props) + // console.log(props) }); diff --git a/src/app/plan-audit/plan-list/plan-list.component.html b/src/app/plan-audit/plan-list/plan-list.component.html index 55ea6a8..fd814a3 100644 --- a/src/app/plan-audit/plan-list/plan-list.component.html +++ b/src/app/plan-audit/plan-list/plan-list.component.html @@ -1,5 +1,5 @@
-
+
@@ -18,7 +18,8 @@
-
+
+
@@ -38,5 +39,7 @@ +
+
\ No newline at end of file diff --git a/src/app/plan-audit/plan-list/plan-list.component.scss b/src/app/plan-audit/plan-list/plan-list.component.scss index a1939e9..9f43ce3 100644 --- a/src/app/plan-audit/plan-list/plan-list.component.scss +++ b/src/app/plan-audit/plan-list/plan-list.component.scss @@ -21,8 +21,10 @@ padding: 20px; display: flex; flex-wrap: wrap; - justify-content: space-between; + // justify-content: space-between; + flex-wrap: wrap; .contantitem{ + margin: 10px; div{ width: 110px; height: 110px; diff --git a/src/app/plan-audit/plan-list/plan-list.component.ts b/src/app/plan-audit/plan-list/plan-list.component.ts index c8e41b2..0c76f51 100644 --- a/src/app/plan-audit/plan-list/plan-list.component.ts +++ b/src/app/plan-audit/plan-list/plan-list.component.ts @@ -1,5 +1,5 @@ import { HttpClient } from '@angular/common/http'; -import { Component, Inject, OnInit, Renderer2, ViewChild } from '@angular/core'; +import { Component, Inject, Input, OnInit, Renderer2, ViewChild } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; @@ -10,7 +10,7 @@ import { MatSnackBar } from '@angular/material/snack-bar'; }) export class PlanListComponent implements OnInit { constructor(private http: HttpClient,public snackBar: MatSnackBar,public dialog: MatDialog) { } - + @Input() public planType: any;//data名字根据引用场景自定义 //单位相关数据 unitId:any = sessionStorage.getItem('companyId') diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts index 6b2978f..9dbdeec 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -146,7 +146,7 @@ export class PlanRecordComponent implements OnInit { tableClick(e,item){ this.showtype = -1 //e.target.parentElement.bgColor='#2196F3' - console.log(item) + // console.log(item) this.organizationName='' this.itemid=item.itemId this.id=item.id @@ -171,7 +171,7 @@ export class PlanRecordComponent implements OnInit { }else{ this.postlevel = data.level } - console.log('xxx',data) + // console.log('xxx',data) data.fireForceDetailInfo.location ? null : data.fireForceDetailInfo.location={x:null,y:null} this.fireForceDetailInfo = data.fireForceDetailInfo this.showtype = 13 @@ -289,7 +289,7 @@ export class PlanRecordComponent implements OnInit { this.compantData={name:'',buildingTypes:[],address:''} this.planType = this.planData.planMode let data = this.planData - console.log(data) + // console.log(data) if(data.planType==1){ this.twoOrthree=2 }else if(data.planType==2){ @@ -338,7 +338,7 @@ export class PlanRecordComponent implements OnInit { export class recordshow3D{ constructor(private sanitizer: DomSanitizer,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog) {} ngOnInit(): void { - console.log(this.data) + // console.log(this.data) this.threedUrl=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.url.changingThisBreaksApplicationSecurity) } threedUrl diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html index c81b24e..75e0767 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -97,15 +97,20 @@
- + - + - + + + + + + diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts index 346a7e3..17e3ce0 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -77,6 +77,17 @@ export class WaitExamineerComponent implements OnInit { this.getAlltabledate() this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src); } + + planTypeIndex //平面图类型 是总平面图还是层平面图 + selectedIndexChange(e){ + this.selected.setValue(e) + // console.log(6666,e) + if(e == 1){ + this.planTypeIndex = 'zong' + }else if(e == 2){ + this.planTypeIndex = 'ceng' + } + } ngOnDestroy () { /* this.indexbar.clear() this.indexbar.dispose() */ diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index 5bc72a0..6fab655 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -104,7 +104,7 @@ export class EntryPlanLookComponent implements OnInit { //查看预案 lookPlan(e){ if(e.planMode == 0){ - console.log(e.attachmentUrls) + // console.log(e.attachmentUrls) var index=e.attachmentUrls[0].indexOf("\/") if(e.attachmentUrls[0].substr(0,index)=='psw'){ const dialogRef = this.dialog.open(PsViewer, { @@ -567,7 +567,7 @@ export class AddPlanone { let file = this.file || null //获取上传的文件 let fileSize = file.size || null //上传文件的总大小 let shardSize = 5 * 1024 * 1024 //5MB一个分片 - console.log(this.psw) + // console.log(this.psw) if (file && fileSize<=shardSize) { //上传文件<=5MB时 let formData = new FormData() @@ -972,9 +972,9 @@ export class AddPlanone { } } onSubmit2(value){ - console.log(this.webaddress) + // console.log(this.webaddress) var reg = new RegExp('(http|https):\/\/([\w.!@#$%^&*()_+-=])*\s*') -　　console.log(reg.test(this.webaddress)) + //console.log(reg.test(this.webaddress)) } } @@ -1021,7 +1021,7 @@ export class DownloadFile { //点击想要下载的文件 addurl(item,key){ - console.log(item,key) + // console.log(item,key) this.selectedFileIndex = key this.selectedFileData = item } @@ -1099,7 +1099,7 @@ export class ChangeName { export class PsViewer{ constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) {} ngOnInit(): void { - console.log(this.data) + // console.log(this.data) const viewer = new Viewer({ container: document.querySelector('#viewer'), panorama:'/api/Objects/PlanPlatform/'+ this.data, diff --git a/src/app/plan-management/maintain-up/maintain-up.component.ts b/src/app/plan-management/maintain-up/maintain-up.component.ts index 557935b..a7e265c 100644 --- a/src/app/plan-management/maintain-up/maintain-up.component.ts +++ b/src/app/plan-management/maintain-up/maintain-up.component.ts @@ -458,7 +458,7 @@ export class MaintainUpComponent implements OnInit { //勾选框事件 verifyState //判断是否可以修改 checkChange(e,element){ - console.log(element) + // console.log(element) if(element.contentVerify!=null){ this.verifyState=element.contentVerify.verifyState }else{ @@ -567,7 +567,7 @@ export class MaintainUpComponent implements OnInit { if(selectedunitArr.length == 1){ //带着id跳到删除页面 let isTrue = confirm('您确定要删除吗') if(isTrue){ - console.log(selectedunitArr) + // console.log(selectedunitArr) let body = { // title: item.name, operation: 2,//删除操作方式 diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts index f85889d..b70e4fc 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/src/app/plan-management/meet-plan/meet-plan.component.ts @@ -452,7 +452,7 @@ export class newunitMeet{ planType:16, attachmentUrls:[`${this.objectName}`] } - console.log(body) + // console.log(body) this.http.post("/api/PlanComponentsMajor",body).subscribe((data:any)=>{ this.snackBar.open('创建成功!','确定',config); //console.log(data) diff --git a/src/app/plan-management/open-plan/open-plan.component.ts b/src/app/plan-management/open-plan/open-plan.component.ts index 8f894fd..5d65f7d 100644 --- a/src/app/plan-management/open-plan/open-plan.component.ts +++ b/src/app/plan-management/open-plan/open-plan.component.ts @@ -194,7 +194,7 @@ export class OpenPlanComponent implements OnInit { /* sessionStorage.setItem("companyName",element.companyName) window.open(`/planAudit/planpass?id=${element.companyId}&companyName=${element.companyName}&auditPlanId=${element.id}&auditStatus=${element.auditStatus}&type=6&planType=2`); */ - console.log(e) + // console.log(e) if(e.planMode == 0||e.planMode == 1){ //console.log(e.attachmentUrls) var index=e.attachmentUrls[0].indexOf("\/") @@ -319,7 +319,7 @@ export class OpenPlanComponent implements OnInit { export class GkhtmlPsViewer{ constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) {} ngOnInit(): void { - console.log(this.data) + // console.log(this.data) const viewer = new Viewer({ container: document.querySelector('#viewer'), panorama:'/api/Objects/PlanPlatform/'+ this.data, diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts index 41dd317..88654b1 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/src/app/plan-management/pass-plan/pass-plan.component.ts @@ -321,7 +321,7 @@ export class PassPlanComponent implements OnInit { } //查看单位信息 lookUnitInfo(element){ - console.log(element) + // console.log(element) // const dialogRef = this.dialog.open(UnitInfo, { // width: '1500px', // height:'800px' @@ -335,7 +335,7 @@ export class PassPlanComponent implements OnInit { //跳转查看预案页面 审核通过预案 routerTo(e){ - console.log(e) + // console.log(e) if(e.planMode == 0||e.planMode == 1){ //console.log(e.attachmentUrls) var index=e.attachmentUrls[0].indexOf("\/") @@ -485,7 +485,7 @@ export class PassPlanComponent implements OnInit { export class GkPsViewer{ constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) {} ngOnInit(): void { - console.log(this.data) + // console.log(this.data) const viewer = new Viewer({ container: document.querySelector('#viewer'), panorama:'/api/Objects/PlanPlatform/'+ this.data, @@ -503,6 +503,6 @@ export class GkPsViewer{ export class UnitInfo{ constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) {} ngOnInit(): void { - console.log(this.data) + // console.log(this.data) } } \ No newline at end of file diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts index afd1999..3256776 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts @@ -130,7 +130,7 @@ export class ReinforcePlanComponent implements OnInit { Sort: '' } this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{ - console.log('增援预案列表',data) + // console.log('增援预案列表',data) this.length = data.totalCount this.allPlanInfo = data this.tabledataSource = data.items @@ -232,7 +232,7 @@ export class ReinforcePlanComponent implements OnInit { //查看预案 openPlan(e){ - console.log(e) + // console.log(e) let id = e.id sessionStorage.setItem("planId",id) sessionStorage.setItem("companyId",e.companyId) diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts index 74af655..9186f5e 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts @@ -175,7 +175,7 @@ export class AddUnitTwoTimeComponent implements OnInit { await this.serviceData.getData(this.zhiorbuild=="zhi"?parbuild:parzhi,`/api/StatisticsAnalysis/Trends`) this.setTimeoutObj = window.setTimeout(() => { this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate)) - console.log(this.tabledata) + // console.log(this.tabledata) for(var i=0;i
-
+
计划完成情况
@@ -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/statistic-analysis/state/page-one/page-one.component.ts b/src/app/statistic-analysis/state/page-one/page-one.component.ts index ae140a3..1852b4c 100644 --- a/src/app/statistic-analysis/state/page-one/page-one.component.ts +++ b/src/app/statistic-analysis/state/page-one/page-one.component.ts @@ -55,7 +55,7 @@ export class PageOneComponent implements OnInit { indexData initCharts(){ this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) - console.log(this.tabledata) + // console.log(this.tabledata) var ec = echarts as any; this.indexBzt = ec.init(document.getElementById('indexBzt'),'walden'); @@ -126,7 +126,7 @@ export class PageOneComponent implements OnInit { ] }; this.indexBzt.on('click', (params) => { - console.log(params) + // console.log(params) for(var i=0;i0){ diff --git a/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts b/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts index ed52f93..3d815f5 100644 --- a/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts +++ b/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts @@ -49,7 +49,7 @@ export class PageThereYearComponent implements OnInit { } await this.serviceData.getData(paramdata,`/api/StatisticsAnalysis/Trends`) this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate)) - console.log(this.tabledata) + // console.log(this.tabledata) for(var i=0;i=this.echartsData.selectStartMonth||this.tabledata[0][i].month<=this.echartsData.selectEndMonth){ this.datayuex.push(this.tabledata[0][i].month) @@ -229,7 +229,7 @@ export class echartsComponent implements OnInit { await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Trends`) window.setTimeout(()=>{ this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) - console.log(this.tabledata) + // console.log(this.tabledata) for(var i=0;i
-

欢迎您, {{realName}}

+

欢迎您, {{realName}}

diff --git a/src/app/tabbar/tabbar.component.scss b/src/app/tabbar/tabbar.component.scss index 97f1d73..c7cee28 100644 --- a/src/app/tabbar/tabbar.component.scss +++ b/src/app/tabbar/tabbar.component.scss @@ -285,7 +285,7 @@ mat-icon{ .isUpdates{ - left: 596px; + left: 564px; } .uploadFile{ height: 64px; diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts index 5cf429d..22b415c 100644 --- a/src/app/tabbar/tabbar.component.ts +++ b/src/app/tabbar/tabbar.component.ts @@ -64,7 +64,7 @@ export class TabbarComponent implements OnInit { //从维护更新页面进入需要显示提交审核按钮 if(this.route.snapshot.queryParams["isUpdates"] == '1'){ this.contentVerify = JSON.parse(sessionStorage.getItem('contentVerify')) - console.log(6666,JSON.parse(sessionStorage.getItem('contentVerify'))) + // console.log(6666,JSON.parse(sessionStorage.getItem('contentVerify'))) this.isUpdates = true } this.tabbarService.getMessage().subscribe((message: any)=>{ 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 @@
-
+
-
+