From 4e60273930b31cc25f7c2a4ab1b7d5a8088a378b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 六月 2020 08:30:29 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs

---
 src/main/webapp/views/wrkMast/wrkMast.html          |   10 +++++-----
 src/main/java/com/zy/common/web/AuthController.java |    2 +-
 src/main/webapp/views/matCode/matCode.html          |    7 +++----
 src/main/webapp/views/stoMan/stoQue.html            |    4 ++--
 src/main/webapp/static/js/wrkMast/wrkMast.js        |    4 ++--
 src/main/resources/application.yml                  |    2 +-
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 835ba54..1ce49d5 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -146,7 +146,7 @@
 
                     // 鏄惁鎷ユ湁鏌ョ湅鏉冮檺
                     if (getUserId() != 9527) {
-                        Resource view = resourceService.selectOne(new EntityWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "view"));
+                        Resource view = resourceService.selectOne(new EntityWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "#view"));
                         if (!Cools.isEmpty(view)){
                             RoleResource param = new RoleResource();
                             param.setResourceId(view.getId());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a3210c4..006891b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -15,7 +15,7 @@
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlasrs
     username: sa
-    password: sa@123
+    password: Qwe!@#123
   mvc:
     static-path-pattern: /**
   redis:
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 657dae3..ae7e21b 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -20,7 +20,7 @@
         cellMinWidth: 50,
         cols: [[
             {type: 'checkbox'}
-            ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true}
+            ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 85}
             ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
             ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
             ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
@@ -64,7 +64,7 @@
             //         return html;
             //     }}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:200}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:160}
         ]],
         request: {
             pageName: 'curr',
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 79c401c..7c16e1f 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -79,16 +79,15 @@
 </div>
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-normal" id="btn-export" lay-event="exportData" style="float: inherit">瀵煎嚭</button>
-        <button class="layui-btn " id="btn-into" lay-event="intoData">瀵煎叆</button>
-        <button class="layui-btn layui-btn-danger" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
+        <button class="layui-btn layui-btn-normal layui-btn-sm" id="btn-export" lay-event="exportData" style="float: inherit">瀵煎嚭</button>
+        <button class="layui-btn layui-btn-sm" id="btn-into" lay-event="intoData">瀵煎叆</button>
+        <button class="layui-btn layui-btn-danger layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
     </div>
 </script>
 
 <script type="text/html" id="operate">
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
     <button class="layui-btn layui-btn-danger layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
-<!--    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>-->
 </script>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html
index fedba56..936047c 100644
--- a/src/main/webapp/views/stoMan/stoQue.html
+++ b/src/main/webapp/views/stoMan/stoQue.html
@@ -46,7 +46,7 @@
 </div>
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-normal layui-btn-lg" id="refresh-sto" lay-event="refreshSto" style="margin-left: 10px">鏇存柊搴撳瓨</button>
+        <button class="layui-btn layui-btn-normal layui-btn-sm" id="refresh-sto" lay-event="refreshSto" style="margin-left: 10px">鏇存柊搴撳瓨</button>
         <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
     </div>
 </script>
@@ -54,7 +54,7 @@
 <table class="layui-hide" id="stoQue" lay-filter="stoQue"></table>
 
 <script type="text/html" id="operate">
-    <a class="layui-btn layui-btn-sm loc-detl" lay-event="locDetl" style="font-size: 15px">鏌ョ湅鏄庣粏</a>
+    <a class="layui-btn layui-btn-xs loc-detl" lay-event="locDetl">鏌ョ湅鏄庣粏</a>
 </script>
 
 <!--鏄庣粏琛�-->
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index f839a05..b3c110c 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -106,8 +106,8 @@
 </div>
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon">&#xe624;</i>澧炲姞浼樺厛绾�</button>
-        <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon">&#xe67e;</i>闄嶄綆浼樺厛绾�</button>
+        <button class="layui-btn layui-btn-normal layui-btn-sm" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon">&#xe624;</i>澧炲姞浼樺厛绾�</button>
+        <button class="layui-btn layui-btn-normal layui-btn-sm" id="btn-pri-red" lay-event="priRed"><i class="layui-icon">&#xe67e;</i>闄嶄綆浼樺厛绾�</button>
         <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
     </div>
 </script>
@@ -122,9 +122,9 @@
 </div>
 
 <script type="text/html" id="operate">
-    <a class="layui-btn layui-btn-sm btn-detlShow" lay-event="detlShow">鏄庣粏</a>
-    <a class="layui-btn layui-btn-danger layui-btn-sm btn-complete" lay-event="complete">瀹屾垚</a>
-    <a class="layui-btn layui-btn-primary layui-btn-sm btn-cancel" lay-event="cancel">鍙栨秷</a>
+    <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
+    <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
 </script>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>

--
Gitblit v1.9.1