1

web/pages/analysis.html

@@ -282,8 +282,8 @@
                                 <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="{{index}}" data-indexs="{{indexs}}" data-type="{{items.data_type}}">{{items.comparator_name}}</div>
                                 <!-- {{#  if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} -->
                                 {{#  if(items.tableType != "user_label"){ }}
-                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}"> 
+                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}" data-index="{{index}}" data-indexs="{{indexs}}"> 
-                                    <input type="text"  data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> 
+                                    <input type="text"  data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}" autocomplete="off"> 
                                 </div>
                                 {{#  } }} 
                                 <!-- {{#  } }}  -->
@@ -306,11 +306,11 @@
         {{#  } }} 
             <div class="analysis-custom-top">
                 <div class="analysis-num">{{index}}</div>
-                <div class="analysis-con-left-screen-list-left-zhibiaoname2"> <input data-index="{{index}}" type="text" value="{{item.eventNameDisplay}}" placeholder="请出入指标名"/></div>
+                <div class="analysis-con-left-screen-list-left-zhibiaoname2"> <input autocomplete="off" data-index="{{index}}" type="text" value="{{item.eventNameDisplay}}" placeholder="请出入指标名"/></div>
             </div>
 
             <div class="analysis-custom-event-box">
-                <input class="analysis-custom-event-txt" data-index="{{index}}" type="text" value="{{item.customEvent}}" placeholder="直接输入运算符或点击选择事件"/>
+                <input class="analysis-custom-event-txt" data-index="{{index}}" type="text" value="{{item.customEvent}}" placeholder="直接输入运算符或点击选择事件" autocomplete="off"/>
             </div>
             <div class="analysis-custom-event-dis-box" id="analysis-custom-event-dis-box-{{index}}">
                 <div class="analysis-custom-event-box analysis-custom-event-box-display">
@@ -339,7 +339,7 @@
                                 <div id="ta-property-select-{{index}}-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
                                 <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="{{index}}" data-indexs="{{indexs}}">{{items.comparator_name}}</div>
                                 <!-- {{#  if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} -->
-                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}"> <input type="text"  data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
+                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}" data-index="{{index}}" data-indexs="{{indexs}}"> <input type="text"  data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
                                 <!-- {{#  } }}  -->
                                 <div class="analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
                             </div>
@@ -420,8 +420,8 @@
             {{#  if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }}
                 <!-- <div class="analysis-overall-situation-input" > <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" /> </div> -->
                 {{#  if(item.data_type != "datetime" && item.data_type != "user_label"){ }}
-                    <div class="analysis-overall-situation-input" data-type="{{item.data_type}}"> 
+                    <div class="analysis-overall-situation-input" data-type="{{item.data_type}}" data-index="{{index}}"> 
-                        <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" data-type="{{item.data_type}}"/> 
+                        <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" data-type="{{item.data_type}}" autocomplete="off"/> 
                     </div>
                 {{# } else if(item.data_type == "user_label"){ }}
 
@@ -433,7 +433,7 @@
             {{#  } }} 
 
             {{#  if(item.comparator_id === "range"){ }}
-                <div class="analysis-overall-situation-input2" > <input data-index="{{index}}" type="text" value="{{item.section[0]}}" name="start"/> <span>与</span> <input data-index="{{index}}" name="end" type="text" value="{{item.section[1]}}"/> <span>之间</span> </div>
+                <div class="analysis-overall-situation-input2" > <input data-index="{{index}}" type="text" value="{{item.section[0]}}" name="start" autocomplete="off"/> <span>与</span> <input autocomplete="off" data-index="{{index}}" name="end" type="text" value="{{item.section[1]}}"/> <span>之间</span> </div>
             {{#  } }} 
             <p class="analysis-overall-situation-del" data-index="{{index}}"> <img src="./static/img/cha1.png"> </p>
         </div>

web/pages/customname.html

@@ -0,0 +1,59 @@
+
+<div class="eventattradmin-bg-box">
+
+    <div class="eventattradmin-box">
+        <div class="eventattradmin-top-box">
+            <div class="eventattradmin-left___y490Q">自定义别名<i class="layui-icon" title="">&#xe60b;</i> </div>
+
+            <div class="eventattradmin-right___1TIt8">
+
+
+                <input id="fileupload" type="file" class="form-control"  name="file"  >
+                <button type="button" class="layui-btn" id="test9" style="background-color:#3d90ff;">开始上传</button>
+            </div>
+
+        </div>
+
+
+        <div class="customname-table-box">
+            <div class="customname-info-bg">
+                <div class="customname-info-table-top">
+                    <div class="customname-info-table1">属性</div>
+                    <div class="customname-info-table2">值</div>
+                    <div class="customname-info-table2" style="border: 0;">值</div>
+                </div>
+                <div class="customname-content-box">
+                   
+    
+               
+                </div>
+
+            </div>
+        </div>
+
+
+    </div>
+
+</div>
+
+<script id="customname-content-box-dot" type="text/html">
+
+    {{# layui.each(d, function(index, item) {  }}
+
+        <div class="customname-val-box">
+            <div class="customname-val">
+                <span>{{item.attr_name}}</span>
+            </div>
+            <div class="customname-val-right-box">
+                {{# layui.each(item.map_, function(indexs, items) {  }}
+                <div class="customname-val-right">
+                    <div class="customname-val-right-val">{{items.title}}</div>
+                    <div class="customname-val-right-val">{{items.id}}</div>
+                </div>
+                {{#  }); }}
+            </div>
+        </div>
+        
+    {{#  }); }}
+
+</script>

web/pages/dashboard.html

@@ -51,7 +51,7 @@
                       <dd><a class="ajax-content" href="eventmanagement" data-id="conetnt">事件管理</a></dd>
                       <dd><a class="ajax-content" href="eventattradmin" data-id="conetnt">事件属性管理</a></dd>
                       <dd><a class="ajax-content" href="userattradmin" data-id="conetnt">用户属性管理</a></dd>
-                      <dd><a class="ajax-content" href="" data-id="conetnt">自定义别名</a></dd>
+                      <dd><a class="ajax-content" href="customname" data-id="conetnt">自定义别名</a></dd>
                       <dd><a class="ajax-content" href="datacheck" data-id="conetnt">埋点数据检查</a></dd>
                     </dl>
                   </li>

web/pages/event.html

@@ -33,8 +33,8 @@
                                 <div id="ta-property-select-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="0" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
                                 <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="0" data-indexs="{{indexs}}">{{items.comparatorName}}</div>
                                 {{#  if(items.comparator != "is null" && items.comparator != "is not null" && items.comparator !="not null" && items.comparator != "range" && items.data_type != "user_label"){ }}
-                                <div class="analysis-zhibiao-list-type4" data-type="{{items.data_type}}" >
+                                <div class="analysis-zhibiao-list-type4" data-type="{{items.data_type}}" data-index="0" data-indexs="{{indexs}}">
-                                     <input type="text" id="analysis-zhibiao-list-type4-{{indexs}}" data-index="0" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> 
+                                     <input autocomplete="off" type="text" id="analysis-zhibiao-list-type4-{{indexs}}" data-index="0" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> 
                                 </div>
                                 {{#  } }} 
                                 <div class="analysis-zhibiao-list-del analysis-zhibiao-list-del-initial-event" data-twonum="{{indexs}}"></div>

web/pages/globalfilter.html

@@ -6,7 +6,7 @@
             <div class="analysis-overall-situation-fuhao" data-index="{{index}}" data-type="{{item.data_type}}" >{{item.comparator_name}}</div>
             {{#  if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }}
                 {{#  if(item.data_type != "datetime" && item.data_type != "user_label"){ }}
-                    <div class="analysis-overall-situation-input" data-type="{{item.data_type}}"> 
+                    <div class="analysis-overall-situation-input" data-type="{{item.data_type}}" data-index="{{index}}"> 
                         <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" data-type="{{item.data_type}}"/> 
                     </div>
                 {{# } else if(item.data_type == "user_label"){ }}
@@ -19,7 +19,7 @@
             {{#  } }}
 
             {{#  if(item.comparator === "range"){ }}
-                <div class="analysis-overall-situation-input2" > <input data-index="{{index}}" type="text" value="{{item.section[0]}}" name="start"/> <span>与</span> <input data-index="{{index}}" name="end" type="text" value="{{item.section[1]}}"/> <span>之间</span> </div>
+                <div class="analysis-overall-situation-input2" > <input autocomplete="off" data-index="{{index}}" type="text" value="{{item.section[0]}}" name="start"/> <span>与</span> <input data-index="{{index}}" name="end" type="text" value="{{item.section[1]}}"/> <span>之间</span> </div>
             {{#  } }} 
             <p class="analysis-overall-situation-del" data-index="{{index}}"> <img src="./static/img/cha1.png"> </p>
         </div>

web/pages/returnvisitevent.html

@@ -31,7 +31,7 @@
                                 <div id="ta-property-select-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="1" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
                                 <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="1" data-indexs="{{indexs}}">{{items.comparatorName}}</div>
                                 {{#  if(items.comparator != "is null" && items.comparator != "is not null" && items.comparator !="not null" && items.comparator != "range" && items.data_type != "user_label"){ }}
-                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{indexs}}"> <input type="text" data-index="1" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
+                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{indexs}}" data-index="1" data-indexs="{{indexs}}" > <input autocomplete="off" type="text" data-index="1" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
                                 {{#  } }} 
                                 <div class="analysis-zhibiao-list-del analysis-zhibiao-list-del-return-event" data-twonum="{{indexs}}"></div>
                             </div>

web/pages/screen.html

@@ -40,8 +40,8 @@
             </div>
             {{#  if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }}
                 {{#  if(item.data_type != "datetime"){ }}
-                    <div class="right-box" data-type="{{item.data_type}}">
+                    <div class="right-box" data-type="{{item.data_type}}" data-index="{{index}}">
-                        <input type="type" class="screen-right-txt" data-index={{index}} placeholder="多个用,隔开" value="{{item.strftv}}">
+                        <input type="type" class="screen-right-txt" data-index={{index}} placeholder="多个用,隔开" value="{{item.strftv}}" autocomplete="off">
                     </div>
                 {{# } else { }}
                     <div class="right-box right-date-box" data-type="{{item.data_type}}" data-index="{{index}}">

web/pages/userpar.html

@@ -36,7 +36,7 @@
                                 <div id="ta-property-select-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="0" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
                                 <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="0" data-indexs="{{indexs}}" data-type="{{items.data_type}}">{{items.comparator_name}}</div>
                                 {{#  if(items.comparator != "is null" && items.comparator != "is not null" && items.comparator !="not null" && items.comparator != "range" && items.data_type != "user_label"){ }}
-                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{indexs}}"> <input type="text" data-index="0" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
+                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{indexs}}" data-index="0" data-indexs="{{indexs}}"> <input type="text" data-index="0" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
                                 {{#  } }} 
                                 <div class="analysis-zhibiao-list-del analysis-zhibiao-list-del-initial-event" data-twonum="{{indexs}}"></div>
                             </div>

web/src/x.min.js

@@ -202,7 +202,6 @@ var X = window.X || {
                         X.gourl("login");
                         location.reload();
                     }else if(d.code == -9){
-                        
                         callback && callback("查无数据");
                     }else {
                         layer.msg(d.msg);
@@ -278,6 +277,34 @@ var X = window.X || {
         });
     };
 
+    X.uploadfile=function(url,id,callback){
+        var loginCache = X.loginCache();
+        var token = (loginCache? loginCache.token:"");
+        token = "Bearer "+token;
+        layui.upload.render({
+            elem: id
+            , url: ipurl+url+"?game="+ X.DATA.game || ""
+            ,headers: {
+                Authorization:token//此处放置请求到的用户token
+            }
+            , auto: false
+            ,accept: 'file' //普通文件
+            ,exts: 'xls|xlsx' //只允许上传excel文件
+            ,bindAction: '#test9'
+            , choose: function (obj) {
+            //    console.log(obj);
+            }
+            , done: function (res) {
+               if(res.code == 0 ){
+                    layer.msg("提交成功");
+                    callback && callback(res);
+               }else {
+                    layer.msg(res.msg);
+               }
+            }
+        });
+    }
+
     //下载报表
     X.download=function(url, params,name){
         // console.log(url);
@@ -3680,7 +3707,7 @@ var X = window.X || {
                 var index = obj.attr("data-index");
                 var indexs = obj.attr("data-indexs");
                 X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
+                    // console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
                     // filtersymbols[index][indexs] = val.category;
@@ -3746,6 +3773,43 @@ var X = window.X || {
                 data['events'][index]['eventNameDisplay'] = txt;
             });
 
+            $(document).off("click",".analysis-zhibiao-list-type4").on("click",".analysis-zhibiao-list-type4",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var indexs = $(this).attr("data-indexs");
+                var columnName;
+                if(indexs != undefined){
+                    columnName  = data['events'][index]['filts'][indexs]['columnName'];
+                }else {
+                    columnName = data['eventView']['filts'][index]['columnName']
+                }
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            console.log(val);
+                            if(indexs != undefined){
+                                data['events'][index]['filts'][indexs]['strftv'] = val.title;
+                                var arr = [];
+                                arr.push(val.id);
+                                data['events'][index]['filts'][indexs]['ftv'] = arr; 
+                                updataindex(data.events)
+                            }else {
+                                data['eventView']['filts'][index]['strftv'] = val.title;
+                                var arr = [];
+                                arr.push(val.id);
+                                data['eventView']['filts'][index]['ftv'] = arr; 
+                                X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){
+                                    renderdate();
+                                });
+                            }
+                            
+                        })
+                    }
+                })
+            });
+
             // 监听文本框
             $(document).off('change','.analysis-zhibiao-list-type4 input').on('change','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr("data-index");
@@ -3995,7 +4059,7 @@ var X = window.X || {
             // 全局筛选
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
-                console.log(defaultgroupdata);
+
                 var drr={
                     "columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
                     "columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
@@ -4120,6 +4184,31 @@ var X = window.X || {
                 })
             });
 
+
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var columnName = data['eventView']['filts'][index]['columnName']
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    console.log(val);
+                    if(val != "查无数据"){
+                        
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                          
+                            data['eventView']['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['eventView']['filts'][index]['ftv'] = arr; 
+                            X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){
+                                renderdate();
+                            });
+                            
+                        })
+                    }
+                })
+            });
+
             $(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var index = $(this).attr("data-index");
                 var val = $(this).val();
@@ -4916,6 +5005,28 @@ var X = window.X || {
                 // console.log(index);
             });
 
+            
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var columnName = data['events']['filts'][index]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['events']['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['events']['filts'][index]['ftv'] = arr; 
+                            X.template("globalfilter","xinwei-whole",data['events']['filts'],function(){
+                                renderdate();
+                            });
+                        })
+                    }
+                })
+            });
+
             // 渲染过滤项时间框
             function renderdate(){
                 lay('.analysis-overall-situation-date').each(function(){
@@ -5396,6 +5507,29 @@ var X = window.X || {
                 })
             });
 
+        }
+    };
+})();
+// srczip/logic/customname.js
+(function(){
+    X.pageLogic['customname'] = {
+        init : function(){   
+
+            updataselect_list();
+            
+            X.uploadfile("data_mana/add_select_map","#fileupload",function(res){
+                updataselect_list();
+            });
+
+            function updataselect_list(){
+                X.api("data_mana/select_list","get",{},function(res){
+                
+                    X.laytpldata('#customname-content-box-dot',res,'.customname-content-box');
+                })
+            };
+            
+            
+
         }
     };
 })();
@@ -7592,6 +7726,26 @@ var X = window.X || {
                 }
             });
 
+            $(document).off("click",".analysis-zhibiao-list-type4").on("click",".analysis-zhibiao-list-type4",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var indexs = $(this).attr("data-indexs");
+                var columnName = data['events'][index]['filts'][indexs]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['events'][index]['filts'][indexs]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['events'][index]['filts'][indexs]['ftv'] = arr; 
+                            X.template("userpar","userpar-event",data['events']); 
+                        })
+                    }
+                })
+            });
+
             $(document).off('change','.analysis-zhibiao-list-type4 input').on('change','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
@@ -9978,6 +10132,28 @@ var X = window.X || {
                 });
             };
 
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var columnName = data['eventView']['filts'][index]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['eventView']['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['eventView']['filts'][index]['ftv'] = arr; 
+                            X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+                                renderdate();
+                            });
+                        })
+                    }
+                })
+            });
+
+
             $(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var val = $(this).val();
                 var index = $(this).attr("data-index");
@@ -10643,7 +10819,7 @@ var X = window.X || {
                         X.laytpldata("#projectadmin-con-hz-left-list-tit-xiangmu-dot",d,".projectadmin-con-hz-left-list-tit-xiangmu");
                         updataapiinfo(d[0]['_id']);
                     }else {
-                        layer.msg('暂无数据');
+                        layer.msg('查无数据');
                     }
 
                     // X.laytpldata("#projectadmin-info-box-dot",d.sys_role[0]['authority'],".projectadmin-info-box");
@@ -11163,6 +11339,49 @@ var X = window.X || {
                 })
             });
 
+            $(document).off("click",".analysis-zhibiao-list-type4").on("click",".analysis-zhibiao-list-type4",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var indexs = $(this).attr("data-indexs");
+                var columnName = data['events'][index]['filts'][indexs]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['events'][index]['filts'][indexs]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['events'][index]['filts'][indexs]['ftv'] = arr; 
+                            X.template("event","initial-event",data['events'][0]);
+                            X.template("returnvisitevent","returnvisit-event",data['events'][1]);
+                        })
+                    }
+                })
+            });
+
+            
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var columnName = data['eventView']['filts'][index]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['eventView']['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['eventView']['filts'][index]['ftv'] = arr; 
+                            X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+                                renderdate();
+                            });
+                        })
+                    }
+                })
+            });
+
             $(document).off('change','.analysis-zhibiao-list-type4 input').on('change','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr('data-index');
                 var indexs = $(this).attr('data-indexs');
@@ -12752,6 +12971,27 @@ var X = window.X || {
                 })
             });
 
