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

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

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

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

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

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

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

src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html

@@ -1,6 +1,6 @@
 <div class="content">
   <mat-tab-group>
-
+<!-- 
     <mat-tab label="单位消防设施">
       <div class="contentBox">
 
@@ -8,9 +8,6 @@
         <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>
           <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>
             <mat-accordion multi>
@@ -75,7 +72,6 @@
             <mat-expansion-panel>
               <mat-expansion-panel-header>
                 <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>
               <div *ngFor="let items of item.propertyInfos" class="InputField">
                 <label>{{items.propertyName}}:</label>
@@ -94,7 +90,7 @@
         </div>
 
       </div>
-    </mat-tab>
+    </mat-tab> -->
 
     <mat-tab label="{{newItem.name}}" *ngFor="let newItem of allBuildingGrouping">
       <div class="contentBox">

src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html

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

src/app/key-unit/key-unit-management/createunit.component.html

@@ -9,7 +9,7 @@
         </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}$">
         </mat-form-field>
         

src/app/key-unit/water-road/water-road.component.ts

@@ -33,6 +33,15 @@ export class WaterRoadComponent implements OnInit {
     {id:'0',name:'消火栓',selected:true},
     {id:'1',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' //默认水源范围
   selectedWaterList:any = [] //选择提交的水源

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

@@ -116,7 +116,7 @@
                     </mat-select>
                 </mat-form-field>
             </div>
-              <div class="queryField" *ngIf="!padMore&&!pcMore">
+<div class="queryField" *ngIf="!padMore&&!pcMore">
     <label style="margin-right: 10px;">制作情况:</label>
     <mat-form-field>
         <mat-select placeholder='请选择预案制作情况' [(ngModel)]="haveyuan" name="haveyuan">
@@ -125,7 +125,6 @@
         </mat-select>
     </mat-form-field>
     </div>
-            
           </div>
         </form>
     </div>

src/app/plan-management/meet-plan/meet-plan.component.scss

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

src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss

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

src/app/plan-management/type-plan/type-plan.component.scss

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

src/app/ui/usermanagement/createUser.html

@@ -12,6 +12,12 @@
         </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>
       <mat-form-field>
         <input type="text" matInput required ngModel name="user" #user="ngModel" placeholder="真实姓名">
@@ -20,14 +26,14 @@
 
     <div mat-dialog-content>
       <mat-form-field>
-        <input type="text" matInput required ngModel name="post"  placeholder="用户职务">
+        <input type="text" matInput ngModel name="post"  placeholder="用户职务">
       </mat-form-field>
     </div>
 
     <div mat-dialog-content>
       <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}$"
-        required ngModel name="phone" placeholder="联系电话">
+        ngModel name="phone" placeholder="联系电话">
       </mat-form-field>
     </div>
 
@@ -41,6 +47,7 @@
         <input type="text" matInput [(ngModel)]="selectedOffices.officeName" disabled name="officeName" placeholder="所属机关">
       </mat-form-field>
     </div>
+
     <div mat-dialog-content *ngIf="errmsg">
       <p style="font-size: 14px; color: red;">{{errmsg}}</p>
     </div>

src/app/ui/usermanagement/editUser.html

@@ -9,6 +9,12 @@
         </mat-form-field>
     </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>
       <mat-form-field>
         <input type="text" matInput required [(ngModel)]="realName" name="user"  placeholder="真实姓名">
@@ -17,14 +23,14 @@
 
     <div mat-dialog-content>
       <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>
     </div>
 
     <div mat-dialog-content>
       <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}$"
-        required [(ngModel)]="phone" name="phone" placeholder="联系电话">
+        [(ngModel)]="phone" name="phone" placeholder="联系电话">
       </mat-form-field>
     </div>
 

src/app/ui/usermanagement/usermanagement.component.ts

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