monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 18faf39dacf8b28283d3c86de46d9cbb65f30e6d 1 parent 3773f479

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

Inline Side-by-side
Showing 4 changed files with 91 additions and 30 deletions
@@ -69,6 +69,8 @@ body{font-size: 15px;} @@ -69,6 +69,8 @@ body{font-size: 15px;}
69 .screen-nav{ 69 .screen-nav{
70 margin-bottom: 30px; 70 margin-bottom: 30px;
71 padding-right: 20px; 71 padding-right: 20px;
  72 + z-index: 1;
  73 + position: relative;
72 } 74 }
73 .screen-res-performance{ 75 .screen-res-performance{
74 display: flex; 76 display: flex;
@@ -187,12 +187,16 @@ export default { @@ -187,12 +187,16 @@ export default {
187 let str='<div>'+params[0].name+'</div>'; 187 let str='<div>'+params[0].name+'</div>';
188 let unit='%'; 188 let unit='%';
189 for(let i=0;i<params.length;i++){ 189 for(let i=0;i<params.length;i++){
190 - if(i==0 || i==3){  
191 - unit="个" 190 + if(i==3){
  191 + unit=" 个"
192 }else{ 192 }else{
193 unit="%" 193 unit="%"
194 } 194 }
195 - 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>" 195 + let dataVal=0;
  196 + if(params[i].data && params[i].data!=undefined && params[i].data!='undefined'){
  197 + dataVal=params[i].data
  198 + }
  199 + 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>"
196 } 200 }
197 return str 201 return str
198 }, 202 },
@@ -247,11 +251,13 @@ export default { @@ -247,11 +251,13 @@ export default {
247 color:'#0a1b31' 251 color:'#0a1b31'
248 } 252 }
249 }, 253 },
  254 + // position:'right',