+            $(document).off("click",'.right-box').on("click",'.right-box',function(){
+                var obj = $(this);
+                var index = obj.attr("data-index");
+                var offset = obj.offset();
+                var columnName = data['filts'][index]['columnName'];
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['filts'][index]['ftv'] = arr; 
+                            X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){
+                                renderdate();
+                            });
+                        })
+                    }
+                })
+                console.log(data['filts'][index]['columnName'])
+            });
+
             //文本框条件输入触发事件
             $(document).off('click','.screen-right-txt').on('change','.screen-right-txt',function(){
                 var index = $(this).attr('data-index');

web/srczip/common.js

@@ -201,7 +201,6 @@ var X = window.X || {
                         X.gourl("login");
                         location.reload();
                     }else if(d.code == -9){
-                        
                         callback && callback("查无数据");
                     }else {
                         layer.msg(d.msg);
@@ -277,6 +276,34 @@ var X = window.X || {
         });
     };
 
+    X.uploadfile=function(url,id,callback){
+        var loginCache = X.loginCache();
+        var token = (loginCache? loginCache.token:"");
+        token = "Bearer "+token;
+        layui.upload.render({
+            elem: id
+            , url: ipurl+url+"?game="+ X.DATA.game || ""
+            ,headers: {
+                Authorization:token//此处放置请求到的用户token
+            }
+            , auto: false
+            ,accept: 'file' //普通文件
+            ,exts: 'xls|xlsx' //只允许上传excel文件
+            ,bindAction: '#test9'
+            , choose: function (obj) {
+            //    console.log(obj);
+            }
+            , done: function (res) {
+               if(res.code == 0 ){
+                    layer.msg("提交成功");
+                    callback && callback(res);
+               }else {
+                    layer.msg(res.msg);
+               }
+            }
+        });
+    }
+
     //下载报表
     X.download=function(url, params,name){
         // console.log(url);

web/srczip/logic/analysis.js

@@ -320,7 +320,7 @@
                 var index = obj.attr("data-index");
                 var indexs = obj.attr("data-indexs");
                 X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
+                    // console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
                     // filtersymbols[index][indexs] = val.category;
@@ -386,6 +386,43 @@
                 data['events'][index]['eventNameDisplay'] = txt;
             });
 
