chenjingyu 4 years ago
parent
commit
ead265c554
  1. 2
      src/app/_theming.scss
  2. 2
      src/app/gis-management/allaround/allaround.component.scss
  3. 13
      src/app/gis-management/gis-labeling/gis-labeling.component.ts
  4. 22
      src/app/key-unit/basicinfo-look/basicinfo.component.html
  5. 185
      src/app/key-unit/basicinfo-look/basicinfo.component.scss
  6. 24
      src/app/key-unit/basicinfo-look/basicinfo.component.ts
  7. 26
      src/app/key-unit/basicinfo-look/lookmaster.component.html
  8. 66
      src/app/key-unit/basicinfo-look/lookmaster.component.ts
  9. 25
      src/app/key-unit/basicinfo/basicinfo.component.html
  10. 206
      src/app/key-unit/basicinfo/basicinfo.component.scss
  11. 9
      src/app/key-unit/basicinfo/basicinfo.component.ts
  12. 7
      src/app/key-unit/key-unit-management/key-unit-management.component.scss
  13. 3
      src/app/key-unit/key-unit.module.ts
  14. 6
      src/app/tabbar/tabbar.component.html
  15. 39
      src/app/tabbar/tabbar.component.scss
  16. 14
      src/app/ui/collection-tools-building/collection-tools.component.html
  17. 16
      src/app/ui/collection-tools-building/collection-tools.component.scss
  18. 4
      src/app/ui/collection-tools-building/panel.scss
  19. 6
      src/app/ui/collection-tools/collection-tools.component.html

2
src/app/_theming.scss

@ -2824,7 +2824,7 @@ $mat-calendar-weekday-table-font-size: 11px !default;
@media (hover: none) {
.mat-expansion-panel:not(.mat-expanded):not([aria-disabled='true'])
.mat-expansion-panel-header:hover {
background: mat-color($background, card);
// background: mat-color($background, card);
}
}

2
src/app/gis-management/allaround/allaround.component.scss

