[完善]改名

src/app/pages/lockscreen/lockscreen.component.html

@@ -1,5 +1,5 @@
 <div class="content">
-  <h1 class="header">灭火救援指挥培训系统</h1>
+  <h1 class="header">指挥长（员）战术战法培训系统</h1>
 
   <div class="loginBox">
     <div class="center">
@@ -35,5 +35,5 @@
   </div>
 
   <p class="toLogin" title="管理员登录" (click)='toAdminLogin()'><mat-icon>arrow_drop_down_circle</mat-icon></p>
-  <p class="footer">Copyright <mat-icon style="vertical-align: top; font-size: 20px;">copyright</mat-icon> 2019 北京安信科创软件有限公司出品</p>
+  <!-- <p class="footer">Copyright <mat-icon style="vertical-align: top; font-size: 20px;">copyright</mat-icon> 2019 北京安信科创软件有限公司出品</p> -->
 </div>

src/app/pages/login/login.component.html

@@ -1,7 +1,7 @@
 <div class="content">
   <div class="loginBox">
-      <h1 class="header">灭火救援指挥培训系统 (管理员)</h1>
+      <!-- <h1 class="header">灭火救援指挥培训系统 (管理员)</h1> -->
-
+      <h1 class="header">指挥长（员）战术战法培训系统 (管理员)</h1>
       <div class="center">
         <form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
 
@@ -29,5 +29,5 @@
 
   </div>
   <p class="toLogin" title="教员学员登录" (click)='toAdminLogin()'><mat-icon>arrow_drop_down_circle</mat-icon></p>
-  <p class="footer">Copyright <mat-icon style="vertical-align: top; font-size: 20px;">copyright</mat-icon> 2019 北京安信科创软件有限公司出品</p>
+  <!-- <p class="footer">Copyright <mat-icon style="vertical-align: top; font-size: 20px;">copyright</mat-icon> 2019 北京安信科创软件有限公司出品</p> -->
 </div>

src/app/pages/register/register.component.html

@@ -16,9 +16,7 @@
         <form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
 
           <mat-form-field>
-            <input matInput id="name" name="name"
+            <input matInput id="name" name="name" required ngModel #name="ngModel" placeholder="请输入账号">
-            required
-            ngModel #name="ngModel" placeholder="请输入账号">
           </mat-form-field>
 
           <!-- <div *ngIf="name.invalid && (name.dirty || name.touched)"
@@ -29,11 +27,11 @@
           </div> -->
 
           <mat-form-field>
-            <input matInput id="email" name="email"
+            <input matInput id="email" name="email" required
-            required pattern="^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$"
+              pattern="^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$" ngModel #email="ngModel"
-            ngModel #email="ngModel" placeholder="请输入邮箱">
+              placeholder="请输入邮箱">
           </mat-form-field>
-<!-- 
+          <!-- 
           <div *ngIf="email.invalid && (email.dirty || email.touched)"
             class="alert-danger">
             <div *ngIf="email.errors.required">
@@ -45,9 +43,8 @@
           </div> -->
 
           <mat-form-field>
-            <input matInput id="password" name="password" type='password'
+            <input matInput id="password" name="password" type='password' required minlength="8" ngModel
-            required minlength="8"
+              #password="ngModel" placeholder="请输入密码">
-            ngModel #password="ngModel" placeholder="请输入密码">
           </mat-form-field>
 
           <!-- <div *ngIf="password.invalid && (password.dirty || password.touched)"
@@ -62,7 +59,7 @@
 
           <mat-checkbox style="margin-top: 25px;">请同意不扩散核武器条约条约</mat-checkbox>
 
-          <button type="submit" [disabled]="!form.form.valid" class="loginbtn"mat-button>注册</button>
+          <button type="submit" [disabled]="!form.form.valid" class="loginbtn" mat-button>注册</button>
         </form>
 
         <div class="applyfor">
@@ -76,6 +73,6 @@
 
       </mat-card>
     </div>
-    
+
   </div>
 </div>

src/app/ui/all-file/all-file.component.html

@@ -149,9 +149,9 @@
     <a (click)="openlearn()" [href]='aHrefUnsafeLearnFun()'> <mat-icon style="vertical-align: middle; font-size: 24px;">account_balance</mat-icon> 战术学习<span>进入</span></a>
 </div>
 
-<div class="openSystem" *ngIf="!selectedDataBank.includes('/') && (roleType =='1' || roleType == '2')">
+<!-- <div class="openSystem" *ngIf="!selectedDataBank.includes('/') && (roleType =='1' || roleType == '2')">
     <a (click)="openmultirole()" [href]='aHrefUnsafeLearnFun2()'> <mat-icon style="vertical-align: middle; font-size: 24px;">account_balance</mat-icon> 多人电子沙盘推演系统<span>进入</span></a>
-</div>
+</div> -->
 <div class="fixedBox" [hidden]="!uploadisLoading2">
   <app-upload-files [thatFile]='this' #child></app-upload-files>
 </div>