+            $(document).off("click",".analysis-zhibiao-list-type4").on("click",".analysis-zhibiao-list-type4",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var indexs = $(this).attr("data-indexs");
+                var columnName;
+                if(indexs != undefined){
+                    columnName  = data['events'][index]['filts'][indexs]['columnName'];
+                }else {
+                    columnName = data['eventView']['filts'][index]['columnName']
+                }
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            console.log(val);
+                            if(indexs != undefined){
+                                data['events'][index]['filts'][indexs]['strftv'] = val.title;
+                                var arr = [];
+                                arr.push(val.id);
+                                data['events'][index]['filts'][indexs]['ftv'] = arr; 
+                                updataindex(data.events)
+                            }else {
+                                data['eventView']['filts'][index]['strftv'] = val.title;
+                                var arr = [];
+                                arr.push(val.id);
+                                data['eventView']['filts'][index]['ftv'] = arr; 
+                                X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){
+                                    renderdate();
+                                });
+                            }
+                            
+                        })
+                    }
+                })
+            });
+
             // 监听文本框
             $(document).off('change','.analysis-zhibiao-list-type4 input').on('change','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr("data-index");
@@ -635,7 +672,7 @@
             // 全局筛选
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
-                console.log(defaultgroupdata);
+
                 var drr={
                     "columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
                     "columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
@@ -760,6 +797,31 @@
                 })
             });
 
