Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
smart
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqinghua
smart
Commits
356b72ff
Commit
356b72ff
authored
Mar 19, 2020
by
wangqinghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug 修复
parent
530a943b
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
534 additions
and
447 deletions
+534
-447
alarm-list.component.html
...ain/webapp/app/alarm/alarm-list/alarm-list.component.html
+1
-1
operation-work.component.html
...app/analysis/operation-work/operation-work.component.html
+14
-12
sys-change-count.component.ts
...p/analysis/sys-change-count/sys-change-count.component.ts
+3
-1
home.component.html
src/main/webapp/app/home/home.component.html
+0
-1
website.component.html
src/main/webapp/app/modal/website/website.component.html
+302
-289
flow-trend.component.html
...bapp/app/netTopology/flow-trend/flow-trend.component.html
+2
-3
link-inventory.component.html
...p/work/modal/link-inventory/link-inventory.component.html
+40
-37
link-inventory.component.ts
...app/work/modal/link-inventory/link-inventory.component.ts
+15
-12
look-plan.component.ts
...in/webapp/app/work/modal/look-plan/look-plan.component.ts
+1
-1
plan-modal.component.ts
.../webapp/app/work/modal/plan-modal/plan-modal.component.ts
+2
-2
handle-detail.component.html
...rk/work-handle/handle-detail/handle-detail.component.html
+54
-23
handle-detail.component.ts
...work/work-handle/handle-detail/handle-detail.component.ts
+3
-12
handle-event.component.html
...work/work-handle/handle-event/handle-event.component.html
+57
-23
handle-event.component.ts
...p/work/work-handle/handle-event/handle-event.component.ts
+5
-13
global.css
src/main/webapp/content/css/global.css
+35
-17
No files found.
src/main/webapp/app/alarm/alarm-list/alarm-list.component.html
View file @
356b72ff
...
...
@@ -17,7 +17,7 @@
<smart-full-screen></smart-full-screen>
</div>
</div>
<div
nz-row
[
nzGutter
]="
4
"
class=
"search-form"
>
<div
nz-row
class=
"search-form"
>
<div
nz-col
nzSpan=
"3"
>
<nz-select
style=
"width: 100%;"
nzShowSearch
nzAllowClear
nzPlaceHolder=
"选择级别"
[(
ngModel
)]="
obj
.
priorityName
"
>
<nz-option
nzLabel=
"告警"
nzValue=
"告警"
></nz-option>
...
...
src/main/webapp/app/analysis/operation-work/operation-work.component.html
View file @
356b72ff
...
...
@@ -27,17 +27,19 @@
</nz-select>
</div>
</div>
<!--解决状态-->
<ng-container
*
ngIf=
"type == '1'"
>
<smart-analysis-status
#
smartAnalysisstatus
></smart-analysis-status>
</ng-container>
<div
class=
"padding-top-10 padding-bottom-10"
>
<!--解决状态-->
<ng-container
*
ngIf=
"type == '1'"
>
<smart-analysis-status
#
smartAnalysisstatus
></smart-analysis-status>
</ng-container>
<!--事件分类统计-->
<ng-container
*
ngIf=
"type == '2'"
>
<smart-analysis-event
#
smartAnalysisEvent
></smart-analysis-event>
</ng-container>
<!--事件分类统计-->
<ng-container
*
ngIf=
"type == '2'"
>
<smart-analysis-event
#
smartAnalysisEvent
></smart-analysis-event>
</ng-container>
<!--处理人统计-->
<ng-container
*
ngIf=
"type == '3'"
>
<smart-analysis-deal
#
smartAnalysisDeal
></smart-analysis-deal>
</ng-container>
<!--处理人统计-->
<ng-container
*
ngIf=
"type == '3'"
>
<smart-analysis-deal
#
smartAnalysisDeal
></smart-analysis-deal>
</ng-container>
</div>
src/main/webapp/app/analysis/sys-change-count/sys-change-count.component.ts
View file @
356b72ff
...
...
@@ -201,7 +201,7 @@ export class SysChangeCountComponent implements OnInit {
//时间改变
changeType
()
{
if
(
this
.
timeType
==
'99'
)
return
;
if
(
this
.
timeType
==
'99'
)
return
;
this
.
obj
.
startTime
=
this
.
commonSer
.
getTimeByType
(
this
.
timeType
).
startTime
;
this
.
obj
.
endTime
=
this
.
commonSer
.
getTimeByType
(
this
.
timeType
).
endTime
;
}
...
...
@@ -222,6 +222,8 @@ export class SysChangeCountComponent implements OnInit {
this
.
isDownload
=
true
;
//下载文件
const
d
=
{
startTime
:
this
.
obj
.
startTime
,
endTime
:
this
.
obj
.
endTime
,
format
:
'excel'
};
this
.
systemChangeSer
.
sysChangeExport
(
d
).
subscribe
(
...
...
src/main/webapp/app/home/home.component.html
View file @
356b72ff
...
...
@@ -8,7 +8,6 @@
</nz-breadcrumb>
</div>
<div
nz-col
nzSpan=
"8"
class=
"text-right"
>
<button
nzType=
"primary"
(
click
)="
returnBack
()"
nz-button
>
返回上一页
</button>
<button
(
click
)="
ngOnInit
()"
nz-button
nzType=
"primary"
><i
class=
"anticon anticon-sync"
></i></button>
<smart-full-screen></smart-full-screen>
</div>
...
...
src/main/webapp/app/modal/website/website.component.html
View file @
356b72ff
<nz-modal
[
nzMaskClosable
]="
false
"
[
nzWidth
]="
1080
"
[(
nzVisible
)]="
isVisible
"
nzTitle=
"{{title}}"
(
nzOnCancel
)="
handleCancel
()"
(
nzOnOk
)="
handleOk
()"
[
nzOkLoading
]="
isOkLoading
"
>
<nz-tabset
[
nzType
]="'
card
'"
[
nzSelectedIndex
]="
tabNum
"
(
nzSelectedIndexChange
)="
tabsChange
($
event
)"
style=
"padding-bottom: 25px;min-height: 500px"
>
<nz-modal
[
nzMaskClosable
]="
false
"
[
nzWidth
]="
780
"
[(
nzVisible
)]="
isVisible
"
nzTitle=
"{{title}}"
(
nzOnCancel
)="
handleCancel
()"
(
nzOnOk
)="
handleOk
()"
[
nzOkLoading
]="
isOkLoading
"
>
<nz-tabset
[
nzType
]="'
card
'"
[
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"
>
<nz-collapse>
<nz-collapse-panel
nzHeader=
"基本属性"
[
nzActive
]="
false
"
>
<div
nz-row
[
nzGutter
]="
24
"
>
<div
nz-col
[
nzSpan
]="
12
"
>
<nz-form-item
nzFlex
>
<nz-form-label
[
nzSpan
]="
6
"
nzRequired
nzFor=
"webName"
>
网站名称
</nz-form-label>
<nz-form-control
[
nzSpan
]="
14
"
>
<input
id=
"webName"
maxlength=
"20"
name=
"webName"
nz-input
placeholder=
"网站名称"
[(
ngModel
)]="
validateForm
.
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
[
nzSpan
]="
6
"
nzRequired
nzFor=
"webName"
>
网站名称
</nz-form-label>
<nz-form-control
[
nzSpan
]="
14
"
>
<input
id=
"webName"
maxlength=
"20"
name=
"webName"
nz-input
placeholder=
"网站名称"
[(
ngModel
)]="
validateForm
.
name
"
>
</nz-form-control>
</nz-form-item>
</div>
<div
nz-col
[
nzSpan
]="
12
"
>
<nz-form-item
nzFlex
>
<nz-form-label
[
nzOffset
]="
4
"
[
nzSpan
]="
6
"
nzRequired
nzFor=
"delay"
>
更新间隔(s)
</nz-form-label>
<nz-form-control
[
nzSpan
]="
14
"
>
<input
id=
"delay"
name=
"delay"
type=
"number"
nz-input
placeholder=
"更新间隔(s)"
[(
ngModel
)]="
validateForm
.
delay
"
>
</nz-form-control>
</nz-form-item>
</div>
</div>
<div
nz-col
[
nzSpan
]="
12
"
>
<nz-form-item
nzFlex
>
<nz-form-label
[
nzOffset
]="
4
"
[
nzSpan
]="
6
"
nzRequired
nzFor=
"delay"
>
更新间隔(s)
</nz-form-label>
<nz-form-control
[
nzSpan
]="
14
"
>
<input
id=
"delay"
name=
"delay"
maxlength=
"10"
type=
"number"
nz-input
placeholder=
"更新间隔(s)"
[(
ngModel
)]="
validateForm
.
delay
"
>
</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
[
nzSpan
]="
6
"
nzFor=
"retries"
>
尝试次数
</nz-form-label>
<nz-form-control
[
nzSpan
]="
14
"
>
<input
id=
"retries"
name=
"retries"
nz-input
placeholder=
"尝试次数"
[(
ngModel
)]="
validateForm
.
retries
"
>
</nz-form-control>
</nz-form-item>
</div>
<div
nz-row
[
nzGutter
]="
24
"
>
<div
nz-col
[
nzSpan
]="
12
"
>
<nz-form-item
nzFlex
>
<nz-form-label
[
nzSpan
]="
6
"
nzFor=
"retries"
>
尝试次数
</nz-form-label>
<nz-form-control
[
nzSpan
]="
14
"
>
<input
id=
"retries"
maxlength=
"10"
name=
"retries"
nz-input
placeholder=
"尝试次数"
[(
ngModel
)]="
validateForm
.
retries
"
>
</nz-form-control>
</nz-form-item>
</div>
</div>
</div>
<div
nz-row
[
nzGutter
]="
24
"
>
<div
nz-col
[
nzSpan
]="
24
"
>
<nz-form-item
nzFlex
>
<nz-form-label
[
nzSpan
]="
3
"
nzFor=
"http_proxy"
>
Http代理
</nz-form-label>
<nz-form-control
[
nzSpan
]="
18
"
>
<input
id=
"http_proxy"
maxlength=
"40"
name=
"http_proxy"
nz-input
placeholder=
"默认"
[(
ngModel
)]="
validateForm
.
http_proxy
"
>
</nz-form-control>
</nz-form-item>
</div>
</div>
</nz-collapse-panel>
<div
nz-row
[
nzGutter
]="
24
"
>
<div
nz-col
[
nzSpan
]="
24
"
>
<nz-form-item
nzFlex
>
<nz-form-label
[
nzSpan
]="
3
"
nzFor=
"http_proxy"
>
Http代理
</nz-form-label>
<nz-form-control
[
nzSpan
]="
18
"
>
<input
id=
"http_proxy"
maxlength=
"40"
name=
"http_proxy"
nz-input
placeholder=
"默认"
[(
ngModel
)]="
validateForm
.
http_proxy
"
>
</nz-form-control>
</nz-form-item>
</div>
</div>
<nz-collapse-panel
nzHeader=
"高级属性"
[
nzActive
]="
false
"
>
<div
nz-row
[
nzGutter
]="
24
"
>
<div
nz-col
[
nzSpan
]="
2
"
>
变量
</div
>
<div
nz-col
[
nzSpan
]="
10
"
>
<nz-form-item
nzFlex
>
<nz-form-control
[
nzSpan
]="
14
"
>
<input
name=
"ipmi_username"
nz-input
placeholder=
"默认"
>
</nz-form-control
>
</nz-form-item
>
</div
>
<div
nz-col
[
nzSpan
]="
1
"
>
>=
</div
>
<div
nz-col
[
nzSpan
]="
10
"
>
<nz-form-item
nzFlex
>
<nz-form-control
[
nzSpan
]="
14
"
>
<input
name=
"ipmi_username"
nz-input
placeholder=
"默认"
>
</nz-form-control
>
</nz-form-item
>
</div
>
<div
nz-col
[
nzSpan
]="
1
"
>
X
</div
>
</div
>
<!-- <nz-collapse-panel nzHeader="高级属性" [nzActive]="false">--
>
<!-- <div nz-row [nzGutter]="24">--
>
<!-- <div nz-col [nzSpan]="2">--
>
<!-- 变量-->
<!-- </div>--
>
<!-- <div nz-col [nzSpan]="10">--
>
<!-- <nz-form-item nzFlex>--
>
<!-- <nz-form-control [nzSpan]="14">--
>
<!-- <input name="ipmi_username" maxlength="10" nz-input placeholder="默认">--
>
<!-- </nz-form-control>--
>
<!-- </nz-form-item>--
>
<!-- </div>--
>
<!-- <div nz-col [nzSpan]="1">--
>
<!-- >=-->
<!-- </div>--
>
<!-- <div nz-col [nzSpan]="10">--
>
<!-- <nz-form-item nzFlex>--
>
<!-- <nz-form-control [nzSpan]="14">--
>
<!-- <input name="ipmi_username" maxlength="10" nz-input placeholder="默认">--
>
<!-- </nz-form-control>--
>
<!-- </nz-form-item>--
>
<!-- </div>--
>
<!-- <div nz-col [nzSpan]="1">--
>
<!-- X-->
<!-- </div>--
>
<!-- </div>--
>
<div
nz-row
[
nzGutter
]="
24
"
>
<div
nz-col
[
nzSpan
]="
2
"
>
头部
</div>
<div
nz-col
[
nzSpan
]="
10
"
>
<nz-form-item
nzFlex
>
<nz-form-control
[
nzSpan
]="
14
"
>
<input
name=
"ipmi_username"
nz-input
placeholder=
"默认"
>
</nz-form-control>
</nz-form-item>
</div>
<div
nz-col
[
nzSpan
]="
1
"
>
>=
</div>
<div
nz-col
[
nzSpan
]="
10
"
>
<nz-form-item
nzFlex
>
<nz-form-control
[
nzSpan
]="
14
"
>
<input
name=
"ipmi_username"
nz-input
placeholder=
"默认"
>
</nz-form-control>
</nz-form-item>
</div>
<div
nz-col
[
nzSpan
]="
1
"
>
X
</div>
</div>
</nz-collapse-panel>
</nz-collapse>
<!-- <div nz-row [nzGutter]="24">-->
<!-- <div nz-col [nzSpan]="2">-->
<!-- 头部-->
<!-- </div>-->
<!-- <div nz-col [nzSpan]="10">-->
<!-- <nz-form-item nzFlex>-->
<!-- <nz-form-control [nzSpan]="14">-->
<!-- <input name="ipmi_username" maxlength="10" nz-input placeholder="默认">-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<!-- <div nz-col [nzSpan]="1">-->
<!-- >=-->
<!-- </div>-->
<!-- <div nz-col [nzSpan]="10">-->
<!-- <nz-form-item nzFlex>-->
<!-- <nz-form-control [nzSpan]="14">-->
<!-- <input name="ipmi_username" maxlength="10" nz-input placeholder="默认">-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<!-- <div nz-col [nzSpan]="1">-->
<!-- X-->
<!-- </div>-->
<!-- </div>-->
<!-- </nz-collapse-panel>-->
</form>
...
...
@@ -111,210 +113,221 @@
</nz-tab>
<nz-tab
nzTitle=
"2.步骤"
>
<button
class=
"margin-left-5"
(
click
)="
addStep
()"
nz-button
nzType=
"default"
>
添加步骤
</button>
<div
style=
"padding: 10px;"
>
<div
nz-row
[
nzGutter
]="
24
"
>
<div
nz-col
[
nzSpan
]="
1
"
class=
"text-center"
>
No
</div>
<div
nz-col
[
nzSpan
]="
4
"
>
<span
class=
"color-red"
>
*
</span>
步骤名称
</div>
<div
nz-col
[
nzSpan
]="
2
"
>
<span
class=
"color-red"
>
*
</span>
超时
</div>
<div
nz-col
[
nzSpan
]="
5
"
>
<span
class=
"color-red"
>
*
</span>
URL
</div>
<div
nz-col
[
nzSpan
]="
3
"
>
要求字串
</div>
<div
nz-col
[
nzSpan
]="
3
"
>
要求状态码
</div>
<div
nz-col
[
nzSpan
]="
3
"
>
<span
class=
"color-red"
>
*
</span>
跟随跳转
</div>
<div
nz-col
[
nzSpan
]="
1
"
></div>
<div
nz-col
[
nzSpan
]="
2
"
></div>
<button
class=
"margin-left-5"
(
click
)="
addStep
()"
nz-button
nzType=
"default"
>
添加步骤
</button>
<div
style=
"padding: 10px;"
>
<div
nz-row
[
nzGutter
]="
24
"
>
<div
nz-col
[
nzSpan
]="
1
"
class=
"text-center"
>
No
</div>
<div
nz-col
[
nzSpan
]="
4
"
>
<span
class=
"color-red"
>
*
</span>
步骤名称
</div>
<div
nz-col
[
nzSpan
]="
2
"
>
<span
class=
"color-red"
>
*
</span>
超时
</div>
<div
nz-col
[
nzSpan
]="
5
"
>
<span
class=
"color-red"
>
*
</span>
URL
</div>
<div
nz-col
[
nzSpan
]="
3
"
>
要求字串
</div>
<div
nz-col
[
nzSpan
]="
3
"
>
要求状态码
</div>
<div
nz-col
[
nzSpan
]="
3
"
>
<span
class=
"color-red"
>
*
</span>
跟随跳转
</div>
<div
nz-col
[
nzSpan
]="
1
"
></div>
<div
nz-col
[
nzSpan
]="
2
"
></div>
</div>
<ng-container
*
ngFor=
"let item of steps;let i = index;"
>
<div
nz-row
[
nzGutter
]="
12
"
>
<div
nz-col
[
nzSpan
]="
1
"
class=
"text-center middle"
>
{{i + 1}}
</div>
<nz-form-control
nz-col
[
nzSpan
]="
4
"
>
<input
nz-input
placeholder=
"名称"
maxlength=
"10"
[(
ngModel
)]="
item
.
name
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
2
"
>
<input
nz-input
placeholder=
"15"
maxlength=
"10"
[(
ngModel
)]="
item
.
timeout
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<input
nz-input
placeholder=
""
maxlength=
"30"
[(
ngModel
)]="
item
.
url
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
3
"
>
<input
nz-input
placeholder=
""
maxlength=
"5"
[(
ngModel
)]="
item
.
posts
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
3
"
>
<input
nz-input
placeholder=
"200"
maxlength=
"10"
[(
ngModel
)]="
item
.
status_codes
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
3
"
>
<nz-select
style=
"width: 100%"
name=
"equipmentType"
nzPlaceHolder=
"是否跟随跳转"
[(
ngModel
)]="
item
.
follow_redirects
"
>
<nz-option
nzValue=
"1"
nzLabel=
"是"
></nz-option>
<nz-option
nzValue=
"0"
nzLabel=
"否"
></nz-option>
</nz-select>
</nz-form-control>
<div
nz-col
[
nzSpan
]="
1
"
class=
"middle"
>
<span
(
click
)="
deleteStep
(
i
)"
class=
"cursor main-color"
>
X
</span>
</div>
<ng-container
*
ngFor=
"let item of steps;let i = index;"
>
<div
nz-row
[
nzGutter
]="
12
"
>
<div
nz-col
[
nzSpan
]="
1
"
class=
"text-center middle"
>
{{i +1}}
<div
nz-col
[
nzSpan
]="
2
"
(
click
)="
showCon
(
i
)"
class=
"middle main-color cursor"
>
阈值
</div>
</div>
<div
class=
"trigger-class"
*
ngIf=
"item.show"
>
<nz-form-item
class=
"form-select"
>
<nz-form-control
class=
"form-select"
>
<div
nz-row
[
nzGutter
]="
12
"
>
<nz-form-control
nz-col
[
nzPush
]="
1
"
[
nzSpan
]="
6
"
>
<button
nz-button
nzType=
"primary"
nzSize=
"small"
(
click
)="
addcondition
(
i
)"
>
添加条件
</button>
<span>
危险阈值
</span>
</nz-form-control>
</div>
<nz-form-control
nz-col
[
nzSpan
]="
4
"
>
<input
nz-input
placeholder=
"名称"
[(
ngModel
)]="
item
.
name
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
2
"
>
<input
nz-input
placeholder=
"15"
[(
ngModel
)]="
item
.
timeout
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<input
nz-input
placeholder=
""
[(
ngModel
)]="
item
.
url
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
3
"
>
<input
nz-input
placeholder=
""
[(
ngModel
)]="
item
.
posts
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
3
"
>
<input
nz-input
placeholder=
"200"
[(
ngModel
)]="
item
.
status_codes
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
3
"
>
<nz-select
style=
"width: 100%"
name=
"equipmentType"
nzPlaceHolder=
"是否跟随跳转"
[(
ngModel
)]="
item
.
follow_redirects
"
>
<nz-option
nzValue=
"1"
nzLabel=
"是"
></nz-option>
<nz-option
nzValue=
"0"
nzLabel=
"否"
></nz-option>
</nz-select>
</nz-form-control>
<div
nz-col
[
nzSpan
]="
1
"
class=
"middle"
>
<span
(
click
)="
deleteStep
(
i
)"
class=
"cursor main-color"
>
X
</span>
<div
nz-row
[
nzGutter
]="
12
"
*
ngFor=
"let fault of item.conditionList;let i1 = index;"
>
<nz-form-control
nz-col
[
nzSpan
]="
1
"
></nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<nz-select
name=
"interfaces_main"
nzPlaceHolder=
"选择接口类型"
[(
ngModel
)]="
fault
.
and
"
*
ngIf=
"i1 > 0"
>
<nz-option
nzValue=
" and "
nzLabel=
"并且"
></nz-option>
<nz-option
nzValue=
" or "
nzLabel=
"或"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
4
"
>
<nz-select
name=
"interfaces_main"
[(
ngModel
)]="
fault
.
time
"
>
<nz-option
nzValue=
"0"
nzLabel=
"响应时间"
></nz-option>
<nz-option
nzValue=
"1"
nzLabel=
"响应代码"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<nz-select
name=
"interfaces_main"
nzPlaceHolder=
"选择接口类型"
[(
ngModel
)]="
fault
.
equal
"
>
<nz-option
nzValue=
"="
nzLabel=
"="
></nz-option>
<nz-option
nzValue=
">"
nzLabel=
">"
></nz-option>
<nz-option
nzValue=
"<"
nzLabel=
"<"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<input
type=
"text"
nz-input
name=
"value"
[(
ngModel
)]="
fault
.
value
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
2
"
>
<button
nz-button
nzType=
"primary"
(
click
)="
deleteCondition
(
i
,
i1
)"
><i
style=
"color: #fff"
class=
"anticon anticon-close-circle-o"
></i></button>
</nz-form-control>
</div>
<div
nz-col
[
nzSpan
]="
2
"
(
click
)="
showCon
(
i
)"
class=
"middle main-color cursor"
>
阈值
</div>
</div>
<div
class=
"trigger-class"
*
ngIf=
"item.show"
>
<nz-form-item
class=
"form-select"
>
<nz-form-control
class=
"form-select"
>
<div
nz-row
[
nzGutter
]="
12
"
>
<nz-form-control
nz-col
[
nzPush
]="
1
"
[
nzSpan
]="
6
"
>
<button
nz-button
nzType=
"primary"
nzSize=
"small"
(
click
)="
addcondition
(
i
)"
>
添加条件
</button>
<span>
危险阈值
</span>
</nz-form-control>
</div>
<div
nz-row
[
nzGutter
]="
12
"
*
ngFor=
"let fault of item.conditionList;let i1 = index;"
>
<nz-form-control
nz-col
[
nzSpan
]="
1
"
></nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<nz-select
name=
"interfaces_main"
nzPlaceHolder=
"选择接口类型"
[(
ngModel
)]="
fault
.
and
"
*
ngIf=
"i1 > 0"
>
<nz-option
nzValue=
" and "
nzLabel=
"并且"
></nz-option>
<nz-option
nzValue=
" or "
nzLabel=
"或"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
4
"
>
<nz-select
name=
"interfaces_main"
[(
ngModel
)]="
fault
.
time
"
>
<nz-option
nzValue=
"0"
nzLabel=
"响应时间"
></nz-option>
<nz-option
nzValue=
"1"
nzLabel=
"响应代码"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<nz-select
name=
"interfaces_main"
nzPlaceHolder=
"选择接口类型"
[(
ngModel
)]="
fault
.
equal
"
>
<nz-option
nzValue=
"="
nzLabel=
"="
></nz-option>
<nz-option
nzValue=
">"
nzLabel=
">"
></nz-option>
<nz-option
nzValue=
"<"
nzLabel=
"<"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<input
type=
"text"
nz-input
name=
"value"
[(
ngModel
)]="
fault
.
value
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
2
"
>
<button
nz-button
nzType=
"primary"
(
click
)="
deleteCondition
(
i
,
i1
)"
><i
style=
"color: #fff"
class=
"anticon anticon-close-circle-o"
></i></button>
</nz-form-control>
</div>
</nz-form-control>
</nz-form-item>
<nz-form-item
class=
"form-select"
>
<nz-form-control
class=
"form-select"
>
<div
nz-row
[
nzGutter
]="
12
"
>
<nz-form-control
nz-col
[
nzPush
]="
1
"
[
nzSpan
]="
6
"
>
<button
nz-button
nzType=
"primary"
nzSize=
"small"
(
click
)="
addFault
(
i
)"
>
添加条件
</button>
<span>
故障阈值
</span>
</nz-form-control>
</nz-form-item>
<nz-form-item
class=
"form-select"
>
<nz-form-control
class=
"form-select"
>
<div
nz-row
[
nzGutter
]="
12
"
>
<nz-form-control
nz-col
[
nzPush
]="
1
"
[
nzSpan
]="
6
"
>
<button
nz-button
nzType=
"primary"
nzSize=
"small"
(
click
)="
addFault
(
i
)"
>
添加条件
</button>
<span>
故障阈值
</span>
</nz-form-control>
</div>
<div
nz-row
[
nzGutter
]="
12
"
*
ngFor=
"let fault of item.faultConditionList;let i2 = index;"
>
<nz-form-control
nz-col
[
nzSpan
]="
1
"
></nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<nz-select
name=
"interfaces_main"
[(
ngModel
)]="
fault
.
and
"
*
ngIf=
"i2 > 0"
>
<nz-option
nzValue=
" and "
nzLabel=
"并且"
></nz-option>
<nz-option
nzValue=
" or "
nzLabel=
"或"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
4
"
>
<nz-select
name=
"interfaces_main"
[(
ngModel
)]="
fault
.
time
"
>
<nz-option
nzValue=
"0"
nzLabel=
"响应时间"
></nz-option>
<nz-option
nzValue=
"1"
nzLabel=
"响应代码"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<nz-select
name=
"interfaces_main"
nzPlaceHolder=
"选择接口类型"
[(
ngModel
)]="
fault
.
equal
"
>
<nz-option
nzValue=
"="
nzLabel=
"="
></nz-option>
<nz-option
nzValue=
">"
nzLabel=
">"
></nz-option>
<nz-option
nzValue=
"<"
nzLabel=
"<"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<input
type=
"text"
nz-input
name=
"value"
[(
ngModel
)]="
fault
.
value
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
2
"
>
<button
nz-button
nzType=
"primary"
(
click
)="
deleteFault
(
i
,
i2
)"
><i
style=
"color: #fff"
class=
"anticon anticon-close-circle-o"
></i></button>
</nz-form-control>
</div>
</div>
<div
nz-row
[
nzGutter
]="
12
"
*
ngFor=
"let fault of item.faultConditionList;let i2 = index;"
>
<nz-form-control
nz-col
[
nzSpan
]="
1
"
></nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<nz-select
name=
"interfaces_main"
[(
ngModel
)]="
fault
.
and
"
*
ngIf=
"i2 > 0"
>
<nz-option
nzValue=
" and "
nzLabel=
"并且"
></nz-option>
<nz-option
nzValue=
" or "
nzLabel=
"或"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
4
"
>
<nz-select
name=
"interfaces_main"
[(
ngModel
)]="
fault
.
time
"
>
<nz-option
nzValue=
"0"
nzLabel=
"响应时间"
></nz-option>
<nz-option
nzValue=
"1"
nzLabel=
"响应代码"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<nz-select
name=
"interfaces_main"
nzPlaceHolder=
"选择接口类型"
[(
ngModel
)]="
fault
.
equal
"
>
<nz-option
nzValue=
"="
nzLabel=
"="
></nz-option>
<nz-option
nzValue=
">"
nzLabel=
">"
></nz-option>
<nz-option
nzValue=
"<"
nzLabel=
"<"
></nz-option>
</nz-select>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
5
"
>
<input
type=
"text"
maxlength=
"10"
nz-input
name=
"value"
[(
ngModel
)]="
fault
.
value
"
>
</nz-form-control>
<nz-form-control
nz-col
[
nzSpan
]="
2
"
>
<button
nz-button
nzType=
"primary"
(
click
)="
deleteFault
(
i
,
i2
)"
><i
style=
"color: #fff"
class=
"anticon anticon-close-circle-o"
></i></button>
</nz-form-control>
</nz-form-item>
<div
class=
"modal-footer-btn"
>
<button
nz-button
(
click
)="
closeCon
(
i
,
true
)"
nzType=
"primary"
>
保存
</button>
</div>
</div>
</ng-container>
</nz-form-control>
</nz-form-item>
<div
class=
"modal-footer-btn"
>
<button
nz-button
(
click
)="
closeCon
(
i
,
true
)"
nzType=
"primary"
>
保存
</button>
</div>
</div>
</ng-container>
</div>
</nz-tab>
<!-- <nz-tab nzTitle="3.认证">-->
<!-- <form nz-form class="ant-advanced-search-form">-->
<!-- <div nz-row [nzGutter]="24">-->
<!-- <div nz-col [nzSpan]="12">-->
<!-- <nz-form-item nzFlex>-->
<!-- <nz-form-label [nzSpan]="6" nzFor="applicationid">Http认证</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="14">-->
<!-- <nz-select id="applicationid" name="applicationid" nzPlaceHolder="选择设备类型" [(ngModel)]="validateForm.applicationid">-->
<!-- <nz-option nzValue="是" nzLabel="是"></nz-option>-->
<!-- </nz-select>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<!-- <nz-tab nzTitle="3.认证">-->
<!-- <form nz-form class="ant-advanced-search-form">-->
<!-- <div nz-row [nzGutter]="24">-->
<!-- <div nz-col [nzSpan]="12">-->
<!-- <nz-form-item nzFlex>-->
<!-- <nz-form-label [nzSpan]="6" nzFor="applicationid">Http认证</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="14">-->
<!-- <nz-select id="applicationid" name="applicationid" nzPlaceHolder="选择设备类型" [(ngModel)]="validateForm.applicationid">-->
<!-- <nz-option nzValue="是" nzLabel="是"></nz-option>-->
<!-- </nz-select>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<!-- <div nz-col [nzSpan]="6">-->
<!-- <label nz-checkbox>-->
<!-- <span>SSL验证对端</span>-->
<!-- </label>-->
<!-- </div>-->
<!-- <div nz-col [nzSpan]="6">-->
<!-- <label nz-checkbox>-->
<!-- <span>SSL验证对端</span>-->
<!-- </label>-->
<!-- </div>-->
<!-- <div nz-col [nzSpan]="6">-->
<!-- <label nz-checkbox>-->
<!-- <span>SSL验证主机</span>-->
<!-- </label>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div nz-row [nzGutter]="24">-->
<!-- <div nz-col [nzSpan]="12">-->
<!-- <nz-form-item nzFlex>-->
<!-- <nz-form-label [nzSpan]="6" nzFor="ssl_cert_file">SSL证书文件</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="14">-->
<!-- <input id="ssl_cert_file" name="ssl_cert_file" nz-input placeholder="默认"-->
<!-- [(ngModel)]="validateForm.ssl_cert_file">-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<!-- <div nz-col [nzSpan]="6">-->
<!-- <label nz-checkbox>-->
<!-- <span>SSL验证主机</span>-->
<!-- </label>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div nz-row [nzGutter]="24">-->
<!-- <div nz-col [nzSpan]="12">-->
<!-- <nz-form-item nzFlex>-->
<!-- <nz-form-label [nzSpan]="6" nzFor="ssl_cert_file">SSL证书文件</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="14">-->
<!-- <input id="ssl_cert_file" name="ssl_cert_file" nz-input placeholder="默认"-->
<!-- [(ngModel)]="validateForm.ssl_cert_file">-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<!-- <div nz-col [nzSpan]="12">-->
<!-- <nz-form-item nzFlex>-->
<!-- <nz-form-label [nzOffset]="4" [nzSpan]="6" nzFor="ssl_key_file">SSL秘钥文件-->
<!-- </nz-form-label>-->
<!-- <nz-form-control [nzSpan]="14">-->
<!-- <input id="ssl_key_file" name="ssl_key_file" nz-input placeholder="默认"-->
<!-- [(ngModel)]="validateForm.ssl_key_file">-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div nz-col [nzSpan]="12">-->
<!-- <nz-form-item nzFlex>-->
<!-- <nz-form-label [nzOffset]="4" [nzSpan]="6" nzFor="ssl_key_file">SSL秘钥文件-->
<!-- </nz-form-label>-->
<!-- <nz-form-control [nzSpan]="14">-->
<!-- <input id="ssl_key_file" name="ssl_key_file" nz-input placeholder="默认"-->
<!-- [(ngModel)]="validateForm.ssl_key_file">-->
<!-- </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 [nzSpan]="6" nzFor="ssl_key_password">SSL秘钥密码</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="14">-->
<!-- <input id="ssl_key_password" name="ssl_key_password" nz-input placeholder="默认"-->
<!-- [(ngModel)]="validateForm.ssl_key_password">-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<!-- </div>-->
<!-- </form>-->
<!-- </nz-tab>-->
<!-- <div nz-row [nzGutter]="24">-->
<!-- <div nz-col [nzSpan]="12">-->
<!-- <nz-form-item nzFlex>-->
<!-- <nz-form-label [nzSpan]="6" nzFor="ssl_key_password">SSL秘钥密码</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="14">-->
<!-- <input id="ssl_key_password" name="ssl_key_password" nz-input placeholder="默认"-->
<!-- [(ngModel)]="validateForm.ssl_key_password">-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<!-- </div>-->
<!-- </form>-->
<!-- </nz-tab>-->
</nz-tabset>
</nz-modal>
src/main/webapp/app/netTopology/flow-trend/flow-trend.component.html
View file @
356b72ff
...
...
@@ -42,11 +42,10 @@
<button
(
click
)="
search
()"
nz-button
nzType=
"default"
><i
class=
"anticon anticon-search"
style=
"color: #6097b7"
></i>
搜索
</button>
</div>
</div>
<div
nz-row
[
nzGutter
]="
4
"
style=
"padding-bottom: 10px
"
>
<div
nz-row
[
nzGutter
]="
4
"
class=
"padding-top-10 padding-bottom-10
"
>
<div
nz-col
nzSpan=
"7"
>
<ng-container
*
ngIf=
"echartType == 'history'"
>
<nz-radio-group
style=
"width: 100%;"
[(
ngModel
)]="
timeType
"
(
ngModelChange
)="
changeType
()"
[
nzButtonStyle
]="'
solid
'"
>
<nz-radio-group
style=
"width: 100%;"
[(
ngModel
)]="
timeType
"
(
ngModelChange
)="
changeType
()"
>
<label
nz-radio-button
nzValue=
"1"
>
今天
</label>
<label
nz-radio-button
nzValue=
"2"
>
昨天
</label>
<label
nz-radio-button
nzValue=
"3"
>
三天
</label>
...
...
src/main/webapp/app/work/modal/link-inventory/link-inventory.component.html
View file @
356b72ff
<!--选择资产-->
<nz-modal
[
nzMaskClosable
]="
false
"
[
nzWidth
]="
880
"
[(
nzVisible
)]="
isVisiable
"
[
nzTitle
]="
title
"
(
nzOnCancel
)="
handleEditCancel
()"
(
nzOnOk
)="
handEditleOk
()"
>
<div
nz-form
class=
"ant-advanced-search-form form-select"
>
<div
nz-row
[
nzGutter
]="
24
"
>
<div
nz-col
[
nzSpan
]="
8
"
>
<nz-tree
#
nzTree
name=
"nodes"
[(
ngModel
)]="
nodes
"
[
nzAsyncData
]="
true
"
[
nzCheckStrictly
]="
true
"
(
nzCheckBoxChange
)="
selectCheckTree
($
event
)"
(
nzClick
)="
mouseAction
('
click
',$
event
)"
(
nzExpandChange
)="
mouseAction
('
expand
',$
event
)"
>
</nz-tree>
</div>
<nz-modal
[
nzMaskClosable
]="
false
"
[
nzWidth
]="
880
"
[(
nzVisible
)]="
isVisiable
"
[
nzTitle
]="
title
"
(
nzOnCancel
)="
handleEditCancel
()"
(
nzOnOk
)="
handEditleOk
()"
>
<div
style=
"padding:10px 15px"
class=
"ant-advanced-search-form form-select"
>
<div
nz-row
[
nzGutter
]="
24
"
>
<div
nz-col
[
nzSpan
]="
8
"
>
<nz-tree
#
nzTree
name=
"nodes"
[(
ngModel
)]="
nodes
"
[
nzAsyncData
]="
true
"
[
nzCheckStrictly
]="
true
"
(
nzCheckBoxChange
)="
selectCheckTree
($
event
)"
(
nzClick
)="
mouseAction
('
click
',$
event
)"
(
nzExpandChange
)="
mouseAction
('
expand
',$
event
)"
>
</nz-tree>
</div>
<div
nz-col
[
nzSpan
]="
16
"
>
<nz-table
#
basicTable
[
nzData
]="
invertoryList
"
(
nzPageIndexChange
)="
refreshStatus
()"
(
nzPageSizeChange
)="
refreshStatus
()"
>
<thead>
<tr>
<th>
资产编号
</th>
<th>
资产分类
</th>
<th>
资产名称
</th>
<th
nzShowCheckbox
[(
nzChecked
)]="
allChecked
"
[
nzIndeterminate
]="
indeterminate
"
(
nzCheckedChange
)="
checkAll
($
event
)"
></th>
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let data of basicTable.data"
>
<td>
{{data.inventoryNo}}
</td>
<td>
{{data.invertoryname}}
</td>
<td>
{{data.name}}
</td>
<td
nzShowCheckbox
[(
nzChecked
)]="
data
.
checked
"
(
nzCheckedChange
)="
selectItem
(
data
,$
event
)"
></td>
</tr>
</tbody>
</nz-table>
</div>
<div
nz-col
[
nzSpan
]="
16
"
>
<nz-table
#
basicTable
[
nzData
]="
invertoryList
"
(
nzPageIndexChange
)="
refreshStatus
()"
(
nzPageSizeChange
)="
refreshStatus
()"
>
<thead>
<tr>
<th>
资产编号
</th>
<th>
资产分类
</th>
<th>
资产名称
</th>
<th
nzShowCheckbox
[(
nzChecked
)]="
allChecked
"
[
nzIndeterminate
]="
indeterminate
"
(
nzCheckedChange
)="
checkAll
($
event
)"
></th>
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let data of basicTable.data"
>
<td>
{{data.inventoryNo}}
</td>
<td>
{{data.invertoryname}}
</td>
<td>
{{data.name}}
</td>
<td
nzShowCheckbox
[(
nzChecked
)]="
data
.
checked
"
(
nzCheckedChange
)="
selectItem
(
data
,$
event
)"
></td>
</tr>
</tbody>
</nz-table>
</div>
</div>
</div>
</div>
</nz-modal>
src/main/webapp/app/work/modal/link-inventory/link-inventory.component.ts
View file @
356b72ff
...
...
@@ -24,7 +24,10 @@ export class LinkInventoryComponent implements OnInit {
}
checkAll
(
value
:
boolean
):
void
{
this
.
invertoryList
.
forEach
(
data
=>
data
.
checked
=
value
);
this
.
invertoryList
.
forEach
(
data
=>
{
data
.
checked
=
value
;
this
.
selectList
.
push
(
data
);
});
this
.
refreshStatus
();
}
...
...
@@ -35,15 +38,15 @@ export class LinkInventoryComponent implements OnInit {
this
.
indeterminate
=
(
!
allChecked
)
&&
(
!
allUnChecked
);
}
selectItem
(
item
,
e
)
{
if
(
e
)
{
selectItem
(
item
,
e
)
{
if
(
e
)
{
this
.
selectList
.
push
(
item
);
}
else
{
this
.
selectList
.
forEach
((
value
,
index
)
=>
{
if
(
value
.
id
==
item
.
id
)
{
this
.
selectList
.
splice
(
index
,
1
)
}
else
{
this
.
selectList
.
forEach
((
value
,
index
)
=>
{
if
(
value
.
id
==
item
.
id
)
{
this
.
selectList
.
splice
(
index
,
1
);
}
})
})
;
}
this
.
refreshStatus
();
}
...
...
@@ -78,9 +81,9 @@ export class LinkInventoryComponent implements OnInit {
//获取下级---子分类
mouseAction
(
name
:
string
,
event
:
NzFormatEmitEvent
)
{
if
(
name
==
"click"
)
{
if
(
name
==
'click'
)
{
this
.
selectCheckTree
(
event
);
}
else
{
}
else
{
const
index
=
<
any
>
event
.
node
.
key
-
1
;
const
pId
=
event
.
node
.
origin
.
id
;
this
.
workSer
.
findByParentidCount
(
pId
).
subscribe
(
...
...
@@ -120,12 +123,12 @@ export class LinkInventoryComponent implements OnInit {
this
.
title
=
title
;
}
handleEditCancel
(){
handleEditCancel
()
{
this
.
selectList
=
[];
this
.
isVisiable
=
false
;
}
handEditleOk
(){
handEditleOk
()
{
this
.
isVisiable
=
false
;
this
.
done
.
emit
(
this
.
selectList
);
}
...
...
src/main/webapp/app/work/modal/look-plan/look-plan.component.ts
View file @
356b72ff
...
...
@@ -40,7 +40,7 @@ export class LookPlanComponent implements OnInit {
downLoad
()
{
this
.
workSer
.
downloadTemplate
(
'plan'
,
this
.
planId
).
subscribe
(
(
data
)
=>
{
this
.
commonSer
.
downloadFile
(
this
.
plan
.
fileName
+
".xlsx"
,
data
);
this
.
commonSer
.
downloadFile
(
this
.
plan
.
fileName
,
data
);
}
);
}
...
...
src/main/webapp/app/work/modal/plan-modal/plan-modal.component.ts
View file @
356b72ff
...
...
@@ -42,7 +42,7 @@ export class PlanModalComponent implements OnInit {
this
.
participantsList
=
[];
this
.
principalsList
=
[];
this
.
validateForm
=
this
.
fb
.
group
({
title
:
[
''
,
[
Validators
.
required
],
Validators
.
maxLength
(
20
)
],
title
:
[
''
,
[
Validators
.
required
,
Validators
.
maxLength
(
20
)]
],
typeId
:
[
null
,
[
Validators
.
required
]],
startTime
:
[
null
,
[
Validators
.
required
]],
endTime
:
[
null
,
[
Validators
.
required
]],
...
...
@@ -50,7 +50,7 @@ export class PlanModalComponent implements OnInit {
cycleNum
:
[
'1'
],
number
:
[
null
,
[
Validators
.
required
]],
workload
:
[
null
],
description
:
[
null
,
Validators
.
maxLength
(
100
)],
description
:
[
null
,
Validators
.
maxLength
(
100
)],
principals
:
[
null
,
[
Validators
.
required
]],
//负责人
participants
:
[
null
,
[
Validators
.
required
]],
//参与人
});
...
...
src/main/webapp/app/work/work-handle/handle-detail/handle-detail.component.html
View file @
356b72ff
...
...
@@ -78,9 +78,9 @@
<div
nz-col
nzSpan=
"4"
>
处理结果
</div>
<div
nz-col
nzSpan=
"1"
></div>
<div
nz-col
nzSpan=
"19"
>
<
span
*
ngIf=
"event?.operateStatus == '0'"
>
未解决
</span
>
<
span
*
ngIf=
"event?.operateStatus == '1'"
>
部分解决
</span
>
<
span
*
ngIf=
"event?.operateStatus == '2'"
>
已解决
</span
>
<
nz-tag
*
ngIf=
"event?.operateStatus == '0'"
[
nzColor
]="'#
f50
'"
>
未解决
</nz-tag
>
<
nz-tag
*
ngIf=
"event?.operateStatus == '1'"
[
nzColor
]="'
orange
'"
>
部分解决
</nz-tag
>
<
nz-tag
*
ngIf=
"event?.operateStatus == '2'"
[
nzColor
]="'
green
'"
>
已解决
</nz-tag
>
</div>
</div>
<div
nz-row
>
...
...
@@ -93,36 +93,67 @@
<div
nz-row
>
<div
nz-col
nzSpan=
"4"
>
关联资产
</div>
<div
nz-col
nzSpan=
"1"
></div>
<div
nz-col
nzSpan=
"19"
>
<p
*
ngFor=
"let item of event?.inventorys;"
>
<span
style=
"margin-right: 5px"
>
{{item.inventoryNo}}
</span>
<span
style=
"margin-right: 5px"
>
{{item.name}}
</span>
<span>
{{item.typeName}}
</span>
</p>
<div
nz-col
nzSpan=
"12"
>
<table
border=
"1"
class=
"table-demo"
>
<thead>
<tr>
<th>
资产编号
</th>
<th>
资产名称
</th>
<th>
资产类型
</th>
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let item of event?.inventorys;"
>
<td>
{{item.inventoryNo}}
</td>
<td>
{{item.name}}
</td>
<td>
{{item.typeName}}
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div
nz-row
>
<div
nz-col
nzSpan=
"4"
>
关联费用
</div>
<div
nz-col
nzSpan=
"1"
></div>
<div
nz-col
nzSpan=
"19"
>
<p
class=
"margin-bottom-10"
*
ngFor=
"let item of event?.eventCostList;let i = index"
>
<span
class=
"margin-right-5"
>
<ng-container
*
ngIf=
"item.costTypeId == '0'"
>
委外费用
</ng-container>
<ng-container
*
ngIf=
"item.costTypeId == '1'"
>
物料费用
</ng-container>
<ng-container
*
ngIf=
"item.costTypeId == '2'"
>
其他
</ng-container>
</span>
<span
class=
"margin-right-5"
>
{{item.amount}}
</span>
</p>
<div
nz-col
nzSpan=
"12"
>
<table
border=
"1"
class=
"table-demo"
>
<thead>
<tr>
<th>
费用类别
</th>
<th>
费用金额
</th>
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let item of event?.eventCostList;"
>
<td>
<ng-container
*
ngIf=
"item.costTypeId == '0'"
>
委外费用
</ng-container>
<ng-container
*
ngIf=
"item.costTypeId == '1'"
>
物料费用
</ng-container>
<ng-container
*
ngIf=
"item.costTypeId == '2'"
>
其他
</ng-container>
</td>
<td>
{{item.amount}}
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div
nz-row
>
<div
nz-col
nzSpan=
"4"
>
违规通报
</div>
<div
nz-col
nzSpan=
"1"
></div>
<div
nz-col
nzSpan=
"19"
>
<p
class=
"margin-bottom-10"
*
ngFor=
"let item of event?.eventViolationVOList;let i = index"
>
<span
class=
"margin-right-5"
>
{{item.title}}
</span>
<span
class=
"margin-right-5"
>
{{item.projectName}}
</span>
</p>
<div
nz-col
nzSpan=
"12"
>
<table
border=
"1"
class=
"table-demo"
>
<thead>
<tr>
<th>
标题
</th>
<th>
通报内容
</th>
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let item of event?.eventViolationVOList;"
>
<td>
{{item.title}}
</td>
<td>
{{item.content}}
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div
nz-row
>
...
...
src/main/webapp/app/work/work-handle/handle-detail/handle-detail.component.ts
View file @
356b72ff
...
...
@@ -57,22 +57,13 @@ export class HandleDetailComponent implements OnInit {
ngOnInit
()
{
this
.
userName
=
this
.
$localStorage
.
retrieve
(
'userInfo'
).
userName
;
this
.
getDetail
();
this
.
findTransferAndInventory
();
}
//详情
getDetail
()
{
this
.
workSer
.
findByNo
(
this
.
eventId
).
subscribe
(
(
res
)
=>
{
this
.
event
=
res
.
data
;
}
);
}
//查询事件流转信息
findTransferAndInventory
()
{
getDetail
()
{
this
.
workSer
.
findTransferAndInventory
(
this
.
eventId
).
subscribe
(
(
res
)
=>
{
this
.
event
=
res
.
data
;
this
.
transforsList
=
res
.
data
.
transfers
;
this
.
transforsList
.
forEach
(
e
=>
{
e
.
operatorInfo
=
e
.
operatorInfo
.
replace
(
/
\"
/g
,
''
).
replace
(
'{'
,
''
).
replace
(
'}'
,
''
).
split
(
':'
);
...
...
@@ -128,7 +119,7 @@ export class HandleDetailComponent implements OnInit {
}
//返回上一页
returnBack
(){
returnBack
()
{
this
.
location
.
back
();
}
}
src/main/webapp/app/work/work-handle/handle-event/handle-event.component.html
View file @
356b72ff
...
...
@@ -99,40 +99,74 @@
</div>
<div
nz-row
>
<div
nz-col
nzSpan=
"5"
class=
"line-height-32"
>
关联资产:
</div>
<div
nz-col
nzSpan=
"1
9
"
>
<div
nz-col
nzSpan=
"1
2
"
>
<button
(
click
)="
showInventoryModal
()"
nz-button
><span>
选择
</span></button>
<p
class=
"margin-top-10"
*
ngFor=
"let item of linkList;let i = index"
>
<span
class=
"margin-right-5"
>
{{item.inventoryNo}}
</span>
<span
class=
"margin-right-5"
>
{{item.name}}
</span>
<span>
{{item.typename}}
</span>
<i
(
click
)="
deleteInventory
(
i
)"
class=
"anticon anticon-close margin-right-5"
></i>
</p>
<table
*
ngIf=
"linkList.length > 0"
border=
"1"
class=
"table-demo margin-top-10"
>
<thead>
<tr>
<th>
资产编号
</th>
<th>
资产名称
</th>
<th>
操作
</th>
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let item of linkList;let i = index"
>
<td>
{{item.inventoryNo}}
</td>
<td>
{{item.name}}
</td>
<td><i
(
click
)="
deleteInventory
(
i
)"
class=
"anticon anticon-close-circle handle-delete"
></i></td>
</tr>
</tbody>
</table>
</div>
</div>
<div
nz-row
>
<div
nz-col
nzSpan=
"5"
class=
"line-height-32"
>
关联费用:
</div>
<div
nz-col
nzSpan=
"1
9
"
>
<div
nz-col
nzSpan=
"1
2
"
>
<button
(
click
)="
showCostModal
()"
nz-button
><span>
添加
</span></button>
<p
class=
"margin-top-10"
*
ngFor=
"let item of eventCostList;let i = index"
>
<span
class=
"margin-right-5"
>
<ng-container
*
ngIf=
"item.costTypeId == '0'"
>
委外费用
</ng-container>
<ng-container
*
ngIf=
"item.costTypeId == '1'"
>
物料费用
</ng-container>
<ng-container
*
ngIf=
"item.costTypeId == '2'"
>
其他
</ng-container>
</span>
<span
class=
"margin-right-5"
>
{{item.amount}}
</span>
<i
(
click
)="
deleteCost
(
i
)"
class=
"anticon anticon-close margin-right-5"
></i>
</p>
<table
*
ngIf=
"eventCostList.length > 0"
border=
"1"
class=
"table-demo margin-top-10"
>
<thead>
<tr>
<th>
费用类别
</th>
<th>
费用金额
</th>
<th>
操作
</th>
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let item of eventCostList;let i = index"
>
<td>
<ng-container
*
ngIf=
"item.costTypeId == '0'"
>
委外费用
</ng-container>
<ng-container
*
ngIf=
"item.costTypeId == '1'"
>
物料费用
</ng-container>
<ng-container
*
ngIf=
"item.costTypeId == '2'"
>
其他
</ng-container>
</td>
<td>
{{item.amount}}
</td>
<td><i
(
click
)="
deleteCost
(
i
)"
class=
"anticon anticon-close-circle handle-delete"
></i></td>
</tr>
</tbody>
</table>
</div>
</div>
<div
nz-row
>
<div
nz-col
nzSpan=
"5"
class=
"line-height-32"
>
违规通报:
</div>
<div
nz-col
nzSpan=
"1
9
"
>
<div
nz-col
nzSpan=
"1
2
"
>
<button
(
click
)="
showNotiModal
()"
nz-button
><span>
添加
</span></button>
<p
class=
"margin-top-10"
*
ngFor=
"let item of eventViolationVOList;let i = index"
>
<span
class=
"margin-right-5"
>
{{item.title}}
</span>
<span
class=
"margin-right-5"
>
{{item.projectName}}
</span>
<i
(
click
)="
deleteNoti
(
i
)"
class=
"anticon anticon-close margin-right-5"
></i>
</p>
<table
*
ngIf=
"eventViolationVOList.length > 0"
border=
"1"
class=
"table-demo margin-top-10"
>
<thead>
<tr>
<th>
通报标题
</th>
<th>
关联项目
</th>
<th>
通报内容
</th>
<th>
操作
</th>
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let item of eventViolationVOList;let i = index"
>
<td>
{{item.title}}
</td>
<td>
{{item.projectName}}
</td>
<td>
{{item.content}}
</td>
<td><i
(
click
)="
deleteNoti
(
i
)"
class=
"anticon anticon-close-circle handle-delete"
></i></td>
</tr>
</tbody>
</table>
</div>
</div>
<div
nz-row
>
...
...
src/main/webapp/app/work/work-handle/handle-event/handle-event.component.ts
View file @
356b72ff
...
...
@@ -51,7 +51,7 @@ export class HandleEventComponent implements OnInit {
constructor
(
private
routrInfo
:
ActivatedRoute
,
private
workSer
:
WorkService
,
private
location
:
Location
,
private
message
:
NzMessageService
,
private
datePipe
:
DatePipe
,
private
commonSer
:
CommonService
,
)
{
)
{
this
.
routrInfo
.
queryParams
.
subscribe
(
(
res
)
=>
{
this
.
eventId
=
res
.
eventId
;
...
...
@@ -61,22 +61,13 @@ export class HandleEventComponent implements OnInit {
ngOnInit
()
{
this
.
getDetail
();
this
.
findTransferAndInventory
();
}
//事件详情
getDetail
()
{
this
.
workSer
.
findByNo
(
this
.
eventId
).
subscribe
(
(
res
)
=>
{
this
.
event
=
res
.
data
;
}
);
}
//查询事件流转信息
findTransferAndInventory
()
{
getDetail
()
{
this
.
workSer
.
findTransferAndInventory
(
this
.
eventId
).
subscribe
(
(
res
)
=>
{
this
.
event
=
res
.
data
;
this
.
transforsList
=
res
.
data
.
transfers
;
this
.
transforsList
.
forEach
(
e
=>
{
e
.
operatorInfo
=
e
.
operatorInfo
.
replace
(
/
\"
/g
,
''
).
replace
(
'{'
,
''
).
replace
(
'}'
,
''
).
split
(
':'
);
...
...
@@ -207,8 +198,9 @@ export class HandleEventComponent implements OnInit {
deleteNoti
(
i
)
{
this
.
eventViolationVOList
.
splice
(
i
,
1
);
}
//返回上一页
returnBack
(){
returnBack
()
{
this
.
location
.
back
();
}
}
src/main/webapp/content/css/global.css
View file @
356b72ff
...
...
@@ -277,23 +277,7 @@ ui bootstrap tweaks
background-size
:
cover
;
}
@keyframes
rotateplane
{
0
%
{
transform
:
rotateX
(
0
);
}
25
%
{
transform
:
rotateX
(
90deg
);
}
50
%
{
transform
:
rotateY
(
0deg
);
}
75
%
{
transform
:
rotateY
(
90deg
);
}
100
%
{
transform
:
rotate3d
(
0
,
0
,
0
,
0
);
}
}
/* jhipster-needle-css-add-main JHipster will add new css style */
.padding-0
{
...
...
@@ -468,4 +452,38 @@ ui bootstrap tweaks
.ant-modal-body
>
.ant-tabs
{
margin
:
15px
;
}
.has-error
.ant-form-explain
,
.has-error
.ant-form-split
{
font-size
:
12px
;
}
table
.table-demo
{
width
:
100%
;
}
.table-demo
td
{
text-align
:
center
;
height
:
30px
;
padding
:
2px
;
}
.table-demo
th
{
text-align
:
center
;
height
:
30px
;
padding
:
2px
;
}
@keyframes
rotateplane
{
0
%
{
transform
:
rotateX
(
0
);
}
25
%
{
transform
:
rotateX
(
90deg
);
}
50
%
{
transform
:
rotateY
(
0deg
);
}
75
%
{
transform
:
rotateY
(
90deg
);
}
100
%
{
transform
:
rotate3d
(
0
,
0
,
0
,
0
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment