shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

上海一张图
chenjingyu 4 years ago
parent
91a4ad57ff 0d7c476036
commit
3f25e5a2c8
19 changed files with 1689 additions and 1171 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/app/key-unit/basicinfo-look/basicinfo.component.html
  2. 813
      src/app/key-unit/basicinfo-look/basicinfo.component.ts
  3. 349
      src/app/key-unit/basicinfo/basicinfo.component.html
  4. 916
      src/app/key-unit/basicinfo/basicinfo.component.ts
  5. 120
      src/app/key-unit/edit-plan-info/edit-plan-info.component.html
  6. 5
      src/app/key-unit/key-unit.module.ts
  7. 17
      src/app/key-unit/special-warning/special-warning.component.html
  8. 64
      src/app/key-unit/special-warning/special-warning.component.scss
  9. 25
      src/app/key-unit/special-warning/special-warning.component.spec.ts
  10. 74
      src/app/key-unit/special-warning/special-warning.component.ts
  11. 42
      src/app/key-unit/view-unit-details/view-unit-details.component.html
  12. 2
      src/app/pages/login/login.component.ts
  13. 4
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  14. 7
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  15. 4
      src/app/tabbar/tabbar.component.html
  16. 119
      src/app/ui/collection-tools-building/collection-tools.component.ts
  17. 120
      src/app/ui/collection-tools-plan/collection-tools.component.ts
  18. 119
      src/app/ui/collection-tools/collection-tools.component.ts
  19. 56
      src/styles.scss

4
src/app/key-unit/basicinfo-look/basicinfo.component.html
Unescape View File

@ -112,7 +112,7 @@
<mat-spinner *ngIf="isspinner" diameter= 50></mat-spinner>
</div>
</div>
<div class="mainright" id="setPosition">
<div class="mainright" id="setUnitPositionLook">
<div style="width: 100%;height: 100%;" id="container">
</div>
@ -141,7 +141,7 @@
<div class="gistopbox hidden" [ngClass]="{'show': isGisTopBoxTwo}">
<div class="inputBox">
<span>位置: </span>
<input name="position" [(ngModel)]="searchTitle" id="tipinput" class="positionInput" type="text" autocomplete="off">
</div>
<div class="setPosition">
搜索

813
src/app/key-unit/basicinfo-look/basicinfo.component.ts
View File

File diff suppressed because it is too large Load Diff

349
src/app/key-unit/basicinfo/basicinfo.component.html
Unescape View File