+
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var columnName = data['eventView']['filts'][index]['columnName']
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    console.log(val);
+                    if(val != "查无数据"){
+                        
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                          
+                            data['eventView']['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['eventView']['filts'][index]['ftv'] = arr; 
+                            X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){
+                                renderdate();
+                            });
+                            
+                        })
+                    }
+                })
+            });
+
             $(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var index = $(this).attr("data-index");
                 var val = $(this).val();

web/srczip/logic/attribute.js

@@ -269,6 +269,28 @@
                 // console.log(index);
             });
 
+            
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var columnName = data['events']['filts'][index]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['events']['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['events']['filts'][index]['ftv'] = arr; 
+                            X.template("globalfilter","xinwei-whole",data['events']['filts'],function(){
+                                renderdate();
+                            });
+                        })
+                    }
+                })
+            });
+
             // 渲染过滤项时间框
             function renderdate(){
                 lay('.analysis-overall-situation-date').each(function(){

web/srczip/logic/customname.js

@@ -0,0 +1,22 @@
+(function(){
+    X.pageLogic['customname'] = {
+        init : function(){   
+
+            updataselect_list();
+            
+            X.uploadfile("data_mana/add_select_map","#fileupload",function(res){
+                updataselect_list();
+            });
+
+            function updataselect_list(){
+                X.api("data_mana/select_list","get",{},function(res){
+                
+                    X.laytpldata('#customname-content-box-dot',res,'.customname-content-box');
+                })
+            };
+            
+            
+
+        }
+    };
+})();

web/srczip/logic/distribution.js

@@ -293,6 +293,26 @@
                 }
             });
 
