diff --git a/web/pages/userlabel_dy.html b/web/pages/userlabel_dy.html index 4208a6a..9fd1358 100644 --- a/web/pages/userlabel_dy.html +++ b/web/pages/userlabel_dy.html @@ -151,7 +151,7 @@ {{item.uce_calcu_symbolDesc}}
- +
,在 {{# if(item.e_days == 0){ }} diff --git a/web/src/x.min.js b/web/src/x.min.js index 357345c..e4ce988 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -15992,7 +15992,7 @@ var X = window.X || { var offset = obj.offset(); var index = obj.attr('data-index'); X.querycriteriapop(dataArr,'setgrouping',offset.left,offset.top+obj.height(),function(val){ - console.log(val); + data['qp']['user_cluster_def']['events'][index]['eventDesc'] = val.id; data['qp']['user_cluster_def']['events'][index]['event_name'] = val.name; updatalable(); @@ -16031,7 +16031,7 @@ var X = window.X || { var offset = obj.offset(); var index = obj.attr('data-index') X.parametersopen(retdata,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ - console.log(val); + data['qp']['user_cluster_def']['events'][index]['prop_quota']['quotaDesc'] = val.title; data['qp']['user_cluster_def']['events'][index]['prop_quota']['quota_type'] = val.data_type; if(val.data_type == null){ @@ -16049,7 +16049,7 @@ var X = window.X || { var index = obj.attr('data-index'); var type = obj.attr('data-type'); X.parametersopen(quotas_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ - console.log(val); + data['qp']['user_cluster_def']['events'][index]['prop_quota']['analysisDesc'] = val.title; data['qp']['user_cluster_def']['events'][index]['prop_quota']['analysis'] = val.id; updatalable(); @@ -16061,7 +16061,7 @@ var X = window.X || { var index = obj.attr("data-index"); var offset = obj.offset(); X.parametersopen(X['DATA']['search']['condition2'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ - console.log(val); + data['qp']['user_cluster_def']['events'][index]['uce_calcu_symbolDesc'] = val.title; data['qp']['user_cluster_def']['events'][index]['uce_calcu_symbol'] = val.id; updatalable(); @@ -16071,7 +16071,6 @@ var X = window.X || { $(document).off("change",'.lable-input-box input').on('change','.lable-input-box input',function(){ var obj = $(this); var index = obj.attr("data-index"); - console.log(index); var text = obj.val(); data['qp']['user_cluster_def']['events'][index]['num'] = text; }); @@ -16099,11 +16098,9 @@ var X = window.X || { data['display_name'] = labledesc; data['remarks'] = labeldes; X.api('user_label/save','post',data,function(d){ - console.log(d); layer.msg("添加成功"); }) }); - } }; })(); diff --git a/web/srczip/logic/userlabel_dy.js b/web/srczip/logic/userlabel_dy.js index d8b056d..1fc8f73 100644 --- a/web/srczip/logic/userlabel_dy.js +++ b/web/srczip/logic/userlabel_dy.js @@ -123,7 +123,7 @@ var offset = obj.offset(); var index = obj.attr('data-index'); X.querycriteriapop(dataArr,'setgrouping',offset.left,offset.top+obj.height(),function(val){ - console.log(val); + data['qp']['user_cluster_def']['events'][index]['eventDesc'] = val.id; data['qp']['user_cluster_def']['events'][index]['event_name'] = val.name; updatalable(); @@ -162,7 +162,7 @@ var offset = obj.offset(); var index = obj.attr('data-index') X.parametersopen(retdata,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ - console.log(val); + data['qp']['user_cluster_def']['events'][index]['prop_quota']['quotaDesc'] = val.title; data['qp']['user_cluster_def']['events'][index]['prop_quota']['quota_type'] = val.data_type; if(val.data_type == null){ @@ -180,7 +180,7 @@ var index = obj.attr('data-index'); var type = obj.attr('data-type'); X.parametersopen(quotas_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ - console.log(val); + data['qp']['user_cluster_def']['events'][index]['prop_quota']['analysisDesc'] = val.title; data['qp']['user_cluster_def']['events'][index]['prop_quota']['analysis'] = val.id; updatalable(); @@ -192,7 +192,7 @@ var index = obj.attr("data-index"); var offset = obj.offset(); X.parametersopen(X['DATA']['search']['condition2'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ - console.log(val); + data['qp']['user_cluster_def']['events'][index]['uce_calcu_symbolDesc'] = val.title; data['qp']['user_cluster_def']['events'][index]['uce_calcu_symbol'] = val.id; updatalable(); @@ -202,7 +202,6 @@ $(document).off("change",'.lable-input-box input').on('change','.lable-input-box input',function(){ var obj = $(this); var index = obj.attr("data-index"); - console.log(index); var text = obj.val(); data['qp']['user_cluster_def']['events'][index]['num'] = text; }); @@ -230,11 +229,9 @@ data['display_name'] = labledesc; data['remarks'] = labeldes; X.api('user_label/save','post',data,function(d){ - console.log(d); layer.msg("添加成功"); }) }); - } }; })(); \ No newline at end of file diff --git a/web/static/css/style.css b/web/static/css/style.css index 5980690..17ad39d 100644 --- a/web/static/css/style.css +++ b/web/static/css/style.css @@ -714,7 +714,7 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; } .lable-title-name { font-size: 16px; color: #202d3f; font-weight: 500; margin-top: 4px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis } .label-info-box { padding: 0px 24px; height: 56px; line-height: 56px; font-size: 14px; color: #42546d; font-weight: 500; cursor: pointer; display: flex; align-items: center; justify-content: space-between; } .label-info-box:hover { color: #4fa1ff; } -.label-info-box-ov { width: 100%; overflow-y: auto; height:633px; background-color: #fff; } +.label-info-box-ov { width: 100%; overflow-y: auto; height: calc(100% - 175px); background-color: #fff; } .label-but-box { height: 48px; display: flex; justify-content: center; align-items: center; border-top: 1px solid #e6e6e6; color: #607595; } .label-but-box div { display: flex;align-items: center;justify-content: center;width: 86px;height: 32px;cursor: pointer; } .lable-dingyi:hover { color: #4fa1ff; }