@ -6,24 +6,24 @@
<mat-panel-title>
单位信息
</mat-panel-title>
<button type="button" color="primary" mat-button mat-raised-button style="height: 35px; margin-right: 25px;" (click)="seeFirfightingDevice($event)">查看消防设施统计</button>
<button type="button" color="primary" mat-button mat-raised-button
style="height: 35px; margin-right: 25px;" (click)="seeFirfightingDevice($event)">查看消防设施统计</button>
</mat-expansion-panel-header>
<div class="topbox">
<form (ngSubmit)="onSubmit(form.value,form.invalid,form)" #form="ngForm" class="example-container">
<div class="mainbox" >
<div class="mainbox">
<div class="mainleft">
<div class="inputbox" >
<div class="inputbox">
<span style="color: red;">*</span>
<span>统一社会信用代码：</span>
<mat-form-field>
<input matInput id="creditcode" name="creditcode" type='text' #usci="ngModel"
required minlength="1" maxlength="18"
[(ngModel)]="unitinfo.usci"
(focus)="closeorganizationbox()"
pattern="^[0-9A-HJ-NP-RTUW-Y]{2}\d{6}[0-9A-HJ-NP-RTUW-Y]{10}$">
required minlength="1" maxlength="18" [(ngModel)]="unitinfo.usci"
(focus)="closeorganizationbox()"
pattern="^[0-9A-HJ-NP-RTUW-Y]{2}\d{6}[0-9A-HJ-NP-RTUW-Y]{10}$">
</mat-form-field>
<div *ngIf="usci.invalid && (usci.dirty || usci.touched)" class="alert-danger">
<div *ngIf="usci.errors.pattern" class="alert-danger">
<div *ngIf="usci.errors.pattern" class="alert-danger">
统一社会信用代码格式不正确
</div>
</div>
@ -33,7 +33,8 @@
<span>单位类型：</span>
<mat-form-field (click)="closeorganizationbox()">
<mat-select required name="unittype" [(ngModel)]="defaultbuildingTypes">
<mat-option [value]="item.id" *ngFor="let item of allunittype">{{item.name}}</mat-option>
<mat-option [value]="item.id" *ngFor="let item of allunittype">{{item.name}}
</mat-option>
</mat-select>
</mat-form-field>
</div>
@ -41,11 +42,8 @@
<span style="color: red;">*</span>
<span>联系人：</span>
<mat-form-field>
<input matInput id="linkman" name="linkman" type='text'
required minlength="1"
[(ngModel)]="unitinfo.contacts"
(focus)="closeorganizationbox()"
>
<input matInput id="linkman" name="linkman" type='text' required minlength="1"
[(ngModel)]="unitinfo.contacts" (focus)="closeorganizationbox()">
</mat-form-field>
</div>
<div class="inputbox">
@ -53,14 +51,14 @@
<span>联系电话：</span>
<mat-form-field>
<input 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()"
>
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()">
</mat-form-field>
<div *ngIf="linkphone.invalid && (linkphone.dirty || linkphone.touched)" class="alert-danger">
<div *ngIf="linkphone.errors.pattern" class="alert-danger">
电话号码格式不正确
<div *ngIf="linkphone.invalid && (linkphone.dirty || linkphone.touched)"
class="alert-danger">
<div *ngIf="linkphone.errors.pattern" class="alert-danger">
电话号码格式不正确
</div>
</div>
</div>
@ -68,59 +66,58 @@
<span style="color: red;">*</span>
<span>辖区中队：</span>
<mat-form-field class="longInput">
<input matInput id="organization" name="organization" type='text'
required minlength="1"
[(ngModel)]="selectedorganization"
(focus)="openorganizationbox()"
readonly="value" >
<input matInput id="organization" name="organization" type='text' required
minlength="1" [(ngModel)]="selectedorganization" (focus)="openorganizationbox()"
readonly="value">
</mat-form-field>
</div>
<div id="organizationbox" class="organizationbox" *ngIf="isorganizationbox">
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
<mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='add(node)' class="organizationlist">
<button type="button" mat-icon-button disabled ></button>
<mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='add(node)'
class="organizationlist">
<button type="button" mat-icon-button disabled></button>
<li>{{node.name}}</li>
</mat-tree-node>
<mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='add(node)' class="organizationlist">
<button
type="button"
mat-icon-button
matTreeNodeToggle
[attr.aria-label]="'toggle ' + node.name">
<mat-icon class="mat-icon-rtl-mirror">
{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
</mat-icon>
<mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding
(click)='add(node)' class="organizationlist">
<button type="button" mat-icon-button matTreeNodeToggle
[attr.aria-label]="'toggle ' + node.name">
<mat-icon class="mat-icon-rtl-mirror">
{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
</mat-icon>
</button>
<li>{{node.name}}</li>
</mat-tree-node>
</mat-tree>
</mat-tree>
</div>
<div class="inputbox longinputbox">
<span style="color: red;">*</span>
<span>单位地址：</span>
<mat-form-field class="longInput">
<input matInput id="unitaddress" name="unitaddress" type='text'
required minlength="1"
[(ngModel)]="unitinfo.address"
(focus)="closeorganizationbox()">
<input matInput id="unitaddress" name="unitaddress" type='text' required
minlength="1" [(ngModel)]="unitinfo.address" (focus)="closeorganizationbox()">
</mat-form-field>
</div>
</div>
<div class="uploadimg">
<span>单位照片：</span>
<div class="uploadingimg" id="viewerjs">
<img [src]="imgsrc ? imgsrc : noImg" [attr.data-original]="imgsrc ? imgsrc.split('?')[0] : noImg">
<img [src]="imgsrc ? imgsrc : noImg"
[attr.data-original]="imgsrc ? imgsrc.split('?')[0] : noImg">
</div>
<mat-spinner *ngIf="isspinner" diameter= 50></mat-spinner>
</div>
<mat-spinner *ngIf="isspinner" diameter=50></mat-spinner>
</div>
<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>
<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" class="sub2">
<button type="submit" color="primary" class="submit1" mat-button mat-raised-button>保存</button>
<button type="submit" color="primary" class="submit1" mat-button
mat-raised-button>保存</button>
</div>
</div>
<div class="mainright" id="setPosition">
<div class="mainright" id="setUnitPosition">
<div style="width: 100%;height: 100%;" id="container">
</div>
@ -128,15 +125,15 @@
<div class="gistopbox" *ngIf="isGisTopBox">
<div class="positionItem">
<span>
经度 :
经度 :
</span>
<div class="itemNum">
{{markerPosition.x || '暂未标注'}}
{{markerPosition.x || '暂未标注'}}
</div>
</div>
<div class="positionItem">
<span>
纬度 :
纬度 :
</span>
<div class="itemNum">
{{markerPosition.y || '暂未标注'}}
@ -149,10 +146,11 @@
<div class="gistopbox hidden" [ngClass]="{'show': isGisTopBoxTwo}">
<div class="inputBox">
<span>位置: </span>
<input name="position" [(ngModel)]="searchTitle" id="tipinput" class="positionInput" type="text" autocomplete="off">
<input name="position" [(ngModel)]="searchTitle" id="tipinput" class="positionInput"
type="text" autocomplete="off">
</div>
<div class="setPosition" (click)="search()">
搜索
搜索
</div>
</div>
</div>
@ -164,53 +162,66 @@
<!-- body -->
<div class="bodyBox" id="basicInfoBody">
<div>
<button type="button" mat-icon-button (click)="addhouseinfo()" class="addBuilding"><mat-icon>add_circle_outline</mat-icon></button>
<button type="button" mat-icon-button (click)="addhouseinfo()" class="addBuilding">
<mat-icon>add_circle_outline</mat-icon>
</button>
</div>
<div style="height: 100%; box-sizing:border-box;overflow-y: auto;padding-left: 26px;">
<mat-tab-group style="height: 100%;" [selectedIndex]="selectedIndex" (selectedTabChange)="selectedTabChange($event)">
<mat-tab *ngFor="let item of houses;let key = index" label="{{item.name}}">
<mat-tab-group style="height: 100%;" [selectedIndex]="selectedIndex"
(selectedTabChange)="selectedTabChange($event)">
<mat-tab *ngFor="let item of houses;let key = index" label="{{item.name}}">
<ng-template matTabContent>
<form *ngIf="item.data && item.data.length!=0" style="height: 100%; overflow-y:auto; display: block;" (ngSubmit)="onSubmitBuildingInfo(form.value,item,key,form.invalid)" #form="ngForm" class="example-container">
<div class="buildInfoInput marginLeft" >
<form *ngIf="item.data && item.data.length!=0"
style="height: 100%; overflow-y:auto; display: block;"
(ngSubmit)="onSubmitBuildingInfo(form.value,item,key,form.invalid)" #form="ngForm"
class="example-container">
<div class="buildInfoInput marginLeft">
<span>建筑名称：</span>
<mat-form-field>
<input required matInput name="buildingName" type='text' minlength="1" [(ngModel)]="item.name">
<input required matInput name="buildingName" type='text' minlength="1"
[(ngModel)]="item.name">
</mat-form-field>
<span style="color: red;">*</span>
</div>
<div class="buildInfoInput marginLeft">
<span>建筑类型：</span>
<mat-form-field>
<mat-select name="buildingTypeName" [(ngModel)]="item.buildingTypes[0].name">
<mat-option [value]="n.name" *ngFor="let n of allunittype" (click)="templateBuildtype(n,item,key)">{{n.name}}</mat-option>
<mat-select name="buildingTypeName" [(ngModel)]="item.buildingTypes[0].name">
<mat-option [value]="n.name" *ngFor="let n of allunittype"
(click)="templateBuildtype(n,item,key)">{{n.name}}</mat-option>
</mat-select>
</mat-form-field>
<span style="color: red;">*</span>
</div>
<div *ngFor="let element of item.data[0].buildingBasicGroups;let groupsIndex = index "style="float: left;width:100%">
<div *ngFor="let element of item.data[0].buildingBasicGroups;let groupsIndex = index "
style="float: left;width:100%">
<!-- 类型为表单并且不是 罐区 -->
<div *ngIf="element.type == 0 && element.name.indexOf('罐区') == -1">
<p style="font-size: 22px;">{{element.name}}</p>
<div class="buildInfoInput marginLeft" *ngFor="let i of element.propertyInfos;let inputIndex = index" style="float: left;position: relative;">
<span>{{i.propertyName}}<span *ngIf="i.physicalUnit">({{i.physicalUnit}})</span>：</span>
<!-- 如果类型是文本 -->
<mat-form-field *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
<div class="buildInfoInput marginLeft"
*ngFor="let i of element.propertyInfos;let inputIndex = index"
style="float: left;position: relative;">
<span>{{i.propertyName}}<span
*ngIf="i.physicalUnit">({{i.physicalUnit}})</span>：</span>
<!-- 如果类型是文本 -->
<mat-form-field *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
<input matInput name="{{groupsIndex}}{{inputIndex}}" type='text'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue">
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue">
</mat-form-field>
<!-- 如果类型是数字 -->
<mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '耐火等级'">
<input matInput name="{{groupsIndex}}{{inputIndex}}" type='number'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue"
(change)="inputchange($event,i.ruleName,i.ruleValue,i)"
>
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue"
(change)="inputchange($event,i.ruleName,i.ruleValue,i)">
</mat-form-field>
<!-- 如果类型是耐火等级 -->
<mat-form-field *ngIf="i.propertyName == '耐火等级'">
<mat-select name="{{groupsIndex}}{{inputIndex}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
<mat-select name="{{groupsIndex}}{{inputIndex}}"
required="{{ i.required==true ? 'true' : 'false' }}"
placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
<mat-option value="0">1级</mat-option>
<mat-option value="1">2级</mat-option>
<mat-option value="2">3级</mat-option>
@ -218,10 +229,15 @@
</mat-select>
</mat-form-field>
<!-- 如果类型是多行文本 -->
<textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{groupsIndex}}{{inputIndex}}"></textarea>
<span style="color: red;" *ngIf="i.required">*</span>
<div *ngIf="i.isshowrule" style="position: absolute;left: 205px;top: 45px;font-size: 11px;color: red;">
<textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'"
style="width: 180px;height: 60px;"
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue"
name="{{groupsIndex}}{{inputIndex}}"></textarea>
<span style="color: red;" *ngIf="i.required">*</span>
<div *ngIf="i.isshowrule"
style="position: absolute;left: 205px;top: 45px;font-size: 11px;color: red;">
<span>{{i.rulevalue}}</span>
</div>
</div>
@ -229,63 +245,91 @@
<!-- 类型为表格 并且不是 罐区 -->
<div *ngIf="element.type == 1 && element.name.indexOf('罐区') == -1">
<p style="font-size: 22px;">
<mat-checkbox color="primary" (change)="checkboxChange(element,$event,item)" *ngIf="element.isOptional" [name]="element.name" [(ngModel)]="element.submitted" style="float: left;margin-right: 10px;"></mat-checkbox>
<mat-checkbox color="primary" (change)="checkboxChange(element,$event,item)"
*ngIf="element.isOptional" [name]="element.name"
[(ngModel)]="element.submitted" style="float: left;margin-right: 10px;">
</mat-checkbox>
{{element.name}}
</p>
<table *ngIf="element.submitted">
<tr>
<th *ngFor="let item of element.propertyInfos[0].origin;let index = index">
<button *ngIf="index == 0" style="width: 24px;" type="button" mat-icon-button class="addline" (click)="addline(element.propertyInfos)"><mat-icon>add_circle_outline</mat-icon></button>
<button *ngIf="index == 0" style="width: 24px;" type="button" mat-icon-button class="removeline" (click)="removeline(element.propertyInfos)"><mat-icon>remove_circle_outline</mat-icon></button>
<button *ngIf="index == 0" style="width: 24px;" type="button"
mat-icon-button class="addline"
(click)="addline(element.propertyInfos)">
<mat-icon>add_circle_outline</mat-icon>
</button>
<button *ngIf="index == 0" style="width: 24px;" type="button"
mat-icon-button class="removeline"
(click)="removeline(element.propertyInfos)">
<mat-icon>remove_circle_outline</mat-icon>
</button>
{{item.propertyName}}
<span style="color: red;" *ngIf="item.required">*</span>
<span style="color: red;" *ngIf="item.required">*</span>
</th>
</tr>
<tr *ngFor="let item of element.propertyInfos;let line = index">
<td *ngFor="let i of item.origin;let list = index">
<input *ngIf="i.propertyType != 1" style="height:45px" class="tankinfo" name="{{element.name}}{{line + 1}}-{{list + 1}}" type="{{i.propertyType == 0 ? 'text' : 'number'}}"
required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue">
<textarea class="tankinfo" *ngIf="i.propertyType == 1" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{element.name}}{{line + 1}}{{list + 1}}">
<input *ngIf="i.propertyType != 1" style="height:45px" class="tankinfo"
name="{{element.name}}{{line + 1}}-{{list + 1}}"
type="{{i.propertyType == 0 ? 'text' : 'number'}}"
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue">
<textarea class="tankinfo" *ngIf="i.propertyType == 1"
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue"
name="{{element.name}}{{line + 1}}{{list + 1}}">
</textarea>
</td>
</tr>
</table>
</div>
<!-- 类型为表单 是罐区-->
<div *ngIf="element.type == 0 && element.name.indexOf('罐区') != -1">
<p style="font-size: 22px;">
<mat-checkbox color="primary" (change)="checkboxChange(element,$event,item)" *ngIf="element.isOptional && element.name == '罐区1'" [name]="element.name" [(ngModel)]="element.submitted" style="float: left;margin-right: 10px;"></mat-checkbox>
<span *ngIf="element.name == '罐区1'">罐区信息</span>
</p>
<div *ngIf="element.submitted" >
<div *ngIf="element.type == 0 && element.name.indexOf('罐区') != -1">
<p style="font-size: 22px;">
<mat-checkbox color="primary" (change)="checkboxChange(element,$event,item)"
*ngIf="element.isOptional && element.name == '罐区1'" [name]="element.name"
[(ngModel)]="element.submitted" style="float: left;margin-right: 10px;">
</mat-checkbox>
<span *ngIf="element.name == '罐区1'">罐区信息</span>
</p>
<div *ngIf="element.submitted">
<p *ngIf="element.name == '罐区1'" style="margin: 5px 0;">
<button type="button" mat-raised-button color="primary" (click)="addTankBox(item,groupsIndex)" style="margin-right: 5px;">添加罐区</button>
<button type="button" mat-raised-button color="warn" (click)="removeTankBox(item,groupsIndex)" matTooltip="会将此建筑处于末尾的罐区移除">移除末尾罐区</button>
<button type="button" mat-raised-button color="primary"
(click)="addTankBox(item,groupsIndex)"
style="margin-right: 5px;">添加罐区</button>
<button type="button" mat-raised-button color="warn"
(click)="removeTankBox(item,groupsIndex)"
matTooltip="会将此建筑处于末尾的罐区移除">移除末尾罐区</button>
</p>
<p style="font-size: 22px;">{{element.name}}</p>
<div class="buildInfoInput marginLeft" *ngFor="let i of element.propertyInfos;let inputIndex = index" style="float: left;position: relative;">
<span>{{i.propertyName}}<span *ngIf="i.physicalUnit">({{i.physicalUnit}})</span>：</span>
<!-- 如果类型是文本 -->
<mat-form-field *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
<div class="buildInfoInput marginLeft"
*ngFor="let i of element.propertyInfos;let inputIndex = index"
style="float: left;position: relative;">
<span>{{i.propertyName}}<span
*ngIf="i.physicalUnit">({{i.physicalUnit}})</span>：</span>
<!-- 如果类型是文本 -->
<mat-form-field *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
<input matInput name="{{groupsIndex}}{{inputIndex}}" type='text'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue">
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue">
</mat-form-field>
<!-- 如果类型是数字 -->
<mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '耐火等级'">
<input matInput name="{{groupsIndex}}{{inputIndex}}" type='number'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue"
(change)="inputchange($event,i.ruleName,i.ruleValue,i)"
>
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue"
(change)="inputchange($event,i.ruleName,i.ruleValue,i)">
</mat-form-field>
<!-- 如果类型是耐火等级 -->
<mat-form-field *ngIf="i.propertyName == '耐火等级'">
<mat-select name="{{groupsIndex}}{{inputIndex}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
<mat-select name="{{groupsIndex}}{{inputIndex}}"
required="{{ i.required==true ? 'true' : 'false' }}"
placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
<mat-option value="0">1级</mat-option>
<mat-option value="1">2级</mat-option>
<mat-option value="2">3级</mat-option>
@ -293,17 +337,22 @@
</mat-select>
</mat-form-field>
<!-- 如果类型是多行文本 -->
<textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{groupsIndex}}{{inputIndex}}"></textarea>
<span style="color: red;" *ngIf="i.required">*</span>
<div *ngIf="i.isshowrule" style="position: absolute;left: 205px;top: 45px;font-size: 11px;color: red;">
<textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'"
style="width: 180px;height: 60px;"
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue"
name="{{groupsIndex}}{{inputIndex}}"></textarea>
<span style="color: red;" *ngIf="i.required">*</span>
<div *ngIf="i.isshowrule"
style="position: absolute;left: 205px;top: 45px;font-size: 11px;color: red;">
<span>{{i.rulevalue}}</span>
</div>
</div>
</div>
</div>
<!-- 类型为表格 是罐区 -->
<!-- 类型为表格 是罐区 -->
<div *ngIf="element.type == 1 && element.name.indexOf('罐区') != -1">
<p style="font-size: 22px;" *ngIf="element.submitted">
{{element.name}}
@ -311,67 +360,73 @@
<table *ngIf="element.submitted">
<tr>
<th *ngFor="let item of element.propertyInfos[0].origin;let index = index">
<button *ngIf="index == 0" style="width: 24px;" type="button" mat-icon-button class="addline" (click)="addline(element.propertyInfos)"><mat-icon>add_circle_outline</mat-icon></button>
<button *ngIf="index == 0" style="width: 24px;" type="button" mat-icon-button class="removeline" (click)="removeline(element.propertyInfos)"><mat-icon>remove_circle_outline</mat-icon></button>
<button *ngIf="index == 0" style="width: 24px;" type="button"
mat-icon-button class="addline"
(click)="addline(element.propertyInfos)">
<mat-icon>add_circle_outline</mat-icon>
</button>
<button *ngIf="index == 0" style="width: 24px;" type="button"
mat-icon-button class="removeline"
(click)="removeline(element.propertyInfos)">
<mat-icon>remove_circle_outline</mat-icon>
</button>
{{item.propertyName}}
<span style="color: red;" *ngIf="item.required">*</span>
<span style="color: red;" *ngIf="item.required">*</span>
</th>
</tr>
<tr *ngFor="let item of element.propertyInfos;let line = index">
<td *ngFor="let i of item.origin;let list = index">
<input type="{{i.propertyType == 0 ? 'text' : 'number'}}" style="height:45px" class="tankinfo" name="{{element.name}}{{line + 1}}-{{list + 1}}"
required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue">
<input type="{{i.propertyType == 0 ? 'text' : 'number'}}"
style="height:45px" class="tankinfo"
name="{{element.name}}{{line + 1}}-{{list + 1}}"
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue">
</td>
</tr>
</table>
</div>
</div>
<div class="CustomData" style="width: 200px;margin-top: 60px;">
<mat-checkbox color="primary" (change)="checkCustomData($event)" name="checkbuilding" [(ngModel)]="item.isCustomData" style="float: left;margin-right: 10px;"></mat-checkbox>
<mat-checkbox color="primary" (change)="checkCustomData($event)" name="checkbuilding"
[(ngModel)]="item.isCustomData" style="float: left;margin-right: 10px;">
</mat-checkbox>
<h1 style="font-size: 22px;width: 200px;">自定义信息</h1>
</div>
<div style="position: relative;" *ngIf="item.isCustomData">
<button style="position: absolute;left: 80px;top: 8px;" type="button" mat-icon-button (click)="addCustomData(item)" class="addCustomData">
<button style="position: absolute;left: 80px;top: 8px;" type="button" mat-icon-button
(click)="addCustomData(item)" class="addCustomData">
<mat-icon>add_circle_outline</mat-icon>
</button>
<button style="position: absolute;left:120px;top: 8px;" type="button" mat-icon-button (click)="popCustomData(item)" class="deleteCustomData">
<button style="position: absolute;left:120px;top: 8px;" type="button" mat-icon-button
(click)="popCustomData(item)" class="deleteCustomData">
<mat-icon>remove_circle_outline</mat-icon>
</button>
<div class="houseinfoinput marginLeft" style="float: left;" *ngFor="let i of item.customData.customProperties;let key = index">
<div class="houseinfoinput marginLeft" style="float: left;"
*ngFor="let i of item.customData.customProperties;let key = index">
<mat-form-field>
<input matInput type='text' name="customData{{key}}Name"
required
[(ngModel)]="i.name">
<input matInput type='text' name="customData{{key}}Name" required
[(ngModel)]="i.name">
</mat-form-field>
<span>:</span>
<mat-form-field>
<input matInput type='text' name="customData{{key}}Value"
required
[(ngModel)]="i.value">
<input matInput type='text' name="customData{{key}}Value" required
[(ngModel)]="i.value">
</mat-form-field>
<span style="color: red;" *ngIf="i.required">*</span>
<span style="color: red;" *ngIf="i.required">*</span>
</div>
</div>
<div class="infobtnbox">
<button type="submit" mat-button mat-raised-button color="primary">保存</button>
<button type="button" mat-raised-button (click)="deletedbuilding(item,key)" color="warn">删除</button>
<button type="button" mat-raised-button (click)="deletedbuilding(item,key)"
color="warn">删除</button>
</div>
</form>
</ng-template>
</mat-tab>
</mat-tab-group>
</div>
</div>
</div>
</div>

