新增事件属性用户属性添加功能

web/pages/addeventattradmin.html

@@ -0,0 +1,43 @@
+<!-- 添加事件属性管理 -->
+<div class="eventattradminadd-box">
+
+    <div class="eventattradminedit-bg-box">
+
+        <form class="layui-form" action="" lay-filter="eventattradmineditexample" eventattradminedit>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">属性名</label>
+                <div class="layui-input-block">
+                    <input type="text" name="eventname" lay-verify="name" autocomplete="off" placeholder="请输入属性名" class="layui-input">
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                  <label class="layui-form-label">类型</label>
+                  <div class="layui-input-inline" style="width: 146px;">
+                    
+                    <select name="addevent" lay-filter="aihao">
+                        <option value=""></option>
+                        <option value="string">文本</option>
+                        <option value="array">数组</option>
+                        <option value="datetime">时间</option>
+                        <option value="int">数值</option>
+                        <option value="ip">ip</option>
+                        <option value="float">浮点型</option>
+                      </select>
+
+                  </div>
+                </div>
+            </div>
+
+        </form>
+
+    </div>
+
+    <div class="eventattradminedit-but-box">
+        <div class="eventattradminedit-qx">取 消</div>
+        <div class="eventattradminedit-qd">确 定</div>
+    </div>
+
+</div>

web/pages/eventattradmin.html

@@ -6,7 +6,7 @@
             <div class="eventattradmin-left___y490Q">事件属性管理 <i class="layui-icon" title="在该页面进行事件属性的管理。包括设置时间属性的显示名，显示状态，计数单位，上传维度表以及设置虚拟时间属性等功能">&#xe60b;</i> </div>
 
             <div class="eventattradmin-right___1TIt8">
-                <div class="eventattradmin-search___23TMG">
+                <!-- <div class="eventattradmin-search___23TMG">
                     <i class="layui-icon">&#xe615;</i>
                     <input type="text" placeholder="请输入搜索" />
                     <img src="./static/img/cha1.png">
@@ -14,9 +14,9 @@
                 <div class="eventattradmin-display___21tQp">
                     <img src="./static/img/peizhi2.png">
                     <span>显示名配置</span>
-                </div>
+                </div> -->
 
-                <div class="eventattradmin-actions___141YT">
+                <div class="eventattradmin-actions___141YT addeventattradmin">
                     <i class="layui-icon">&#xe624;</i>
                     <span>虚拟事件属性</span>
                 </div>

web/pages/eventattradminedit.html

@@ -23,7 +23,7 @@
             <div class="layui-form-item">
                 <div class="layui-inline">
                   <label class="layui-form-label">状态</label>
-                  <div class="layui-input-inline">
+                  <div class="layui-input-inline" style="width: 146px;">
                     
                     <select name="eventstate" lay-filter="aihao">
                         <option value=""></option>

web/pages/eventmanagement.html

@@ -6,7 +6,7 @@
             <div class="eventattradmin-left___y490Q">事件管理<i class="layui-icon" title="在该页面进行事件及事件属性的管理。包括设置事件的显示名，显示状态等；设置事件属性的显示名，显示状态，计数单位，上传维度表等功能">&#xe60b;</i> </div>
 
             <div class="eventattradmin-right___1TIt8">
-                <div class="eventattradmin-search___23TMG">
+                <!-- <div class="eventattradmin-search___23TMG">
                     <i class="layui-icon">&#xe615;</i>
                     <input type="text" placeholder="请输入搜索" />
                     <img src="./static/img/cha1.png">
@@ -14,12 +14,12 @@
                 <div class="eventattradmin-display___21tQp">
                     <img src="./static/img/peizhi2.png">
                     <span>显示名配置</span>
-                </div>
+                </div> -->
 
-                <div class="eventattradmin-actions___141YT">
+                <!-- <div class="eventattradmin-actions___141YT">
                     <i class="layui-icon">&#xe624;</i>
                     <span>虚拟事件</span>
-                </div>
+                </div> -->
 
             </div>
 

web/pages/userattradmin.html

