From aca37844babdacddb12ed27d7952104da137548b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 5 Oct 2018 19:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ajax/libs/bootstrap-treetable/bootstrap-treetable.js      | 2 +-
 src/main/resources/templates/monitor/job/add.html             | 2 +-
 src/main/resources/templates/monitor/job/edit.html            | 2 +-
 src/main/resources/templates/monitor/job/job.html             | 2 +-
 src/main/resources/templates/monitor/job/jobLog.html          | 2 +-
 .../resources/templates/monitor/logininfor/logininfor.html    | 2 +-
 src/main/resources/templates/monitor/online/online.html       | 2 +-
 src/main/resources/templates/monitor/operlog/operlog.html     | 2 +-
 src/main/resources/templates/system/config/config.html        | 2 +-
 src/main/resources/templates/system/dict/data/data.html       | 2 +-
 src/main/resources/templates/system/dict/type/type.html       | 2 +-
 src/main/resources/templates/system/menu/add.html             | 3 ++-
 src/main/resources/templates/system/menu/edit.html            | 2 +-
 src/main/resources/templates/system/menu/menu.html            | 2 +-
 src/main/resources/templates/system/notice/add.html           | 4 ++--
 src/main/resources/templates/system/notice/edit.html          | 3 ++-
 src/main/resources/templates/system/notice/notice.html        | 2 +-
 src/main/resources/templates/system/post/post.html            | 2 +-
 src/main/resources/templates/system/role/role.html            | 4 ++--
 src/main/resources/templates/system/user/user.html            | 2 +-
 src/main/resources/templates/tool/gen/gen.html                | 2 +-
 21 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js b/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js
index d14121e7..a3e4d34f 100644
--- a/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js
+++ b/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js
@@ -652,7 +652,7 @@
         ajaxParams: {},          // 请求数据的ajax的data属性
         expandColumn: 0,         // 在哪一列上面显示展开按钮
         expandAll: false,        // 是否全部展开
-        expandFirst: false,       // 是否默认第一级展开--expandAll为false时生效
+        expandFirst: true,       // 是否默认第一级展开--expandAll为false时生效
         striped: false,          // 是否各行渐变色
         bordered: true,          // 是否显示边框
         hover: true,             // 是否鼠标悬停
diff --git a/src/main/resources/templates/monitor/job/add.html b/src/main/resources/templates/monitor/job/add.html
index f4194693..426cc04b 100644
--- a/src/main/resources/templates/monitor/job/add.html
+++ b/src/main/resources/templates/monitor/job/add.html
@@ -62,7 +62,7 @@
 	</div>
 	<div th:include="include::footer"></div>
 	<script type="text/javascript">
