From 6825157edf40ad13bfca1d7995106bc1f0405ac9 Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Thu, 12 May 2022 16:27:44 +0800 Subject: [PATCH] 1 --- web/pages/personalsettingsedit.html | 15 +++++++- web/pages/setgrouping.html | 2 +- web/src/x.min.js | 48 +++++++++++++++++++++--- web/srczip/common.js | 2 +- web/srczip/logic/distribution.js | 5 ++- web/srczip/logic/eventmanagement.js | 3 +- web/srczip/logic/personalsettingsedit.js | 3 +- web/srczip/logic/routeanalysis.js | 19 +++++++++- web/srczip/logic/setgrouping.js | 3 +- 9 files changed, 86 insertions(+), 14 deletions(-) diff --git a/web/pages/personalsettingsedit.html b/web/pages/personalsettingsedit.html index 77f30ca..a1dcb57 100644 --- a/web/pages/personalsettingsedit.html +++ b/web/pages/personalsettingsedit.html @@ -19,6 +19,19 @@ +
+
+ +
+ + +
+
+
+
@@ -38,7 +51,7 @@
-
+
取 消
确 定
diff --git a/web/pages/setgrouping.html b/web/pages/setgrouping.html index 53c3b0c..bc7603f 100644 --- a/web/pages/setgrouping.html +++ b/web/pages/setgrouping.html @@ -24,7 +24,7 @@
{{item.title}}
{{# layui.each(item.category, function(indexs, items){ }} -
+
{{items.event_desc}}
diff --git a/web/src/x.min.js b/web/src/x.min.js index 0813468..bd01a00 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -128,7 +128,7 @@ var X = window.X || { "operatorarr": [ {title: '无',id:""}, {title: '+',id:'+'}, - {title: '-',id:'-'}, + {title: '-',id:'-'}, {title: '*',id:'*'}, {title: '/',id:'/'}, ] @@ -8388,7 +8388,8 @@ var X = window.X || { "quotaname":"次数", "relation":"and", //筛选关系 "type":"normal", - "renameindicator":'' //重命名指标 + "renameindicator":'', //重命名指标 + "label_id":"" } ] data['events'] = arr; @@ -8434,8 +8435,10 @@ var X = window.X || { X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){ obj.html(val.id); + console.log(val); dataevent['eventName'] = val.name; dataevent['eventDesc'] = val.id; + dataevent['label_id'] = val.label_id // X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){ // groupitemeventsdata= val; // }) @@ -9293,12 +9296,13 @@ var X = window.X || { }) }); - + }, eventmanagementlist : function(){ X.laytabledata("#eventmanagement-table","data_mana/event_list",[[ {field:'name', title: '事件名', sort: true} ,{field:'show_name', title: '显示名'} + ,{field:'label_id', title: '分析标签'} ,{field:'desc', title: '备注'} ,{field:'is_show', title: '显示状态', minWidth: 100,templet:function(d){ if(d.is_show){ @@ -11718,6 +11722,19 @@ var X = window.X || { }); + } + }; +})(); +// srczip/logic/nodedetails.js +(function(){ + X.pageLogic['nodedetails'] = { + init : function(parms){ + var me = this; + var me = this; + this.parms = parms; + this.callback = parms.callback; + + } }; })(); @@ -11915,7 +11932,8 @@ var X = window.X || { layui.form.val('personalsettingseditexample', { "show_name": data.show_name // "name": "value" ,"desc": data.desc - ,"is_show":(data.is_show)? 1 : 0 + ,"is_show":(data.is_show)? 1 : 0, + "label_id": data.label_id }); }else { @@ -13713,7 +13731,15 @@ var X = window.X || { //计算按钮 $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){ - calculationdata(); + // calculationdata(); + X.open({ + type: 1, + title: false, + closeBtn: 0, + shadeClose: true, + skin: 'yourclass', + url: 'nodedetails' + }) }); @@ -13829,6 +13855,15 @@ var X = window.X || { myChart.on('click', function (params) { console.log(params); }); + + // 跳转节点详情弹窗 + myChart.on('click', function (params) { + // console.log(params); + + + + }); + }; // 返回 @@ -14451,7 +14486,8 @@ var X = window.X || { 'name':$(this).attr('data-name'), 'id':$(this).attr('data-id'), 'event_attr':data[index]['category'][indexs].event_attr, - 'event_filter':data[index]['category'][indexs].event_filter + 'event_filter':data[index]['category'][indexs].event_filter, + 'label_id': $(this).attr("data-label") } me.callback && me.callback(valdata); diff --git a/web/srczip/common.js b/web/srczip/common.js index d4471c2..56765d4 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -127,7 +127,7 @@ var X = window.X || { "operatorarr": [ {title: '无',id:""}, {title: '+',id:'+'}, - {title: '-',id:'-'}, + {title: '-',id:'-'}, {title: '*',id:'*'}, {title: '/',id:'/'}, ] diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js index 32f279b..68ea086 100644 --- a/web/srczip/logic/distribution.js +++ b/web/srczip/logic/distribution.js @@ -110,7 +110,8 @@ "quotaname":"次数", "relation":"and", //筛选关系 "type":"normal", - "renameindicator":'' //重命名指标 + "renameindicator":'', //重命名指标 + "label_id":"" } ] data['events'] = arr; @@ -156,8 +157,10 @@ X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){ obj.html(val.id); + console.log(val); dataevent['eventName'] = val.name; dataevent['eventDesc'] = val.id; + dataevent['label_id'] = val.label_id // X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){ // groupitemeventsdata= val; // }) diff --git a/web/srczip/logic/eventmanagement.js b/web/srczip/logic/eventmanagement.js index 2f97f99..2ef619e 100644 --- a/web/srczip/logic/eventmanagement.js +++ b/web/srczip/logic/eventmanagement.js @@ -21,12 +21,13 @@ }) }); - + }, eventmanagementlist : function(){ X.laytabledata("#eventmanagement-table","data_mana/event_list",[[ {field:'name', title: '事件名', sort: true} ,{field:'show_name', title: '显示名'} + ,{field:'label_id', title: '分析标签'} ,{field:'desc', title: '备注'} ,{field:'is_show', title: '显示状态', minWidth: 100,templet:function(d){ if(d.is_show){ diff --git a/web/srczip/logic/personalsettingsedit.js b/web/srczip/logic/personalsettingsedit.js index 755048e..06e686e 100644 --- a/web/srczip/logic/personalsettingsedit.js +++ b/web/srczip/logic/personalsettingsedit.js @@ -10,7 +10,8 @@ layui.form.val('personalsettingseditexample', { "show_name": data.show_name // "name": "value" ,"desc": data.desc - ,"is_show":(data.is_show)? 1 : 0 + ,"is_show":(data.is_show)? 1 : 0, + "label_id": data.label_id }); }else { diff --git a/web/srczip/logic/routeanalysis.js b/web/srczip/logic/routeanalysis.js index d463ec2..3a56658 100644 --- a/web/srczip/logic/routeanalysis.js +++ b/web/srczip/logic/routeanalysis.js @@ -400,7 +400,15 @@ //计算按钮 $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){ - calculationdata(); + // calculationdata(); + X.open({ + type: 1, + title: false, + closeBtn: 0, + shadeClose: true, + skin: 'yourclass', + url: 'nodedetails' + }) }); @@ -516,6 +524,15 @@ myChart.on('click', function (params) { console.log(params); }); + + // 跳转节点详情弹窗 + myChart.on('click', function (params) { + // console.log(params); + + + + }); + }; // 返回 diff --git a/web/srczip/logic/setgrouping.js b/web/srczip/logic/setgrouping.js index 61e2c9c..2e91e3e 100644 --- a/web/srczip/logic/setgrouping.js +++ b/web/srczip/logic/setgrouping.js @@ -51,7 +51,8 @@ 'name':$(this).attr('data-name'), 'id':$(this).attr('data-id'), 'event_attr':data[index]['category'][indexs].event_attr, - 'event_filter':data[index]['category'][indexs].event_filter + 'event_filter':data[index]['category'][indexs].event_filter, + 'label_id': $(this).attr("data-label") } me.callback && me.callback(valdata);