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

zhuzhou
chenjingyu 4 years ago
parent
605842e94b 98f2bb5250
commit
d41b7d884c
14 changed files with 94 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/app/data-collection/fire-force/fire-force.component.scss
  2. 10
      src/app/data-collection/linkage-forces/linkage-forces.component.scss
  3. 11
      src/app/data-collection/water-collection/water-collection.component.scss
  4. 8
      src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html
  5. 4
      src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html
  6. 2
      src/app/key-unit/key-unit-management/createunit.component.html
  7. 9
      src/app/key-unit/water-road/water-road.component.ts
  8. 59
      src/app/plan-management/entry-plan/entry-plan.component.html
  9. 2
      src/app/plan-management/meet-plan/meet-plan.component.scss
  10. 2
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
  11. 2
      src/app/plan-management/type-plan/type-plan.component.scss
  12. 11
      src/app/ui/usermanagement/createUser.html
  13. 10
      src/app/ui/usermanagement/editUser.html
  14. 4
      src/app/ui/usermanagement/usermanagement.component.ts

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

@ -278,7 +278,7 @@
cursor: pointer; cursor: pointer;
} }
.tabsbox{ .tabsbox{
margin-top: 10px; // margin-top: 10px;
width: 100%; width: 100%;
height: 40px; height: 40px;
overflow: hidden; overflow: hidden;
@ -524,6 +524,9 @@
} }
} }
.noHeight{ .noHeight{
.tabsbox{
margin-top: 10px;
}
height: 0px; height: 0px;
transition: height 0.5s; transition: height 0.5s;
} }
@ -625,7 +628,7 @@
height:338px; height:338px;
transition: height 0.5s; transition: height 0.5s;
.tabsbox{ .tabsbox{
margin-top: 5px; // margin-top: 5px;
height: 38px; height: 38px;
line-height: 38px; line-height: 38px;
.tabs{ .tabs{
@ -688,6 +691,9 @@
} }
} }
.noHeight{ .noHeight{
.tabsbox{
margin-top: 10px;
}
height: 0px; height: 0px;
transition: height 0.5s; transition: height 0.5s;
} }

10
src/app/data-collection/linkage-forces/linkage-forces.component.scss
Unescape View File

@ -249,7 +249,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
font-size: 15px; font-size: 15px;
margin-top: 10px; // margin-top: 10px;
.tabs{ .tabs{
div{ div{
float: left; float: left;
@ -488,6 +488,9 @@
} }
} }
.noHeight{ .noHeight{
.tabsbox{
margin-top: 10px;
}
height: 0px; height: 0px;
transition: height 0.5s; transition: height 0.5s;
} }
@ -614,7 +617,7 @@
.tabsbox{ .tabsbox{
height: 38px; height: 38px;
line-height: 38px; line-height: 38px;
margin-top: 5px; // margin-top: 5px;
.tabs{ .tabs{
div{ div{
width: 90px; width: 90px;
@ -674,6 +677,9 @@
} }
} }
.noHeight{ .noHeight{
.tabsbox{
margin-top: 10px;
}
height: 0px; height: 0px;
transition: height 0.5s; transition: height 0.5s;
} }

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

@ -232,7 +232,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
font-size: 15px; font-size: 15px;
margin-top: 10px; // margin-top: 10px;
.tabs{ .tabs{
div{ div{
float: left; float: left;
@ -333,6 +333,9 @@
} }
} }
.noHeight{ .noHeight{
.tabsbox{
margin-top: 10px;
}
height: 0px; height: 0px;
transition: height 0.5s; transition: height 0.5s;
} }
@ -433,7 +436,7 @@
transition: height 0.5s; transition: height 0.5s;
.tabsbox{ .tabsbox{
height: 38px; height: 38px;
margin-top: 5px; // margin-top: 5px;
line-height: 38px; line-height: 38px;
.tabs{ .tabs{
div{ div{
@ -485,8 +488,12 @@
} }
} }
.noHeight{ .noHeight{
.tabsbox{
margin-top: 10px;
}
height: 0px; height: 0px;
transition: height 0.5s; transition: height 0.5s;
} }
} }
} }

