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

[新增]水源采集页面ui + 组织机构增加下属机关 + 用户管理增加下属机关

dev
邵佳豪 4 years ago
parent
8527958db3
commit
feb63ee208
20 changed files with 1324 additions and 77 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. 184
      src/app/data-collection/fire-force/fire-force.component.html
  2. 162
      src/app/data-collection/fire-force/fire-force.component.scss
  3. 48
      src/app/data-collection/fire-force/fire-force.component.ts
  4. 230
      src/app/data-collection/water-collection/water-collection.component.html
  5. 206
      src/app/data-collection/water-collection/water-collection.component.scss
  6. 146
      src/app/data-collection/water-collection/water-collection.component.ts
  7. 3
      src/app/key-unit/key-unit-management/key-unit-management.component.html
  8. 13
      src/app/ui/organization/addOffices.html
  9. 11
      src/app/ui/organization/createorganization.component.html
  10. 13
      src/app/ui/organization/editOffices.html
  11. 94
      src/app/ui/organization/organization.component.html
  12. 38
      src/app/ui/organization/organization.component.scss
  13. 124
      src/app/ui/organization/organization.component.ts
  14. 4
      src/app/ui/ui.module.ts
  15. 14
      src/app/ui/usermanagement/createUser.html
  16. 14
      src/app/ui/usermanagement/editUser.html
  17. 5
      src/app/ui/usermanagement/usermanagement.component.html
  18. 21
      src/app/ui/usermanagement/usermanagement.component.scss
  19. 53
      src/app/ui/usermanagement/usermanagement.component.ts
  20. 18
      src/styles.scss

184
src/app/data-collection/fire-force/fire-force.component.html
Unescape View File

@ -1,8 +1,188 @@
<div class="box">
<div class="listbox">
<div class="topbox">
<div class="add">
<div>
<mat-slide-toggle color="primary" (change)='slideChange($event)' checked labelPosition='before'>列表过滤</mat-slide-toggle>
</div>
<div>
<button style="width: 68px;" mat-flat-button color="primary">新增</button>
</div>
</div>
<div class="searchbox" *ngIf="isCheckedOfSearchDiv">
<div class="inputbox">
<span>
关键字:
</span>
<input type="text" placeholder="请输入名称/类别" [(ngModel)]="searchForm.name"/>
</div>
<div class="inputbox">
<span>
完整度:
</span>
<select [(ngModel)]="searchForm.integrityNum" [ngClass]="{'gray': searchForm.integrityNum == ''}">
<option value='' selected disabled style='display:none;'>请选择</option>
<option *ngFor="let item of listIntegrityNum" [value]="item.id">{{item.name}}</option>
</select>
</div>
<div class="searchbtn">
<button (click)="searchList()" style="width: 100%;" mat-flat-button color="primary"><mat-icon style="width: 20px;height: 20px;font-size: 20px;">search</mat-icon>搜索</button>
</div>
</div>
</div>
<div style="height: 1px;width: 100%;background-color: #F2F4F6;"></div>
<div class="contantbox">
<div class="title">
<span>消防队</span>
<span>完整度</span>
</div>
</div>
</div>
<div class="mapbox">
<div class="mapcheckbox">
<mat-checkbox color="primary" *ngFor="let item of checkBoxList">{{item.name}}</mat-checkbox>
</div>
<div id="map" class="map">
</div>
<div class="detailsbox">
<div class="tabsbox">
<div class="tabs">
<div (click)="clickTab(item.type)" *ngFor="let item of tabsList" [ngClass]="{'selectedBtn': selectedBtn == item.type}">{{item.name}}</div>
</div>
<div class="btnbox">
<span class="save"><mat-icon>save</mat-icon>保存</span>
<span class="submitAudit"><mat-icon>open_in_browser</mat-icon>提交审核</span>
</div>
</div>
<div class="contant" *ngIf="selectedBtn == 0">
<div class="总队">
<p>基本信息</p>
<!-- <div class="总队,支队">
<mat-grid-list cols="6" rowHeight="40px">
<mat-grid-tile colspan='6' rowspan='1'>
<span>
<span style="color: red;">*</span>
队站名称:
</span>
<input type="text" style="width: 88.6%;">
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
联系电话:
</span>
<input type="text">
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
传真:
</span>
<input type="text">
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
辖区面积:
</span>
<input type="text">
</mat-grid-tile>
<mat-grid-tile colspan='6' rowspan='3'>
<span>
备注:
</span>
<textarea name="" id="" ></textarea>
</mat-grid-tile>
</mat-grid-list>
</div> -->
<!-- <div class="大队,中队">
<mat-grid-list cols="6" rowHeight="40px">
<mat-grid-tile colspan='6' rowspan='1'>
<span>
<span style="color: red;">*</span>
队站名称:
</span>
<input type="text" style="width: 88.6%;">
</mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'>
<span>
值班电话:
</span>
<input style="width: 76%;" type="text">
</mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'>
<span>
辖区面积:
</span>
<input style="width: 76%;" type="text">
</mat-grid-tile>
<mat-grid-tile colspan='6' rowspan='3'>
<span>
备注:
</span>
<textarea name="" id="" ></textarea>
</mat-grid-tile>
</mat-grid-list>
</div> -->
<div class="其他消防队伍">
<mat-grid-list cols="6" rowHeight="40px">
<mat-grid-tile colspan='3' rowspan='1'>
<span>
<span style="color: red;">*</span>
队伍类型:
</span>
<input type="text">
</mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'>
<span>
<span style="color: red;">*</span>
队伍名称:
</span>
<input type="text">
</mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'>
<span>
值班电话:
</span>
<input style="width: 76%;" type="text">
</mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'>
<span>
辖区面积:
</span>
<input style="width: 76%;" type="text">
</mat-grid-tile>
<mat-grid-tile colspan='6' rowspan='3'>
<span>
备注:
</span>
<textarea name="" id="" ></textarea>
</mat-grid-tile>
</mat-grid-list>
</div>
<p>位置信息</p>
<p>人员数量</p>
<p>联系方式</p>
</div>
</div>
<div class="contant" *ngIf="selectedBtn == 1">
车辆装备
</div>
<div class="contant" *ngIf="selectedBtn == 2">
相关资料
</div>
</div>
</div>
</div>

