update

潘钊
1 parent ed3d5df2
Showing 4 changed files with 9 additions and 10 deletions
src/main/resources/application-dev.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/index.html
src/main/resources/static/pages/permission/user/list.html
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201:3306/control
+spring.datasource.url= jdbc:mysql://127.0.0.1:3306/control
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password= panzhao
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.password= 123456
 \ No newline at end of file
@@ -143,7 +143,7 @@ tr.row-active td {
         <div class="page-header-inner ">
             <!-- LOGO -->
             <div class="page-logo">
-                <a href="index.html" class="logo-default logo-default-text" > 闵行公交调度系统 </a>
+                <a href="index.html" class="logo-default logo-default-text" > 青浦公交调度系统 </a>
                 <div class="menu-toggler sidebar-toggler">
                 </div>
             </div>
@@ -133,11 +133,7 @@
 		{{obj.lastLoginDate}}
 	</td>
 	<td>
-		{{if obj.enabled}}
-			<button type="button" onclick="changeEnabled({{obj.id}},0)" class="btn btn-warning btn-sm">禁用</button>
-		{{else}}
-			<button type="button" onclick="changeEnabled({{obj.id}},1)" class="btn btn-success btn-sm">启用</button>
-		{{/if}}
+		<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}"><i class="fa fa-edit"></i> 编辑</a>
 	</td>
 </tr>
 {{/each}}
@@ -194,6 +190,9 @@ $(function(){
 		params['page'] = page;
 		var i = layer.load(2);
 		$get('/user' ,params, function(data){
+			$.each(data.content, function(i, obj) {
+                obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
+            });
 			var bodyHtm = template('user_list_temp', {list: data.content});
 			$('#datatable_user tbody').html(bodyHtm)