916
src/app/key-unit/basicinfo/basicinfo.component.ts
View File

File diff suppressed because it is too large Load Diff

120
src/app/key-unit/edit-plan-info/edit-plan-info.component.html
Unescape View File

@ -10,65 +10,69 @@
</div>
<mat-tab-group style="height: 100%;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
<mat-tab label="1.基本信息">
<ng-template matTabContent>
<app-basicinfo></app-basicinfo>
</ng-template>
</mat-tab>
<mat-tab label="2.总平面图">
<ng-template matTabContent>
<app-collection-tools-plan></app-collection-tools-plan>
</ng-template>
</mat-tab>
<mat-tab label="3.层平面图">
<ng-template matTabContent>
<app-collection-tools-building></app-collection-tools-building>
</ng-template>
</mat-tab>
<mat-tab label="4.四周毗邻">
<ng-template matTabContent>
<app-allaround></app-allaround>
</ng-template>
</mat-tab>
<mat-tab label="5.消防设施">
<ng-template matTabContent>
<app-fire-fighting-device></app-fire-fighting-device>
</ng-template>
</mat-tab>
<mat-tab label="6.重点部位">
<ng-template matTabContent>
<app-key-site></app-key-site>
</ng-template>
</mat-tab>
<mat-tab label="7.功能分区">
<ng-template matTabContent>
<app-function-division></app-function-division>
</ng-template>
</mat-tab>
<mat-tab label="8.行车路线">
<ng-template matTabContent>
<app-router-gis></app-router-gis>
</ng-template>
</mat-tab>
<mat-tab label="9.周边水源及力量">
<ng-template matTabContent>
<app-water-road></app-water-road>
</ng-template>
</mat-tab>
<mat-tab label="10.实景图">
<ng-template matTabContent>
<app-realistic-picture></app-realistic-picture>
</ng-template>
</mat-tab>
<mat-tab label="11.上传CAD">
<ng-template matTabContent>
<app-uploading-cad></app-uploading-cad>
</ng-template>
</mat-tab>
<!-- <mat-tab label="12.unity平面图">
<mat-tab label="1.基本信息">
<ng-template matTabContent>
<app-basicinfo></app-basicinfo>
</ng-template>
</mat-tab>
<mat-tab label="2.总平面图">
<ng-template matTabContent>
<app-collection-tools-plan></app-collection-tools-plan>
</ng-template>
</mat-tab>
<mat-tab label="3.层平面图">
<ng-template matTabContent>
<app-collection-tools-building></app-collection-tools-building>
</ng-template>
</mat-tab>
<mat-tab label="4.四周毗邻">
<ng-template matTabContent>
<app-allaround></app-allaround>
</ng-template>
</mat-tab>
<mat-tab label="5.消防设施">
<ng-template matTabContent>
<app-fire-fighting-device></app-fire-fighting-device>
</ng-template>
</mat-tab>
<mat-tab label="6.重点部位">
<ng-template matTabContent>
<app-key-site></app-key-site>
</ng-template>
</mat-tab>
<mat-tab label="7.功能分区">
<ng-template matTabContent>
<app-function-division></app-function-division>
</ng-template>
</mat-tab>
<mat-tab label="8.行车路线">
<ng-template matTabContent>
<app-router-gis></app-router-gis>
</ng-template>
</mat-tab>
<mat-tab label="9.周边水源及力量">
<ng-template matTabContent>
<app-water-road></app-water-road>
</ng-template>
</mat-tab>
<mat-tab label="10.实景图">
<ng-template matTabContent>
<app-realistic-picture></app-realistic-picture>
</ng-template>
</mat-tab>
<mat-tab label="11.上传CAD">
<ng-template matTabContent>
<app-uploading-cad></app-uploading-cad>
</ng-template>
</mat-tab>
<mat-tab label="12.特别警示">
<ng-template matTabContent>
<app-special-warning></app-special-warning>
</ng-template>
</mat-tab>
<!-- <mat-tab label="12.unity平面图">
<ng-template matTabContent>
<iframe id="main" src="/unityApp2Basic/index.html" name="unityApp" frameborder="0" width="96%" height="100%" style="margin-left: 2%;"></iframe>
</ng-template>
</mat-tab> -->
</mat-tab-group>
</mat-tab-group>