162
src/app/data-collection/fire-force/fire-force.component.scss
Unescape View File

@ -5,14 +5,176 @@
display: flex;
box-sizing: border-box;
padding: 10px;
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 400;
color: #000000;
}
.listbox{
width: 400px;
height: 100%;
background-color: #fff;
.topbox{
box-sizing: border-box;
padding: 10px 22px 22px;
.add{
height: 36px;
line-height: 36px;
display: flex;
justify-content: space-between;
}
.searchbox{
.inputbox{
width: 100%;
height: 36px;
font-size: 14px;
line-height: 36px;
margin: 10px 0;
display: flex;
span{
margin-right: 5px;
}
select,input{
flex: 1;
background-color: #F2F4F6;
border: 0;
border-radius: 5px;
box-sizing: border-box;
padding:0 8px;
}
.gray{
color: gray;
}
// input::-moz-placeholder {
// color: rgba(90, 83, 83, 0.89);
// opacity: 1;
// }
// input:-ms-input-placeholder {
// color: rgba(90, 83, 83, 0.89);;
// }
// input::-webkit-input-placeholder {
// color: rgba(90, 83, 83, 0.89);;
// }
}
}
}
.contantbox{
.title{
display: flex;
justify-content: space-between;
width: 100%;
box-sizing: border-box;
padding: 0 22px;
height: 36px;
line-height: 36px;
span{
font-size: 14px;
font-weight: 500;
}
}
}
}
.mapbox{
flex: 1;
margin-left: 10px;
background-color: #fff;
display: flex;
flex-direction: column;
.mapcheckbox{
width: 100%;
height: 50px;
line-height: 50px;
mat-checkbox{
margin-right:60px;
font-size: 15px;
}
mat-checkbox:nth-child(1){
margin-left: 20px;
}
}
#map{
flex: 1;
}
.detailsbox{
width: 100%;
height:520px;
.tabsbox{
width: 100%;
height: 40px;
line-height: 40px;
display: flex;
justify-content: space-between;
font-size: 15px;
.tabs{
div{
float: left;
width: 120px;
text-align: center;
cursor: pointer;
color: #000000;
opacity: 0.4;
border-right: 1px solid #F2F4F6;
}
.selectedBtn{
background-color: #2196F3;
color: #fff;
opacity: 1;
}
}
.btnbox{
span{
cursor: pointer;
color: #2196F3;
mat-icon{
vertical-align: text-top;
font-size: 20px;
width: 20px;
height: 20px;
}
}
span:hover{
text-decoration: underline;
}
.submitAudit{
margin: 0 30px;
}
}
}
.contant{
width: 100%;
height:480px;
overflow-y: auto;
p{
color: #2196F3;
background-color: #F2F4F6;
height: 33px;
line-height: 33px;
box-sizing: border-box;
padding-left: 20px;
font-size: 15px;
}
span{
font-size: 15px;
}
input,select{
height: 30px;
line-height: 30px;
box-sizing: border-box;
padding: 0 12px;
width: 63%;
margin-left: 5px;
border: 1px solid #EBEBEB;
border-radius: 5px;
}
textarea{
width: 90%;
margin-left: 5px;
height: 85%;
border: 1px solid #EBEBEB;
border-radius: 5px;
}
}
}
}

48
src/app/data-collection/fire-force/fire-force.component.ts
Unescape View File