@@ -6,7 +6,7 @@
             <div class="eventattradmin-left___y490Q">用户属性管理 <i class="layui-icon" title="在该页面进行事件属性的管理。包括设置时间属性的显示名，显示状态，计数单位，上传维度表以及设置虚拟时间属性等功能">&#xe60b;</i> </div>
 
             <div class="eventattradmin-right___1TIt8">
-                <div class="eventattradmin-search___23TMG">
+                <!-- <div class="eventattradmin-search___23TMG">
                     <i class="layui-icon">&#xe615;</i>
                     <input type="text" placeholder="请输入搜索" />
                     <img src="./static/img/cha1.png">
@@ -14,9 +14,9 @@
                 <div class="eventattradmin-display___21tQp">
                     <img src="./static/img/peizhi2.png">
                     <span>显示名配置</span>
-                </div>
+                </div> -->
 
-                <div class="eventattradmin-actions___141YT">
+                <div class="eventattradmin-actions___141YT adduserattradmin">
                     <i class="layui-icon">&#xe624;</i>
                     <span>虚拟事件属性</span>
                 </div>

web/src/x.min.js

@@ -2675,6 +2675,34 @@ var X = window.X || {
 
 
 
+// srczip/logic/addeventattradmin.js
+(function(){
+    X.pageLogic['addeventattradmin'] = {
+        init : function(parms){
+            var me = this;
+            this.parms = parms;
+            this.callback = parms.callback; //选择后执行的回调
+            var data = parms.extData;//获取到上层弹窗传的数据
+            layui.form.render();
+
+            $(".eventattradminedit-but-box .eventattradminedit-qx").click(function(){
+                layer.closeAll();
+            });
+        
+            $(document).off('click','.eventattradminedit-but-box .eventattradminedit-qd').on('click','.eventattradminedit-but-box .eventattradminedit-qd',function(){
+                var fromdata = layui.form.val("eventattradmineditexample");
+
+               X.api('data_mana/add_attr',"post",{new_attribute: fromdata['eventname'], data_type:fromdata.addevent ,cat:data,state:'add'},function(d){
+                   me.callback && me.callback(d);
+                   layer.closeAll();
+                   layer.msg('添加成功');
+               })
+            })
+
+        }
+    };
+})();
+
 // srczip/logic/addexistuser.js
 (function(){
     X.pageLogic['addexistuser'] = {
@@ -8555,8 +8583,15 @@ var X = window.X || {
                       me.eventattradminlist();  
                     })
                 }
-            })
+            });
 
+            $(document).off("click",'.addeventattradmin').on('click','.addeventattradmin',function(){
+                
+                X.parametersopen('event',"addeventattradmin",'auto',function(){
+                    me.eventattradminlist();  
+                })
+
+            });
 
         },
         eventattradminlist : function(){
@@ -8593,8 +8628,6 @@ var X = window.X || {
             ,"&cat=event");
         }
 
-
-
     };
 })();
 
@@ -8627,7 +8660,7 @@ var X = window.X || {
                 layer.closeAll();
             })
             
-            $(".eventattradminedit-but-box .eventattradminedit-qd").click(function(){
+            $(document).off('click','.eventattradminedit-but-box .eventattradminedit-qd').on('click','.eventattradminedit-but-box .eventattradminedit-qd',function(){
                 var fromdata = layui.form.val("eventattradmineditexample");
                 var is_show;
                 if(fromdata.eventstate == "1"){
@@ -14171,8 +14204,14 @@ var X = window.X || {
                       me.userattradminlist();  
                     })
                 }
-            })
+            });
 
+            $(document).off('click','.adduserattradmin').on('click','.adduserattradmin',function(){
+                X.parametersopen('user',"addeventattradmin",'auto',function(){
+                    me.userattradminlist();  
+                })
+
+            });
 
         },
         userattradminlist : function(){

web/srczip/logic/addeventattradmin.js

@@ -0,0 +1,26 @@
+(function(){
+    X.pageLogic['addeventattradmin'] = {
+        init : function(parms){
+            var me = this;
+            this.parms = parms;
+            this.callback = parms.callback; //选择后执行的回调
+            var data = parms.extData;//获取到上层弹窗传的数据
+            layui.form.render();
+
+            $(".eventattradminedit-but-box .eventattradminedit-qx").click(function(){
+                layer.closeAll();
+            });
+        
+            $(document).off('click','.eventattradminedit-but-box .eventattradminedit-qd').on('click','.eventattradminedit-but-box .eventattradminedit-qd',function(){
+                var fromdata = layui.form.val("eventattradmineditexample");
+
+               X.api('data_mana/add_attr',"post",{new_attribute: fromdata['eventname'], data_type:fromdata.addevent ,cat:data,state:'add'},function(d){
+                   me.callback && me.callback(d);
+                   layer.closeAll();
+                   layer.msg('添加成功');
+               })
+            })
+
+        }
+    };
+})();

web/srczip/logic/eventattradmin.js

@@ -11,8 +11,15 @@
                       me.eventattradminlist();  
                     })
                 }
-            })
+            });
 
+            $(document).off("click",'.addeventattradmin').on('click','.addeventattradmin',function(){
+                
+                X.parametersopen('event',"addeventattradmin",'auto',function(){
+                    me.eventattradminlist();  
+                })
+
+            });
 
         },
         eventattradminlist : function(){
@@ -49,7 +56,5 @@
             ,"&cat=event");
         }
 
-
-
     };
 })();

web/srczip/logic/eventattradminedit.js

@@ -26,7 +26,7 @@
                 layer.closeAll();
             })
             
-            $(".eventattradminedit-but-box .eventattradminedit-qd").click(function(){
+            $(document).off('click','.eventattradminedit-but-box .eventattradminedit-qd').on('click','.eventattradminedit-but-box .eventattradminedit-qd',function(){
                 var fromdata = layui.form.val("eventattradmineditexample");
                 var is_show;
                 if(fromdata.eventstate == "1"){

web/srczip/logic/userattradmin.js

@@ -11,8 +11,14 @@
                       me.userattradminlist();  
                     })
                 }
-            })
+            });
 
+            $(document).off('click','.adduserattradmin').on('click','.adduserattradmin',function(){
+                X.parametersopen('user',"addeventattradmin",'auto',function(){
+                    me.userattradminlist();  
+                })
+
+            });
 
         },
         userattradminlist : function(){

web/static/css/event.css

@@ -11,7 +11,7 @@
 .eventattradmin-table-box { margin: 24px; height: calc(100% - 120px); overflow: hidden; }
 
 /* 修改事件属性管理 */
-
+.eventattradminadd-box { width: 450px; height: 500px; background-color: #fff; }
 .eventattradminedit-box { width: 450px; height: 300px; background-color: #fff; }
 .eventattradminedit-bg-box { padding: 24px 24px 24px 0px; }
 .eventattradminedit-but-box { padding: 16px 24px 0 0; margin-top: 20px; border-top: 1px solid #f0f0f0; display: flex; justify-content:flex-end; align-items: center; }
@@ -21,5 +21,7 @@
 .personalsettingsedit-qx { color: #42546d; border: 1px solid #f0f0f0; }
 .personalsettingsedit-qd { color: #fff; background-color: #3d90ff; }
 .personalsettingsedit-box { width: 450px; height: 300px; }
-
+.eventattradminadd-box .eventattradminedit-but-box { 
-
+    padding: 16px 0px 0 0; margin-top: 20px; border-top: 1px solid #f0f0f0; display: flex; justify-content:flex-end; align-items: center; width: 100%; position: absolute; bottom: 16px; right: 0px;
+ }
+.eventattradminadd-box .eventattradminedit-but-box div { margin-right: 10px; margin-left: 0; }

web/static/css/style.css

@@ -16,7 +16,7 @@
 .modify-layui-footer { left: 270px !important; }
 .modify-layui-header { background-color: #475285; }
 .layui-nav { background: none; }
-.layui-form-select dl { max-height: 88px !important; }
+/* .layui-form-select dl { max-height: 88px !important; } */
 .layui-table-body { height: 660px !important; }
 .layui-form-item .layui-form-checkbox[lay-skin=primary] { text-indent: 0px !important; }
 .layui-anim-downbit { max-height: 350px; overflow-y: auto; overflow-x: hidden; }