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

src/app/data-collection/fire-force/fire-force.component.scss

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

src/app/data-collection/linkage-forces/linkage-forces.component.scss

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

src/app/data-collection/water-collection/water-collection.component.scss

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

src/app/gis-management/basic-info/basic-info.component.scss

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

src/app/gis-management/gis-labeling/shareUrl.scss

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

src/app/key-unit/key-unit-management/key-unit-management.component.ts

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

src/app/pages/lockscreen/lockscreen.component.scss

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

src/app/plan-audit/basic-info/basic-info.component.scss

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

src/app/plan-audit/fireforce-audit/fireforce-audit.component.html

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

src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss

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

src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.html

@@ -43,25 +43,25 @@
                                 <span style="color: red;">*</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 colspan='3' rowspan='1'>
                             <span>
                                 单位联系电话:
                             </span>
-                            <input type="text" [(ngModel)]="LinkageForceDetailInfo.phoneNumber">
+                            <input readonly type="text" [(ngModel)]="LinkageForceDetailInfo.phoneNumber">
                         </mat-grid-tile>
                         <mat-grid-tile colspan='3' rowspan='1'>
                             <span>
                                 单位传真:
                             </span>
-                            <input type="text" [(ngModel)]="LinkageForceDetailInfo.faxNumber">
+                            <input readonly type="text" [(ngModel)]="LinkageForceDetailInfo.faxNumber">
                         </mat-grid-tile>
                         <mat-grid-tile colspan='6' rowspan='2'>
                             <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-list>
                     <p>位置信息</p>
@@ -70,21 +70,21 @@
                             <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>
-                            <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 colspan='3' rowspan='1'>
                             <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>
-                            <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-list>
@@ -94,19 +94,19 @@
                             <span>
                                 联系人:
                             </span>
-                            <input type="text" [(ngModel)]="LinkageForceDetailInfo.contactName">
+                            <input readonly type="text" [(ngModel)]="LinkageForceDetailInfo.contactName">
                         </mat-grid-tile>
                         <mat-grid-tile colspan='2' rowspan='1'>
                             <span>
                                 职务:
                             </span>
-                            <input type="text" [(ngModel)]="LinkageForceDetailInfo.contactTitle">
+                            <input readonly type="text" [(ngModel)]="LinkageForceDetailInfo.contactTitle">
                         </mat-grid-tile>
                         <mat-grid-tile colspan='2' rowspan='1'>
                             <span>
                                 电话:
                             </span>
-                            <input type="text" [(ngModel)]="LinkageForceDetailInfo.contactPhone">
+                            <input readonly type="text" [(ngModel)]="LinkageForceDetailInfo.contactPhone">
                         </mat-grid-tile>
                     </mat-grid-list>
                     <p>应急信息</p>
@@ -115,13 +115,13 @@
                             <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 colspan='3' rowspan='2'>
                             <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-list>

src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.scss

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

src/app/plan-audit/plan-audit.module.ts

@@ -70,10 +70,13 @@ import { CadDrawComponent } from './cad-draw/cad-draw.component'
 import { RealisticPictureLookComponent }from './realistic-picture-look/realistic-picture.component'
 import { previewImg3 } from './realistic-picture-look/realistic-picture.component'
 import { show3D } from './wait-examineer/wait-examineer.component';
+import { recordshow3D } from './plan-record/plan-record.component'
 import { ViewDetailsComponent } from './view-details/view-details.component'
 @NgModule({
   declarations: [DetachmentLevelComponent, PlanAuditComponent, PlanPassComponent,PlanOpen, PlanRecordComponent, BasicInfoComponent, 
-    WaitExamineerComponent,AllaroundComponent,ImgDetails,FireFacilitiesComponent,ImagesData2,previewBigImg2,PlanListComponent,OpenPlanToolDialog,KeySiteLookComponent,KeySiteImgs2,FunctionPartitionComponent,CadDrawComponent,RealisticPictureLookComponent,previewImg3,show3D, WaterAuditComponent, FireforceAuditComponent, LinkageforcesAuditComponent, ViewDetailsComponent],
+    WaitExamineerComponent,AllaroundComponent,ImgDetails,FireFacilitiesComponent,ImagesData2,previewBigImg2,PlanListComponent,OpenPlanToolDialog,
+    KeySiteLookComponent,KeySiteImgs2,FunctionPartitionComponent,CadDrawComponent,RealisticPictureLookComponent,previewImg3,show3D, WaterAuditComponent, 
+    FireforceAuditComponent, LinkageforcesAuditComponent, ViewDetailsComponent,recordshow3D],
   imports: [
     CommonModule,
     PlanAuditRoutingModule,

src/app/plan-audit/plan-record/plan-record.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-02 15:58:22
+ * @LastEditTime: 2021-02-20 10:40:25
 -->
 <div class="box">
     <div class="boxleft">
@@ -172,9 +172,30 @@
             </mat-tab> -->
         
           </mat-tab-group>
-          <div class="word" *ngIf="showtype==0||showtype==2">
+          <div class="word" *ngIf="showtype==0">
             <iframe [src]='iframeSrc'></iframe>
-         </div>
-         <div id="viewer" *ngIf="showtype==1"></div>
+        </div>
+        <div id="viewer"  *ngIf="showtype==1"></div>
+        <div class="twoD" *ngIf="showtype==2">
+          <div class="planBox">
+            <span>单位名称: </span>
+            <span>{{compantData.name?compantData.name : '暂无数据'}}</span>
+          </div>
+          <div class="planBox">
+            <span>消防救援站: </span>
+            <span>{{organizationName}}</span>
+          </div>
+          <div class="planBox">
+            <span>单位类型: </span>
+            <span>{{compantData.buildingTypes.length?compantData.buildingTypes[0].name : '暂无数据'}}</span>
+          </div>
+          <div class="planBox">
+            <span>单位地址: </span>
+            <span>{{compantData.address?compantData.address : '暂无数据'}}</span>
+          </div>
+          <div class="planBox">
+            <span style="color: #2196F3;cursor:pointer;" (click)='oopen3Dshow()'>查看详情</span>
+          </div>
+        </div>
     </div>
 </div>

src/app/plan-audit/plan-record/plan-record.component.scss

@@ -92,6 +92,18 @@ th,td{
 .green{color: #00C756;}
 .red{color: #FF4D4D;}
 .blue{color: #2196F3;}
+.twoD {
+    width: 100%;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    align-items: left;
+    .planBox {
+      margin: 30px 30px;
+      color: black;
+      :first-child {margin-right: 10px;}
+    }
+  }
 
 //滚动条样式
 ::-webkit-scrollbar{

src/app/plan-audit/plan-record/plan-record.component.ts

@@ -4,11 +4,12 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-06 10:15:00
+ * @LastEditTime: 2021-02-20 10:39:50
  */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit,Inject } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
 import { HttpClient } from '@angular/common/http'
 import { DomSanitizer } from '@angular/platform-browser';
 import { Viewer } from 'photo-sphere-viewer';
@@ -21,7 +22,7 @@ declare var CryptoJS
 })
 export class PlanRecordComponent implements OnInit {
 
-  constructor(private http:HttpClient,public snackBar: MatSnackBar,private sanitizer: DomSanitizer) { }
+  constructor(private http:HttpClient,public snackBar: MatSnackBar,private sanitizer: DomSanitizer,public dialog: MatDialog) { }
 
   ngOnInit(): void {
     let level = sessionStorage.getItem("level");
@@ -73,7 +74,17 @@ export class PlanRecordComponent implements OnInit {
   count//一共多少条
   tableDate
   showPvt=false//全景图是否显示
+  shenheTable=[]//选中要审核的对象
+  chuorzhong//判断初审还是终审
+  radioid//选中的id
   showtype=0//0:word,1:全景图，2:二维三维，3:重点单位
+  compantData={name:'',buildingTypes:[],address:''}
+  organizationName
+  planData
+  id
+  companyId
+  fetchUrl
+  companyName
 
   //获取表格数据
   getAlltabledate(){
@@ -120,34 +131,75 @@ export class PlanRecordComponent implements OnInit {
     this.getAlltabledate()
   }
   //表格点击事件
+  viewer//全景图对象
   tableClick(e,item){
     //e.target.parentElement.bgColor='#2196F3'
-    let filename:string
-    let fetchUrl
+    console.log(e,item)
+    this.organizationName=''
+    this.id=item.id
+    this.fetchUrl=''
+    this.viewer={}
     this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data:any)=>{
+      console.log(data)
+      this.companyId=data.companyId
+      this.companyName=data.companyName
       if(data.planType!=2&&data.planType!=1){
-        fetchUrl=data.attachmentUrls[0]
-        var index=fetchUrl.indexOf("\/")
-        if(fetchUrl.substr(0,index)=='psw'){
+        this.fetchUrl=data.attachmentUrls[0]
+        var index=this.fetchUrl.indexOf("\/")
+        if(this.fetchUrl.substr(0,index)=='psw'){
           this.showtype=1
           window.setTimeout(()=>{
-            const viewer = new Viewer({
+            this.viewer = new Viewer({
               container: document.querySelector('#viewer'),
-              panorama:'/api/Objects/PlanPlatform/'+ fetchUrl,
+              panorama:'/api/Objects/PlanPlatform/'+ this.fetchUrl,
               
             });
           })
           
         }else{
-          this.showtype=0
-          this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{
+          this.lookWord()
+        }
+      }else{
+        this.organizationName=item.organizationName
+        this.planData = data
+        this.handleData()
+        return
+        
+        //this.src=`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`
+        //this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
+        //window.open(`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`)
+      }
+      
+      
+     })
+      
+    if(e.checked){
+      this.shenheTable.push(item)
+    }
+    else{
+      for(var i=0;i<this.shenheTable.length;i++ ){
+        if(this.shenheTable[i].id==item.id){
+          this.shenheTable.splice(i,1)
+        }
+      }
+    }
+    this.radioid=item.itemId
+    /* this.chuorzhong=item.verifyState
+    this.radioid=item.itemId */
+  }
+
+  //毕升
+  lookWord(){
+    this.showtype=0
+    let filename:string
+          this.http.get(`/api/ObjectMetadata/PlanPlatform/${this.fetchUrl}`).subscribe((data:any)=>{
             filename=data.fileName 
             let json={
              doc: {
-                docId: item.id, 
+                docId: this.id, 
                 title: filename,
                //title: filename,
-                fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl
+                fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+this.fetchUrl
              },
              user: {
                 uid: "test",
@@ -165,15 +217,68 @@ export class PlanRecordComponent implements OnInit {
            this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
            //window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`)
            })
-        }
-      }else{
-        this.showtype=2
-        this.src=`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`
-        this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
-        //window.open(`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`)
-      }
-      
-     })
+  }
+  
+
+  //查看二维三维预案
+  thirdPartyURL
+  planType
+  twoOrthree
+  handleData () {
+    this.compantData={name:'',buildingTypes:[],address:''}
+    this.planType = this.planData.planMode
+    let data = this.planData
+    console.log(data)
+    if(data.planType==1){
+      this.twoOrthree=2
+    }else if(data.planType==2){
+      this.twoOrthree=3
+    }
+    if (this.planData.planMode==0) { //预案planMode=0时, 查看word
+      //this.lookWord()
+    } else if (this.planData.planMode==1) { //预案planMode=1时, 解析文档
+
+    } else if (this.planData.planMode==2) { //预案planMode=2时, 跳查看页面组件
+      this.showtype=2
+      this.http.get(`/api/Plans/${data.companyId}`).subscribe((data:any)=>{
+        data && data.company? this.compantData = data.company : null
+      })
+      sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length? this.compantData.buildingTypes[0].id: undefined);
+      sessionStorage.setItem("companyId",this.companyId);
+      sessionStorage.setItem("planId",this.id);
+      sessionStorage.setItem("editable",'0');
+      sessionStorage.setItem("planName",data.name)
+      let companyId = sessionStorage.getItem("companyId")
+      this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/planAudit/planpass?id=${this.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`);
+      //window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`)
+    } else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址'
+      this.showtype=2
+      this.http.get(`/api/Plans/${data.companyId}`).subscribe((data:any)=>{
+        data && data.company? this.compantData = data.company : null
+      })
+      //this.dialog.open(show3D,{width:'1350px',height:'700px',data:{url:data.url}}); //打开图片弹窗
+      this.thirdPartyURL = this.sanitizer.bypassSecurityTrustResourceUrl(data.url)
+    }
+
   }
 
+  //打开三维预案弹窗
+  oopen3Dshow(){
+    this.dialog.open(recordshow3D,{width:'1650px',height:'850px',data:{url:this.thirdPartyURL,twoOrthree:this.twoOrthree}});
+  }
+
+}
+
+@Component({
+  selector: 'app-wait-examineer-show3D',
+  templateUrl: './show3D.html',
+  styleUrls: ['./plan-record.component.scss']
+})
+export class recordshow3D{
+  constructor(private sanitizer: DomSanitizer,public dialogRef: MatDialogRef<recordshow3D>,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog) {}
+  ngOnInit(): void {
+    console.log(this.data)
+    this.threedUrl=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.url.changingThisBreaksApplicationSecurity)
+  }
+  threedUrl
 }

src/app/plan-audit/plan-record/show3D.html

@@ -0,0 +1,11 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-02-04 16:03:00
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-02-05 09:41:49
+-->
+<div style="width:100%;height: 100%;">
+    <iframe style="width:100%;height: 100%;border: none;" [src]='threedUrl'></iframe>
+</div>

src/app/plan-audit/wait-examineer/wait-examineer.component.html

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

src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@@ -76,7 +76,11 @@ export class EntryPlanLookComponent implements OnInit {
   }
   //跳转单位信息
   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){
@@ -89,8 +93,6 @@ export class EntryPlanLookComponent implements OnInit {
     ]
     // this.getCompanyData()
     this.isoperation = this.route.snapshot.queryParams.operation
-
-
     this.unitdata.unitname  = this.route.snapshot.queryParams.unitName
     this.unitdata.organizationName  = this.route.snapshot.queryParams.orName
     this.unitdata.unittype  = this.route.snapshot.queryParams.unitType

src/app/plan-management/entry-plan/entry-plan.component.ts

@@ -320,10 +320,9 @@ export class EntryPlanComponent implements OnInit {
   operation=true
   //查看预案按钮跳转
   routerTo(element){
-    // console.log(element)
     this.level=='0'?this.operation=false:true
     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) {

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

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

src/app/working-area/working-area.component.ts

@@ -162,7 +162,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
    * 重大调整-主版本号增加
    * 日期变更-日期版本号增加
    */
-  public VERSION = '1.2.1.20210207_beta';
+  public VERSION = '1.2.2.20210220_beta';
   /**
    * 数据初始化
    */
@@ -992,24 +992,41 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     if (imageUrl === undefined || imageUrl === null || imageUrl === '') {
       this.backgroundImage.texture = this.backgroundTexture;
     } else {
-      this.backgroundImage.texture = await PIXI.Texture.fromURL(imageUrl);
+      // this.backgroundImage.texture = await PIXI.Texture.fromURL(imageUrl);
+      if (imageWidth !== undefined
+        && imageWidth !== null
+        && imageWidth !== 0
+        && imageHeight !== undefined
+        && imageHeight !== null
+        && imageHeight !== 0) {
+        // console.log(imageWidth, imageHeight);
+        // this.backgroundImage.width = imageWidth;
+        // this.backgroundImage.height = imageHeight;
+        this.backgroundImage.texture =
+          await PIXI.Texture.fromURL(imageUrl + '?x-oss-process=image/resize,m_fixed,h_' + imageHeight + ',w_' + imageWidth); // 图片处理
+      } else {
+        // this.backgroundImage.width = this.backgroundImage.texture.width;
+        // this.backgroundImage.height = this.backgroundImage.texture.height;
+        this.backgroundImage.texture =
+          await PIXI.Texture.fromURL(imageUrl); // 请求原图
+      }
     }
 
     this.backgroundImage.angle = imageAngle;
 
-    if (imageWidth !== undefined
-      && imageWidth !== null
-      && imageWidth !== 0
-      && imageHeight !== undefined
-      && imageHeight !== null
-      && imageHeight !== 0) {
-      console.log(imageWidth, imageHeight);
-      this.backgroundImage.width = imageWidth;
-      this.backgroundImage.height = imageHeight;
-    } else {
-      this.backgroundImage.width = this.backgroundImage.texture.width;
-      this.backgroundImage.height = this.backgroundImage.texture.height;
-    }
+    // if (imageWidth !== undefined
+    //   && imageWidth !== null
+    //   && imageWidth !== 0
+    //   && imageHeight !== undefined
+    //   && imageHeight !== null
+    //   && imageHeight !== 0) {
+    //   console.log(imageWidth, imageHeight);
+    //   this.backgroundImage.width = imageWidth;
+    //   this.backgroundImage.height = imageHeight;
+    // } else {
+    //   this.backgroundImage.width = this.backgroundImage.texture.width;
+    //   this.backgroundImage.height = this.backgroundImage.texture.height;
+    // }
 
     this.backgroundImage.x = this.backgroundImage.width / 2;
     this.backgroundImage.y = this.backgroundImage.height / 2;