monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 091a7abd8811185207a5804418d22bd473afc684 2 parents 941fe7a3 e879d9c9

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

大屏及电子税务局页面样式修改，业务导航手动点击切换，业务性能鼠标悬浮过滤undefined，



See merge request !76
Inline Side-by-side
Showing 4 changed files with 81 additions and 20 deletions
... ... @@ -69,6 +69,8 @@ body{font-size: 15px;}
.screen-nav{
margin-bottom: 30px;
padding-right: 20px;
z-index: 1;
position: relative;
}
.screen-res-performance{
display: flex;
... ...
... ... @@ -187,12 +187,16 @@ export default {
let str='<div>'+params[0].name+'</div>';
let unit='%';
for(let i=0;i<params.length;i++){
if(i==0 || i==3){
unit="个"
if(i==3){
unit=" 个"
}else{
unit="%"
}
str+="<div style='display:flex;justify-content: space-between'><span>"+params[i].marker+params[i].seriesName+"</span><span style='margin-left:10px;'>"+params[i].data+unit+"</span></div>"
let dataVal=0;
if(params[i].data && params[i].data!=undefined && params[i].data!='undefined'){
dataVal=params[i].data
}
str+="<div style='display:flex;justify-content: space-between'><span>"+params[i].marker+params[i].seriesName+"</span><span style='margin-left:10px;'>"+dataVal+unit+"</span></div>"
}
return str
},
... ... @@ -247,11 +251,13 @@ export default {
color:'#0a1b31'
}
},
// position:'right',
min:0,
max:100,
splitNumber:5,
interval:(100-0)/5
}, {
},
{
name: '单位:万',
type: 'value',
axisLabel: {
... ...
... ... @@ -50,44 +50,88 @@ export default {
const startInterval=()=>{
if (proxy.timer) {
clearInterval(proxy.timer)
}
proxy.timer=setInterval(function (){
proxy.preOrNext(0);
},10000)
}
const preOrNext=(val)=>{
console.log("click",val)
let listArray=[];
proxy.listArray.map((item,index)=>{
listArray.push(item.busId)
})
let index=listArray.indexOf(proxy.checkId)
if(index!=-1){
if(index>=4){
proxy.arrowClick('right')
}
if(index+1==listArray.length){
proxy.checkId=listArray[0]
proxy.arrowClick('left')
if(val==0){
proxy.preNext()
}else{
if(val=='left'){
proxy.checkId=listArray[index+1]
}else{
proxy.preNext()
}
}
}else{
if(val=='left'){
if(index==0){
proxy.checkId=listArray[listArray.length-1]
proxy.clickNext()
}else{
proxy.checkId=listArray[index-1]
}
}else{
proxy.checkId=listArray[index+1]
if(index>=4){
proxy.clickNext()
}
}
proxy.clickTabs(proxy.checkId)
}
},10000)
proxy.clickTabs(proxy.checkId)
}
/*if(val){
if (proxy.timer) {
clearInterval(proxy.timer)
const arrowClick=(val)=>{
}
if(val=='right'){
proxy.$refs.cardShow.next();
proxy.nextPage();
proxy.clickNext()
}else{
proxy.$refs.cardShow.prev();
proxy.prePage();
proxy.preNext()
}
}else{
}*/
}
const arrowClick=(val)=>{
proxy.preOrNext(val);
}
const clickNext=()=>{
proxy.$refs.cardShow.next();
proxy.nextPage();
}
const preNext=()=>{
proxy.$refs.cardShow.next();
proxy.prePage();
}
const nextPage= ()=>{
if (proxy.currentPage == proxy.pageNum - 1) return;
... ... @@ -105,6 +149,9 @@ export default {
return{
arrowClick,
clickNext,
preNext,
preOrNext,
nextPage,
prePage,
startInterval,
... ...
... ... @@ -191,12 +191,16 @@ export default {
let str='<div>'+params[0].name+'</div>';
let unit='%';
for(let i=0;i<params.length;i++){
if(i==0 || i==3){
unit="个"
if(i==3){
unit=" 个"
}else{
unit="%"
}
str+="<div style='display:flex;justify-content: space-between'><span>"+params[i].marker+params[i].seriesName+"</span><span style='margin-left:10px;'>"+params[i].data+unit+"</span></div>"
let dataVal=0;
if(params[i].data && params[i].data!=undefined && params[i].data!='undefined') {
dataVal=params[i].data
}
str+="<div style='display:flex;justify-content: space-between'><span>"+params[i].marker+params[i].seriesName+"</span><span style='margin-left:10px;'>"+dataVal+unit+"</span></div>"
}
return str
},
... ... @@ -251,11 +255,13 @@ export default {
color:'#0a1b31'
}
},
// position:'right',
min:0,
max:100,
splitNumber:10,
interval:(100-0)/10
}, {
},
{
name: '单位:万',
type: 'value',
axisLabel: {
... ...