diff --git a/src/app/key-unit/basicinfo/basicinfo.component.scss b/src/app/key-unit/basicinfo/basicinfo.component.scss
index 9c6800b..7f44df5 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.scss
+++ b/src/app/key-unit/basicinfo/basicinfo.component.scss
@@ -1,13 +1,20 @@
.topbox{
- height: 485px;
+ // height: 485px;
width: 100%;
padding-bottom: 20px;
+ .sub1{
+ display: none;
+ }
+ .sub2{
+ display: block;
+ margin-top: 8px;
+ }
.mainbox{
height: 100%;
position: relative;
display: flex;
.mainleft{
- width:800px;
+ flex: 1;
height: 100%;
float: left;
.inputbox{
@@ -17,6 +24,12 @@
float: left;
text-align: end;
}
+ .longinputbox{
+ width: 700px;
+ .longInput{
+ width: 538px;
+ }
+ }
.organizationbox{
width:538px;
height: 200px;
@@ -62,6 +75,10 @@
left: 79px;
border: 1px dashed gray;
border-radius:3px;
+ img{
+ width: 299px;
+ height: 170px;
+ }
}
}
@@ -153,6 +170,191 @@
}
}
}
+
+
+@media screen and (max-width:1400px){
+ .topbox{
+ .sub2{
+ display: none;
+ }
+ .sub1{
+ display: block;
+ }
+ // height: 485px;
+ width: 100%;
+ padding-bottom: 20px;
+ .mainbox{
+ height: 100%;
+ max-height: 500px;
+ overflow-y: auto;
+ position: relative;
+ display: flex;
+ .mainleft{
+ flex: 1;
+ height: 100%;
+ float: left;
+ .inputbox{
+ width: 326px;
+ height: 44px;
+ margin:2px 6px;
+ float: left;
+ text-align: end;
+ }
+ .longinputbox{
+ width: 400px;
+ .longInput{
+ width:300px;
+ }
+ }
+ .organizationbox{
+ width:300px;
+ height: 166px;
+ background: white;
+ position: absolute;
+ top: 232px;
+ left:106px;
+ z-index: 100;
+ border: 1px solid grey;
+ overflow: auto;
+ li{
+ list-style: none;
+
+ }
+ mat-tree-node{
+ cursor: pointer;
+ }
+ mat-tree-node:hover{
+ background: rgba(225, 225, 225, 0.8);
+ }
+ }
+ .addbtn{
+ width: 100%;
+ // margin:20px 0;
+ // padding-bottom: 20px;
+ }
+ .uploadimg{
+ width: 400px;
+ height: 180px;
+ float: left;
+ margin-top:12px;
+ position: relative;
+ margin-left: 26px;
+ span{
+ float: left;
+ }
+ .uploadingimg{
+ width: 299px;
+ height: 154px;
+ cursor: pointer;
+ position: absolute;
+ top: 0px;
+ left: 79px;
+ border: 1px dashed gray;
+ border-radius:3px;
+ img{
+ width: 299px;
+ height: 154px;
+ }
+ }
+
+ }
+ .image{
+ width: 100%;
+ height: 38px;
+ display: flex;
+ justify-content:space-between;
+ box-sizing: border-box;
+ padding: 0 106px;
+ input{
+ width: 190px;
+ margin-top: 0px;
+ cursor: pointer;
+ }
+ }
+ }
+ .mainright{
+ float: left;
+ flex: 1;
+ height: 430px;
+ margin-right: 10px;
+ margin-top: 23px;
+ position: relative;
+ .searchinput{
+ display: flex;
+ position: absolute;
+ left: 0;
+ top: 0;
+ }
+ .gistopbox{
+ position: absolute;
+ box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+ border-radius: 4px;
+ left: 5%;
+ top: 10px;
+ width: 90%;
+ height:46px;
+ background: #FFFFFF;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ cursor: default;;
+ .positionItem{
+ width: 34%;
+ height: 35px;
+ display: flex;
+ align-items: center;
+ .itemNum{
+ background: #F2F2F2;
+ box-sizing: border-box;
+ padding-left: 10px;
+ width: 60%;
+ height: 32px;
+ line-height: 32px;
+ margin-left: 5px;
+ border-radius: 4px;
+ }
+ }
+ .setPosition{
+ cursor: pointer;
+ width: 22%;
+ height: 32px;
+ background: #2196F3;
+ color: #fff;
+ border-radius: 4px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .inputBox{
+ width: 63%;
+ display: flex;
+ align-items: center;
+ .positionInput{
+ border: 0;
+ border-radius: 6px;
+ width: 90%;
+ height: 34px;
+ background: #F2F2F2;
+ margin-left: 8px;
+ box-sizing: border-box;
+ padding-left: 10px;
+ }
+ }
+
+ }
+ .hidden{
+ opacity: 0;
+ z-index: -1;
+ }
+ .show{
+ opacity: 1;
+ z-index: 1;
+ }
+ }
+ }
+ }
+}
+
.bodyBox{
flex: 70%;overflow-y: auto;
position: relative;
diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts
index a07f1a3..fcbe8e1 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo/basicinfo.component.ts
@@ -21,7 +21,7 @@ import { LookMaster } from './lookmaster.component'
import { ActivatedRoute } from '@angular/router';
import { TabbarAndScoreService } from 'src/app/http-interceptors/tabbar-and-score.service';
declare var AMap: any;
-
+import Viewer from 'viewerjs';
@Component({
selector: 'app-basicinfo',
templateUrl: './basicinfo.component.html',
@@ -94,11 +94,17 @@ export class BasicinfoComponent implements OnInit {
houses: any = [] //存储当前单位的建筑信息
unitId : any //当前单位id
+ gallery : any //Viewer实例
ngOnInit(): void {
this.getallunittype()
this.getorganization()
this.getUnitAllBuildings()//获得单位下所有建筑
this.unitId = this.route.snapshot.queryParams.id
+ setTimeout(() => {
+ this.gallery = new Viewer(document.getElementById('viewerjs'),{
+ url: 'data-original'
+ });
+ },0);
}
//获得单位下所有建筑
getUnitAllBuildings(){
@@ -229,6 +235,7 @@ export class BasicinfoComponent implements OnInit {
this.markerPosition2 = {x: this.map.getCenter().lng,y: this.map.getCenter().lat} //获取当前地图中心位置
}
this.newPositionMarker.on('dragend', (e)=>{
+ // console.log(1111)
this.markerPosition2 = {x: e.lnglat.lng, y: e.lnglat.lat}
})
//点击确定
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.scss b/src/app/key-unit/key-unit-management/key-unit-management.component.scss
index adf9eda..b26141d 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.scss
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.scss
@@ -154,7 +154,6 @@
width: 180px;
height: 30px;
background-color: #e2e7ee;
- // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
margin: 0 auto;
position: relative;
.integrityNum{
@@ -260,6 +259,12 @@
left: 188px;
}
}
+
+@media screen and (max-width:1400px){
+ .integrityDiv{
+ width: 128px;
+ }
+}
.integrityDiv:hover{
.integrityDetails{
display: block;
diff --git a/src/app/key-unit/key-unit.module.ts b/src/app/key-unit/key-unit.module.ts
index 07f1796..8ffd21f 100644
--- a/src/app/key-unit/key-unit.module.ts
+++ b/src/app/key-unit/key-unit.module.ts
@@ -73,7 +73,6 @@ import { ImgsDataDetail } from './fire-fighting-device/addGrouping.component';
import { FireFightingDeviceLookComponent } from './fire-fighting-device-look/fire-fighting-device.component';
import { ImagesData2, previewBigImg2 } from './fire-fighting-device-look/imagesdata.component';
import { ImgsDataDetail2 } from './fire-fighting-device-look/addGrouping.component';
-import { LookMaster2 } from './basicinfo-look/lookmaster.component';
import { UiModule } from '../../app/ui/ui.module';
import { SixFamiliarityComponent,routerMapComponent } from './six-familiarity/six-familiarity.component';
import { ActualCombatDrillComponent } from './actual-combat-drill/actual-combat-drill.component';
@@ -88,7 +87,7 @@ import { upname } from './key-unit-management/key-unit-management.component';
import { companyAuditResult } from './key-unit-management/key-unit-management.component'
@NgModule({
- declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,LookMaster2,addPartitionAttribute2, SixFamiliarityComponent, ActualCombatDrillComponent,routerMapComponent, SixFamiliarListComponent,TrainingRecordinfoComponent,RouterGISComponent,WaterRoadComponent,PhotoofthesceneComponent,KnowRouteComponent,FindProblemComponent,upname,companyAuditResult,StatisticsOfFireFightingFacilities],
+ declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,addPartitionAttribute2, SixFamiliarityComponent, ActualCombatDrillComponent,routerMapComponent, SixFamiliarListComponent,TrainingRecordinfoComponent,RouterGISComponent,WaterRoadComponent,PhotoofthesceneComponent,KnowRouteComponent,FindProblemComponent,upname,companyAuditResult,StatisticsOfFireFightingFacilities],
exports:[ViewUnitDetailsPlanComponent],
imports: [
CommonModule,
diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html
index 738ad11..0309e86 100644
--- a/src/app/tabbar/tabbar.component.html
+++ b/src/app/tabbar/tabbar.component.html
@@ -1,7 +1,6 @@
- {{title}} : {{planName}}
-
+ {{title}} : {{planName}}
-
diff --git a/src/app/tabbar/tabbar.component.scss b/src/app/tabbar/tabbar.component.scss
index 099f600..97f1d73 100644
--- a/src/app/tabbar/tabbar.component.scss
+++ b/src/app/tabbar/tabbar.component.scss
@@ -9,7 +9,7 @@ mat-toolbar{
//border:1px solid #F00;
position: absolute;
text-align: center;
- margin-left: 250px;
+ margin-left: 220px;
margin-top: 0px;
-webkit-transform: rotate(-10deg);
-moz-transform: rotate(-10deg);
@@ -97,7 +97,7 @@ mat-icon{
display: none;
width: 350px;
height:290px;
- left: 440px;
+ left: 390px;
top: 30px;
border: 1px solid rgba(0, 0, 0, 0.22);
background-color: white;
@@ -174,12 +174,22 @@ mat-icon{
}
}
+ .closeScore{
+ display: none;
+
+ }
+ @media screen and (max-width:1400px){
+ .closeScore{
+ display: block;
+
+ }
+ }
}
//计分规则按钮
.scoringRule,.isUpdates{
user-select: none;
position: absolute;
- left: 480px;
+ left: 440px;
cursor: pointer;
.name{
background-color: #fff;
@@ -206,7 +216,6 @@ mat-icon{
border: 1px solid #2196F3;
background-color: #fff;
.topbox{
-
position: relative;
background-color: #2196F3;
height: 40px;
@@ -215,7 +224,6 @@ mat-icon{
.imgbox{
position: absolute;
right: 48px;
- // top: 10px;
}
.close{
position: absolute;
@@ -255,6 +263,27 @@ mat-icon{
}
}
+
+@media screen and (max-width:1400px){
+ .scoringRule{
+ .scoringRuleImg{
+ left: -230px;
+ // .tablebox{
+ // width: 450px;
+ // table{
+ // tr{
+ // width: 450px;
+ // }
+ // }
+ // }
+ }
+ }
+}
+
+
+
+
+
.isUpdates{
left: 596px;
}
diff --git a/src/app/ui/collection-tools-building/collection-tools.component.html b/src/app/ui/collection-tools-building/collection-tools.component.html
index c7d7708..c250122 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.html
+++ b/src/app/ui/collection-tools-building/collection-tools.component.html
@@ -69,16 +69,16 @@
-
+
-
+
@@ -433,9 +433,9 @@
visibility
-
+
-
+
{{node.name}}
@@ -445,7 +445,7 @@
-
+