From d09dfe3df961aa0612e707b39ee36c78b4e3deeb Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Mon, 1 Nov 2021 11:44:12 +0800 Subject: [PATCH] 1 --- web/pages/analysis.html | 9 ++++++++- web/src/x.min.js | 29 ++++++++++++++++++++--------- web/srczip/common.js | 5 ++++- web/srczip/logic/analysis.js | 18 +++++++++++++----- web/srczip/logic/dashboard.js | 6 +++--- web/static/css/analysis.css | 4 +++- web/static/img/ishide.png | Bin 0 -> 452 bytes web/static/img/isshow.png | Bin 0 -> 477 bytes 8 files changed, 51 insertions(+), 20 deletions(-) create mode 100644 web/static/img/ishide.png create mode 100644 web/static/img/isshow.png diff --git a/web/pages/analysis.html b/web/pages/analysis.html index 21a88a7..82696e8 100644 --- a/web/pages/analysis.html +++ b/web/pages/analysis.html @@ -252,7 +252,7 @@
{{index}}
-
{{item.event_desc}}
+
{{item.event_desc}}
的
{{item.event_attr}}
{{# if(item.event_attr_id != "*"){ }} @@ -370,6 +370,13 @@
+ {{# if(item.is_show){ }} +
+ {{# } else { }} +
+ {{# } }} + +
diff --git a/web/src/x.min.js b/web/src/x.min.js index 82940de..ac86c65 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -800,7 +800,9 @@ var X = window.X || { X.eventchart = function(data,callback){ var legenddata=[]; + var legendnamearr = []; for(let i in data){ + legendnamearr.push(data[i]['event_name']) for(let z in data[i]['groups']){ var pj = data[i]['event_name']+data[i]['groups'][z]; legenddata.push(pj); @@ -866,11 +868,12 @@ var X = window.X || { chain_ratiotype = '-' } } - + console.log(legendnamearr); var dataArr = { xAxisData:data[0]['date_range'], legenddata:legenddata, seriesData:seriesData, + legendnamearr:legendnamearr, selected:selected, date:date, sum:sum, @@ -3437,7 +3440,8 @@ var X = window.X || { "customEvent":'', "eventNameDisplay":'',//重命名指标 "format":'float', - "formatname":'两位小数' + "formatname":'两位小数', + "is_show" : true } data.events.push(defaultindicator); updataindex(data.events); @@ -3559,6 +3563,15 @@ var X = window.X || { }) }); + // 显示隐藏 + $(document).off("click",".analysis-isshow-click").on("click",".analysis-isshow-click",function(){ + var index = $(this).attr("data-index"); + var type = $(this).attr("data-type"); + var isshow = (type == "true") ? false : true; + data['events'][index]['is_show'] = isshow; + updataindex(data.events); + }); + // 切换为指标公式或组合 $(document).off('click','.analysis-gongshi').on('click','.analysis-gongshi',function(){ var index = $(this).attr("data-index"); @@ -3617,9 +3630,6 @@ var X = window.X || { obj.html(htmlstring); data['events'][index]['event_desc'] = val.id; data['events'][index]['event_name'] = val.name; - - - }) }); //设置一级事件中第二个参数 @@ -3799,7 +3809,8 @@ var X = window.X || { "customEvent":'', "eventNameDisplay":'',//重命名指标 "format":'float', - "formatname":'两位小数' + "formatname":'两位小数', + "is_show": true } data['events'].push(defaultindicator); @@ -6535,9 +6546,9 @@ var X = window.X || { } }, color: X.DATA.echartscolor, - // legend: { - // data: legendData - // }, + legend: { + // data: eventdata['legendnamearr'], + }, grid: { left: '2%', right: '2%', diff --git a/web/srczip/common.js b/web/srczip/common.js index 3622272..3060a4b 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -799,7 +799,9 @@ var X = window.X || { X.eventchart = function(data,callback){ var legenddata=[]; + var legendnamearr = []; for(let i in data){ + legendnamearr.push(data[i]['event_name']) for(let z in data[i]['groups']){ var pj = data[i]['event_name']+data[i]['groups'][z]; legenddata.push(pj); @@ -865,11 +867,12 @@ var X = window.X || { chain_ratiotype = '-' } } - + console.log(legendnamearr); var dataArr = { xAxisData:data[0]['date_range'], legenddata:legenddata, seriesData:seriesData, + legendnamearr:legendnamearr, selected:selected, date:date, sum:sum, diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js index e4d6427..9ca6b07 100644 --- a/web/srczip/logic/analysis.js +++ b/web/srczip/logic/analysis.js @@ -80,7 +80,8 @@ "customEvent":'', "eventNameDisplay":'',//重命名指标 "format":'float', - "formatname":'两位小数' + "formatname":'两位小数', + "is_show" : true } data.events.push(defaultindicator); updataindex(data.events); @@ -202,6 +203,15 @@ }) }); + // 显示隐藏 + $(document).off("click",".analysis-isshow-click").on("click",".analysis-isshow-click",function(){ + var index = $(this).attr("data-index"); + var type = $(this).attr("data-type"); + var isshow = (type == "true") ? false : true; + data['events'][index]['is_show'] = isshow; + updataindex(data.events); + }); + // 切换为指标公式或组合 $(document).off('click','.analysis-gongshi').on('click','.analysis-gongshi',function(){ var index = $(this).attr("data-index"); @@ -260,9 +270,6 @@ obj.html(htmlstring); data['events'][index]['event_desc'] = val.id; data['events'][index]['event_name'] = val.name; - - - }) }); //设置一级事件中第二个参数 @@ -442,7 +449,8 @@ "customEvent":'', "eventNameDisplay":'',//重命名指标 "format":'float', - "formatname":'两位小数' + "formatname":'两位小数', + "is_show": true } data['events'].push(defaultindicator); diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index ac39e85..9996e1f 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -1144,9 +1144,9 @@ } }, color: X.DATA.echartscolor, - // legend: { - // data: legendData - // }, + legend: { + // data: eventdata['legendnamearr'], + }, grid: { left: '2%', right: '2%', diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css index 61e64a2..bf20c0f 100644 --- a/web/static/css/analysis.css +++ b/web/static/css/analysis.css @@ -82,7 +82,7 @@ .analysis-con-left-screen-list-right-box { display: none; } .analysis-con-left-screen-list-right { margin-right: 8px; display: flex; justify-content: space-between; align-items: center; } -.analysis-con-left-screen-list-right div { width: 24px; height: 24px; border-radius: 2px; margin-left: 8px; cursor: pointer;} +.analysis-con-left-screen-list-right div { width: 24px; height: 24px; border-radius: 2px; margin-left: 8px; cursor: pointer; background-position: 4px 4px !important;} .analysis-con-left-screen-list-right div:hover { background-color: #f0f2f5; } .analysis-chongmingming { background: url("../img/chongmingming.png") no-repeat; } .analysis-chongmingming-del { background: url("../img/cha1.png") no-repeat; display: none;} @@ -93,6 +93,8 @@ .analysis-fuzhi { background: url("../img/fuzhi.png") no-repeat; } .analysis-del { background: url("../img/del.png") no-repeat;} .analysis-zuhe { background: url("../img/zuhe.png") no-repeat !important; } +.analysis-isshow { background: url("../img/isshow.png") no-repeat ; } +.analysis-ishide { background: url("../img/ishide.png") no-repeat ; } .analysis-con-left-screen-list-left-zhibiaoname { display: none; color: #42546d; height: 24px; margin-left: 32px; padding-bottom: 8px; font-weight: 500; font-size: 13px; line-height: 24px; border: 0px ; } .analysis-con-left-screen-list-left-zhibiaoname input { color: #42546d; border: 0; background-color: rgba(0, 0, 0, 0); } .analysis-con-left-screen-list-left-zhibiaoname2 { border-bottom: 1px solid #f0f0f0; display: block; color: #42546d; height: 24px; margin-left: 7px; padding-bottom: 8px; font-weight: 500; font-size: 13px; line-height: 24px; border: 0px ; } diff --git a/web/static/img/ishide.png b/web/static/img/ishide.png new file mode 100644 index 0000000000000000000000000000000000000000..13f513933aa74fcf53a4521dde3d5156cdc8ccf3 GIT binary patch literal 452 zcmV;#0XzPQP)Px$en~_@R5(w~ldnreK@i8kbMHM2*R-6?AeIwy9{ClVDFA|t}5Wp&c1`+KlrLKK2Gxq~n0I=kon@*DCtPS}D zFmp^qmm)HoB*`f=_c`YliD*DX%Ep+zG)>1cnamD=Bdztmhcp4qJVivF8h2DZbk5xp z(F=g}D2j&SIDYf-*4ks|Tup1e*#?}5NZlB-)^3fNpS0G!tpblkG_91n^?s#N8I7Xo zMk&?RDd7twP189d+9skDz>Lk@mFnMz*o0)W*{wpM@LH`_yBm$h zq}KYl)rlYEK@bFkKKXM7oolhyE{n)IfE6No0PqaJZ($0+eHext#bVLFH|@tu^cur3 u90xE0pa;N}h}4WRPx$mq|oHR5(w~lRrpXQ543%?`jBLTF|Lm2k9jJ>H zAcA6UECHLBy!W!yrQ)F71P6zr;G~1INTE{^+o}G!r@S-?iB96;-7b9RchC2obBQ}1 z-mxC{6yOxXG$_LWQca8B1oq(c;iLJr+0=Qb?Jf(sNq-Pl%?RvYD6V)*dN&e}7yN-s zPy?7EIO3H?H(HQ3U~D2tP_ScxRL$u1T)zIqs;dtKp9<_&)nq@9<-;K=`9#QaQVjVW|OB99RDN+>S?^aJu;goo9V-nzc}_jHwS^F#ju3EHI* T`@Q8F00000NkvXXu0mjfA=KQ_ literal 0 HcmV?d00001