+            $(document).off("click",".analysis-zhibiao-list-type4").on("click",".analysis-zhibiao-list-type4",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var indexs = $(this).attr("data-indexs");
+                var columnName = data['events'][index]['filts'][indexs]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['events'][index]['filts'][indexs]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['events'][index]['filts'][indexs]['ftv'] = arr; 
+                            X.template("userpar","userpar-event",data['events']); 
+                        })
+                    }
+                })
+            });
+
             $(document).off('change','.analysis-zhibiao-list-type4 input').on('change','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");

web/srczip/logic/ltvmodel.js

@@ -190,6 +190,28 @@
                 });
             };
 
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var columnName = data['eventView']['filts'][index]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['eventView']['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['eventView']['filts'][index]['ftv'] = arr; 
+                            X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+                                renderdate();
+                            });
+                        })
+                    }
+                })
+            });
+
+
             $(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var val = $(this).val();
                 var index = $(this).attr("data-index");

web/srczip/logic/projectadmin.js

@@ -12,7 +12,7 @@
                         X.laytpldata("#projectadmin-con-hz-left-list-tit-xiangmu-dot",d,".projectadmin-con-hz-left-list-tit-xiangmu");
                         updataapiinfo(d[0]['_id']);
                     }else {
-                        layer.msg('暂无数据');
+                        layer.msg('查无数据');
                     }
 
                     // X.laytpldata("#projectadmin-info-box-dot",d.sys_role[0]['authority'],".projectadmin-info-box");

