diff --git a/web/pages/analysis.html b/web/pages/analysis.html index 2d5c7f2..98d686e 100644 --- a/web/pages/analysis.html +++ b/web/pages/analysis.html @@ -282,8 +282,8 @@
{{items.comparator_name}}
{{# if(items.tableType != "user_label"){ }} -
- +
+
{{# } }} @@ -306,11 +306,11 @@ {{# } }}
{{index}}
-
+
- +
@@ -339,7 +339,7 @@
{{items.columnDesc}}
{{items.comparator_name}}
-
+
@@ -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"){ }} {{# if(item.data_type != "datetime" && item.data_type != "user_label"){ }} -
- +
+
{{# } else if(item.data_type == "user_label"){ }} @@ -433,7 +433,7 @@ {{# } }} {{# if(item.comparator_id === "range"){ }} -
与 之间
+
与 之间
{{# } }}

diff --git a/web/pages/customname.html b/web/pages/customname.html new file mode 100644 index 0000000..834b34e --- /dev/null +++ b/web/pages/customname.html @@ -0,0 +1,59 @@ + +
+ +
+
+
自定义别名
+ +
+ + + + +
+ +
+ + +
+
+
+
属性
+
值
+
值
+
+
+ + + +
+ +
+
+ + +
+ +
+ + \ No newline at end of file diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html index d6a2bce..6798184 100644 --- a/web/pages/dashboard.html +++ b/web/pages/dashboard.html @@ -51,7 +51,7 @@
事件管理
事件属性管理
用户属性管理
-
自定义别名
+
自定义别名
埋点数据检查
diff --git a/web/pages/event.html b/web/pages/event.html index 1a5c60e..4591eca 100644 --- a/web/pages/event.html +++ b/web/pages/event.html @@ -33,8 +33,8 @@
{{items.columnDesc}}
{{items.comparatorName}}
{{# if(items.comparator != "is null" && items.comparator != "is not null" && items.comparator !="not null" && items.comparator != "range" && items.data_type != "user_label"){ }} -
- +
+
{{# } }}
diff --git a/web/pages/globalfilter.html b/web/pages/globalfilter.html index 191cdae..1194284 100644 --- a/web/pages/globalfilter.html +++ b/web/pages/globalfilter.html @@ -6,7 +6,7 @@
{{item.comparator_name}}
{{# 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"){ }} -
+
{{# } else if(item.data_type == "user_label"){ }} @@ -19,7 +19,7 @@ {{# } }} {{# if(item.comparator === "range"){ }} -
与 之间
+
与 之间
{{# } }}

diff --git a/web/pages/returnvisitevent.html b/web/pages/returnvisitevent.html index 20f3e35..eeb3895 100644 --- a/web/pages/returnvisitevent.html +++ b/web/pages/returnvisitevent.html @@ -31,7 +31,7 @@
{{items.columnDesc}}
{{items.comparatorName}}
{{# if(items.comparator != "is null" && items.comparator != "is not null" && items.comparator !="not null" && items.comparator != "range" && items.data_type != "user_label"){ }} -
+
{{# } }}
diff --git a/web/pages/screen.html b/web/pages/screen.html index a4af8a6..809ffd4 100644 --- a/web/pages/screen.html +++ b/web/pages/screen.html @@ -40,8 +40,8 @@
{{# if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }} {{# if(item.data_type != "datetime"){ }} -
- +
+
{{# } else { }}
diff --git a/web/pages/userpar.html b/web/pages/userpar.html index 90bcfc8..5dc9f69 100644 --- a/web/pages/userpar.html +++ b/web/pages/userpar.html @@ -36,7 +36,7 @@
{{items.columnDesc}}
{{items.comparator_name}}
{{# if(items.comparator != "is null" && items.comparator != "is not null" && items.comparator !="not null" && items.comparator != "range" && items.data_type != "user_label"){ }} -
+
{{# } }}
diff --git a/web/src/x.min.js b/web/src/x.min.js index 9dbb904..eca7065 100644 --- a/web/src/x.min.js +++ b/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'); diff --git a/web/srczip/common.js b/web/srczip/common.js index 3060a4b..54858af 100644 --- a/web/srczip/common.js +++ b/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); diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js index 9ca6b07..b0adcdb 100644 --- a/web/srczip/logic/analysis.js +++ b/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(); diff --git a/web/srczip/logic/attribute.js b/web/srczip/logic/attribute.js index ac68757..a421f7f 100644 --- a/web/srczip/logic/attribute.js +++ b/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(){ diff --git a/web/srczip/logic/customname.js b/web/srczip/logic/customname.js new file mode 100644 index 0000000..b1a4266 --- /dev/null +++ b/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'); + }) + }; + + + + } + }; +})(); \ No newline at end of file diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js index d58099b..c984ac6 100644 --- a/web/srczip/logic/distribution.js +++ b/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"); diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js index 756324a..cb4f123 100644 --- a/web/srczip/logic/ltvmodel.js +++ b/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"); diff --git a/web/srczip/logic/projectadmin.js b/web/srczip/logic/projectadmin.js index d05cf13..172377c 100644 --- a/web/srczip/logic/projectadmin.js +++ b/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"); diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js index b9191e5..ed4146c 100644 --- a/web/srczip/logic/retained.js +++ b/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'); diff --git a/web/srczip/logic/screen.js b/web/srczip/logic/screen.js index 19c5851..fc035a4 100644 --- a/web/srczip/logic/screen.js +++ b/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'); diff --git a/web/static/css/style.css b/web/static/css/style.css index 1419fc3..e28120f 100644 --- a/web/static/css/style.css +++ b/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; } + +