@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
declare var AMap: any;
@Component({
selector: 'app-fire-force',
@ -9,7 +10,54 @@ export class FireForceComponent implements OnInit {
constructor() { }
isCheckedOfSearchDiv:boolean = true//列表过滤滑块
slideChange(e){
this.isCheckedOfSearchDiv = e.checked
}
searchForm:any = {
name:'',
integrityNum:''
}
listIntegrityNum:any[] = [
{id:0,name:'<=50%'},
{id:1,name:'50%-60%'},
{id:2,name:'60%-70%'},
{id:3,name:'70%-80%'},
{id:4,name:'80%-90%'},
{id:5,name:'90%-100%'}
]
checkBoxList:any[] = [
{id:0,name:'总队'},
{id:1,name:'支队'},
{id:2,name:'大队'},
{id:3,name:'中队 (消防站)'},
{id:4,name:'其他消防队伍'}
]
ngOnInit(): void {
setTimeout(() => {
this.createMap()
}, 0);
}
//搜索
searchList(){
console.log(this.searchForm)
}
map:any
//创建地图
createMap(){
this.map = new AMap.Map('map', {
zoom:12
})
this.map.setCity('上海市');
}
tabsList:any[] = [
{type:0,name:'详情'},
{type:1,name:'车辆装备'},
{type:2,name:'相关资料'},
]
selectedBtn:number = 0//选择的tabs
clickTab(typeNum){
this.selectedBtn = typeNum
}
}

230
src/app/data-collection/water-collection/water-collection.component.html
Unescape View File

@ -1,8 +1,232 @@
<div class="box">
<div class="box" style="width: 100%;height: 100%;overflow: hidden;">
<div class="listbox">
<div class="topbox">
<div class="add">
<div>
<mat-slide-toggle color="primary" (change)='slideChange($event)' checked labelPosition='before'>列表过滤</mat-slide-toggle>
</div>
<div>
<button style="width: 68px;" mat-flat-button color="primary">新增</button>
</div>
</div>
<div class="searchbox" *ngIf="isCheckedOfSearchDiv">
<div class="inputbox">
<span>
关键字:
</span>
<input type="text" placeholder="请输入名称/编码/类别" [(ngModel)]="searchForm.name"/>
</div>
<div class="inputbox">
<span>
完整度:
</span>
<select [(ngModel)]="searchForm.integrityNum" [ngClass]="{'gray': searchForm.integrityNum == ''}">
<option value='' selected disabled style='display:none;'>请选择</option>
<option *ngFor="let item of listIntegrityNum" [value]="item.id">{{item.name}}</option>
</select>
</div>
<div class="searchbtn">
<button (click)="searchList()" style="width: 100%;" mat-flat-button color="primary"><mat-icon style="width: 20px;height: 20px;font-size: 20px;">search</mat-icon>搜索</button>
</div>
</div>
</div>
<div style="height: 1px;width: 100%;background-color: #F2F4F6;"></div>
<div class="contantbox">
<div class="title">
<span>消防队</span>
<span>完整度</span>
</div>
</div>
</div>
<div class="mapbox">
<div class="mapcheckbox">
<mat-checkbox color="primary" *ngFor="let item of checkBoxList">{{item.name}}</mat-checkbox>
</div>
<div id="map" class="map" style="overflow: hidden;">
<div id="container"></div>
<div class="gistopbox hidden" [ngClass]="{'show': isGisTopBox}">
<div class="inputBox">
<span>搜索: </span>
<input name="position" [(ngModel)]="searchTitle" id="tipinput" class="positionInput" type="text" autocomplete="off">
</div>
</div>
</div>
<div class="detailsbox">
<div class="tabsbox">
<div class="tabs">
<div class="selectedBtn">消火栓</div>
</div>
<div class="btnbox">
<span class="save"><mat-icon>save</mat-icon>保存</span>
<span class="submitAudit"><mat-icon>open_in_browser</mat-icon>提交审核</span>
</div>
</div>
<div class="contant" >
<p>基本信息</p>
<mat-grid-list cols="6" rowHeight="40px">
<mat-grid-tile colspan='6' rowspan='1'>
<span>
<span style="color: red;">*</span>
名称:
</span>
<input type="text" style="width: 88.6%;">
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
行政区:
</span>
<input type="text">
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
水源归属:
</span>
<select>
<option value="0">市政</option>
<option value="1">单位(小区)</option>
</select>
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
所属单位(小区):
</span>
<input type="text">
</mat-grid-tile>
</mat-grid-list>
<p>位置信息</p>
<mat-grid-list cols="6" rowHeight="40px">
<mat-grid-tile colspan='3' rowspan='1'>
<span>
地址:
</span>
<input type="text" style="width:76%;">
</mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'>
<span>
经度:
</span>
<input [(ngModel)]="positionLngLat.x" disabled type="text" style="width: 26%;margin-right: 6%;">
<span>
纬度:
</span>
<input [(ngModel)]="positionLngLat.y" disabled type="text" style="width: 26%;margin-right: 6%;">
<button (click)="setPosition()" style="width:85px;text-align: center;" mat-flat-button color="primary">
<mat-icon style="width: 20px;height: 20px;font-size: 20px;">place</mat-icon>位置
</button>
</mat-grid-tile>
</mat-grid-list>
<p>详细信息</p>
<mat-grid-list cols="6" rowHeight="40px">
<mat-grid-tile colspan='2' rowspan='1'>
<span>
可用状态:
</span>
<select>
<option value="0">可用</option>
<option value="1">维护</option>
<option value="2">损坏</option>
</select>
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
放置形式:
</span>
<select>
<option value="0">地上</option>
<option value="1">地下</option>
</select>
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
管网状态:
</span>
<select>
<option value="0">枝状管网</option>
<option value="1">环状管网</option>
<option value="2">混合状管网</option>
<option value="3">其他</option>
</select>
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
管网直径:
</span>
<select>
<option value="0">100</option>
<option value="1">150</option>
<option value="2">200</option>
<option value="3">300</option>
<option value="4">350</option>
<option value="5">400</option>
</select>
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
管网压力类型:
</span>
<select>
<option value="0">高压管网</option>
<option value="1">临时高压管网</option>
<option value="2">低压管网</option>
</select>
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
管网压力范围:
</span>
<input type="text">
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
接口形式:
</span>
<select>
<option value="0">内扣式</option>
<option value="1">卡式</option>
<option value="2">螺纹式</option>
</select>
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
接口口径:
</span>
<select>
<option value="0">65</option>
<option value="1">80</option>
<option value="2">100</option>
<option value="3">150</option>
</select>
</mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'>
<span>
最大流量:
</span>
<input type="text">
</mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'>
<span>
供水单位:
</span>
<input style="width: 74%;" type="text">
</mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'>
<span>
联系方式:
</span>
<input style="width: 74%;" type="text">
</mat-grid-tile>
<mat-grid-tile colspan='6' rowspan='2'>
<span>
备注:
</span>
<textarea style="height: 80%;" name="" id="" cols="30" rows="10"></textarea>
</mat-grid-tile>
</mat-grid-list>
</div>
</div>
</div>
</div>

206
src/app/data-collection/water-collection/water-collection.component.scss
Unescape View File

@ -5,14 +5,220 @@
display: flex;
box-sizing: border-box;
padding: 10px;
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 400;
color: #000000;
}
.listbox{
width: 400px;
height: 100%;
background-color: #fff;
.topbox{
box-sizing: border-box;
padding: 10px 22px 22px;
.add{
height: 36px;
line-height: 36px;
display: flex;
justify-content: space-between;
}
.searchbox{
.inputbox{
width: 100%;
height: 36px;
font-size: 14px;
line-height: 36px;
margin: 10px 0;
display: flex;
span{
margin-right: 5px;
}
select,input{
flex: 1;
background-color: #F2F4F6;
border: 0;
border-radius: 5px;
box-sizing: border-box;
padding:0 8px;
}
.gray{
color: gray;
}
// input::-moz-placeholder {
// color: rgba(90, 83, 83, 0.89);
// opacity: 1;
// }
// input:-ms-input-placeholder {
// color: rgba(90, 83, 83, 0.89);;
// }
// input::-webkit-input-placeholder {
// color: rgba(90, 83, 83, 0.89);;
// }
}
}
}
.contantbox{
.title{
display: flex;
justify-content: space-between;
width: 100%;
box-sizing: border-box;
padding: 0 22px;
height: 36px;
line-height: 36px;
span{
font-size: 14px;
font-weight: 500;
}
}
}
}
.mapbox{
flex: 1;
margin-left: 10px;
background-color: #fff;
display: flex;
flex-direction: column;
.mapcheckbox{
width: 100%;
height: 50px;
line-height: 50px;
mat-checkbox{
margin-right:60px;
font-size: 15px;
}
mat-checkbox:nth-child(1){
margin-left: 20px;
}
}
#map{
flex: 1;
position: relative;
#container{
width: 100%;
height: 100%;
}
.gistopbox{
position: absolute;
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
border-radius: 5px;
top: 3px;
width: 30%;
height:40px;
background: #FFFFFF;
display: flex;
align-items: center;
cursor: default;;
.inputBox{
width: 100%;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
font-size: 14px;
.positionInput{
border: 0;
border-radius: 6px;
width: 80%;
height: 28px;
background: #F2F2F2;
margin-left: 8px;
box-sizing: border-box;
padding-left: 10px;
}
}
}
.hidden{
opacity: 0;
z-index: -1;
}
.show{
opacity: 1;
z-index: 1;
}
}
.detailsbox{
width: 100%;
height:500px;
.tabsbox{
width: 100%;
height: 40px;
line-height: 40px;
display: flex;
justify-content: space-between;
font-size: 15px;
.tabs{
div{
float: left;
width: 120px;
text-align: center;
cursor: pointer;
color: #000000;
opacity: 0.4;
border-right: 1px solid #F2F4F6;
}
.selectedBtn{
background-color: #2196F3;
color: #fff;
opacity: 1;
}
}
.btnbox{
span{
cursor: pointer;
color: #2196F3;
mat-icon{
vertical-align: text-top;
font-size: 20px;
width: 20px;
height: 20px;
}
}
span:hover{
text-decoration: underline;
}
.submitAudit{
margin: 0 30px;
}
}
}
.contant{
width: 100%;
height:480px;
overflow-y: auto;
p{
color: #2196F3;
background-color: #F2F4F6;
height: 33px;
line-height: 33px;
box-sizing: border-box;
padding-left: 20px;
font-size: 15px;
}
span{
font-size: 15px;
}
input,select{
height: 30px;
line-height: 30px;
box-sizing: border-box;
padding: 0 12px;
width: 60%;
margin-left: 5px;
border: 1px solid #EBEBEB;
border-radius: 5px;
}
textarea{
width: 89%;
margin-left: 5px;
height: 85%;
border: 1px solid #EBEBEB;
border-radius: 5px;
}
}
}
}