web/srczip/logic/retained.js

@@ -272,6 +272,49 @@
                 })
             });
 
+            $(document).off("click",".analysis-zhibiao-list-type4").on("click",".analysis-zhibiao-list-type4",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var indexs = $(this).attr("data-indexs");
+                var columnName = data['events'][index]['filts'][indexs]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['events'][index]['filts'][indexs]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['events'][index]['filts'][indexs]['ftv'] = arr; 
+                            X.template("event","initial-event",data['events'][0]);
+                            X.template("returnvisitevent","returnvisit-event",data['events'][1]);
+                        })
+                    }
+                })
+            });
+
+            
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var columnName = data['eventView']['filts'][index]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['eventView']['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['eventView']['filts'][index]['ftv'] = arr; 
+                            X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+                                renderdate();
+                            });
+                        })
+                    }
+                })
+            });
+
             $(document).off('change','.analysis-zhibiao-list-type4 input').on('change','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr('data-index');
                 var indexs = $(this).attr('data-indexs');

web/srczip/logic/screen.js

@@ -147,6 +147,27 @@
                 })
             });
 
+            $(document).off("click",'.right-box').on("click",'.right-box',function(){
+                var obj = $(this);
+                var index = obj.attr("data-index");
+                var offset = obj.offset();
+                var columnName = data['filts'][index]['columnName'];
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            data['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['filts'][index]['ftv'] = arr; 
+                            X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){
+                                renderdate();
+                            });
+                        })
+                    }
+                })
+                console.log(data['filts'][index]['columnName'])
+            });
+
             //文本框条件输入触发事件
             $(document).off('click','.screen-right-txt').on('change','.screen-right-txt',function(){
                 var index = $(this).attr('data-index');

web/static/css/style.css

@@ -795,4 +795,16 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
 
 .chawushuj { width: 100%; text-align: center;  }
 
+.customname-table-box { margin: 24px; height: calc(100% - 106px); overflow-y: auto; }
+.customname-info-bg { border-left: 1px solid #f0f2f5; }
+.customname-info-table-top { z-index: 999; width: calc(100% - 96px); position: absolute; display: flex; align-items: center; background-color: #f0f2f5; }
+.customname-info-table-top div { width: 33%; padding: 24px 0; text-indent: 20px; border-right: 1px solid #fff; }
+.customname-val-box { display: flex; }
+.customname-val { width: 33%; display: flex; align-items: center; text-indent: 20px; padding: 24px 0; border-bottom: 1px solid #f0f2f5;}
+.customname-val-right-box { width: 66.9%; }
+.customname-val-right {display: flex; align-items: center; width: 100%; border-left: 1px solid #f0f2f5; border-bottom: 1px solid #f0f2f5; }
+.customname-val-right div { width: 50%; padding: 24px 0; text-indent: 20px; border-right: 1px solid #f0f2f5;}
+.customname-content-box { position: relative; top: 66px; }
+
+