8
src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html
Unescape View File

@ -1,6 +1,6 @@
<div class="content"> <div class="content">
<mat-tab-group> <mat-tab-group>
<!--
<mat-tab label="单位消防设施"> <mat-tab label="单位消防设施">
<div class="contentBox"> <div class="contentBox">
@ -8,9 +8,6 @@
<div style="width: 100%;margin-top: 25px;" *ngFor="let item of companyBuiltInGrouping;let key = index"> <div style="width: 100%;margin-top: 25px;" *ngFor="let item of companyBuiltInGrouping;let key = index">
<h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3> <h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3>
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<!-- <mat-icon title="创建" (click)='addCompanyGrouping(item)'>add_circle_outline</mat-icon>
<mat-icon title="保存" style="margin-left: 25px;" (click)='editCompanyGrouping(item)'>description</mat-icon>
<mat-icon title="删除" style="margin-left: 25px;" (click)='deleteCompanyGrouping(item)'>delete</mat-icon> -->
</div> </div>
<div> <div>
<mat-accordion multi> <mat-accordion multi>
@ -75,7 +72,6 @@
<mat-expansion-panel> <mat-expansion-panel>
<mat-expansion-panel-header> <mat-expansion-panel-header>
<h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3> <h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3>
<!-- <mat-icon title="保存" style="margin-left: 25px;" (click)='editCompanyOptional($event,item)'>description</mat-icon> -->
</mat-expansion-panel-header> </mat-expansion-panel-header>
<div *ngFor="let items of item.propertyInfos" class="InputField"> <div *ngFor="let items of item.propertyInfos" class="InputField">
<label>{{items.propertyName}}:</label> <label>{{items.propertyName}}:</label>
@ -94,7 +90,7 @@
</div> </div>
</div> </div>
</mat-tab> </mat-tab> -->
<mat-tab label="{{newItem.name}}" *ngFor="let newItem of allBuildingGrouping"> <mat-tab label="{{newItem.name}}" *ngFor="let newItem of allBuildingGrouping">
<div class="contentBox"> <div class="contentBox">

4
src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html
Unescape View File

@ -1,7 +1,7 @@
<div class="content"> <div class="content">
<mat-tab-group> <mat-tab-group>
<mat-tab label="单位消防设施"> <!-- <mat-tab style="display: none;" label="单位消防设施">
<div class="contentBox"> <div class="contentBox">
<p style="width: 100%; margin: 30px auto; text-align: center;" *ngIf="!companyBuiltInGrouping.length">暂无数据,请完善单位基本信息</p> <p style="width: 100%; margin: 30px auto; text-align: center;" *ngIf="!companyBuiltInGrouping.length">暂无数据,请完善单位基本信息</p>
@ -94,7 +94,7 @@
</div> </div>
</div> </div>
</mat-tab> </mat-tab> -->
<mat-tab label="{{newItem.name}}" *ngFor="let newItem of allBuildingGrouping"> <mat-tab label="{{newItem.name}}" *ngFor="let newItem of allBuildingGrouping">
<div class="contentBox"> <div class="contentBox">

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

@ -9,7 +9,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput id="usci" name="usci" type='text' required <input matInput id="usci" name="usci" type='text'
ngModel #usci="ngModel" placeholder="请输入统一社会信用代码" pattern="^[0-9A-HJ-NP-RTUW-Y]{2}\d{6}[0-9A-HJ-NP-RTUW-Y]{10}$"> ngModel #usci="ngModel" placeholder="请输入统一社会信用代码" pattern="^[0-9A-HJ-NP-RTUW-Y]{2}\d{6}[0-9A-HJ-NP-RTUW-Y]{10}$">
</mat-form-field> </mat-form-field>

9
src/app/key-unit/water-road/water-road.component.ts
Unescape View File

