update

src/main/webapp/app/home/home.component.html

@@ -142,7 +142,7 @@
                     <div>
                         <p>{{item.name}} <span>类型：{{item.extendName}}</span> <span style="margin-left: 10px">IP：{{item.host}}</span>
                         </p>
-                        <p>所在分组</p>
+                        <p>所在分组：<span style="margin-right: 5px;" *ngFor="let groups of item.groupName">{{groups}}</span></p>
                     </div>
                 </div>
                 <div nz-row>

src/main/webapp/app/home/home.component.ts

@@ -196,7 +196,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
                                     hoverAnimation: false,
                                     startAngle: 90,
                                     data: [{
-                                        value: 0,
+                                        value: e.memory,
                                         name: '内存使用率',
                                         itemStyle: {
                                             normal: {
@@ -205,7 +205,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
                                         }
                                     },
                                         {
-                                            value: 100,
+                                            value: 100 - e.memory,
                                             name: '',
                                             tooltip: {
                                                 show: false

src/main/webapp/app/system/examine/examine.component.ts

@@ -49,7 +49,7 @@ export class ExamineComponent implements OnInit {
             this.selectList.push(item.id);
         }else{
             this.selectList.forEach((value,index)=>{
-                if(value.id == item.id){
+                if(value == item.id){
                     this.selectList.splice(index,1)
                 }
             });

src/main/webapp/app/work/asset-part/assets-detail/assets-detail.component.html

@@ -34,7 +34,7 @@
             <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="equipmentTypeid">资产编号
             </nz-form-label>
             <nz-form-control [nzSpan]="14">
-              {{inventoryExtend?.name}}
+              {{inventoryExtend?.inventoryNo}}
               <button (click)="linkThen()" nz-button nzType="primary">关联</button>
             </nz-form-control>
           </nz-form-item>
@@ -74,7 +74,7 @@
       <div nz-row [nzGutter]="24">
         <div nz-col [nzSpan]="12">
           <nz-form-item nzFlex>
-            <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="secondLevelType">资产数量
+            <nz-form-label [nzOffset]="4" [nzSpan]="6"  nzFor="secondLevelType">资产数量
             </nz-form-label>
             <nz-form-control [nzSpan]="14">
               {{inventoryExtend?.inventorycount}}
@@ -95,7 +95,7 @@
       <div nz-row [nzGutter]="24">
         <div nz-col [nzSpan]="12">
           <nz-form-item nzFlex>
-            <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired >库存</nz-form-label>
+            <nz-form-label [nzOffset]="4" [nzSpan]="6"  >库存</nz-form-label>
             <nz-form-control [nzSpan]="14">
               {{inventoryExtend?.stock}}
             </nz-form-control>
@@ -115,7 +115,7 @@
       <div nz-row [nzGutter]="24">
         <div nz-col [nzSpan]="12">
           <nz-form-item nzFlex>
-            <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired>使用</nz-form-label>
+            <nz-form-label [nzOffset]="4" [nzSpan]="6">使用</nz-form-label>
             <nz-form-control [nzSpan]="14">
               {{inventoryExtend?.usedcount}}
             </nz-form-control>
@@ -134,7 +134,7 @@
       <div nz-row [nzGutter]="24">
         <div nz-col [nzSpan]="12">
           <nz-form-item nzFlex>
-            <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired >借出</nz-form-label>
+            <nz-form-label [nzOffset]="4" [nzSpan]="6" >借出</nz-form-label>
             <nz-form-control [nzSpan]="14">
               {{inventoryExtend?.lendcount}}
             </nz-form-control>
@@ -154,7 +154,7 @@
       <div nz-row [nzGutter]="24">
         <div nz-col [nzSpan]="12">
           <nz-form-item nzFlex>
-            <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired>维修</nz-form-label>
+            <nz-form-label [nzOffset]="4" [nzSpan]="6" >维修</nz-form-label>
             <nz-form-control [nzSpan]="14">
               {{inventoryExtend?.repaircount}}
             </nz-form-control>
@@ -174,7 +174,7 @@
       <div nz-row [nzGutter]="24">
         <div nz-col [nzSpan]="12">
           <nz-form-item nzFlex>
-            <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired >报废</nz-form-label>
+            <nz-form-label [nzOffset]="4" [nzSpan]="6" >报废</nz-form-label>
             <nz-form-control [nzSpan]="14">
               {{inventoryExtend?.scrapcount}}
               <!--<input nz-input placeholder="报废" name="scrapcount" [(ngModel)]="inventoryExtend?.scrapcount">-->
@@ -185,7 +185,7 @@
       <div nz-row [nzGutter]="24">
         <div nz-col [nzSpan]="12">
           <nz-form-item nzFlex>
-            <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired >父分类
+            <nz-form-label [nzOffset]="4" [nzSpan]="6" >父分类
             </nz-form-label>
             <nz-form-control [nzSpan]="14">
             </nz-form-control>

src/main/webapp/app/work/modal/type-asets/type-asets.component.html

@@ -2,7 +2,7 @@
 <nz-modal [(nzVisible)]="isVisible" nzTitle="{{title}}" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()">
   <form nz-form  [formGroup]="validateForm">
     <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="name">分类类型</nz-form-label>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">分类类型</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24">
         <button nz-button nzSize="small" [nzType]="isParent" (click)="checkChange('parent')">父分类</button>
         <button nz-button nzSize="small" [nzType]="isChildren" (click)="checkChange('children')">子分类</button>