146
src/app/data-collection/water-collection/water-collection.component.ts
Unescape View File

@ -1,4 +1,7 @@
import { Renderer2 } from '@angular/core';
import { ElementRef } from '@angular/core';
import { Component, OnInit } from '@angular/core';
declare var AMap: any;
@Component({
selector: 'app-water-collection',
@ -7,9 +10,150 @@ import { Component, OnInit } from '@angular/core';
})
export class WaterCollectionComponent implements OnInit {
constructor() { }
constructor(private elementRef: ElementRef,public renderer2: Renderer2) { }
isCheckedOfSearchDiv:boolean = true//列表过滤滑块
slideChange(e){
this.isCheckedOfSearchDiv = e.checked
}
searchForm:any = {
name:'',
integrityNum:''
}
listIntegrityNum:any[] = [
{id:0,name:'<=50%'},
{id:1,name:'50%-60%'},
{id:2,name:'60%-70%'},
{id:3,name:'70%-80%'},
{id:4,name:'80%-90%'},
{id:5,name:'90%-100%'}
]
checkBoxList:any[] = [
{id:0,name:'消火栓'},
{id:1,name:'消防水池'},
{id:2,name:'天然水源'}
]
ngOnInit(): void {
setTimeout(() => {
this.createMap()
}, 0);
}
//搜索
searchList(){
console.log(this.searchForm)
}
map:any
placeSearch:any//构造地点查询类
isMapLabel:boolean = false //是否已经标记坐标
newPositionMarkerContent:any =
'<div class="custom-content-marker">' +
' <img src="/assets/images/newposition.png">' +
'</div>'
newPositionMarkerContentBtn:any =
'<div class="custom-content-marker">' +
' <img src="/assets/images/newposition.png">' +
' <div class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' +
'</div>'
//创建地图
newPositionMarker:any//坐标实例
createMap(){
this.map = new AMap.Map('container', {
zoom:12
})
this.map.setCity('上海市');
//输入提示
var autoOptions = {
input: "tipinput"
};
AMap.plugin(['AMap.PlaceSearch','AMap.AutoComplete'], ()=>{
let auto = new AMap.AutoComplete(autoOptions);
this.placeSearch = new AMap.PlaceSearch(); //构造地点查询类
auto.on("select", (e)=>{
this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat])
this.positionLngLat = {x: e.poi.location.lng, y: e.poi.location.lat}
this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点
});//注册监听，当选中某条记录时会触发
});
if(this.isMapLabel){//如果已经标注单位坐标
console.log('已标注单位位置')
// this.map.setCenter([this.unitinfo.location.x,this.unitinfo.location.y]);
// this.oldPositionMarker = new AMap.Marker({
// position: [this.unitinfo.location.x,this.unitinfo.location.y],
// content: this.newPositionMarkerContent,
// offset: new AMap.Pixel(-15, -18)
// })
// // 将 markers 添加到地图
// this.map.add(this.oldPositionMarker);
}else{
console.log('未标注单位位置')
// this.map.setCity('上海市');
}
}
//点击位置
isGisTopBox:boolean = false //
searchTitle:any = ''//
positionLngLat:any = {}//临时坐标点
atLastPositionLngLat:any = {}//最终坐标点
setPosition(){
if(!this.isGisTopBox){
this.isGisTopBox = true
this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null
let center
if(this.newPositionMarker && this.atLastPositionLngLat.x){//如果已经标注单位坐标
center = [this.atLastPositionLngLat.x, this.atLastPositionLngLat.y]
}else{
center = this.map.getCenter(); //获取当前地图中心位置
}
this.newPositionMarker = new AMap.Marker({
draggable: true,
position: center,
content: this.newPositionMarkerContentBtn,
offset: new AMap.Pixel(-15, -18)
});
this.positionLngLat = {x: center.lng || center[0], y: center.lat || center[1]}
this.map.add(this.newPositionMarker);
this.isMapLabel = true
this.newPositionMarker.on('dragend', (e)=>{
this.positionLngLat = {x: e.lnglat.lng, y: e.lnglat.lat}
})
//点击确定
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{
this.isGisTopBox = false
this.map.remove(this.newPositionMarker)
this.newPositionMarker = new AMap.Marker({
position: [this.positionLngLat.x,this.positionLngLat.y],
content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18)
});
this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat))
this.map.add(this.newPositionMarker);
this.positionLngLat = this.atLastPositionLngLat
})
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'click',(event)=>{
this.isGisTopBox = false
this.map.remove(this.newPositionMarker)
if(this.positionLngLat.x && this.positionLngLat.x != 0 && !this.atLastPositionLngLat.x){//直接取消
this.map.remove(this.newPositionMarker)
this.positionLngLat = {}
this.atLastPositionLngLat = {}
}else{
this.newPositionMarker = new AMap.Marker({
position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y],
content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18)
});
this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点
this.map.add(this.newPositionMarker);
this.positionLngLat = this.atLastPositionLngLat
}
})//取消
}
}
}