@ -33,6 +33,15 @@ export class WaterRoadComponent implements OnInit {
{id:'0',name:'消火栓',selected:true}, {id:'0',name:'消火栓',selected:true},
{id:'1',name:'消防水池',selected:true}, {id:'1',name:'消防水池',selected:true},
{id:'2',name:'天然水源',selected:true}, {id:'2',name:'天然水源',selected:true},
{id:'3',name:'总队',selected:true},
{id:'4',name:'支队',selected:true},
{id:'5',name:'大队',selected:true},
{id:'6',name:'中队(消防站)',selected:true},
{id:'7',name:'其他消防队伍',selected:true}
]
fireForceList:any[] = [
] ]
waterAreaDefault:any = '5000' //默认水源范围 waterAreaDefault:any = '5000' //默认水源范围
selectedWaterList:any = [] //选择提交的水源 selectedWaterList:any = [] //选择提交的水源

59
src/app/plan-management/entry-plan/entry-plan.component.html
Unescape View File

@ -55,17 +55,17 @@
</div> </div>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案类型:</label> <label style="margin-right: 10px;">预案类型:</label>
<mat-form-field> <mat-form-field>
<mat-select name="reservePlanType" [(ngModel)]="reservePlanType" placeholder='请选择预案类型' [multiple]="true"> <mat-select name="reservePlanType" [(ngModel)]="reservePlanType" placeholder='请选择预案类型' [multiple]="true">
<mat-option value=16>文本预案</mat-option> <mat-option value=16>文本预案</mat-option>
<mat-option value=1>二维预案</mat-option> <mat-option value=1>二维预案</mat-option>
<mat-option value=2>三维预案</mat-option> <mat-option value=2>三维预案</mat-option>
<mat-option value=4>其他预案</mat-option> <mat-option value=4>其他预案</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<span *ngIf="pcMore" style="margin-left: 15px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span> <span *ngIf="pcMore" style="margin-left: 15px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
<span *ngIf="pcput" style="margin-left: 10px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>收起<img [src]='imgsrcdown'> </span> <span *ngIf="pcput" style="margin-left: 10px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>收起<img [src]='imgsrcdown'> </span>
</div> </div>
<div class="queryField" *ngIf="pcfind" > <div class="queryField" *ngIf="pcfind" >
<button mat-raised-button color="primary">查询</button> <button mat-raised-button color="primary">查询</button>
@ -84,48 +84,47 @@
<div class="queryField" *ngIf="!padMore&&!pcMore"> <div class="queryField" *ngIf="!padMore&&!pcMore">
<label style="margin-right: 10px;">编制级别:</label> <label style="margin-right: 10px;">编制级别:</label>
<mat-form-field> <mat-form-field>
<mat-select name="preparelevel" [(ngModel)]="preparelevel" placeholder='请选择编制级别'> <mat-select name="preparelevel" [(ngModel)]="preparelevel" placeholder='请选择编制级别'>
<!-- <mat-option value="1">总队</mat-option> <!-- <mat-option value="1">总队</mat-option>
<mat-option value="2">支队</mat-option> <mat-option value="2">支队</mat-option>
<mat-option value="4">大队</mat-option> <mat-option value="4">大队</mat-option>
<mat-option value="8">中队</mat-option> --> <mat-option value="8">中队</mat-option> -->
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option> <mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox> <mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
</div> </div>
<div class="queryField" *ngIf="!padMore&&!pcMore"> <div class="queryField" *ngIf="!padMore&&!pcMore">
<label style="margin-right: 10px;">审核状态:</label> <label style="margin-right: 10px;">审核状态:</label>
<mat-form-field> <mat-form-field>
<mat-select name="toExamine" [(ngModel)]="toExamine" placeholder='请选择审核状态'> <mat-select name="toExamine" [(ngModel)]="toExamine" placeholder='请选择审核状态'>
<mat-option value="8">未提交审核</mat-option> <mat-option value="8">未提交审核</mat-option>
<mat-option value="1">审核中</mat-option> <mat-option value="1">审核中</mat-option>
<mat-option value="2">审核通过</mat-option> <mat-option value="2">审核通过</mat-option>
<mat-option value="4">审核退回</mat-option> <mat-option value="4">审核退回</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore&&!pcMore"> <div class="queryField" *ngIf="!padMore&&!pcMore">
<label style="margin-right: 10px;">信息完整度排序:</label> <label style="margin-right: 10px;">信息完整度排序:</label>
<mat-form-field>
<mat-select placeholder='请选择排序方式' [(ngModel)]="integritySort" name="integritySort">
<mat-option value="desc">从高到低</mat-option>
<mat-option value="asc">从低到高</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="queryField" *ngIf="!padMore&&!pcMore">
<label style="margin-right: 10px;">制作情况:</label>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择预案制作情况' [(ngModel)]="haveyuan" name="haveyuan"> <mat-select placeholder='请选择排序方式' [(ngModel)]="integritySort" name="integritySort">
<mat-option value='true'>有预案</mat-option> <mat-option value="desc">从高到低</mat-option>
<mat-option value="false">无预案</mat-option> <mat-option value="asc">从低到高</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore&&!pcMore">
<label style="margin-right: 10px;">制作情况:</label>
<mat-form-field>
<mat-select placeholder='请选择预案制作情况' [(ngModel)]="haveyuan" name="haveyuan">
<mat-option value='true'>有预案</mat-option>
<mat-option value="false">无预案</mat-option>
</mat-select>
</mat-form-field>
</div>
</div> </div>
</form> </form>
</div> </div>

