From ea4368a7972b559af5f8ab3f9fd80d516c077268 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Mon, 14 Mar 2022 14:06:54 +0800
Subject: [PATCH] 1

---
 web/pages/userpar.html         |  4 ++--
 web/srczip/common.js           | 29 +++++++++++++++++++++++++++++
 web/srczip/logic/addproduct.js |  2 --
 web/srczip/logic/addrole.js    |  5 ++---
 web/static/css/analysis.css    |  4 ++++
 5 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/web/pages/userpar.html b/web/pages/userpar.html
index 5dc9f69..433db62 100644
--- a/web/pages/userpar.html
+++ b/web/pages/userpar.html
@@ -14,7 +14,7 @@
                     {{#  if(d.quota != "*"){ }}
                     <div id="analysis-zhibiao-list-type3-0" class="analysis-zhibiao-list-type3 analysis-background analysis-zhibiao-condition" data-index="0" data-type="{{d.data_type}}">{{d.analysisDesc}}</div>
                     {{#  } }} 
-                    <div class="analysis-ta-property-range analysis-granularity userevent-granularity" data-index="0"  data-type="{{d.data_type}}"> <img src="./static/img/shezhi2.png"> </div>
+                    <div class="analysis-ta-property-range userevent-granularity" data-index="0"  data-type="{{d.data_type}}"> <img src="./static/img/shezhi2.png"> </div>
                 </div>
             </div>
             {{#  if(d.filts.length > 0){ }}
@@ -38,7 +38,7 @@
                                 {{#  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}}" 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 class="analysis-zhibiao-list-del-initial-event" data-twonum="{{indexs}}"></div>
                             </div>
                         {{#  }); }}
                     </div>
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 5f71b8b..c53f72f 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -276,6 +276,25 @@ var X = window.X || {
         });
     };
 
+    //提交修改记录
+    X.submitrecord = function(content){
+        var game = X.game;//项目名
+        var name = X.userinfo.name;//账号名
+        var date = new Date();
+        var y = date.getFullYear();
+        var m = date.getMonth()+1;
+        var d = date.getDate();
+        var h = date.getHours();
+        var min = date.getMinutes();
+        var s = date.getSeconds();
+        var time = y+'年'+(m<10?('0'+m):m)+'月'+(d<10?('0'+d):d)+'日  '+(h<10?('0'+h):h)+':'+(min<10?('0'+min):min)+':'+(s<10?('0'+s):s);//操作时间
+
+        console.log(name+'在'+time+'修改'+content);
+        // X.api(function(){
+            
+        // })
+    };
+
     X.uploadfile=function(url,id,callback){
         var loginCache = X.loginCache();
         var token = (loginCache? loginCache.token:"");
@@ -609,6 +628,16 @@ var X = window.X || {
         callback && callback(dataArr);
     };
 
+    //分页
+    X.layuipages = function(id,count,callback){//绑定id，数据总数
+        layui.laypage.render({
+            elem: id
+            ,count: count //数据总数
+            ,limit: 18 //每页显示数
+            ,jump:callback
+        });
+    };
+
     // 日期选择器
     X.daterender = function(id,callback){
         // console.log(moment().subtract(1, 'week').startOf('week'))
diff --git a/web/srczip/logic/addproduct.js b/web/srczip/logic/addproduct.js
index cf4b4b4..f267c1e 100644
--- a/web/srczip/logic/addproduct.js
+++ b/web/srczip/logic/addproduct.js
@@ -24,12 +24,10 @@
 
             $(document).off('click','.newwenjian-qx').on('click','.newwenjian-qx',function(){
                 layer.closeAll();
-                
             });
 
             $(document).off('click','.newwenjian-cha').on('click','.newwenjian-cha',function(){
                 layer.closeAll();
-               
             });
             
         
diff --git a/web/srczip/logic/addrole.js b/web/srczip/logic/addrole.js
index 2f896b5..cb887ec 100644
--- a/web/srczip/logic/addrole.js
+++ b/web/srczip/logic/addrole.js
@@ -53,8 +53,6 @@
                 for(let i in addroledata){
                     dataArr.push(i);
                 }
-                // console.log(addroledata);
-                // console.log(dataArr);
                 if(passdata){
                     // X.api("authz/add_roles","post",{name:tit,game:X['DATA']['game'],desc:'111'},function(d){
                     
@@ -70,10 +68,11 @@
                             layer.msg("创建成功");
                             $(".addrole-qx a").click();
                         })
+                        
                     })
                 }
             });
 
         }
     };
-})();
\ No newline at end of file
+})();           
\ No newline at end of file
diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css
index d95871f..bf05d4e 100644
--- a/web/static/css/analysis.css
+++ b/web/static/css/analysis.css
@@ -77,6 +77,10 @@
 .analysis-zhibiao-list-type3 { text-align: center; color: #67729d; margin-left: 8px; padding: 0 6px; display: inline-block; min-width: 30px; height: 28px; font-size: 13px; line-height: 29px; border-radius: 2px; background-color: #f0f2f5; cursor: pointer; }
 .analysis-zhibiao-list-del { display: none; cursor: pointer; margin-left: 0px; width: 24px; height: 24px; background: url("../img/cha1.png") no-repeat; background-position: center;  }
 .analysis-zhibiao-list-mar:hover > .analysis-zhibiao-list-del{ display: block; }
+
+.analysis-zhibiao-list-del-initial-event { display: none; cursor: pointer; margin-left: 0px; width: 24px; height: 24px; background: url("../img/cha1.png") no-repeat; background-position: center; }
+.analysis-zhibiao-list-mar:hover > .analysis-zhibiao-list-del-initial-event{ display: block; }
+
 .analysis-zhibiao-list-type4 { margin-left: 8px; font-size: 13px; line-height: 28px; height: 28px; color: #67729d; text-align: center; border-radius: 2px; border: 1px solid #f0f2f5; }
 .analysis-zhibiao-list-type4 input { border: 0; height: 28px; line-height: 26px; padding: 0 6px; color: #67729d; font-size: 13px;}