@ -114,7 +114,7 @@
.rotateA {transform: rotate(90deg) scale(0.75);}
.rotateB {transform: rotate(180deg)}
.rotateC {transform: rotate(270deg) scale(0.75);}
@media screen and (min-width:1000px) and (max-width:1400px){
@media screen and (max-width:1400px){
.bigimgbox{
width:920px;
height: 600px;

13
src/app/gis-management/gis-labeling/gis-labeling.component.ts

@ -561,19 +561,10 @@ export class GisLabelingComponent implements OnInit {
mapPatternChange(type){
this.unitCluster = null
this.waterCluster = null
this.checkRadio = false
if(type == '2D'){
this.mapPattern = true
var layer = new AMap.createDefaultLayer({
zooms:[3,20], //可见级别
visible:true, //是否可见
opacity:1, //透明度
zIndex:0, //叠加层级
resizeEnable: true //是否监控地图容器尺寸变化,
})
this.map = new AMap.Map('map',{
layers:[layer], //当只想显示标准图层时layers属性可缺省,
});
this.map.setCity('上海市');
this.mapInit()
}else{
this.unitCluster ? this.unitCluster.setData([]) : null
this.mapPattern = false

22
src/app/key-unit/basicinfo-look/basicinfo.component.html

@ -41,7 +41,7 @@
<span style="color: red;">*</span>
<span>联系人:</span>
<mat-form-field>
<input matInput id="linkman" name="linkman" type='text'
<input readonly matInput id="linkman" name="linkman" type='text'
required minlength="1"
[(ngModel)]="unitinfo.contacts"
(focus)="closeorganizationbox()"
@ -52,7 +52,7 @@
<span style="color: red;">*</span>
<span>联系电话:</span>
<mat-form-field>
<input matInput id="linkphone" name="linkphone" type='text' #linkphone="ngModel"
<input readonly matInput id="linkphone" name="linkphone" type='text' #linkphone="ngModel"
required pattern="^(?:\+?86)?1(?:3\d{3}|5[^4\D]\d{2}|8\d{3}|7(?:[35-8]\d{2}|4(?:0\d|1[0-2]|9\d))|9[0135-9]\d{2}|66\d{2})\d{6}$"
[(ngModel)]="unitinfo.phone"
(focus)="closeorganizationbox()"
@ -64,14 +64,13 @@
</div>
</div>
</div>
<div class="inputbox" style="width: 700px;">
<div class="inputbox longinputbox">
<span style="color: red;">*</span>
<span>辖区中队:</span>
<mat-form-field style="width: 538px;">
<mat-form-field class="longInput">
<input matInput id="organization" name="organization" type='text'
required minlength="1"
[(ngModel)]="selectedorganization"
(focus)="openorganizationbox()"
readonly="value" >
</mat-form-field>
</div>
@ -95,11 +94,11 @@
</mat-tree-node>
</mat-tree>
</div>
<div class="inputbox" style="width: 700px;">
<div class="inputbox longinputbox">
<span style="color: red;">*</span>
<span>单位地址:</span>
<mat-form-field style="width: 538px;">
<input matInput id="unitaddress" name="unitaddress" type='text'
<mat-form-field class="longInput">
<input readonly matInput id="unitaddress" name="unitaddress" type='text'
required minlength="1"
[(ngModel)]="unitinfo.address"
(focus)="closeorganizationbox()">
@ -107,14 +106,11 @@
</div>
<div class="uploadimg">
<span>单位照片:</span>
<div class="uploadingimg" (click)="lookmaster()">
<img [src]="imgsrc ? imgsrc : noImg" alt="" style="width: 299px; height: 170px;" >
<div class="uploadingimg" id="viewerjs">
<img [src]="imgsrc ? imgsrc : noImg" [attr.data-original]="imgsrc ? imgsrc.split('?')[0] : noImg">
</div>
<mat-spinner *ngIf="isspinner" diameter= 50></mat-spinner>
</div>
<!-- <div class="image" (click)="closeorganizationbox()">
<input id="selectedfile" type="file" ng2FileSelect [uploader]="uploader" (change)="filechange($event)" name="imgFile" accept=".jpg,.png,.jpeg,.gif,.webp">
</div> -->
</div>
<div class="mainright" id="setPosition">
<div style="width: 100%;height: 100%;" id="container">

185
src/app/key-unit/basicinfo-look/basicinfo.component.scss

@ -7,7 +7,7 @@
position: relative;
display: flex;
.mainleft{
width:800px;
flex: 1;
height: 100%;
float: left;
.inputbox{
@ -17,6 +17,12 @@
float: left;
text-align: end;
}
.longinputbox{
width: 700px;
.longInput{
width: 538px;
}
}
.organizationbox{
width:538px;
height: 200px;
@ -62,16 +68,13 @@
left: 79px;
border: 1px dashed gray;
border-radius:3px;
img{
width: 299px;
height: 170px;
}
}
}
.image{
input{
width: 190px;
margin-top: 160px;
cursor: pointer;
}
}
}
.mainright{
float: left;
@ -153,6 +156,172 @@
}
}
}
@media screen and (max-width:1400px){
.topbox{
// height: 485px;
width: 100%;
padding-bottom: 20px;
.mainbox{
height: 100%;
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: 695px;
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;
}
}
}
}
.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;

24
src/app/key-unit/basicinfo-look/basicinfo.component.ts

@ -16,9 +16,9 @@ import { MatTableDataSource } from '@angular/material/table';
import { isNgTemplate } from '@angular/compiler';
import * as _ from 'lodash';
import Swiper from 'swiper';
import { LookMaster2 } from './lookmaster.component'
import { ActivatedRoute } from '@angular/router';
import { StatisticsOfFireFightingFacilities } from '../basicinfo/basicinfo.component';
import Viewer from 'viewerjs';
declare var AMap: any;
@Component({
@ -96,11 +96,17 @@ export class BasicinfoLookComponent 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(){
@ -114,7 +120,9 @@ export class BasicinfoLookComponent implements OnInit {
element.data = []
});
this.houses = data
this.getBuildingInfo()
if(this.houses.length != 0){
this.getBuildingInfo()
}
})
}
@ -669,17 +677,7 @@ export class BasicinfoLookComponent implements OnInit {
}, 500);
}
//查看单位大图
lookmaster(){
const dialogRef = this.dialog.open(LookMaster2, {//调用open方法打开对话框并且携带参数过去
width: '1600px',
height:'900px',
data: {img:this.imgsrc}
});
dialogRef.afterClosed().subscribe(
);
}
//上传文件
startUploading() {
this.isspinner = true

26
src/app/key-unit/basicinfo-look/lookmaster.component.html

@ -1,26 +0,0 @@
<div mat-dialog-title>单位照片</div>
<div>
<div>
<ng-container *ngIf="isshowimg; else elseTemplate">
<div class="imgbox">
<img class="imgitemdefault" [src]="ImgUrl">
<!-- <img class="imgitemdefault" [src]="ImgUrl" [ngClass]="{'img1': rotateA==90,'img2': rotateA==180,'img3': rotateA==270,'img4': rotateB==10,'img5': rotateB==20,'img6': rotateB==30}" > -->
</div>
</ng-container>
<ng-template #elseTemplate >
<p style="text-align: center;">暂无单位图片,请先上传</p>
</ng-template>
</div>
</div>
<!--
<div class="swiper-button-prev"></div>
<div class="swiper-button-next"></div> -->
<!-- <div class="previewImgBottom">
<button type="button" mat-icon-button (click)='rotate()'><mat-icon>refresh</mat-icon></button>
</div> -->

66
src/app/key-unit/basicinfo-look/lookmaster.component.ts

@ -1,66 +0,0 @@
import { Component, OnInit, Inject } from '@angular/core';
import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree';
import {FlatTreeControl} from '@angular/cdk/tree';
import { HttpClient } from '@angular/common/http';
import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
import {FormControl} from '@angular/forms';
import { MatSnackBar } from '@angular/material/snack-bar';
@Component({
selector: 'lookmaster',
templateUrl: './lookmaster.component.html',
styleUrls: ['./basicinfo.component.scss']
})
export class LookMaster2 {
// myControl = new FormControl();
//注入MatDialogRef,可以用来关闭对话框
//要访问对话框组件中的数据,必须使用MAT_DIALOG_DATA注入令牌
constructor(private http: HttpClient,public dialogRef: MatDialogRef<LookMaster2>,@Inject(MAT_DIALOG_DATA) public data) {}
allunittype:any
ImgUrl:string
rotationAngle=0
isheng:any
isshowimg:boolean
onNoClick(): void {
this.dialogRef.close();
}
ngOnInit(): void {
if(this.data.img.indexOf('?') == -1){
this.isshowimg = false
}else{
this.isshowimg = true
var imgurl = this.data.img.split("?")
this.ImgUrl = imgurl[0]
}
}
//点击旋转按钮时
rotateA = 0
rotateB = 0
rotate(){
var w= document.getElementsByClassName("imgitemdefault")[0]['naturalWidth'];
var h = document.getElementsByClassName("imgitemdefault")[0]['naturalHeight'];
if(w > h){
this.isheng = true
}else{
this.isheng = false
}
if(this.isheng){
this.rotateA += 90
if(this.rotateA == 360){
this.rotateA = 0
}
}else{
this.rotateB += 10
if(this.rotateB == 40){
this.rotateB = 0
}
}
}
}

25
src/app/key-unit/basicinfo/basicinfo.component.html

@ -41,7 +41,7 @@
<span style="color: red;">*</span>
<span>联系人:</span>
<mat-form-field>
<input matInput id="linkman" name="linkman" type='text'
<input readonly matInput id="linkman" name="linkman" type='text'
required minlength="1"
[(ngModel)]="unitinfo.contacts"
(focus)="closeorganizationbox()"
@ -52,7 +52,7 @@
<span style="color: red;">*</span>
<span>联系电话:</span>
<mat-form-field>
<input matInput id="linkphone" name="linkphone" type='text' #linkphone="ngModel"
<input readonly matInput id="linkphone" name="linkphone" type='text' #linkphone="ngModel"
required pattern="^(?:\+?86)?1(?:3\d{3}|5[^4\D]\d{2}|8\d{3}|7(?:[35-8]\d{2}|4(?:0\d|1[0-2]|9\d))|9[0135-9]\d{2}|66\d{2})\d{6}$"
[(ngModel)]="unitinfo.phone"
(focus)="closeorganizationbox()"
@ -64,10 +64,10 @@
</div>
</div>
</div>
<div class="inputbox" style="width: 700px;">
<div class="inputbox longinputbox">
<span style="color: red;">*</span>
<span>辖区中队:</span>
<mat-form-field style="width: 538px;">
<mat-form-field class="longInput">
<input matInput id="organization" name="organization" type='text'
required minlength="1"
[(ngModel)]="selectedorganization"
@ -95,11 +95,11 @@
</mat-tree-node>
</mat-tree>
</div>
<div class="inputbox" style="width: 700px;">
<div class="inputbox longinputbox">
<span style="color: red;">*</span>
<span>单位地址:</span>
<mat-form-field style="width: 538px;">
<input matInput id="unitaddress" name="unitaddress" type='text'
<mat-form-field class="longInput">
<input readonly matInput id="unitaddress" name="unitaddress" type='text'
required minlength="1"
[(ngModel)]="unitinfo.address"
(focus)="closeorganizationbox()">
@ -107,16 +107,17 @@
</div>
<div class="uploadimg">
<span>单位照片:</span>
<div class="uploadingimg" (click)="lookmaster()">
<img [src]="imgsrc ? imgsrc : noImg" alt="" style="width: 299px; height: 170px;" >
<div class="uploadingimg" id="viewerjs">
<img [src]="imgsrc ? imgsrc : noImg" [attr.data-original]="imgsrc ? imgsrc.split('?')[0] : noImg">
</div>
<mat-spinner *ngIf="isspinner" diameter= 50></mat-spinner>
</div>
<div class="image" (click)="closeorganizationbox()">
<div class="image">
<input id="selectedfile" type="file" ng2FileSelect [uploader]="uploader" (change)="filechange($event)" name="imgFile" accept=".jpg,.png,.jpeg">
<button type="submit" color="primary" class="submit1 sub1" mat-button mat-raised-button>保存</button>
</div>
<div class="addbtn">
<button type="submit" color="primary" class="submit1" mat-button mat-raised-button>保存</button>
<div class="addbtn" class="sub2">
<button type="submit" color="primary" class="submit1" mat-button mat-raised-button>保存</button>
</div>
</div>
<div class="mainright" id="setPosition">

206
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;

9
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}
})
//点击确定

