From 18faf39dacf8b28283d3c86de46d9cbb65f30e6d Mon Sep 17 00:00:00 2001
From: 鲁尚清 <lushangqing@honggroup.com.cn>
Date: Fri, 19 Nov 2021 11:50:00 +0800
Subject: [PATCH] 大屏及电子税务局页面样式修改，业务导航手动点击切换，业务性能鼠标悬浮过滤undefined，
---
hg-monitor-web-zj/src/main/resources/static/vue3/public/css/zjbigscreen.css | 2 ++
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/availability/index.js | 14 ++++++++++----
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/navTabs/index.js | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/performance/index.js | 14 ++++++++++----
4 files changed, 91 insertions(+), 30 deletions(-)
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/public/css/zjbigscreen.css b/hg-monitor-web-zj/src/main/resources/static/vue3/public/css/zjbigscreen.css
index d5a95cc..9d826a7 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/public/css/zjbigscreen.css
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/public/css/zjbigscreen.css
@@ -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;
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/availability/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/availability/index.js
index 41d921b..43cbaf0 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/availability/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/availability/index.js
@@ -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: {
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/navTabs/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/navTabs/index.js
index a5d1638..64ac0fd 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/navTabs/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/navTabs/index.js
@@ -50,45 +50,89 @@ export default {
const startInterval=()=>{
if (proxy.timer) {
clearInterval(proxy.timer)
+
}
proxy.timer=setInterval(function (){
- 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')
+ 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+1==listArray.length){
+ proxy.checkId=listArray[0]
+ if(val==0){
+ proxy.preNext()
+
+ }else{
+ if(val=='left'){
+ proxy.checkId=listArray[index+1]
+ }else{
+ proxy.preNext()
+ }
}
- if(index+1==listArray.length){
- proxy.checkId=listArray[0]
- proxy.arrowClick('left')
+ }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)
- }
- const arrowClick=(val)=>{
- if(val=='right'){
- proxy.$refs.cardShow.next();
- proxy.nextPage();
+ proxy.clickTabs(proxy.checkId)
+
+ }
+ /*if(val){
+ if (proxy.timer) {
+ clearInterval(proxy.timer)
+
+ }
+ if(val=='right'){
+ proxy.clickNext()
+
+ }else{
+ proxy.preNext()
+
+ }
}else{
- proxy.$refs.cardShow.prev();
- proxy.prePage();
- }
+ }*/
}
+
+ 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;
proxy.currentPage++;
@@ -105,6 +149,9 @@ export default {
return{
arrowClick,
+ clickNext,
+ preNext,
+ preOrNext,
nextPage,
prePage,
startInterval,
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/performance/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/performance/index.js
index e788d89..3dfb0d0 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/performance/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/performance/index.js
@@ -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: {
--
libgit2 0.24.0