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

[完善]录入预案跳转单位信息bug

zhuzhou
邵佳豪 4 years ago
parent
b73dcdfd44
commit
7d4fa61654
16 changed files with 81 additions and 91 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. 1
      src/app/data-collection/fire-force/fire-force.component.scss
  2. 1
      src/app/data-collection/linkage-forces/linkage-forces.component.scss
  3. 1
      src/app/data-collection/water-collection/water-collection.component.scss
  4. 3
      src/app/gis-management/basic-info/basic-info.component.scss
  5. 2
      src/app/gis-management/gis-labeling/shareUrl.scss
  6. 2
      src/app/key-unit/key-unit-management/key-unit-management.component.ts
  7. 1
      src/app/pages/lockscreen/lockscreen.component.scss
  8. 3
      src/app/plan-audit/basic-info/basic-info.component.scss
  9. 106
      src/app/plan-audit/fireforce-audit/fireforce-audit.component.html
  10. 1
      src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss
  11. 26
      src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.html
  12. 5
      src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.scss
  13. 4
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  14. 8
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  15. 3
      src/app/plan-management/entry-plan/entry-plan.component.ts
  16. 3
      src/app/ui/collection-tools/panel.scss

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

@ -6,7 +6,6 @@
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;
// font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
} }

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

@ -6,7 +6,6 @@
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;
// font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
} }

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

@ -6,7 +6,6 @@
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;
// font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
} }

3
src/app/gis-management/basic-info/basic-info.component.scss
Unescape View File

