修改 查询详情页

src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersonaction/BasicCheckPersonActionDTO.java

@@ -22,6 +22,10 @@ public class BasicCheckPersonActionDTO {
     @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
     private String dutyIndexLibName;
 
+    @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称")
+    private String dutyIndexLibParentName;
+
+
     @ApiModelProperty(name = "dutyTitle", value = "上报标题")
     private String dutyTitle;
     @ApiModelProperty(name = "actionTime", value = "时间")
@@ -189,4 +193,12 @@ public class BasicCheckPersonActionDTO {
     public void setPhoto(String photo) {
         this.photo = photo;
     }
+
+    public String getDutyIndexLibParentName() {
+        return dutyIndexLibParentName;
+    }
+
+    public void setDutyIndexLibParentName(String dutyIndexLibParentName) {
+        this.dutyIndexLibParentName = dutyIndexLibParentName;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersoninfo/BasicCheckPersonInfoDTO.java

@@ -22,6 +22,9 @@ public class BasicCheckPersonInfoDTO {
     @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
     private String dutyIndexLibName;
 
+    @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称")
+    private String dutyIndexLibParentName;
+
     @ApiModelProperty(name = "dutyTitle", value = "上报标题")
     private String dutyTitle;
     @ApiModelProperty(name = "orgName", value = "单位名称")
@@ -270,4 +273,12 @@ public class BasicCheckPersonInfoDTO {
     public void setEducationName(String educationName) {
         this.educationName = educationName;
     }
+
+    public String getDutyIndexLibParentName() {
+        return dutyIndexLibParentName;
+    }
+
+    public void setDutyIndexLibParentName(String dutyIndexLibParentName) {
+        this.dutyIndexLibParentName = dutyIndexLibParentName;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/HeartTalkDTO.java

@@ -14,6 +14,15 @@ public class HeartTalkDTO {
     private String reportId;
     @ApiModelProperty(name = "dutyIndexLibId", value = "责任清单ID")
     private String dutyIndexLibId;
+
+    @ApiModelProperty(name = "dutyIndexLibName", value = "责任清单ID")
+    private String dutyIndexLibName;
+    @ApiModelProperty(name = "dutyIndexLibParentName", value = "责任清单ID")
+    private String dutyIndexLibParentName;
+
+
+
+
     @ApiModelProperty(name = "dutyTitle", value = "上报标题")
     private String dutyTitle;
     @ApiModelProperty(name = "orgName", value = "单位名称")
@@ -70,6 +79,22 @@ public class HeartTalkDTO {
     private String talkPlace2;
 
 
+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
+    public String getDutyIndexLibParentName() {
+        return dutyIndexLibParentName;
+    }
+
+    public void setDutyIndexLibParentName(String dutyIndexLibParentName) {
+        this.dutyIndexLibParentName = dutyIndexLibParentName;
+    }
+
     public String getDutyTitle() {
         return dutyTitle;
     }

src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/PartyCleanMeetingDTO.java

@@ -14,6 +14,15 @@ public class PartyCleanMeetingDTO {
     private String reportId;
     @ApiModelProperty(name = "dutyIndexLibId", value = "责任清单ID")
     private String dutyIndexLibId;
+    @ApiModelProperty(name = "dutyIndexLibName", value = "责任清单名称")
+    private String dutyIndexLibName;
+    @ApiModelProperty(name = "dutyIndexLibParentName", value = "责任清单ID")
+    private String dutyIndexLibParentName;
+
+
+
+
+
     @ApiModelProperty(name = "title", value = "标题")
     private String title;
     @ApiModelProperty(name = "meetingTime", value = "会议时间")
@@ -221,4 +230,20 @@ public class PartyCleanMeetingDTO {
     public void setMeetingPhoto(String meetingPhoto) {
         this.meetingPhoto = meetingPhoto;
     }
+
+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
+    public String getDutyIndexLibParentName() {
+        return dutyIndexLibParentName;
+    }
+
+    public void setDutyIndexLibParentName(String dutyIndexLibParentName) {
+        this.dutyIndexLibParentName = dutyIndexLibParentName;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/entityres/EntityResDTO.java

@@ -20,6 +20,9 @@ public class EntityResDTO {
     private String dutyIndexLibId;
     @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
     private String dutyIndexLibName;
+    @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称")
+    private String dutyIndexLibParentName;
+
     @ApiModelProperty(name = "entityResTitle", value = "主体责任台账上报标题")
     private String entityResTitle;
     @ApiModelProperty(name = "entityResType", value = "上报类型 1.具体事项 2.监督情况 3.备注")
@@ -157,4 +160,12 @@ public class EntityResDTO {
     public void setIndexAuditStatus(String indexAuditStatus) {
         this.indexAuditStatus = indexAuditStatus;
     }
+
+    public String getDutyIndexLibParentName() {
+        return dutyIndexLibParentName;
+    }
+
+    public void setDutyIndexLibParentName(String dutyIndexLibParentName) {
+        this.dutyIndexLibParentName = dutyIndexLibParentName;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/indexgeneral/IndexGeneralDTO.java

@@ -20,6 +20,9 @@ public class IndexGeneralDTO {
     private String dutyIndexLibId;
     @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
     private String dutyIndexLibName;
+    @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标上级名称")
+    private String dutyIndexLibParentName;
+
     @ApiModelProperty(name = "indexGeneralTitle", value = "上报标题")
     private String indexGeneralTitle;
     @ApiModelProperty(name = "indexGeneralContent", value = "上报正文")
@@ -136,4 +139,12 @@ public class IndexGeneralDTO {
     public void setIndexAuditStatus(String indexAuditStatus) {
         this.indexAuditStatus = indexAuditStatus;
     }
+
+    public String getDutyIndexLibParentName() {
+        return dutyIndexLibParentName;
+    }
+
+    public void setDutyIndexLibParentName(String dutyIndexLibParentName) {
+        this.dutyIndexLibParentName = dutyIndexLibParentName;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/partycommitteemeeting/PartyCommitteeMeetingDTO.java

@@ -18,6 +18,8 @@ public class PartyCommitteeMeetingDTO {
     private String dutyIndexLibId;
     @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
     private String dutyIndexLibName;
+    @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称")
+    private String dutyIndexLibParentName;
     @ApiModelProperty(name = "partyCommitteeMeetingId", value = "党委会上报ID")
     private String partyCommitteeMeetingId;
     @ApiModelProperty(name = "partyCommitteeMeetingType", value = "上报类型")
@@ -45,7 +47,13 @@ public class PartyCommitteeMeetingDTO {
     private String indexAuditStatus;
 
 
+    public String getDutyIndexLibParentName() {
+        return dutyIndexLibParentName;
+    }
 
+    public void setDutyIndexLibParentName(String dutyIndexLibParentName) {
+        this.dutyIndexLibParentName = dutyIndexLibParentName;
+    }
 
     public String getDutyIndexLibId() {
         return dutyIndexLibId;

src/main/java/com/tenlion/twoduty/pojo/dtos/partypunishinfo/PartyPunishInfoDTO.java

@@ -22,6 +22,9 @@ public class PartyPunishInfoDTO {
     @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
     private String dutyIndexLibName;
 
+    @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称")
+    private String dutyIndexLibParentName;
+
     @ApiModelProperty(name = "dutyTitle", value = "上报标题")
     private String dutyTitle;
     @ApiModelProperty(name = "personName", value = "姓名")
@@ -257,4 +260,12 @@ public class PartyPunishInfoDTO {
     public void setCreatorName(String creatorName) {
         this.creatorName = creatorName;
     }
+
+    public String getDutyIndexLibParentName() {
+        return dutyIndexLibParentName;
+    }
+
+    public void setDutyIndexLibParentName(String dutyIndexLibParentName) {
+        this.dutyIndexLibParentName = dutyIndexLibParentName;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/problemclue/ProblemClueDTO.java

@@ -23,6 +23,9 @@ public class ProblemClueDTO {
     @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
     private String dutyIndexLibName;
 
+    @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称")
+    private String dutyIndexLibParentName;
+
     @ApiModelProperty(name = "dutyTitle", value = "上报标题")
     private String dutyTitle;
     @ApiModelProperty(name = "caseNumber", value = "案件号")
@@ -300,4 +303,12 @@ public class ProblemClueDTO {
     public void setClueTypeName(String clueTypeName) {
         this.clueTypeName = clueTypeName;
     }
+
+    public String getDutyIndexLibParentName() {
+        return dutyIndexLibParentName;
+    }
+
+    public void setDutyIndexLibParentName(String dutyIndexLibParentName) {
+        this.dutyIndexLibParentName = dutyIndexLibParentName;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/supervisecheck/SuperviseCheckDTO.java

@@ -22,6 +22,9 @@ public class SuperviseCheckDTO {
     @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
     private String dutyIndexLibName;
 
+    @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称")
+    private String dutyIndexLibParentName;
+
     @ApiModelProperty(name = "dutyTitle", value = "上报标题")
     private String dutyTitle;
     @ApiModelProperty(name = "checkPhotos", value = "附加图片")
@@ -194,4 +197,12 @@ public class SuperviseCheckDTO {
     public void setGmtCreate(String gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
+    public String getDutyIndexLibParentName() {
+        return dutyIndexLibParentName;
+    }
+
+    public void setDutyIndexLibParentName(String dutyIndexLibParentName) {
+        this.dutyIndexLibParentName = dutyIndexLibParentName;
+    }
 }

src/main/java/com/tenlion/twoduty/service/basiccheckpersonaction/impl/BasicCheckPersonActionServiceImpl.java

@@ -1,7 +1,9 @@
 package com.tenlion.twoduty.service.basiccheckpersonaction.impl;
 
+import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
 import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
 import com.tenlion.twoduty.service.indexaudit.IIndexAuditService;
+import com.tenlion.twoduty.service.indexlib.IIndexLibService;
 import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
@@ -37,6 +39,8 @@ public class BasicCheckPersonActionServiceImpl extends DefaultBaseService implem
     private IBasicCheckPersonActionDao basicCheckPersonActionDao;
     @Autowired
     private IIndexAuditService iIndexAuditService;
+    @Autowired
+    private IIndexLibService iIndexLibService;
 
 
     @Override
@@ -143,7 +147,10 @@ public class BasicCheckPersonActionServiceImpl extends DefaultBaseService implem
     public BasicCheckPersonActionDTO get(String basicCheckPersonActionId) {
         Map<String, Object> params = super.getHashMap(2);
         params.put("reportId", basicCheckPersonActionId);
-        return get(params);
+        BasicCheckPersonActionDTO basicCheckPersonActionDTO = get(params);
+        IndexLibDTO parentParent = iIndexLibService.getParentParent(basicCheckPersonActionDTO.getDutyIndexLibId());
+        basicCheckPersonActionDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName());
+        return basicCheckPersonActionDTO;
     }
 
     @Override

src/main/java/com/tenlion/twoduty/service/basiccheckpersoninfo/impl/BasicCheckPersonInfoServiceImpl.java

@@ -1,7 +1,9 @@
 package com.tenlion.twoduty.service.basiccheckpersoninfo.impl;
 
+import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
 import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
 import com.tenlion.twoduty.service.indexaudit.IIndexAuditService;
+import com.tenlion.twoduty.service.indexlib.IIndexLibService;
 import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
@@ -37,6 +39,8 @@ public class BasicCheckPersonInfoServiceImpl extends DefaultBaseService implemen
     private IBasicCheckPersonInfoDao basicCheckPersonInfoDao;
     @Autowired
     private IIndexAuditService iIndexAuditService;
+    @Autowired
+    private IIndexLibService indexLibService;
 
     @Override
     public void save(BasicCheckPersonInfoVO basicCheckPersonInfoVO) {
@@ -143,7 +147,10 @@ public class BasicCheckPersonInfoServiceImpl extends DefaultBaseService implemen
     public BasicCheckPersonInfoDTO get(String basicCheckPersonInfoId) {
         Map<String, Object> params = super.getHashMap(2);
         params.put("reportId", basicCheckPersonInfoId);
-        return get(params);
+        BasicCheckPersonInfoDTO basicCheckPersonInfoDTO = get(params);
+        IndexLibDTO parentParent = indexLibService.getParentParent(basicCheckPersonInfoDTO.getDutyIndexLibId());
+        basicCheckPersonInfoDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName());
+        return basicCheckPersonInfoDTO;
     }
 
     @Override

src/main/java/com/tenlion/twoduty/service/dutylistform/impl/DutyListFormServiceImpl.java

@@ -5,10 +5,12 @@ import com.github.pagehelper.PageInfo;
 import com.tenlion.twoduty.dao.dutylistform.IDutyListFormDao;
 import com.tenlion.twoduty.pojo.dtos.dutylistform.HeartTalkDTO;
 import com.tenlion.twoduty.pojo.dtos.dutylistform.PartyCleanMeetingDTO;
+import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
 import com.tenlion.twoduty.pojo.vos.dutylistform.PartyCleanMeetingVO;
 import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
 import com.tenlion.twoduty.service.dutylistform.IDutyListFormService;
 import com.tenlion.twoduty.service.indexaudit.IIndexAuditService;
+import com.tenlion.twoduty.service.indexlib.IIndexLibService;
 import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
@@ -34,6 +36,8 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
     private IDutyListFormDao dutyListFormDao;
     @Autowired
     private IIndexAuditService iIndexAuditService;
+    @Autowired
+    private IIndexLibService indexLibService;
 
     @Override
     public SuccessResultList<List<PartyCleanMeetingDTO>> listPagePartyCleanMeeting(ListPage page) {
@@ -46,7 +50,12 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
 
     @Override
     public PartyCleanMeetingDTO getPartyCleanMeeting(Map<String, Object> params) {
-        return dutyListFormDao.getPartyCleanMeeting(params);
+        PartyCleanMeetingDTO partyCleanMeeting = dutyListFormDao.getPartyCleanMeeting(params);
+        IndexLibDTO parentParent = indexLibService.getParentParent(partyCleanMeeting.getDutyIndexLibId());
+        partyCleanMeeting.setDutyIndexLibParentName(parentParent.getIndexLibParentName());
+        IndexLibDTO indexLibDTO = indexLibService.get(partyCleanMeeting.getDutyIndexLibId());
+        partyCleanMeeting.setDutyIndexLibName(indexLibDTO.getIndexLibName());
+        return partyCleanMeeting;
     }
 
     @Override
@@ -91,7 +100,12 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
 
     @Override
     public HeartTalkDTO getHeartTalk(Map<String, Object> params) {
-        return dutyListFormDao.getHeartTalk(params);
+        HeartTalkDTO heartTalk = dutyListFormDao.getHeartTalk(params);
+        IndexLibDTO parentParent = indexLibService.getParentParent(heartTalk.getDutyIndexLibId());
+        heartTalk.setDutyIndexLibParentName(parentParent.getIndexLibParentName());
+        IndexLibDTO indexLibDTO = indexLibService.get(heartTalk.getDutyIndexLibId());
+        heartTalk.setDutyIndexLibName(indexLibDTO.getIndexLibName());
+        return heartTalk;
     }
 
     @Override

src/main/java/com/tenlion/twoduty/service/entityres/impl/EntityResServiceImpl.java

@@ -1,7 +1,9 @@
 package com.tenlion.twoduty.service.entityres.impl;
 
+import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
 import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
 import com.tenlion.twoduty.service.indexaudit.IIndexAuditService;
+import com.tenlion.twoduty.service.indexlib.IIndexLibService;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -36,6 +38,8 @@ public class EntityResServiceImpl extends DefaultBaseService implements IEntityR
     private IEntityResDao entityResDao;
     @Autowired
     private IIndexAuditService iIndexAuditService;
+    @Autowired
+    private IIndexLibService iIndexLibService;
 
     @Override
     public void save(EntityResVO entityResVO) {
@@ -133,7 +137,10 @@ public class EntityResServiceImpl extends DefaultBaseService implements IEntityR
     public EntityResDTO get(String entityResId) {
         Map<String, Object> params = super.getHashMap(2);
         params.put("entityResId", entityResId);
-        return get(params);
+        EntityResDTO entityResDTO = get(params);
+        IndexLibDTO parentParent = iIndexLibService.getParentParent(entityResDTO.getDutyIndexLibId());
+        entityResDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName());
+        return entityResDTO;
     }
 
     @Override

src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java

@@ -1,9 +1,11 @@
 package com.tenlion.twoduty.service.indexgeneral.impl;
 
+import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
 import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
 import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO;
 import com.tenlion.twoduty.service.indexaudit.IIndexAuditService;
 import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService;
+import com.tenlion.twoduty.service.indexlib.IIndexLibService;
 import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.common.component.SecurityComponent;
@@ -41,6 +43,8 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde
     private IIndexGeneralDao indexGeneralDao;
     @Autowired
     private IIndexAuditService iIndexAuditService;
+    @Autowired
+    private IIndexLibService iIndexLibService;
 
     @Override
     public void save(IndexGeneralVO indexGeneralVO) {
@@ -146,7 +150,10 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde
     public IndexGeneralDTO get(String indexGeneralId) {
         Map<String, Object> params = super.getHashMap(2);
         params.put("indexGeneralId", indexGeneralId);
-        return get(params);
+        IndexGeneralDTO indexGeneralDTO = get(params);
+        IndexLibDTO indexLibDTO = iIndexLibService.getParentParent(indexGeneralDTO.getDutyIndexLibId());
+        indexGeneralDTO.setDutyIndexLibParentName(indexLibDTO.getIndexLibParentName());
+        return indexGeneralDTO;
     }
 
     @Override
@@ -203,4 +210,8 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde
         return count == null ? 0 : count;
     }
     
+    
+    
+    
+
 }

src/main/java/com/tenlion/twoduty/service/indexlib/IIndexLibService.java

@@ -21,6 +21,14 @@ import java.util.Map;
  **/
 public interface IIndexLibService {
 
+
+    /**
+     * 获取父级的父级
+     * @param indexLibId
+     * @return
+     */
+    IndexLibDTO getParentParent(String indexLibId);
+
     /**
      * 获取web显示的指标
      * @param indexLibParentId

src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java

@@ -56,6 +56,24 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib
      */
     private final static String ROLE_CODE_2 ="0002";
 
+
+    /**
+     * 获取父级的父级
+     * @param indexLibId
+     * @return
+     */
+    public IndexLibDTO getParentParent(String indexLibId){
+        IndexLibDTO indexLibDTO = null;
+        indexLibDTO = this.get(indexLibId);
+        if(!"0".equals(indexLibDTO.getIndexLibParentId())){
+            indexLibDTO = this.get(indexLibDTO.getIndexLibParentId());
+        }
+        return indexLibDTO;
+    }
+
+
+
+
     /**
      * 获取web显示的指标
      * @param indexLibParentId

src/main/java/com/tenlion/twoduty/service/partycommitteemeeting/impl/PartyCommitteeMeetingServiceImpl.java

@@ -1,7 +1,9 @@
 package com.tenlion.twoduty.service.partycommitteemeeting.impl;
 
+import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
 import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
 import com.tenlion.twoduty.service.indexaudit.IIndexAuditService;
+import com.tenlion.twoduty.service.indexlib.IIndexLibService;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -36,7 +38,8 @@ public class PartyCommitteeMeetingServiceImpl extends DefaultBaseService impleme
     private IPartyCommitteeMeetingDao partyCommitteeMeetingDao;
     @Autowired
     private IIndexAuditService iIndexAuditService;
-
+    @Autowired
+    private IIndexLibService indexLibService;
 
 
     @Override
@@ -135,7 +138,10 @@ public class PartyCommitteeMeetingServiceImpl extends DefaultBaseService impleme
     public PartyCommitteeMeetingDTO get(String partyCommitteeMeetingId) {
         Map<String, Object> params = super.getHashMap(2);
         params.put("partyCommitteeMeetingId", partyCommitteeMeetingId);
-        return get(params);
+        PartyCommitteeMeetingDTO partyCommitteeMeetingDTO = get(params);
+        IndexLibDTO parentParent = indexLibService.getParentParent(partyCommitteeMeetingDTO.getDutyIndexLibId());
+        partyCommitteeMeetingDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName());
+        return partyCommitteeMeetingDTO;
     }
 
     @Override

src/main/java/com/tenlion/twoduty/service/partypunishinfo/impl/PartyPunishInfoServiceImpl.java

@@ -1,7 +1,9 @@
 package com.tenlion.twoduty.service.partypunishinfo.impl;
 
+import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
 import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
 import com.tenlion.twoduty.service.indexaudit.IIndexAuditService;
+import com.tenlion.twoduty.service.indexlib.IIndexLibService;
 import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
@@ -37,6 +39,8 @@ public class PartyPunishInfoServiceImpl extends DefaultBaseService implements IP
     private IPartyPunishInfoDao partyPunishInfoDao;
     @Autowired
     private IIndexAuditService iIndexAuditService;
+    @Autowired
+    private IIndexLibService indexLibService;
 
     @Override
     public void save(PartyPunishInfoVO partyPunishInfoVO) {
@@ -139,7 +143,10 @@ public class PartyPunishInfoServiceImpl extends DefaultBaseService implements IP
     public PartyPunishInfoDTO get(String reportId) {
         Map<String, Object> params = super.getHashMap(2);
         params.put("reportId", reportId);
-        return get(params);
+        PartyPunishInfoDTO partyPunishInfoDTO = get(params);
+        IndexLibDTO parentParent = indexLibService.getParentParent(partyPunishInfoDTO.getDutyIndexLibId());
+        partyPunishInfoDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName());
+        return partyPunishInfoDTO;
     }
 
     @Override

src/main/java/com/tenlion/twoduty/service/problemclue/impl/ProblemClueServiceImpl.java

@@ -1,7 +1,9 @@
 package com.tenlion.twoduty.service.problemclue.impl;
 
+import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
 import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
 import com.tenlion.twoduty.service.indexaudit.IIndexAuditService;
+import com.tenlion.twoduty.service.indexlib.IIndexLibService;
 import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
@@ -37,6 +39,8 @@ public class ProblemClueServiceImpl extends DefaultBaseService implements IProbl
     private IProblemClueDao problemClueDao;
     @Autowired
     private IIndexAuditService iIndexAuditService;
+    @Autowired
+    private IIndexLibService indexLibService;
 
 
     @Override
@@ -145,7 +149,10 @@ public class ProblemClueServiceImpl extends DefaultBaseService implements IProbl
     public ProblemClueDTO get(String problemClueId) {
         Map<String, Object> params = super.getHashMap(2);
         params.put("reportId", problemClueId);
-        return get(params);
+        ProblemClueDTO problemClueDTO = get(params);
+        IndexLibDTO parentParent = indexLibService.getParentParent(problemClueDTO.getDutyIndexLibId());
+        problemClueDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName());
+        return problemClueDTO;
     }
 
     @Override

src/main/java/com/tenlion/twoduty/service/supervisecheck/impl/SuperviseCheckServiceImpl.java

@@ -1,7 +1,9 @@
 package com.tenlion.twoduty.service.supervisecheck.impl;
 
+import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
 import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO;
 import com.tenlion.twoduty.service.indexaudit.IIndexAuditService;
+import com.tenlion.twoduty.service.indexlib.IIndexLibService;
 import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
@@ -37,6 +39,8 @@ public class SuperviseCheckServiceImpl extends DefaultBaseService implements ISu
     private ISuperviseCheckDao superviseCheckDao;
     @Autowired
     private IIndexAuditService iIndexAuditService;
+    @Autowired
+    private IIndexLibService indexLibService;
 
     @Override
     public void save(SuperviseCheckVO superviseCheckVO) {
@@ -139,7 +143,10 @@ public class SuperviseCheckServiceImpl extends DefaultBaseService implements ISu
     public SuperviseCheckDTO get(String superviseCheckId) {
         Map<String, Object> params = super.getHashMap(2);
         params.put("reportId", superviseCheckId);
-        return get(params);
+        SuperviseCheckDTO superviseCheckDTO = get(params);
+        IndexLibDTO parentParent = indexLibService.getParentParent(superviseCheckDTO.getDutyIndexLibId());
+        superviseCheckDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName());
+        return superviseCheckDTO;
     }
 
     @Override

src/main/java/com/tenlion/twoduty/utils/WeatherUtil.java

@@ -1,5 +1,6 @@
 package com.tenlion.twoduty.utils;
 
+import com.alibaba.druid.support.logging.Log;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 

src/main/resources/mybatis/mapper/indexlib/indexLib-mapper.xml

@@ -63,6 +63,9 @@
 
 
 
+
+
+
     <!-- 树形列表 -->
     <select id="listZTreeWeb" parameterType="map" resultMap="indexLibZTreeDTO">
         SELECT

src/main/resources/static/assets/js/vendor/ueditor/ueditor.all.js

@@ -18965,12 +18965,12 @@ UE.plugins['video'] = function (){
                 for (var r = 0; r < rowsNum; r++) {
                     html.push('<tr' + (r == 0 ? ' class="firstRow"':'') + '>');
                     for (var c = 0; c < colsNum; c++) {
-                        html.push('<td width="' + tdWidth + '"  vAlign="' + opt.tdvalign + '" >' + (browser.ie && browser.version < 11 ? domUtils.fillChar : '<br/>') + '</td>')
+                        html.push('<td width="' + tdWidth + '"  vAlign="' + opt.tdvalign + '" style="border:1px solid #000;">' + (browser.ie && browser.version < 11 ? domUtils.fillChar : '<br/>') + '</td>')
                     }
                     html.push('</tr>')
                 }
                 //禁止指定table-width
-                return '<table><tbody>' + html.join('') + '</tbody></table>'
+                return '<table style="border-collapse:collapse"><tbody>' + html.join('') + '</tbody></table>'
             }
 
             if (!opt) {
@@ -19830,7 +19830,14 @@ UE.plugins['video'] = function (){
             utils.each(domUtils.getElementsByTagName(table,'td'),function(td){
                 td.style.borderWidth = '1px';
                 td.style.borderStyle = 'solid';
+                td.style.borderColor = 'windowtext';
             })
+            //增加下面一段
+            utils.each(domUtils.getElementsByTagName(table,'th'),function(th){
+                th.style.borderWidth = domUtils.getComputedStyle(th, "border-width");
+                th.style.borderStyle = 'solid';
+                th.style.borderColor = 'windowtext';
+            });
         }
     };
     function resetTdWidth(table, editor) {
@@ -19985,13 +19992,23 @@ UE.plugins['table'] = function () {
     me.ready(function () {
         utils.cssRule('table',
             //选中的td上的样式
+            // '.selectTdClass{background-color:#edf5fa !important}' +
+            //     'table.noBorderTable td,table.noBorderTable th,table.noBorderTable caption{border:1px dashed #ddd !important}' +
+            //     //插入的表格的默认样式
+            //     'table{margin-bottom:10px;border-collapse:collapse;display:table;}' +
+            //     'td,th{padding: 5px 10px;border: 1px solid #DDD;}' +
+            //     'caption{border:1px dashed #DDD;border-bottom:0;padding:3px;text-align:center;}' +
+            //     'th{border-top:1px solid #BBB;background-color:#F7F7F7;}' +
+            //     'table tr.firstRow th{border-top-width:2px;}' +
+            //     '.ue-table-interlace-color-single{ background-color: #fcfcfc; } .ue-table-interlace-color-double{ background-color: #f7faff; }' +
+            //     'td p{margin:0;padding:0;}', me.document);
             '.selectTdClass{background-color:#edf5fa !important}' +
                 'table.noBorderTable td,table.noBorderTable th,table.noBorderTable caption{border:1px dashed #ddd !important}' +
                 //插入的表格的默认样式
                 'table{margin-bottom:10px;border-collapse:collapse;display:table;}' +
-                'td,th{padding: 5px 10px;border: 1px solid #DDD;}' +
+                'td,th{padding: 5px 10px;border: 1px dashed #DDD;}' + //这里修改 1px solid #DDD 为 1px dashed #DDD
                 'caption{border:1px dashed #DDD;border-bottom:0;padding:3px;text-align:center;}' +
-                'th{border-top:1px solid #BBB;background-color:#F7F7F7;}' +
+                'th{border-top:1px dashed #BBB;background-color:#F7F7F7;}' + //这里修改 1px solid #BBB 为 1px dashed #BBB
                 'table tr.firstRow th{border-top-width:2px;}' +
                 '.ue-table-interlace-color-single{ background-color: #fcfcfc; } .ue-table-interlace-color-double{ background-color: #f7faff; }' +
                 'td p{margin:0;padding:0;}', me.document);
@@ -20239,7 +20256,8 @@ UE.plugins['table'] = function () {
                 } else {
                     utils.each(tables, function (table) {
                         removeStyleSize(table, true);
-                        domUtils.removeAttributes(table, ['style', 'border']);
+                        // domUtils.removeAttributes(table, ['style', 'border']);
+                        domUtils.removeAttributes(table, ['style']);
                         utils.each(domUtils.getElementsByTagName(table, "td"), function (td) {
                             if (isEmptyBlock(td)) {
                                 domUtils.fillNode(me.document, td);

src/main/resources/static/route/basiccheckpersonaction/print.html

@@ -29,32 +29,27 @@
     </style>
 </head>
 <body>
-<div class="main" id="main">
+<div id="main">
 
 
 </div>
 <script id="data" type="text/html">
-    <div class="title">
-        <h3>{{ d.dutyIndexLibName }}</h3>
-        <p>
-            <span>上报时间：{{ d.gmtCreate }}</span>
-            <span>上报人：{{ d.creatorName }}</span>
-        </p>
-    </div>
-    <div class="table-box">
     <style>
         *{margin:0;padding:0;}
-            .main{width: 1000px;min-height:1200px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden;box-shadow: 0 0 10px #ccc}
+        body{background: #f2f2f2}
-            .title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
+        .top{background: url("assets/web/images/top.png") no-repeat center;background-size: 1920px 320px;height:320px;padding-top: 100px;box-sizing: border-box;position: relative;}
-            .title h3{font-size: 32px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
+        .top-content{width: 1000px;margin: 0 auto;}
-            .title p{font-size: 15px;color: #333;}
+        .top-content span{display: block;position: absolute;bottom: -60px;right: 20px;background: #004acd;color: #fff;cursor: pointer;line-height: 40px;width:60px;text-align: center}
-            .title p span{margin-right: 50px}
+        .top-content h1{font-size: 40px;color: #fff;text-shadow: 0 0 10px #EEE;margin-bottom: 10px;}
-            .tableTitle{text-align: center;font-size: 40px;line-height: 38px}
+        .top-content p{font-size: 18px;color: #fff;}
-            .table-box{margin: 10px 0;}
+        .main{overflow:hidden;width:1000px;background: #fff;border-top-right-radius: 10px;border-top-left-radius: 10px;min-height: 800px;margin: -50px auto 0;position: relative;}
-            .table-box table{table-layout: fixed;width: 100%;border-collapse: collapse;}
+        .container{width: 1017px;height: 100%;overflow-y: auto;padding: 50px 100px;box-sizing: border-box;}
-            .table-box table td{height: 40px;font-size: 16px;border: 1px solid #161615;text-align: center;}
+        .title{text-align: center;font-size: 28px;color: #1f5781;line-height: 45px;font-weight: bold;}
-            .button-box{position: fixed;top:20px;right: 40px;}
+        .time{font-size: 14px;color: #333;text-align: center;margin-top: 20px;line-height: 30px;background: #eee}
-            .button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
+        .time span{margin-right: 50px;}
+        .time span:last-child{margin-right: 0}
+        .content{margin-top: 20px;}
+        .content p{font-size: 16px !important;line-height: 40px !important;}
         .title{
             text-align: center;
         }
@@ -63,26 +58,36 @@
             /*text-indent: 30px;*/
             padding: 0 10px;
         }
-            table{margin: 0 auto;width:85% !important;}
+        table{margin: 0 auto;width:100% !important;table-layout: fixed;width: 100%;}
-            table td{border-width: 2px !important;}
+        table td{border: 2px solid #CCC! important;}
+        table td:nth-child(odd){text-align: center}
     </style>
+    <div class="top">
+        <div class="top-content">
+            <h1>{{ d.dutyIndexLibParentName }}</h1>
+            <p>{{ d.dutyIndexLibName }}</p>
+            <span class="close">返回</span>
+        </div>
+    </div>
+    <div class="main">
+        <div class="container">
+            <div class="title">
+                {{ d.dutyIndexLibName }}
+            </div>
+            <div class="time">
+                <span>上报时间：{{ d.gmtCreate }}</span>
+                <span>上报人：{{ d.creatorName }}</span>
+            </div>
+            <div class="content">
                 <table style="height: 500px">
-            {{# if(d.imagesList.length > 0) { }}
+                    <colgroup>
-            <div class="swiper-container">
+                        <col width="12%">
-                <div class="swiper-wrapper" id="indexGeneralImagesFileBox">
+                        <col width="21%">
-                    {{#  layui.each(d.imagesList, function(index, item){ }}
+                        <col width="12%">
-                    <div class="swiper-slide"><img src="route/file/download/false/{{item.fileId}}" align="加载失败"></div>
+                        <col width="21%">
-                    {{#  }); }}
+                        <col width="12%">
-                </div>
+                        <col width="22%">
-                <!-- 如果需要分页器 -->
+                    </colgroup>
-                <div class="swiper-pagination"></div>
-                <!-- 如果需要导航按钮 -->
-                <!--<div class="swiper-button-prev"></div>-->
-                <!--<div class="swiper-button-next"></div>-->
-                <!-- 如果需要滚动条 -->
-                <div class="swiper-scrollbar"></div>
-            </div>
-            {{# } }}
                     <tr>
                         <td class="tableTitle">时间</td>
                         <td class="details" style="height: 60px">{{ d.actionTime }}</td>
@@ -107,14 +112,13 @@
                         <td class="tableTitle">备注</td>
                         <td class="details" colspan="5" style="height: 100px">{{ d.remarks }}</td>
                     </tr>
-        </table>
 
+                </table>
+            </div>
+        </div>
     </div>
 </script>
-<div class="button-box">
+
-    <button class="print" style="display:none;">打印</button>
-    <button class="close">返回</button>
-</div>
 
 <script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
 <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
@@ -231,9 +235,10 @@
         }
 
 
-        $('.close').on('click', function() {
+        $(document).on('click','.close',function () {
             closeBox();
         });
+
         $('.print').on('click', function() {
             $("#main").jqprint({
                 debug: false,  //是否显示iframe查看效果

src/main/resources/static/route/basiccheckpersoninfo/print.html

@@ -14,34 +14,30 @@
 
 </head>
 <body>
-<div class="main" id="main">
+<div id="main">
 
 
 </div>
 <script id="data" type="text/html">
-    <div class="title">
-        <h3>{{ d.dutyIndexLibName }}</h3>
-        <p>
-            <span>上报时间：{{ d.gmtCreate }}</span>
-            <span>上报人：{{ d.creatorName }}</span>
-        </p>
-    </div>
-    <div class="table-box">
     <style>
         *{margin:0;padding:0;}
-            .main{width: 1000px;min-height:1200px;margin: 0 auto;padding-top: 50px;;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden;box-shadow: 0 0 10px #ccc}
+        body{background: #f2f2f2}
-            .title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
+        .top{background: url("assets/web/images/top.png") no-repeat center;background-size: 1920px 320px;height:320px;padding-top: 100px;box-sizing: border-box;position: relative;}
-            .title h3{font-size: 32px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
+        .top-content{width: 1000px;margin: 0 auto;}
-            .title p{font-size: 15px;color: #333;}
+        .top-content span{display: block;position: absolute;bottom: -60px;right: 20px;background: #004acd;color: #fff;cursor: pointer;line-height: 40px;width:60px;text-align: center}
-            .title p span{margin-right: 50px}
+        .top-content h1{font-size: 40px;color: #fff;text-shadow: 0 0 10px #EEE;margin-bottom: 10px;}
-
+        .top-content p{font-size: 18px;color: #fff;}
-
+        .main{overflow:hidden;width:1000px;background: #fff;border-top-right-radius: 10px;border-top-left-radius: 10px;min-height: 800px;margin: -50px auto 0;position: relative;}
-            .tableTitle{text-align: center;font-size: 40px;line-height: 38px}
+        .container{width: 1017px;height: 100%;overflow-y: auto;padding: 50px 100px;box-sizing: border-box;}
-            .table-box{margin: 10px 0;}
+        .title{text-align: center;font-size: 28px;color: #1f5781;line-height: 45px;font-weight: bold;}
-            .table-box table{table-layout: fixed;width: 100%;border-collapse: collapse;}
+        .time{font-size: 14px;color: #333;text-align: center;margin-top: 20px;line-height: 30px;background: #eee}
-            .table-box table td{height: 40px;font-size: 16px;border: 1px solid #161615;}
+        .time span{margin-right: 50px;}
-            .button-box{position: fixed;top:20px;right: 40px;}
+        .time span:last-child{margin-right: 0}
-            .button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
+        .content{margin-top: 20px;}
+        .content p{font-size: 16px !important;line-height: 40px !important;}
+        table{margin: 0 auto;width:100% !important;table-layout: fixed;width: 100%;}
+        table td{border: 2px solid #CCC! important;}
+        table td:nth-child(odd){text-align: center}
         .title{
             text-align: center;
         }
@@ -49,10 +45,33 @@
             text-align: center;
 
         }
-            table{margin: 0 auto;width:85% !important;}
-            table td{border-width: 2px !important;}
     </style>
+    <div class="top">
+        <div class="top-content">
+            <h1>{{ d.dutyIndexLibParentName }}</h1>
+            <p>{{ d.dutyIndexLibName }}</p>
+            <span class="close">返回</span>
+        </div>
+    </div>
+    <div class="main">
+        <div class="container">
+            <div class="title">
+                {{ d.dutyIndexLibName }}
+            </div>
+            <div class="time">
+                <span>上报时间：{{ d.gmtCreate }}</span>
+                <span>上报人：{{ d.creatorName }}</span>
+            </div>
+            <div class="content">
                 <table style="height: 500px">
+                    <colgroup>
+                        <col width="12%">
+                        <col width="21%">
+                        <col width="12%">
+                        <col width="21%">
+                        <col width="12%">
+                        <col width="22%">
+                    </colgroup>
                     <tr>
                         <td class="tableTitle">单位名称</td>
                         <td class="details" colspan="5" style="height: 50px">{{ d.orgName }}</td>
@@ -100,15 +119,11 @@
                         <td class="details" colspan="2" style="height: 50px">{{ d.noteDateTime }}</td>
                     </tr>
                 </table>
-
             </div>
-
+        </div>
+    </div>
 
 </script>
-<div class="button-box">
-    <button class="print" style="display:none;">打印</button>
-    <button class="close">返回</button>
-</div>
 
 <script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
 <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
@@ -181,9 +196,10 @@
 
 
 
-        $('.close').on('click', function() {
+        $(document).on('click','.close',function () {
             closeBox();
         });
+
         $('.print').on('click', function() {
             $("#main").jqprint({
                 debug: false,  //是否显示iframe查看效果

src/main/resources/static/route/entityres/print.html

@@ -44,7 +44,7 @@
     </style>
 </head>
 <body>
-<div class="main" id="main">
+<div id="main">
 
 </div>
 
@@ -53,45 +53,41 @@
 <script id="data" type="text/html">
     <style>
         *{margin:0;padding:0;}
-        .main{width: 1000px;min-height:1200px;margin: 0 auto;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden;box-shadow: 0 0 10px #ccc}
+        body{background: #f2f2f2}
-        .title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
+        .top{background: url("assets/web/images/top.png") no-repeat center;background-size: 1920px 320px;height:320px;padding-top: 100px;box-sizing: border-box;position: relative;}
-        .title h3{font-size: 32px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
+        .top-content{width: 1000px;margin: 0 auto;}
-        .title p{font-size: 16px;color: #333;}
+        .top-content span{display: block;position: absolute;bottom: -60px;right: 20px;background: #004acd;color: #fff;cursor: pointer;line-height: 40px;width:60px;text-align: center}
-        .title p span{margin-right: 50px}
+        .top-content h1{font-size: 40px;color: #fff;text-shadow: 0 0 10px #EEE;margin-bottom: 10px;}
-        .content{min-height: 500px;margin-top: 10px;}
+        .top-content p{font-size: 18px;color: #fff;}
-        .content p{font-size: 16px;color: #333;line-height: 40px;}
+        .main{overflow:hidden;width:1000px;background: #fff;border-top-right-radius: 10px;border-top-left-radius: 10px;min-height: 800px;margin: -50px auto 0;position: relative;}
-        .button-box{position: fixed;top:20px;right: 40px;}
+        .container{width: 1017px;height: 100%;overflow-y: auto;padding: 50px 100px;box-sizing: border-box;}
-        .button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
+        .title{text-align: center;font-size: 28px;color: #1f5781;line-height: 45px;font-weight: bold;}
-        table{margin: 0 auto;width:85% !important;}
+        .time{font-size: 14px;color: #333;text-align: center;margin-top: 20px;line-height: 30px;background: #eee}
-        table td{border-width: 2px !important;}
+        .time span{margin-right: 50px;}
+        .time span:last-child{margin-right: 0}
+        .content p{font-size: 16px !important;line-height: 40px !important;}
+        table{margin: 0 auto;width:100% !important;}
+        table td{border-width: 1px !important;}
     </style>
+    <div class="top">
+        <div class="top-content">
+            <h1>{{ d.dutyIndexLibParentName }}</h1>
+            <p>{{ d.dutyIndexLibName }}</p>
+            <span class="close">返回</span>
+        </div>
+    </div>
+    <div class="main">
+        <div class="container">
             <div class="title">
-        <h3>{{ d.entityResTitle }}</h3>
+                {{ d.entityResTitle }}
-        <p>
+            </div>
+            <div class="time">
                 <span>上报时间：{{ d.gmtCreate }}</span>
                 <span>上报人：{{ d.creatorName }}</span>
                 <span>上报类型：{{ d.entityResTypeName }}</span>
-        </p>
             </div>
             <div class="content">
-        {{# if(d.imagesList.length > 0) { }}
+                {{ d.entityResContent }}
-        <div class="swiper-container">
-            <div class="swiper-wrapper" id="indexGeneralImagesFileBox">
-                {{#  layui.each(d.imagesList, function(index, item){ }}
-                <div class="swiper-slide"><img src="route/file/download/false/{{item.fileId}}" align="加载失败"></div>
-                {{#  }); }}
-            </div>
-            <!-- 如果需要分页器 -->
-            <div class="swiper-pagination"></div>
-            <!-- 如果需要导航按钮 -->
-            <!--<div class="swiper-button-prev"></div>-->
-            <!--<div class="swiper-button-next"></div>-->
-            <!-- 如果需要滚动条 -->
-            <div class="swiper-scrollbar"></div>
-        </div>
-        {{# } }}
-
-        <p>{{ d.entityResContent }}</p>
             </div>
             {{#  layui.each(d.filesList, function(index, item){ }}
             <span class="layui-btn-group">
@@ -121,8 +117,8 @@
                 </div>
             </span>
             {{#  }); }}
-
+        </div>
-
+    </div>
 
 </script>
 
@@ -218,10 +214,7 @@
 <!--</script>-->
 
 
-<div class="button-box">
+
-    <button class="print" style="display:none;">打印</button>
-    <button class="close">返回</button>
-</div>
 <script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
 <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
@@ -342,7 +335,7 @@
 
 
 
-        $('.close').on('click', function() {
+        $(document).on('click','.close',function () {
             closeBox();
         });
         $('.print').on('click', function() {

src/main/resources/static/route/hearttalk/print-heart-talk.html

@@ -13,51 +13,65 @@
 
 </head>
 <body>
-<div class="main" id="main">
+<div id="main">
 
 </div>
 <script id="data" type="text/html">
-    <div class="title">
-        <h3>{{ d.dutyTitle }}</h3>
-        <p>
-            <span>上报时间：{{ d.gmtCreate }}</span>
-            <span>上报人：{{ d.creatorName }}</span>
-        </p>
-    </div>
-    <div class="table-box">
     <style>
         *{margin:0;padding:0;}
-            .main{width: 1000px;min-height:1200px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden;box-shadow: 0 0 10px #ccc}
+        body{background: #f2f2f2}
-            .title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
+        .top{background: url("assets/web/images/top.png") no-repeat center;background-size: 1920px 320px;height:320px;padding-top: 100px;box-sizing: border-box;position: relative;}
-            .title h3{font-size: 32px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
+        .top-content{width: 1000px;margin: 0 auto;}
-            .title p{font-size: 15px;color: #333;}
+        .top-content span{display: block;position: absolute;bottom: -60px;right: 20px;background: #004acd;color: #fff;cursor: pointer;line-height: 40px;width:60px;text-align: center}
-            .title p span{margin-right: 50px}
+        .top-content h1{font-size: 40px;color: #fff;text-shadow: 0 0 10px #EEE;margin-bottom: 10px;}
-
+        .top-content p{font-size: 18px;color: #fff;}
-
+        .main{overflow:hidden;width:1000px;background: #fff;border-top-right-radius: 10px;border-top-left-radius: 10px;min-height: 800px;margin: -50px auto 0;position: relative;}
-            .tableTitle{text-align: center;font-size: 24px;line-height: 40px}
+        .container{width: 1017px;height: 100%;overflow-y: auto;padding: 50px 100px;box-sizing: border-box;}
-            .table-box{margin: 10px 0;}
+        .title{text-align: center;font-size: 28px;color: #1f5781;line-height: 45px;font-weight: bold;}
-            .table-box table{table-layout: fixed;width: 100%;border-collapse: collapse;}
+        .time{font-size: 14px;color: #333;text-align: center;margin-top: 20px;line-height: 30px;background: #eee}
-            .table-box table td{height: 40px;font-size: 16px;border: 1px solid #161615;text-align: center;}
+        .time span{margin-right: 50px;}
-            .button-box{position: fixed;top:20px;right: 40px;}
+        .time span:last-child{margin-right: 0}
-            .button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
+        .content{margin-top: 20px;}
-            .title{
+        .content {font-size: 16px !important;line-height: 40px !important;}
-                text-align: center;
+        table{margin: 0 auto;width:100% !important;table-layout: fixed}
-            }
+        table td{border: 2px solid #CCC! important;font-size: 16px;height: 40px;}
-            .details{
+        table td:nth-child(odd){text-align: center}
-                text-align: left;
+        /*.tableTitle{text-align: center;font-size: 24px;line-height: 40px}*/
-                /*text-indent: 30px;
-                padding: 0 10px;*/
-            }
-            table{margin: 0 auto;width:85% !important;}
-            table td{border-width: 2px !important;}
     </style>
+    <div class="top">
+        <div class="top-content">
+            <h1>{{ d.dutyIndexLibParentName }}</h1>
+            <p>{{ d.dutyIndexLibName }}</p>
+            <span class="close">返回</span>
+        </div>
+    </div>
+    <div class="main">
+        <div class="container">
+            <div class="title">
+                {{ d.dutyTitle }}
+            </div>
+            <div class="time">
+                <span>上报时间：{{ d.gmtCreate }}</span>
+                <span>上报人：{{ d.creatorName }}</span>
+            </div>
+            <div class="content">
                 <table style="height: 500px">
+                    <colgroup>
+                        <col width="5.5%">
+                        <col width="7%">
+                        <col width="5.5%">
+                        <col width="7%">
+                        <col width="5.5%">
+                        <col width="7%">
+                        <col width="5.5%">
+                        <col width="7%">
+                    </colgroup>
                     <!--<tr>-->
                     <!--<td class="title" colspan="6">{{ d.dutyTitle }}</td>-->
                     <!--</tr>-->
                     <tr>
                         <td class="tableTitle">上报类型</td>
-                <td class="tableTitle" colspan="4">{{ d.talkTypeName }}</td>
+                        <td class="tableTitle" colspan="3">{{ d.talkTypeName }}</td>
                         <td class="tableTitle">单位名称</td>
                         <td class="tableTitle" colspan="3">{{ d.orgName}}</td>
                     </tr>
@@ -67,11 +81,11 @@
                         <td class="tableTitle">政治面貌</td>
                         <td class="tableTitle" colspan="2">{{ d.politicalStatus}}</td>
                         <td class="tableTitle">单位职务</td>
-                <td class="tableTitle" colspan="2">{{ d.orgJob}}</td>
+                        <td class="tableTitle">{{ d.orgJob}}</td>
                     </tr>
                     <tr>
                         <td class="tableTitle">谈话原因</td>
-                <td class="tableTitle" colspan="8" style="height: 100px">{{ d.talkReason}}</td>
+                        <td class="tableTitle" colspan="7" style="height: 100px">{{ d.talkReason}}</td>
                     </tr>
                     <tr>
                         <td class="tableTitle">谈话人1</td>
@@ -81,7 +95,7 @@
                         <td class="tableTitle">谈话时间1</td>
                         <td class="details">{{ d.talkDateTime}}</td>
                         <td class="tableTitle">谈话地点1</td>
-                <td class="tableTitle"  colspan="2">{{ d.talkPlace}}</td>
+                        <td class="tableTitle">{{ d.talkPlace}}</td>
                     </tr>
                     <tr>
                         <td class="tableTitle">谈话人2</td>
@@ -91,19 +105,19 @@
                         <td class="tableTitle">谈话时间2</td>
                         <td class="details">{{ d.talkDateTime2}}</td>
                         <td class="tableTitle">谈话地点2</td>
-                <td class="tableTitle"  colspan="2">{{ d.talkPlace2}}</td>
+                        <td class="tableTitle">{{ d.talkPlace2}}</td>
                     </tr>
                     <tr>
-                <td class="title">记录人</td>
+                        <td>记录人</td>
-                <td class="title" colspan="8">{{ d.noteTaker}}</td>
+                        <td colspan="7">{{ d.noteTaker}}</td>
                     </tr>
                     <tr>
                         <td class="tableTitle">谈心谈话内容</td>
-                <td class="tableTitle" style="height: 100px"  colspan="8">{{ d.talkContent}}</td>
+                        <td class="tableTitle" style="height: 100px"  colspan="7">{{ d.talkContent}}</td>
                     </tr>
                     <tr>
                         <td class="tableTitle">谈心谈话对象意见</td>
-                <td class="tableTitle" style="height: 100px"  colspan="8">{{ d.talkObjOpinion}}</td>
+                        <td class="tableTitle" style="height: 100px"  colspan="7">{{ d.talkObjOpinion}}</td>
                     </tr>
                     <tr>
                         <td class="tableTitle">签字</td>
@@ -119,11 +133,12 @@
                             </div>
                         </td>
                         <td class="tableTitle">签字时间</td>
-                <td class="tableTitle" colspan="4">{{ d.signDataTime}}</td>
+                        <td class="tableTitle" colspan="3">{{ d.signDataTime}}</td>
                     </tr>
-
                 </table>
             </div>
+        </div>
+    </div>
 </script>
 
 
@@ -205,7 +220,7 @@
 
 
 
-        $('.close').on('click', function() {
+        $(document).on('click','.close',function () {
             closeBox();
         });
         $('.print').on('click', function() {

src/main/resources/static/route/indexgeneral/print.html

@@ -44,45 +44,47 @@
     </style>
 </head>
 <body style="background: #eee">
-<div class="main" id="main">
+<div id="main">
 
 </div>
 
 <script id="data" type="text/html">
     <style>
         *{margin:0;padding:0;}
-        .main{width: 1000px;min-height:1200px;margin: 0 auto;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden;box-shadow: 0 0 10px #ccc}
+        body{background: #f2f2f2}
-        .title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
+        .top{background: url("assets/web/images/top.png") no-repeat center;background-size: 1920px 320px;height:320px;padding-top: 100px;box-sizing: border-box;position: relative;}
-        .title h3{font-size: 32px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
+        .top-content{width: 1000px;margin: 0 auto;}
-        .title p{font-size: 15px;color: #333;}
+        .top-content span{display: block;position: absolute;bottom: -60px;right: 20px;background: #004acd;color: #fff;cursor: pointer;line-height: 40px;width:60px;text-align: center}
-        .title p span{margin-right: 50px}
+        .top-content h1{font-size: 40px;color: #fff;text-shadow: 0 0 10px #EEE;margin-bottom: 10px;}
-        .content{min-height: 500px;margin-top: 10px;}
+        .top-content p{font-size: 18px;color: #fff;}
-        .content p{font-size: 20px;color: #333;margin-bottom: 30px;line-height: 40px;}
+        .main{overflow:hidden;width:1000px;background: #fff;border-top-right-radius: 10px;border-top-left-radius: 10px;min-height: 800px;margin: -50px auto 0;position: relative;}
-        .button-box{position: fixed;top:20px;right: 40px;}
+        .container{width: 1017px;height: 100%;overflow-y: auto;padding: 50px 100px;box-sizing: border-box;}
-        .button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
+        .title{text-align: center;font-size: 28px;color: #1f5781;line-height: 45px;font-weight: bold;}
-        table{margin: 0 auto;width:85% !important;}
+        .time{font-size: 14px;color: #333;text-align: center;margin-top: 20px;line-height: 30px;background: #eee}
-        table td{border-width: 2px !important;}
+        .time span{margin-right: 50px;}
+        .time span:last-child{margin-right: 0}
+        .content p{font-size: 16px !important;line-height: 40px !important;}
+        table{margin: 0 auto;width:100% !important;}
+        table td{border-width: 1px !important;}
     </style>
+    <div class="top">
+        <div class="top-content">
+            <h1>{{ d.dutyIndexLibParentName }}</h1>
+            <p>{{ d.dutyIndexLibName }}</p>
+            <span class="close">返回</span>
+        </div>
+    </div>
+    <div class="main">
+        <div class="container">
             <div class="title">
-        <h3>{{ d.indexGeneralTitle }}</h3>
+                {{ d.indexGeneralTitle }}
-        <p>
+            </div>
+            <div class="time">
                 <span>上报时间：{{ d.gmtCreate }}</span>
                 <span>上报人：{{ d.creatorName }}</span>
-        </p>
             </div>
             <div class="content">
-        {{# if(d.imagesList.length > 0) { }}
+                {{ d.indexGeneralContent }}
-            <div class="swiper-container">
-                <div class="swiper-wrapper" id="indexGeneralImagesFileBox">
-                    {{#  layui.each(d.imagesList, function(index, item){ }}
-                        <div class="swiper-slide"><img src="route/file/download/false/{{item.fileId}}" align="加载失败"></div>
-                    {{#  }); }}
-                </div>
-                <div class="swiper-pagination"></div>
-            </div>
-        {{# } }}
-
-        <p>{{ d.indexGeneralContent }}</p>
             </div>
             {{#  layui.each(d.filesList, function(index, item){ }}
             <span class="layui-btn-group">
@@ -112,12 +114,12 @@
                 </div>
             </span>
             {{#  }); }}
+        </div>
+    </div>
+
 </script>
 
-<div class="button-box">
+
-    <button class="print" style="display:none;">打印</button>
-    <button class="close">返回</button>
-</div>
 <script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
 <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
@@ -238,7 +240,8 @@
 
 
 
-        $('.close').on('click', function() {
+
+        $(document).on('click','.close',function () {
             closeBox();
         });
         $('.print').on('click', function() {

src/main/resources/static/route/indexgeneraltwo/print.html

@@ -15,42 +15,52 @@
 <body>
 
 
-<div class="main" id="main">
+<div id="main">
 
 </div>
 <script id="data" type="text/html">
     <style>
         *{margin:0;padding:0;}
-        .main{width: 1000px;min-height:1200px;margin: 0 auto;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden;box-shadow: 0 0 10px #ccc}
+        body{background: #f2f2f2}
-        .title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
+        .top{background: url("assets/web/images/top.png") no-repeat center;background-size: 1920px 320px;height:320px;padding-top: 100px;box-sizing: border-box;position: relative;}
-        .title h3{font-size: 32px;color: #1f5781;margin-bottom: 10px;font-weight: bolder;}
+        .top-content{width: 1000px;margin: 0 auto;}
-        .title p{font-size: 15px;color: #333;}
+        .top-content span{display: block;position: absolute;bottom: -60px;right: 20px;background: #004acd;color: #fff;cursor: pointer;line-height: 40px;width:60px;text-align: center}
-        .title p span{margin-right: 50px}
+        .top-content h1{font-size: 40px;color: #fff;text-shadow: 0 0 10px #EEE;margin-bottom: 10px;}
-        .content{min-height: 500px;margin-top: 10px;}
+        .top-content p{font-size: 18px;color: #fff;}
-        .content p{font-size: 20px;color: #333;line-height: 40px;}
+        .main{overflow:hidden;width:1000px;background: #fff;border-top-right-radius: 10px;border-top-left-radius: 10px;min-height: 800px;margin: -50px auto 0;position: relative;}
-        .button-box{position: fixed;top:20px;right: 40px;}
+        .container{width: 1017px;height: 100%;overflow-y: auto;padding: 50px 100px;box-sizing: border-box;}
-        .button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
+        .title{text-align: center;font-size: 28px;color: #1f5781;line-height: 45px;font-weight: bold;}
-        table{margin: 0 auto;width:85% !important;}
+        .time{font-size: 14px;color: #333;text-align: center;margin-top: 20px;line-height: 30px;background: #eee}
-        table td{border-width: 2px !important;}
+        .time span{margin-right: 50px;}
+        .time span:last-child{margin-right: 0}
+        .content p{font-size: 16px !important;line-height: 40px !important;}
+        table{margin: 0 auto;width:100% !important;}
+        table td{border-width: 1px !important;}
     </style>
+    <div class="top">
+        <div class="top-content">
+            <h1>{{ d.dutyIndexLibParentName }}</h1>
+            <p>{{ d.dutyIndexLibName }}</p>
+            <span class="close">返回</span>
+        </div>
+    </div>
+    <div class="main">
+        <div class="container">
             <div class="title">
-        <h3>{{ d.indexGeneralTitle }}</h3>
+                {{ d.indexGeneralTitle }}
-        <p>
+            </div>
+            <div class="time">
                 <span>上报时间：{{ d.gmtCreate }}</span>
                 <span>上报人：{{ d.creatorName }}</span>
-        </p>
             </div>
             <div class="content">
-        <p>{{ d.indexGeneralContent }}</p>
+                {{ d.indexGeneralContent }}
+            </div>
+        </div>
     </div>
 
 </script>
 
-
-<div class="button-box">
-    <button class="print" style="display:none;">打印</button>
-    <button class="close">返回</button>
-</div>
 <script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
 <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
@@ -112,11 +122,14 @@
             }
         }
 
-
+        $(document).on('click','.close',function () {
-
-        $('.close').on('click', function() {
             closeBox();
         });
+
+
+       /* $('.close').on('click', function() {
+
+        });*/
         $('.print').on('click', function() {
             $("#main").jqprint({
                 debug: false,  //是否显示iframe查看效果

src/main/resources/static/route/partycleanmeeting/print-party-clean-meeting.html

@@ -48,7 +48,7 @@
 
 </head>
 <body>
-<div class="main" id="main">
+<div id="main">
 
 
 
@@ -62,41 +62,40 @@
 <script id="data" type="text/html">
     <style>
         *{margin:0;padding:0;}
-        .main{width: 1000px;min-height:1200px;margin: 0 auto;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden;box-shadow: 0 0 10px #ccc}
+        body{background: #f2f2f2}
-        .title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
+        .top{background: url("assets/web/images/top.png") no-repeat center;background-size: 1920px 320px;height:320px;padding-top: 100px;box-sizing: border-box;position: relative;}
-        .title h3{font-size: 32px;color: #1f5781;margin-bottom: 10px;font-weight: bolder;}
+        .top-content{width: 1000px;margin: 0 auto;}
-        .title p{font-size: 15px;color: #333;}
+        .top-content span{display: block;position: absolute;bottom: -60px;right: 20px;background: #004acd;color: #fff;cursor: pointer;line-height: 40px;width:60px;text-align: center}
-        .content{min-height: 500px;margin-top: 10px;}
+        .top-content h1{font-size: 40px;color: #fff;text-shadow: 0 0 10px #EEE;margin-bottom: 10px;}
-        .content p{font-size: 20px;color: #000;line-height:40px;}
+        .top-content p{font-size: 18px;color: #fff;}
-        .title p span{margin-right: 50px}
+        .main{overflow:hidden;width:1000px;background: #fff;border-top-right-radius: 10px;border-top-left-radius: 10px;min-height: 800px;margin: -50px auto 0;position: relative;}
-        .button-box{position: fixed;top:20px;right: 40px;}
+        .container{width: 1017px;height: 100%;overflow-y: auto;padding: 50px 100px;box-sizing: border-box;}
-        .button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
+        .title{text-align: center;font-size: 28px;color: #1f5781;line-height: 45px;font-weight: bold;}
+        .time{font-size: 14px;color: #333;text-align: center;margin-top: 20px;line-height: 30px;background: #eee}
+        .time span{margin-right: 50px;}
+        .time span:last-child{margin-right: 0}
+        .content p{font-size: 16px !important;line-height: 40px !important;}
         .moretext {text-indent: 2em}
-        table{margin: 0 auto;width:85% !important;}
+        table{margin: 0 auto;width:100% !important;}
-        table td{border-width: 2px !important;}
+        table td{border-width: 1px !important;}
     </style>
+    <div class="top">
+        <div class="top-content">
+            <h1>{{ d.dutyIndexLibParentName }}</h1>
+            <p>{{ d.dutyIndexLibName }}</p>
+            <span class="close">返回</span>
+        </div>
+    </div>
+    <div class="main">
+        <div class="container">
             <div class="title">
-        <h3>{{ d.title}}</h3>
+                {{ d.title }}
-        <p>
+            </div>
+            <div class="time">
                 <span>上报时间：{{ d.gmtCreate }}</span>
                 <span>上报人：{{ d.creatorName }}</span>
-
-        </p>
             </div>
-    {{# if(d.imagesList.length > 0) { }}
-        <div class="swiper-container">
-            <div class="swiper-wrapper" id="indexGeneralImagesFileBox">
-                {{#  layui.each(d.imagesList, function(index, item){ }}
-                <div class="swiper-slide"><img src="route/file/download/false/{{item.fileId}}" align="加载失败"></div>
-                {{#  }); }}
-            </div>
-            <!-- 如果需要分页器 -->
-            <div class="swiper-pagination"></div>
-
-        </div>
-    {{# } }}
             <div class="content">
-       <!-- <p>会议标题：{{ d.title }}</p>-->
                 <p>会议时间：{{ d.meetingTime }}</p>
                 <p>会议地点：{{ d.meetingPlace  }}</p>
                 <p>记录人：{{ d.noteTaker }}</p>
@@ -107,12 +106,11 @@
                 <p>(党委会纪要、党委书记讲话内容)</p>
                 <p class="moretext">{{ d.partySecretaryTalk }}</p>
             </div>
+        </div>
+    </div>
 </script>
 
-<div class="button-box">
+
-    <button class="print" style="display:none;">打印</button>
-    <button class="close">返回</button>
-</div>
 <script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
 <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
@@ -228,7 +226,7 @@
         }
 
 
-        $('.close').on('click', function() {
+        $(document).on('click','.close',function () {
             closeBox();
         });
         $('.print').on('click', function() {

src/main/resources/static/route/partycommitteemeeting/print.html

@@ -44,50 +44,48 @@
     </style>
 </head>
 <body>
-<div class="main" id="main">
+<div id="main">
 
 </div>
 <script id="data" type="text/html">
     <style>
         *{margin:0;padding:0;}
-        .main{width: 1000px;min-height:1200px;margin: 0 auto;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden;box-shadow: 0 0 10px #ccc}
+        body{background: #f2f2f2}
-        .title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
+        .top{background: url("assets/web/images/top.png") no-repeat center;background-size: 1920px 320px;height:320px;padding-top: 100px;box-sizing: border-box;position: relative;}
-        .title h3{font-size: 32px;color: #1f5781;margin-bottom: 10px;font-weight: bolder;}
+        .top-content{width: 1000px;margin: 0 auto;}
-        .title p{font-size: 16px;color: #333;}
+        .top-content span{display: block;position: absolute;bottom: -60px;right: 20px;background: #004acd;color: #fff;cursor: pointer;line-height: 40px;width:60px;text-align: center}
-        .title p span{margin-right: 50px}
+        .top-content h1{font-size: 40px;color: #fff;text-shadow: 0 0 10px #EEE;margin-bottom: 10px;}
-        .content{min-height: 500px;margin-top: 10px;}
+        .top-content p{font-size: 18px;color: #fff;}
-        .content p{font-size: 20px;color: #333;line-height: 40px;}
+        .main{overflow:hidden;width:1000px;background: #fff;border-top-right-radius: 10px;border-top-left-radius: 10px;min-height: 800px;margin: -50px auto 0;position: relative;}
-        .button-box{position: fixed;top:20px;right: 40px;}
+        .container{width: 1017px;height: 100%;overflow-y: auto;padding: 50px 100px;box-sizing: border-box;}
-        .button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
+        .title{text-align: center;font-size: 28px;color: #1f5781;line-height: 45px;font-weight: bold;}
-        table{margin: 0 auto;width:85% !important;}
+        .time{font-size: 14px;color: #333;text-align: center;margin-top: 20px;line-height: 30px;background: #eee}
-        table td{border-width: 2px !important;}
+        .time span{margin-right: 50px;}
+        .time span:last-child{margin-right: 0}
+        .content p{font-size: 16px !important;line-height: 40px !important;}
+        table{margin: 0 auto;width:100% !important;}
+        table td{border-width: 1px !important;}
     </style>
+    <div class="top">
+        <div class="top-content">
+            <h1>{{ d.dutyIndexLibParentName }}</h1>
+            <p>{{ d.dutyIndexLibName }}</p>
+
+            <span class="close">返回</span>
+        </div>
+    </div>
+    <div class="main">
+        <div class="container">
             <div class="title">
-        <h3>{{ d.partyCommitteeMeetingTitle }}</h3>
+                {{ d.partyCommitteeMeetingTitle }}
-        <p>
+            </div>
+            <div class="time">
                 <span>上报时间：{{ d.gmtCreate }}</span>
                 <span>上报人：{{ d.creatorName }}</span>
                 <span>上报类型：{{ d.partyCommitteeMeetingTypeName }}</span>
-        </p>
             </div>
             <div class="content">
-        {{# if(d.imagesList.length > 0) { }}
+                {{ d.partyCommitteeMeetingContent }}
-        <div class="swiper-container">
-            <div class="swiper-wrapper" id="indexGeneralImagesFileBox">
-                {{#  layui.each(d.imagesList, function(index, item){ }}
-                <div class="swiper-slide"><img src="route/file/download/false/{{item.fileId}}" align="加载失败"></div>
-                {{#  }); }}
-            </div>
-            <!-- 如果需要分页器 -->
-            <div class="swiper-pagination"></div>
-            <!-- 如果需要导航按钮 -->
-            <!--<div class="swiper-button-prev"></div>-->
-            <!--<div class="swiper-button-next"></div>-->
-            <!-- 如果需要滚动条 -->
-            <div class="swiper-scrollbar"></div>
-        </div>
-        {{# } }}
-        <p>{{ d.partyCommitteeMeetingContent }}</p>
             </div>
             {{#  layui.each(d.filesList, function(index, item){ }}
             <span class="layui-btn-group">
@@ -117,19 +115,12 @@
                 </div>
             </span>
             {{#  }); }}
-
+        </div>
-
+    </div>
-
 </script>
 
 
 
-
-
-<div class="button-box">
-    <button class="print" style="display:none;">打印</button>
-    <button class="close">返回</button>
-</div>
 <script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
 <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
@@ -245,7 +236,7 @@
 
 
 
-        $('.close').on('click', function() {
+        $(document).on('click','.close',function () {
             closeBox();
         });
 

src/main/resources/static/route/partypunishinfo/print.html

@@ -13,33 +13,29 @@
 
 </head>
 <body>
-<div class="main" id="main">
+<div id="main">
 
 </div>
 <script id="data" type="text/html">
-    <div class="title">
-        <h3>{{ d.dutyIndexLibName }}</h3>
-        <p>
-            <span>上报时间：{{ d.gmtCreate }}</span>
-            <span>上报人：{{ d.creatorName }}</span>
-        </p>
-    </div>
-    <div class="table-box">
     <style>
         *{margin:0;padding:0;}
-            .main{width: 1000px;min-height:1200px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden;box-shadow: 0 0 10px #ccc}
+        body{background: #f2f2f2}
-
+        .top{background: url("assets/web/images/top.png") no-repeat center;background-size: 1920px 320px;height:320px;padding-top: 100px;box-sizing: border-box;position: relative;}
-            .title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
+        .top-content{width: 1000px;margin: 0 auto;}
-            .title h3{font-size: 32px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
+        .top-content span{display: block;position: absolute;bottom: -60px;right: 20px;background: #004acd;color: #fff;cursor: pointer;line-height: 40px;width:60px;text-align: center}
-            .title p{font-size: 15px;color: #333;}
+        .top-content h1{font-size: 40px;color: #fff;text-shadow: 0 0 10px #EEE;margin-bottom: 10px;}
-            .title p span{margin-right: 50px}
+        .top-content p{font-size: 18px;color: #fff;}
-
+        .main{overflow:hidden;width:1000px;background: #fff;border-top-right-radius: 10px;border-top-left-radius: 10px;min-height: 800px;margin: -50px auto 0;position: relative;}
-            .tableTitle{text-align: center;font-size: 24px;line-height: 40px}
+        .container{width: 1017px;height: 100%;overflow-y: auto;padding: 50px 100px;box-sizing: border-box;}
-            .table-box{margin: 10px 0;}
+        .title{text-align: center;font-size: 28px;color: #1f5781;line-height: 45px;font-weight: bold;}
-            .table-box table{table-layout: fixed;width: 100%;border-collapse: collapse;}
+        .time{font-size: 14px;color: #333;text-align: center;margin-top: 20px;line-height: 30px;background: #eee}
-            .table-box table td{height: 40px;font-size: 16px;border: 1px solid #161615;text-align: center;}
+        .time span{margin-right: 50px;}
-            .button-box{position: fixed;top:20px;right: 40px;}
+        .time span:last-child{margin-right: 0}
-            .button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
+        .content{font-size: 16px !important;line-height: 40px !important;margin-top: 20px;}
+        table{margin: 0 auto;width:100% !important;table-layout: fixed;width:100%;}
+        table td{border: 2px solid #ccc!important;}
+        table td:nth-child(odd){text-align: center}
+        /*table td{font-size: 16px;border: 1px solid #161615;text-align: center;}*/
         .title{
             text-align: center;
         }
@@ -48,10 +44,33 @@
             /*text-indent: 30px;*/
             padding: 0 10px;
         }
-            table{margin: 0 auto;width:85% !important;}
-            table td{border-width: 2px !important;}
     </style>
+    <div class="top">
+        <div class="top-content">
+            <h1>{{ d.dutyIndexLibParentName }}</h1>
+            <p>{{ d.dutyIndexLibName }}</p>
+            <span class="close">返回</span>
+        </div>
+    </div>
+    <div class="main">
+        <div class="container">
+            <div class="title">
+                {{ d.dutyIndexLibName }}
+            </div>
+            <div class="time">
+                <span>上报时间：{{ d.gmtCreate }}</span>
+                <span>上报人：{{ d.creatorName }}</span>
+            </div>
+            <div class="content">
                 <table style="height: 500px">
+                    <colgroup>
+                        <col width="12%">
+                        <col width="21%">
+                        <col width="12%">
+                        <col width="21%">
+                        <col width="12%">
+                        <col width="22%">
+                    </colgroup>
                     <!--<tr>
                         <td class="title" colspan="6" style="height: 50px">{{ d.dutyTitle }}</td>
                     </tr>-->
@@ -108,13 +127,12 @@
 
                 </table>
             </div>
+        </div>
+    </div>
+
 </script>
 
 
-<div class="button-box">
-    <button class="print" style="display:none;">打印</button>
-    <button class="close">返回</button>
-</div>
 <script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
 <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
@@ -186,7 +204,7 @@
 
 
 
-        $('.close').on('click', function() {
+        $(document).on('click','.close',function () {
             closeBox();
         });
 

src/main/resources/static/route/problemclue/print.html

@@ -14,46 +14,62 @@
 
 </head>
 <body>
-<div class="main" id="main">
+<div id="main">
 
 
 </div>
 <script id="data" type="text/html">
-    <div class="title">
-        <h3>{{ d.dutyTitle }}</h3>
-        <p>
-            <span>上报时间：{{ d.gmtCreate }}</span>
-            <span>上报人：{{ d.creatorName }}</span>
-        </p>
-    </div>
-    <div class="table-box">
     <style>
         *{margin:0;padding:0;}
-            .main{width: 1000px;min-height:1200px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden;box-shadow: 0 0 10px #ccc}
+        body{background: #f2f2f2}
-
+        .top{background: url("assets/web/images/top.png") no-repeat center;background-size: 1920px 320px;height:320px;padding-top: 100px;box-sizing: border-box;position: relative;}
-            .title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
+        .top-content{width: 1000px;margin: 0 auto;}
-            .title h3{font-size: 32px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
+        .top-content span{display: block;position: absolute;bottom: -60px;right: 20px;background: #004acd;color: #fff;cursor: pointer;line-height: 40px;width:60px;text-align: center}
-            .title p{font-size: 15px;color: #333;}
+        .top-content h1{font-size: 40px;color: #fff;text-shadow: 0 0 10px #EEE;margin-bottom: 10px;}
-            .title p span{margin-right: 50px}
+        .top-content p{font-size: 18px;color: #fff;}
-
+        .main{overflow:hidden;width:1000px;background: #fff;border-top-right-radius: 10px;border-top-left-radius: 10px;min-height: 800px;margin: -50px auto 0;position: relative;}
-            .tableTitle{text-align: center;font-size: 40px;line-height: 38px}
+        .container{width: 1017px;height: 100%;overflow-y: auto;padding: 50px 100px;box-sizing: border-box;}
-            .table-box{margin: 10px 0;}
+        .title{text-align: center;font-size: 28px;color: #1f5781;line-height: 45px;font-weight: bold;}
-            .table-box table{table-layout: fixed;width: 100%;border-collapse: collapse;}
+        .time{font-size: 14px;color: #333;text-align: center;margin-top: 20px;line-height: 30px;background: #eee}
-            .table-box table td{height: 40px;font-size: 16px;border: 1px solid #161615;}
+        .time span{margin-right: 50px;}
-            .button-box{position: fixed;top:20px;right: 40px;}
+        .time span:last-child{margin-right: 0}
-            .button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
+        .content{margin-top: 20px;}
-            .title{
+        .content p{font-size: 16px !important;line-height: 40px !important;}
-                text-align: center;
+        table{margin: 0 auto;width:100% !important;table-layout: fixed;width: 100%;}
-            }
+        table td{border: 2px solid #CCC! important;}
+        table td:nth-child(odd){text-align: center}
         .details{
             text-align: left;
             text-indent: 30px;
             padding: 0 10px;
         }
-            table{margin: 0 auto;width:85% !important;}
-            table td{border-width: 2px !important;}
     </style>
+    <div class="top">
+        <div class="top-content">
+            <h1>{{ d.dutyIndexLibParentName }}</h1>
+            <p>{{ d.dutyIndexLibName }}</p>
+            <span class="close">返回</span>
+        </div>
+    </div>
+    <div class="main">
+        <div class="container">
+            <div class="title">
+                {{ d.dutyTitle }}
+            </div>
+            <div class="time">
+                <span>上报时间：{{ d.gmtCreate }}</span>
+                <span>上报人：{{ d.creatorName }}</span>
+            </div>
+            <div class="content">
                 <table style="height: 500px">
+                    <colgroup>
+                        <col width="12%">
+                        <col width="21%">
+                        <col width="12%">
+                        <col width="21%">
+                        <col width="12%">
+                        <col width="22%">
+                    </colgroup>
                     <!--<tr>-->
                     <!--<td colspan="4"></td>-->
                     <!--</tr>-->
@@ -66,11 +82,11 @@
                         <td class="details" style="height: 60px">{{ d.handoverNumber }}</td>
                     </tr>
                     <tr>
-                <td class="title">反映人</td>
+                        <td>反映人</td>
                         <td class="details" style="height: 60px">{{ d.reportPerson }}</td>
-                <td class="title">被反映人</td>
+                        <td>被反映人</td>
                         <td class="details" style="height: 60px">{{ d.beReportedPerson }}</td>
-                <td class="title">单位职务</td>
+                        <td>单位职务</td>
                         <td class="details" style="height: 60px">{{ d.orgJob }}</td>
                     </tr>
                     <tr>
@@ -134,7 +150,8 @@
                         <td class="details" colspan="5" style="height: 100px">{{ d.remarks }}</td>
                     </tr>
                 </table>
-
+            </div>
+        </div>
     </div>
 
 
@@ -215,9 +232,10 @@
 
 
 
-        $('.close').on('click', function() {
+        $(document).on('click','.close',function () {
             closeBox();
         });
+
         $('.print').on('click', function() {
 
 

src/main/resources/static/route/supervisecheck/print.html

@@ -48,63 +48,58 @@
 
 </head>
 <body>
-<div class="main" id="main">
+<div id="main">
 
 
 </div>
 
 <script id="data" type="text/html">
-    <div class="title">
-        <h3>{{ d.dutyIndexLibName }}</h3>
-        <p>
-            <span>上报时间：{{ d.gmtCreate }}</span>
-            <span>上报人：{{ d.creatorName }}</span>
-        </p>
-    </div>
-    <div class="table-box">
     <style>
         *{margin:0;padding:0;}
-            .main{width: 1000px;min-height:1200px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden;box-shadow: 0 0 10px #ccc}
+        body{background: #f2f2f2}
-
+        .top{background: url("assets/web/images/top.png") no-repeat center;background-size: 1920px 320px;height:320px;padding-top: 100px;box-sizing: border-box;position: relative;}
-
+        .top-content{width: 1000px;margin: 0 auto;}
-            .title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
+        .top-content span{display: block;position: absolute;bottom: -60px;right: 20px;background: #004acd;color: #fff;cursor: pointer;line-height: 40px;width:60px;text-align: center}
-            .title h3{font-size: 32px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
+        .top-content h1{font-size: 40px;color: #fff;text-shadow: 0 0 10px #EEE;margin-bottom: 10px;}
-            .title p{font-size: 15px;color: #333;}
+        .top-content p{font-size: 18px;color: #fff;}
-            .title p span{margin-right: 50px}
+        .main{overflow:hidden;width:1000px;background: #fff;border-top-right-radius: 10px;border-top-left-radius: 10px;min-height: 800px;margin: -50px auto 0;position: relative;}
-            .tableTitle{text-align: center;font-size: 40px;line-height: 38px}
+        .container{width: 1017px;height: 100%;overflow-y: auto;padding: 50px 100px;box-sizing: border-box;}
-            .table-box{margin: 10px 0;}
+        .title{text-align: center;font-size: 28px;color: #1f5781;line-height: 45px;font-weight: bold;}
-            .table-box table{table-layout: fixed;width: 100%;border-collapse: collapse;}
+        .time{font-size: 14px;color: #333;text-align: center;margin-top: 20px;line-height: 30px;background: #eee}
-            .table-box table td{height: 40px;font-size: 16px;border: 1px solid #161615;text-align: center;}
+        .time span{margin-right: 50px;}
-            .button-box{position: fixed;top:20px;right: 40px;}
+        .time span:last-child{margin-right: 0}
-            .button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
+        .content{margin-top: 20px;}
-            .title{
+        .content p{font-size: 16px !important;line-height: 40px !important;}
-                text-align: center;
+        table{margin: 0 auto;width:100% !important;table-layout: fixed;width: 100%;}
-            }
+        table td{border: 2px solid #CCC! important;}
-            .details{
+        table td:nth-child(odd){text-align: center}
-                text-align: left;
-                /*text-indent: 30px;*/
-                padding: 0 10px;
-            }
-            table{margin: 0 auto;width:85% !important;}
-            table td{border-width: 2px !important;}
     </style>
+    <div class="top">
+        <div class="top-content">
+            <h1>{{ d.dutyIndexLibParentName }}</h1>
+            <p>{{ d.dutyIndexLibName }}</p>
+            <span class="close">返回</span>
+        </div>
+    </div>
+    <div class="main">
+        <div class="container">
+            <div class="title">
+                {{ d.dutyIndexLibName }}
+            </div>
+            <div class="time">
+                <span>上报时间：{{ d.gmtCreate }}</span>
+                <span>上报人：{{ d.creatorName }}</span>
+            </div>
+            <div class="content">
                 <table style="height: 500px">
-            {{# if(d.imagesList.length > 0) { }}
+                    <colgroup>
-            <div class="swiper-container">
+                        <col width="12%">
-                <div class="swiper-wrapper" id="indexGeneralImagesFileBox">
+                        <col width="21%">
-                    {{#  layui.each(d.imagesList, function(index, item){ }}
+                        <col width="12%">
-                    <div class="swiper-slide"><img style="height: 100%;width: 100% " src="route/file/download/false/{{item.fileId}}" align="加载失败"></div>
+                        <col width="21%">
-                    {{#  }); }}
+                        <col width="12%">
-                </div>
+                        <col width="22%">
-                <!-- 如果需要分页器 -->
+                    </colgroup>
-                <div class="swiper-pagination"></div>
-                <!-- 如果需要导航按钮 -->
-                <!--<div class="swiper-button-prev"></div>-->
-                <!--<div class="swiper-button-next"></div>-->
-                <!-- 如果需要滚动条 -->
-                <div class="swiper-scrollbar"></div>
-            </div>
-            {{# } }}
                     <tr>
                         <td class="tableTitle">检查地点</td>
                         <td class="details" style="height: 60px">{{ d.checkPlace }}</td>
@@ -131,13 +126,14 @@
                     </tr>
                 </table>
             </div>
+        </div>
+    </div>
+
+
 
 
 </script>
-<div class="button-box">
+
-    <button class="print" style="display:none;">打印</button>
-    <button class="close">返回</button>
-</div>
 
 <script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
 <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
@@ -247,7 +243,7 @@
 
 
 
-        $('.close').on('click', function() {
+        $(document).on('click','.close',function () {
             closeBox();
         });
         $('.print').on('click', function() {

src/main/resources/static/route/web/detail.html

@@ -66,7 +66,7 @@
     <div class="detail" v-cloak>
         <div class="news-title">
             <h2>{{newsDetail.articleContentTitle}}</h2>
-            <p>发布单位：{{newsDetail.articleContentAuthor}}　　发布时间：{{newsDetail.articleContentPublishTime}}</p>
+            <p>来源：{{newsDetail.articleContentSource}}　　发布时间：{{newsDetail.articleContentPublishTime}}</p>
         </div>
         <div class="news-detail" v-html="newsDetail.articleContentContent"></div>
     </div>

src/main/resources/static/route/web/public.html

@@ -467,8 +467,8 @@
                 var self = this
                 layer.open({
                     type: 2,
-                    title: false,
+                    title: '上报信息',
-                    closeBtn: true,
+                    closeBtn: false,
                     area: ['80%', '80%'],
                     shadeClose: true,
                     anim: 2,

src/main/resources/templates/articlecontent/save.html

@@ -83,7 +83,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">文章作者</label>
                             <div class="layui-input-block">
-                                <input type="text" id="articleContentAuthor" name="articleContentAuthor" class="layui-input" value="" placeholder="请输入文章作者"  maxlength="255" lay-verify="required">
+                                <input type="text" id="articleContentAuthor" name="articleContentAuthor" class="layui-input" value="" placeholder="请输入文章作者"  maxlength="255">
                             </div>
                         </div>
                     </div>

src/main/resources/templates/articlecontent/type/save-type.html

@@ -68,7 +68,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">文章作者</label>
                             <div class="layui-input-block">
-                                <input type="text" id="articleContentAuthor" name="articleContentAuthor" class="layui-input" value="" placeholder="请输入文章作者"  maxlength="255" lay-verify="required">
+                                <input type="text" id="articleContentAuthor" name="articleContentAuthor" class="layui-input" value="" placeholder="请输入文章作者"  maxlength="255">
                             </div>
                         </div>
                     </div>

src/main/resources/templates/articlecontent/type/update-type.html

@@ -68,7 +68,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">文章作者</label>
                             <div class="layui-input-block">
-                                <input type="text" id="articleContentAuthor" name="articleContentAuthor" class="layui-input" value="" placeholder="请输入文章作者"  maxlength="255" lay-verify="required">
+                                <input type="text" id="articleContentAuthor" name="articleContentAuthor" class="layui-input" value="" placeholder="请输入文章作者"  maxlength="255">
                             </div>
                         </div>
                     </div>

src/main/resources/templates/articlecontent/update.html

@@ -83,7 +83,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">文章作者</label>
                             <div class="layui-input-block">
-                                <input type="text" id="articleContentAuthor" name="articleContentAuthor" class="layui-input" value="" placeholder="请输入文章作者"  maxlength="255" lay-verify="required">
+                                <input type="text" id="articleContentAuthor" name="articleContentAuthor" class="layui-input" value="" placeholder="请输入文章作者"  maxlength="255">
                             </div>
                         </div>
                     </div>