支部园地风采台账、首页先进风采轮播、支部园地宣传台账

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchDemeanorController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.branch;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.branch.domain.TBranchDemeanor;
+import com.ruoyi.branch.service.ITBranchDemeanorService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 支部园地风采Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-27
+ */
+@RestController
+@RequestMapping("/branch/demeanor")
+public class TBranchDemeanorController extends BaseController
+{
+    @Autowired
+    private ITBranchDemeanorService tBranchDemeanorService;
+
+    /**
+     * 查询支部园地风采列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:demeanor:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBranchDemeanor tBranchDemeanor)
+    {
+        startPage();
+        List<TBranchDemeanor> list = tBranchDemeanorService.selectTBranchDemeanorList(tBranchDemeanor);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出支部园地风采列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:demeanor:export')")
+    @Log(title = "支部园地风采", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchDemeanor tBranchDemeanor)
+    {
+        List<TBranchDemeanor> list = tBranchDemeanorService.selectTBranchDemeanorList(tBranchDemeanor);
+        ExcelUtil<TBranchDemeanor> util = new ExcelUtil<TBranchDemeanor>(TBranchDemeanor.class);
+        util.exportExcel(response, list, "支部园地风采数据");
+    }
+
+    /**
+     * 获取支部园地风采详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:demeanor:query')")
+    @GetMapping(value = "/{demeanorId}")
+    public AjaxResult getInfo(@PathVariable("demeanorId") Long demeanorId)
+    {
+        return success(tBranchDemeanorService.selectTBranchDemeanorByDemeanorId(demeanorId));
+    }
+
+    /**
+     * 新增支部园地风采
+     */
+    @PreAuthorize("@ss.hasPermi('branch:demeanor:add')")
+    @Log(title = "支部园地风采", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchDemeanor tBranchDemeanor)
+    {
+        tBranchDemeanor.setCreateBy(getUsername());
+        return toAjax(tBranchDemeanorService.insertTBranchDemeanor(tBranchDemeanor));
+    }
+
+    /**
+     * 修改支部园地风采
+     */
+    @PreAuthorize("@ss.hasPermi('branch:demeanor:edit')")
+    @Log(title = "支部园地风采", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchDemeanor tBranchDemeanor)
+    {
+        return toAjax(tBranchDemeanorService.updateTBranchDemeanor(tBranchDemeanor));
+    }
+
+    /**
+     * 删除支部园地风采
+     */
+    @PreAuthorize("@ss.hasPermi('branch:demeanor:remove')")
+    @Log(title = "支部园地风采", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{demeanorIds}")
+    public AjaxResult remove(@PathVariable Long[] demeanorIds)
+    {
+        return toAjax(tBranchDemeanorService.deleteTBranchDemeanorByDemeanorIds(demeanorIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchPublicizeController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.branch;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.branch.domain.TBranchPublicize;
+import com.ruoyi.branch.service.ITBranchPublicizeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 支部园地宣传Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-27
+ */
+@RestController
+@RequestMapping("/branch/publicize")
+public class TBranchPublicizeController extends BaseController
+{
+    @Autowired
+    private ITBranchPublicizeService tBranchPublicizeService;
+
+    /**
+     * 查询支部园地宣传列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:publicize:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBranchPublicize tBranchPublicize)
+    {
+        startPage();
+        List<TBranchPublicize> list = tBranchPublicizeService.selectTBranchPublicizeList(tBranchPublicize);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出支部园地宣传列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:publicize:export')")
+    @Log(title = "支部园地宣传", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchPublicize tBranchPublicize)
+    {
+        List<TBranchPublicize> list = tBranchPublicizeService.selectTBranchPublicizeList(tBranchPublicize);
+        ExcelUtil<TBranchPublicize> util = new ExcelUtil<TBranchPublicize>(TBranchPublicize.class);
+        util.exportExcel(response, list, "支部园地宣传数据");
+    }
+
+    /**
+     * 获取支部园地宣传详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:publicize:query')")
+    @GetMapping(value = "/{publicizeId}")
+    public AjaxResult getInfo(@PathVariable("publicizeId") Long publicizeId)
+    {
+        return success(tBranchPublicizeService.selectTBranchPublicizeByPublicizeId(publicizeId));
+    }
+
+    /**
+     * 新增支部园地宣传
+     */
+    @PreAuthorize("@ss.hasPermi('branch:publicize:add')")
+    @Log(title = "支部园地宣传", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchPublicize tBranchPublicize)
+    {
+        tBranchPublicize.setCreateBy(getUsername());
+        return toAjax(tBranchPublicizeService.insertTBranchPublicize(tBranchPublicize));
+    }
+
+    /**
+     * 修改支部园地宣传
+     */
+    @PreAuthorize("@ss.hasPermi('branch:publicize:edit')")
+    @Log(title = "支部园地宣传", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchPublicize tBranchPublicize)
+    {
+        return toAjax(tBranchPublicizeService.updateTBranchPublicize(tBranchPublicize));
+    }
+
+    /**
+     * 删除支部园地宣传
+     */
+    @PreAuthorize("@ss.hasPermi('branch:publicize:remove')")
+    @Log(title = "支部园地宣传", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{publicizeIds}")
+    public AjaxResult remove(@PathVariable Long[] publicizeIds)
+    {
+        return toAjax(tBranchPublicizeService.deleteTBranchPublicizeByPublicizeIds(publicizeIds));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/branch/domain/TBranchDemeanor.java

@@ -0,0 +1,117 @@
+package com.ruoyi.branch.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 支部园地风采对象 t_branch_demeanor
+ * 
+ * @author ruoyi
+ * @date 2023-07-27
+ */
+public class TBranchDemeanor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @Excel(name = "主键id")
+    private Long demeanorId;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String demeanorTitle;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String demeanorContent;
+
+    /** 是否置顶（1是 0否） */
+    @Excel(name = "是否置顶", readConverterExp = "1=是,0=否")
+    private String isPinned;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setDemeanorId(Long demeanorId) 
+    {
+        this.demeanorId = demeanorId;
+    }
+
+    public Long getDemeanorId() 
+    {
+        return demeanorId;
+    }
+
+    public void setDemeanorTitle(String demeanorTitle) 
+    {
+        this.demeanorTitle = demeanorTitle;
+    }
+
+    public String getDemeanorTitle() 
+    {
+        return demeanorTitle;
+    }
+
+    public void setDemeanorContent(String demeanorContent) 
+    {
+        this.demeanorContent = demeanorContent;
+    }
+
+    public String getDemeanorContent() 
+    {
+        return demeanorContent;
+    }
+
+    public void setIsPinned(String isPinned) 
+    {
+        this.isPinned = isPinned;
+    }
+
+    public String getIsPinned() 
+    {
+        return isPinned;
+    }
+
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("demeanorId", getDemeanorId())
+            .append("demeanorTitle", getDemeanorTitle())
+            .append("demeanorContent", getDemeanorContent())
+            .append("isPinned", getIsPinned())
+            .append("deptId", getDeptId())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/branch/domain/TBranchPublicize.java

@@ -0,0 +1,117 @@
+package com.ruoyi.branch.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 支部园地宣传对象 t_branch_publicize
+ * 
+ * @author ruoyi
+ * @date 2023-07-27
+ */
+public class TBranchPublicize extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @Excel(name = "主键id")
+    private Long publicizeId;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String publicizeTitle;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String publicizeContent;
+
+    /** 是否置顶（1是 0否） */
+    @Excel(name = "是否置顶", readConverterExp = "1=是,0=否")
+    private String isPinned;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setPublicizeId(Long publicizeId) 
+    {
+        this.publicizeId = publicizeId;
+    }
+
+    public Long getPublicizeId() 
+    {
+        return publicizeId;
+    }
+
+    public void setPublicizeTitle(String publicizeTitle) 
+    {
+        this.publicizeTitle = publicizeTitle;
+    }
+
+    public String getPublicizeTitle() 
+    {
+        return publicizeTitle;
+    }
+
+    public void setPublicizeContent(String publicizeContent) 
+    {
+        this.publicizeContent = publicizeContent;
+    }
+
+    public String getPublicizeContent() 
+    {
+        return publicizeContent;
+    }
+
+    public void setIsPinned(String isPinned) 
+    {
+        this.isPinned = isPinned;
+    }
+
+    public String getIsPinned() 
+    {
+        return isPinned;
+    }
+
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("publicizeId", getPublicizeId())
+            .append("publicizeTitle", getPublicizeTitle())
+            .append("publicizeContent", getPublicizeContent())
+            .append("isPinned", getIsPinned())
+            .append("deptId", getDeptId())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/branch/mapper/TBranchDemeanorMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchDemeanor;
+
+/**
+ * 支部园地风采Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-27
+ */
+public interface TBranchDemeanorMapper 
+{
+    /**
+     * 查询支部园地风采
+     * 
+     * @param demeanorId 支部园地风采主键
+     * @return 支部园地风采
+     */
+    public TBranchDemeanor selectTBranchDemeanorByDemeanorId(Long demeanorId);
+
+    /**
+     * 查询支部园地风采列表
+     * 
+     * @param tBranchDemeanor 支部园地风采
+     * @return 支部园地风采集合
+     */
+    public List<TBranchDemeanor> selectTBranchDemeanorList(TBranchDemeanor tBranchDemeanor);
+
+    /**
+     * 新增支部园地风采
+     * 
+     * @param tBranchDemeanor 支部园地风采
+     * @return 结果
+     */
+    public int insertTBranchDemeanor(TBranchDemeanor tBranchDemeanor);
+
+    /**
+     * 修改支部园地风采
+     * 
+     * @param tBranchDemeanor 支部园地风采
+     * @return 结果
+     */
+    public int updateTBranchDemeanor(TBranchDemeanor tBranchDemeanor);
+
+    /**
+     * 删除支部园地风采
+     * 
+     * @param demeanorId 支部园地风采主键
+     * @return 结果
+     */
+    public int deleteTBranchDemeanorByDemeanorId(Long demeanorId);
+
+    /**
+     * 批量删除支部园地风采
+     * 
+     * @param demeanorIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchDemeanorByDemeanorIds(Long[] demeanorIds);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/mapper/TBranchPublicizeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchPublicize;
+
+/**
+ * 支部园地宣传Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-27
+ */
+public interface TBranchPublicizeMapper 
+{
+    /**
+     * 查询支部园地宣传
+     * 
+     * @param publicizeId 支部园地宣传主键
+     * @return 支部园地宣传
+     */
+    public TBranchPublicize selectTBranchPublicizeByPublicizeId(Long publicizeId);
+
+    /**
+     * 查询支部园地宣传列表
+     * 
+     * @param tBranchPublicize 支部园地宣传
+     * @return 支部园地宣传集合
+     */
+    public List<TBranchPublicize> selectTBranchPublicizeList(TBranchPublicize tBranchPublicize);
+
+    /**
+     * 新增支部园地宣传
+     * 
+     * @param tBranchPublicize 支部园地宣传
+     * @return 结果
+     */
+    public int insertTBranchPublicize(TBranchPublicize tBranchPublicize);
+
+    /**
+     * 修改支部园地宣传
+     * 
+     * @param tBranchPublicize 支部园地宣传
+     * @return 结果
+     */
+    public int updateTBranchPublicize(TBranchPublicize tBranchPublicize);
+
+    /**
+     * 删除支部园地宣传
+     * 
+     * @param publicizeId 支部园地宣传主键
+     * @return 结果
+     */
+    public int deleteTBranchPublicizeByPublicizeId(Long publicizeId);
+
+    /**
+     * 批量删除支部园地宣传
+     * 
+     * @param publicizeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchPublicizeByPublicizeIds(Long[] publicizeIds);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/ITBranchDemeanorService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchDemeanor;
+
+/**
+ * 支部园地风采Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-27
+ */
+public interface ITBranchDemeanorService 
+{
+    /**
+     * 查询支部园地风采
+     * 
+     * @param demeanorId 支部园地风采主键
+     * @return 支部园地风采
+     */
+    public TBranchDemeanor selectTBranchDemeanorByDemeanorId(Long demeanorId);
+
+    /**
+     * 查询支部园地风采列表
+     * 
+     * @param tBranchDemeanor 支部园地风采
+     * @return 支部园地风采集合
+     */
+    public List<TBranchDemeanor> selectTBranchDemeanorList(TBranchDemeanor tBranchDemeanor);
+
+    /**
+     * 新增支部园地风采
+     * 
+     * @param tBranchDemeanor 支部园地风采
+     * @return 结果
+     */
+    public int insertTBranchDemeanor(TBranchDemeanor tBranchDemeanor);
+
+    /**
+     * 修改支部园地风采
+     * 
+     * @param tBranchDemeanor 支部园地风采
+     * @return 结果
+     */
+    public int updateTBranchDemeanor(TBranchDemeanor tBranchDemeanor);
+
+    /**
+     * 批量删除支部园地风采
+     * 
+     * @param demeanorIds 需要删除的支部园地风采主键集合
+     * @return 结果
+     */
+    public int deleteTBranchDemeanorByDemeanorIds(Long[] demeanorIds);
+
+    /**
+     * 删除支部园地风采信息
+     * 
+     * @param demeanorId 支部园地风采主键
+     * @return 结果
+     */
+    public int deleteTBranchDemeanorByDemeanorId(Long demeanorId);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/ITBranchPublicizeService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchPublicize;
+
+/**
+ * 支部园地宣传Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-27
+ */
+public interface ITBranchPublicizeService 
+{
+    /**
+     * 查询支部园地宣传
+     * 
+     * @param publicizeId 支部园地宣传主键
+     * @return 支部园地宣传
+     */
+    public TBranchPublicize selectTBranchPublicizeByPublicizeId(Long publicizeId);
+
+    /**
+     * 查询支部园地宣传列表
+     * 
+     * @param tBranchPublicize 支部园地宣传
+     * @return 支部园地宣传集合
+     */
+    public List<TBranchPublicize> selectTBranchPublicizeList(TBranchPublicize tBranchPublicize);
+
+    /**
+     * 新增支部园地宣传
+     * 
+     * @param tBranchPublicize 支部园地宣传
+     * @return 结果
+     */
+    public int insertTBranchPublicize(TBranchPublicize tBranchPublicize);
+
+    /**
+     * 修改支部园地宣传
+     * 
+     * @param tBranchPublicize 支部园地宣传
+     * @return 结果
+     */
+    public int updateTBranchPublicize(TBranchPublicize tBranchPublicize);
+
+    /**
+     * 批量删除支部园地宣传
+     * 
+     * @param publicizeIds 需要删除的支部园地宣传主键集合
+     * @return 结果
+     */
+    public int deleteTBranchPublicizeByPublicizeIds(Long[] publicizeIds);
+
+    /**
+     * 删除支部园地宣传信息
+     * 
+     * @param publicizeId 支部园地宣传主键
+     * @return 结果
+     */
+    public int deleteTBranchPublicizeByPublicizeId(Long publicizeId);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/impl/TBranchDemeanorServiceImpl.java

@@ -0,0 +1,99 @@
+package com.ruoyi.branch.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.branch.mapper.TBranchDemeanorMapper;
+import com.ruoyi.branch.domain.TBranchDemeanor;
+import com.ruoyi.branch.service.ITBranchDemeanorService;
+
+/**
+ * 支部园地风采Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-07-27
+ */
+@Service
+public class TBranchDemeanorServiceImpl implements ITBranchDemeanorService 
+{
+    @Autowired
+    private TBranchDemeanorMapper tBranchDemeanorMapper;
+
+    /**
+     * 查询支部园地风采
+     * 
+     * @param demeanorId 支部园地风采主键
+     * @return 支部园地风采
+     */
+    @Override
+    public TBranchDemeanor selectTBranchDemeanorByDemeanorId(Long demeanorId)
+    {
+        return tBranchDemeanorMapper.selectTBranchDemeanorByDemeanorId(demeanorId);
+    }
+
+    /**
+     * 查询支部园地风采列表
+     * 
+     * @param tBranchDemeanor 支部园地风采
+     * @return 支部园地风采
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TBranchDemeanor> selectTBranchDemeanorList(TBranchDemeanor tBranchDemeanor)
+    {
+        return tBranchDemeanorMapper.selectTBranchDemeanorList(tBranchDemeanor);
+    }
+
+    /**
+     * 新增支部园地风采
+     * 
+     * @param tBranchDemeanor 支部园地风采
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchDemeanor(TBranchDemeanor tBranchDemeanor)
+    {
+        tBranchDemeanor.setCreateTime(DateUtils.getNowDate());
+        return tBranchDemeanorMapper.insertTBranchDemeanor(tBranchDemeanor);
+    }
+
+    /**
+     * 修改支部园地风采
+     * 
+     * @param tBranchDemeanor 支部园地风采
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchDemeanor(TBranchDemeanor tBranchDemeanor)
+    {
+        tBranchDemeanor.setUpdateTime(DateUtils.getNowDate());
+        return tBranchDemeanorMapper.updateTBranchDemeanor(tBranchDemeanor);
+    }
+
+    /**
+     * 批量删除支部园地风采
+     * 
+     * @param demeanorIds 需要删除的支部园地风采主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchDemeanorByDemeanorIds(Long[] demeanorIds)
+    {
+        return tBranchDemeanorMapper.deleteTBranchDemeanorByDemeanorIds(demeanorIds);
+    }
+
+    /**
+     * 删除支部园地风采信息
+     * 
+     * @param demeanorId 支部园地风采主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchDemeanorByDemeanorId(Long demeanorId)
+    {
+        return tBranchDemeanorMapper.deleteTBranchDemeanorByDemeanorId(demeanorId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/impl/TBranchPublicizeServiceImpl.java

@@ -0,0 +1,99 @@
+package com.ruoyi.branch.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.branch.mapper.TBranchPublicizeMapper;
+import com.ruoyi.branch.domain.TBranchPublicize;
+import com.ruoyi.branch.service.ITBranchPublicizeService;
+
+/**
+ * 支部园地宣传Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-07-27
+ */
+@Service
+public class TBranchPublicizeServiceImpl implements ITBranchPublicizeService 
+{
+    @Autowired
+    private TBranchPublicizeMapper tBranchPublicizeMapper;
+
+    /**
+     * 查询支部园地宣传
+     * 
+     * @param publicizeId 支部园地宣传主键
+     * @return 支部园地宣传
+     */
+    @Override
+    public TBranchPublicize selectTBranchPublicizeByPublicizeId(Long publicizeId)
+    {
+        return tBranchPublicizeMapper.selectTBranchPublicizeByPublicizeId(publicizeId);
+    }
+
+    /**
+     * 查询支部园地宣传列表
+     * 
+     * @param tBranchPublicize 支部园地宣传
+     * @return 支部园地宣传
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TBranchPublicize> selectTBranchPublicizeList(TBranchPublicize tBranchPublicize)
+    {
+        return tBranchPublicizeMapper.selectTBranchPublicizeList(tBranchPublicize);
+    }
+
+    /**
+     * 新增支部园地宣传
+     * 
+     * @param tBranchPublicize 支部园地宣传
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchPublicize(TBranchPublicize tBranchPublicize)
+    {
+        tBranchPublicize.setCreateTime(DateUtils.getNowDate());
+        return tBranchPublicizeMapper.insertTBranchPublicize(tBranchPublicize);
+    }
+
+    /**
+     * 修改支部园地宣传
+     * 
+     * @param tBranchPublicize 支部园地宣传
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchPublicize(TBranchPublicize tBranchPublicize)
+    {
+        tBranchPublicize.setUpdateTime(DateUtils.getNowDate());
+        return tBranchPublicizeMapper.updateTBranchPublicize(tBranchPublicize);
+    }
+
+    /**
+     * 批量删除支部园地宣传
+     * 
+     * @param publicizeIds 需要删除的支部园地宣传主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchPublicizeByPublicizeIds(Long[] publicizeIds)
+    {
+        return tBranchPublicizeMapper.deleteTBranchPublicizeByPublicizeIds(publicizeIds);
+    }
+
+    /**
+     * 删除支部园地宣传信息
+     * 
+     * @param publicizeId 支部园地宣传主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchPublicizeByPublicizeId(Long publicizeId)
+    {
+        return tBranchPublicizeMapper.deleteTBranchPublicizeByPublicizeId(publicizeId);
+    }
+}

ruoyi-system/src/main/resources/mapper/branch/TBranchDemeanorMapper.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.branch.mapper.TBranchDemeanorMapper">
+    
+    <resultMap type="TBranchDemeanor" id="TBranchDemeanorResult">
+        <result property="demeanorId"    column="demeanor_id"    />
+        <result property="demeanorTitle"    column="demeanor_title"    />
+        <result property="demeanorContent"    column="demeanor_content"    />
+        <result property="isPinned"    column="is_pinned"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectTBranchDemeanorVo">
+        select u.demeanor_id, u.demeanor_title, u.demeanor_content, u.is_pinned, u.dept_id, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time from t_branch_demeanor u left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTBranchDemeanorList" parameterType="TBranchDemeanor" resultMap="TBranchDemeanorResult">
+        <include refid="selectTBranchDemeanorVo"/>
+        <where>  
+            <if test="demeanorId != null "> and u.demeanor_id = #{demeanorId}</if>
+            <if test="demeanorTitle != null  and demeanorTitle != ''"> and u.demeanor_title like concat(concat('%', #{demeanorTitle}), '%')</if>
+            <if test="demeanorContent != null  and demeanorContent != ''"> and u.demeanor_content like concat(concat('%', #{demeanorContent}), '%')</if>
+            <if test="isPinned != null  and isPinned != ''"> and u.is_pinned = #{isPinned}</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            and u.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTBranchDemeanorByDemeanorId" parameterType="Long" resultMap="TBranchDemeanorResult">
+        <include refid="selectTBranchDemeanorVo"/>
+        where u.demeanor_id = #{demeanorId}
+        and u.del_flag = 0
+    </select>
+        
+    <insert id="insertTBranchDemeanor" parameterType="TBranchDemeanor">
+        <selectKey keyProperty="demeanorId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_demeanor.NEXTVAL as demeanorId FROM DUAL
+        </selectKey>
+        insert into t_branch_demeanor
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="demeanorId != null">demeanor_id,</if>
+            <if test="demeanorTitle != null and demeanorTitle != ''">demeanor_title,</if>
+            <if test="demeanorContent != null">demeanor_content,</if>
+            <if test="isPinned != null">is_pinned,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="demeanorId != null">#{demeanorId},</if>
+            <if test="demeanorTitle != null and demeanorTitle != ''">#{demeanorTitle},</if>
+            <if test="demeanorContent != null">#{demeanorContent},</if>
+            <if test="isPinned != null">#{isPinned},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBranchDemeanor" parameterType="TBranchDemeanor">
+        update t_branch_demeanor
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="demeanorTitle != null and demeanorTitle != ''">demeanor_title = #{demeanorTitle},</if>
+            <if test="demeanorContent != null">demeanor_content = #{demeanorContent},</if>
+            <if test="isPinned != null">is_pinned = #{isPinned},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where demeanor_id = #{demeanorId}
+    </update>
+
+    <update id="deleteTBranchDemeanorByDemeanorId" parameterType="Long">
+        update t_branch_demeanor set del_flag = 2 where demeanor_id = #{demeanorId}
+    </update>
+
+    <update id="deleteTBranchDemeanorByDemeanorIds" parameterType="String">
+        update t_branch_demeanor set del_flag = 2 where demeanor_id in
+        <foreach item="demeanorId" collection="array" open="(" separator="," close=")">
+            #{demeanorId}
+        </foreach>
+    </update>
+</mapper>

ruoyi-system/src/main/resources/mapper/branch/TBranchPublicizeMapper.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.branch.mapper.TBranchPublicizeMapper">
+    
+    <resultMap type="TBranchPublicize" id="TBranchPublicizeResult">
+        <result property="publicizeId"    column="publicize_id"    />
+        <result property="publicizeTitle"    column="publicize_title"    />
+        <result property="publicizeContent"    column="publicize_content"    />
+        <result property="isPinned"    column="is_pinned"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectTBranchPublicizeVo">
+        select u.publicize_id, u.publicize_title, u.publicize_content, u.is_pinned, u.dept_id, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time from t_branch_publicize u left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTBranchPublicizeList" parameterType="TBranchPublicize" resultMap="TBranchPublicizeResult">
+        <include refid="selectTBranchPublicizeVo"/>
+        <where>  
+            <if test="publicizeId != null "> and u.publicize_id = #{publicizeId}</if>
+            <if test="publicizeTitle != null  and publicizeTitle != ''"> and u.publicize_title like concat(concat('%', #{publicizeTitle}), '%')</if>
+            <if test="publicizeContent != null  and publicizeContent != ''"> and u.publicize_content like concat(concat('%', #{publicizeContent}), '%')</if>
+            <if test="isPinned != null  and isPinned != ''"> and u.is_pinned = #{isPinned}</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            and u.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTBranchPublicizeByPublicizeId" parameterType="Long" resultMap="TBranchPublicizeResult">
+        <include refid="selectTBranchPublicizeVo"/>
+        where u.publicize_id = #{publicizeId}
+        and u.del_flag = 0
+    </select>
+        
+    <insert id="insertTBranchPublicize" parameterType="TBranchPublicize">
+        <selectKey keyProperty="publicizeId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_publicize.NEXTVAL as publicizeId FROM DUAL
+        </selectKey>
+        insert into t_branch_publicize
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="publicizeId != null">publicize_id,</if>
+            <if test="publicizeTitle != null and publicizeTitle != ''">publicize_title,</if>
+            <if test="publicizeContent != null">publicize_content,</if>
+            <if test="isPinned != null">is_pinned,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="publicizeId != null">#{publicizeId},</if>
+            <if test="publicizeTitle != null and publicizeTitle != ''">#{publicizeTitle},</if>
+            <if test="publicizeContent != null">#{publicizeContent},</if>
+            <if test="isPinned != null">#{isPinned},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBranchPublicize" parameterType="TBranchPublicize">
+        update t_branch_publicize
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="publicizeTitle != null and publicizeTitle != ''">publicize_title = #{publicizeTitle},</if>
+            <if test="publicizeContent != null">publicize_content = #{publicizeContent},</if>
+            <if test="isPinned != null">is_pinned = #{isPinned},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where publicize_id = #{publicizeId}
+    </update>
+
+    <update id="deleteTBranchPublicizeByPublicizeId" parameterType="Long">
+        update t_branch_publicize set del_flag = 2 where publicize_id = #{publicizeId}
+    </update>
+
+    <update id="deleteTBranchPublicizeByPublicizeIds" parameterType="String">
+        update t_branch_publicize set del_flag = 2 where publicize_id in
+        <foreach item="publicizeId" collection="array" open="(" separator="," close=")">
+            #{publicizeId}
+        </foreach>
+    </update>
+</mapper>

ruoyi-ui/src/api/branch/demeanor.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询支部园地风采列表
+export function listDemeanor(query) {
+  return request({
+    url: '/branch/demeanor/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支部园地风采详细
+export function getDemeanor(demeanorId) {
+  return request({
+    url: '/branch/demeanor/' + demeanorId,
+    method: 'get'
+  })
+}
+
+// 新增支部园地风采
+export function addDemeanor(data) {
+  return request({
+    url: '/branch/demeanor',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改支部园地风采
+export function updateDemeanor(data) {
+  return request({
+    url: '/branch/demeanor',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除支部园地风采
+export function delDemeanor(demeanorId) {
+  return request({
+    url: '/branch/demeanor/' + demeanorId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/branch/publicize.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询支部园地宣传列表
+export function listPublicize(query) {
+  return request({
+    url: '/branch/publicize/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支部园地宣传详细
+export function getPublicize(publicizeId) {
+  return request({
+    url: '/branch/publicize/' + publicizeId,
+    method: 'get'
+  })
+}
+
+// 新增支部园地宣传
+export function addPublicize(data) {
+  return request({
+    url: '/branch/publicize',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改支部园地宣传
+export function updatePublicize(data) {
+  return request({
+    url: '/branch/publicize',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除支部园地宣传
+export function delPublicize(publicizeId) {
+  return request({
+    url: '/branch/publicize/' + publicizeId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/branch/zbfc/demeanor/index.vue

@@ -0,0 +1,500 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="demeanorTitle">
+        <el-input
+          v-model="queryParams.demeanorTitle"
+          placeholder="请输入标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['branch:demeanor:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['branch:demeanor:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['branch:demeanor:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['branch:demeanor:edit']"
+        >导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['branch:demeanor:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="demeanorList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="demeanorId" width="80" />
+      <el-table-column
+        label="标题"
+        align="center"
+        prop="demeanorTitle"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.isPinned == 1">已置顶</el-tag>
+          {{scope.row.demeanorTitle}}
+        </template>
+      </el-table-column>
+      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-select"
+            @click="handlePin (scope.row)"
+            v-if="scope.row.isPinned == 0"
+            v-hasPermi="['system:demeanor:edit']"
+          >置顶</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-select"
+            @click="handlePin (scope.row)"
+            v-if="scope.row.isPinned == 1"
+            v-hasPermi="['system:demeanor:edit']"
+          >取消置顶</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-select"
+            @click="handleSelect (scope.row)"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['branch:demeanor:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['branch:demeanor:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改支部园地风采对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="demeanorTitle">
+          <el-input v-model="form.demeanorTitle" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="内容">
+          <editor v-model="form.demeanorContent" :min-height="192"/>
+        </el-form-item>
+          <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+        <el-upload
+                ref="upload"
+                :limit="1"
+                accept=".xlsx, .xls"
+                :headers="upload.headers"
+                :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                :disabled="upload.isUploading"
+                :on-progress="handleFileUploadProgress"
+                :on-success="handleFileSuccess"
+                :auto-upload="false"
+                drag
+        >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">
+                将文件拖到此处，或
+                <em>点击上传</em>
+            </div>
+            <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+            </div>
+            <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+    </el-dialog>
+    <!-- 查看对话框 -->
+    <el-dialog v-dialogDrag :title="title" :visible.sync="checkView" width="780px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="标题" prop="demeanorTitle">
+              <el-input v-model="form.demeanorTitle" placeholder="请输入标题" v-bind:disabled="check"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="check">
+            <el-form-item label="内容">
+              <p v-html="form.demeanorContent" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDemeanor, getDemeanor, delDemeanor, addDemeanor, updateDemeanor, exportDemeanor, importTemplate} from "@/api/branch/demeanor";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Editor from '@/components/Editor';
+
+export default {
+  name: "Demeanor",
+  components: { Treeselect },
+  // components: { Editor },
+  data() {
+    return {
+      checkView: false,
+      check: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 支部园地风采表格数据
+      demeanorList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/branch/demeanor/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        demeanorId: null,
+        demeanorTitle: null,
+        demeanorContent: null,
+        isPinned: null,
+        deptId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deptId: [
+          { required: true, message: "归属部门不能为空", trigger: "blur" }
+        ],
+        demeanorTitle: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查看 **/
+    handleSelect(row) {
+      this.reset();
+      const demeanorId = row.demeanorId || this.ids
+      getDemeanor(demeanorId).then(response => {
+        this.form = response.data;
+        this.checkView = true;
+        this.check= true;
+        this.title = '查看支部园地风采';
+      });
+    },
+    /** 处理置顶 */
+    handlePin(row) {
+      let demeanor = row;
+      if (demeanor.isPinned == 0) {
+        this.$confirm('是否确认置顶编号为 '+ ' '+demeanor.demeanorId+ ' 的数据项?', '警告', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          demeanor.isPinned = 1;
+          updateDemeanor(demeanor).then(() => {
+            this.$modal.msgSuccess('置顶成功');
+            this.getList();
+          });
+        })
+      } else {
+        this.$confirm('是否确认取消置顶编号为 '+ ' '+demeanor.demeanorId+ ' 的数据项?', '警告', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          demeanor.isPinned = 0;
+          updateDemeanor(demeanor).then(() => {
+            this.$modal.msgSuccess('取消置顶成功');
+            this.getList();
+          });
+        })
+      }
+    },
+    /** 查询支部园地风采列表 */
+    getList() {
+      this.loading = true;
+      listDemeanor(this.queryParams).then(response => {
+        this.demeanorList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        demeanorId: null,
+        demeanorTitle: null,
+        demeanorContent: null,
+        isPinned: null,
+        deptId: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.demeanorId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加支部园地风采";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const demeanorId = row.demeanorId || this.ids
+      getDemeanor(demeanorId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改支部园地风采";
+      });
+    },
+      /** 提交按钮 */
+      submitForm() {
+          this.$refs["form"].validate(valid => {
+              if (valid) {
+                  if (this.form.demeanorId != null) {
+                      updateDemeanor(this.form).then(response => {
+                          this.$modal.msgSuccess("修改成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  } else {
+                      addDemeanor(this.form).then(response => {
+                          this.$modal.msgSuccess("新增成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  }
+              }
+          });
+      },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const demeanorIds = row.demeanorId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delDemeanor(demeanorIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有支部园地风采数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportDemeanor(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>
+
+<style>
+    /** 文本换行符处理 */
+    .el-table .cell{
+        white-space: pre-wrap;
+    }
+    /** textarea字体 */
+    textarea {
+        font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+    }
+</style>

ruoyi-ui/src/views/branch/zbfc/publicize/index.vue

@@ -0,0 +1,445 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="publicizeTitle">
+        <el-input
+          v-model="queryParams.publicizeTitle"
+          placeholder="请输入标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['branch:publicize:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['branch:publicize:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['branch:publicize:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['branch:publicize:edit']"
+        >导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['branch:publicize:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="publicizeList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="publicizeId" width="80" />
+      <el-table-column label="标题" align="center" prop="publicizeTitle" />
+      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-select"
+            @click="handleSelect (scope.row)"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['branch:publicize:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['branch:publicize:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改支部园地宣传对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="publicizeTitle">
+          <el-input v-model="form.publicizeTitle" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="内容">
+          <editor v-model="form.publicizeContent" :min-height="192"/>
+        </el-form-item>
+          <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+        <el-upload
+                ref="upload"
+                :limit="1"
+                accept=".xlsx, .xls"
+                :headers="upload.headers"
+                :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                :disabled="upload.isUploading"
+                :on-progress="handleFileUploadProgress"
+                :on-success="handleFileSuccess"
+                :auto-upload="false"
+                drag
+        >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">
+                将文件拖到此处，或
+                <em>点击上传</em>
+            </div>
+            <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+            </div>
+            <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+    </el-dialog>
+    <!-- 查看对话框 -->
+    <el-dialog v-dialogDrag :title="title" :visible.sync="checkView" width="780px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="标题" prop="demeanorTitle">
+              <el-input v-model="form.publicizeTitle" placeholder="请输入标题" v-bind:disabled="check"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="check">
+            <el-form-item label="内容">
+              <p v-html="form.publicizeContent" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPublicize, getPublicize, delPublicize, addPublicize, updatePublicize, exportPublicize, importTemplate} from "@/api/branch/publicize";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Editor from '@/components/Editor';
+
+export default {
+  name: "Publicize",
+  components: { Treeselect },
+  // components: { Editor },
+  data() {
+    return {
+      checkView: false,
+      check: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 支部园地宣传表格数据
+      publicizeList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/branch/publicize/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        publicizeId: null,
+        publicizeTitle: null,
+        publicizeContent: null,
+        isPinned: null,
+        deptId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deptId: [
+          { required: true, message: "归属部门不能为空", trigger: "blur" }
+        ],
+        publicizeTitle: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查看 **/
+    handleSelect(row) {
+      this.reset();
+      const publicizeId = row.publicizeId || this.ids
+      getPublicize(publicizeId).then(response => {
+        this.form = response.data;
+        this.checkView = true;
+        this.check= true;
+        this.title = '查看支部园地宣传';
+      });
+    },
+    /** 查询支部园地宣传列表 */
+    getList() {
+      this.loading = true;
+      listPublicize(this.queryParams).then(response => {
+        this.publicizeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        publicizeId: null,
+        publicizeTitle: null,
+        publicizeContent: null,
+        isPinned: null,
+        deptId: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.publicizeId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加支部园地宣传";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const publicizeId = row.publicizeId || this.ids
+      getPublicize(publicizeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改支部园地宣传";
+      });
+    },
+      /** 提交按钮 */
+      submitForm() {
+          this.$refs["form"].validate(valid => {
+              if (valid) {
+                  if (this.form.publicizeId != null) {
+                      updatePublicize(this.form).then(response => {
+                          this.$modal.msgSuccess("修改成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  } else {
+                      addPublicize(this.form).then(response => {
+                          this.$modal.msgSuccess("新增成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  }
+              }
+          });
+      },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const publicizeIds = row.publicizeId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delPublicize(publicizeIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有支部园地宣传数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportPublicize(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>
+
+<style>
+    /** 文本换行符处理 */
+    .el-table .cell{
+        white-space: pre-wrap;
+    }
+    /** textarea字体 */
+    textarea {
+        font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+    }
+</style>

ruoyi-ui/src/views/dashboard/DemeanorChart.vue

@@ -0,0 +1,151 @@
+<template>
+  <div>
+    <div class="text-container" :style="{height:height,width:width}">
+      <ul class="allBirth">
+        <li v-for="(item,index) in demeanorList" class="info">
+          <span style="padding-left: 20px">{{parseTime(item.createTime, '{yyyy}-{mm}-{dd}')}}</span>
+          <span style="padding-left: 20px">{{item.demeanorTitle}}</span>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { listDemeanor } from "@/api/branch/demeanor";
+
+  const totalDuration = 2000;
+
+  export default {
+    name: "DemeanorChart",
+    props: {
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '210px'
+      }
+    },
+    data() {
+      return {
+        // 查询参数
+        queryParams: {},
+        // 先进风采列表
+        demeanorList: null,
+      }
+    },
+    created() {
+      this.listDemeanor();
+    },
+    methods: {
+      /** 查询先进风采列表 */
+      listDemeanor() {
+        this.queryParams.isPinned = 1;
+        listDemeanor(this.queryParams).then(response => {
+          this.demeanorList = response.rows;
+          //判断是否需要滚动
+          if (this.demeanorList.length > 4) {
+            //设置文字滚动一轮时间
+            let elem = document.querySelector('.allBirth');
+            let state = elem.style['animation'];
+            let time = this.demeanorList.length * 2
+            elem.style['animation'] = 'myMove ' + time + 's linear infinite';
+            let state1 = elem.style['animation-fill-mode'];
+            elem.style['animation-fill-mode'] = 'forwards';
+            //设置文字无缝滚动高度
+            let param = this.demeanorList.length * 50
+            let myFirstkeyframes = "@keyframes myMove{0% {transform: translateY(200px);}100% {transform: translateY(-" + param +"px);}}";
+            let style = document.createElement("style");
+            style.setAttribute("type", "text/css");
+            document.head.appendChild(style);
+            const sheet = style.sheet;
+            sheet.insertRule(myFirstkeyframes, 0);
+          }
+        });
+      },
+    }
+  }
+</script>
+
+<style>
+  .text-container {
+    line-height: 30px;
+    overflow: hidden;
+  }
+
+  .dangao {
+    width: 40px !important;
+    height: 40px !important;
+  }
+
+  .info {
+    font-weight:bold;
+    list-style: none;
+    display: flex;
+    margin: 10px 0 0 0;
+    align-items: center;     /* 垂直居中 */
+    border-radius:5px 5px 5px 5px ;
+    /*border: 2px solid rgba(41, 107, 155, 0.71);*/
+    background-color: transparent;
+  }
+
+  .allBirth {
+    margin: -10px 0 0 0;
+    padding: 0 20px 0 20px;
+    /*animation: myMove 10s linear infinite;
+    animation-fill-mode: forwards;*/
+  }
+
+  /*文字无缝滚动*/
+  /*@keyframes myMove {
+    0% {
+      transform: translateY(200px);
+    }
+    100% {
+      transform: translateY(-300px);
+    }
+  }*/
+
+  /*文字停顿滚动*/
+  @keyframes myMove2 {
+    0% {
+      transform: translateY(0);
+    }
+    10% {
+      transform: translateY(-30px);
+    }
+    20% {
+      transform: translateY(-30px);
+    }
+    30% {
+      transform: translateY(-60px);
+    }
+    40% {
+      transform: translateY(-60px);
+    }
+    50% {
+      transform: translateY(-90px);
+    }
+    60% {
+      transform: translateY(-90px);
+    }
+    70% {
+      transform: translateY(-120px);
+    }
+    80% {
+      transform: translateY(-120px);
+    }
+    90% {
+      transform: translateY(-150px);
+    }
+    100% {
+      transform: translateY(-150px);
+    }
+  }
+
+  .info span {
+    padding-top: 5px;
+  }
+</style>

ruoyi-ui/src/views/dashboard/NoticeChart.vue

@@ -17,7 +17,7 @@
   const totalDuration = 2000;
 
   export default {
-    name: "BrithChart",
+    name: "NoticeChart",
     props: {
       width: {
         type: String,

ruoyi-ui/src/views/index.vue

@@ -42,7 +42,7 @@
           </div>
           <div class="body">
             <div class="chart-wrapper">
-              <notice-chart />
+              <demeanor-chart />
             </div>
           </div>
         </el-card>
@@ -67,11 +67,12 @@
 
 <script>
 import BrithChart from "./dashboard/BrithChart";
+import DemeanorChart from "./dashboard/DemeanorChart";
 import NoticeChart from "./dashboard/NoticeChart";
 
 export default {
   name: "Index",
-  components: { BrithChart, NoticeChart },
+  components: { BrithChart, NoticeChart, DemeanorChart },
   data() {
     return {
       urls: [