From 7df0dabb0d2ded61f631a490d6367af0da5889d9 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Wed, 16 Mar 2022 14:00:50 +0800
Subject: [PATCH] 1

---
 web/pages/dashboard.html          | 12 ++++++------
 web/src/x.min.js                  |  7 ++++---
 web/srczip/logic/dashboard.js     |  4 ++--
 web/srczip/logic/dropdownlist2.js |  2 +-
 web/srczip/logic/login.js         |  1 +
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html
index b12ae6c..1968334 100644
--- a/web/pages/dashboard.html
+++ b/web/pages/dashboard.html
@@ -169,9 +169,9 @@
                 <!-- <div class="img-box" title="共享">
                     <img src="./static/img/fenxiang.png" /> 
                 </div> -->
-                <div class="img-box shezhi" title="设置">
+                <!-- <div class="img-box shezhi" title="设置">
                     <img src="./static/img/shezhi.png" />
-                </div>
+                </div> -->
                 <div class="img-box baobiao" title="报表" style="display: none;">
                     <img src="./static/img/baobiao2.png">
                 </div>
@@ -337,7 +337,7 @@
             <a href="javascript:;" class="fontcolor mykanban"> <img src="./static/img/wenjian.png" data-id="{{item._id}}"/><span>{{item.name}}</span> </a>
             {{#  layui.each(item.children, function(indexs, items){ }}
             <dl class="layui-nav-child modeify-layui-nav-child">
-                <dd class="layui-left-dd" data-id="{{items._id}}" data-authority="{{item.authority}}"><a href="javascript:;" class="fontcolor second category"><span>{{items.name}} </span> 
+                <dd class="layui-left-dd" data-id="{{items._id}}" data-authority="{{item.authority}}" data-userid="{{item.user_id}}"><a href="javascript:;" class="fontcolor second category"><span>{{items.name}} </span> 
                 <img src="./static/img/gengduo.png" alt=""> </a></dd>
             </dl>
             {{#  }); }}
@@ -349,7 +349,7 @@
                 <img class='kanbanwenjianimg' src="./static/img/gengduo.png"/></a>
                 {{#  layui.each(item.children, function(indexs, items){ }}
                 <dl class="layui-nav-child modeify-layui-nav-child">
-                    <dd class="layui-left-dd" data-authority="{{item.authority}}" data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"><span>{{items.name}}</span> 
+                    <dd class="layui-left-dd" data-authority="{{item.authority}}" data-id="{{items._id}}" data-userid="{{item.user_id}}"><a href="javascript:;" class="fontcolor second category"><span>{{items.name}}</span> 
                     <img src="./static/img/gengduo.png" alt=""> </a></dd>
                 </dl>
                 {{#  }); }}
@@ -373,7 +373,7 @@
             <dl class="layui-nav-child modeify-layui-nav-child sidebarslide" id="sidebar-boxhuadong">
                 {{#  layui.each(item.children, function(indexs, items){ }}
                     {{#  if(items.onclick == 1 && index == 0){ }}
-                        <dd class="layui-left-dd layui-this" data-authority="{{item.authority}}" data-id="{{items._id}}" data-kjid="{{item._id}}">
+                        <dd class="layui-left-dd layui-this" data-authority="{{item.authority}}" data-id="{{items._id}}" data-kjid="{{item._id}}" data-userid="{{items.user_id}}">
                             <a href="javascript:;" class="fontcolor second category"> 
                                 <span class="tuodong" data-id="{{item._id}}">{{items.name}}</span>
                                 {{#  if(item.authority == "rw"){ }}
@@ -382,7 +382,7 @@
                             </a>
                         </dd>
                     {{#  } else { }}
-                        <dd class="layui-left-dd" data-authority="{{item.authority}}" data-id="{{items._id}}" data-kjid="{{item._id}}">
+                        <dd class="layui-left-dd" data-authority="{{item.authority}}" data-id="{{items._id}}" data-kjid="{{item._id}}" data-userid="{{items.user_id}}">
                             <a href="javascript:;" class="fontcolor second category"> 
                                 <span class="tuodong" data-id="{{item._id}}">{{items.name}}</span>
                                 {{#  if(item.authority == "rw"){ }}
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 738e30f..c9db1b2 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -6015,7 +6015,7 @@ var X = window.X || {
             $(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
                 var authority = $(this).attr("data-authority");
                 X.DATA.authority = authority;
-                if(authority == "rw"){
+                if(authority == "rw" && X.DATA['userinfo']['userid'] == $(this).attr("data-userid")){
                     $(".baobiao").show();
                 }else{
                     $(".baobiao").hide();
@@ -6305,7 +6305,7 @@ var X = window.X || {
                     shadeClose: true,
                     skin: 'yourclass',
                     url: 'search'
-                  })
+                })
             });
             
             $(document).off('click','.tab-right-box .shezhi').on("click",".tab-right-box .shezhi",function(){
@@ -8723,8 +8723,8 @@ var X = window.X || {
             $(document).off('click','.dropdownlist-list').on('click','.dropdownlist-list',function(){
                 var index = $(this).attr("data-index");
                 var dataArr = listdata[index];
-                me.callback && me.callback(dataArr);
                 layer.closeAll(0);
+                me.callback && me.callback(dataArr);
             })
 
         }
@@ -10643,6 +10643,7 @@ var X = window.X || {
 
         }
     };
+    
 })();
 // srczip/logic/ltvmodel.js
 (function(){
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index dc3bea1..53fb417 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -85,7 +85,7 @@
             $(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
                 var authority = $(this).attr("data-authority");
                 X.DATA.authority = authority;
-                if(authority == "rw"){
+                if(authority == "rw" && X.DATA['userinfo']['userid'] == $(this).attr("data-userid")){
                     $(".baobiao").show();
                 }else{
                     $(".baobiao").hide();
@@ -375,7 +375,7 @@
                     shadeClose: true,
                     skin: 'yourclass',
                     url: 'search'
-                  })
+                })
             });
             
             $(document).off('click','.tab-right-box .shezhi').on("click",".tab-right-box .shezhi",function(){
diff --git a/web/srczip/logic/dropdownlist2.js b/web/srczip/logic/dropdownlist2.js
index d255a21..247c2ac 100644
--- a/web/srczip/logic/dropdownlist2.js
+++ b/web/srczip/logic/dropdownlist2.js
@@ -12,8 +12,8 @@
             $(document).off('click','.dropdownlist-list').on('click','.dropdownlist-list',function(){
                 var index = $(this).attr("data-index");
                 var dataArr = listdata[index];
-                me.callback && me.callback(dataArr);
                 layer.closeAll(0);
+                me.callback && me.callback(dataArr);
             })
 
         }
diff --git a/web/srczip/logic/login.js b/web/srczip/logic/login.js
index 2ab0eea..a1acf73 100644
--- a/web/srczip/logic/login.js
+++ b/web/srczip/logic/login.js
@@ -36,4 +36,5 @@
 
         }
     };
+    
 })();
\ No newline at end of file