Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
IT-monitor
Project
Project
Details
Activity
Releases
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
张伯涛
IT-monitor
Commits
4d275c0c
Commit
4d275c0c
authored
May 30, 2022
by
Asjoker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 所剩修改
parent
dcd8109d
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
531 additions
and
15 deletions
+531
-15
addErrorReport.vue
...ews/IntegratedMonitor/reportStatistics/addErrorReport.vue
+412
-0
errorReport.vue
src/views/IntegratedMonitor/reportStatistics/errorReport.vue
+1
-1
workOverView.vue
src/views/workManagement/workOverView.vue
+118
-14
No files found.
src/views/IntegratedMonitor/reportStatistics/addErrorReport.vue
0 → 100644
View file @
4d275c0c
This diff is collapsed.
Click to expand it.
src/views/IntegratedMonitor/reportStatistics/errorReport.vue
View file @
4d275c0c
...
...
@@ -628,7 +628,7 @@ export default {
/** 查询按钮操作 */
changeTime
()
{
this
.
$router
.
push
({
path
:
'/IntegratedMonitor/reportStatistics/add
Statistic
Report'
,
path
:
'/IntegratedMonitor/reportStatistics/add
Error
Report'
,
type
:
'add'
})
},
...
...
src/views/workManagement/workOverView.vue
View file @
4d275c0c
...
...
@@ -257,7 +257,7 @@
<el-input
type=
"textarea"
/>
</el-form-item>
<el-form-item
label=
"设备信息"
>
<el-button
@
click=
"transferOpen = tru
e"
>
请选择设备信息
</el-button>
<el-button
style=
"margin-bottom: 10px"
@
click=
"transferOpen = true;treeOptionFlag = fals
e"
>
请选择设备信息
</el-button>
<el-table
:data=
"dialogTable"
>
<el-table-column
label=
"监测点名称"
show-overflow-tooltip
prop=
"name"
/>
<el-table-column
label=
"监测点类型"
show-overflow-tooltip
prop=
"type"
/>
...
...
@@ -297,14 +297,56 @@
</div>
</el-dialog>
<el-dialog
:visible
.
sync=
"transferOpen"
title=
"设备信息"
width=
"
6
00px"
>
<el-dialog
:visible
.
sync=
"transferOpen"
title=
"设备信息"
width=
"
8
00px"
>
<tree-transfer
:title=
"['选择告警设备', '选择监测点']"
:from_data=
"fromData"
:to_data=
"toData"
:default-props=
"
{ label: 'label', children: 'children' }"
/>
<!--
<tree-transfer-->
<!-- :title="['选择告警设备', '选择监测点']"-->
<!-- :from_data="fromData"-->
<!-- :to_data="toData"-->
<!-- :default-props="
{ label: 'label', children: 'children' }"-->
<!-- />-->
<el-row
:gutter=
"20"
>
<el-col
:span=
"14"
>
<div
style=
"background-color: #f2f2f2;
line-height: 20px;
font-size: 12px;
padding: 0 5px;
border-radius: 4px 4px 0 0;
border: 1px solid #d2d6de;"
>
选择告警设备
</div>
<div
class=
"equipmentDiv"
>
<el-tree
:data=
"treeData"
node-key=
"id"
:default-expanded-keys=
"[2, 3]"
:default-checked-keys=
"[5]"
@
node-click=
"handleClickNode"
/>
</div>
</el-col>
<el-col
:span=
"10"
>
<div
style=
"background-color: #f2f2f2;
line-height: 20px;
font-size: 12px;
padding: 0 5px;
border-radius: 4px 4px 0 0;
border: 1px solid #d2d6de;"
>
选择监测点
</div>
<div
class=
"equipmentDiv"
>
<el-tree
ref=
"optionsTree"
v-show=
"treeOptionFlag"
:data=
"treeOption"
show-checkbox
node-key=
"id"
:default-expanded-keys=
"[2, 3]"
:default-checked-keys=
"[5]"
/>
</div>
</el-col>
</el-row>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"transferOpen = false"
>
取消
</el-button>
...
...
@@ -322,11 +364,9 @@ import add from '@/assets/icons/workOverviewIcons/add.png'
import
created
from
'@/assets/icons/workOverviewIcons/created.png'
import
handled
from
'@/assets/icons/workOverviewIcons/handled.png'
import
notAssigned
from
'@/assets/icons/workOverviewIcons/notAssigned.png'
import
treeTransfer
from
'el-tree-transfer'
export
default
{
name
:
'Sylog'
,
components
:
{
treeTransfer
},
data
()
{
return
{
myTask
,
...
...
@@ -539,18 +579,58 @@ export default {
}]
}]
}],
treeOption
:
[{
id
:
'1'
,
pid
:
0
,
label
:
'Ping 192.168.1.55'
,
children
:
[]
},
{
id
:
'2'
,
pid
:
0
,
label
:
'Temperature -01-Inlet Ambient-0002'
,
children
:
[]
},
{
id
:
'3'
,
pid
:
0
,
label
:
'Temperature -02-CPU 1-0003'
,
children
:
[]
},
{
id
:
'4'
,
pid
:
0
,
label
:
'Temperature -03-CPU 2-0004'
,
children
:
[]
},
{
id
:
'5'
,
pid
:
0
,
label
:
'Temperature -04-P1 DIMM 1-6-0005'
,
children
:
[]
},
{
id
:
'6'
,
pid
:
0
,
label
:
'Temperature -05-P1 DIMM 7-12-0006'
,
children
:
[]
}],
// "选择监测点"显隐标记
treeOptionFlag
:
false
,
fromData
:
[
{
id
:
'1'
,
pid
:
0
,
label
:
'
一级 1
'
,
label
:
'
本机容器
'
,
children
:
[
{
id
:
'1-1'
,
pid
:
'1'
,
label
:
'二级 1-1'
,
disabled
:
true
,
children
:
[]
label
:
'虚拟化平台'
,
children
:
[{
id
:
'1-1-1'
,
pid
:
'1-1'
,
label
:
'虚拟设备'
},
{
id
:
'1-1-2'
,
pid
:
'1-1'
,
label
:
'虚拟路由'
}]
},
{
id
:
'1-2'
,
...
...
@@ -598,6 +678,22 @@ export default {
}
},
methods
:
{
handleClickNode
(
data
)
{
console
.
log
(
'this is handleClickNode'
,
data
)
if
(
!
data
.
children
)
{
this
.
treeOptionFlag
=
true
}
},
handleClickAll
(
data
)
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
optionsTree
.
setCheckedNodes
(
this
.
treeOption
)
})
},
handleClickAll
(
data
)
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
optionsTree
.
setCheckedNodes
(
this
.
treeOption
)
})
},
handleMyMission
()
{
this
.
$router
.
push
({
path
:
'/workManagement/myMission'
...
...
@@ -700,6 +796,14 @@ export default {
}
}
}
.equipmentDiv
{
max-height
:
150px
;
height
:
150px
;
overflow
:
auto
;
border
:
1px
solid
#d2d6de
;
padding
:
10px
0
;
border-radius
:
0
0
4px
4px
;
}
.colClass
{
width
:
20%
;
}
...
...
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