3
src/app/key-unit/key-unit-management/key-unit-management.component.html
Unescape View File

@ -1,5 +1,4 @@
<div style="height: 100%;overflow: hidden">
<div style="height: 100%;overflow-y: auto">
<div id="header" class="header" (click)="bigclosediv($event)">
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
<div class="queryBox">

13
src/app/ui/organization/addOffices.html
Unescape View File

@ -0,0 +1,13 @@
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
<mat-form-field>
<input matInput id="name" name="name" type='text'
required ngModel #name="ngModel" placeholder="请输入下属机关名称">
</mat-form-field>
<div class="btn">
<button type="submit" class="savebtn" mat-raised-button color="primary" [disabled]='form.invalid'>确定</button>
<button type="button" mat-button (click)="onNoClick()" mat-raised-button>取消</button>
</div>
</form>

11
src/app/ui/organization/createorganization.component.html
Unescape View File

@ -15,19 +15,10 @@
<input matInput id="division" name="division" type='text'
ngModel #division="ngModel" placeholder="请输入区划">
</mat-form-field>
<!-- <mat-form-field class="example-full-width">
<input type="text" placeholder="是否拥有权限" aria-label="Number" matInput [matAutocomplete]="auto1" name="enabled" ngModel #enabled="ngModel">
<mat-autocomplete #auto1="matAutocomplete">
<mat-option *ngFor="let option of options2" [value]="option">
{{option}}
</mat-option>
</mat-autocomplete>
</mat-form-field> -->
<div class="btn">
<button type="submit" class="savebtn" mat-raised-button color="primary" [disabled]='form.invalid'>确定</button>
<button type="button" mat-button (click)="onNoClick()" mat-raised-button>取消</button>
</div>
</form>
</form>

13
src/app/ui/organization/editOffices.html
Unescape View File

@ -0,0 +1,13 @@
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
<mat-form-field>
<input matInput id="name" name="name" type='text'
required [(ngModel)]="officeName" placeholder="请输入下属机关名称">
</mat-form-field>
<div class="btn">
<button type="submit" class="savebtn" mat-raised-button color="primary" [disabled]='form.invalid'>确定</button>
<button type="button" mat-button (click)="onNoClick()" mat-raised-button>取消</button>
</div>
</form>

94
src/app/ui/organization/organization.component.html
Unescape View File

@ -1,39 +1,65 @@
<div style="height: 100%; overflow-y: auto;position: relative">
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl" >
<mat-tree-node *matTreeNodeDef="let node;" matTreeNodePadding>
<button mat-icon-button disabled ></button>
{{node.name}}
<button mat-icon-button class="create" (click)="create(node)"><mat-icon>add_circle_outline</mat-icon></button>
<button mat-icon-button class="edit" (click)="edit(node)"><mat-icon>create</mat-icon></button>
<button mat-icon-button class="up" (click)="up(node)" [disabled]="!node.isTop?false:true"><mat-icon>arrow_upward</mat-icon></button>
<button mat-icon-button class="down" (click)="down(node)" [disabled]="!node.isBottom?false:true"><mat-icon>arrow_downward</mat-icon></button>
<button mat-icon-button class="disabled" (click)="disable(node)" *ngIf="node.enabled" color="warn"><mat-icon>block</mat-icon></button>
<button mat-icon-button class="disabled" (click)="disable(node)" *ngIf="!node.enabled"><mat-icon>block</mat-icon></button>
<button mat-icon-button class="deleted" (click)="delete(node)"><mat-icon>delete</mat-icon></button>
<div class="box" style="height: 100%; overflow-y: auto;position: relative">
<div>
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl" >
<mat-tree-node *matTreeNodeDef="let node;" matTreeNodePadding (click)="getOffices(node)">
<button mat-icon-button disabled ></button>
{{node.name}}
<button mat-icon-button class="create" (click)="create(node)"><mat-icon>add_circle_outline</mat-icon></button>
<button mat-icon-button class="edit" (click)="edit(node)"><mat-icon>create</mat-icon></button>
<button mat-icon-button class="up" (click)="up(node)" [disabled]="!node.isTop?false:true"><mat-icon>arrow_upward</mat-icon></button>
<button mat-icon-button class="down" (click)="down(node)" [disabled]="!node.isBottom?false:true"><mat-icon>arrow_downward</mat-icon></button>
<button mat-icon-button class="disabled" (click)="disable(node)" *ngIf="node.enabled" color="warn"><mat-icon>block</mat-icon></button>
<button mat-icon-button class="disabled" (click)="disable(node)" *ngIf="!node.enabled"><mat-icon>block</mat-icon></button>
<button mat-icon-button class="deleted" (click)="delete(node)"><mat-icon>delete</mat-icon></button>
</mat-tree-node>
<mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="getOffices(node)">
<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>
{{node.name}}
<button mat-icon-button class="create" (click)="create(node)"><mat-icon>add_circle_outline</mat-icon></button>
<button mat-icon-button class="edit" (click)="edit(node)"><mat-icon>create</mat-icon></button>
<button mat-icon-button class="up" (click)="up(node)" [disabled]="!node.isTop?false:true"><mat-icon>arrow_upward</mat-icon></button>
<button mat-icon-button class="down" (click)="down(node)" [disabled]="!node.isBottom?false:true"><mat-icon>arrow_downward</mat-icon></button>
<button mat-icon-button class="disabled" (click)="disable(node)" *ngIf="node.enabled" color="warn"><mat-icon>block</mat-icon></button>
<button mat-icon-button class="disabled" (click)="disable(node)" *ngIf="!node.enabled"><mat-icon>block</mat-icon></button>
<button mat-icon-button class="deleted" (click)="delete(node)"><mat-icon>delete</mat-icon></button>
</mat-tree-node>
</mat-tree-node>
<mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding>
<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>
{{node.name}}
<button mat-icon-button class="create" (click)="create(node)"><mat-icon>add_circle_outline</mat-icon></button>
<button mat-icon-button class="edit" (click)="edit(node)"><mat-icon>create</mat-icon></button>
<button mat-icon-button class="up" (click)="up(node)" [disabled]="!node.isTop?false:true"><mat-icon>arrow_upward</mat-icon></button>
<button mat-icon-button class="down" (click)="down(node)" [disabled]="!node.isBottom?false:true"><mat-icon>arrow_downward</mat-icon></button>
<button mat-icon-button class="disabled" (click)="disable(node)" *ngIf="node.enabled" color="warn"><mat-icon>block</mat-icon></button>
<button mat-icon-button class="disabled" (click)="disable(node)" *ngIf="!node.enabled"><mat-icon>block</mat-icon></button>
<button mat-icon-button class="deleted" (click)="delete(node)"><mat-icon>delete</mat-icon></button>
</mat-tree>
</div>
</mat-tree-node>
</mat-tree>
<!-- 组织机构下属机关 -->
<div class="rightDiv" *ngIf="selectedOrg">
<div class="topbox">
({{selectedOrg.name}})组织机构下属机关
<button style="width: 68px;margin: 0 12px;" mat-flat-button color="primary" (click)="addOffices()">新增</button>
</div>
<div class="listBox">
<ul>
<li *ngFor="let item of OfficesList">
<span>{{item.officeName}}</span>
<span class="btnbox">
<button mat-icon-button class="edit" (click)="editOffice(item)"><mat-icon>create</mat-icon></button>
<button mat-icon-button class="deleted" (click)="deleteOffice(item)"><mat-icon style="color: #f44336;">delete</mat-icon></button>
</span>
</li>
</ul>
<span style="text-align: center;" *ngIf="OfficesList && OfficesList.length == 0">
暂无下属机关
</span>
</div>
</div>
<div *ngIf="isloading" style="position: absolute;width: 100%;height: 100%;background-color: rgba(125, 125, 125, 0.3);z-index: 999;left: 0;top: 0;text-align: center;">
<mat-spinner style="position: fixed;top: 40%;left: 50%;transform: translate(-40%,-50%);"></mat-spinner>
<p style="position: fixed;top:53%;left: 53%;transform: translate(-53%,-50%);">努力加载中...</p>

38
src/app/ui/organization/organization.component.scss
Unescape View File

@ -68,4 +68,42 @@ form{
.orilist:hover{
cursor: pointer;
background-color: rgba(225, 225, 225, 0.8);
}
.box{
div{
float: left;
}
.rightDiv{
display: flex;
flex-direction: column;
border: 1px solid gray;
border-radius: 6px;
box-sizing: border-box;
padding: 20px;
.topbox{
display: flex;
height: 40px;
line-height: 40px;
}
.listBox{
width: 100%;
text-align: center;
li{
display: flex;
justify-content: space-between;
box-sizing: border-box;
padding: 3px 6px;
align-items: center;
.btnbox{
display: flex;
align-items: center;
button{
margin: 0 2px;
}
}
}
}
}
}

124
src/app/ui/organization/organization.component.ts
Unescape View File

@ -337,6 +337,58 @@ export class OrganizationComponent implements OnInit {
})
}
selectedOrg:any//当前选择的组织机构
OfficesList:any //获得的下级列表
//获得点击组织机构的下级机关单位
getOffices(node){
console.log(node)
this.selectedOrg = node
this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => {
console.log("获取成功",data)
this.OfficesList = data
})
}
//新增下属机关
addOffices(){
const dialogRef = this.dialog.open(addOffices, {//调用open方法打开对话框并且携带参数过去
data: {selectedOrg:this.selectedOrg,OfficesList:this.OfficesList}
});
dialogRef.afterClosed().subscribe(
data=>{
if(data == '创建成功'){
this.getOffices(this.selectedOrg)
}
}
);
}
//编辑机关
editOffice(item){
const dialogRef = this.dialog.open(editOffices, {//调用open方法打开对话框并且携带参数过去
data: {item:item}
});
dialogRef.afterClosed().subscribe(
data=>{
if(data == '修改成功'){
this.getOffices(this.selectedOrg)
}
}
);
}
//删除机关
deleteOffice(item){
let isDelete = window.confirm('确定要删除此机关吗?')
if(isDelete){
this.http.delete(`/api/OrganizationsOffices/${item.id}`).subscribe(data => {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('删除成功','确定',config);
this.getOffices(this.selectedOrg)
})
}
}
}
@ -555,4 +607,76 @@ export class EditOrganization {
}
}
}
//增加下属机关
@Component({
selector: 'addOffices',
templateUrl: './addOffices.html',
styleUrls: ['./organization.component.scss']
})
export class addOffices {
constructor(private http: HttpClient,public dialogRef: MatDialogRef<addOffices>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
onNoClick(): void {
this.dialogRef.close();
}
onSubmit(value){
console.log(value)
let body = {
id: null,
organizationId: this.data.selectedOrg.id,
officeName: value.name,
order: this.data.OfficesList.length == 0 ? 0 : this.data.OfficesList[this.data.OfficesList.length - 1].order,
enabled: true
}
this.http.post('/api/OrganizationsOffices',body).subscribe(data => {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('创建成功','确定',config);
this.dialogRef.close('创建成功');
})
}
}
//编辑下属机关
@Component({
selector: 'editOffices',
templateUrl: './editOffices.html',
styleUrls: ['./organization.component.scss']
})
export class editOffices {
constructor(private http: HttpClient,public dialogRef: MatDialogRef<editOffices>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
ngOnInit(): void {
console.log(this.data)
}
onNoClick(): void {
this.dialogRef.close();
}
officeName:any = this.data.item.officeName
onSubmit(value){
console.log(value)
let body = {
id: this.data.item.id,
organizationId: this.data.item.organizationId,
officeName: value.name,
order: this.data.item.order,
enabled: true
}
this.http.put(`/api/OrganizationsOffices/${this.data.item.id}`,body).subscribe(data => {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('修改成功','确定',config);
this.dialogRef.close('修改成功');
})
}
}

4
src/app/ui/ui.module.ts
Unescape View File

@ -62,7 +62,7 @@ import { PersonaldataComponent } from '../pages/personaldata/personaldata.compon
import { FooterComponent } from './footer/footer.component';
import { UserdataComponent, EditUser } from './userdata/userdata.component';
import { ChangepasswordComponent } from './changepassword/changepassword.component';
import { OrganizationComponent, CreateOrganization, EditOrganization } from './organization/organization.component';
import { OrganizationComponent, CreateOrganization, EditOrganization, addOffices, editOffices } from './organization/organization.component';
import { UnittypeComponent,DialogOverviewExampleDialog,editorialUnit } from './unittype/unittype.component';
import { AuthorityComponent, CreateAuthority } from './authority/authority.component';
import { RoleComponent, CreateRole, EditRole } from './role/role.component';
@ -99,7 +99,7 @@ import { CollectionToolsPlanComponent, CreateBuildingPlan, EditBuildingPlan, Vie
import { addDisposalNodeComponentPlan, editDisposalNodeComponentPlan, editPlaneFigureComponentPlan, leftFunctionalDomainComponentPlan } from './collection-tools-plan/leftFunctionalDomain';
import { saveOneDialogPlan, saveTwoDialogPlan } from './collection-tools-plan/save';
@NgModule({
declarations: [UiComponent, DateselectComponent, MenuComponent, CardComponent, ListComponent, GridComponent, StepperComponent, TabgroupComponent, ButtonComponent, BadgeComponent, ProgressComponent, SnackbarComponent,PersonaldataComponent, FooterComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,TimePipe,CreateNewUser,EditNewUser,allRoles,EditRole,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, EnterpriseuserComponent,AddEnterpriserUser,addUnitAttributeComponent,editUnitAttribute,seeenterpriseuser,editenterpriseuser, FireFightingFacilitiesFormworkComponent,addFireFightingFacilitiesFormworkComponent,editFireFightingFacilitiesFormworkComponent,addBuiltInComponent,addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,CollectionToolsPlanComponent,CreateBuildingPlan,EditBuildingPlan,ViewDetailsPlan,leftFunctionalDomainComponentPlan,editPlaneFigureComponentPlan,addDisposalNodeComponentPlan,editDisposalNodeComponentPlan,saveOneDialogPlan,saveTwoDialogPlan],
declarations: [UiComponent, DateselectComponent, MenuComponent, CardComponent, ListComponent, GridComponent, StepperComponent, TabgroupComponent, ButtonComponent, BadgeComponent, ProgressComponent, SnackbarComponent,PersonaldataComponent, FooterComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,TimePipe,CreateNewUser,EditNewUser,allRoles,EditRole,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, EnterpriseuserComponent,AddEnterpriserUser,addUnitAttributeComponent,editUnitAttribute,seeenterpriseuser,editenterpriseuser, FireFightingFacilitiesFormworkComponent,addFireFightingFacilitiesFormworkComponent,editFireFightingFacilitiesFormworkComponent,addBuiltInComponent,addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,CollectionToolsPlanComponent,CreateBuildingPlan,EditBuildingPlan,ViewDetailsPlan,leftFunctionalDomainComponentPlan,editPlaneFigureComponentPlan,addDisposalNodeComponentPlan,editDisposalNodeComponentPlan,saveOneDialogPlan,saveTwoDialogPlan,addOffices,editOffices],
imports: [
CommonModule,

14
src/app/ui/usermanagement/createUser.html
Unescape View File

@ -36,7 +36,11 @@
<input type="text" matInput [(ngModel)]="organizationName" disabled required name="organizationName" placeholder="所属机构">
</mat-form-field>
</div>
<div mat-dialog-content>
<mat-form-field>
<input type="text" matInput [(ngModel)]="selectedOffices.officeName" disabled name="officeName" placeholder="所属机关">
</mat-form-field>
</div>
<div mat-dialog-content *ngIf="errmsg">
<p style="font-size: 14px; color: red;">{{errmsg}}</p>
</div>
@ -67,4 +71,12 @@
<li>{{node.name}}</li>
</mat-tree-node>
</mat-tree>
</div>
<div class="officesbox">
<span>请选择机构下属机关</span>
<div class="officesList">
<ul>
<li *ngFor="let item of OfficesList" (click)="selectOffice(item)">{{item.officeName}}</li>
</ul>
</div>
</div>

14
src/app/ui/usermanagement/editUser.html
Unescape View File

@ -33,7 +33,11 @@
<input type="text" matInput [(ngModel)]="affiliateName" disabled required name="organizationName" placeholder="所属机构">
</mat-form-field>
</div>
<div mat-dialog-content>
<mat-form-field>
<input type="text" matInput [(ngModel)]="selectedOffices.officeName" disabled name="officeName" placeholder="所属机关">
</mat-form-field>
</div>
<div mat-dialog-actions>
<button mat-raised-button color="primary" type="submit" [disabled]="!form.form.valid">确定</button>
<button mat-raised-button mat-dialog-close>取消</button>
@ -60,4 +64,12 @@
<li>{{node.name}}</li>
</mat-tree-node>
</mat-tree>
</div>
<div class="officesbox">
<span>请选择机构下属机关</span>
<div class="officesList">
<ul>
<li *ngFor="let item of OfficesList" (click)="selectOffice(item)">{{item.officeName}}</li>
</ul>
</div>
</div>

5
src/app/ui/usermanagement/usermanagement.component.html
Unescape View File

@ -69,6 +69,11 @@
<td mat-cell *matCellDef="let element">{{element.organizationName}}</td>
</ng-container>
<ng-container matColumnDef="office">
<th mat-header-cell *matHeaderCellDef>所属机关</th>
<td mat-cell *matCellDef="let element">{{element.organizationOfficeName}}</td>
</ng-container>
<ng-container matColumnDef="role">
<th mat-header-cell *matHeaderCellDef>所属角色</th>
<td mat-cell *matCellDef="let element">

21
src/app/ui/usermanagement/usermanagement.component.scss
Unescape View File

@ -46,13 +46,28 @@ table {
width: 200px;
float: left;
}
.tree {
.tree,.officesbox {
width: 300px;
height: 400px;
float: right;
float: left;
overflow-y: auto;
}
.officesbox{
box-sizing: border-box;
padding-left: 12px;
}
.officesList{
ul{
li{
height: 48px;
line-height: 48px;
cursor: pointer;
}
li:hover{
background-color: rgba(225, 225, 225, 0.8);
}
}
}
//分配角色

53
src/app/ui/usermanagement/usermanagement.component.ts
Unescape View File

@ -42,7 +42,7 @@ export class UsermanagementComponent implements OnInit {
}
displayedColumns: string[] = ['loginName', 'realName', 'mechanism','role','time', 'operation'];
displayedColumns: string[] = ['loginName', 'realName', 'mechanism','office','role','time', 'operation'];
dataSource:any; //所有用户
allMechanism:any; //所有机构
@ -162,7 +162,7 @@ export class UsermanagementComponent implements OnInit {
//打开创建用户窗口
open() {
let dialogRef = this.dialog.open(CreateNewUser,{
width: '600px',
width: '850px',
});
dialogRef.afterClosed().subscribe(
(data)=>{
@ -346,8 +346,26 @@ export class CreateNewUser {
add (e) {
this.organizationId = e.id
this.organizationName = e.name
this.selectedOffices = {}
this.getOffices(e)
}
selectedOrg:any//当前选择的组织机构
OfficesList:any //获得的下级列表
//获得点击组织机构的下级机关单位
getOffices(node){
console.log(node)
this.selectedOrg = node
this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => {
console.log("获取成功",data)
this.OfficesList = data
})
}
//选择机关
selectedOffices:any = {}
selectOffice(item){
this.selectedOffices = item
console.log(item)
}
errmsg:any; //捕获错误信息
//新增用户
onSubmit(e) {
@ -360,7 +378,8 @@ export class CreateNewUser {
phone:e.phone,
enabled:true,
creationTime:time,
organizationId:this.organizationId
organizationId:this.organizationId,
organizationOfficeId:this.selectedOffices.id
}).subscribe(data=> {
this.dialogRef.close('success')},
error=>{this.errmsg = error}
@ -397,6 +416,9 @@ export class EditNewUser {
this.phone=this.data.e.phone,
this.affiliate=this.data.e.organizationId
this.affiliateName=this.data.e.organizationName
this.selectedOffices.officeName = this.data.e.organizationOfficeName
this.selectedOffices.id = this.data.e.organizationOfficeId
console.log(this.data)
}
private _transformer = (node, level: number) => {
@ -440,8 +462,26 @@ export class EditNewUser {
add (e) {
this.affiliate = e.id
this.affiliateName = e.name
this.selectedOffices = {}
this.getOffices(e)
}
selectedOrg:any//当前选择的组织机构
OfficesList:any //获得的下级列表
//获得点击组织机构的下级机关单位
getOffices(node){
console.log(node)
this.selectedOrg = node
this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => {
console.log("获取成功",data)
this.OfficesList = data
})
}
//选择机关
selectedOffices:any = {}
selectOffice(item){
this.selectedOffices = item
console.log(item)
}
//编辑
onSubmit (e) {
this.http.put(`/api/Users/${this.data.e.name}`,{
@ -452,7 +492,8 @@ export class EditNewUser {
roleNames:this.data.e.roleNames,
enabled: this.data.e.enabled,
creationTime:this.data.e.creationTime,
organizationId:this.affiliate
organizationId:this.affiliate,
organizationOfficeId:this.selectedOffices.id
}).subscribe(data=>{
this.dialogRef.close('success')
})

18
src/styles.scss
Unescape View File

@ -2,10 +2,11 @@
@import './app/theme.scss';
@import "./app/ngZorroTree.css"; /* 引入组件样式 */
html,body{
width: 100%;
height: 100%;
margin:0 auto;
width: 100%;
height:100%;
margin:0 auto;
padding:0;
overflow: hidden;
}
ul,ol,dl,li,dt,dd,p,form,input,h1,h2,h3,h4,h5,h6,section,article,aside,header,footer,nav,figure,time,mark,main,canvas{
margin:0;
@ -20,7 +21,7 @@ img{
}
a{
text-decoration: none;
color:#000;
color:#000;
}
ul,ol,li{
list-style:none;
@ -85,13 +86,6 @@ table td.mat-footer-cell:last-of-type{
.mat-tab-body-content{
overflow: hidden!important;
}
.amap-logo{
display: none;
opacity:0 !important;
}
.amap-copyright {
opacity:0;
}
//gis单位信息tabs样式
#gis{
.mat-tab-label{
@ -139,7 +133,7 @@ table td.mat-footer-cell:last-of-type{
padding: 0;
}
#setPosition{
#setPosition,#map{
.custom-content-marker {
position: relative;
width: 29px;

Write Preview
Loading…
Cancel
Save