8.16汇报后修改内容

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

@@ -53,6 +53,8 @@ public class TBranchPlanController extends BaseController
         for (TBranchPlan branchPlan : list) {
             TBranchPlanItem tBranchPlanItem = new TBranchPlanItem();
             tBranchPlanItem.setPlanId(branchPlan.getPlanId());
+            tBranchPlanItem.setItemStatus(tBranchPlan.getItemStatus());
+            tBranchPlanItem.setPersonInCharge(tBranchPlan.getPersonInCharge());
             List<TBranchPlanItem> tBranchPlanItems = tBranchPlanItemService.selectTBranchPlanItemList(tBranchPlanItem);
             branchPlan.setItemList(tBranchPlanItems);
         }

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

@@ -58,10 +58,18 @@ public class TBranchPublicizeController extends BaseController
             tFile.setTableName("branchPublicize");
             tFile.setTableId(branchPublicize.getPublicizeId());
             List<TFile> tFiles = fileService.selectTFileList(tFile);
+
+            TFile tFile2 = new TFile();
+            tFile2.setTableName("branchPub2");
+            tFile2.setTableId(branchPublicize.getPublicizeId());
+            List<TFile> tFiles2 = fileService.selectTFileList(tFile2);
+
             if (tFiles != null) {
                 TFile file = tFiles.get(0);
+                TFile file2 = tFiles2.get(0);
                 ProfilesVO vo = new ProfilesVO();
                 vo.setUrl(file.getUrl());
+                vo.setUrl2(file2.getUrl());
                 vo.setTitle(branchPublicize.getPublicizeTitle());
                 profileVOs.add(vo);
             }

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

