From 134a3c0583ee1fe018c1d1827c468832c737aa55 Mon Sep 17 00:00:00 2001 From: gjq Date: Mon, 13 Dec 2021 18:11:07 +0800 Subject: [PATCH] .... --- .../controller/ContentController.java | 32 ++++ .../casesfirst/CommentController.java | 15 -- .../activity/mapper/CommentMapper.java | 10 +- .../nbclass/activity/mapper/WxUserMapper.java | 24 +-- .../nbclass/activity/model/LabelLogger.java | 5 - .../activity/service/CommentService.java | 11 +- .../activity/service/WxUserService.java | 16 +- .../service/impl/CommentServiceImpl.java | 11 +- .../service/impl/WxUserServiceImpl.java | 25 ++-- .../controller/QyWxLoginController.java | 39 +++-- .../mapper/activity/CommentMapper.xml | 16 +- .../mapper/activity/ContentMapper.xml | 24 ++- .../mapper/activity/WxUserMapper.xml | 52 ++++--- src/main/resources/static/img/admin.png | Bin 0 -> 7817 bytes .../templates/content-logger/list.html | 121 +++++++++++++++ .../templates/content/application.html | 138 ++++++++++-------- .../resources/templates/content/list2.html | 124 +++++++++------- .../resources/templates/fragments/navbar.html | 29 ++-- 18 files changed, 480 insertions(+), 212 deletions(-) create mode 100644 src/main/resources/static/img/admin.png create mode 100644 src/main/resources/templates/content-logger/list.html diff --git a/src/main/java/com/nbclass/activity/controller/ContentController.java b/src/main/java/com/nbclass/activity/controller/ContentController.java index faf94ae..20a65a6 100644 --- a/src/main/java/com/nbclass/activity/controller/ContentController.java +++ b/src/main/java/com/nbclass/activity/controller/ContentController.java @@ -9,12 +9,14 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import com.nbclass.activity.model.*; +import com.nbclass.activity.service.CommentService; import com.nbclass.activity.service.DataDictService; import com.nbclass.exception.ParameterException; import com.nbclass.system.service.UserService; import com.nbclass.util.JWTUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -61,6 +63,9 @@ public class ContentController extends BaseController { @Resource private DataDictService dataDictService; + @Autowired + private CommentService commentService; + /** * 案例页面 * @param model @@ -543,4 +548,31 @@ public class ContentController extends BaseController { return Result.success(map); } + /** + * 标签、索引反馈日志列表 + * @param page + * @param pageSize + * @return + */ + @PostMapping("/getLabelLogger") + @ResponseBody + public PageResultVo getLabelLogger(Integer page,Integer pageSize,Integer id){ + PageHelper.startPage(page,pageSize); + List list = commentService.getLabelLogger(id); + PageInfo pageInfo = new PageInfo<>(list); + return ResultUtil.table(list,pageInfo.getTotal()); + } + + /** + * 标签、索引反馈日志状态更新 + * @param id + * @return + */ + @PostMapping("/updateLogger") + @ResponseBody + public Result updateLogger(Integer id,Integer status){ + commentService.updateLogger(id,status); + return Result.success(); + } + } diff --git a/src/main/java/com/nbclass/activity/controller/casesfirst/CommentController.java b/src/main/java/com/nbclass/activity/controller/casesfirst/CommentController.java index 3e067eb..80b46f3 100644 --- a/src/main/java/com/nbclass/activity/controller/casesfirst/CommentController.java +++ b/src/main/java/com/nbclass/activity/controller/casesfirst/CommentController.java @@ -184,21 +184,6 @@ public class CommentController { return Result.success(); } - /** - * 标签、索引反馈日志列表 - * @param request - * @param page - * @param pageSize - * @return - */ - @GetMapping("/getLabelLogger") - public Result getLabelLogger(HttpServletRequest request,Integer page,Integer pageSize){ - String token = request.getHeader("token"); - String userId = JWTUtils.getUserId(token); - PageInfo list = commentService.getLabelLogger(page,pageSize,Long.parseLong(userId)); - return Result.success(list); - } - /** * 新建文件夹 * @param favoritesFolder diff --git a/src/main/java/com/nbclass/activity/mapper/CommentMapper.java b/src/main/java/com/nbclass/activity/mapper/CommentMapper.java index e3f833a..21c5ec7 100644 --- a/src/main/java/com/nbclass/activity/mapper/CommentMapper.java +++ b/src/main/java/com/nbclass/activity/mapper/CommentMapper.java @@ -198,10 +198,9 @@ public interface CommentMapper { /** * 标签、索引反馈日志列表 - * @param userId * @return */ - List getLabelLogger(Long userId); + List getLabelLogger(Integer id); /** * 案例打分 @@ -209,4 +208,11 @@ public interface CommentMapper { */ void saveScoring(Scoring scoring); + /** + * 标签、索引反馈日志状态更新 + * @param id + * @param status + */ + void updateLogger(@Param("id") Integer id, + @Param("status") Integer status); } diff --git a/src/main/java/com/nbclass/activity/mapper/WxUserMapper.java b/src/main/java/com/nbclass/activity/mapper/WxUserMapper.java index 749de11..4f2330d 100644 --- a/src/main/java/com/nbclass/activity/mapper/WxUserMapper.java +++ b/src/main/java/com/nbclass/activity/mapper/WxUserMapper.java @@ -8,27 +8,27 @@ import com.nbclass.activity.model.WxUser; import com.nbclass.util.MyMapper; /** - * + * * @author Leon * @datetime 2020年6月2日 下午4:42:57 */ public interface WxUserMapper extends MyMapper { - + // 这个没用，使用insertSelective方法。 public void insertCustom(WxUser entity); - + /** * 根据userid修改记录 * @param entity */ public void updateByUserId(WxUser entity); - + /** * 获取成员UserID列表 * @return */ public List getUserIds(); - + /** * 通过部门ID列表获取用户信息列表 * @param deptids @@ -42,12 +42,18 @@ public interface WxUserMapper extends MyMapper { * @return */ public List getUsersByUserIds(@Param("userids")String[] userids); - - + + /** * 删除此userids之外的用户 * @param userIds */ public void delOtherUsers(@Param("userids")List userids); - -} \ No newline at end of file + + /** + * 获取企业微信头像 + * @param username + * @return + */ + String getNickname(String username); +} diff --git a/src/main/java/com/nbclass/activity/model/LabelLogger.java b/src/main/java/com/nbclass/activity/model/LabelLogger.java index cdaf3cf..02d6ba0 100644 --- a/src/main/java/com/nbclass/activity/model/LabelLogger.java +++ b/src/main/java/com/nbclass/activity/model/LabelLogger.java @@ -45,10 +45,5 @@ public class LabelLogger implements Serializable { */ private String name; - /** - * 案例名称 - */ - private String contentName; - } diff --git a/src/main/java/com/nbclass/activity/service/CommentService.java b/src/main/java/com/nbclass/activity/service/CommentService.java index dee81fc..cc9f41a 100644 --- a/src/main/java/com/nbclass/activity/service/CommentService.java +++ b/src/main/java/com/nbclass/activity/service/CommentService.java @@ -3,6 +3,8 @@ package com.nbclass.activity.service; import com.github.pagehelper.PageInfo; import com.nbclass.activity.model.*; +import java.util.List; + public interface CommentService { /** @@ -193,11 +195,9 @@ public interface CommentService { /** * 标签、索引反馈日志列表 - * @param page - * @param pageSize * @return */ - PageInfo getLabelLogger(Integer page, Integer pageSize, Long userId); + List getLabelLogger(Integer id); /** * 案例打分 @@ -205,4 +205,9 @@ public interface CommentService { */ void saveScoring(Scoring scoring); + /** + * 标签、索引反馈日志状态更新 + * @param id + */ + void updateLogger(Integer id,Integer status); } diff --git a/src/main/java/com/nbclass/activity/service/WxUserService.java b/src/main/java/com/nbclass/activity/service/WxUserService.java index b8d139d..767b441 100644 --- a/src/main/java/com/nbclass/activity/service/WxUserService.java +++ b/src/main/java/com/nbclass/activity/service/WxUserService.java @@ -5,26 +5,32 @@ import java.util.List; import com.nbclass.activity.model.WxUser; /** - * + * * @author Leon * @datetime 2020年6月2日 下午4:50:28 */ public interface WxUserService{ - + /** * 批量保存用户 * @param userList */ public void merge(List userList); - + /** * 同步企业微信成员 */ public void syncWxUser(); - + /** * 同步企业微信部门 */ public void syncWxDepartment(); - + + /** + * 获取企业微信头像 + * @param username + * @return + */ + String getNickname(String username); } diff --git a/src/main/java/com/nbclass/activity/service/impl/CommentServiceImpl.java b/src/main/java/com/nbclass/activity/service/impl/CommentServiceImpl.java index f14854d..d5c556c 100644 --- a/src/main/java/com/nbclass/activity/service/impl/CommentServiceImpl.java +++ b/src/main/java/com/nbclass/activity/service/impl/CommentServiceImpl.java @@ -164,10 +164,8 @@ public class CommentServiceImpl implements CommentService { } @Override - public PageInfo getLabelLogger(Integer page, Integer pageSize, Long userId) { - PageHelper.startPage(page,pageSize); - List list = commentMapper.getLabelLogger(userId); - return new PageInfo<>(list); + public List getLabelLogger(Integer id) { + return commentMapper.getLabelLogger(id); } @Override @@ -175,4 +173,9 @@ public class CommentServiceImpl implements CommentService { commentMapper.saveScoring(scoring); } + @Override + public void updateLogger(Integer id, Integer status) { + commentMapper.updateLogger(id,status); + } + } diff --git a/src/main/java/com/nbclass/activity/service/impl/WxUserServiceImpl.java b/src/main/java/com/nbclass/activity/service/impl/WxUserServiceImpl.java index f34b7b4..7767083 100644 --- a/src/main/java/com/nbclass/activity/service/impl/WxUserServiceImpl.java +++ b/src/main/java/com/nbclass/activity/service/impl/WxUserServiceImpl.java @@ -28,22 +28,22 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Service public class WxUserServiceImpl implements WxUserService { - + @Resource private WxUserMapper wxUserMapper; - + @Resource private UserService userService; - + @Resource private WxDepartmentMapper deptMapper; - - + + @Transactional @Override public void merge(List userList){ if(userList == null || userList.size() == 0)return; - + List dbUserIds = wxUserMapper.getUserIds(); // 查询数据库已有的数据 List existIds = new ArrayList(); for (WxUser wxUser : userList) { @@ -57,7 +57,7 @@ public class WxUserServiceImpl implements WxUserService { account.setStatus(1); account.setPassword("szxgl.cn"); // 默认登录密码 PasswordHelper.encryptPassword(account); - + existIds.add(wxUser.getUserid()); if(dbUserIds.contains(wxUser.getUserid())){ wxUserMapper.updateByUserId(wxUser); @@ -69,7 +69,7 @@ public class WxUserServiceImpl implements WxUserService { // 删除当前企业微信不存在的用户 if(existIds.size()>0)wxUserMapper.delOtherUsers(existIds); } - + @Override public void syncWxUser() { try { @@ -135,11 +135,16 @@ public class WxUserServiceImpl implements WxUserService { log.error("同步企业部门异常", e); } } - + + @Override + public String getNickname(String username) { + return wxUserMapper.getNickname(username); + } + public static void main(String[] args) { String jsonstr = "{\"id\":1,\"Name\":\"信广龙\",\"Order\":100000000,\"parentId\":5}"; WxDepartment wxUser = JSON.toJavaObject(JSONObject.parseObject(jsonstr), WxDepartment.class); System.out.println(JSON.toJSON(wxUser)); } - + } diff --git a/src/main/java/com/nbclass/system/controller/QyWxLoginController.java b/src/main/java/com/nbclass/system/controller/QyWxLoginController.java index 2632a1f..45289a2 100644 --- a/src/main/java/com/nbclass/system/controller/QyWxLoginController.java +++ b/src/main/java/com/nbclass/system/controller/QyWxLoginController.java @@ -7,6 +7,8 @@ import java.net.URLEncoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.nbclass.activity.service.WxUserService; +import com.nbclass.vo.base.Result; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; @@ -14,6 +16,7 @@ import org.apache.shiro.authc.LockedAccountException; import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import com.alibaba.fastjson.JSONObject; @@ -24,6 +27,7 @@ import com.nbclass.util.CommonUtils; import com.nbclass.util.HttpUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.ResponseBody; /** * 企业微信扫码登录 @@ -33,12 +37,15 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller @RequestMapping("/qywx") -public class QyWxLoginController { - +public class QyWxLoginController extends BaseController { + private static final int AgentId = 1000016; // 企业微信登录应用ID(信广龙广告) - + @Autowired - private UserService userService; + private UserService userService; + + @Autowired + private WxUserService wxUserService; /** * PC端网页授权(企业微信授权登录) @@ -56,7 +63,7 @@ public class QyWxLoginController { response.sendRedirect(redirectUrl); return; } - + String url = "http://show.szxgl.cn/qywx/api/sso/getUserInfo?agentid="+AgentId+"&code="+code; try { JSONObject json = HttpUtils.httpPost(url); @@ -72,7 +79,7 @@ public class QyWxLoginController { outPrintError(response, "该账号未经授权，请联系管理员授权后再试！"); return; } - + // 企业微信登录成功，下一步进行系统shiro身份验证 String username = userid; MyUsernamePasswordToken token = new MyUsernamePasswordToken(username); // 免密登录,用于扫码登录手机验证码登录等场景 @@ -90,14 +97,14 @@ public class QyWxLoginController { } //更新最后登录时间 userService.updateLastLoginTime((User) SecurityUtils.getSubject().getPrincipal()); - + response.sendRedirect(request.getContextPath()+"/admin"); } catch (Exception e) { log.error("企业微信登录授权失败", e); outPrintError(response, "企业微信授权失败，请稍候再试！"); } } - + /** * 输出错误信息到页面 * @param response @@ -127,12 +134,24 @@ public class QyWxLoginController { } } } - + private static String getBaseUrl(HttpServletRequest request){ String result = null; int port = request.getServerPort(); result = request.getScheme()+"://"+request.getServerName()+(port==80||port==443 ? "" : ":"+port)+request.getContextPath()+"/"; return result; } - + + /** + * 获取企业微信头像 + * @return + */ + @GetMapping("/getAvatar") + @ResponseBody + public Result getNickname(){ + User loginUser = getLoginUser(); + String avatar = wxUserService.getNickname(loginUser.getUsername()); + return Result.success(avatar); + } + } diff --git a/src/main/resources/mapper/activity/CommentMapper.xml b/src/main/resources/mapper/activity/CommentMapper.xml index 6972371..743969d 100644 --- a/src/main/resources/mapper/activity/CommentMapper.xml +++ b/src/main/resources/mapper/activity/CommentMapper.xml @@ -571,16 +571,20 @@ @@ -601,4 +605,12 @@ ) + + update label_logger set + + status = #{status} + + where id = #{id} + + diff --git a/src/main/resources/mapper/activity/ContentMapper.xml b/src/main/resources/mapper/activity/ContentMapper.xml index 0e77fe9..75b2b99 100644 --- a/src/main/resources/mapper/activity/ContentMapper.xml +++ b/src/main/resources/mapper/activity/ContentMapper.xml @@ -400,6 +400,24 @@ and c.label_feedback > 0 + + and DATE_FORMAT(c.createtime, '%Y-%m-%d')>= DATE_FORMAT(#{createtime}, '%Y-%m-%d') + + + and DATE_FORMAT(c.createtime, '%Y-%m-%d') <= DATE_FORMAT(#{createtimeSection}, '%Y-%m-%d') + + + and DATE_FORMAT(c.updatetime, '%Y-%m-%d')>= DATE_FORMAT(#{updatetime}, '%Y-%m-%d') + + + and DATE_FORMAT(c.updatetime, '%Y-%m-%d') <= DATE_FORMAT(#{updatetimeSection}, '%Y-%m-%d') + + + and DATE_FORMAT(c.online_time, '%Y-%m-%d')>= DATE_FORMAT(#{onlineTime}, '%Y-%m-%d') + + + and DATE_FORMAT(c.online_time, '%Y-%m-%d') <= DATE_FORMAT(#{onlineTimeSection}, '%Y-%m-%d') + and item.id in @@ -469,13 +487,13 @@ data_dict_item item LEFT JOIN content_tags tags ON item.id = tags.tid LEFT JOIN content c ON c.id = tags.cid and c.online_time is not null + + and YEARWEEK( date_format(c.online_time, '%Y-%m-%d' ), 1 ) = YEARWEEK(now()) + WHERE item.dictid = 26 GROUP BY item.id,c.id - - and YEARWEEK( date_format(c.online_time, '%Y-%m-%d' ), 1 ) = YEARWEEK(now()) - AND DATE_FORMAT( c.online_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' ) diff --git a/src/main/resources/mapper/activity/WxUserMapper.xml b/src/main/resources/mapper/activity/WxUserMapper.xml index 9a054a1..6a10d26 100644 --- a/src/main/resources/mapper/activity/WxUserMapper.xml +++ b/src/main/resources/mapper/activity/WxUserMapper.xml @@ -1,66 +1,70 @@ - + insert into wx_user (userid, name, mobile, department, position, gender, email, weixinid, - isleader, avatar, english_name, status) + isleader, avatar, english_name, status) values (#{userid}, #{name}, #{mobile}, #{department}, #{position}, #{gender}, #{email}, #{weixinid}, #{isleader}, #{avatar}, #{english_name}, #{status}) - + update wx_user set name = #{name}, mobile = #{mobile}, department = #{department} - , position = #{position} + , position = #{position} - , gender = #{gender} + , gender = #{gender} - , email = #{email} + , email = #{email} - , weixinid = #{weixinid} + , weixinid = #{weixinid} - , isleader = #{isleader} + , isleader = #{isleader} - , avatar = #{avatar} + , avatar = #{avatar} - , english_name = #{english_name} + , english_name = #{english_name} - , `status` = #{status} + , `status` = #{status} - where userid = #{userid} + where userid = #{userid} - + - + - + - + - delete from wx_user where userid not in + delete from wx_user where userid not in - #{userid} + #{userid} - - \ No newline at end of file + + + + diff --git a/src/main/resources/static/img/admin.png b/src/main/resources/static/img/admin.png new file mode 100644 index 0000000000000000000000000000000000000000..01f01b1a00eb149bcd6bdcf86000c38c3925602a GIT binary patch literal 7817 zcmV;49(Li0P)Py8LrFwIRCr$PT?urYS9SiLw$U=$B}4fUu>ILm{+* zwjn^1a9RlGG$ADkdq_`PC=k*nB#@Q_2w5>CPP{2zWNY8I(P*@cHfy~-R~p6I=l^H@ z|M$Ol&X0rVE%$!!eSX`0_X?;K6a;=(Nree^>`92hwn%|eBIHdGlBZ{oI5mv~BE-xP zqGt$E(}YMOh?yCPhzKAu0y7c7Ohg2xA_S%)A}|ptFd7|+p{Pga>ZaG%4+M<;OQ=mfTmj3eI6eI6BoDZ34g zwrIQ&3H;v$`QkY<>l19*6+u=&_;d%|Gc}D5j7_0@a1;r_?u2mGZ;QfYLJS&WV(?7= zARfAMs~8TaJVt9<5yaCYr#t9x$ER`I@E9t_CSfyLM}>oj+2L_qG&&*oOrduW#zx~@LJSVaN8^WEH;AY8mX{^JK(#*SvoS9dZZ?xC((xAl�#2q7ke*_P4jwhTdtD7D6c?+=dRef^`x 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/templates/content-logger/list.html b/src/main/resources/templates/content-logger/list.html new file mode 100644 index 0000000..8e65b42 --- /dev/null +++ b/src/main/resources/templates/content-logger/list.html @@ -0,0 +1,121 @@ +
+
    +
  1. 首页
    2. +
  2. 标签、索引反馈日志
    3. +
+
+
+
+ +
+ + +
+
+
+ +
+ + diff --git a/src/main/resources/templates/content/application.html b/src/main/resources/templates/content/application.html index 6651e86..b119517 100644 --- a/src/main/resources/templates/content/application.html +++ b/src/main/resources/templates/content/application.html @@ -8,15 +8,46 @@
@@ -263,7 +281,7 @@ {field: 'collectionNumber', title: '收藏数', align : "center"}, {field: 'comments', title: '评论数', align : "center"}, {field: 'createtime', title: '创建时间', align : "center"}, - // {field: 'updatetime', title: '修改时间', align : "center"}, + {field: 'updatetime', title: '修改时间', align : "center"}, {field: 'onlineTime', title: '上线时间', align : "center"}, {field: 'position', title: '关联部门', align : "center", width: "170", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ @@ -294,16 +312,16 @@ let seeHtml = ""; let editHtml = ""; if(row.status === 1){ - adoptHtml = '发布'; - rejectHtml = '驳回'; - seeHtml = '查看'; + adoptHtml = ' 发布'; + rejectHtml = ' 驳回'; + seeHtml = ' 查看'; editHtml = ' 修改'; }else if(row.status === 2){ - adoptHtml = '下线'; - seeHtml = '查看'; + adoptHtml = ' 下线'; + seeHtml = ' 查看'; editHtml = ' 修改'; }else if(row.status === 3){ - seeHtml = '查看'; + seeHtml = ' 查看'; } return adoptHtml+rejectHtml+editHtml+seeHtml; }} @@ -430,6 +448,12 @@ $("#case_number").val(""); $("#title").val(""); $(".form-control").find("option:selected").attr("selected",false); + $("#createTime").find("input").val(""); + $("#createTimeSection").find("input").val(""); + $("#updateTime").find("input").val(""); + $("#updateTimeSection").find("input").val(""); + $("#onlineTime").find("input").val(""); + $("#onlineTimeSection").find("input").val(""); }); }); diff --git a/src/main/resources/templates/content/list2.html b/src/main/resources/templates/content/list2.html index dbf8ba3..9b394f1 100644 --- a/src/main/resources/templates/content/list2.html +++ b/src/main/resources/templates/content/list2.html @@ -9,15 +9,33 @@
-
+
- +
-
+
- +
-
+ +       +
+ + +
+ +       +
+ + +
+ +       +
-
+ +
+
-
+ +       +
-
- - -
-
- - -
-
+ +       +
-
+       +
-
+       +
-
+       +
-
+
+
- +
-
+
- +
- -
+       +
- +
-
+
- +
-
+       +
- +
-
+
- +
-
+ +
-
+
@@ -173,13 +191,13 @@ - +
-
+
@@ -230,9 +248,7 @@ {field: 'visibility', title: '可见性', align : "center", formatter:function(value,row, index){ return row.visibility === 1 ? "可见" : "不可见"; }}, - {field: 'labelFeedback', title: '标签反馈数', align : "center",formatter:function(value,row, index){ - - }}, + {field: 'labelFeedback', title: '标签反馈数', align : "center"}, {field: 'purposeCase', title: '案例用途', align : "center", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 19){ @@ -284,7 +300,7 @@ {field: 'collectionNumber', title: '收藏数', align : "center" }, {field: 'comments', title: '评论数', align : "center" }, {field: 'createtime', title: '创建时间', align : "center"}, - //{field: 'updatetime', title: '修改时间', align : "center"}, + {field: 'updatetime', title: '修改时间', align : "center"}, {field: 'onlineTime', title: '上线时间', align : "center"}, {field: 'position', title: '关联部门', align : "center",width:170,formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ @@ -325,7 +341,7 @@ seeHtml = '查看'; delHtml = ' 删除'; }*/ - submitHtml = '提交'; + submitHtml = ' 提交'; editHtml = ' 修改'; delHtml = ' 删除'; }else if(row.status === 1){ @@ -333,30 +349,30 @@ submitHtml = '撤回'; }*/ //这里的1标记为查看状态 - seeHtml = '查看'; + seeHtml = ' 查看'; delHtml = ' 删除'; - submitHtml = '撤回'; + submitHtml = ' 撤回'; }else if(row.status === 3){ /*if($("#name").val() !== 'admin'){ submitHtml = '更新'; }*/ - submitHtml = '更新'; - seeHtml = '查看'; + submitHtml = ' 更新'; + seeHtml = ' 查看'; delHtml = ' 删除'; } if(row.status === 2){ /*if($("#name").val() !== 'admin'){ offlineHtml = '下线'; }*/ - offlineHtml = '下线'; - submitHtml = '更新'; - seeHtml = '查看'; + offlineHtml = ' 下线'; + submitHtml = ' 更新'; + seeHtml = ' 查看'; } /*if(row.status === 3){ delHtml = ' 删除'; }*/ - return offlineHtml+submitHtml+editHtml + delHtml + seeHtml; + return offlineHtml+submitHtml+editHtml+delHtml+seeHtml; }} ]; var options={ diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 8f03234..82ebfcc 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -1,7 +1,7 @@