From e8d566fd1c70166e8202a7368d51b010f7e86bbd Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Thu, 6 Jan 2022 10:11:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9C=8B=E6=9D=BF=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=A0=87=E8=AE=B0=E5=8F=AF=E6=9F=A5=E7=9C=8B=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/pages/dashboard.html | 2 + web/pages/modeltype.html | 19 ++++++-- web/src/x.min.js | 86 +++++++++++++++++++++++++++++----- web/srczip/common.js | 3 +- web/srczip/logic/dashboard.js | 49 ++++++++++++++++++- web/srczip/logic/screen.js | 34 ++++++++++---- web/static/css/style.css | 6 +++ web/static/img/jeiguo.png | Bin 0 -> 1224 bytes 8 files changed, 169 insertions(+), 30 deletions(-) create mode 100644 web/static/img/jeiguo.png diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html index 4d07d21..c9795a5 100644 --- a/web/pages/dashboard.html +++ b/web/pages/dashboard.html @@ -674,6 +674,7 @@
+
@@ -711,6 +712,7 @@
+
diff --git a/web/pages/modeltype.html b/web/pages/modeltype.html index 6e63e83..f236168 100644 --- a/web/pages/modeltype.html +++ b/web/pages/modeltype.html @@ -30,9 +30,15 @@ {{# } }}
{{# if(d.authority == "rw"){ }} -
- 报表 +
+
+ +
+
+ 报表 +
+ {{# } }}
@@ -61,8 +67,13 @@
{{# if(d.authority == "rw"){ }} -
- 趋势图 +
+
+ +
+
+ 趋势图 +
{{# } }}
diff --git a/web/src/x.min.js b/web/src/x.min.js index 9f38022..3eab49e 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -123,7 +123,8 @@ var X = window.X || { 'retentionlist' : [ {'title':'留存','id':0}, {'title':'流失','id':1}, - ] + ], + 'screenlist':[] }, }; @@ -5952,6 +5953,7 @@ var X = window.X || { //更新时间按钮 $(".updatetime").click(function(){ + X['DATA']['screenlist'] = []; X.updatatime(".updatetime"); me.gettabledata(); }); @@ -6029,6 +6031,7 @@ var X = window.X || { $(document).off('click','.tishi-tjsx').on('click','.tishi-tjsx',function(){ var obj = $(this); var id = obj.attr('data-id'); + var screenlist; var cat = obj.attr('data-cat'); var modelsize = obj.attr('data-modelsize'); var modeltype = obj.attr('data-modeltype'); @@ -6039,6 +6042,13 @@ var X = window.X || { var timetxtarr = timetxt.split(" - "); var startTime = timetxtarr[0] + " "+ "00:00:00"; var endTime = timetxtarr[1]+ " "+ "23:59:59"; + + for(let i in X.DATA['screenlist']){ + if(id == X.DATA['screenlist'][i]['id']){ + screenlist = X.DATA['screenlist'][i]; + } + } + X.open({ type: 1, title: false, @@ -6047,14 +6057,22 @@ var X = window.X || { shadeClose: true, offset: [120,270], url: "screen", - extData : id, + extData : screenlist, callback : function(d){ d['startTime'] = startTime; d['endTime']=endTime; + d['id'] = id; var dataArr = { report_id : id, ext_filter : d } + X.DATA['screenlist'].push(d); + + for(let i in X.DATA['screenlist']){ + var cardid = "model"+X.DATA['screenlist'][i]['id']; + $("#"+cardid+" .shaixjeiguo").show(); + } + X.api("ck/"+ cat +"_model","post",dataArr,function(vals){ if(vals == '查无数据'){ layer.msg('筛选条件无数据'); @@ -6083,6 +6101,28 @@ var X = window.X || { }) }); + $(document).off('click','.shaixjeiguo').on('click','.shaixjeiguo',function(){ + var id = $(this).attr('data-id'); + var filts + for(let i in X.DATA.screenlist){ + if(X.DATA.screenlist[i]['id'] == id){ + filts = X.DATA.screenlist[i]['filts']; + } + } + var filtshtml = '' + if(filts.length > 0){ + for(let i in filts){ + filtshtml+= filts[i]['columnDesc'] + filts[i]['comparator_name'] + filts[i]['strftv'] + '
' + } + } + + layui.layer.tips(filtshtml, '.shaixjeiguo', { + tips: [4, '#475285'] + }); + }) + + + // 侧边栏搜索 $('.sousuo-txt').bind('input propertychange', function() { var tit = $(this).val() @@ -6188,8 +6228,13 @@ var X = window.X || { }); //更新报表 - $(document).off('click','.model-gengx').on('click','.model-gengx',function(){ + $(document).off('click','.model-gengx').on('click','.model-gengx',function(){ var id = $(this).attr('data-id'); + for(let i in X['DATA']['screenlist']){ + if(X['DATA']['screenlist'][i]['id'] == id){ + X['DATA']['screenlist'].splice(i,1); + } + } X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){ // return; X.pageLogic['dashboard'].fillmodeldata(d[id]); @@ -7132,6 +7177,7 @@ var X = window.X || { //当外框和标题渲染完在渲染数据 if(num == Object.getOwnPropertyNames(d).length){ for(let q in d){ + // console.log(d[q]); X.pageLogic['dashboard'].fillmodeldata(d[q]); } } @@ -13216,6 +13262,25 @@ var X = window.X || { this.callback = parms.callback; //选择后执行的回调 var reportid = parms.extData;//获取到上层弹窗传的数据 + //默认开始时有一个数据 + var data = { + 'filts':[], + 'relation':'and' + }; + // if(reportid){ + // data = reportid; + // if(reportid.relation == 'and'){ + // $('.screen-left-qei').html("且"); + // }else { + // $('.screen-left-qei').html("或"); + // } + // if(reportid['filts'].length > 1){ + // $('.screen-left-qei').show(); + // } + // X.laytpldata("#screen-con-box-dot",reportid['filts'],".screen-con-box",function(){ + // renderdate(); + // }); + // } var my_event,load_filter_props,filter_map; X.api("data_auth/my_event","get",{},function(d){ @@ -13224,10 +13289,9 @@ var X = window.X || { load_filter_props = val; X.api("data_auth/filter_map","get",{},function(d){ filter_map = d; - // console.log(my_event); - // console.log(load_filter_props); - // console.log(filter_map); - updatascreencon(); + // if(!reportid){ + updatascreencon(); + // } }) }) }); @@ -13259,12 +13323,6 @@ var X = window.X || { data['relation'] = 'and'; } }); - - //默认开始时有一个数据 - var data = { - 'filts':[], - 'relation':'and' - }; function updatascreencon(){ var drr={ @@ -13278,7 +13336,9 @@ var X = window.X || { "section":[-1,1],//区间 "tableType":load_filter_props[0]['id'] }; + data['filts'].push(drr); + X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){ renderdate(); }); diff --git a/web/srczip/common.js b/web/srczip/common.js index ce64669..baebe5d 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -122,7 +122,8 @@ var X = window.X || { 'retentionlist' : [ {'title':'留存','id':0}, {'title':'流失','id':1}, - ] + ], + 'screenlist':[] }, }; diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index 0500bca..1f9fafb 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -119,6 +119,7 @@ //更新时间按钮 $(".updatetime").click(function(){ + X['DATA']['screenlist'] = []; X.updatatime(".updatetime"); me.gettabledata(); }); @@ -196,6 +197,7 @@ $(document).off('click','.tishi-tjsx').on('click','.tishi-tjsx',function(){ var obj = $(this); var id = obj.attr('data-id'); + var screenlist; var cat = obj.attr('data-cat'); var modelsize = obj.attr('data-modelsize'); var modeltype = obj.attr('data-modeltype'); @@ -206,6 +208,13 @@ var timetxtarr = timetxt.split(" - "); var startTime = timetxtarr[0] + " "+ "00:00:00"; var endTime = timetxtarr[1]+ " "+ "23:59:59"; + + for(let i in X.DATA['screenlist']){ + if(id == X.DATA['screenlist'][i]['id']){ + screenlist = X.DATA['screenlist'][i]; + } + } + X.open({ type: 1, title: false, @@ -214,14 +223,22 @@ shadeClose: true, offset: [120,270], url: "screen", - extData : id, + extData : screenlist, callback : function(d){ d['startTime'] = startTime; d['endTime']=endTime; + d['id'] = id; var dataArr = { report_id : id, ext_filter : d } + X.DATA['screenlist'].push(d); + + for(let i in X.DATA['screenlist']){ + var cardid = "model"+X.DATA['screenlist'][i]['id']; + $("#"+cardid+" .shaixjeiguo").show(); + } + X.api("ck/"+ cat +"_model","post",dataArr,function(vals){ if(vals == '查无数据'){ layer.msg('筛选条件无数据'); @@ -250,6 +267,28 @@ }) }); + $(document).off('click','.shaixjeiguo').on('click','.shaixjeiguo',function(){ + var id = $(this).attr('data-id'); + var filts + for(let i in X.DATA.screenlist){ + if(X.DATA.screenlist[i]['id'] == id){ + filts = X.DATA.screenlist[i]['filts']; + } + } + var filtshtml = '' + if(filts.length > 0){ + for(let i in filts){ + filtshtml+= filts[i]['columnDesc'] + filts[i]['comparator_name'] + filts[i]['strftv'] + '
' + } + } + + layui.layer.tips(filtshtml, '.shaixjeiguo', { + tips: [4, '#475285'] + }); + }) + + + // 侧边栏搜索 $('.sousuo-txt').bind('input propertychange', function() { var tit = $(this).val() @@ -355,8 +394,13 @@ }); //更新报表 - $(document).off('click','.model-gengx').on('click','.model-gengx',function(){ + $(document).off('click','.model-gengx').on('click','.model-gengx',function(){ var id = $(this).attr('data-id'); + for(let i in X['DATA']['screenlist']){ + if(X['DATA']['screenlist'][i]['id'] == id){ + X['DATA']['screenlist'].splice(i,1); + } + } X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){ // return; X.pageLogic['dashboard'].fillmodeldata(d[id]); @@ -1299,6 +1343,7 @@ //当外框和标题渲染完在渲染数据 if(num == Object.getOwnPropertyNames(d).length){ for(let q in d){ + // console.log(d[q]); X.pageLogic['dashboard'].fillmodeldata(d[q]); } } diff --git a/web/srczip/logic/screen.js b/web/srczip/logic/screen.js index 5213b50..e3ac81a 100644 --- a/web/srczip/logic/screen.js +++ b/web/srczip/logic/screen.js @@ -8,6 +8,25 @@ this.callback = parms.callback; //选择后执行的回调 var reportid = parms.extData;//获取到上层弹窗传的数据 + //默认开始时有一个数据 + var data = { + 'filts':[], + 'relation':'and' + }; + // if(reportid){ + // data = reportid; + // if(reportid.relation == 'and'){ + // $('.screen-left-qei').html("且"); + // }else { + // $('.screen-left-qei').html("或"); + // } + // if(reportid['filts'].length > 1){ + // $('.screen-left-qei').show(); + // } + // X.laytpldata("#screen-con-box-dot",reportid['filts'],".screen-con-box",function(){ + // renderdate(); + // }); + // } var my_event,load_filter_props,filter_map; X.api("data_auth/my_event","get",{},function(d){ @@ -16,10 +35,9 @@ load_filter_props = val; X.api("data_auth/filter_map","get",{},function(d){ filter_map = d; - // console.log(my_event); - // console.log(load_filter_props); - // console.log(filter_map); - updatascreencon(); + // if(!reportid){ + updatascreencon(); + // } }) }) }); @@ -51,12 +69,6 @@ data['relation'] = 'and'; } }); - - //默认开始时有一个数据 - var data = { - 'filts':[], - 'relation':'and' - }; function updatascreencon(){ var drr={ @@ -70,7 +82,9 @@ "section":[-1,1],//区间 "tableType":load_filter_props[0]['id'] }; + data['filts'].push(drr); + X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){ renderdate(); }); diff --git a/web/static/css/style.css b/web/static/css/style.css index 1c22da5..7c0c9d2 100644 --- a/web/static/css/style.css +++ b/web/static/css/style.css @@ -104,6 +104,12 @@ font-weight: bold; } +.guolv-dian { width: 5px; height: 5px; border-radius: 50%; background-color: red; position: relative; top: -20px; left: 20px; display: none; } +.card-tow-right { display: flex; align-items: center; } +.shaixjeiguo { padding: 3px 5px; cursor: pointer; display: none; } +.shaixjeiguo img{ width: 16px; height: 16px; } +.shaixjeiguo:hover { background-color: #f0f2f5; } + .username { color: #67729d; margin-right: 16px; } .layui-project { position:absolute; top: 0; left: 80px; ;} .layui-nav-bar { width: 0px !important; height: 0px !important; } diff --git a/web/static/img/jeiguo.png b/web/static/img/jeiguo.png new file mode 100644 index 0000000000000000000000000000000000000000..0929d13c316efc126ff075508e08ca9bc9c8fe14 GIT binary patch literal 1224 zcmV;(1ULJMP)Px(f=NU{R9HvFmS1cXRTRd*bEjZY@lC{6qmlrHuE7v7Jn({v8WIz1lt`qre`dQz z+MO+e6=N|`3*DVoiS5qp&NdB#v3=r!7#}nQHANGJHuyLCM55Jbh*}e1ckeMXyW4KJ zv$Ib}fo?m6H0yJyasxrG1uN6q@j;}dJLGZQh-Mkw21e_mb;cJ; zi-?X4c3y4<#1o(^KDJYm{20Khk_dlFjEN$|_ayR{t(5jhMZBwbd`qE_-zo%l1N7X2 zDIGTr^++R#B>-AaW-o-8tRyn{1m=oIElbNc5{oA6Bg}YfK9_mO8Vc!tc}oFwy8u8b zCDAjcp?=WFxOzPnd-u*_YwHD+dIlu8Eu9Qqsi(0BK#SXxAnbLE4(hfH^_}IISI26) z&80nH%1i}!Gz5smv-^nXbje&Evy5>6a?Q0wZljq}zjgA$y1hpLXI(wQD^@D_rkCD) z1tPlrIRQI}@QW<2-ewK&|8+S4jyV_;BycdDR6lWYH9dQ((wK@O?j0HIoUPS#0S@$! zwchrZ{1b%R8R)l+;IUgV2Y6Gdg4|&lp~+}Z_E8q}nR8DP9?ztLA9@0W6V}6ml`q{u zSqx-`BTdb)yUX&~V}tL*2X-z@4Xgh-S^5tZ2ecG9v-tAJYil9#WwyTEkb98!0A0z~5WZX$f-EDDm_MpNOhssk4u zMY$5?ZU>{w915oWCPve3XPnm)A(c)Adp!X{-I;q7MYuD{%m=KY(0Fa&VhHC2M@Q3! z`i7r*ShpS&P=0V@i1wK&^?gqO=Vm0HohG6!0KaD%q5WRM6$k>4rj1a{&%89E_KRS+ zuXBl(4H@J4AL{~WdiF3t10`6zoK6MZ|6Y}7<~7|F&)p}9e|Ga3mN^vEy!2{6Mi)WY z?gT2=udf{$d10>6F6*spdiDZ9I{{o3t8Z)_9f)0P2oO6o)?O^iOXa{zrV)JTRsgE| zg#|xpB}3=x>3Ez6asvP#E;r6iDi$A04~Ne;0}|=ZZKoC<2V+AezVcmY8lc>e1`)*< zk~k?9<#eXbIWHE^-d_McMT8SxMt%@=52exG>}F=Nz<6Xql>P?ucL1gV6ad=D;7vrh zyUKVLkUb2N1e$16iN?qBgxyCB-+7-mVVn}m&E9mf>vy-3diLo?5Dftwq1d6Z^?4}+ zf~lQ=fCL8!SO;K=AukFR)3T*7V-0Ghv8(zuf@lh$nFjQW@q<_q0KdnvVgR)emC0C9 mfC_|jb