monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 8f3fd42152cfad7f1b8296f5dfb724bb61a1c331 2 parents d4f4f71d 8eafd22e

Merge branch 'master-v32-lushangqing' into 'master' 

申报库CPU监控、文书库CPU监控优化



See merge request !85
Inline Side-by-side
Showing 7 changed files with 114 additions and 18 deletions
... ... @@ -13,7 +13,7 @@ export default {
allData: {
polyline: {
title: "申报库CPU监控",
unit: "cpu使用率%",
unit: "使用率%",
data: [{
name: "80.12.97.3",
datas: ["12","15","21","18","20","37","45","23","12","5","7","14"]
... ... @@ -109,8 +109,15 @@ export default {
}
that.allData.polyline.data.push(resData.series[0])
that.updateChart()
that.allData.polyline.data.map((item,index)=>{
if(index==0){
item.name="80.12.97.3"
}else{
item.name="80.12.97.2"
}
})
that.updateChart()
});
},
... ... @@ -143,7 +150,7 @@ export default {
that.allData = {
polyline: {
title: "申报库CPU监控",
unit: "cpu使用率%",
unit: "使用率%",
data: seriesData1
},
xAxis: {
... ... @@ -251,7 +258,8 @@ export default {
},
legend: {
data: ["80.12.97.3","80.12.97.2"],
// data: ["80.12.97.3","80.12.97.2"],
data: legendArr,
itemHeight:0,//图例圆圈大小设置
right: '5%',
top: '5%',
... ... @@ -286,7 +294,7 @@ export default {
},
yAxis: {
type: 'value',
name:'cpu使用率%',
name:unit,
nameTextStyle:{
color:'#ffffff',
padding:[0,0,0,-20]
... ...
... ... @@ -12,7 +12,7 @@ export default {
allData: {
polyline: {
title: "文书库CPU监控",
unit: "cpu使用率%",
unit: "使用率%",
data: [{
name: "80.12.97.7",
data: ["12","15","21","18","20","37","45","23","12","5","7","14"]
... ... @@ -104,6 +104,14 @@ export default {
resData=that.res2.data
}
that.allData.polyline.data.push(resData.series[0])
that.allData.polyline.data.map((item,index)=>{
if(index==0){
item.name="80.12.97.7"
}else{
item.name="80.12.97.8"
}
})
that.updateChart()
});
},
... ... @@ -135,7 +143,7 @@ export default {
that.allData = {
polyline: {
title: "文书库CPU监控",
unit: "cpu使用率%",
unit: "使用率%",
data: seriesData1
},
xAxis: {
... ... @@ -237,7 +245,8 @@ export default {
},
legend: {
data: ["80.12.97.7","80.12.97.8"],
// data: ["80.12.97.7","80.12.97.8"],
data: legendArr,
itemHeight:0,//图例圆圈大小设置
right: '5%',
top: '5%',
... ...
... ... @@ -5,8 +5,8 @@
</div>
<div class="ypt">
<el-carousel direction="vertical" :autoplay="true" indicator-position="none" interval="4000" >
<el-carousel-item v-for="(item,index) in cloudData" :key="index">
<el-carousel direction="vertical" :autoplay="true" indicator-position="none" interval="20000" ref="cloudCarousel" >
<el-carousel-item v-for="(item,index) in cloudData" :key="index" name="index">
<div class="item swiper-slide" >
<div class="ui_base u_p3d">
<!--<div class="circlediv">
... ...
... ... @@ -54,6 +54,11 @@ export default {
})
proxy.cloudData=data;
setTimeout(function (){
proxy.$refs.cloudCarousel.setActiveItem(1);
},1000)
run();
//鼠标移入停止环绕动画
$(".ypt__info .ball_base").hover(function() {
... ...
... ... @@ -5,7 +5,7 @@
</div>
<div class="sjzx">
<div class="item sjzx_machineroom" v-for="item in jfdata" >
<div class="item sjzx_machineroom" v-for="(item,index) in jfdata" >
<h5 >{{item.machineRoomName}}</h5>
<div class="imgDiv">
<!-- <img @click="isShow(item)" class="imgDiv-video" src="/vue3/src/assets/images/zjdp/icon-jf.png">-->
... ... @@ -14,8 +14,8 @@
</div>
<ul class="float-container">
<li><i class='icon-wd'></i><span>温度：{{item.wd}}</span></li>
<li><i class='icon-sd'></i><span>湿度：{{item.sd}}</span></li>
<li><i class='icon-wd'></i><span v-show="index==0">机柜：252</span><span v-show="index==1">机柜：42</span></li>
<li><i class='icon-sd'></i><span v-show="index==0">资产：1568</span><span v-show="index==1">资产：46</span></li>
<li><i class='icon-mj'></i><span>面积：{{item.area}}</span></li>
</ul>
</div>
... ...
... ... @@ -16,6 +16,7 @@ export default {
ySeriesCommon:[],
legendData:[],
xAxisDataDate:[],
yAxisData:[],
optionData:'',
colorData:["#97d5f4",'#efe0a7','#e5abd1'],
chartId:'line-echart-declare'
... ... @@ -42,14 +43,21 @@ export default {
let declareLineData=data.data;
let legendData=[];
let xAxisDataDate=[];
let yAxisData=[];
$.each(declareLineData,function (i,v){
let index=0;
if(i==2){
index=1;
}else{
index=0;
}
ySeriesCommon.push({
name:v.name,
type:'line',
smooth:true,
stack:'Total',
data:v.number,
// yAxisIndex:0,
yAxisIndex:index,
showSymbol:false,
itemStyle : {
normal : {
... ... @@ -64,6 +72,7 @@ export default {
}
},
})
yAxisData.push(v.number);
legendData.push(v.name);
xAxisDataDate.push(v.days);
... ... @@ -71,6 +80,7 @@ export default {
proxy.ySeriesCommon=ySeriesCommon;
proxy.legendData=legendData;
proxy.xAxisDataDate=xAxisDataDate[0];
proxy.yAxisData=yAxisData;
proxy.optionInit();
}
})
... ... @@ -78,6 +88,14 @@ export default {
})
const optionInit=()=>{
console.log("888",proxy.yAxisData)
let data1=proxy.yAxisData[0];
let data2=proxy.yAxisData[1];
let data3=proxy.yAxisData[2];
let min1=proxy.calMin([data1,data2]);
let max1=proxy.calMax([data1,data2]);
let min2=proxy.calMin([data3,data3]);
let max2=proxy.calMax([data3,data3]);
proxy.optionData = {
title: {
... ... @@ -132,7 +150,8 @@ export default {
},
},
yAxis:{
yAxis:[
{
type: 'value',
splitLine:{
lineStyle: {
... ... @@ -142,16 +161,70 @@ export default {
axisLabel:{
color:'#ffffff',
},
splitNumber:5,
min:min1,
max:max1,
interval:(max1-min1)/5
},
{
type: 'value',
splitLine:{
lineStyle: {
color:'#0a1b31'
}
},
axisLabel:{
color:'#ffffff',
},
splitNumber:5,
min:min2,
max:max2,
interval:(max2-min2)/5
}
],
series: proxy.ySeriesCommon,
itemStyle:{
showSymbol:false
}
};
}
//计算最大值
const calMax=(arr)=>{
let max=0;
arr.forEach((el)=>{
el.forEach((el1)=>{
if(!(el1 === undefined || el1 === '')){
if(max<el1){
max=el1;
}
}
})
})
let maxint=Math.ceil(max/9.5);
let maxval=maxint * 10;//让显示的刻度是整数
return maxval;
}
//计算最小值
const calMin=(arr)=>{
let min=0;
arr.forEach((el)=>{
el.forEach((el1)=>{
if(!(el1 === undefined || el1 === '')){
if(min>el1){
min=el1;
}
}
})
})
let minint=Math.floor(min/10);
let minval=minint * 10;//让显示的刻度是整数
return minval;
}
return{
optionInit
optionInit,
calMax,
calMin
}
}
}
\ No newline at end of file
... ...
... ... @@ -196,7 +196,7 @@ export default {
},
{//被攻击点
// type: 'scatter',
type:'effectScatter',
type:'effectScatter',//涟漪状态
hoverAnimation:true,//鼠标移入是否显示动画
coordinateSystem: 'geo',
zlevel: 3,
... ... @@ -206,7 +206,8 @@ export default {
brushType: 'fill',
scale: 2
},
symbol: 'circle',
// symbol: 'circle',//圆形涟漪状态
symbol: 'pin',
symbolSize: 30,
itemStyle:{
color:'#EE4237',
... ...