@@ -14,10 +14,19 @@ import java.math.BigDecimal;
 public class ProfilesVO extends BaseEntity {
     /** 图片地址 */
     private String url;
+    private String url2;
 
     /** 标题 */
     private String title;
 
+    public String getUrl2() {
+        return url2;
+    }
+
+    public void setUrl2(String url2) {
+        this.url2 = url2;
+    }
+
     public String getUrl() {
         return url;
     }

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

@@ -35,9 +35,31 @@ public class TBranchPlan extends BaseEntity
     /** 所属年份 */
     private String planYear;
 
+    /** 当前状态 */
+    private String itemStatus;
+
+    /** 负责人 */
+    private String personInCharge;
+
     /** 条目 */
     private List<TBranchPlanItem> itemList;
 
+    public String getItemStatus() {
+        return itemStatus;
+    }
+
+    public void setItemStatus(String itemStatus) {
+        this.itemStatus = itemStatus;
+    }
+
+    public String getPersonInCharge() {
+        return personInCharge;
+    }
+
+    public void setPersonInCharge(String personInCharge) {
+        this.personInCharge = personInCharge;
+    }
+
     public List<TBranchPlanItem> getItemList() {
         return itemList;
     }

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

@@ -34,11 +34,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planYear != null "> and extract(year from u.plan_time) = #{planYear}</if>
             <if test="itemStatus != null  and itemStatus != ''"> and u.item_status = #{itemStatus}</if>
             <if test="actualTime != null "> and u.actual_time = #{actualTime}</if>
-            <if test="personInCharge != null  and personInCharge != ''"> and u.person_in_charge = #{personInCharge}</if>
+            <if test="personInCharge != null  and personInCharge != ''"> and u.person_in_charge like concat(concat('%', #{personInCharge}), '%')</if>
             <if test="deptId != null "> and u.dept_id = #{deptId}</if>
             and u.del_flag = 0
         </where>
-        order by u.plan_id asc
+        order by u.plan_id asc, u.plan_time asc
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>

ruoyi-ui/src/views/branch/zbjs/plan/index.vue

@@ -8,6 +8,26 @@
                         placeholder="选择年份">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="当前状态" prop="itemStatus">
+        <el-select v-model="queryParams.itemStatus" placeholder="请选择当前状态">
+          <el-option
+            v-for="dict in itemStatusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="负责人" prop="personInCharge">
+        <el-select v-model="queryParams.personInCharge" placeholder="请选择负责人">
+          <el-option
+            v-for="dict in userList"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </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>
@@ -390,6 +410,8 @@ export default {
       }).then(() => {
         return listPlan({
           "planYear": this.queryParams.planYear.getFullYear(),
+          "itemStatus": this.queryParams.itemStatus,
+          "personInCharge": this.queryParams.personInCharge,
           "deptId": this.queryParams.deptId
         });
       }).then(response => {

ruoyi-ui/src/views/branch/zbjs/zbzzjg/index.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="app-container">
     <div>
-      页面开发中
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>支部组织架构</span>
+        </div>
+        <img src="../../../../assets/images/党支部书记.png" style="max-width: 100%;height: auto; width: auto;"/>
+      </el-card>
     </div>
   </div>
 </template>

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

@@ -73,6 +73,8 @@
   .text-container {
     line-height: 30px;
     overflow: hidden;
+    background-color: rgba(255, 255, 255, 0.6);
+    padding-top: 10px;
   }
 
   .dangao {
@@ -86,9 +88,10 @@
     display: flex;
     margin: 10px 0 0 0;
     align-items: center;     /* 垂直居中 */
-    border-radius:5px 5px 5px 5px ;
+    /*border-radius:5px 5px 5px 5px ;*/
     /*border: 2px solid rgba(41, 107, 155, 0.71);*/
     background-color: transparent;
+    border-bottom: 1px dashed #C0C0C0;
   }
 
   .allBirth {

ruoyi-ui/src/views/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container home">
     <el-row :gutter="20">
-      <el-col :xs="12" :sm="12" :md="12" :lg="12">
-        <el-carousel direction="vertical" height="350px" style="margin-bottom: 20px;">
+      <el-col :xs="24" :sm="24" :md="12" :lg="8">
+        <el-carousel direction="horizontal" height="250px" style="margin-bottom: 20px;">
           <!-- 为了让走马灯在轮播图片的同时能够在上面附带文字，将走马灯组件单独放在一个 div 里
        		并且为这个 div 单独设计 css 样式 pic_item -->
           <div class="pic_item">
@@ -13,59 +13,61 @@
           </div>
         </el-carousel>
       </el-col>
-      <el-col :xs="12" :sm="12" :md="12" :lg="12">
-        <el-carousel direction="vertical" height="350px" style="margin-bottom: 20px;">
-          <div class="pic_item">
-            <el-carousel-item v-for="(item, index) in demeanorUrls" :key="index">
-              <el-image :src="item.url" style="width: 100%; height: 100%;"></el-image>
-              <h3>{{item.title}}</h3>
-            </el-carousel-item>
+      <el-col :xs="24" :sm="24" :md="12" :lg="8">
+        <div class="title">
+          <div class="logo">
+            <img src="../assets/logo/logo.png" alt="logo" />
           </div>
-        </el-carousel>
+          学习资料
+        </div>
+        <demeanor-chart />
+      </el-col>
+      <el-col :xs="24" :sm="24" :md="12" :lg="8">
+        <div class="title">
+          <div class="logo">
+            <img src="../assets/logo/logo.png" alt="logo" />
+          </div>常用下载
+        </div>
+        <demeanor-chart />
       </el-col>
+      <!--<el-col :xs="12" :sm="12" :md="12" :lg="12">-->
+        <!--<el-carousel direction="vertical" height="350px" style="margin-bottom: 20px;">-->
+          <!--<div class="pic_item">-->
+            <!--<el-carousel-item v-for="(item, index) in demeanorUrls" :key="index">-->
+              <!--<el-image :src="item.url" style="width: 100%; height: 100%;"></el-image>-->
+              <!--<h3>{{item.title}}</h3>-->
+            <!--</el-carousel-item>-->
+          <!--</div>-->
+        <!--</el-carousel>-->
+      <!--</el-col>-->
     </el-row>
     <el-row :gutter="20">
       <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card>
-          <div slot="header">
-            <span class="title">
-              公示公告
-            </span>
+        <div class="title">
+          <div class="logo">
+            <img src="../assets/logo/logo.png" alt="logo" />
           </div>
-          <div class="body">
-            <div class="chart-wrapper">
-              <notice-chart />
-            </div>
-          </div>
-        </el-card>
+          公示公告、工作提醒
+        </div>
+        <notice-chart />
       </el-col>
       <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card>
-          <div slot="header">
-            <span class="title">
-              先进风采
-            </span>
-          </div>
-          <div class="body">
-            <div class="chart-wrapper">
-              <demeanor-chart />
-            </div>
+        <div class="title">
+          <div class="logo">
+            <img src="../assets/logo/logo.png" alt="logo" />
           </div>
-        </el-card>
+          先进风采
+        </div>
+        <demeanor-chart />
       </el-col>
       <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card>
-          <div slot="header">
-            <span class="title">
-              政治生日
-            </span>
+        <div class="title">
+          <div class="logo">
+            <img src="../assets/logo/logo.png" alt="logo" />
           </div>
-          <div class="body">
-            <div class="chart-wrapper">
-              <brith-chart />
-            </div>
-          </div>
-        </el-card>
+          政治生日
+        </div>
+        <brith-chart />
       </el-col>
     </el-row>
   </div>
@@ -98,6 +100,7 @@ export default {
       for (let i = 0; i < profiles.length; i++) {
         this.publicizeUrls.push({
           "url": process.env.VUE_APP_BASE_API + profiles[i].url,
+          "url2": profiles[i].url2,
           "title": profiles[i].title
         });
       }
@@ -114,6 +117,9 @@ export default {
     });
   },
   methods: {
+    handleSee(url) {
+      window.open(process.env.VUE_APP_BASE_API + url);
+    },
   }
 };
 </script>
@@ -170,7 +176,19 @@ export default {
 }
 
 .title{
-  font-size: 18px;
+  font-size: 14px;
+  background-color: #F5222D;
+  color: white;
+  height: 32px;
+  line-height: 32px;
+  font-weight: bold;
+}
+
+.logo{
+  height: 18px;
+  width: 18px;
+  display: inline-block;
+  margin: 0px 10px 0px 10px;
 }
 
 .el-carousel__item h3 {
@@ -228,7 +246,7 @@ img{
   /* text-decoration-line: underline; */
   font-weight: 900;
   /*font-family:Georgia, 'Times New Roman', Times, serif;*/
-  font-size: 18px;
+  font-size: 14px;
   line-height: 116%;
   display: flex;
   align-items: center;