Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Jinan_project

src/app/home/basic-info/basic-info.component.html

@@ -12,4 +12,4 @@
             <router-outlet></router-outlet>
         </div>
     </div>
-</div>
+</div>

src/app/home/basic-info/unit/unit.component.html

@@ -1,2 +1,72 @@
-<button (click)="next()">下一页</button>
+<div class="orbox" id="orbox">
-<input placeholder="label" value="value">
+    <div class="topbox">
+        <!-- <div class="lefttop">
+          <span>菜单列表</span>
+          
+        </div> -->
+        <div class="righttop">
+            <!-- <form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
+            <nz-form-item>
+              <nz-form-control>
+                <nz-input-group nzPrefixIcon="search">
+                  <input type="text" nz-input placeholder="请输入单位" formControlName="search" [(ngModel)]="searchValue"/>
+                </nz-input-group>
+              </nz-form-control>
+              <button style="display: none;" type="submit"></button>
+            </nz-form-item>
+          </form> -->
+            <nz-input-group nzPrefixIcon="search">
+                <input type="text" nz-input placeholder="请输入单位" />
+            </nz-input-group>
+            <nz-input-group nzPrefixIcon="search">
+                <input type="text" nz-input placeholder="请输入单位" />
+            </nz-input-group>
+            <nz-input-group nzPrefixIcon="search">
+                <input type="text" nz-input placeholder="请输入单位" />
+            </nz-input-group>
+        </div>
+        <div>
+            <button nz-button nzType="primary"><i nz-icon nzType="plus-circle" nzTheme="outline"></i>查询</button>
+            <button nz-button nzType="primary"><i nz-icon nzType="plus-circle" nzTheme="outline"></i>重置</button>
+        </div>
+        <div>
+
+        </div>
+    </div>
+    <nz-table [nzBordered]="true" #basicTable [nzData]="listOfData">
+        <thead>
+          <tr>
+            <th>单位名称</th>
+            <th>信息完整度</th>
+            <th>所属机构</th>
+            <th>单位级别</th>
+            <th>使用性质</th>
+            <th>修改时间</th>
+            <th>单位地址</th>
+            <th>状态</th>
+            <th>操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of basicTable.data">
+            <td >{{ data.name }}</td>
+            <td ><div style="height: 20px; background: #eee; border-radius: 4px;">
+                <div [ngStyle]="{'width':data.integrity+'%'}" style=" height: 100%; background: #46B783; border-radius: 4px; text-align: center; color: #fff;">{{data.integrity}}%</div>
+            </div></td>
+            <td >{{ data.organization }}</td>
+            <td >{{ data.level }}</td>
+            <td >{{ data.nature }}</td>
+            <td >{{ data.time }}</td>
+            <td >{{ data.addr }}</td>
+            <td >{{ data.state }}</td>
+            <td >
+              <a>查看详情</a>
+              &nbsp;
+              <a>关闭</a>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+    <!-- <button (click)="next()">下一页</button>
+<input placeholder="label" value="value"> -->
+</div>

src/app/home/basic-info/unit/unit.component.scss

@@ -1,6 +1,91 @@
-p{
+.orbox {
-    color: black;
+    width: 100%;
-}
+    height: 100%;
-input{
+    overflow-y: auto;
-    color: red;
+    background: #fff;
-}
+    box-sizing: border-box;
+    padding: 20px;
+    font-size: 15px;
+  }
+  
+  .topbox {
+    width: 100%;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  
+    .lefttop {
+      span:nth-child(1) {
+        color: #000D21;
+        margin-right: 16px;
+      }
+  
+      span:nth-child(2) {
+        color: rgba(36, 36, 36, 0.24);
+      }
+    }
+  
+    .righttop {
+      height: 36px;
+      display: flex;
+  
+      button {
+        margin-left: 16px;
+      }
+  
+      nz-input-group {
+        height: 32px;
+      }
+    }
+  }
+  
+  .treeTitle {
+    width: 700px;
+    height: 36px;
+    line-height: 36px;
+    display: flex;
+    justify-content: space-between;
+    color: #000D21;
+    box-sizing: border-box;
+    padding-left: 30px;
+    padding-right: 180px;
+    background: rgba(145, 204, 255, 0.2);
+    margin: 12px 0;
+  }
+  
+  .nodebox {
+    font-size: 15px;
+  
+  }
+  
+  .operation {
+    position: absolute;
+    right: 0;
+  
+    span {
+      margin-left: 40px;
+    }
+  
+    span:nth-child(1),
+    span:nth-child(2),
+    span:nth-child(3) {
+      color: #2399FF;
+    }
+  
+    .grey{
+      color: rgba(0, 13, 33, 0.48)!important;
+    }
+    .progress{
+        width: 100%;
+        height: 20px;
+        background: #eee;
+        border-radius: 2px;
+        .bg{
+            width: 32%;
+            height: 100%;
+            background: #46B783;
+        }
+    }
+  }
+  

src/app/home/basic-info/unit/unit.component.ts

@@ -1,17 +1,52 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-
+interface Person {
+  id: string;
+  name: string;
+  integrity: number;
+  organization: string;
+  level: string;
+  nature:string;
+  time:string;
+  addr:string;
+  state:string
+}
 @Component({
   selector: 'app-unit',
   templateUrl: './unit.component.html',
   styleUrls: ['./unit.component.scss']
 })
 export class UnitComponent implements OnInit {
-
+  listOfData: Person[] = [
+    {
+      id: '1',
+      name: 'John Brown',
+      integrity: 20,
+      organization: 'New York No. 1 Lake Park',
+      level:'重点单位',
+      nature:'会议中心',
+      time:'time',
+      addr:'单位地址',
+      state:''
+    }
+    // {
+    //   id: '2',
+    //   name: 'Jim Green',
+    //   integrity: 42,
+    //   organization: 'London No. 1 Lake Park'
+    // },
+    // {
+    //   id: '3',
+    //   name: 'Joe Black',
+    //   integrity: 32,
+    //   organization: 'Sidney No. 1 Lake Park'
+    // }
+  ];
   constructor(private router: Router) { }
 
   ngOnInit(): void {
   }
+  searchValue = '';
   next() {
     this.router.navigate(['/basicInfo/unit/details']);
   }

src/app/home/home.module.ts

@@ -13,6 +13,8 @@ import { RoleComponent } from './system-management/role/role.component';
 import { OrComponent } from './system-management/or/or.component';
 import { UnitComponent } from './basic-info/unit/unit.component';
 import { UnitDetailsComponent } from './basic-info/unit-details/unit-details.component';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { NzTableModule } from 'ng-zorro-antd/table';
 import { NzIconModule } from 'ng-zorro-antd/icon';
 import { ZhiIndicatorsComponent } from './task/zhi-indicators/zhi-indicators.component';
 import { ZhiAuditComponent } from './task/zhi-audit/zhi-audit.component';
@@ -22,6 +24,7 @@ import { DaOneselfPlanComponent } from './task/da-oneself-plan/da-oneself-plan.c
 import { StationTaskExecutionComponent } from './task/station-task-execution/station-task-execution.component';
 import { StationTaskApplyComponent } from './task/station-task-apply/station-task-apply.component';
 import { StationWeeklyPlanComponent } from './task/station-weekly-plan/station-weekly-plan.component';
+import { NzProgressModule } from 'ng-zorro-antd/progress';
 import { NzEmptyModule } from 'ng-zorro-antd/empty';
 import { NzButtonModule } from 'ng-zorro-antd/button';
 import { NzTableModule } from 'ng-zorro-antd/table';
@@ -62,7 +65,10 @@ import { NzInputModule } from 'ng-zorro-antd/input';
     HomeRoutingModule,
     NzLayoutModule,
     NzDropDownModule,
+    NzInputModule,
+    NzTableModule,
     NzIconModule,
+    NzProgressModule,
     NzEmptyModule,
     NzButtonModule,
     NzTableModule,

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

@@ -4,7 +4,7 @@
     <p class="a2">防消一体化综合治理平台</p>
   </div>
   <div class="card">
-    <!-- <h1 class="cardheader">登录</h1> -->
+    <h1 class="cardheader">登录</h1>
     <!-- <h1 class="cardheader">济南管理系统</h1> -->
 
     <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
@@ -28,7 +28,7 @@
       <div class="hint">
         <nz-form-item style="margin-bottom: 0;">
           <nz-form-control>
-            <label nz-checkbox formControlName="remember" [(ngModel)]="remember">七天内自动登陆</label>
+            <label nz-checkbox formControlName="remember" [(ngModel)]="remember">记住密码</label>
           </nz-form-control>
         </nz-form-item>
         <span class="forget" (click)="forget()">忘记密码?</span>

src/app/pages/login/login.component.scss

@@ -10,7 +10,9 @@
 }
 .left{
   color: #feffff;
+  padding: 50px;
   margin-right: 100px;
+  height: 504px;
   p{
     font-size: 24px;
     text-align: left;
@@ -25,11 +27,14 @@
   width: 468px;
   height: 504px;
   box-sizing: border-box;
-  padding: 79px 45px 42px 45px;
+  padding: 40px 45px 42px 45px;
   color: #3b3b3b;
 }
 
 .cardheader {
+  width: 200px;
+  margin: 0 auto;
+  text-align: center;
   font-size: 22px;
   color: #3b3b3b
 }
@@ -61,7 +66,7 @@ button {
   width: 100%;
   height: 42px;
   font-size: 16px;
-  background: #2D4CC1;
+  // background: #2D4CC1;
   border-radius: 4px;
 }
 

src/theme.scss

@@ -0,0 +1,5 @@
+// -------- 引入官方提供的 less 样式入口文件 -----------
+@import "../node_modules/ng-zorro-antd/ng-zorro-antd.less";
+
+// -------- 自定义参数覆盖 -----------
+@primary-color          : #f5222d;