5
src/app/key-unit/key-unit.module.ts
Unescape View File

@ -83,10 +83,11 @@ import { PhotoofthesceneComponent } from './photoofthescene/photoofthescene.comp
import { KnowRouteComponent } from './know-route/know-route.component';
import { FindProblemComponent } from './find-problem/find-problem.component';
import { upname } from './key-unit-management/key-unit-management.component';
import { companyAuditResult } from './key-unit-management/key-unit-management.component'
import { companyAuditResult } from './key-unit-management/key-unit-management.component';
import { SpecialWarningComponent } from './special-warning/special-warning.component'
@NgModule({
declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,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],
declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,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, SpecialWarningComponent],
exports:[ViewUnitDetailsPlanComponent],
imports: [
CommonModule,

17
src/app/key-unit/special-warning/special-warning.component.html
Unescape View File

@ -0,0 +1,17 @@
<div class="bigbox">
<div class="itembox" *ngFor="let item of specialWarningData;let key = index">
<div class="title">
<input [(ngModel)]="item.name" type="text" name="" id="" placeholder="请输入名称(可编辑)">
<div class="deletebtn" *ngIf="key == specialWarningData.length - 1 && specialWarningData.length != 1 && pattern == 'edit'">
<mat-icon (click)="deleteItem()">delete</mat-icon>
</div>
</div>
<div class="contant">
<textarea [(ngModel)]="item.content" name="" id="" cols="30" rows="10"></textarea>
</div>
</div>
<div class="bottombox" *ngIf="pattern == 'edit'">
<button mat-flat-button color="primary" (click)="addItem()">新增</button>
</div>
<button *ngIf="pattern == 'edit'" class="savebtn" (click)="save()" mat-stroked-button color="primary">保存</button>
</div>

64
src/app/key-unit/special-warning/special-warning.component.scss
Unescape View File

@ -0,0 +1,64 @@
.bigbox {
width: 100%;
height: 100%;
box-sizing: border-box;
padding-top: 72px;
overflow-y: auto;
position: relative;
input,
textarea {
border: 0px;
}
.itembox {
margin: 0 auto;
width: 70%;
height: 330px;
border: 1px solid rgba(0, 0, 0, 0.122);
display: flex;
flex-direction: column;
margin-bottom: 12px;
.title {
width: 100%;
height: 36px;
border-bottom: 1px solid rgba(0, 0, 0, 0.122);
display: flex;
input {
flex: 1;
height: 100%;
box-sizing: border-box; //其他浏览器
-webkit-box-sizing: border-box; //谷歌
-moz-box-sizing: border-box; //火狐
padding-left: 6px;
}
.deletebtn {
line-height: 50px;
cursor: pointer;
background: #fff;
}
}
.contant {
display: flex;
width: 100%;
flex: 1;
textarea {
flex: 1;
overflow-y: auto;
resize: none;
background: #fafafa;
-webkit-box-sizing: border-box; //谷歌
-moz-box-sizing: border-box; //火狐
padding: 6px;
}
}
}
.bottombox {
width: 100%;
display: flex;
justify-content: center;
}
.savebtn{
position: fixed;
right: 5%;
top: 125px;
}
}

25
src/app/key-unit/special-warning/special-warning.component.spec.ts
Unescape View File

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { SpecialWarningComponent } from './special-warning.component';
describe('SpecialWarningComponent', () => {
let component: SpecialWarningComponent;
let fixture: ComponentFixture<SpecialWarningComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ SpecialWarningComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(SpecialWarningComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

74
src/app/key-unit/special-warning/special-warning.component.ts
Unescape View File

@ -0,0 +1,74 @@
import { HttpClient } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
@Component({
selector: 'app-special-warning',
templateUrl: './special-warning.component.html',
styleUrls: ['./special-warning.component.scss']
})
export class SpecialWarningComponent implements OnInit {
constructor(public http: HttpClient, public snackBar: MatSnackBar) { }
specialWarningData: Data[]//特别警示数据
pattern: string//查看还是编辑
ngOnInit(): void {
sessionStorage.getItem('editable') == '0' ? this.pattern = 'look' : this.pattern = 'edit'
this.getSpecialWarning()
}
//获得单位特别警示
getSpecialWarning() {
this.http.get('/api/CompanySpecialWarnings', {
params: {
companyId: sessionStorage.getItem('companyId')
}
}).subscribe((data: Data[]) => {
if (data.length != 0) {
this.specialWarningData = data
} else {
this.specialWarningData = [{ name: '', content: '' }]
}
console.log('特别警示数据', this.specialWarningData)
})
}
//新增item
addItem() {
this.specialWarningData.push({ name: '', content: '' })
}
//删除末尾item
deleteItem() {
let isTrue = window.confirm('确定要删除该分组吗？')
if (isTrue) {
this.specialWarningData.pop()
}
}
//保存
save() {
console.log('保存', this.specialWarningData)
this.http.put('/api/CompanySpecialWarnings', this.specialWarningData, {
params: {
companyId: sessionStorage.getItem('companyId')
}
}).subscribe((data) => {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('保存成功', '确定', config);
}, err => {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('保存失败', '确定', config);
})
}
}
//特别警示数据
export interface Data {
name: string,
content: string
}

42
src/app/key-unit/view-unit-details/view-unit-details.component.html
Unescape View File

@ -1,12 +1,12 @@
<div class="fixedPrompt">
<label class="scorePrompt" *ngIf="selected.value == 0">*单位信息,建筑信息填写完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 1">*单位毗邻模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 2">*消防设施,重点部位模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 3">*总平面图模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 4 || selected.value == 5">*层平面图模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 6">*填写2条以上可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 9">*外观,室内,安全出口各上传2张图片可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 10">*上传2张CAD图片可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 0">*单位信息,建筑信息填写完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 1">*单位毗邻模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 2">*消防设施,重点部位模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 3">*总平面图模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 4 || selected.value == 5">*层平面图模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 6">*填写2条以上可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 9">*外观,室内,安全出口各上传2张图片可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 10">*上传2张CAD图片可得满分</label>
</div>
<mat-tab-group style="height:100%;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
<mat-tab label="1.基本信息">
@ -20,13 +20,13 @@
</ng-template>
</mat-tab>
<mat-tab label="3.层平面图">
<ng-template matTabContent>
<app-collection-tools-building></app-collection-tools-building>
</ng-template>
<ng-template matTabContent>
<app-collection-tools-building></app-collection-tools-building>
</ng-template>
</mat-tab>
<mat-tab label="4.四周毗邻">
<ng-template matTabContent>
<app-allaround></app-allaround>
<app-allaround></app-allaround>
</ng-template>
</mat-tab>
<mat-tab label="5.消防设施">
@ -45,18 +45,18 @@
</ng-template>
</mat-tab>
<mat-tab label="8.行车路线">
<ng-template matTabContent>
<app-router-gis></app-router-gis>
</ng-template>
<ng-template matTabContent>
<app-router-gis></app-router-gis>
</ng-template>
</mat-tab>
<mat-tab label="9.周边水源及力量">
<ng-template matTabContent>
<app-water-road></app-water-road>
<app-water-road></app-water-road>
</ng-template>
</mat-tab>
<mat-tab label="10.实景图">
<ng-template matTabContent>
<app-realistic-picture-look></app-realistic-picture-look>
<app-realistic-picture-look></app-realistic-picture-look>
</ng-template>
</mat-tab>
<mat-tab label="11.上传CAD">
@ -64,10 +64,14 @@
<app-uploading-cad-look></app-uploading-cad-look>
</ng-template>
</mat-tab>
<mat-tab label="12.特别警示">
<ng-template matTabContent>
<app-special-warning></app-special-warning>
</ng-template>
</mat-tab>
<!-- <mat-tab label="12.unity平面图">
<ng-template matTabContent>
<iframe id="main" src="/unityApp2Basic/index.html" name="unityApp" frameborder="0" width="96%" height="100%" style="margin-left:2%;"></iframe>
</ng-template>
</mat-tab> -->
</mat-tab-group>
</mat-tab-group>

2
src/app/pages/login/login.component.ts
Unescape View File

@ -6,6 +6,8 @@ import {CacheTokenService} from '../../http-interceptors/cache-token.service'//
import { MatSnackBar,MatSnackBarConfig } from '@angular/material/snack-bar';
import { MatDialog,MatDialogRef } from '@angular/material/dialog';
@Component({
selector: 'app-login',
templateUrl: './login.component.html',

4
src/app/plan-audit/wait-examineer/wait-examineer.component.html
Unescape View File

@ -97,7 +97,7 @@
<button mat-raised-button style="color: #FFFFFF;background-color: #38D984;float: right;"
(click)='agree()'>同意</button>
</div>
<div class="rightheadone" style="display: block;">
<div class="rightheadone" style="display: block;" *ngIf="showtype == 3">
<button mat-raised-button color="primary" (click)="buttonChange()">{{isallDate?'显示变更数据':'显示完整数据'}} </button>
<!-- <button mat-raised-button *ngIf="isallDate" style="background-color: #FFCC00; color: #FFFFFF;"
(click)="preview()"><img src="../../../assets/images/change.png" style="margin-bottom: 2px;"> 预览得分</button> -->
@ -107,7 +107,7 @@
<!-- 数据变更div -->
<div *ngIf="!isallDate" style="flex: 1;overflow-y: auto;">
<div *ngIf="showtype == 3" id="firefacilities" style="margin: 10px;">
<mat-accordion class="tableContent" multi>
<mat-accordion *ngIf="selectedItem.differentContent" class="tableContent" multi>
<!-- 基本信息 -->
<mat-expansion-panel *ngIf="this.differentContentOfUnitInfo[0].childrens.length != 0" expanded>
<mat-expansion-panel-header collapsedHeight='40px' expandedHeight='40px' class="panelhead"

7
src/app/plan-audit/wait-examineer/wait-examineer.component.ts
Unescape View File

@ -167,10 +167,12 @@ export class WaitExamineerComponent implements OnInit {
differentContentOfPicture: any//当前单位变更数据 之 实景图
radioClick(e, item) {
this.selectedItem = item
console.log(item)
// console.log('当前选择的信息',JSON.parse(this.selectedItem.differentContent) )
if(item.contentType == 11){
if(item.contentType == 11 && this.selectedItem.differentContent){
let differentContent = JSON.parse(this.selectedItem.differentContent)
// 单位信息
this.differentContentOfUnitInfo = differentContent.filter(item => item.propertyName == 'basicInfo')
// 实景图
@ -181,7 +183,6 @@ export class WaitExamineerComponent implements OnInit {
this.differentContentOfBuildingsInfo.childrens.forEach(element => {
element.childrens = element.childrens.filter(item => item.isObj == false)
});
console.log('当前选择的单位的实景图',this.differentContentOfBuildingsInfo)
//功能分区
let differentContentOfFunction = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0]))
this.differentContentOfFunction = []

4
src/app/tabbar/tabbar.component.html
Unescape View File

@ -3,14 +3,14 @@
<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>
<a class="active"><span ><a></a>{{(companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}} %</span></a>
</div>
<div class="integrityDetails" id="xiangqing" *ngIf="companyIntegrityScore">
<div class="integrityDetailsTop">
<span class="span1">分类名称</span>
<span class="span2">已得分</span>
<span class="span3">总分</span>
<span class="span3">百分比</span>
</div>
<div class="integrityDetailsBody">
<ul>

119
src/app/ui/collection-tools-building/collection-tools.component.ts
Unescape View File

@ -1919,6 +1919,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
//复制图层 平面图 楼层/区域
duplicateLayer(item) {
this.maskLayerService.sendMessage(true)
let paramsData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData.data || {}))
Object.keys(paramsData).forEach((key) => {
if (key != '图例') {
@ -1941,7 +1942,46 @@ export class CollectionToolsBuildingComponent implements OnInit {
sitePlanId: data.id
}
this.http.post('/api/SitePlanData', newData, { params: this.params }).subscribe(data => {
this.renovateSitePlan()
this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
});
let list = []
//保存建筑数据
let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
CompanyData.data = JSON.stringify(CompanyData.data)
this.http.post("/api/CompanyData", CompanyData, {params: {companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存单位毗邻
let CompanyAdjoins = this.canvasData.getCompanyAdjoinInfo()
this.http.post("/api/CompanyAdjoins/Batch", CompanyAdjoins, {params:{companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
}, err => {
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
if (err == 'infos 有重复方向！') {
this.snackBar.open('单位毗邻同步失败,存在相同方向', '确定', config);
} else {
this.snackBar.open('单位毗邻同步失败', '确定', config);
}
})
//批量保存单位重点部位
let CompanyImportantLocations = this.canvasData.getCompanyImportantLocations()
this.http.post("/api/CompanyImportantLocations/Batch", CompanyImportantLocations, {params:{companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存单位消防设施素材
let CompanyFacilityAssets = this.canvasData.getAllCompanyFacilityAssetInfo()
this.http.post("/api/CompanyFacilityAssets/Batch", CompanyFacilityAssets, {params: {companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
})
})
@ -1958,13 +1998,88 @@ export class CollectionToolsBuildingComponent implements OnInit {
buildingAreaId: data.id
}
this.http.post('/api/BuildingAreaData', newData, { params: this.params }).subscribe(data => {
this.renovateBuilding()
this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
});
let list = []
//建筑数据
let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
CompanyData.data = JSON.stringify(CompanyData.data)
this.http.post("/api/BuildingData", CompanyData, {params: { companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存建筑毗邻
let buildingAdjoins = this.canvasData.getBuildingAdjoinInfo()
this.http.post(`/api/BuildingAdjoins/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingAdjoins).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
}, err => {
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
if (err == 'infos 有重复方向！') {
this.snackBar.open('建筑毗邻同步失败,存在相同方向', '确定', config);
} else {
this.snackBar.open('建筑毗邻同步失败', '确定', config);
}
})
//批量保存建筑重点部位
let buildingImportantLocations = this.canvasData.getBuildingImportantLocations()
this.http.post(`/api/BuildingImportantLocations/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingImportantLocations).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存建筑消防设施素材
let buildingFacilityAssets = this.canvasData.getAllBuildingFacilityAssetInfo()
this.http.post(`/api/BuildingFacilityAssets/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingFacilityAssets).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
})
})
}
}
//复制完楼层后 刷新视图
updateCurrentFloor() {
if (this.checkedBuildingIndex == -1) { //总平面图
let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
let planData = this.getSitePlanCompanyData() //获取 单位 数据
this.http.get('/api/SitePlans', { params: this.params }).subscribe(data => {
this.sitePlanData = data
this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
this.selectSitePlanIndex = this.sitePlanData.length-1
Promise.all([fireData, planData]).then((res) => {
this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
this.maskLayerService.sendMessage(false)
})
}) //重新加载 新楼层
} else { //楼层/区域
let params = { buildingId: this.beforeOneCheckedBuilding.id }
let fireData = this.getFireElements(this.beforeOneCheckedBuilding.buildingTypes[0].id || '') //获取建筑下 消防要素
let planData = this.getBuildingData(params) //获取 建筑 数据
this.http.get('/api/BuildingAreas', { params }).subscribe(data => {
this.sitePlanData = data
this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
this.selectSitePlanIndex = this.sitePlanData.length-1
Promise.all([fireData, planData]).then((res) => {
this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
this.maskLayerService.sendMessage(false)
})
}) //重新加载 新楼层
}
}
//平面图 楼层/区域 替换底图
replaceBaseMap(e, item) {
e.stopPropagation();

120
src/app/ui/collection-tools-plan/collection-tools.component.ts
Unescape View File

@ -1844,7 +1844,6 @@ export class CollectionToolsPlanComponent implements OnInit {
//复制图层 平面图 楼层/区域
duplicateLayer(item) {
if (item.isGis) {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@ -1852,6 +1851,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.snackBar.open('gis底图不允许复制', '确定', config);
return
}
this.maskLayerService.sendMessage(true)
let paramsData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData.data || {}))
Object.keys(paramsData).forEach((key) => {
if (key != '图例') {
@ -1874,7 +1874,46 @@ export class CollectionToolsPlanComponent implements OnInit {
sitePlanId: data.id
}
this.http.post('/api/SitePlanData', newData, { params: this.params }).subscribe(data => {
this.renovateSitePlan()
this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
});
let list = []
//保存建筑数据
let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
CompanyData.data = JSON.stringify(CompanyData.data)
this.http.post("/api/CompanyData", CompanyData, {params: {companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存单位毗邻
let CompanyAdjoins = this.canvasData.getCompanyAdjoinInfo()
this.http.post("/api/CompanyAdjoins/Batch", CompanyAdjoins, {params:{companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
}, err => {
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
if (err == 'infos 有重复方向！') {
this.snackBar.open('单位毗邻同步失败,存在相同方向', '确定', config);
} else {
this.snackBar.open('单位毗邻同步失败', '确定', config);
}
})
//批量保存单位重点部位
let CompanyImportantLocations = this.canvasData.getCompanyImportantLocations()
this.http.post("/api/CompanyImportantLocations/Batch", CompanyImportantLocations, {params:{companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存单位消防设施素材
let CompanyFacilityAssets = this.canvasData.getAllCompanyFacilityAssetInfo()
this.http.post("/api/CompanyFacilityAssets/Batch", CompanyFacilityAssets, {params: {companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
})
})
@ -1891,13 +1930,88 @@ export class CollectionToolsPlanComponent implements OnInit {
buildingAreaId: data.id
}
this.http.post('/api/BuildingAreaData', newData, { params: this.params }).subscribe(data => {
this.renovateBuilding()
this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
});
let list = []
//建筑数据
let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
CompanyData.data = JSON.stringify(CompanyData.data)
this.http.post("/api/BuildingData", CompanyData, {params: { companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存建筑毗邻
let buildingAdjoins = this.canvasData.getBuildingAdjoinInfo()
this.http.post(`/api/BuildingAdjoins/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingAdjoins).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
}, err => {
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
if (err == 'infos 有重复方向！') {
this.snackBar.open('建筑毗邻同步失败,存在相同方向', '确定', config);
} else {
this.snackBar.open('建筑毗邻同步失败', '确定', config);
}
})
//批量保存建筑重点部位
let buildingImportantLocations = this.canvasData.getBuildingImportantLocations()
this.http.post(`/api/BuildingImportantLocations/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingImportantLocations).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存建筑消防设施素材
let buildingFacilityAssets = this.canvasData.getAllBuildingFacilityAssetInfo()
this.http.post(`/api/BuildingFacilityAssets/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingFacilityAssets).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
})
})
}
}
//复制完楼层后 刷新视图
updateCurrentFloor() {
if (this.checkedBuildingIndex == -1) { //总平面图
let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
let planData = this.getSitePlanCompanyData() //获取 单位 数据
this.http.get('/api/SitePlans', { params: this.params }).subscribe(data => {
this.sitePlanData = data
this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
this.selectSitePlanIndex = this.sitePlanData.length-1
Promise.all([fireData, planData]).then((res) => {
this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
this.maskLayerService.sendMessage(false)
})
}) //重新加载 新楼层
} else { //楼层/区域
let params = { buildingId: this.beforeOneCheckedBuilding.id }
let fireData = this.getFireElements(this.beforeOneCheckedBuilding.buildingTypes[0].id || '') //获取建筑下 消防要素
let planData = this.getBuildingData(params) //获取 建筑 数据
this.http.get('/api/BuildingAreas', { params }).subscribe(data => {
this.sitePlanData = data
this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
this.selectSitePlanIndex = this.sitePlanData.length-1
Promise.all([fireData, planData]).then((res) => {
this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
this.maskLayerService.sendMessage(false)
})
}) //重新加载 新楼层
}
}
//平面图 楼层/区域 替换底图
replaceBaseMap(e, item) {
e.stopPropagation();

119
src/app/ui/collection-tools/collection-tools.component.ts
Unescape View File

@ -1988,6 +1988,7 @@ export class CollectionToolsComponent implements OnInit {
//复制图层 平面图 楼层/区域
duplicateLayer(item) {
this.maskLayerService.sendMessage(true)
let paramsData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData.data || {}))
Object.keys(paramsData).forEach((key) => {
if (key != '图例') {
@ -2010,7 +2011,46 @@ export class CollectionToolsComponent implements OnInit {
sitePlanId: data.id
}
this.http.post('/api/SitePlanData', newData, { params: this.params }).subscribe(data => {
this.renovateSitePlan()
this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
});
let list = []
//保存建筑数据
let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
CompanyData.data = JSON.stringify(CompanyData.data)
this.http.post("/api/CompanyData", CompanyData, {params: {companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存单位毗邻
let CompanyAdjoins = this.canvasData.getCompanyAdjoinInfo()
this.http.post("/api/CompanyAdjoins/Batch", CompanyAdjoins, {params:{companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
}, err => {
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
if (err == 'infos 有重复方向！') {
this.snackBar.open('单位毗邻同步失败,存在相同方向', '确定', config);
} else {
this.snackBar.open('单位毗邻同步失败', '确定', config);
}
})
//批量保存单位重点部位
let CompanyImportantLocations = this.canvasData.getCompanyImportantLocations()
this.http.post("/api/CompanyImportantLocations/Batch", CompanyImportantLocations, {params:{companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存单位消防设施素材
let CompanyFacilityAssets = this.canvasData.getAllCompanyFacilityAssetInfo()
this.http.post("/api/CompanyFacilityAssets/Batch", CompanyFacilityAssets, {params: {companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
})
})
@ -2027,13 +2067,88 @@ export class CollectionToolsComponent implements OnInit {
buildingAreaId: data.id
}
this.http.post('/api/BuildingAreaData', newData, { params: this.params }).subscribe(data => {
this.renovateBuilding()
this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
});
let list = []
//建筑数据
let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
CompanyData.data = JSON.stringify(CompanyData.data)
this.http.post("/api/BuildingData", CompanyData, {params: { companyId: this.params.companyId}}).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存建筑毗邻
let buildingAdjoins = this.canvasData.getBuildingAdjoinInfo()
this.http.post(`/api/BuildingAdjoins/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingAdjoins).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
}, err => {
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
if (err == 'infos 有重复方向！') {
this.snackBar.open('建筑毗邻同步失败,存在相同方向', '确定', config);
} else {
this.snackBar.open('建筑毗邻同步失败', '确定', config);
}
})
//批量保存建筑重点部位
let buildingImportantLocations = this.canvasData.getBuildingImportantLocations()
this.http.post(`/api/BuildingImportantLocations/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingImportantLocations).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
//批量保存建筑消防设施素材
let buildingFacilityAssets = this.canvasData.getAllBuildingFacilityAssetInfo()
this.http.post(`/api/BuildingFacilityAssets/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingFacilityAssets).subscribe(data => {
list.push(1)
if (list.length === 4) { this.updateCurrentFloor() }
})
})
})
}
}
//复制完楼层后 刷新视图
updateCurrentFloor() {
if (this.checkedBuildingIndex == -1) { //总平面图
let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
let planData = this.getSitePlanCompanyData() //获取 单位 数据
this.http.get('/api/SitePlans', { params: this.params }).subscribe(data => {
this.sitePlanData = data
this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
this.selectSitePlanIndex = this.sitePlanData.length-1
Promise.all([fireData, planData]).then((res) => {
this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
this.maskLayerService.sendMessage(false)
})
}) //重新加载 新楼层
} else { //楼层/区域
let params = { buildingId: this.beforeOneCheckedBuilding.id }
let fireData = this.getFireElements(this.beforeOneCheckedBuilding.buildingTypes[0].id || '') //获取建筑下 消防要素
let planData = this.getBuildingData(params) //获取 建筑 数据
this.http.get('/api/BuildingAreas', { params }).subscribe(data => {
this.sitePlanData = data
this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
this.selectSitePlanIndex = this.sitePlanData.length-1
Promise.all([fireData, planData]).then((res) => {
this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
this.maskLayerService.sendMessage(false)
})
}) //重新加载 新楼层
}
}
//平面图 楼层/区域 替换底图
replaceBaseMap(e, item) {
e.stopPropagation();

56
src/styles.scss
Unescape View File

@ -266,4 +266,60 @@ td{
.custom-content-marker .close-btn:hover{
background: #666;
}
}
#setUnitPosition,#setUnitPositionLook{
.custom-content-marker {
position: relative;
// border: 1px solid red;
width: 68px;
height: 68px;
overflow: hidden;
display: flex;
justify-content: center;
.positionimg {
width: 30px;
height: 36px;
}
}
.custom-content-marker .btnbox {
position: absolute;
left: 0px;
bottom: 0px;
width: 68px;
height: 30px;
background: #ffffff;
border-radius: 60px;
color: #ebebeb;
display: flex;
justify-content: space-around;
box-sizing: border-box;
padding: 0 5px;
align-items: center;
img {
width: 20px;
height: 20px;
cursor: pointer;
}
}
.custom-content-marker .btnbox2 {
position: absolute;
left: 0px;
bottom: 0px;
width: 68px;
height: 30px;
opacity: 0;
border-radius: 60px;
color: #ebebeb;
display: flex;
justify-content: space-around;
box-sizing: border-box;
padding: 0 5px;
align-items: center;
}
.custom-content-marker .close-btn:hover {
background: #666;
}
}
Write Preview
Loading…
Cancel
Save