@ -18,7 +18,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
// font-family: Source Han Sans CN;
color: #333333; color: #333333;
padding: 10px; padding: 10px;
box-sizing: border-box; box-sizing: border-box;
@ -31,7 +30,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
p{ p{
height: 14px; height: 14px;
font-size: 14px; font-size: 14px;
// font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
line-height: 14px; line-height: 14px;
color: #333333; color: #333333;
@ -54,7 +52,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
p{ p{
height: 14px; height: 14px;
font-size: 14px; font-size: 14px;
// font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
line-height: 14px; line-height: 14px;
color: #333333; color: #333333;

2
src/app/gis-management/gis-labeling/shareUrl.scss
Unescape View File

@ -8,7 +8,6 @@
position: relative; position: relative;
.name{ .name{
font-size: 20px; font-size: 20px;
// font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
} }
@ -37,7 +36,6 @@
line-height: 36px; line-height: 36px;
background: #EEF1F5; background: #EEF1F5;
font-size: 16px; font-size: 16px;
// font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
opacity: 0.4; opacity: 0.4;

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

@ -568,7 +568,7 @@ export class KeyUnitManagementComponent implements OnInit {
//跳转查看基本信息页面 //跳转查看基本信息页面
unitdetails(element){ unitdetails(element){
console.log(element) // console.log(element)
sessionStorage.setItem("editable","0") sessionStorage.setItem("editable","0")
sessionStorage.setItem("companyName",element.name) sessionStorage.setItem("companyName",element.name)
sessionStorage.setItem("companyId",element.id) sessionStorage.setItem("companyId",element.id)

1
src/app/pages/lockscreen/lockscreen.component.scss
Unescape View File

@ -22,7 +22,6 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
color: #fff; color: #fff;
font-family: Roboto, sans-serif;
background: url('../../../assets/images/background.jpg'); background: url('../../../assets/images/background.jpg');
&::before { &::before {
position: fixed; position: fixed;

3
src/app/plan-audit/basic-info/basic-info.component.scss
Unescape View File

@ -18,7 +18,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
width: 100%; width: 100%;
height: 760px; height: 760px;
overflow-y: auto; overflow-y: auto;
// font-family: Source Han Sans CN;
color: #333333; color: #333333;
padding: 10px; padding: 10px;
box-sizing: border-box; box-sizing: border-box;
@ -31,7 +30,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
p{ p{
height: 14px; height: 14px;
font-size: 14px; font-size: 14px;
// font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
line-height: 14px; line-height: 14px;
color: #333333; color: #333333;
@ -54,7 +52,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
p{ p{
height: 14px; height: 14px;
font-size: 14px; font-size: 14px;
// font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
line-height: 14px; line-height: 14px;
color: #333333; color: #333333;

106
src/app/plan-audit/fireforce-audit/fireforce-audit.component.html
Unescape View File

@ -36,25 +36,25 @@
<span style="color: red;">*</span> <span style="color: red;">*</span>
队站名称: 队站名称:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.stationName" type="text" style="width:88%;"> <input readonly [(ngModel)]="FireForceDetailInfo.stationName" type="text" style="width:88%;">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'> <mat-grid-tile colspan='2' rowspan='1'>
<span> <span>
联系电话: 联系电话:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.phoneNumber" type="text"> <input readonly [(ngModel)]="FireForceDetailInfo.phoneNumber" type="text">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'> <mat-grid-tile colspan='2' rowspan='1'>
<span> <span>
传真: 传真:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.faxNumber" type="text"> <input readonly [(ngModel)]="FireForceDetailInfo.faxNumber" type="text">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'> <mat-grid-tile colspan='2' rowspan='1'>
<span> <span>
辖区面积: 辖区面积:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.jurisdictionArea" type="text"> <input readonly [(ngModel)]="FireForceDetailInfo.jurisdictionArea" type="text">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='6' rowspan='2'> <mat-grid-tile colspan='6' rowspan='2'>
<span> <span>
@ -69,17 +69,17 @@
<span> <span>
地址: 地址:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.address" type="text" style="width:76%;"> <input readonly [(ngModel)]="FireForceDetailInfo.address" type="text" style="width:76%;">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
经度: 经度:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.location.x" disabled type="text" style="width: 26%;margin-right: 6%;"> <input readonly [(ngModel)]="FireForceDetailInfo.location.x" disabled type="text" style="width: 26%;margin-right: 6%;">
<span> <span>
纬度: 纬度:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.location.y" disabled type="text" style="width: 26%;margin-right: 6%;"> <input readonly [(ngModel)]="FireForceDetailInfo.location.y" disabled type="text" style="width: 26%;margin-right: 6%;">
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
@ -89,19 +89,19 @@
<span> <span>
现役官兵人数: 现役官兵人数:
</span> </span>
<input [(ngModel)]="ZongpersonCountData[0].PropertyValue" type="text"> <input readonly [(ngModel)]="ZongpersonCountData[0].PropertyValue" type="text">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'> <mat-grid-tile colspan='2' rowspan='1'>
<span> <span>
政府专职消防员数: 政府专职消防员数:
</span> </span>
<input [(ngModel)]="ZongpersonCountData[1].PropertyValue" type="text"> <input readonly [(ngModel)]="ZongpersonCountData[1].PropertyValue" type="text">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'> <mat-grid-tile colspan='2' rowspan='1'>
<span> <span>
消防文员数: 消防文员数:
</span> </span>
<input [(ngModel)]="ZongpersonCountData[2].PropertyValue" type="text"> <input readonly [(ngModel)]="ZongpersonCountData[2].PropertyValue" type="text">
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
<p>联系方式</p> <p>联系方式</p>
@ -110,25 +110,25 @@
<span> <span>
总队长名称: 总队长名称:
</span> </span>
<input type="text" [(ngModel)]="ZongcontactData[0].PropertyValue"> <input readonly type="text" [(ngModel)]="ZongcontactData[0].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
总队长联系方式: 总队长联系方式:
</span> </span>
<input type="text" [(ngModel)]="ZongcontactData[1].PropertyValue"> <input readonly type="text" [(ngModel)]="ZongcontactData[1].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
总队政委姓名: 总队政委姓名:
</span> </span>
<input type="text" [(ngModel)]="ZongcontactData[2].PropertyValue"> <input readonly type="text" [(ngModel)]="ZongcontactData[2].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
总队政委联系方式: 总队政委联系方式:
</span> </span>
<input type="text" [(ngModel)]="ZongcontactData[3].PropertyValue"> <input readonly type="text" [(ngModel)]="ZongcontactData[3].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
<mat-grid-list cols="6" rowHeight="40px" *ngIf="selectedFireForceLevel == 1"> <mat-grid-list cols="6" rowHeight="40px" *ngIf="selectedFireForceLevel == 1">
@ -136,25 +136,25 @@
<span> <span>
支队长姓名: 支队长姓名:
</span> </span>
<input type="text" [(ngModel)]="ZhicontactData[0].PropertyValue"> <input readonly type="text" [(ngModel)]="ZhicontactData[0].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
支队长联系方式: 支队长联系方式:
</span> </span>
<input type="text" [(ngModel)]="ZhicontactData[1].PropertyValue"> <input readonly type="text" [(ngModel)]="ZhicontactData[1].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
支队政委姓名: 支队政委姓名:
</span> </span>
<input type="text" [(ngModel)]="ZhicontactData[2].PropertyValue"> <input readonly type="text" [(ngModel)]="ZhicontactData[2].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
支队政委联系方式: 支队政委联系方式:
</span> </span>
<input type="text" [(ngModel)]="ZhicontactData[3].PropertyValue"> <input readonly type="text" [(ngModel)]="ZhicontactData[3].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
</div> </div>
@ -167,19 +167,19 @@
<span style="color: red;">*</span> <span style="color: red;">*</span>
队站名称: 队站名称:
</span> </span>
<input type="text" style="width:81%;" [(ngModel)]="FireForceDetailInfo.stationName"> <input readonly type="text" style="width:81%;" [(ngModel)]="FireForceDetailInfo.stationName">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
值班电话: 值班电话:
</span> </span>
<input type="text" [(ngModel)]="FireForceDetailInfo.phoneNumber"> <input readonly type="text" [(ngModel)]="FireForceDetailInfo.phoneNumber">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
辖区面积: 辖区面积:
</span> </span>
<input type="text" [(ngModel)]="FireForceDetailInfo.jurisdictionArea"> <input readonly type="text" [(ngModel)]="FireForceDetailInfo.jurisdictionArea">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='6' rowspan='2'> <mat-grid-tile colspan='6' rowspan='2'>
<span> <span>
@ -194,17 +194,17 @@
<span> <span>
地址: 地址:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.address" type="text" style="width:76%;"> <input readonly [(ngModel)]="FireForceDetailInfo.address" type="text" style="width:76%;">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
经度: 经度:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.location.x" disabled type="text" style="width: 26%;margin-right: 6%;"> <input readonly [(ngModel)]="FireForceDetailInfo.location.x" disabled type="text" style="width: 26%;margin-right: 6%;">
<span> <span>
纬度: 纬度:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.location.y" disabled type="text" style="width: 26%;margin-right: 6%;"> <input readonly [(ngModel)]="FireForceDetailInfo.location.y" disabled type="text" style="width: 26%;margin-right: 6%;">
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
@ -214,19 +214,19 @@
<span> <span>
现役人数: 现役人数:
</span> </span>
<input type="text" [(ngModel)]="DaZhongpersonCountData[0].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongpersonCountData[0].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'> <mat-grid-tile colspan='2' rowspan='1'>
<span> <span>
政府专职消防员数: 政府专职消防员数:
</span> </span>
<input type="text" [(ngModel)]="DaZhongpersonCountData[1].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongpersonCountData[1].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'> <mat-grid-tile colspan='2' rowspan='1'>
<span> <span>
每日执勤人数: 每日执勤人数:
</span> </span>
<input type="text" [(ngModel)]="DaZhongpersonCountData[2].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongpersonCountData[2].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
<p>联系方式</p> <p>联系方式</p>
@ -235,73 +235,73 @@
<span> <span>
站长姓名: 站长姓名:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[0].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[0].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
站长联系方式: 站长联系方式:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[1].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[1].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
指导员姓名: 指导员姓名:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[2].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[2].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
指导员联系方式: 指导员联系方式:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[3].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[3].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
副指导员姓名: 副指导员姓名:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[4].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[4].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
副指导员联系方式: 副指导员联系方式:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[5].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[5].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
副站长一姓名: 副站长一姓名:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[6].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[6].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
副站长一联系方式: 副站长一联系方式:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[7].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[7].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
副站长二姓名: 副站长二姓名:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[8].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[8].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
副站长二联系方式: 副站长二联系方式:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[9].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[9].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
副站长三姓名: 副站长三姓名:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[10].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[10].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
副站长三联系方式: 副站长三联系方式:
</span> </span>
<input type="text" [(ngModel)]="DaZhongcontactData[11].PropertyValue"> <input readonly type="text" [(ngModel)]="DaZhongcontactData[11].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
</div> </div>
@ -326,33 +326,33 @@
<span style="color: red;">*</span> <span style="color: red;">*</span>
队伍名称: 队伍名称:
</span> </span>
<input type="text" [(ngModel)]="FireForceDetailInfo.stationName"> <input readonly type="text" [(ngModel)]="FireForceDetailInfo.stationName">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
管辖单位: 管辖单位:
</span> </span>
<!-- <input disabled [(ngModel)]="superior.name" class="smallwidth" type="text" placeholder="名称"> <!-- <input readonly disabled [(ngModel)]="superior.name" class="smallwidth" type="text" placeholder="名称">
<input disabled [(ngModel)]="superior.code" class="smallwidth" type="text" placeholder="编号"> --> <input readonly disabled [(ngModel)]="superior.code" class="smallwidth" type="text" placeholder="编号"> -->
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
队长: 队长:
</span> </span>
<input [(ngModel)]="othercontactData[0].PropertyValue" class="smallwidth" type="text" placeholder="姓名"> <input readonly [(ngModel)]="othercontactData[0].PropertyValue" class="smallwidth" type="text" placeholder="姓名">
<input [(ngModel)]="othercontactData[1].PropertyValue" class="smallwidth" type="text" placeholder="联系方式"> <input readonly [(ngModel)]="othercontactData[1].PropertyValue" class="smallwidth" type="text" placeholder="联系方式">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
值班电话: 值班电话:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.phoneNumber" type="text"> <input readonly [(ngModel)]="FireForceDetailInfo.phoneNumber" type="text">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
传真: 传真:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.faxNumber" type="text"> <input readonly [(ngModel)]="FireForceDetailInfo.faxNumber" type="text">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='6' rowspan='2'> <mat-grid-tile colspan='6' rowspan='2'>
<span> <span>
@ -367,17 +367,17 @@
<span> <span>
地址: 地址:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.address" type="text" style="width:76%;"> <input readonly [(ngModel)]="FireForceDetailInfo.address" type="text" style="width:76%;">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
经度: 经度:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.location.x" disabled type="text" style="width: 26%;margin-right: 6%;"> <input readonly [(ngModel)]="FireForceDetailInfo.location.x" disabled type="text" style="width: 26%;margin-right: 6%;">
<span> <span>
纬度: 纬度:
</span> </span>
<input [(ngModel)]="FireForceDetailInfo.location.y" disabled type="text" style="width: 26%;margin-right: 6%;"> <input readonly [(ngModel)]="FireForceDetailInfo.location.y" disabled type="text" style="width: 26%;margin-right: 6%;">
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
@ -388,20 +388,20 @@
<span> <span>
每日执勤人数: 每日执勤人数:
</span> </span>
<input type="text" [(ngModel)]="otherpersonCountData[0].PropertyValue"> <input readonly type="text" [(ngModel)]="otherpersonCountData[0].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
消防队员总人数: 消防队员总人数:
</span> </span>
<input type="text" [(ngModel)]="otherpersonCountData[1].PropertyValue"> <input readonly type="text" [(ngModel)]="otherpersonCountData[1].PropertyValue">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
执勤车辆数: 执勤车辆数:
</span> </span>
<div class="unitDiv"> <div class="unitDiv">
<input type="text" [(ngModel)]="otherpersonCountData[2].PropertyValue"> <input readonly type="text" [(ngModel)]="otherpersonCountData[2].PropertyValue">
<span class="unit">辆</span> <span class="unit">辆</span>
</div> </div>
</mat-grid-tile> </mat-grid-tile>
@ -410,7 +410,7 @@
灭火剂总量: 灭火剂总量:
</span> </span>
<div class="unitDiv"> <div class="unitDiv">
<input type="text" [(ngModel)]="otherpersonCountData[3].PropertyValue"> <input readonly type="text" [(ngModel)]="otherpersonCountData[3].PropertyValue">
<span class="unit">个</span> <span class="unit">个</span>
</div> </div>
</mat-grid-tile> </mat-grid-tile>

1
src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss
Unescape View File

@ -132,6 +132,7 @@
margin-left: 5px; margin-left: 5px;
border: 1px solid #EBEBEB; border: 1px solid #EBEBEB;
border-radius: 5px; border-radius: 5px;
font-family: Regular;
} }
textarea{ textarea{
width: 89%; width: 89%;

26
src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.html
Unescape View File

@ -43,25 +43,25 @@
<span style="color: red;">*</span> <span style="color: red;">*</span>
名称: 名称:
</span> </span>
<input type="text" style="width: 63%;" [(ngModel)]="LinkageForceDetailInfo.name"> <input readonly type="text" style="width: 63%;" [(ngModel)]="LinkageForceDetailInfo.name">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
单位联系电话: 单位联系电话:
</span> </span>
<input type="text" [(ngModel)]="LinkageForceDetailInfo.phoneNumber"> <input readonly type="text" [(ngModel)]="LinkageForceDetailInfo.phoneNumber">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
单位传真: 单位传真:
</span> </span>
<input type="text" [(ngModel)]="LinkageForceDetailInfo.faxNumber"> <input readonly type="text" [(ngModel)]="LinkageForceDetailInfo.faxNumber">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='6' rowspan='2'> <mat-grid-tile colspan='6' rowspan='2'>
<span> <span>
备注: 备注:
</span> </span>
<textarea [(ngModel)]="LinkageForceDetailInfo.remark" style="height: 80%;width: 84.5%;" name="" id="" cols="30" rows="10"></textarea> <textarea readonly [(ngModel)]="LinkageForceDetailInfo.remark" style="height: 80%;width: 84.5%;" name="" id="" cols="30" rows="10"></textarea>
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
<p>位置信息</p> <p>位置信息</p>
@ -70,21 +70,21 @@
<span> <span>
行政区: 行政区:
</span> </span>
<input type="text" style="width: 26%;margin-right: 6%;" [(ngModel)]="LinkageForceDetailInfo.administrativeRegion"> <input readonly type="text" style="width: 26%;margin-right: 6%;" [(ngModel)]="LinkageForceDetailInfo.administrativeRegion">
<span> <span>
地址: 地址:
</span> </span>
<input type="text" style="width: 26%;margin-right: 6%;" [(ngModel)]="LinkageForceDetailInfo.address"> <input readonly type="text" style="width: 26%;margin-right: 6%;" [(ngModel)]="LinkageForceDetailInfo.address">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'> <mat-grid-tile colspan='3' rowspan='1'>
<span> <span>
经度: 经度:
</span> </span>
<input [(ngModel)]="LinkageForceDetailInfo.location.x" disabled type="text" style="width: 26%;margin-right: 6%;"> <input readonly [(ngModel)]="LinkageForceDetailInfo.location.x" disabled type="text" style="width: 26%;margin-right: 6%;">
<span> <span>
纬度: 纬度:
</span> </span>
<input [(ngModel)]="LinkageForceDetailInfo.location.y" disabled type="text" style="width: 26%;margin-right: 6%;"> <input readonly [(ngModel)]="LinkageForceDetailInfo.location.y" disabled type="text" style="width: 26%;margin-right: 6%;">
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
@ -94,19 +94,19 @@
<span> <span>
联系人: 联系人:
</span> </span>
<input type="text" [(ngModel)]="LinkageForceDetailInfo.contactName"> <input readonly type="text" [(ngModel)]="LinkageForceDetailInfo.contactName">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'> <mat-grid-tile colspan='2' rowspan='1'>
<span> <span>
职务: 职务:
</span> </span>
<input type="text" [(ngModel)]="LinkageForceDetailInfo.contactTitle"> <input readonly type="text" [(ngModel)]="LinkageForceDetailInfo.contactTitle">
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='2' rowspan='1'> <mat-grid-tile colspan='2' rowspan='1'>
<span> <span>
电话: 电话:
</span> </span>
<input type="text" [(ngModel)]="LinkageForceDetailInfo.contactPhone"> <input readonly type="text" [(ngModel)]="LinkageForceDetailInfo.contactPhone">
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
<p>应急信息</p> <p>应急信息</p>
@ -115,13 +115,13 @@
<span> <span>
服务内容: 服务内容:
</span> </span>
<textarea style="height: 80%;width: 70%;" name="" id="" cols="30" rows="10" [(ngModel)]="LinkageForceDetailInfo.serviceContent"></textarea> <textarea readonly style="height: 80%;width: 70%;" name="" id="" cols="30" rows="10" [(ngModel)]="LinkageForceDetailInfo.serviceContent"></textarea>
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='2'> <mat-grid-tile colspan='3' rowspan='2'>
<span> <span>
资源说明: 资源说明:
</span> </span>
<textarea style="height: 80%;width: 70%;" name="" id="" cols="30" rows="10" [(ngModel)]="LinkageForceDetailInfo.resourceRemark"></textarea> <textarea readonly style="height: 80%;width: 70%;" name="" id="" cols="30" rows="10" [(ngModel)]="LinkageForceDetailInfo.resourceRemark"></textarea>
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>

5
src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.scss
Unescape View File

@ -6,7 +6,7 @@
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;
// font-family: Source Han Sans CN; font-family: Regular;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
} }
@ -136,6 +136,7 @@
margin-left: 5px; margin-left: 5px;
border: 1px solid #EBEBEB; border: 1px solid #EBEBEB;
border-radius: 5px; border-radius: 5px;
font-family: Regular;
} }
textarea{ textarea{
width: 89%; width: 89%;
@ -143,6 +144,7 @@
height: 85%; height: 85%;
border: 1px solid #EBEBEB; border: 1px solid #EBEBEB;
border-radius: 5px; border-radius: 5px;
font-family: Regular;
} }
.longinput{ .longinput{
width: 74%; width: 74%;
@ -154,6 +156,7 @@
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
padding-right: 50px; padding-right: 50px;
font-family: Regular;
} }
.unit{ .unit{
position: absolute; position: absolute;

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

@ -269,9 +269,9 @@
<app-water-audit></app-water-audit> <app-water-audit></app-water-audit>
</div> --> </div> -->
<!-- 消防力量审核 --> <!-- 消防力量审核 -->
<!-- <div class="fireForceAudit"> <div class="fireForceAudit">
<app-fireforce-audit></app-fireforce-audit> <app-fireforce-audit></app-fireforce-audit>
</div> --> </div>
<!-- 联动力量审核 --> <!-- 联动力量审核 -->
<!-- <div class="LinkageForcesAudit"> <!-- <div class="LinkageForcesAudit">
<app-linkageforces-audit></app-linkageforces-audit> <app-linkageforces-audit></app-linkageforces-audit>

8
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
Unescape View File

@ -76,7 +76,11 @@ export class EntryPlanLookComponent implements OnInit {
} }
//跳转单位信息 //跳转单位信息
lookUnitData(){ lookUnitData(){
window.open(`/keyUnit/viewunitinfo?id=${this.route.snapshot.queryParams.unitId}`) sessionStorage.setItem("editable","0")
sessionStorage.setItem("companyName",this.route.snapshot.queryParams.unitName)
sessionStorage.setItem("companyId",this.route.snapshot.queryParams.unitId)
// sessionStorage.setItem(element.id,JSON.stringify(element.companyIntegrityScore))
window.open(`/keyUnit/viewunitinfo?id=${this.route.snapshot.queryParams.unitId}&usci=${this.route.snapshot.queryParams.usci}`)
} }
//分页事件 //分页事件
changePage(e){ changePage(e){
@ -89,8 +93,6 @@ export class EntryPlanLookComponent implements OnInit {
] ]
// this.getCompanyData() // this.getCompanyData()
this.isoperation = this.route.snapshot.queryParams.operation this.isoperation = this.route.snapshot.queryParams.operation
this.unitdata.unitname = this.route.snapshot.queryParams.unitName this.unitdata.unitname = this.route.snapshot.queryParams.unitName
this.unitdata.organizationName = this.route.snapshot.queryParams.orName this.unitdata.organizationName = this.route.snapshot.queryParams.orName
this.unitdata.unittype = this.route.snapshot.queryParams.unitType this.unitdata.unittype = this.route.snapshot.queryParams.unitType

3
src/app/plan-management/entry-plan/entry-plan.component.ts
Unescape View File

@ -320,10 +320,9 @@ export class EntryPlanComponent implements OnInit {
operation=true operation=true
//查看预案按钮跳转 //查看预案按钮跳转
routerTo(element){ routerTo(element){
// console.log(element)
this.level=='0'?this.operation=false:true this.level=='0'?this.operation=false:true
sessionStorage.setItem("companyName",element.company.name) sessionStorage.setItem("companyName",element.company.name)
window.open(`/planManagement/entryPlandetail?unitId=${element.company.id}&unitTypeId=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].id}&operation=${this.operation}&pagetype=entryplan&unitName=${element.company.name}&orName=${element.company.organizationName}&unitType=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].name}&unitAdd=${element.company.address}`); window.open(`/planManagement/entryPlandetail?unitId=${element.company.id}&unitTypeId=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].id}&operation=${this.operation}&pagetype=entryplan&unitName=${element.company.name}&orName=${element.company.organizationName}&unitType=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].name}&unitAdd=${element.company.address}&usci=${element.company.usci}`);
} }
//查询 //查询
onSubmit (value) { onSubmit (value) {

3
src/app/ui/collection-tools/panel.scss
Unescape View File

@ -157,11 +157,8 @@
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
padding-bottom: 10px; padding-bottom: 10px;
// border-top: 1px dashed #999;
} }
//基本信息/想定作业 切换 //基本信息/想定作业 切换
.scenarioAssignment { .scenarioAssignment {
overflow-y: auto; overflow-y: auto;

Write Preview
Loading…
Cancel
Save