2
src/app/plan-management/meet-plan/meet-plan.component.scss
Unescape View File

@ -95,7 +95,7 @@
} }
.newadd{ .newadd{
margin-top: 12px; margin-top: 12px;
margin-left: 70px; margin-left: 30px;
display: flex; display: flex;
button{ button{
font-size: 16px; font-size: 16px;

2
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
Unescape View File

@ -95,7 +95,7 @@
} }
.newadd{ .newadd{
margin-top: 12px; margin-top: 12px;
margin-left: 70px; margin-left: 30px;
display: flex; display: flex;
button{ button{
font-size: 16px; font-size: 16px;

2
src/app/plan-management/type-plan/type-plan.component.scss
Unescape View File

@ -95,7 +95,7 @@
} }
.newadd{ .newadd{
margin-top: 12px; margin-top: 12px;
margin-left: 70px; margin-left: 30px;
display: flex; display: flex;
button{ button{
font-size: 16px; font-size: 16px;

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

@ -12,6 +12,12 @@
</div> </div>
</div> </div>
<div mat-dialog-content>
<mat-form-field>
<input type="text" matInput required ngModel name="identityCard" #identityCard="ngModel" placeholder="身份证号码">
</mat-form-field>
</div>
<div mat-dialog-content> <div mat-dialog-content>
<mat-form-field> <mat-form-field>
<input type="text" matInput required ngModel name="user" #user="ngModel" placeholder="真实姓名"> <input type="text" matInput required ngModel name="user" #user="ngModel" placeholder="真实姓名">
@ -20,14 +26,14 @@
<div mat-dialog-content> <div mat-dialog-content>
<mat-form-field> <mat-form-field>
<input type="text" matInput required ngModel name="post" placeholder="用户职务"> <input type="text" matInput ngModel name="post" placeholder="用户职务">
</mat-form-field> </mat-form-field>
</div> </div>
<div mat-dialog-content> <div mat-dialog-content>
<mat-form-field> <mat-form-field>
<input type="tel" matInput pattern="^(?:\+?86)?1(?:3\d{3}|5[^4\D]\d{2}|8\d{3}|7(?:[0-35-9]\d{2}|4(?:0\d|1[0-2]|9\d))|9[0-35-9]\d{2}|6[2567]\d{2}|4(?:[14]0\d{3}|[68]\d{4}|[579]\d{2}))\d{6}$" <input type="tel" matInput pattern="^(?:\+?86)?1(?:3\d{3}|5[^4\D]\d{2}|8\d{3}|7(?:[0-35-9]\d{2}|4(?:0\d|1[0-2]|9\d))|9[0-35-9]\d{2}|6[2567]\d{2}|4(?:[14]0\d{3}|[68]\d{4}|[579]\d{2}))\d{6}$"
required ngModel name="phone" placeholder="联系电话"> ngModel name="phone" placeholder="联系电话">
</mat-form-field> </mat-form-field>
</div> </div>
@ -41,6 +47,7 @@
<input type="text" matInput [(ngModel)]="selectedOffices.officeName" disabled name="officeName" placeholder="所属机关"> <input type="text" matInput [(ngModel)]="selectedOffices.officeName" disabled name="officeName" placeholder="所属机关">
</mat-form-field> </mat-form-field>
</div> </div>
<div mat-dialog-content *ngIf="errmsg"> <div mat-dialog-content *ngIf="errmsg">
<p style="font-size: 14px; color: red;">{{errmsg}}</p> <p style="font-size: 14px; color: red;">{{errmsg}}</p>
</div> </div>

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

@ -9,6 +9,12 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div mat-dialog-content>
<mat-form-field>
<input type="text" pattern="^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$" matInput required [(ngModel)]="identityCard" name="identityCard" placeholder="身份证号码">
</mat-form-field>
</div>
<div mat-dialog-content> <div mat-dialog-content>
<mat-form-field> <mat-form-field>
<input type="text" matInput required [(ngModel)]="realName" name="user" placeholder="真实姓名"> <input type="text" matInput required [(ngModel)]="realName" name="user" placeholder="真实姓名">
@ -17,14 +23,14 @@
<div mat-dialog-content> <div mat-dialog-content>
<mat-form-field> <mat-form-field>
<input type="text" matInput required [(ngModel)]="post" name="post" placeholder="用户职务"> <input type="text" matInput [(ngModel)]="post" name="post" placeholder="用户职务">
</mat-form-field> </mat-form-field>
</div> </div>
<div mat-dialog-content> <div mat-dialog-content>
<mat-form-field> <mat-form-field>
<input type="tel" matInput pattern="^(?:\+?86)?1(?:3\d{3}|5[^4\D]\d{2}|8\d{3}|7(?:[0-35-9]\d{2}|4(?:0\d|1[0-2]|9\d))|9[0-35-9]\d{2}|6[2567]\d{2}|4(?:[14]0\d{3}|[68]\d{4}|[579]\d{2}))\d{6}$" <input type="tel" matInput pattern="^(?:\+?86)?1(?:3\d{3}|5[^4\D]\d{2}|8\d{3}|7(?:[0-35-9]\d{2}|4(?:0\d|1[0-2]|9\d))|9[0-35-9]\d{2}|6[2567]\d{2}|4(?:[14]0\d{3}|[68]\d{4}|[579]\d{2}))\d{6}$"
required [(ngModel)]="phone" name="phone" placeholder="联系电话"> [(ngModel)]="phone" name="phone" placeholder="联系电话">
</mat-form-field> </mat-form-field>
</div> </div>

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

@ -375,6 +375,7 @@ export class CreateNewUser {
name:e.name, name:e.name,
realName:e.user, realName:e.user,
post:e.post, post:e.post,
identityCard:e.identityCard,
phone:e.phone, phone:e.phone,
enabled:true, enabled:true,
creationTime:time, creationTime:time,
@ -412,6 +413,7 @@ export class EditNewUser {
this.getTreeData() this.getTreeData()
this.name=this.data.e.name this.name=this.data.e.name
this.realName=this.data.e.realName this.realName=this.data.e.realName
this.identityCard = this.data.e.identityCard
this.post=this.data.e.post, this.post=this.data.e.post,
this.phone=this.data.e.phone, this.phone=this.data.e.phone,
this.affiliate=this.data.e.organizationId this.affiliate=this.data.e.organizationId
@ -483,11 +485,13 @@ export class EditNewUser {
// console.log(item) // console.log(item)
} }
//编辑 //编辑
identityCard:any//身份证
onSubmit (e) { onSubmit (e) {
this.http.put(`/api/Users/${this.data.e.name}`,{ this.http.put(`/api/Users/${this.data.e.name}`,{
name:this.data.e.name, name:this.data.e.name,
realName:this.realName, realName:this.realName,
post:this.post, post:this.post,
identityCard:this.identityCard,
phone:this.phone, phone:this.phone,
roleNames:this.data.e.roleNames, roleNames:this.data.e.roleNames,
enabled: this.data.e.enabled, enabled: this.data.e.enabled,

Write Preview
Loading…
Cancel
Save