Skip to content

I
IT-monitor
Commit 363ba4a6 authored by 秦嘉's avatar 秦嘉
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 37fb5bdc 13660aee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2839 additions and 284 deletions
src/styles/variables.scss
View file @ 363ba4a6
......@@ -90,7 +90,7 @@ $menuHover:#1A2137;
$subMenuBg:#232C48;
$subMenuHover:#1A2137;
$sideBarWidth: 224px;
$sideBarWidth: 200px;
$sideHideWidth: 54px;
// the :export directive is the magic sauce for webpack
......
src/views/IntegratedMonitor/Linux.vue
View file @ 363ba4a6
......@@ -7,7 +7,7 @@
:data="data"
show-checkbox
node-key="id"
:default-expanded-keys="[0,1,2, 3,4,7]"
:default-expanded-keys="[0,1,2, 3,4,7,10]"
:default-checked-keys="[0,1,2,5]"
:props="defaultProps"
/>
......@@ -101,7 +101,7 @@
<el-input v-model="additionalForm.value" />
</el-form-item>
<el-form-item label="错误频率:">
<el-input style="width: 69%" v-model="additionalForm.value1" />
<el-input v-model="additionalForm.value1" style="width: 69%" />
<el-select
v-model="additionalForm.value2"
style="width: 30%"
......@@ -214,7 +214,7 @@
<el-input v-model="additionalForm2.value4" />
</el-form-item>
<el-form-item label="错误频率:">
<el-input style="width: 69%" v-model="additionalForm.value1" />
<el-input v-model="additionalForm.value1" style="width: 69%" />
<el-select
v-model="additionalForm.value2"
style="width: 30%"
......@@ -323,7 +323,7 @@
<el-input v-model="additionalForm.value" />
</el-form-item>
<el-form-item label="错误频率:">
<el-input style="width: 69%" v-model="additionalForm.value1" />
<el-input v-model="additionalForm.value1" style="width: 69%" />
<el-select
v-model="additionalForm.value2"
style="width: 30%"
......@@ -431,7 +431,7 @@
<el-input v-model="additionalForm.value" />
</el-form-item>
<el-form-item label="错误频率:">
<el-input style="width: 69%" v-model="additionalForm.value1" />
<el-input v-model="additionalForm.value1" style="width: 69%" />
<el-select
v-model="additionalForm.value2"
style="width: 30%"
......@@ -539,7 +539,7 @@
<el-input v-model="additionalForm.value" />
</el-form-item>
<el-form-item label="错误频率:">
<el-input style="width: 69%" v-model="additionalForm.value1" />
<el-input v-model="additionalForm.value1" style="width: 69%" />
<el-select
v-model="additionalForm.value2"
style="width: 30%"
......@@ -586,7 +586,7 @@
<el-input v-model="additionalForm.value" />
</el-form-item>
<el-form-item label="错误频率:">
<el-input style="width: 69%" v-model="additionalForm.value1" />
<el-input v-model="additionalForm.value1" style="width: 69%" />
<el-select
v-model="additionalForm.value2"
style="width: 30%"
......@@ -623,7 +623,7 @@
<el-input v-model="additionalForm.value" />
</el-form-item>
<el-form-item label="错误频率:">
<el-input style="width: 69%" v-model="additionalForm.value1" />
<el-input v-model="additionalForm.value1" style="width: 69%" />
<el-select
v-model="additionalForm.value2"
style="width: 30%"
......@@ -721,7 +721,7 @@
<el-input v-model="additionalForm.value" />
</el-form-item>
<el-form-item label="错误频率:">
<el-input style="width: 69%" v-model="additionalForm.value1" />
<el-input v-model="additionalForm.value1" style="width: 69%" />
<el-select
v-model="additionalForm.value2"
style="width: 30%"
......@@ -798,11 +798,11 @@ export default {
return {
faultForm: {
value: '',
value1: '',
value1: ''
},
faultForm2: {
value: '',
value1: '',
value1: ''
},
additionalForm: {
value: '',
......@@ -856,7 +856,7 @@ export default {
},
basicForm3: {
value: '',
value1: '',
value1: ''
},
activeNames: ['1', '2', '3', '4'],
activeNames2: ['1', '2', '3', '4'],
......@@ -879,39 +879,57 @@ export default {
}, {
id: 2,
label: '交换分区'
}, {
id: 13,
label: '物理内存'
}, {
id: 3,
label: '一级 1',
label: '磁盘',
children: [{
id: 4,
label: '二级 1-1',
label: '/dev/mapper/centos-root (/)',
children: [{
id: 5,
label: '三级 1-1-1'
label: '/dev/sda1 (/boot)'
}, {
id: 6,
label: '三级 1-1-2'
label: 'devtmpfs (/dev)'
}]
}]
}, {
id: 7,
label: '一级 2',
label: '进程',
children: [{
id: 8,
label: '二级 2-1'
label: '/bin/bash /usr/local/JianKongYi/Server/bin/../python/python.sh ../web_terminal/webserver.py'
}, {
id: 9,
label: '二级 2-2'
label: '/bin/bash /usr/sbin/ksmtuned'
}, {
id: 14,
label: '/bin/ps auxw'
}, {
id: 15,
label: '/sbin/audispd'
}, {
id: 16,
label: '/sbin/rpcbind -w'
}]
}, {
id: 10,
label: '一级 3',
label: '磁盘IO',
children: [{
id: 11,
label: '二级 3-1'
label: 'dm-o'
}, {
id: 12,
label: '二级 3-2'
label: 'dm-1'
}, {
id: 17,
label: 'scd0'
}, {
id: 18,
label: 'sda'
}]
}],
defaultProps: {
......
src/views/IntegratedMonitor/equipment.vue
View file @ 363ba4a6
This diff is collapsed.
src/views/IntegratedMonitor/viewExhibition/logicalGroup.vue
View file @ 363ba4a6
......@@ -2,16 +2,20 @@
<div id="container_max" class="logicalClass">
<div class="logicalHead">
<div class="logicalBtns">
<el-button class="headBtnW" @click="refresh">刷新</el-button>
<el-button id="fullscreen_btn" class="headBtnW">全屏</el-button>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button v-if="!fullscreen" id="fullscreen_btn" type="primary">全屏</el-button>
<el-button v-if="fullscreen" id="fullscreen_btn2" type="primary">取消全屏</el-button>
</div>
</div>
<el-divider />
<div class="logicalBody">
<div style="font-weight: bold;padding: 0 10px 10px 5px">设备管理列表</div>
<el-table
:data="dataList"
border
:row-key="getKeys"
:expand-row-keys="expand"
:default-expand-all="true"
:tree-props="{children: 'child'}"
>
<el-table-column label="公司" prop="company" show-overflow-tooltip>
......@@ -144,7 +148,7 @@
<el-button @click="closeAddDialog">取消</el-button>
</span>
</el-dialog>
<el-dialog class="addWarnClass" width="50%" title="告警添加" :visible.sync="objectDialog">
<el-dialog class="addWarnClass" width="50%" title="添加对象" :visible.sync="objectDialog">
<el-form v-if="stepActive === 1" ref="addForm" style="width: 100%;height: 300px" label-width="auto" :model="addForm">
<el-form-item label=" ">
<div class="treebody">
......@@ -181,6 +185,7 @@ export default {
name: 'LogicalGroup',
data() {
return {
fullscreen: false,
dataTree: [{
id: 1,
icon: require('@/assets/image/shebei.png'),
......@@ -192,11 +197,11 @@ export default {
children: [{
id: 111,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '三级 1-1-1'
label: '智盘服务器10.1.1.50'
}, {
id: 112,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '三级 1-1-2'
label: '127.0.0.1'
}]
},
{
......@@ -206,11 +211,11 @@ export default {
children: [{
id: 121,
icon: require('@/assets/image/shebei2-guzhang.png'),
label: '三级 1-1-1'
label: 'ping'
}, {
id: 122,
icon: require('@/assets/image/shebei2-guzhang.png'),
label: '三级 1-1-2'
label: 'url'
}]
}]
}],
......@@ -229,25 +234,25 @@ export default {
children: [{
id: 111,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '三级 1-1-1'
label: '智盘服务器10.1.1.50'
}, {
id: 112,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '三级 1-1-2'
label: '127.0.0.1'
}]
},
{
id: 12,
icon: require('@/assets/image/shebei9-weixian.png'),
label: '虚拟化平台',
label: '虚拟设备（默认每个设备支持5个监测点）',
children: [{
id: 121,
icon: require('@/assets/image/shebei2-guzhang.png'),
label: '三级 1-1-1'
label: 'ping'
}, {
id: 122,
icon: require('@/assets/image/shebei2-guzhang.png'),
label: '三级 1-1-2'
label: 'url'
}]
}]
}],
......@@ -288,11 +293,19 @@ export default {
child: [
{ id: '111', icon: require('@/assets/image/shebei9-zhengchang.png'), company: '服务器硬件', type: '',
child: [
{ id: '1111', icon: require('@/assets/image/shebei2-zhengchang.png'), company: '云打印服务器-硬件', type: '' }
{ id: '1111', icon: require('@/assets/image/shebei2-zhengchang.png'), company: '云打印服务器-硬件', type: '' },
{ id: '1112', icon: require('@/assets/image/shebei2-zhengchang.png'), company: 'B0629虚拟化服务器HPE DL580G9', type: '' },
{ id: '1113', icon: require('@/assets/image/shebei2-zhengchang.png'), company: '温泉翁群翁', type: '' }
] },
{ id: '112', icon: require('@/assets/image/shebei2-zhengchang.png'), company: '云打印服务器-硬件', type: '',
child: [
{ id: '1121', noIcon: '1', company: 'Power Supply -PS 2 Presence-0045', type: '' }
{ id: '1121', noIcon: '1', company: 'Power Supply -PS 2 Presence-0045', type: '' },
{ id: '1122', noIcon: '1', company: 'Temperature -16-VR P1 Mem-0011', type: '' },
{ id: '1123', noIcon: '1', company: 'Fan -Fan 4 DutyCycle-0038', type: '' },
{ id: '1124', noIcon: '1', company: 'Temperature -22-PCI 2-0017', type: '' },
{ id: '1125', noIcon: '1', company: 'Temperature -38-I/O Zone-0027', type: '' },
{ id: '1126', noIcon: '1', company: 'Power Supply -Power Supply 2-0043', type: '' },
{ id: '1127', noIcon: '1', company: 'Temperature -43-Storage Batt-002c', type: '' }
] }
] }
] }
......@@ -353,9 +366,37 @@ export default {
handleExpand() {
const element = document.getElementById('container_max')// 指定全屏区域元素
document.getElementById('fullscreen_btn').addEventListener('click', () => {
if (screenfull.isEnabled) {
screenfull.request(element)
// if (screenfull.isEnabled) {
// screenfull.request(element)
// }
// 判断是否已经是全屏
// 如果是全屏，退出
if (this.fullscreen) {
if (document.exitFullscreen) {
document.exitFullscreen()
} else if (document.webkitCancelFullScreen) {
document.webkitCancelFullScreen()
} else if (document.mozCancelFullScreen) {
document.mozCancelFullScreen()
} else if (document.msExitFullscreen) {
document.msExitFullscreen()
}
console.log('已还原！')
} else { // 否则，进入全屏
if (element.requestFullscreen) {
element.requestFullscreen()
} else if (element.webkitRequestFullScreen) {
element.webkitRequestFullScreen()
} else if (element.mozRequestFullScreen) {
element.mozRequestFullScreen()
} else if (element.msRequestFullscreen) {
// IE11
element.msRequestFullscreen()
}
console.log('已全屏！')
}
// 改变当前全屏状态
this.fullscreen = !this.fullscreen
})// 实现模块全屏
}
}
......@@ -364,6 +405,12 @@ export default {
<style lang="scss">
.logicalClass{
.el-divider--horizontal{
padding-top: 10px;
margin: 0!important;
height: 14px!important;
background-color: #F1F1F1!important;
}
.el-input__inner{
padding: 0 0 0 9px;
}
......@@ -371,6 +418,7 @@ export default {
padding: 5px 0;
}
.logicalBody{
padding: 10px;
.name-icon{
width: 20px;
height: 20px;
......@@ -388,8 +436,8 @@ export default {
.logicalHead{
height: 58px;
padding: 15px 20px 10px 20px;
background-color: #edeef3 !important;
border-bottom: 1px solid #DBDDE3;
//background-color: #edeef3 !important;
//border-bottom: 1px solid #DBDDE3;
.logicalBtns{
float: right;
.headBtn{
......
src/views/IntegratedMonitor/warning/warningSetup.vue
View file @ 363ba4a6
......@@ -2,16 +2,18 @@
<div id="container_max" class="warnModule">
<div class="warnHead">
<div class="warnBtns">
<el-button class="headBtn" @click="handleAdd">添加</el-button>
<el-button class="headBtn" @click="handleUpdate">编辑</el-button>
<el-button class="headBtn">删除</el-button>
<el-button class="headBtn">禁止</el-button>
<el-button class="headBtnW" @click="refresh">刷新</el-button>
<el-button id="fullscreen_btn" class="headBtnW">全屏</el-button>
<el-button type="primary" @click="handleAdd">添加</el-button>
<el-button type="primary" @click="handleUpdate">编辑</el-button>
<el-button type="primary">删除</el-button>
<el-button type="primary">禁止</el-button>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button v-if="!fullscreen" id="fullscreen_btn" type="primary">全屏</el-button>
<el-button v-if="fullscreen" id="fullscreen_btn2" type="primary">取消全屏</el-button>
</div>
</div>
<el-divider />
<div class="warnBody">
<span style="font-size:24px;margin-right: 10px ">告警设置</span>
<span style="font-weight: bold;margin-right: 10px ">告警设置</span>
<el-link type="primary" @click="addWarn">新增告警</el-link>
<el-table
:data="tableData"
......@@ -165,6 +167,7 @@ export default {
name: 'WarningSetup',
data() {
return {
fullscreen: false,
data: [{
id: 1,
icon: require('@/assets/image/shebei.png'),
......@@ -176,11 +179,11 @@ export default {
children: [{
id: 111,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '三级 1-1-1'
label: '智盘服务器10.1.1.50'
}, {
id: 112,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '三级 1-1-2'
label: '127.0.0.1'
}]
},
{
......@@ -190,11 +193,11 @@ export default {
children: [{
id: 121,
icon: require('@/assets/image/shebei2-guzhang.png'),
label: '三级 1-1-1'
label: 'ping'
}, {
id: 122,
icon: require('@/assets/image/shebei2-guzhang.png'),
label: '三级 1-1-2'
label: 'url'
}]
}]
}],
......@@ -255,9 +258,37 @@ export default {
handleExpand() {
const element = document.getElementById('container_max')// 指定全屏区域元素
document.getElementById('fullscreen_btn').addEventListener('click', () => {
if (screenfull.isEnabled) {
screenfull.request(element)
// if (screenfull.isEnabled) {
// screenfull.request(element)
// }
// 判断是否已经是全屏
// 如果是全屏，退出
if (this.fullscreen) {
if (document.exitFullscreen) {
document.exitFullscreen()
} else if (document.webkitCancelFullScreen) {
document.webkitCancelFullScreen()
} else if (document.mozCancelFullScreen) {
document.mozCancelFullScreen()
} else if (document.msExitFullscreen) {
document.msExitFullscreen()
}
console.log('已还原！')
} else { // 否则，进入全屏
if (element.requestFullscreen) {
element.requestFullscreen()
} else if (element.webkitRequestFullScreen) {
element.webkitRequestFullScreen()
} else if (element.mozRequestFullScreen) {
element.mozRequestFullScreen()
} else if (element.msRequestFullscreen) {
// IE11
element.msRequestFullscreen()
}
console.log('已全屏！')
}
// 改变当前全屏状态
this.fullscreen = !this.fullscreen
})// 实现模块全屏
},
closeAddDialog() {
......@@ -301,6 +332,12 @@ export default {
<style lang="scss">
.warnModule{
.el-divider--horizontal{
padding-top: 10px;
margin: 0!important;
height: 14px!important;
background-color: #F1F1F1!important;
}
.strategyRow{
padding: 5px 0;
}
......@@ -331,8 +368,8 @@ export default {
.warnHead{
height: 58px;
padding: 15px 20px 10px 20px;
background-color: #edeef3 !important;
border-bottom: 1px solid #DBDDE3;
//background-color: #edeef3 !important;
//border-bottom: 1px solid #DBDDE3;
.warnBtns{
float: right;
.headBtn{
......
src/views/assetManagement/assetList.vue
View file @ 363ba4a6
<template>
<div id="container_max" class="assetListMoudle">
<div class="assetListHead">
<div class="assetListTitle">资产清单</div>
<!-- <div class="assetListTitle">资产清单</div>-->
<div class="warnBtns">
<el-button class="headBtn" @click="addAsset">新增</el-button>
<el-button class="headBtn" @click="deleteRow">删除</el-button>
<el-button class="headBtn">更多</el-button>
<el-button class="headBtnW" @click="refresh">刷新</el-button>
<el-button id="fullscreen_btn" class="headBtnW">全屏</el-button>
<el-button type="primary" @click="addAsset">新增</el-button>
<el-button type="primary" @click="deleteRow">删除</el-button>
<el-button type="primary">更多</el-button>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button id="fullscreen_btn" type="primary">全屏</el-button>
</div>
</div>
<el-divider />
<div class="assetListBody">
<el-row :gutter="12">
<el-col :span="6">
......@@ -41,10 +42,11 @@
</div>
</el-col>
<el-col :span="18">
<div style="font-weight: bold;padding: 10px 10px 0 5px">资产清单列表</div>
<el-table
:data="tableData"
border
style="width: 100%;padding-top: 20px"
style="width: 100%;padding-top: 10px"
>
<el-table-column label="资产名称" prop="name" show-overflow-tooltip>
<template slot-scope="scope">
......@@ -287,11 +289,17 @@ export default {
<style lang="scss">
.assetListMoudle{
.el-divider--horizontal{
padding-top: 10px;
margin: 0!important;
height: 14px!important;
background-color: #F1F1F1!important;
}
.assetListHead{
height: 58px;
padding: 15px 20px 10px 20px;
background-color: #edeef3 !important;
border-bottom: 1px solid #DBDDE3;
//background-color: #edeef3 !important;
//border-bottom: 1px solid #DBDDE3;
.assetListTitle{
float: left;
font-size: 24px;
......
src/views/assetManagement/informationChange/index.vue
View file @ 363ba4a6
......@@ -802,6 +802,7 @@ export default {
},
assetsPreservation() {
this.selectAssets = false
this.information = 1
this.dataS = []
this.addData = this.addData1
},
......
src/views/overView/dashboard/equipment.vue
View file @ 363ba4a6
......@@ -3,7 +3,7 @@
<el-row :gutter="12">
<el-col :span="6">
<div class="equipmentLeft">
<div style="height: 50px"></div>
<div style="height: 50px" />
<el-card class="box-card">
<div style="display: flex;margin-top: 10px">
<el-divider direction="vertical" />
......@@ -106,7 +106,8 @@
<el-col :span="6">
<div class="equipmentRight">
<div style="display: flex;justify-content: end; height: 50px;padding-right: 5px">
<img id="fullscreen_btn" style=" cursor:pointer;height: 35px;width: 35px" :src="expandPage">
<img v-if="!fullscreen" id="fullscreen_btn" style=" cursor:pointer;height: 35px;width: 35px" :src="expandPage">
<img v-if="fullscreen" id="fullscreen_btn2" style=" cursor:pointer;height: 35px;width: 35px" :src="expandPageShrink">
<div style="font-size: 30px;padding-left: 20px; padding-right: 20px">{{ nowDate }}</div>
<div>
<div style="font-size: 20px">{{ week }}</div>
......@@ -159,6 +160,7 @@ export default {
name: 'Equipment',
data() {
return {
fullscreen: false,
isFullscrenn: false,
expandPage: require('@/assets/image/expand.png'),
nowDate: '',
......@@ -173,6 +175,7 @@ export default {
{ label: '智盘服务器-10.1.154', time: '2019-12-09' }
],
equipmentIcon: require('@/assets/image/shebeizongshu.png'),
expandPageShrink: require('@/assets/image/exitFullBtn.png'),
monitorIcon: require('@/assets/image/jiankongdianshu.png'),
warnIcon: require('@/assets/image/gaojingshu.png')
}
......@@ -270,9 +273,37 @@ export default {
handleExpand() {
const element = document.getElementById('container_max')// 指定全屏区域元素
document.getElementById('fullscreen_btn').addEventListener('click', () => {
if (screenfull.isEnabled) {
screenfull.request(element)
// if (screenfull.isEnabled) {
// screenfull.request(element)
// }
// 判断是否已经是全屏
// 如果是全屏，退出
if (this.fullscreen) {
if (document.exitFullscreen) {
document.exitFullscreen()
} else if (document.webkitCancelFullScreen) {
document.webkitCancelFullScreen()
} else if (document.mozCancelFullScreen) {
document.mozCancelFullScreen()
} else if (document.msExitFullscreen) {
document.msExitFullscreen()
}
console.log('已还原！')
} else { // 否则，进入全屏
if (element.requestFullscreen) {
element.requestFullscreen()
} else if (element.webkitRequestFullScreen) {
element.webkitRequestFullScreen()
} else if (element.mozRequestFullScreen) {
element.mozRequestFullScreen()
} else if (element.msRequestFullscreen) {
// IE11
element.msRequestFullscreen()
}
console.log('已全屏！')
}
// 改变当前全屏状态
this.fullscreen = !this.fullscreen
})// 实现模块全屏
},
getTime() {
......@@ -349,7 +380,7 @@ export default {
grid: {
top: '3%',
left: '3%',
right: '4%',
right: '8%',
containLabel: true
},
xAxis: {
......@@ -427,7 +458,7 @@ export default {
grid: {
top: '3%',
left: '3%',
right: '4%',
right: '8%',
containLabel: true
},
xAxis: {
......
src/views/workManagement/myCreated.vue 0 → 100644
View file @ 363ba4a6
This diff is collapsed.
src/views/workManagement/myMission.vue 0 → 100644
View file @ 363ba4a6
This diff is collapsed.
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