Skip to content

S
smart
Commit 97bd3c9b authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent 7bd5a457
Hide whitespace changes
Inline Side-by-side
Showing with 444 additions and 368 deletions
src/main/webapp/app/analysis/operation-work/analysis-deal/analysis-deal.component.html
View file @ 97bd3c9b
......@@ -45,7 +45,7 @@
<tbody>
<ng-container *ngFor="let data of dealList">
<tr>
<td>{{data.typeName}}</td>
<td>{{data.username}}</td>
<td>{{data.num}}</td>
<td>未解决 {{data.unsolved}} 部分解决 {{data.solveLittle}} 解决 {{data.solved}}</td>
<td>
......
src/main/webapp/app/analysis/operation-work/analysis-status/analysis-status.component.html
View file @ 97bd3c9b
......@@ -54,7 +54,7 @@
</ng-container>
</td>
<td>
<ng-container *ngFor="let item of data.eventTypeS">
<ng-container *ngFor="let item of data.eventTypes">
<span>{{item.typeName}} {{item.num}}</span>
</ng-container>
</td>
......
src/main/webapp/app/modal/alarm-modal/alarm-modal.component.html
View file @ 97bd3c9b
<!--添加资源-->
<nz-modal [nzWidth]="1080" [nzFooter]="null" [(nzVisible)]="isShow" [nzTitle]="title"
(nzOnCancel)="handleEditCancel()" (nzOnOk)="handEditleOk()">
<nz-tabset [nzSelectedIndex]="tabNum" style="padding-bottom: 25px;min-height: 500px">
<nz-tabset [nzSelectedIndex]="tabNum" (nzSelectedIndexChange)="tabsChange($event)" style="padding-bottom: 25px;min-height: 500px">
<nz-tab nzTitle="选定告警目标">
<div nz-form class="ant-advanced-search-form form-select">
<nz-form-item>
......
src/main/webapp/app/modal/alarm-modal/alarm-modal.component.ts
View file @ 97bd3c9b
......@@ -208,6 +208,7 @@ export class AlarmModalComponent implements OnInit {
//tab切换
tabsChange(index) {
console.log(this.tabNum);
this.tabNum = index;
}
......
src/main/webapp/app/modal/basic-edit/basic-edit.component.html
View file @ 97bd3c9b
<!--添加资源-->
<nz-modal [nzWidth]="1080" [nzFooter]="null" [(nzVisible)]="isBasicEdit" nzTitle="{{modalTitle}}"
(nzOnCancel)="handleEditCancel()" (nzOnOk)="handEditleOk()">
<nz-tabset [nzSelectedIndex]="tabNum" style="padding-bottom: 25px;min-height: 500px">
<nz-tabset [nzSelectedIndex]="tabNum" (nzSelectedIndexChange)="tabsChange($event)" style="padding-bottom: 25px;min-height: 500px">
<nz-tab nzTitle="资源信息">
<div nz-form class="ant-advanced-search-form form-select">
<div nz-row [nzGutter]="24">
......
src/main/webapp/app/modal/modify-password/modify-password.component.html
View file @ 97bd3c9b
<nz-modal [(nzVisible)]="isVisible" [nzTitle]="title" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()">
<form nz-form [formGroup]="validateForm">
<nz-form-item>
<nz-form-label [nzSpan]="7" nzRequired nzFor="password">密码</nz-form-label>
<nz-form-label [nzSpan]="7" nzRequired nzFor="oldPassword">旧密码</nz-form-label>
<nz-form-control [nzSpan]="12">
<input type="password" nz-input formControlName="password" placeholder="密码">
<nz-form-explain *ngIf="validateForm.get('password').dirty && validateForm.get('password').errors">请输入密码</nz-form-explain>
<input type="password" nz-input formControlName="oldPassword" placeholder="密码">
<nz-form-explain *ngIf="validateForm.get('oldPassword').dirty && validateForm.get('oldPassword').errors">请输入密码</nz-form-explain>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="7" nzRequired nzFor="newPassword">新密码</nz-form-label>
<nz-form-control [nzSpan]="12">
<input type="password" nz-input formControlName="newPassword" placeholder="密码">
<nz-form-explain *ngIf="validateForm.get('newPassword').dirty && validateForm.get('newPassword').errors">请输入密码</nz-form-explain>
</nz-form-control>
</nz-form-item>
<nz-form-item>
......
src/main/webapp/app/modal/modify-password/modify-password.component.ts
View file @ 97bd3c9b
......@@ -37,7 +37,7 @@ export class ModifyPasswordComponent implements OnInit {
if (this.validateForm.invalid) {
return false;
}
if(this.validateForm.value.password != this.validateForm.value.realPassword){
if(this.validateForm.value.newPassword != this.validateForm.value.realPassword){
this.message.error("两次输入密码不一致");
return false;
}
......@@ -46,7 +46,8 @@ export class ModifyPasswordComponent implements OnInit {
update() {
let formData = new FormData();
formData.append('password',this.validateForm.value.password);
formData.append('newPassword',this.validateForm.value.realPassword);
formData.append('oldPassword',this.validateForm.value.oldPassword);
this.layoutSer.modifyPassword(formData).subscribe(
(res) => {
if (res.errCode == 10000) {
......@@ -69,8 +70,9 @@ export class ModifyPasswordComponent implements OnInit {
//初始化
initForm() {
this.validateForm = this.fb.group({
password: [null, [Validators.required]],
realPassword: [null, [Validators.required]],
oldPassword: [null, [Validators.required]],
newPassword: [null, [Validators.required,Validators.minLength(6),Validators.maxLength(12)]],
realPassword: [null, [Validators.required,Validators.minLength(6),Validators.maxLength(12)]],
});
}
}
src/main/webapp/app/modal/website/website.component.html
View file @ 97bd3c9b
<nz-modal [nzWidth]="1080" [(nzVisible)]="isVisible" nzTitle="{{title}}" [nzFooter]="null" (nzOnCancel)="handleCancel()"
(nzOnOk)="handleOk()">
<nz-tabset [nzSelectedIndex]="tabNum" style="padding-bottom: 25px;min-height: 500px">
<nz-tabset [nzSelectedIndex]="tabNum" (nzSelectedIndexChange)="tabsChange($event)" style="padding-bottom: 25px;min-height: 500px">
<nz-tab nzTitle="1.场景">
<div nz-form class="ant-advanced-search-form form-select">
<form nz-form class="ant-advanced-search-form">
......
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.html
View file @ 97bd3c9b
......@@ -24,174 +24,174 @@
<nz-spin [nzSpinning]="isSpinning">
<div class="tabset">
<div class="tabset-btn">
<button (click)="showCheckModal()" nz-button nzType="default">添加监测点</button>
<button (click)="showDeleteConfirm()" nz-button nzType="default">删除</button>
</div>
<div class="releative" #checkEle>
<div #colorEle class="checkTags tag-form">
<span (click)="changeState('正常')">
<nz-tag [nzColor]="color.green"></nz-tag>
<i *ngIf="!checkStatus.normal && checkStatus.normal !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>{{checkStatus.normal}}
</span>
<span (click)="changeState('告警')"> <nz-tag [nzColor]="color.yellow"></nz-tag>
<i *ngIf="!checkStatus.warning && checkStatus.warning !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
{{checkStatus.warning}}
</span>
<span (click)="changeState('严重')"> <nz-tag [nzColor]="color.red"></nz-tag>
<i *ngIf="!checkStatus.high && checkStatus.high !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
{{checkStatus.high}}
</span>
<span (click)="changeState('禁用')"> <nz-tag [nzColor]="color.gray"></nz-tag>
<i *ngIf="!checkStatus.disabled && checkStatus.disabled !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
{{checkStatus.disabled}}
</span>
<div class="tabset-btn">
<button (click)="showCheckModal()" nz-button nzType="default">添加监测点</button>
<button (click)="showDeleteConfirm()" nz-button nzType="default">删除</button>
</div>
<nz-tabset [nzSelectedIndex]="tabNum" class="tabs-smart">
<div class="releative" #checkEle>
<div #colorEle class="checkTags tag-form">
<span (click)="changeState('正常')">
<nz-tag [nzColor]="color.green"></nz-tag>
<i *ngIf="!checkStatus.normal && checkStatus.normal !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>{{checkStatus.normal}}
</span>
<span (click)="changeState('告警')"> <nz-tag [nzColor]="color.yellow"></nz-tag>
<i *ngIf="!checkStatus.warning && checkStatus.warning !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
{{checkStatus.warning}}
</span>
<span (click)="changeState('严重')"> <nz-tag [nzColor]="color.red"></nz-tag>
<i *ngIf="!checkStatus.high && checkStatus.high !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
{{checkStatus.high}}
</span>
<span (click)="changeState('禁用')"> <nz-tag [nzColor]="color.gray"></nz-tag>
<i *ngIf="!checkStatus.disabled && checkStatus.disabled !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
{{checkStatus.disabled}}
</span>
</div>
<nz-tabset [nzSelectedIndex]="tabNum" class="tabs-smart">
<nz-tab nzTitle="资源详情">
<section>
资源显示名称
<div nz-row nzGutter="24">
<div nz-col nzSpan="12">
<nz-collapse>
<nz-collapse-panel [nzHeader]="panel1.name" [nzActive]="panel1.active"
[nzDisabled]="panel1.disabled">
<div nz-row>
<div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption1" style="height: 220px;width: 100%"></div>
<div class="posiabsolutStr">
<p>{{responseTimeStr}}</p>
<p>ms</p>
<nz-tab nzTitle="资源详情">
<section>
资源显示名称
<div nz-row nzGutter="24">
<div nz-col nzSpan="12">
<nz-collapse>
<nz-collapse-panel [nzHeader]="panel1.name" [nzActive]="panel1.active"
[nzDisabled]="panel1.disabled">
<div nz-row>
<div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption1" style="height: 220px;width: 100%"></div>
<div class="posiabsolutStr">
<p>{{responseTimeStr}}</p>
<p>ms</p>
</div>
</div>
</div>
<div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption2" style="height: 220px;width: 100%;"></div>
<div class="posiabsolutStr">
<p>{{losedStr}}</p>
<p>%</p>
<div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption2" style="height: 220px;width: 100%;"></div>
<div class="posiabsolutStr">
<p>{{losedStr}}</p>
<p>%</p>
</div>
</div>
</div>
</div>
</nz-collapse-panel>
</nz-collapse>
</div>
<div nz-col nzSpan="12">
<nz-collapse>
<nz-collapse-panel [nzHeader]="panel2.name" [nzActive]="panel2.active"
[nzDisabled]="panel2.disabled">
<div nz-row>
<div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption3" style="height: 220px;width: 100%;"></div>
<div class="posiabsolutStr">
<p>{{cpuUsedStr}}</p>
<p>%</p>
</nz-collapse-panel>
</nz-collapse>
</div>
<div nz-col nzSpan="12">
<nz-collapse>
<nz-collapse-panel [nzHeader]="panel2.name" [nzActive]="panel2.active"
[nzDisabled]="panel2.disabled">
<div nz-row>
<div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption3" style="height: 220px;width: 100%;"></div>
<div class="posiabsolutStr">
<p>{{cpuUsedStr}}</p>
<p>%</p>
</div>
</div>
</div>
<div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption4" style="height: 220px;width: 100%"></div>
<div class="posiabsolutStr">
<p>{{usedStr}}</p>
<p>%</p>
<div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption4" style="height: 220px;width: 100%"></div>
<div class="posiabsolutStr">
<p>{{usedStr}}</p>
<p>%</p>
</div>
</div>
</div>
</nz-collapse-panel>
</nz-collapse>
</div>
</div>
<div nz-row style="margin: 30px 0;">
<nz-collapse>
<nz-collapse-panel [nzHeader]="panel3.name" [nzActive]="panel3.active"
[nzDisabled]="panel3.disabled">
<div nz-col nzSpan="16">
<div echarts [options]="secondOptionLeft" class="demo-chart"></div>
</div>
<div nz-col nzSpan="8">
<div echarts [options]="secondOptionRight" class="demo-chart"></div>
</div>
</nz-collapse-panel>
</nz-collapse>
</div>
</div>
<div nz-row style="margin: 30px 0;">
<nz-collapse>
<nz-collapse-panel [nzHeader]="panel3.name" [nzActive]="panel3.active"
[nzDisabled]="panel3.disabled">
<div nz-col nzSpan="16">
<div echarts [options]="secondOptionLeft" class="demo-chart"></div>
</div>
<div nz-col nzSpan="8">
<div echarts [options]="secondOptionRight" class="demo-chart"></div>
</div>
</nz-collapse-panel>
</nz-collapse>
</div>
<div nz-row>
<nz-table #basicTable [nzData]="dataSet" [nzFrontPagination]="false" [nzTotal]="totalNumInOut" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="changeInoutInfo($event)" [nzLoading]="inOutLoading">
<thead>
<tr>
<th>状态</th>
<th>接口</th>
<th>进流量</th>
<th>出流量</th>
<th>状态变更时间</th>
<th nzWidth="150px">图表</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data">
<td>{{data.state}}</td>
<td>{{data.name}}</td>
<td>{{data.in}}</td>
<td>{{data.out}}</td>
<td>{{data.changeState}}</td>
<td>图表</td>
</tr>
</tbody>
</nz-table>
</div>
</section>
</nz-tab>
<nz-tab nzTitle="监测点列表">
<div nz-row>
<nz-table #basicTable [nzData]="dataSet" [nzFrontPagination]="false" [nzTotal]="totalNumInOut" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="changeInoutInfo($event)" [nzLoading]="inOutLoading">
<div class="padding-15-0">
<nz-radio-group [(ngModel)]="itemTypeValue" [nzButtonStyle]="'solid'">
<label *ngFor="let item of itemTypeList" (click)="changeType(item.applicationid)" nz-radio-button nzValue="{{item.applicationid}}">{{item.name}}</label>
</nz-radio-group>
</div>
<nz-table #checkTable [nzData]="checkList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageIndex" [nzPageSize]="pageSize" (nzPageIndexChange)="change($event)" [nzLoading]="loading">
<thead>
<tr>
<th>状态</th>
<th>接口</th>
<th>进流量</th>
<th>出流量</th>
<th>状态变更时间</th>
<th nzWidth="150px">图表</th>
<th nzWidth="250px">监测点名称</th>
<th >最新数据</th>
<th nzWidth="250px">最新数据时间</th>
<th>监测点分类</th>
<th>更新时间间隔</th>
<th>图表</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data">
<td>{{data.state}}</td>
<td>{{data.name}}</td>
<td>{{data.in}}</td>
<td>{{data.out}}</td>
<td>{{data.changeState}}</td>
<td>图表</td>
<tr *ngFor="let data of checkTable.data">
<td class="tag-form">
<nz-tag *ngIf="data.priority == 4 || data.priority == 5" [nzColor]="color.red"></nz-tag>
<nz-tag *ngIf="data.priority == 2 || data.priority == 3" [nzColor]="color.yellow"></nz-tag>
<nz-tag *ngIf="data.priority != 2 && data.priority != 3 && data.priority != 4 && data.priority != 5 && data.status == 0" [nzColor]="color.green"></nz-tag>
<nz-tag *ngIf="data.priority != 2 && data.priority != 3 && data.priority != 4 && data.priority != 5 && data.status == 1" [nzColor]="color.gray"></nz-tag>
{{data.name}}</td>
<td>{{data.lastvalue}}</td>
<td>{{data.lastclock}}</td>
<td>{{data.itemType}}</td>
<td>{{data.delay}}</td>
<td class="cursor">
<span (click)="showImageModal(data)">图表</span>
</td>
<td class="handle cursor">
<span (click)="showEditModal(data)">编辑</span>
<span (click)="deleteCheckItem(data)">删除</span>
<span *ngIf="data.status == 0 && data.state==0" (click)="updateItem(data.itemid,1)" style="color: red">停止</span>
<span *ngIf="data.status == 0 && data.state==1" (click)="updateItem(data.itemid,1)" style="color: red">不支持的</span>
<span *ngIf="data.status == 1 && data.state==0" (click)="updateItem(data.itemid,0)" style="color: green">启用</span>
<span *ngIf="data.status == 1 && data.state==1" (click)="updateItem(data.itemid,0)" style="color: green">启用</span>
</td>
</tr>
</tbody>
</nz-table>
</div>
</section>
</nz-tab>
<nz-tab nzTitle="监测点列表">
<div nz-row>
<div class="padding-15-0">
<nz-radio-group [(ngModel)]="itemTypeValue" [nzButtonStyle]="'solid'">
<label *ngFor="let item of itemTypeList" (click)="changeType(item.applicationid)" nz-radio-button nzValue="{{item.applicationid}}">{{item.name}}</label>
</nz-radio-group>
</div>
<nz-table #checkTable [nzData]="checkList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageIndex" [nzPageSize]="pageSize" (nzPageIndexChange)="change($event)" [nzLoading]="loading">
<thead>
<tr>
<th nzWidth="250px">监测点名称</th>
<th >最新数据</th>
<th nzWidth="250px">最新数据时间</th>
<th>监测点分类</th>
<th>更新时间间隔</th>
<th>图表</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of checkTable.data">
<td class="tag-form">
<nz-tag *ngIf="data.priority == 4 || data.priority == 5" [nzColor]="color.red"></nz-tag>
<nz-tag *ngIf="data.priority == 2 || data.priority == 3" [nzColor]="color.yellow"></nz-tag>
<nz-tag *ngIf="data.priority != 2 && data.priority != 3 && data.priority != 4 && data.priority != 5 && data.status == 0" [nzColor]="color.green"></nz-tag>
<nz-tag *ngIf="data.priority != 2 && data.priority != 3 && data.priority != 4 && data.priority != 5 && data.status == 1" [nzColor]="color.gray"></nz-tag>
{{data.name}}</td>
<td>{{data.lastvalue}}</td>
<td>{{data.lastclock}}</td>
<td>{{data.itemType}}</td>
<td>{{data.delay}}</td>
<td class="cursor">
<span (click)="showImageModal(data)">图表</span>
</td>
<td class="handle cursor">
<span (click)="showEditModal(data)">编辑</span>
<span (click)="deleteCheckItem(data)">删除</span>
<span *ngIf="data.status == 0 && data.state==0" (click)="updateItem(data.itemid,1)" style="color: red">停止</span>
<span *ngIf="data.status == 0 && data.state==1" (click)="updateItem(data.itemid,1)" style="color: red">不支持的</span>
<span *ngIf="data.status == 1 && data.state==0" (click)="updateItem(data.itemid,0)" style="color: green">启用</span>
<span *ngIf="data.status == 1 && data.state==1" (click)="updateItem(data.itemid,0)" style="color: green">启用</span>
</td>
</tr>
</tbody>
</nz-table>
</div>
</nz-tab>
<nz-tab #thirdTabs nzTitle="历史告警" >
<smart-warn-list #warnList></smart-warn-list>
</nz-tab>
</nz-tabset>
</nz-tab>
<nz-tab #thirdTabs nzTitle="历史告警" >
<smart-warn-list #warnList></smart-warn-list>
</nz-tab>
</nz-tabset>
</div>
</div>
</div>
</nz-spin>
<!--添加监测点-->
......
src/main/webapp/app/work/asset-part/assets-detail/assets-detail.component.html
View file @ 97bd3c9b
......@@ -24,232 +24,243 @@
</div>
</div>
<nz-tabset class="tabs-smart ">
<nz-tab #thirdTabs nzTitle="资产信息" >
<div nz-form class="ant-advanced-search-form form-select">
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="equipmentTypeid">资产编号
</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.inventoryNo}}
<button (click)="linkThen()" nz-button nzType="primary">关联</button>
</nz-form-control>
</nz-form-item>
</div>
<div class="tabset">
<div class="tabset-btn">
<button (click)="showEditModal()" nz-button nzType="default">编辑</button>
<button (click)="deleteModal()" nz-button nzType="default">删除</button>
</div>
<nz-tabset class="tabs-smart ">
<nz-tab #thirdTabs nzTitle="资产信息" >
<div nz-form class="ant-advanced-search-form form-select">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">负责人</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.person}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="equipmentTypeid">资产编号
</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.inventoryNo}}
<ng-container *ngIf="!inventoryExtend?.hostid">
<button nzSize="small" (click)="linkThen()" nz-button nzType="primary">关联</button>
</ng-container>
</nz-form-control>
</nz-form-item>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="equipmentTypeid">资产名称
</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.name}}
</nz-form-control>
</nz-form-item>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">负责人</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.person}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">负责人</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.person}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="equipmentTypeid">资产名称
</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.name}}
</nz-form-control>
</nz-form-item>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzFor="secondLevelType">资产数量
</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.inventorycount}}
</nz-form-control>
</nz-form-item>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">负责人</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.person}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" nzFor="invertoryname">品牌</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.invertoryname}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzFor="secondLevelType">资产数量
</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.inventorycount}}
</nz-form-control>
</nz-form-item>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >库存</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.stock}}
</nz-form-control>
</nz-form-item>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" nzFor="invertoryname">品牌</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.invertoryname}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" >型号</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.serialnoA}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >库存</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.stock}}
</nz-form-control>
</nz-form-item>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6">使用</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.usedcount}}
</nz-form-control>
</nz-form-item>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" >型号</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.serialnoA}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" >MAC地址</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.mac}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >借出</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.lendcount}}
</nz-form-control>
</nz-form-item>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6">使用</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.usedcount}}
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">维保到期</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.maintenanceExpiration}}
</nz-form-control>
</nz-form-item>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" >MAC地址</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.mac}}
</nz-form-control>
</nz-form-item>
</div>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >借出</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.lendcount}}
</nz-form-control>
</nz-form-item>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >维修</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.repaircount}}
</nz-form-control>
</nz-form-item>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">维保到期</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.maintenanceExpiration}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">存放地点</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.storageLocation}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >维修</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.repaircount}}
</nz-form-control>
</nz-form-item>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<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">-->
</nz-form-control>
</nz-form-item>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">存放地点</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.storageLocation}}
</nz-form-control>
</nz-form-item>
</div>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >父分类
</nz-form-label>
<nz-form-control [nzSpan]="14">
</nz-form-control>
</nz-form-item>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<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">-->
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >父分类
</nz-form-label>
<nz-form-control [nzSpan]="14">
</nz-form-control>
</nz-form-item>
</div>
</div>
<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-control [nzSpan]="14">
</nz-form-control>
</nz-form-item>
</div>
<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-control [nzSpan]="14">
</nz-form-control>
</nz-form-item>
</div>
</div>
</div>
</div>
</nz-tab>
<nz-tab #thirdTabs nzTitle="关联事件" >
<nz-table #nzTable [nzData]="thingList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)" [nzLoading]="loading">
<thead>
<tr>
<th nzShowSort>时间</th>
<th>事件编号</th>
<th>标题</th>
<th nzWidth="15%">事件来源</th>
<th>事件分类</th>
<th>处理人</th>
<th>状态</th>
<th style="text-align: center">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of thingList">
<td class="table-timeline">
<nz-timeline-item>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}}}</nz-timeline-item>
</td>
<td class="round-tag tag-form">
</nz-tab>
<nz-tab #thirdTabs nzTitle="关联事件" >
<nz-table #nzTable [nzData]="thingList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)" [nzLoading]="loading">
<thead>
<tr>
<th nzShowSort>时间</th>
<th>事件编号</th>
<th>标题</th>
<th nzWidth="15%">事件来源</th>
<th>事件分类</th>
<th>处理人</th>
<th>状态</th>
<th style="text-align: center">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of thingList">
<td class="table-timeline">
<nz-timeline-item>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}}}</nz-timeline-item>
</td>
<td class="round-tag tag-form">
{{data.id}}
</td>
<td>{{data.title}}</td>
<td>
<span *ngIf="data.source == 0">系统告警</span>
<span *ngIf="data.source == 1">手动新增</span>
</td>
<td>{{data.typeName}}</td>
<td>
{{data.operators[0]?.username}}
</td>
<td>
<ng-container *ngIf="data.status == 0">待处理</ng-container>
<ng-container *ngIf="data.status == 1">已结束</ng-container>
</td>
<td class="list-icon ">
<span class="cursor" *ngIf="data.status == 1" (click)="lookEvent(data)">查看</span>
</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
</nz-tabset>
</td>
<td>{{data.title}}</td>
<td>
<span *ngIf="data.source == 0">系统告警</span>
<span *ngIf="data.source == 1">手动新增</span>
</td>
<td>{{data.typeName}}</td>
<td>
{{data.operators[0]?.username}}
</td>
<td>
<ng-container *ngIf="data.status == 0">待处理</ng-container>
<ng-container *ngIf="data.status == 1">已结束</ng-container>
</td>
<td class="list-icon ">
<span class="cursor" *ngIf="data.status == 1" (click)="lookEvent(data)">查看</span>
</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
</nz-tabset>
</div>
<!--选择资源-->
<smart-select-group #smartSelectGroup (done)="setLink($event)"></smart-select-group>
<!--资产-->
<smart-assets #smartAssets (done)="getDetail()"></smart-assets>
\ No newline at end of file
src/main/webapp/app/work/asset-part/assets-detail/assets-detail.component.ts
View file @ 97bd3c9b
......@@ -4,6 +4,9 @@ import {WorkService} from '../../work.service';
import {pageSize} from '../../../app.constants';
import {NzMessageService} from 'ng-zorro-antd';
import {SelectGroupComponent} from '../../../modal/select-group/select-group.component';
import {CommonService} from '../../../shared/common/common.service';
import {Location} from '@angular/common';
import {AssetsComponent} from '../../modal/assets/assets.component';
@Component({
selector: 'smart-assets-detail',
......@@ -12,6 +15,7 @@ import {SelectGroupComponent} from '../../../modal/select-group/select-group.com
})
export class AssetsDetailComponent implements OnInit {
@ViewChild('smartSelectGroup') smartSelectGroup:SelectGroupComponent;
@ViewChild('smartAssets') smartAssets:AssetsComponent;
invertoryId;
inventoryExtend;
......@@ -21,8 +25,8 @@ export class AssetsDetailComponent implements OnInit {
pageCount = pageSize;
loading = false;
thingList;
constructor(private routerInfo:ActivatedRoute,private workSer:WorkService,
private message:NzMessageService,private router:Router) {
constructor(private routerInfo:ActivatedRoute,private workSer:WorkService,private commonSer:CommonService,
private message:NzMessageService,private router:Router,private localSer:Location) {
this.routerInfo.queryParams.subscribe(
(res)=>{
this.invertoryId = res.invertoryId;
......@@ -76,6 +80,30 @@ export class AssetsDetailComponent implements OnInit {
});
}
//删除
deleteModal(){
const data = {
inventoryIds: [this.invertoryId]
};
this.commonSer.confirmThing("删除","确定删除该资产？",()=>{
this.workSer.deleteInventory(data).subscribe(
(res)=>{
if(res.errCode == 10000){
this.localSer.back();
this.message.success("删除资产成功");
}else{
this.message.error(res.errMsg);
}
}
)
})
}
//编辑
showEditModal(){
this.smartAssets.showEditModal("编辑资产",this.invertoryId);
}
// 打开添加关联modal
linkThen(){
this.smartSelectGroup.showAddModal("选择资源");
......
src/main/webapp/app/work/asset-part/child-assets/child-assets.component.ts
View file @ 97bd3c9b
......@@ -130,7 +130,7 @@ export class ChildAssetsComponent implements OnInit {
//编辑资产
showEditModal(id){
this.smartAssets.showEditModal("编辑资产");
this.smartAssets.showEditModal("编辑资产",id);
}
//查看详情
......
src/main/webapp/app/work/modal/assets/assets.component.ts
View file @ 97bd3c9b
......@@ -2,6 +2,7 @@ import {Component, EventEmitter, OnInit, Output} from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {WorkService} from '../../work.service';
import {NzMessageService} from 'ng-zorro-antd';
import {DatePipe} from '@angular/common';
@Component({
selector: 'smart-assets',
......@@ -19,7 +20,9 @@ export class AssetsComponent implements OnInit {
parentTypeList;
typeList;
constructor(private workSer:WorkService,private fb:FormBuilder,
invertoryId //资产Id
constructor(private workSer:WorkService,private fb:FormBuilder,private datePipe:DatePipe,
private message:NzMessageService) {
}
......@@ -48,7 +51,6 @@ export class AssetsComponent implements OnInit {
storageLocation:[null],
groupid:[null],
inventoryTypeid:[null,[Validators.required]],
});
}
......@@ -77,10 +79,16 @@ export class AssetsComponent implements OnInit {
this.getParentType();
}
showEditModal(title) {
showEditModal(title,id) {
this.title = title;
this.invertoryId = id;
this.isVisible = true;
this.getParentType();
this.workSer.selectByPrimaryKey(this.invertoryId).subscribe(
(res)=>{
this.validateForm.patchValue( res.data );
}
)
}
handEditleOk() {
......@@ -114,7 +122,19 @@ export class AssetsComponent implements OnInit {
}
update(){
this.validateForm.value.id = this.invertoryId;
this.validateForm.value.maintenanceExpiration = this.datePipe.transform(this.validateForm.value.maintenanceExpiration,"yyyy-MM-dd HH:mm:ss");
this.workSer.updateInventory(this.validateForm.value).subscribe(
(res)=>{
if(res.errCode == 10000){
this.message.success("编辑资产成功");
this.isVisible = false;
this.done.emit();
}else{
this.message.error(res.errMsg);
}
}
)
}
handleEditCancel() {
......
src/main/webapp/app/work/work-handle/handle-event/handle-event.component.html
View file @ 97bd3c9b
......@@ -12,7 +12,7 @@
事件处置
</nz-breadcrumb-item>
<nz-breadcrumb-item>
事件编号：123456
事件编号：{{event?.id}}
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
......@@ -27,14 +27,15 @@
<div nz-row>
<div nz-col nzSpan="4">事件编号</div>
<div nz-col nzSpan="1"></div>
<div nz-col nzSpan="7"></div>
<div nz-col nzSpan="7">{{event?.id}}</div>
<div nz-col nzSpan="4">提交时间</div>
<div nz-col nzSpan="7">{{event?.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</div>
</div>
<div nz-row>
<div nz-col nzSpan="4">请求人</div>
<div nz-col nzSpan="1"></div>
<div nz-col nzSpan="4">{{event?.requester}}</div>
<div nz-col nzSpan="7">{{event?.requester}}</div>
<div nz-col nzSpan="4"></div>
<div nz-col nzSpan="7">{{event?.requesterPhone}}</div>
</div>
<div nz-row>
......@@ -53,7 +54,7 @@
<div nz-row>
<div nz-col nzSpan="4">附件</div>
<div nz-col nzSpan="1"></div>
<div nz-col nzSpan="7">{{event?.file}}</div>
<div nz-col nzSpan="7">{{event?.fileName}}</div>
</div>
<h2>流转记录</h2>
......
src/main/webapp/app/work/work.service.ts
View file @ 97bd3c9b
......@@ -124,6 +124,11 @@ export class WorkService {
return this.http.post(SERVER_API_URL + '/inventory/createInventory' ,data);
}
//修改资产
updateInventory(data): Observable<any>{
return this.http.post(SERVER_API_URL + '/inventory/updateInventory' ,data);
}
//根据资产类型id查询资产
findInventory(params): Observable<any>{
return this.http.get(SERVER_API_URL + '/inventory/findInventory/' +params);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment