1

web/pages/addproject_owner_name.html

@@ -0,0 +1,41 @@
+<!-- 编辑渠道权限 -->
+<div class="datarightsedit-box">
+
+    <div class="datarightsedit-top-box">
+        <div>编辑项目渠道权限</div>
+        <img src="./static/img/cha.png">
+    </div>  
+    <div class="datarightsedit-con" style="max-height: 480px; overflow-y: auto;">
+        <div class="datarightsedit-con-box">
+           
+            
+        </div>
+    </div>
+
+
+
+    </div>
+
+    <div class="datarightsedit-but-box">
+        <div class="datarightsedit-tj">添加</div>
+        <div class="datarightsedit-qx">取消</div>
+        <div class="datarightsedit-qd">确定</div>
+    </div>
+
+</div>
+
+<script id="datarightsedit-con-box-dot" type="text/html">
+    {{#  layui.each(d, function(index, item){ }}
+        <div>
+            <div class="datarightsedit-txt-box">
+                <div class="datarightsedit-txt-box-tit">发行渠道</div> 
+                <input type="text"  data-index="{{index}}" class="daxinqudao" value="{{item.main_channel}}"/>
+                 <img src="./static/img/del-red.png" style="width:16px; height:16px; cursor:pointer; margin-left: 8px;" data-index="{{index}}" class="datarightsedit-txt-box-del">
+            </div>
+            <div class="datarightsedit-txt-box">
+                <div class="datarightsedit-txt-box-tit">渠道参数</div>
+                <input type="text" data-index="{{index}}" value="{{item.ditch}}" placeholder="输入渠道多个用逗号','隔开" class="qudaocanshu"/>
+            </div>
+        </div>
+    {{#  }); }}
+</script>

web/pages/addproject_owner_name_list.html

@@ -0,0 +1,37 @@
+<div class="eventattradmin-bg-box">
+
+    <div class="eventattradmin-box">
+        <div class="eventattradmin-top-box">
+            <div class="eventattradmin-left___y490Q">项目渠道添加 </div>
+
+            <div class="eventattradmin-right___1TIt8">
+                <!-- <div class="eventattradmin-search___23TMG">
+                    <i class="layui-icon">&#xe615;</i>
+                    <input type="text" placeholder="请输入搜索" />
+                    <img src="./static/img/cha1.png">
+                </div>
+                <div class="eventattradmin-display___21tQp">
+                    <img src="./static/img/peizhi2.png">
+                    <span>显示名配置</span>
+                </div>
+
+                <div class="eventattradmin-actions___141YT">
+                    <i class="layui-icon">&#xe624;</i>
+                    <span>虚拟事件属性</span>
+                </div> -->
+
+            </div>
+
+        </div>
+
+        <div class="eventattradmin-table-box">
+            <table class="layui-hide" id="eventattradmin-table" lay-filter="eventattradmintest"></table>
+        </div>
+        
+    </div>
+
+</div>
+
+<script type="text/html" id="addprojectownernameDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+</script>

web/pages/dashboard.html

@@ -69,6 +69,7 @@
                         <dd><a class="ajax-content" href="personalsettings" data-id="conetnt">个人设置</a></dd>
                         <dd><a class="ajax-content" href="projectinfo" data-id="conetnt">项目管理</a></dd>
                         <dd><a href="javascript:void(0);" class="addproduct">添加项目</a></dd>
+                        <!-- <dd><a class="ajax-content" href="addproject_owner_name_list" data-id="conetnt">渠道添加</a></dd> -->
                         <dd><a href="javascript:void(0);" class="sifnoutlogin">退出登录</a></dd>
                     </dl>
                  </li>

web/pages/login.html

@@ -62,7 +62,7 @@
     </div>
     
     <div class="login-bottom-box">
-        <div class="login-bottom-left">Copyright © 2013-2020 乐谷数据分析平台. All rights reserved.</div>
+        <div class="login-bottom-left">Copyright © 2013-2022 乐谷数据分析平台. All rights reserved.</div>
         <div class="login-bottom-right">Version 1.0.0</div>
     </div>
 </div>

web/src/x.min.js

@@ -129,7 +129,7 @@ var X = window.X || {
 
 (function(){
     //本地
-    // var ipurl = "http://10.0.0.77:7889/api/v1/";
+    // var ipurl = "http://10.0.0.240:7899/api/v1/";
     // 线上
     var ipurl = "http://139.159.159.3:9865/api/v1/";
     //线上测试
@@ -2912,6 +2912,115 @@ var X = window.X || {
         }
     };
 })();
+// srczip/logic/addproject_owner_name.js
+(function(){
+    X.pageLogic['addproject_owner_name'] = {
+        init : function(parms){
+            var me = this;
+            this.parms = parms;
+            this.callback = parms.callback; //选择后执行的回调
+            var data = parms.extData;//获取到上层弹窗传的数据
+            console.log(data);
+            
+            if(data){
+                // for(let i in data.ditch){
+                //     $(".datarightsedit-txt-input").html(data.main_channel);
+                //     $(".datarightsedit-txt-input3").html(data.ditch);
+                // }
+                X.laytpldata("#datarightsedit-con-box-dot",data.ditch,".datarightsedit-con-box");
+            };
+
+            $(document).off("click",'.datarightsedit-tj').on('click','.datarightsedit-tj',function(){
+                var arr = {
+                    'main_channel':'',
+                    'ditch':''
+                }
+                data.ditch.push(arr);
+                X.laytpldata("#datarightsedit-con-box-dot",data.ditch,".datarightsedit-con-box");
+            });
+            
+            $(document).off('click','.daxinqudao').on('blur','.daxinqudao',function(){
+                var index = $(this).attr("data-index");
+                data.ditch[index]['main_channel'] = $(this).val();
+            });
+
+            $(document).off('click','.qudaocanshu').on('blur','.qudaocanshu',function(){
+                var index = $(this).attr("data-index");
+                data.ditch[index]['ditch'] = $(this).val();
+            });
+
+            $(document).off("click",'.datarightsedit-txt-box-del').on('click','.datarightsedit-txt-box-del',function(){
+                var index = $(this).attr("data-index");
+                data.ditch.splice(index,1);
+                X.laytpldata("#datarightsedit-con-box-dot",data.ditch,".datarightsedit-con-box");
+            });
+            
+            $(".datarightsedit-qx").click(function(){
+                layer.closeAll();
+            });
+
+            $(".datarightsedit-top-box img").click(function(){
+                layer.closeAll();
+            });
+
+            $(".datarightsedit-qd").click(function(){
+
+                X.api("project/add_project_name","post",{game:data.game,ditch:data.ditch,name: data.name},function(d){
+                    if(d){
+                        console.log(d);
+                        layer.msg("编辑成功");
+                        me.callback && me.callback();
+                        layer.closeAll();
+                    }
+                })
+            });
+
+        },
+
+    };
+})();
+
+// srczip/logic/addproject_owner_name_list.js
+(function(){
+    X.pageLogic['addproject_owner_name_list'] = {
+        init : function(){
+            var me = this;
+            me.addprojectownernamelist(); 
+            layui.table.on('tool(eventattradmintest)', function(obj){
+                var data = obj.data;
+                if(obj.event === 'edit'){
+                    data['cat'] = 'event'
+                    X.parametersopen(data,"addproject_owner_name",'auto',function(){
+                      me.addprojectownernamelist();  
+                    })
+                }
+            })
+
+
+        },
+        addprojectownernamelist : function(){
+            X.laytabledata("#eventattradmin-table","project/project_name",[[
+                {field:'game', title: '项目名', sort: true}
+                ,{field:'name', title: '显示名'}
+                ,{field:'main_channel', title: '发行渠道 : 渠道参数',templet:function(d){
+                    var txt = '';
+                    for(let i in d.ditch){
+                        if(d.ditch[i]['main_channel'] != undefined  && d.ditch[i]['ditch'] != undefined) {
+
+                        }
+                        txt +=  d.ditch[i]['main_channel']+ " : " + d.ditch[i]['ditch'] +'<br>'
+                    } 
+                    return txt
+                }}
+                ,{fixed: 'right', title:'操作', toolbar: '#addprojectownernameDemo', width:80}
+            ]]);
+        }
+
+
+
+    };
+})();
+
 // srczip/logic/addrole.js
 (function(){
     X.pageLogic['addrole'] = {
@@ -10260,10 +10369,10 @@ var X = window.X || {
                     "section":[-1,1],//区间
                     "table_type":screentypedata[0]['id'],
                 };
-                if(data['eventView']['filts'].length == 1){
+                // if(data['eventView']['filts'].length == 1){
-                    layer.msg('此项只能添加一个');
+                //     layer.msg('此项只能添加一个');
-                    return;
+                //     return;
-                }
+                // }
                 data['eventView']['filts'].push(drr);
                 if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
@@ -10300,6 +10409,17 @@ var X = window.X || {
                 });
             });
 
+            $(document).off('click','.analysis-overall-situation-left-guanxi').on('click','.analysis-overall-situation-left-guanxi',function(){
+                var html = $(this).html(); //relation筛选条件的关系
+                if(html == "且"){
+                    $(this).html('或');
+                    data['eventView']['relation'] = 'or'
+                }else {
+                    $(this).html('且');
+                    data['eventView']['relation'] = 'and'
+                }
+            });
+
             $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){
                 var obj = $(this);
                 var offset = obj.offset();

web/srczip/common.js

@@ -128,7 +128,7 @@ var X = window.X || {
 
 (function(){
     //本地
-    // var ipurl = "http://10.0.0.77:7889/api/v1/";
+    // var ipurl = "http://10.0.0.240:7899/api/v1/";
     // 线上
     var ipurl = "http://139.159.159.3:9865/api/v1/";
     //线上测试

web/srczip/logic/addproject_owner_name.js

@@ -0,0 +1,66 @@
+(function(){
+    X.pageLogic['addproject_owner_name'] = {
+        init : function(parms){
+            var me = this;
+            this.parms = parms;
+            this.callback = parms.callback; //选择后执行的回调
+            var data = parms.extData;//获取到上层弹窗传的数据
+            console.log(data);
+            
+            if(data){
+                // for(let i in data.ditch){
+                //     $(".datarightsedit-txt-input").html(data.main_channel);
+                //     $(".datarightsedit-txt-input3").html(data.ditch);
+                // }
+                X.laytpldata("#datarightsedit-con-box-dot",data.ditch,".datarightsedit-con-box");
+            };
+
+            $(document).off("click",'.datarightsedit-tj').on('click','.datarightsedit-tj',function(){
+                var arr = {
+                    'main_channel':'',
+                    'ditch':''
+                }
+                data.ditch.push(arr);
+                X.laytpldata("#datarightsedit-con-box-dot",data.ditch,".datarightsedit-con-box");
+            });
+            
+            $(document).off('click','.daxinqudao').on('blur','.daxinqudao',function(){
+                var index = $(this).attr("data-index");
+                data.ditch[index]['main_channel'] = $(this).val();
+            });
+
+            $(document).off('click','.qudaocanshu').on('blur','.qudaocanshu',function(){
+                var index = $(this).attr("data-index");
+                data.ditch[index]['ditch'] = $(this).val();
+            });
+
+            $(document).off("click",'.datarightsedit-txt-box-del').on('click','.datarightsedit-txt-box-del',function(){
+                var index = $(this).attr("data-index");
+                data.ditch.splice(index,1);
+                X.laytpldata("#datarightsedit-con-box-dot",data.ditch,".datarightsedit-con-box");
+            });
+            
+            $(".datarightsedit-qx").click(function(){
+                layer.closeAll();
+            });
+
+            $(".datarightsedit-top-box img").click(function(){
+                layer.closeAll();
+            });
+
+            $(".datarightsedit-qd").click(function(){
+
+                X.api("project/add_project_name","post",{game:data.game,ditch:data.ditch,name: data.name},function(d){
+                    if(d){
+                        console.log(d);
+                        layer.msg("编辑成功");
+                        me.callback && me.callback();
+                        layer.closeAll();
+                    }
+                })
+            });
+
+        },
+
+    };
+})();

web/srczip/logic/addproject_owner_name_list.js

@@ -0,0 +1,39 @@
+(function(){
+    X.pageLogic['addproject_owner_name_list'] = {
+        init : function(){
+            var me = this;
+            me.addprojectownernamelist(); 
+            layui.table.on('tool(eventattradmintest)', function(obj){
+                var data = obj.data;
+                if(obj.event === 'edit'){
+                    data['cat'] = 'event'
+                    X.parametersopen(data,"addproject_owner_name",'auto',function(){
+                      me.addprojectownernamelist();  
+                    })
+                }
+            })
+
+
+        },
+        addprojectownernamelist : function(){
+            X.laytabledata("#eventattradmin-table","project/project_name",[[
+                {field:'game', title: '项目名', sort: true}
+                ,{field:'name', title: '显示名'}
+                ,{field:'main_channel', title: '发行渠道 : 渠道参数',templet:function(d){
+                    var txt = '';
+                    for(let i in d.ditch){
+                        if(d.ditch[i]['main_channel'] != undefined  && d.ditch[i]['ditch'] != undefined) {
+
+                        }
+                        txt +=  d.ditch[i]['main_channel']+ " : " + d.ditch[i]['ditch'] +'<br>'
+                    } 
+                    return txt
+                }}
+                ,{fixed: 'right', title:'操作', toolbar: '#addprojectownernameDemo', width:80}
+            ]]);
+        }
+
+
+
+    };
+})();

web/srczip/logic/ltvmodel.js

@@ -85,10 +85,10 @@
                     "section":[-1,1],//区间
                     "table_type":screentypedata[0]['id'],
                 };
-                if(data['eventView']['filts'].length == 1){
+                // if(data['eventView']['filts'].length == 1){
-                    layer.msg('此项只能添加一个');
+                //     layer.msg('此项只能添加一个');
-                    return;
+                //     return;
-                }
+                // }
                 data['eventView']['filts'].push(drr);
                 if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
@@ -125,6 +125,17 @@
                 });
             });
 
+            $(document).off('click','.analysis-overall-situation-left-guanxi').on('click','.analysis-overall-situation-left-guanxi',function(){
+                var html = $(this).html(); //relation筛选条件的关系
+                if(html == "且"){
+                    $(this).html('或');
+                    data['eventView']['relation'] = 'or'
+                }else {
+                    $(this).html('且');
+                    data['eventView']['relation'] = 'and'
+                }
+            });
+
             $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){
                 var obj = $(this);
                 var offset = obj.offset();

web/static/css/style.css

@@ -27,6 +27,7 @@
 .modify-layui-card { height: 388px; }
 .layui-laydate .layui-this { background-color: rgba(89, 120, 249, 1) !important; }
 .layui-laypage-em { background-color: #3d90ff !important; }
+.layui-table-cell { height: auto; }
 
 ::-webkit-scrollbar { 
     width:0px; 
@@ -840,3 +841,10 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
 }
 
 .datarightsedit-txt-input { width: 420px; height: 400px; padding: 10px 15px; resize:none; border: 1px solid #f0f0f0; }
+.datarightsedit-txt-input2 { width: 420px; height: 150px; padding: 10px 15px; resize:none; border: 1px solid #f0f0f0; }
+.datarightsedit-txt-input3 { width: 420px; height: 150px; padding: 10px 15px; resize:none; border: 1px solid #f0f0f0; }
+.addrole-info-table-con2 { overflow-y: auto; display: flex; flex-wrap: wrap; }
+.qudaoming { margin-top: 10px; }
+.datarightsedit-tj { background-color: #009688; color: #fff; }
+.datarightsedit-txt-box { align-items: center;}
+