7
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;

3
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,

6
src/app/tabbar/tabbar.component.html

@ -1,7 +1,6 @@
<mat-toolbar [color]="theme?'primary':'accent'">
<!-- <mat-toolbar> -->
<h1>{{title}} <span *ngIf="planName != null">: {{planName}}</span> </h1>
<h1 style="max-width: 240px;display: block;overflow: hidden;text-overflow: ellipsis;">{{title}} <span *ngIf="planName != null">: {{planName}}</span> </h1>
<!--分数框-->
<div class="grade" *ngIf="companyIntegrityScore" onmouseover="xiangqing.style.display='block';" onmouseout="xiangqing.style.display='none';">
<a class="active"><span ><a></a>{{(companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}} 分</span></a>
@ -107,8 +106,9 @@
</li>
</ul>
</div>
<div style="width: 100%;text-align: center;font-size: 13px;">
<div style="width: 100%;text-align: center;font-size: 13px;position: relative;">
仅供参考
<span class="closeScore" style="position: absolute;right: 12px;top: 0px;" onmouseover="xiangqing.style.display='none';">关闭</span>
</div>
</div>

39
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;
}

14
src/app/ui/collection-tools-building/collection-tools.component.html

@ -69,16 +69,16 @@
<div id="leftDiv" (mousewheel)="$event.stopPropagation()" class='functionalDomainLeft publicCss' [ngClass]="{'togglePanel': toggleExpandPanel==true,'scenarioAssignment': !pattern}" style="user-select: none;">
<div class="leftDragDiv" (mousedown)="leftDivMouseDown($event)"></div>
<!-- 平面图 -->
<div class="planarGraph">
<div class="planarGraph" style="overflow: hidden;display: flex;flex-direction: column;">
<div class="planarGraphHeader" (click)='togglePlanarGraph()'>
<mat-icon *ngIf="togglePlane">keyboard_arrow_up</mat-icon>
<mat-icon *ngIf="!togglePlane">keyboard_arrow_down</mat-icon>
<label class="overflowText" style="font-weight: 550;">平面图</label>
<label class="hover" *ngIf="isEditPattern && pattern">
<mat-icon (click)='foundPanel($event)'>add</mat-icon>
<label class="hover" *ngIf="isEditPattern && pattern" (click)='foundPanel($event)'>
<mat-icon >add</mat-icon>
</label>
</div>
<div [hidden]="!togglePlane" >
<div [hidden]="!togglePlane" style="flex: 1;">
<div class="sitePlanContent" *ngFor="let item of sitePlanData;let key = index" [ngClass]="{'isRefugeStorey':item.isRefugeStorey==true,'selectSitePlan': selectSitePlanIndex==key}" (click)='selectSitePlan(item,key)'>
<label class="overflowText" style="display:inline-block; max-width: 160px;"><mat-icon *ngIf="!item.imageUrl" class="matIcons">broken_image</mat-icon>{{item.name}}</label>
<a href="javascript:;" class="fireForce" *ngIf="isEditPattern && !pattern">
@ -433,9 +433,9 @@
<div class="firecategoriesTree">
<div class="hideAllTreeNode" (click)='toggoleAllTreenode()' *ngIf="allFireElements.length"><label>全部显示/隐藏</label><mat-icon [ngClass]="{'icongray': hideAllTreenode == false}">visibility</mat-icon></div>
<!-- 消防列表树写在这里 -->
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl" cdkDropList [cdkDropListData]="dataSource" (cdkDropListDropped)="drop($event)">
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
<mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" class="treeNode">
<mat-tree-node [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" class="treeNode">
<button mat-icon-button disabled></button>
<span title="{{node.name}}" [ngClass]="{'treeText': !node.isTemplate}">
{{node.name}}
@ -445,7 +445,7 @@
</mat-tree-node>
<mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)"class="treeNode" >
<mat-tree-node [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)"class="treeNode" >
<button mat-icon-button
matTreeNodeToggle
[attr.aria-label]="'toggle ' + node.name">