-		var prefix = ctx + "monitor/job"
+		var prefix = ctx + "monitor/job";
 	
 		$("#form-job-add").validate({
 			rules:{
diff --git a/src/main/resources/templates/monitor/job/edit.html b/src/main/resources/templates/monitor/job/edit.html
index 2ed46693..e2e7d52e 100644
--- a/src/main/resources/templates/monitor/job/edit.html
+++ b/src/main/resources/templates/monitor/job/edit.html
@@ -63,7 +63,7 @@
 	</div>
 	<div th:include="include::footer"></div>
 	<script type="text/javascript">
-		var prefix = ctx + "monitor/job"
+		var prefix = ctx + "monitor/job";
 	
 		$("#form-job-edit").validate({
 			rules:{
diff --git a/src/main/resources/templates/monitor/job/job.html b/src/main/resources/templates/monitor/job/job.html
index 2ac1b420..ee1dbaf7 100644
--- a/src/main/resources/templates/monitor/job/job.html
+++ b/src/main/resources/templates/monitor/job/job.html
@@ -61,7 +61,7 @@
 		var removeFlag = [[${@permission.hasPermi('monitor:job:remove')}]];
 		var statusFlag = [[${@permission.hasPermi('monitor:job:changeStatus')}]];
 		var datas = [[${@dict.getType('sys_job_status')}]];
-		var prefix = ctx + "monitor/job"
+		var prefix = ctx + "monitor/job";
 
 		$(function() {
 		    var options = {
diff --git a/src/main/resources/templates/monitor/job/jobLog.html b/src/main/resources/templates/monitor/job/jobLog.html
index b86b358c..ab612e13 100644
--- a/src/main/resources/templates/monitor/job/jobLog.html
+++ b/src/main/resources/templates/monitor/job/jobLog.html
@@ -56,7 +56,7 @@
 	<script th:inline="javascript">
 		var removeFlag = [[${@permission.hasPermi('monitor:job:remove')}]];
 		var datas = [[${@dict.getType('sys_job_status')}]];
-		var prefix = ctx + "monitor/jobLog"
+		var prefix = ctx + "monitor/jobLog";
 
 		$(function() {
 		    var options = {
diff --git a/src/main/resources/templates/monitor/logininfor/logininfor.html b/src/main/resources/templates/monitor/logininfor/logininfor.html
index f88371b7..c88f20de 100644
--- a/src/main/resources/templates/monitor/logininfor/logininfor.html
+++ b/src/main/resources/templates/monitor/logininfor/logininfor.html
@@ -56,7 +56,7 @@
 	<div th:include="include :: footer"></div>
 	<script th:inline="javascript">
 	    var datas = [[${@dict.getType('sys_common_status')}]];
-		var prefix = ctx + "monitor/logininfor"
+		var prefix = ctx + "monitor/logininfor";
 	
 		$(function() {
 		    var options = {
diff --git a/src/main/resources/templates/monitor/online/online.html b/src/main/resources/templates/monitor/online/online.html
index 34cf0e2a..4e4b2cef 100644
--- a/src/main/resources/templates/monitor/online/online.html
+++ b/src/main/resources/templates/monitor/online/online.html
@@ -40,7 +40,7 @@
 	<div th:include="include :: footer"></div>
 	<script th:inline="javascript">
 		var forceFlag = [[${@permission.hasPermi('monitor:online:forceLogout')}]];
-		var prefix = ctx + "monitor/online"
+		var prefix = ctx + "monitor/online";
 
 		$(function() {
 		    var options = {
diff --git a/src/main/resources/templates/monitor/operlog/operlog.html b/src/main/resources/templates/monitor/operlog/operlog.html
index b55528a2..12594921 100644
--- a/src/main/resources/templates/monitor/operlog/operlog.html
+++ b/src/main/resources/templates/monitor/operlog/operlog.html
@@ -57,7 +57,7 @@
 	<script th:inline="javascript">
 		var detailFlag = [[${@permission.hasPermi('monitor:operlog:detail')}]];
 		var datas = [[${@dict.getType('sys_oper_type')}]];
-		var prefix = ctx + "monitor/operlog"
+		var prefix = ctx + "monitor/operlog";
 
 		$(function() {
 		    var options = {
diff --git a/src/main/resources/templates/system/config/config.html b/src/main/resources/templates/system/config/config.html
index 38fb9804..46c9ef87 100644
--- a/src/main/resources/templates/system/config/config.html
+++ b/src/main/resources/templates/system/config/config.html
@@ -61,7 +61,7 @@
         var editFlag = [[${@permission.hasPermi('system:config:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:config:remove')}]];
         var datas = [[${@dict.getType('sys_yes_no')}]];
-        var prefix = ctx + "system/config"
+        var prefix = ctx + "system/config";
 
         $(function() {
             var options = {
diff --git a/src/main/resources/templates/system/dict/data/data.html b/src/main/resources/templates/system/dict/data/data.html
index f38313cd..d118ffdc 100644
--- a/src/main/resources/templates/system/dict/data/data.html
+++ b/src/main/resources/templates/system/dict/data/data.html
@@ -60,7 +60,7 @@
 		var editFlag = [[${@permission.hasPermi('system:dict:edit')}]];
 		var removeFlag = [[${@permission.hasPermi('system:dict:remove')}]];
 		var datas = [[${@dict.getType('sys_normal_disable')}]];
-		var prefix = ctx + "system/dict/data"
+		var prefix = ctx + "system/dict/data";
 
 		$(function() {
 			var options = {
diff --git a/src/main/resources/templates/system/dict/type/type.html b/src/main/resources/templates/system/dict/type/type.html
index fa1353d8..0fe6b178 100644
--- a/src/main/resources/templates/system/dict/type/type.html
+++ b/src/main/resources/templates/system/dict/type/type.html
@@ -64,7 +64,7 @@
 		var listFlag = [[${@permission.hasPermi('system:dict:list')}]];
 		var removeFlag = [[${@permission.hasPermi('system:dict:remove')}]];
 		var datas = [[${@dict.getType('sys_normal_disable')}]];
-		var prefix = ctx + "system/dict"
+		var prefix = ctx + "system/dict";
 
 		$(function() {
 		    var options = {
diff --git a/src/main/resources/templates/system/menu/add.html b/src/main/resources/templates/system/menu/add.html
index 84f73677..d7e994bd 100644
--- a/src/main/resources/templates/system/menu/add.html
+++ b/src/main/resources/templates/system/menu/add.html
@@ -68,7 +68,8 @@
 	</div>
 	<div th:include="include::footer"></div>
 	 <script>
-        var prefix = ctx + "system/menu"
+        var prefix = ctx + "system/menu";
+        
         $("#form-menu-add").validate({
         	rules:{
         		menuType:{
diff --git a/src/main/resources/templates/system/menu/edit.html b/src/main/resources/templates/system/menu/edit.html
index 27d843e5..243322ea 100644
--- a/src/main/resources/templates/system/menu/edit.html
+++ b/src/main/resources/templates/system/menu/edit.html
@@ -69,7 +69,7 @@
 	</div>
 	<div th:include="include::footer"></div>
 	 <script>
-        var prefix = ctx + "system/menu"
+        var prefix = ctx + "system/menu";
 
         $(function() {
             var menuType = $('input[name="menuType"]:checked').val();
diff --git a/src/main/resources/templates/system/menu/menu.html b/src/main/resources/templates/system/menu/menu.html
index aee80197..e715b312 100644
--- a/src/main/resources/templates/system/menu/menu.html
+++ b/src/main/resources/templates/system/menu/menu.html
@@ -51,7 +51,7 @@
 		var editFlag = [[${@permission.hasPermi('system:menu:edit')}]];
 		var removeFlag = [[${@permission.hasPermi('system:menu:remove')}]];
 		var datas = [[${@dict.getType('sys_show_hide')}]];
-		var prefix = ctx + "system/menu"
+		var prefix = ctx + "system/menu";
 
 		$(function() {
 		    var options = {
diff --git a/src/main/resources/templates/system/notice/add.html b/src/main/resources/templates/system/notice/add.html
index 7849e6f4..a60c2a72 100644
--- a/src/main/resources/templates/system/notice/add.html
+++ b/src/main/resources/templates/system/notice/add.html
@@ -49,13 +49,13 @@
     <script th:src="@{/ajax/libs/summernote/summernote.min.js}"></script>
     <script th:src="@{/ajax/libs/summernote/summernote-zh-CN.js}"></script>
     <script type="text/javascript">
+        var prefix = ctx + "system/notice";
     
 	    $('.summernote').summernote({
 			height : '220px',
 			lang : 'zh-CN'
 		});
-	    
-		var prefix = ctx + "system/notice"
+		
 		$("#form-notice-add").validate({
 			rules:{
 				noticeTitle:{
diff --git a/src/main/resources/templates/system/notice/edit.html b/src/main/resources/templates/system/notice/edit.html
index 74671e2f..f5eee47e 100644
--- a/src/main/resources/templates/system/notice/edit.html
+++ b/src/main/resources/templates/system/notice/edit.html
@@ -50,6 +50,8 @@
     <script th:src="@{/ajax/libs/summernote/summernote.min.js}"></script>
     <script th:src="@{/ajax/libs/summernote/summernote-zh-CN.js}"></script>
     <script type="text/javascript">
+        var prefix = ctx + "system/notice";
+    
 	    $(function() {
 		    $('.summernote').summernote({
 				height : '220px',
@@ -59,7 +61,6 @@
 		    $('#editor').code(content);
 	    });
 	    
-		var prefix = ctx + "system/notice"
 		$("#form-notice-edit").validate({
 			rules:{
 				xxxx:{
diff --git a/src/main/resources/templates/system/notice/notice.html b/src/main/resources/templates/system/notice/notice.html
index e66158e4..5d74d011 100644
--- a/src/main/resources/templates/system/notice/notice.html
+++ b/src/main/resources/templates/system/notice/notice.html
@@ -54,7 +54,7 @@
         var removeFlag = [[${@permission.hasPermi('system:notice:remove')}]];
         var types = [[${@dict.getType('sys_notice_type')}]];
         var datas = [[${@dict.getType('sys_notice_status')}]];
-        var prefix = ctx + "system/notice"
+        var prefix = ctx + "system/notice";
 
         $(function() {
             var options = {
diff --git a/src/main/resources/templates/system/post/post.html b/src/main/resources/templates/system/post/post.html
index b28dfc02..5452d7b3 100644
--- a/src/main/resources/templates/system/post/post.html
+++ b/src/main/resources/templates/system/post/post.html
@@ -57,7 +57,7 @@
 		var editFlag = [[${@permission.hasPermi('system:post:edit')}]];
 		var removeFlag = [[${@permission.hasPermi('system:post:remove')}]];
 		var datas = [[${@dict.getType('sys_normal_disable')}]];
-		var prefix = ctx + "system/post"
+		var prefix = ctx + "system/post";
 
 		$(function() {
 		    var options = {
diff --git a/src/main/resources/templates/system/role/role.html b/src/main/resources/templates/system/role/role.html
index 7c20e75c..0cdd27a2 100644
--- a/src/main/resources/templates/system/role/role.html
+++ b/src/main/resources/templates/system/role/role.html
@@ -63,7 +63,7 @@
 		var editFlag = [[${@permission.hasPermi('system:role:edit')}]];
 		var removeFlag = [[${@permission.hasPermi('system:role:remove')}]];
 		var datas = [[${@dict.getType('sys_normal_disable')}]];
-		var prefix = ctx + "system/role"
+		var prefix = ctx + "system/role";
 		
 
 		$(function() {
@@ -118,7 +118,7 @@
 		            formatter: function(value, row, index) {
 		                var actions = [];
 		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.roleId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-		                actions.push('<a class="btn btn-primary btn-xs ' + removeFlag + '" href="#" onclick="rule(\'' + row.roleId + '\')"><i class="fa fa-check-square-o"></i>权限</a> ');
+		                actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="#" onclick="rule(\'' + row.roleId + '\')"><i class="fa fa-check-square-o"></i>数据权限</a> ');
 		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.roleId + '\')"><i class="fa fa-remove"></i>删除</a>');
 		                return actions.join('');
 		            }
diff --git a/src/main/resources/templates/system/user/user.html b/src/main/resources/templates/system/user/user.html
index e0484f13..49e0b929 100644
--- a/src/main/resources/templates/system/user/user.html
+++ b/src/main/resources/templates/system/user/user.html
@@ -91,7 +91,7 @@
 		var removeFlag = [[${@permission.hasPermi('system:user:remove')}]];
 		var resetPwdFlag = [[${@permission.hasPermi('system:user:resetPwd')}]];
 		var datas = [[${@dict.getType('sys_normal_disable')}]];
-		var prefix = ctx + "system/user"
+		var prefix = ctx + "system/user";
 
 		$(function() {
 			$('body').layout({ west__size: 185 });
diff --git a/src/main/resources/templates/tool/gen/gen.html b/src/main/resources/templates/tool/gen/gen.html
index 36074806..42df3c32 100644
--- a/src/main/resources/templates/tool/gen/gen.html
+++ b/src/main/resources/templates/tool/gen/gen.html
@@ -44,7 +44,7 @@
 	</div>
 	<div th:include="include :: footer"></div>
 	<script type="text/javascript">
-		var prefix = ctx + "tool/gen"
+		var prefix = ctx + "tool/gen";
 	
 		$(function() {
 		    var options = {