250 min:0, 255 min:0,
251 max:100, 256 max:100,
252 splitNumber:5, 257 splitNumber:5,
253 interval:(100-0)/5 258 interval:(100-0)/5
254 - }, { 259 + },
  260 + {
255 name: '单位:万', 261 name: '单位:万',
256 type: 'value', 262 type: 'value',
257 axisLabel: { 263 axisLabel: {
@@ -50,45 +50,89 @@ export default { @@ -50,45 +50,89 @@ export default {
50 const startInterval=()=>{ 50 const startInterval=()=>{
51 if (proxy.timer) { 51 if (proxy.timer) {
52 clearInterval(proxy.timer) 52 clearInterval(proxy.timer)
  53 +
53 } 54 }
54 proxy.timer=setInterval(function (){ 55 proxy.timer=setInterval(function (){
55 - let listArray=[];  
56 - proxy.listArray.map((item,index)=>{  
57 - listArray.push(item.busId)  
58 - })  
59 - let index=listArray.indexOf(proxy.checkId)  
60 -  
61 - if(index!=-1){  
62 - if(index>=4){  
63 - proxy.arrowClick('right') 56 + proxy.preOrNext(0);
  57 + },10000)
  58 + }
  59 + const preOrNext=(val)=>{
  60 + console.log("click",val)
  61 + let listArray=[];
  62 + proxy.listArray.map((item,index)=>{
  63 + listArray.push(item.busId)
  64 + })
  65 + let index=listArray.indexOf(proxy.checkId)
  66 + if(index!=-1){
  67 + if(index+1==listArray.length){
  68 + proxy.checkId=listArray[0]
  69 + if(val==0){
  70 + proxy.preNext()
  71 +
  72 + }else{
  73 + if(val=='left'){
  74 + proxy.checkId=listArray[index+1]
  75 + }else{
  76 + proxy.preNext()
  77 + }
64 } 78 }
65 - if(index+1==listArray.length){  
66 - proxy.checkId=listArray[0]  
67 - proxy.arrowClick('left')  
68 79
  80 + }else{
  81 +
  82 + if(val=='left'){
  83 + if(index==0){
  84 + proxy.checkId=listArray[listArray.length-1]
  85 + proxy.clickNext()
  86 + }else{
  87 + proxy.checkId=listArray[index-1]
  88 + }
69 }else{ 89 }else{
70 proxy.checkId=listArray[index+1] 90 proxy.checkId=listArray[index+1]
  91 + if(index>=4){
  92 + proxy.clickNext()
71 93
  94 + }
72 } 95 }
73 96
74 - proxy.clickTabs(proxy.checkId) 97 +
  98 +
75 99
76 } 100 }
77 - },10000)  
78 - }  
79 101
80 - const arrowClick=(val)=>{  
81 - if(val=='right'){  
82 - proxy.$refs.cardShow.next();  
83 - proxy.nextPage(); 102 + proxy.clickTabs(proxy.checkId)
  103 +
  104 + }
  105 + /*if(val){
  106 + if (proxy.timer) {
  107 + clearInterval(proxy.timer)
  108 +
  109 + }
  110 + if(val=='right'){
  111 + proxy.clickNext()
  112 +
  113 + }else{
  114 + proxy.preNext()
  115 +
  116 + }
84 117
85 }else{ 118 }else{
86 - proxy.$refs.cardShow.prev();  
87 - proxy.prePage();  
88 119
89 - } 120 + }*/
90 121
91 } 122 }
  123 +
  124 + const arrowClick=(val)=>{
  125 + proxy.preOrNext(val);
  126 +
  127 + }
  128 + const clickNext=()=>{
  129 + proxy.$refs.cardShow.next();
  130 + proxy.nextPage();
  131 + }
  132 + const preNext=()=>{
  133 + proxy.$refs.cardShow.next();
  134 + proxy.prePage();
  135 + }
92 const nextPage= ()=>{ 136 const nextPage= ()=>{
93 if (proxy.currentPage == proxy.pageNum - 1) return; 137 if (proxy.currentPage == proxy.pageNum - 1) return;
94 proxy.currentPage++; 138 proxy.currentPage++;
@@ -105,6 +149,9 @@ export default { @@ -105,6 +149,9 @@ export default {
105 149
106 return{ 150 return{
107 arrowClick, 151 arrowClick,
  152 + clickNext,
  153 + preNext,
  154 + preOrNext,
108 nextPage, 155 nextPage,
109 prePage, 156 prePage,
110 startInterval, 157 startInterval,
@@ -191,12 +191,16 @@ export default { @@ -191,12 +191,16 @@ export default {
191 let str='<div>'+params[0].name+'</div>'; 191 let str='<div>'+params[0].name+'</div>';
192 let unit='%'; 192 let unit='%';
193 for(let i=0;i<params.length;i++){ 193 for(let i=0;i<params.length;i++){
194 - if(i==0 || i==3){  
195 - unit="个" 194 + if(i==3){
  195 + unit=" 个"
196 }else{ 196 }else{
197 unit="%" 197 unit="%"
198 } 198 }
199 - 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>" 199 + let dataVal=0;
  200 + if(params[i].data && params[i].data!=undefined && params[i].data!='undefined') {
  201 + dataVal=params[i].data
  202 + }
  203 + 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>"
200 } 204 }
201 return str 205 return str
202 }, 206 },
@@ -251,11 +255,13 @@ export default { @@ -251,11 +255,13 @@ export default {
251 color:'#0a1b31' 255 color:'#0a1b31'
252 } 256 }
253 }, 257 },
  258 + // position:'right',
254 min:0, 259 min:0,
255 max:100, 260 max:100,
256 splitNumber:10, 261 splitNumber:10,
257 interval:(100-0)/10 262 interval:(100-0)/10
258 - }, { 263 + },
  264 + {
259 name: '单位:万', 265 name: '单位:万',
260 type: 'value', 266 type: 'value',
261 axisLabel: { 267 axisLabel: {