diff --git a/src/main/java/com/tenlion/twoduty/controller/api/articlecontent/ArticleContentController.java b/src/main/java/com/tenlion/twoduty/controller/api/articlecontent/ArticleContentController.java index e9fabef..f2e6c9f 100644 --- a/src/main/java/com/tenlion/twoduty/controller/api/articlecontent/ArticleContentController.java +++ b/src/main/java/com/tenlion/twoduty/controller/api/articlecontent/ArticleContentController.java @@ -4,6 +4,7 @@ import com.tenlion.twoduty.pojo.dtos.articletype.ArticleTypeDTO; import com.tenlion.twoduty.service.articletype.IArticleTypeService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.common.component.SecurityComponent; import ink.wgink.exceptions.ParamsException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; @@ -40,6 +41,8 @@ public class ArticleContentController extends DefaultBaseController { private IArticleContentService articleContentService; @Autowired private IArticleTypeService articleTypeService; + @Autowired + private SecurityComponent securityComponent; @@ -183,6 +186,7 @@ public class ArticleContentController extends DefaultBaseController { @GetMapping("listpage") public SuccessResultList> listPage(ListPage page) { Map params = requestParams(); + params.put("creator",securityComponent.getCurrentUser().getUserId()); page.setParams(params); return articleContentService.listPage(page); } diff --git a/src/main/java/com/tenlion/twoduty/controller/api/departmentbase/DepartmentBaseController.java b/src/main/java/com/tenlion/twoduty/controller/api/departmentbase/DepartmentBaseController.java index 37024a3..7f3c65d 100644 --- a/src/main/java/com/tenlion/twoduty/controller/api/departmentbase/DepartmentBaseController.java +++ b/src/main/java/com/tenlion/twoduty/controller/api/departmentbase/DepartmentBaseController.java @@ -10,8 +10,10 @@ import ink.wgink.common.component.SecurityComponent; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.interfaces.department.IDepartmentBaseService; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO; import ink.wgink.pojo.dtos.department.DepartmentUserDTO; import ink.wgink.pojo.dtos.role.RoleDTO; +import ink.wgink.pojo.dtos.role.RoleSimpleDTO; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.pos.DepartmentPO; import ink.wgink.pojo.pos.PositionPO; @@ -97,19 +99,19 @@ public class DepartmentBaseController extends DefaultBaseController { public List> listJur(){ List list = new ArrayList<>(); List> resultList = new ArrayList<>(); - List roles = securityComponent.getCurrentUser().getRoles(); + List roles = securityComponent.getCurrentUser().getRoles(); if("admin".equals(securityComponent.getCurrentUser().getUserUsername())){ - list = departmentBaseService.listByParentId(GENGID); + list = departmentBaseService.listPOByParentId(GENGID); }else{ - for (RolePO role : roles) { + for (RoleSimpleDTO role : roles) { //市局角色 if(ROLE_1_CODE.equals(role.getRoleCode())){ - list = departmentBaseService.listByParentId(GENGID); + list = departmentBaseService.listPOByParentId(GENGID); break; } //旗县区角色 if(ROLE_2_CODE.equals(role.getRoleCode())){ - for (DepartmentPO department : securityComponent.getCurrentUser().getDepartments()) { + for (DepartmentSimpleDTO department : securityComponent.getCurrentUser().getDepartments()) { DepartmentPO po = departmentBaseService.getPO(department.getDepartmentId()); if(po != null){ list.add(po); diff --git a/src/main/java/com/tenlion/twoduty/controller/api/departmentmember/DepartmentMemberController.java b/src/main/java/com/tenlion/twoduty/controller/api/departmentmember/DepartmentMemberController.java index 6ebe234..38f1f39 100644 --- a/src/main/java/com/tenlion/twoduty/controller/api/departmentmember/DepartmentMemberController.java +++ b/src/main/java/com/tenlion/twoduty/controller/api/departmentmember/DepartmentMemberController.java @@ -6,6 +6,7 @@ import ink.wgink.common.component.SecurityComponent; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO; import ink.wgink.pojo.pos.DepartmentPO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -104,7 +105,7 @@ public class DepartmentMemberController extends DefaultBaseController { public SuccessResultList> listPage(ListPage page) { Map params = requestParams(); page.setParams(params); - List departments = securityComponent.getCurrentUser().getDepartments(); + List departments = securityComponent.getCurrentUser().getDepartments(); if(departments.size() != 0){ //这块根据功能需要只能取第一个单位id params.put("departmentId",departments.get(0).getDepartmentId()); @@ -143,7 +144,7 @@ public class DepartmentMemberController extends DefaultBaseController { @GetMapping("count") SuccessResultData count() { Map params = requestParams(); - List departments = securityComponent.getCurrentUser().getDepartments(); + List departments = securityComponent.getCurrentUser().getDepartments(); if(departments.size() != 0){ //这块根据功能需要只能取第一个单位id params.put("departmentId",departments.get(0).getDepartmentId()); diff --git a/src/main/java/com/tenlion/twoduty/controller/api/departmentsynopsis/DepartmentSynopsisController.java b/src/main/java/com/tenlion/twoduty/controller/api/departmentsynopsis/DepartmentSynopsisController.java index 1b93fd8..b4a7c95 100644 --- a/src/main/java/com/tenlion/twoduty/controller/api/departmentsynopsis/DepartmentSynopsisController.java +++ b/src/main/java/com/tenlion/twoduty/controller/api/departmentsynopsis/DepartmentSynopsisController.java @@ -6,6 +6,7 @@ import ink.wgink.common.component.SecurityComponent; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO; import ink.wgink.pojo.pos.DepartmentPO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -47,7 +48,7 @@ public class DepartmentSynopsisController extends DefaultBaseController { @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("get-now-department") public DepartmentSynopsisDTO getNowDepartment() { - List departments = securityComponent.getCurrentUser().getDepartments(); + List departments = securityComponent.getCurrentUser().getDepartments(); if(departments.size() == 0){ throw new SearchException("未绑定部门"); } diff --git a/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java b/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java index 046b05e..e42ffbb 100644 --- a/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java +++ b/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java @@ -5,8 +5,8 @@ import ink.wgink.common.base.DefaultBaseController; import ink.wgink.common.component.SecurityComponent; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.bos.UserInfoBO; -import ink.wgink.pojo.pos.DepartmentPO; -import ink.wgink.pojo.pos.RolePO; +import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO; +import ink.wgink.pojo.dtos.role.RoleSimpleDTO; import ink.wgink.properties.ServerProperties; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -16,13 +16,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; /** - * TODO + * * @version 1.0 * @author LY * @date 2021/4/13 15:40 @@ -62,12 +61,12 @@ public class indexWebController extends DefaultBaseController { @GetMapping("indexcount") public ModelAndView indexCount(){ ModelAndView mv = new ModelAndView(); - List roles = securityComponent.getCurrentUser().getRoles(); + List roles = securityComponent.getCurrentUser().getRoles(); if(roles.size() == 0){ mv.setViewName("default-home"); return mv; } - for (RolePO role : roles) { + for (RoleSimpleDTO role : roles) { if(ROLE_CODE_1.equals(role.getRoleCode())){ mv.setViewName("default-home"); //mv.setViewName("count_role_1"); @@ -91,7 +90,7 @@ public class indexWebController extends DefaultBaseController { } public String initDepartmentId(UserInfoBO currentUser){ - List departments = currentUser.getDepartments(); + List departments = currentUser.getDepartments(); if(departments.size() == 0){ return "0"; } diff --git a/src/main/java/com/tenlion/twoduty/service/departmentmember/impl/DepartmentMemberServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/departmentmember/impl/DepartmentMemberServiceImpl.java index a5bff7d..08d8008 100644 --- a/src/main/java/com/tenlion/twoduty/service/departmentmember/impl/DepartmentMemberServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/departmentmember/impl/DepartmentMemberServiceImpl.java @@ -3,6 +3,7 @@ package com.tenlion.twoduty.service.departmentmember.impl; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SaveException; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO; import ink.wgink.pojo.pos.DepartmentPO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; @@ -47,7 +48,7 @@ public class DepartmentMemberServiceImpl extends DefaultBaseService implements I @Override public String saveReturnId(DepartmentMemberVO departmentMemberVO) { - List departments = securityComponent.getCurrentUser().getDepartments(); + List departments = securityComponent.getCurrentUser().getDepartments(); if(departments.size() == 0){ throw new SaveException("请绑定单位"); } diff --git a/src/main/java/com/tenlion/twoduty/service/indexaudit/IIndexAuditService.java b/src/main/java/com/tenlion/twoduty/service/indexaudit/IIndexAuditService.java index 1fa10c6..a619073 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexaudit/IIndexAuditService.java +++ b/src/main/java/com/tenlion/twoduty/service/indexaudit/IIndexAuditService.java @@ -20,6 +20,13 @@ import java.util.Map; **/ public interface IIndexAuditService { + /** + * 根据业务ID获取 + * @param bId + * @return + */ + IndexAuditDTO getByBId(String bId); + /** * 用戶当月456上报统计 * @return diff --git a/src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java index 81b5559..a40c4ed 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java @@ -1,5 +1,6 @@ package com.tenlion.twoduty.service.indexaudit.impl; +import com.tenlion.twoduty.pojo.dtos.indexgeneral.IndexGeneralDTO; import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; import com.tenlion.twoduty.pojo.dtos.indextemplate.IndexTemplateDTO; import com.tenlion.twoduty.pojo.vos.indexaudit.AuditVO; @@ -10,10 +11,12 @@ import com.tenlion.twoduty.service.indextemplate.IIndexTemplateService; import com.tenlion.twoduty.utils.AuditStatusEnum; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SearchException; +import ink.wgink.exceptions.UpdateException; import ink.wgink.interfaces.user.IUserBaseService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.role.RoleDTO; +import ink.wgink.pojo.dtos.role.RoleSimpleDTO; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.pos.RolePO; import ink.wgink.pojo.result.SuccessResult; @@ -218,16 +221,22 @@ public class IndexAuditServiceImpl extends DefaultBaseService implements IIndexA public void updateByBId(String bId,String bTitle){ + IndexAuditDTO byBId = this.getByBId(bId); + if(byBId == null){ + throw new SearchException("系统异常"); + } + if(byBId.getIndexAuditStatus().toString().equals(AuditStatusEnum.WAIT.getAuditStatus())){ + throw new UpdateException("该内容已审核通过，不能修改内容"); + } + if(byBId.getIndexAuditStatus().toString().equals(AuditStatusEnum.PASS.getAuditStatus())){ + throw new UpdateException("审核已归档，不能修改内容"); + } + Map params = new HashMap<>(4); params.put("indexAuditStatus",AuditStatusEnum.NORMAL.getAuditStatus()); params.put("indexBId",bId); params.put("indexBTitle",bTitle); indexAuditDao.updateByBId(params); - - IndexAuditDTO byBId = this.getByBId(bId); - if(byBId == null){ - throw new SearchException("系统异常"); - } //新增上报日志 this.saveAuditLog(byBId.getIndexAuditId(),"00","重新上报指标"); } @@ -325,8 +334,8 @@ public class IndexAuditServiceImpl extends DefaultBaseService implements IIndexA public void setAuth(Map params){ Object departmentId = params.get("departmentId"); UserInfoBO currentUser = securityComponent.getCurrentUser(); - List roles = currentUser.getRoles(); - for (RolePO role : roles) { + List roles = currentUser.getRoles(); + for (RoleSimpleDTO role : roles) { if(ROLE_CODE_1.equals(role.getRoleCode())){ if(departmentId != null && !StringUtils.isBlank(departmentId.toString())){ List strings = departmentUserService.listUserId(departmentId.toString()); @@ -346,8 +355,8 @@ public class IndexAuditServiceImpl extends DefaultBaseService implements IIndexA public List setButton(){ List list = new ArrayList<>(6); UserInfoBO currentUser = securityComponent.getCurrentUser(); - List roles = currentUser.getRoles(); - for (RolePO role : roles) { + List roles = currentUser.getRoles(); + for (RoleSimpleDTO role : roles) { if(ROLE_CODE_1.equals(role.getRoleCode())){ list.add("1");//审核按钮 list.add("2");//归档按钮 diff --git a/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java index 5c97b8f..b449142 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java @@ -7,6 +7,7 @@ import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService; import com.tenlion.twoduty.utils.AuditStatusEnum; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.common.component.SecurityComponent; +import ink.wgink.exceptions.UpdateException; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; @@ -133,6 +134,9 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde this.updateAudit(indexGeneralId,indexGeneralVO.getIndexGeneralTitle()); } + + + @Override public IndexGeneralDTO get(Map params) { return indexGeneralDao.get(params); diff --git a/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java index cc98825..ef61c67 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java @@ -9,6 +9,7 @@ import ink.wgink.common.component.SecurityComponent; import ink.wgink.exceptions.ParamsException; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.bos.UserInfoBO; +import ink.wgink.pojo.dtos.role.RoleSimpleDTO; import ink.wgink.pojo.pos.RolePO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; @@ -309,11 +310,11 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib public List initWebButton(){ List list = new ArrayList<>(); - List roles = securityComponent.getCurrentUser().getRoles(); + List roles = securityComponent.getCurrentUser().getRoles(); if(roles.size() == 0){ return list; } - for (RolePO role : roles) { + for (RoleSimpleDTO role : roles) { if(ROLE_CODE_2.equals(role.getRoleCode())){ list.add("1"); list.add("2"); diff --git a/src/main/resources/mybatis/mapper/articlecontent/article-content-mapper.xml b/src/main/resources/mybatis/mapper/articlecontent/article-content-mapper.xml index 686c64a..42dd88d 100644 --- a/src/main/resources/mybatis/mapper/articlecontent/article-content-mapper.xml +++ b/src/main/resources/mybatis/mapper/articlecontent/article-content-mapper.xml @@ -318,6 +318,10 @@ AND t1.article_classify_id = #{articleClassifyId} + + + AND + t1.creator = #{creator} AND diff --git a/src/main/resources/static/assets/web/css/index.css b/src/main/resources/static/assets/web/css/index.css index f09db73..31cc362 100644 --- a/src/main/resources/static/assets/web/css/index.css +++ b/src/main/resources/static/assets/web/css/index.css @@ -1,23 +1,26 @@ -.header{width:100%;height:550px;min-width:1200px;position:relative;background:url(../images/header-bg-2.png) no-repeat center;background-size:1920px 100%} -.date{overflow:hidden;width:1200px;margin:0 auto;height:40px;line-height:40px;font-size:12px;color:#000} +.header{width:100%;height:550px;min-width:1200px;position:relative;background:url(../images/header-bg-7.png) no-repeat center;background-size:1920px 100%} +.date-outer{background:rgba(255,255,255,0.6)} +.date{overflow:hidden;width:1200px;margin:0 auto;height:40px;line-height:40px;font-size:15px;color:#000} .date span{color:#b09158} .day{float:left;} .weather{float:right;} .weather img{margin-left: 10px;width: 20px;height: 20px;vertical-align: middle;margin-top:-3px} -.logo-nav{padding:10px 0;background:rgba(255,255,255,.6)} +.logo-nav{position:absolute;bottom:50px;left:0;right:0;background:linear-gradient(to bottom, #c21300, #a90600)} .logo-nav-content{width:1200px;margin:0 auto} .logo-nav-content:after,.nav ul:after{content:'';display:block;clear:both} .logo-nav .logo{float:left;cursor:pointer} -.nav{float:left;margin-left:140px} -.nav ul{margin-top:10px} -.nav ul li{float:left;border-right:1px solid #bb1511;position:relative} +/*.nav{float:left;margin-left:140px}*/ +/*.nav ul{margin-top:10px}*/ +.nav ul li{float:left;position:relative;width:14%;height:40px;line-height: 40px;} +.nav ul li:after{content: '';display:block;width: 1px;height:20px;position: absolute;right:0;top:50%;margin-top:-10px;background:#bb1511} .nav ul li:last-child{border-right:none} -.nav ul li>a,.nav ul li>span{display:block;padding:0 15px;color:#bb1511;position:relative;cursor: pointer} -.child{display:none;position:absolute;left:0;top:100%;width:100%;padding:10px;background:rgba(255,255,255,.6);box-sizing:border-box} +.nav ul li>a,.nav ul li>span{color:#fff;display:block;padding:0 15px;position:relative;cursor: pointer;text-align: center;font-size: 20px} +.child{z-index:100;display:none;position:absolute;left:0;top:100%;width:100%;padding:10px;background:rgba(255,255,255,.6);box-sizing:border-box} .nav ul li:hover .child{display:block} -.child span, .child a{display:block;text-align:center;color:#000;font-size:18px;line-height:25px;cursor:pointer;font-weight:400} -.child span:hover,.nav ul li>a:hover{color:#bb1511;font-weight:700} -.news{width:1200px;margin:50px auto 0} +.child span, .child a{display:block;text-align:center;color:#000;font-size:18px;line-height:35px;cursor:pointer;font-weight:400;border-bottom: 1px solid #eee;} +.child span:last-child, .child a:last-child{border-bottom: 0} +.child span:hover,.nav ul li>a:hover{font-weight:700} +.news{width:1200px;margin:0 auto;position: relative;} .head-news{text-align:center} .head-news a{display:block;font-weight:bold;font-size:40px;color:#ce0c0d;height:47px;line-height:47px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;margin-bottom:20px} .head-news h3 img{width:105px;height:47px} @@ -28,15 +31,16 @@ .title-line{width:900px;height:10px;background:url(../images/news-line-r.png) no-repeat center;background-size:100% 100%;float:left;margin:18px 0 0 25px} .news-box-title a{float:right;color:#b50100;margin-top:10px} .news-slide{overflow:hidden;margin-top:30px} -.news-left{width:515px;float:left} -.news-left ul li{padding:15px 0 15px;border-bottom:1px dashed #dcdcdc} -.news-left ul li a{display:block;padding-left:15px;position:relative;font-size:18px;color:#000;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} -.news-left ul li a:hover{color:#b50100;} -.news-left ul li a:after{content:'';display:block;width:4px;height:4px;background:#000;border-radius:50%;position:absolute;top:50%;left:0;transform:translate(0,-50%)} -.news-left ul li p{font-size:18px;color:#000;line-height:25px} -.news-left ul li:first-child a{font-size:20px;color:#000;font-weight:700;border-left:4px solid #b09158;padding-left:10px} -.news-left ul li:first-child a:after{display:none} -.news-right{width:540px;float:right;position:relative} +.news-left{width:600px;height:311px;float:left;background: #015ab8;border: 3px solid #015ab8} +/*.news-left ul{line-height: 100%}*/ +.news-left ul li{padding:15px 0 15px;border-bottom:1px solid #dcdcdc;line-height: 37px} +.news-left ul li a{display:block;text-align:center;position:relative;font-size:22px;color: #ffffff;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} +/*.news-left ul li a:hover{color:#b50100;}*/ +/*.news-left ul li a:after{content:'';display:block;width:4px;height:4px;background:#000;border-radius:50%;position:absolute;top:50%;left:0;transform:translate(0,-50%)}*/ +.news-left ul li p{height:37px;font-size:18px;color: #ffffff;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} +/*.news-left ul li:first-child a{font-size:20px;color:#000;font-weight:700;border-left:4px solid #b09158;padding-left:10px}*/ +/*.news-left ul li:first-child a:after{display:none}*/ +.news-right{width:540px;float:right;position:relative;border: 5px solid #a90403} .news-right .bd a{display:block;position:relative} .news-right .bd a img{width:540px;height:305px} .news-right .bd a p{position:absolute;left:0;right:0;bottom:0;padding:0 100px 0 10px;background:rgba(0,0,0,.6);line-height:35px;color:#fff;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;} @@ -52,21 +56,22 @@ .three-box-title a{line-height:28px;float:right;color:#999} .three-box-list{margin-top:15px;overflow: hidden} .three-box-list ul{height:140px;overflow-y: scroll;width:110%;} -.three-box-list ul li a{display:block;line-height:35px;font-size:18px;color:#000;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;position:relative;padding-left:20px} +.three-box-list ul li a{font-family:'黑体';display:block;line-height:35px;font-size:18px;color:#000;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;position:relative;padding-left:20px} .three-box-list ul li a:after{content:'';display:block;width:8px;height:8px;background:#d60000;border-radius:50%;position:absolute;left:0;top:50%;transform:translate(0,-50%)} .three-box-list ul li a:hover{color:#d60000} .street{margin-top:30px;padding:25px 0 85px;background:url(../images/street-bg.png) no-repeat center;background-size:100% 100%} -.street-content{width:1200px;margin:0 auto} -.street-title{margin-bottom:15px;background:url(../images/news-line-w.png) no-repeat right center;background-size:80% 10px} -.street-list ul{overflow:hidden} -.street-list ul li{float:left;width:23.5%;margin-right:2%;margin-bottom:18px} +.street-content{width:1200px;margin:30px auto 0;} +.street-title{margin-bottom:30px;background:url(../images/news-line-w.png) no-repeat right center;background-size:80% 10px} +.street-list ul:after{content:'';display:block;clear: both;} +.street-list ul li{float:left;width:23.5%;margin-right:2%;margin-bottom:18px;box-shadow: 0 0 10px #aaa;} +.street-list ul li:hover{box-shadow: 0 0 10px #015ab8} .street-list ul li:nth-child(4n){margin-right:0} .street-list ul li span{color:#fff;font-size:18px} -.street-img-name{position:relative;margin-top:5px} +.street-img-name{position:relative;} .street-img-name,.street-img-name img{width:100%;height:180px} .street-img-name a{display:block;position:relative} .street-img-name p{position:absolute;left:0;right:0;bottom:0;text-align:center;line-height:30px;color:#fff;font-size:18px;background:rgba(0,0,0,.6)} -.base{padding:50px 0;background:url(../images/base-bg.png) no-repeat center;background-size:100% 100%} +/*.base{padding:50px 0;background:url(../images/base-bg.png) no-repeat center;background-size:100% 100%}*/ .base-content{width:1200px;margin:0 auto} .base-title{background:url(../images/news-line-r.png) no-repeat 220px center;background-size:75% 10px} .base-title a{float:right;font-size:18px;color:#b50100;line-height:40px} @@ -74,7 +79,7 @@ .base-news-left{width:49.5%;float:left;border:5px solid #a90403;box-sizing:border-box;position: relative} .base-news-left a{display:block} .base-news-left img{height:330px;width:100%} -.base-news-left .hd{position: absolute;bottom: 10px;left:50%;transform: translate(-50%,0)} +.base-news-left .hd{position: absolute;bottom: 12px;right:0;/*transform: translate(-50%,0)*/} .base-news-left .hd li{float: left;width: 10px;height: 10px;border-radius: 50%;cursor: pointer;background: #fff;margin-right: 5px;} .base-news-left .hd li.on{background: #015ab8} .base-news-right{width:49.5%;height:340px;float:right;padding:15px;border:1px solid #dcdcdc;background:rgba(247,243,240,.6);box-sizing:border-box} @@ -93,7 +98,9 @@ /*-------二级页面--------*/ -.child-header{background:url(../images/child-header.jpg) no-repeat center;background-size:1920px 100%} +.page-main{width:1200px;margin: 0 auto 20px;box-shadow: 0 0 10px #eee;padding: 0 20px 20px;overflow:hidden;} +.child-nav ul li{width: 16.6666%} +.child-header{background:url(../images/header-bg-7.png) no-repeat center;background-size:1920px 100%} .child-header .date{color:#fff} .page-container{width:1200px;margin:20px auto;} .page-container:after{content:'';display:block;clear:both} diff --git a/src/main/resources/static/route/indexaudit/list_1.html b/src/main/resources/static/route/indexaudit/list_1.html index d4af84d..73dd197 100644 --- a/src/main/resources/static/route/indexaudit/list_1.html +++ b/src/main/resources/static/route/indexaudit/list_1.html @@ -136,6 +136,9 @@ } rowData +=''; rowData +=''; + if(buttonIsShow.indexOf("1") == -1){ + rowData +=''; + } if(buttonIsShow.indexOf("1") > -1) { rowData += ''; } @@ -246,6 +249,19 @@ }); }else if(layEvent === 'remove'){ removeData(data.indexAuditId) + }else if(layEvent === 'update'){ + var indexBId = data.indexBId + var indexBTitle = data.indexBTitle + var loadLayerIndex; + top.restAjax.get(top.restAjax.path('api/indexaudit/getAuditIndexConfig/{indexAuditId}', [data.indexAuditId]), {}, null, function(code, data) { + show(data.indexTemplateUploadPath+indexBId,indexBTitle); + }, function(code, data) { + top.dialog.msg(data.msg); + }, function() { + loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3}); + }, function() { + top.dialog.close(loadLayerIndex); + }); } }); diff --git a/src/main/resources/static/route/web/assessment.html b/src/main/resources/static/route/web/assessment.html index 74ee99f..09d7844 100644 --- a/src/main/resources/static/route/web/assessment.html +++ b/src/main/resources/static/route/web/assessment.html @@ -10,9 +10,9 @@
-