16
src/app/ui/collection-tools-building/collection-tools.component.scss

@ -1,4 +1,7 @@
@import './panel.scss';
html{
::-webkit-scrollbar {display:none}
}
.icongray{
color: #D9D0DC;
}
@ -139,7 +142,7 @@
border: 1px solid #E6EAEE;
width: 235px;
left: 0;
z-index: 111;
z-index: 112;
.leftDragDiv{
position: absolute;
right: 0;
@ -157,6 +160,17 @@
width: 235px;
right: 0;
}
@media screen and (max-width:1300px){
.functionalDomainLeft{
min-width: 195px;
width: 195px;
}
.functionalDomainRight{
width: 195px;
}
}
//右边导航栏显示隐藏
.togglePanel2 {

4
src/app/ui/collection-tools-building/panel.scss

@ -24,7 +24,9 @@
.hover {
width: 18px;
height: 18px;
margin-left: 90px;
position: absolute;
right: 26px;
z-index:112;
border: 1px solid #999;
border-radius: 3px;
.mat-icon {font-size: 18px; color: #999;}

6
src/app/ui/collection-tools/collection-tools.component.html

@ -518,9 +518,9 @@
<div class="firecategoriesTree">
<div class="hideAllTreeNode" (click)='toggoleAllTreenode()' *ngIf="allFireElements.length"><label>全部显示/隐藏</label><mat-icon [ngClass]="{'icongray': hideAllTreenode == false}">visibility</mat-icon></div>
<!-- 消防列表树写在这里 -->
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl" cdkDropList [cdkDropListData]="dataSource" (cdkDropListDropped)="drop($event)">
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
<mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" class="treeNode">
<mat-tree-node [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" class="treeNode">
<button mat-icon-button disabled></button>
<span title="{{node.name}}" [ngClass]="{'treeText': !node.isTemplate}">
{{node.name}}
@ -530,7 +530,7 @@
</mat-tree-node>
<mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)"class="treeNode" >
<mat-tree-node [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)"class="treeNode" >
<button mat-icon-button
matTreeNodeToggle
[attr.aria-label]="'toggle ' + node.name">

Loading…
Cancel
Save