1

web/pages/personalsettingsedit.html

@@ -19,6 +19,19 @@
                 </div>
             </div>
 
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                  <label class="layui-form-label">分析标签</label>
+                  <div class="layui-input-inline">
+                    <select name="label_id" lay-filter="aihao">
+                        <option value="">无</option>
+                        <option value="hero_id">hero_id</option>
+                      </select>
+
+                  </div>
+                </div>
+            </div>
+
             <div class="layui-form-item">
                 <div class="layui-inline">
                   <label class="layui-form-label">状态</label>
@@ -38,7 +51,7 @@
 
     </div>
 
-    <div class="eventattradminedit-but-box">
+    <div class="eventattradminedit-but-box" style="margin-top: -30px;">
         <div class="personalsettingsedit-qx">取 消</div>
         <div class="personalsettingsedit-qd">确 定</div>
     </div>

web/pages/setgrouping.html

@@ -24,7 +24,7 @@
             <div class="setgrouping-content-title">{{item.title}}</div>
             <div class="setgrouping-content-list-box">
                 {{#  layui.each(item.category, function(indexs, items){ }}
-                <div class="setgrouping-content-list" data-index="{{index}}" data-indexs="{{indexs}}" data-id="{{items.event_desc}}" data-name="{{items.event_name}}">
+                <div class="setgrouping-content-list" data-index="{{index}}" data-indexs="{{indexs}}" data-id="{{items.event_desc}}" data-name="{{items.event_name}}" data-label="{{items.event_label}}">
                     <div>{{items.event_desc}}</div>
                     <!-- {{#  if(items.isshoucang != 1){ }} -->
                     <img src="./static/img/xing1.png" class="setgrouping-content-list-img">

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);
 

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:'/'},
         ]

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;
                     // })

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){

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 {
                 

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);
+
+                    
+
+                });
+
             };
 
             // 返回

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);