Skip to content

I
IT-monitor
Commit 68a34490 authored by 11528's avatar 11528
Browse files
Options

Merge remote-tracking branch 'origin/master' into master

parents a3dae65b 363ba4a6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 727 additions and 84 deletions
src/views/IntegratedMonitor/equipment.vue
View file @ 68a34490
<template>
<div id="container_max" class="monitor">
<div class="mointorHead">
<!-- <el-form inline label-width="auto" label-position="right">-->
<!-- <el-form-item v-if="showList === false" class="headSearch" label=" ">-->
<!-- <i style="font-size: 23px;line-height: 32px; background-color: #d6d6d6; border: 1px solid #cccccc " class="el-icon-search" />-->
<!-- <el-input v-model.trim="serchForm.CONNAMECN" class="searchInput" clearable placeholder="请输入关键字" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form inline label-width="auto" label-position="right">-->
<!-- <el-form-item v-if="showList === false" class="headSearch" label=" ">-->
<!-- <i style="font-size: 23px;line-height: 32px; background-color: #d6d6d6; border: 1px solid #cccccc " class="el-icon-search" />-->
<!-- <el-input v-model.trim="serchForm.CONNAMECN" class="searchInput" clearable placeholder="请输入关键字" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<el-form inline label-width="auto" label-position="right">
<el-form-item v-if="showList === false" class="headSearch" label=" ">
<el-input v-model.trim="serchForm.CONNAMECN" clearable placeholder="请输入关键字" />
......@@ -95,20 +95,32 @@
<el-table-column label="最新数据时间" prop="newTime" show-overflow-tooltip />
<el-table-column label="描述" prop="describe" show-overflow-tooltip />
<el-table-column width="300px" label="操作">
<!-- <template slot-scope="scope">-->
<template slot-scope="scope">
<el-link @click="addEquipment">添加设备</el-link>
<el-link @click="addRow">添加组</el-link>
<el-link @click="addRow">编辑</el-link>
<el-link @click="deleteRow">删除</el-link>
<el-tooltip effect="light" placement="bottom" popper-class="moreTip">
<div slot="content" onclick="clickLinux()" class="tooltipText">配置Linux自定义监测</div>
<div slot="content" class="tooltipText" @click="addWarn">添加告警</div>
<div slot="content" onclick="prohibit()" class="tooltipText">临时禁止</div>
<el-link>更多
<el-popover
placement="bottom"
width="200"
trigger="click"
>
<div onclick="clickLinux()" class="tooltipText">配置Linux自定义监测</div>
<div class="tooltipText" @click="addWarn">添加告警</div>
<div onclick="prohibit()" class="tooltipText">临时禁止</div>
<el-link slot="reference">更多
<div class="caretDown" />
</el-link>
</el-tooltip>
<!-- </template>-->
</el-popover>
<!-- <el-tooltip effect="light" placement="bottom" popper-class="moreTip">-->
<!-- <div slot="content" onclick="clickLinux()" class="tooltipText">配置Linux自定义监测</div>-->
<!-- <div slot="content" class="tooltipText" @click="addWarn">添加告警</div>-->
<!-- <div slot="content" onclick="prohibit()" class="tooltipText">临时禁止</div>-->
<!-- <el-link>更多-->
<!-- <div class="caretDown" />-->
<!-- </el-link>-->
<!-- </el-tooltip>-->
</template>
</el-table-column>
</el-table>
</div>
......@@ -155,6 +167,7 @@ export default {
name: 'Equipment',
data() {
return {
visible: false,
fullscreen: false,
prohibitForm: {
starTime: '',
......@@ -355,12 +368,10 @@ export default {
</script>
<style lang="scss">
.moreTip{
.tooltipText{
cursor: pointer;
padding: 5px!important;
}
}
.addGroup{
.el-dialog__footer{
text-align: center;
......
src/views/IntegratedMonitor/viewExhibition/logicalGroup.vue
View file @ 68a34490
......@@ -9,11 +9,13 @@
</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>
......@@ -146,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">
......@@ -195,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'
}]
},
{
......@@ -209,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'
}]
}]
}],
......@@ -291,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: '' }
] }
] }
] }
......
src/views/IntegratedMonitor/viewExhibition/monitorView.vue
View file @ 68a34490
......@@ -121,20 +121,39 @@ export default {
},
tableData: [
{ equipment: '智盘服务器10.1.1.50', icon: require('@/assets/image/shebei2-zhengchang.png'), point: '/dev/sda1 (/boot)', value: '物理内存', value2: 'Ping', value3: '连接' },
{ equipment: '总部24F-机柜8-17U-16U-电票系统', icon: require('@/assets/image/shebei2-guzhang.png'), point: '/dev/sda1 (/boot)', value: '物理内存', value2: 'Ping', value3: '/dev/sda2 (/media/disk)' },
{ equipment: '人脸识别服务器-10.1.1.52', icon: require('@/assets/image/shebei2-zhengchang.png'), point: '/dev/sda1 (/boot)', value: '物理内存', value2: 'Ping', value3: 'Snmp连接检测' }
{ equipment: '总部24F-机柜8-17U-16U-电票系统', icon: require('@/assets/image/shebei2-guzhang.png'), point: 'ora_s000_vbsrun12', value: 'CPU', value2: 'Ping', value3: '/dev/sda2 (/media/disk)' },
{ equipment: '人脸识别服务器-10.1.1.52', icon: require('@/assets/image/shebei2-zhengchang.png'), point: 'ora_asmb_vbsrun12', value: '物理内存', value2: 'Ping', value3: 'Snmp连接检测' },
{ equipment: '跳板机_192.168.8.20', icon: require('@/assets/image/shebei2-zhengchang.png'), point: '/dev/fslv01 (/bkp)', value: 'CPU', value2: 'Ping', value3: 'Snmp连接检测' },
{ equipment: '运维服务器_192.168.6.16', icon: require('@/assets/image/shebei2-zhengchang.png'), point: 'ora_rbal_vbsrun12', value: 'AgentWin CPU', value2: 'Ping', value3: 'Snmp连接检测' },
{ equipment: '智盘服务器-10.1.1.54', icon: require('@/assets/image/shebei2-zhengchang.png'), point: 'ora_dbw0_vbsrun12', value: '物理内存', value2: 'Ping', value3: 'Snmp连接检测' },
{ equipment: '上网代理服务器-10.1.1.58', icon: require('@/assets/image/shebei2-zhengchang.png'), point: '/dev/sda1 (/boot)', value: '虚拟内存', value2: 'Ping', value3: 'Snmp连接检测' },
],
tableData2: [
{ equipment: '餐厅服务器-10.1.1.61', point: 'C:', value: '1', value2: '磁盘使用率(%)', value3: '16.250', value4: '> 90', value5: '> 95', value6: '2022-04-20 23:50:00' },
{ equipment: '餐厅服务器-10.1.1.61', point: 'alg.exe', value: '1', value2: '进程数(个)', value3: '16.250', value4: '> 90', value5: '> 95', value6: '2022-04-20 23:50:00' },
{ equipment: '餐厅服务器-10.1.1.61', point: '虚拟内存', value: '1', value2: '内存使用率(%)', value3: '16.250', value4: '> 90', value5: '> 95', value6: '2022-04-20 23:50:00' }
{ equipment: '餐厅服务器-10.1.1.61', point: '虚拟内存', value: '1', value2: '内存使用率(%)', value3: '19.250', value4: '> 90', value5: '> 95', value6: '2022-04-20 23:50:00' },
{ equipment: '餐厅服务器-10.1.1.61', point: 'Ping', value: '1', value2: '服务成功率(%)', value3: '16.250', value4: '> 90', value5: '> 95', value6: '2022-04-20 23:50:00' },
{ equipment: '餐厅服务器-10.1.1.61', point: 'Windows CPU', value: '1', value2: 'CPU使用率(%)', value3: '16.250', value4: '> 90', value5: '> 95', value6: '2022-04-20 23:50:00' },
{ equipment: '餐厅服务器-10.1.1.61', point: 'Wmi连接', value: '1', value2: '内存使用率(%)', value3: '2', value4: '> 90', value5: '> 95', value6: '2022-04-20 23:50:00' },
{ equipment: '餐厅服务器-10.1.1.61', point: '物理内存', value: '1', value2: '服务成功率(%)', value3: '100.000', value4: '> 90', value5: '> 95', value6: '2022-04-20 23:50:00' },
{ equipment: '餐厅服务器-10.1.1.61', point: '虚拟内存', value: '1', value2: '内存使用率(%)', value3: '11.550', value4: '> 90', value5: '> 95', value6: '2022-04-20 23:50:00' },
{ equipment: '餐厅服务器-10.1.1.61', point: '物理内存', value: '1', value2: '内存使用率(%)', value3: '16.250', value4: '> 90', value5: '> 95', value6: '2022-04-20 23:50:00' },
{ equipment: '餐厅服务器-10.1.1.61', point: 'G:', value: '1', value2: '磁盘使用率(%)', value3: '89.400', value4: '> 90', value5: '> 95', value6: '2022-04-20 23:50:00' },
],
equipmentList: [
{ img: require('@/assets/image/shebei1-weizhi.png'), name: '' },
{ img: require('@/assets/image/shebei2-zhengchang.png'), name: '总部24F-机柜8-17U-16U' },
{ img: require('@/assets/image/shebei2-guzhang.png'), name: '人脸识别服务器-10.1' },
{ img: require('@/assets/image/shebei2-guzhang.png'), name: '人脸应用服务器-10.1' },
{ img: require('@/assets/image/shebei2-zhengchang.png'), name: '智盘服务器10.1.1.50' },
{ img: require('@/assets/image/shebei2-guzhang.png'), name: '智盘服务器10.1.1.50' },
{ img: require('@/assets/image/shebei2-guzhang.png'), name: '智盘服务器10.1.1.50' },
{ img: require('@/assets/image/shebei2-zhengchang.png'), name: '智盘服务器10.1.1.50' }
{ img: require('@/assets/image/shebei2-zhengchang.png'), name: '跳板机_192.168.8.20' },
{ img: require('@/assets/image/shebei2-zhengchang.png'), name: '运维服务器_192.168.6.16' },
{ img: require('@/assets/image/shebei2-zhengchang.png'), name: '绩效系统-10.1.1.60' },
{ img: require('@/assets/image/shebei2-zhengchang.png'), name: '餐厅服务器-10.1.1.61' },
{ img: require('@/assets/image/shebei2-zhengchang.png'), name: '集成平台主节点' },
{ img: require('@/assets/image/shebei2-zhengchang.png'), name: '短信平台-10.1.1.65' },
{ img: require('@/assets/image/shebei2-zhengchang.png'), name: '停车服务器-10.1.1.71' },
{ img: require('@/assets/image/shebei2-zhengchang.png'), name: '停车服务器-10.1.1.73' },
],
activeName: 'first',
data: [{
......
src/views/IntegratedMonitor/viewExhibition/stateStatistics.vue
View file @ 68a34490
......@@ -37,39 +37,39 @@
<span class="bar-header-span">故障统计</span>
</div>
<el-row :gutter="12">
<el-col :span="16">
<el-col :span="15">
<div id="echarts-enter3" class="span_1">
<div id="dataCharts_enter3" ref="chart_enter" style="height: 45vh" />
</div>
</el-col>
<el-col style="margin-top: 30px" :span="8">
<el-col style="margin-top: 30px" :span="9">
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">服务器</div>
<div class="columLabel">服务器:1 个设备(11.11%)，4 个监测点(23.53%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">应用</div>
<div class="columLabel">应用:1 个设备(11.11%)，1 个监测点(5.88%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">网络</div>
<div class="columLabel">网络:7 个设备(77.78%)，12 个监测点(70.59%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">安全</div>
<div class="columLabel">安全:0 个设备(0.00%)，0 个监测点(0.00%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">存储</div>
<div class="columLabel">存储:0 个设备(0.00%)，0 个监测点(0.00%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">虚拟机</div>
<div class="columLabel">虚拟机:0 个设备(0.00%)，0 个监测点(0.00%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">物联网</div>
<div class="columLabel">物联网:0 个设备(0.00%)，0 个监测点(0.00%)</div>
</div>
</el-col>
......@@ -81,39 +81,39 @@
<span class="bar-header-span">危险统计</span>
</div>
<el-row :gutter="12">
<el-col :span="16">
<el-col :span="15">
<div id="echarts-enter4" class="span_1">
<div id="dataCharts_enter4" ref="chart_enter" style="height: 45vh" />
</div>
</el-col>
<el-col style="margin-top: 30px" :span="8">
<el-col style="margin-top: 30px" :span="9">
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">服务器</div>
<div class="columLabel">服务器:3 个设备(75.00%)，11 个监测点(91.67%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">应用</div>
<div class="columLabel">应用: 0 个设备(0.00%)，0 个监测点(0.00%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">网络</div>
<div class="columLabel">网络:1 个设备(25.00%)，1 个监测点(8.33%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">安全</div>
<div class="columLabel">安全:0 个设备(0.00%)，0 个监测点(0.00%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">存储</div>
<div class="columLabel">存储:0 个设备(0.00%)，0 个监测点(0.00%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">虚拟机</div>
<div class="columLabel">虚拟机: 0 个设备(0.00%)，0 个监测点(0.00%)</div>
</div>
<div style="display: flex">
<span class="columSquare"></span>
<div class="columLabel">物联网</div>
<div class="columLabel">物联网: 0 个设备(0.00%)，0 个监测点(0.00%)</div>
</div>
</el-col>
......@@ -268,7 +268,8 @@ export default {
},
legend: {
orient: 'vertical',
bottom: 'bottom'
left: 'left',
top: '50%'
},
series: [
{
......@@ -276,11 +277,11 @@ export default {
type: 'pie',
radius: ['50%', '70%'],
data: [
{ value: 9, name: '故障:' },
{ value: 3, name: '危险:' },
{ value: 83, name: '正常:' },
{ value: 18, name: '未知:' },
{ value: 0, name: '禁止:' }
{ value: 9, name: '故障: 9个, 8.49%' },
{ value: 3, name: '危险: 3 个，2.83%' },
{ value: 83, name: '正常: 83 个，78.30%' },
{ value: 18, name: '未知: 11 个，10.38%' },
{ value: 0, name: '禁止: 0 个，0.00%' }
],
emphasis: {
itemStyle: {
......@@ -303,7 +304,8 @@ export default {
},
legend: {
orient: 'vertical',
bottom: 'bottom'
left: 'left',
top: '50%'
},
series: [
{
......@@ -311,11 +313,11 @@ export default {
type: 'pie',
radius: ['50%', '70%'],
data: [
{ value: 17, name: '故障:' },
{ value: 12, name: '危险:' },
{ value: 1693, name: '正常:' },
{ value: 454, name: '未知:' },
{ value: 1, name: '禁止:' }
{ value: 17, name: '故障: 17 个，0.78%' },
{ value: 12, name: '危险: 12 个，0.55%' },
{ value: 1693, name: '正常: 1693 个，77.80%' },
{ value: 454, name: '未知: 453 个，20.82%' },
{ value: 1, name: '禁止: 1 个，0.05%' }
],
emphasis: {
itemStyle: {
......@@ -378,11 +380,11 @@ export default {
},
series: [
{
data: [120, 200, 150, 80, 70, 110, 130],
data: [80, 140, 150, 180, 40, 30, 130],
type: 'bar'
},
{
data: [12, 20, 15, 80, 70, 10, 30],
data: [200, 60, 40, 50, 170, 110, 210],
type: 'bar'
}
]
......
src/views/IntegratedMonitor/warning/warningFloodControl.vue
View file @ 68a34490
......@@ -181,7 +181,7 @@ export default {
}
</script>
<style lang="scss">
<style lang="scss" scoped>
.warnModule {
.strategyRow {
padding: 5px 0;
......@@ -190,17 +190,6 @@ export default {
.el-input__inner {
padding: 0 0 0 9px;
}
.lineInput {
/deep/ .el-input__inner{
border-top-width: 0;
border-left-width: 0;
border-right-width: 0;
border-bottom-width: 1px;
border-radius: 0;
text-align: center;
width: 70px;
}
}
.warnHead {
height: 58px;
padding: 15px 20px 10px 20px;
......@@ -218,7 +207,17 @@ export default {
}
}
}
.lineInput {
/deep/ .el-input__inner{
border-top-width: 0;
border-left-width: 0;
border-right-width: 0;
border-bottom-width: 1px;
border-radius: 0;
text-align: center;
width: 70px;
}
}
.warnBody {
padding: 15px;
}
......
src/views/IntegratedMonitor/warning/warningSetup.vue
View file @ 68a34490
......@@ -13,7 +13,7 @@
</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"
......
src/views/assetManagement/assetList.vue
View file @ 68a34490
<template>
<div id="container_max" class="assetListMoudle">
<div class="assetListHead">
<div class="assetListTitle">资产清单</div>
<!-- <div class="assetListTitle">资产清单</div>-->
<div class="warnBtns">
<el-button type="primary" @click="addAsset">新增</el-button>
<el-button type="primary" @click="deleteRow">删除</el-button>
......@@ -42,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">
......
src/views/assetManagement/compQuery/index.vue 0 → 100644
View file @ 68a34490
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