+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ //监听行工具事件
+ //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+ //obj.data //获得当前行数据
+ //var layEvent = obj.event; //获得 lay-event 对应的值
+ table.on('tool(test)', function (obj) {
+ var event = obj.event;
+ var data = obj.data;
+ if (event === 'edit') { //执行编辑
+ layer.open({
+ type: 2,
+ title: '编辑管理员',
+ area: ['400px', '5000px'],
+ content: '/admin/editAdmin/' + data.id
+ });
+ } else if (event === 'del') {//执行删除
+ var adminId = $("#adminId").val();
+ if (data.roleName == "超级管理员") {
+ layer.msg('超级管理员不能删除');
+ return;
+ }
+ if (data.id == adminId) {
+ layer.msg('不能删除自己');
+ return;
+ }
+ layer.confirm('确认删除', function (index) {
+ $.ajax({
+ url: '/admin/deleteAdmin/' + data.id,
+ type: 'delete',
+ dataType: 'json',
+ success: function (result) {
+ if (result.code == 200) {
+ layer.msg("删除成功", {icon: 1});
+ location.reload();
+ } else {
+ layer.msg("删除失败", {icon: 5});
+ }
+ }
+ })
+ layer.close(index);
+ })
+ }
+ })
+
+
+ });
+
+
+
+
+
\ No newline at end of file
diff --git a/pccenter/src/main/resources/templates/sys/complainList.html b/pccenter/src/main/resources/templates/sys/complainList.html
new file mode 100644
index 0000000..7c02c80
--- /dev/null
+++ b/pccenter/src/main/resources/templates/sys/complainList.html
@@ -0,0 +1,161 @@
+
+
+
+
+
物业投诉列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pccenter/src/main/resources/templates/sys/dynamic_commentList.html b/pccenter/src/main/resources/templates/sys/dynamic_commentList.html
new file mode 100644
index 0000000..9ad824a
--- /dev/null
+++ b/pccenter/src/main/resources/templates/sys/dynamic_commentList.html
@@ -0,0 +1,163 @@
+
+
+
+
+
活动评论列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pccenter/src/main/resources/templates/sys/editMenu.html b/pccenter/src/main/resources/templates/sys/editMenu.html
new file mode 100644
index 0000000..47fc05f
--- /dev/null
+++ b/pccenter/src/main/resources/templates/sys/editMenu.html
@@ -0,0 +1,99 @@
+
+
+
+
+
编辑菜单
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pccenter/src/main/resources/templates/sys/editRole.html b/pccenter/src/main/resources/templates/sys/editRole.html
index 570fcac..8a57994 100644
--- a/pccenter/src/main/resources/templates/sys/editRole.html
+++ b/pccenter/src/main/resources/templates/sys/editRole.html
@@ -33,7 +33,6 @@
diff --git a/pccenter/src/main/resources/templates/sys/index.html b/pccenter/src/main/resources/templates/sys/index.html
index 47fcf32..7aaa30a 100644
--- a/pccenter/src/main/resources/templates/sys/index.html
+++ b/pccenter/src/main/resources/templates/sys/index.html
@@ -1,5 +1,5 @@
-
+
后台首页
@@ -24,19 +24,19 @@
修改密码
- 退出
+ 退出
-
+
- 个人资料
- 修改密码
- - 退出
+ - 退出
diff --git a/pccenter/src/main/resources/templates/sys/menuList.html b/pccenter/src/main/resources/templates/sys/menuList.html
index 95a1b81..a239710 100644
--- a/pccenter/src/main/resources/templates/sys/menuList.html
+++ b/pccenter/src/main/resources/templates/sys/menuList.html
@@ -1,5 +1,5 @@
-
+
菜单列表
@@ -8,9 +8,12 @@
-
-
-
+
+
+
+
+
+
@@ -58,9 +61,6 @@
{title:'排序',field:'sorting',event:'sorting',style:'cursor:pointer'}
]
]
- })
- $("#editMenu").click(function () {
-
})
//添加菜单
$("#addMenu").click(function () {
@@ -82,10 +82,34 @@
layer.open({
type:2,
title:'添加菜单',
- area:['500px','600px'],
+ area:['400px','400px'],
content:'/menus/addMenu/'+parentId
})
})
+ //编辑菜单
+ $("#editMenu").click(function () {
+ var checkStatus = treeGrid.checkStatus('treeTable');
+ var data = checkStatus.data;//获取选中行的数据
+ if(data.length>1){
+ layer.msg('只能选择一条数据',{icon:5});
+ return ;
+ }
+ var menuId;
+
+ if(data != ''){
+ //获取当前行的节点菜单的Id
+ menuId = data[0].menuId;
+ }
+ //如果没有勾选复选框，默认id的值为0；即是根节点。
+ //parentId = parentId==undefined?0:parentId;
+
+ layer.open({
+ type:2,
+ title:'编辑菜单',
+ area:['400px','400px'],
+ content:'/menus/editMenu/'+menuId
+ })
+ })
//排序:监听行工具事件 tool()
treeGrid.on("tool(treeTable)",function (row) {
if(row.event === 'sorting'){
@@ -118,7 +142,7 @@
})
}
})
-
+
//删除菜单
$("#delMenu").click(function () {
var checkStatus = treeGrid.checkStatus('treeTable');
diff --git a/pccenter/src/main/resources/templates/sys/merchantList.html b/pccenter/src/main/resources/templates/sys/merchantList.html
new file mode 100644
index 0000000..c21d63b
--- /dev/null
+++ b/pccenter/src/main/resources/templates/sys/merchantList.html
@@ -0,0 +1,187 @@
+
+
+
+
+
商家注册列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pccenter/src/main/resources/templates/sys/pmList.html b/pccenter/src/main/resources/templates/sys/pmList.html
new file mode 100644
index 0000000..6e4aaf1
--- /dev/null
+++ b/pccenter/src/main/resources/templates/sys/pmList.html
@@ -0,0 +1,188 @@
+
+
+
+
+
物业审核
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pccenter/src/main/resources/templates/sys/reply.html b/pccenter/src/main/resources/templates/sys/reply.html
new file mode 100644
index 0000000..dae2c28
--- /dev/null
+++ b/pccenter/src/main/resources/templates/sys/reply.html
@@ -0,0 +1,56 @@
+
+
+
+
+
Title
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pccenter/src/main/resources/templates/sys/roleList.html b/pccenter/src/main/resources/templates/sys/roleList.html
index 895701e..a2d3567 100644
--- a/pccenter/src/main/resources/templates/sys/roleList.html
+++ b/pccenter/src/main/resources/templates/sys/roleList.html
@@ -1,5 +1,5 @@
-
+
角色列表
@@ -7,19 +7,29 @@
-
+
+
-
+
+
+
+
+
+
+
+
\ No newline at end of file
--
Gitee
From 7ced510f4371979b73c5fe378c254d8bb10e55bd Mon Sep 17 00:00:00 2001
From: jingkang <1248303996@qq.com>
Date: Wed, 8 Apr 2020 11:32:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pccenter/src/main/java/com/woniu/config/ShiroConfig.java | 2 +-
.../java/com/woniu/controller/ActivityController.java | 5 +++--
pccenter/src/main/java/com/woniu/dao/ActivityMapper.java | 8 ++++----
.../src/main/java/com/woniu/service/ActivityService.java | 2 +-
.../java/com/woniu/service/impl/ActivityServiceImpl.java | 4 ++--
pccenter/src/main/resources/mapper/ActivityMapper.xml | 2 +-
.../src/main/resources/mapper/PropertyManageMapper.xml | 4 ++--
pccenter/src/main/resources/templates/login.html | 9 +++++++--
pccenter/src/main/resources/templates/sys/ac_reply.html | 2 +-
.../src/main/resources/templates/sys/activityList.html | 8 ++++----
pccenter/src/main/resources/templates/sys/addAdmin.html | 2 +-
pccenter/src/main/resources/templates/sys/adminList.html | 2 +-
.../src/main/resources/templates/sys/complainList.html | 2 +-
.../src/main/resources/templates/sys/merchantList.html | 2 +-
pccenter/src/main/resources/templates/sys/pmList.html | 2 +-
pccenter/src/main/resources/templates/sys/reply.html | 2 +-
16 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/pccenter/src/main/java/com/woniu/config/ShiroConfig.java b/pccenter/src/main/java/com/woniu/config/ShiroConfig.java
index 401acde..e40264f 100644
--- a/pccenter/src/main/java/com/woniu/config/ShiroConfig.java
+++ b/pccenter/src/main/java/com/woniu/config/ShiroConfig.java
@@ -27,7 +27,7 @@ public class ShiroConfig {
customRealm.setCacheManager(cacheManager);
return customRealm;
}
- //
+ //shiro核心控制器
@Bean
public DefaultWebSecurityManager securityManager(CustomRealm customRealm,CookieRememberMeManager rememberMeManager){
DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
diff --git a/pccenter/src/main/java/com/woniu/controller/ActivityController.java b/pccenter/src/main/java/com/woniu/controller/ActivityController.java
index b55dc5d..fc5f701 100644
--- a/pccenter/src/main/java/com/woniu/controller/ActivityController.java
+++ b/pccenter/src/main/java/com/woniu/controller/ActivityController.java
@@ -50,6 +50,7 @@ public class ActivityController {
@ResponseBody
@RequiresPermissions("sys:al:examine")
public CommonResult confirmPM(@PathVariable("id") Integer id){
+ System.out.println("活动确认审核"+id);
Date examineTime=new Date();
try {
activityService.editStatusById(id,examineTime);
@@ -89,9 +90,9 @@ public class ActivityController {
@ResponseBody
public CommonResult refuse(@PathVariable("id")Integer id){
//获取当前时间
- Date operationTime=new Date();
+ Date examineTime=new Date();
try {
- activityService.refuse(id,operationTime);
+ activityService.refuse(id,examineTime);
return CommonResult.success("操作成功！");
} catch (Exception e) {
e.printStackTrace();
diff --git a/pccenter/src/main/java/com/woniu/dao/ActivityMapper.java b/pccenter/src/main/java/com/woniu/dao/ActivityMapper.java
index 32b13b7..049eb36 100644
--- a/pccenter/src/main/java/com/woniu/dao/ActivityMapper.java
+++ b/pccenter/src/main/java/com/woniu/dao/ActivityMapper.java
@@ -10,15 +10,15 @@ import java.util.List;
public interface ActivityMapper {
- @Select("select ca.id,ca.ca_type type,ca.ca_examineTime operationTime,ca.ca_title title,ca.ca_content content,ca.ca_money money,ca.ca_peopel_count number,ca.ca_create_time createTime,ca.ca_examine_status status,pu.nickname name from " +
+ @Select("select ca.id,ca.ca_type type,ca.ca_examinetime operationTime,ca.ca_title title,ca.ca_content content,ca.ca_money money,ca.ca_peopel_count number,ca.ca_create_time createTime,ca.ca_examine_status status,pu.nickname name from " +
"person_user pu inner join community_activity ca on pu.id=ca.ca_user_id order by ca.id desc")
List
findByPage(@Param("currentPage") Integer currentPage, @Param("pageSize") Integer pageSize);
- @Update("update community_activity set ca_examine_status = 1,ca_examineTime = #{operationTime} where id=#{value}")
+ @Update("update community_activity set ca_examine_status = 1,ca_examinetime = #{examineTime} where id=#{id}")
void editStatusById(@Param("id") Integer id,@Param("examineTime") Date examineTime);
List select(@Param("name") String name, @Param("status") Integer status);
- @Update("update community_activity set ca_examine_status = 2,ca_examineTime = #{operationTime} where id=#{value}")
- void refuse(@Param("id") Integer id, @Param("operationTime") Date operationTime);
+ @Update("update community_activity set ca_examine_status = 2,ca_examinetime = #{operationTime} where id=#{id}")
+ void refuse(@Param("id") Integer id, @Param("operationTime") Date examineTime);
}
diff --git a/pccenter/src/main/java/com/woniu/service/ActivityService.java b/pccenter/src/main/java/com/woniu/service/ActivityService.java
index 466e268..001d445 100644
--- a/pccenter/src/main/java/com/woniu/service/ActivityService.java
+++ b/pccenter/src/main/java/com/woniu/service/ActivityService.java
@@ -12,5 +12,5 @@ public interface ActivityService {
List select(String name, Integer status);
- void refuse(Integer id, Date operationTime);
+ void refuse(Integer id, Date examineTime);
}
diff --git a/pccenter/src/main/java/com/woniu/service/impl/ActivityServiceImpl.java b/pccenter/src/main/java/com/woniu/service/impl/ActivityServiceImpl.java
index 9d4a0a2..fa79c86 100644
--- a/pccenter/src/main/java/com/woniu/service/impl/ActivityServiceImpl.java
+++ b/pccenter/src/main/java/com/woniu/service/impl/ActivityServiceImpl.java
@@ -34,7 +34,7 @@ public class ActivityServiceImpl implements ActivityService {
}
@Override
- public void refuse(Integer id, Date operationTime) {
- activityMapper.refuse(id,operationTime);
+ public void refuse(Integer id, Date examineTime) {
+ activityMapper.refuse(id,examineTime);
}
}
diff --git a/pccenter/src/main/resources/mapper/ActivityMapper.xml b/pccenter/src/main/resources/mapper/ActivityMapper.xml
index a537259..6c956fb 100644
--- a/pccenter/src/main/resources/mapper/ActivityMapper.xml
+++ b/pccenter/src/main/resources/mapper/ActivityMapper.xml
@@ -3,7 +3,7 @@