支部会议管理、支部党课学习list接口数据权限、sql修改

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

@@ -68,6 +68,10 @@ public class TBranchMeetingMgr extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
+    /** 部门ID */
+    @Excel(name = "部门编号", type = Excel.Type.IMPORT)
+    private Long deptId;
+
     public void setMeetingId(Long meetingId) 
     {
         this.meetingId = meetingId;
@@ -186,6 +190,14 @@ public class TBranchMeetingMgr extends BaseEntity
         return delFlag;
     }
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -56,6 +56,10 @@ public class TBranchStudy extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
+    /** 部门ID */
+    @Excel(name = "部门编号", type = Excel.Type.IMPORT)
+    private Long deptId;
+
     public void setStudyId(Long studyId) 
     {
         this.studyId = studyId;
@@ -147,6 +151,14 @@ public class TBranchStudy extends BaseEntity
         return delFlag;
     }
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -5,6 +5,7 @@ import java.util.List;
 import com.ruoyi.branch.domain.TBranchMeetingMgr;
 import com.ruoyi.branch.mapper.TBranchMeetingMgrMapper;
 import com.ruoyi.branch.service.ITBranchMeetingMgrService;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,6 +41,7 @@ public class TBranchMeetingMgrServiceImpl implements ITBranchMeetingMgrService
      * @return 支部会议管理
      */
     @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
     public List<TBranchMeetingMgr> selectTBranchMeetingMgrList(TBranchMeetingMgr tBranchMeetingMgr)
     {
         return tBranchMeetingMgrMapper.selectTBranchMeetingMgrList(tBranchMeetingMgr);

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

@@ -1,6 +1,8 @@
 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;
@@ -39,6 +41,7 @@ public class TBranchStudyServiceImpl implements ITBranchStudyService
      * @return 支部党课学习
      */
     @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
     public List<TBranchStudy> selectTBranchStudyList(TBranchStudy tBranchStudy)
     {
         return tBranchStudyMapper.selectTBranchStudyList(tBranchStudy);

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

@@ -22,35 +22,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="deptId"       column="dept_id"      />
     </resultMap>
 
     <sql id="selectTBranchMeetingMgrVo">
-        select meeting_id, meeting_type, meeting_time, meeting_venue, host, recorder, participants, absentees, attendees, main_topics, resolutions_formed, remarks, del_flag, create_by, create_time, update_by, update_time from t_branch_meeting_mgr
+        select
+            u.meeting_id,
+            u.meeting_type,
+            u.meeting_time,
+            u.meeting_venue,
+            u.host,
+            u.recorder,
+            u.participants,
+            u.absentees,
+            u.attendees,
+            u.main_topics,
+            u.resolutions_formed,
+            u.remarks,
+            u.del_flag,
+            u.create_by,
+            u.create_time,
+            u.update_by,
+            u.update_time,
+            u.dept_id
+        from t_branch_meeting_mgr u
+        left join sys_dept d on u.dept_id = d.dept_id
     </sql>
 
     <select id="selectTBranchMeetingMgrList" parameterType="TBranchMeetingMgr" resultMap="TBranchMeetingMgrResult">
         <include refid="selectTBranchMeetingMgrVo"/>
         <where>  
-            <if test="meetingId != null "> and meeting_id = #{meetingId}</if>
-            <if test="meetingType != null  and meetingType != ''"> and meeting_type = #{meetingType}</if>
-            <if test="meetingTime != null "> and meeting_time = #{meetingTime}</if>
-            <if test="meetingVenue != null  and meetingVenue != ''"> and meeting_venue = #{meetingVenue}</if>
-            <if test="host != null  and host != ''"> and host = #{host}</if>
-            <if test="recorder != null  and recorder != ''"> and recorder = #{recorder}</if>
-            <if test="participants != null  and participants != ''"> and participants = #{participants}</if>
-            <if test="absentees != null  and absentees != ''"> and absentees = #{absentees}</if>
-            <if test="attendees != null  and attendees != ''"> and attendees = #{attendees}</if>
-            <if test="mainTopics != null  and mainTopics != ''"> and main_topics = #{mainTopics}</if>
-            <if test="resolutionsFormed != null  and resolutionsFormed != ''"> and resolutions_formed = #{resolutionsFormed}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            and del_flag = 0
+            <if test="meetingId != null "> and u.meeting_id = #{meetingId}</if>
+            <if test="meetingType != null  and meetingType != ''"> and u.meeting_type = #{meetingType}</if>
+            <if test="meetingTime != null "> and u.meeting_time = #{meetingTime}</if>
+            <if test="meetingVenue != null  and meetingVenue != ''"> and u.meeting_venue = #{meetingVenue}</if>
+            <if test="host != null  and host != ''"> and u.host = #{host}</if>
+            <if test="recorder != null  and recorder != ''"> and u.recorder = #{recorder}</if>
+            <if test="participants != null  and participants != ''"> and u.participants = #{participants}</if>
+            <if test="absentees != null  and absentees != ''"> and u.absentees = #{absentees}</if>
+            <if test="attendees != null  and attendees != ''"> and u.attendees = #{attendees}</if>
+            <if test="mainTopics != null  and mainTopics != ''"> and u.main_topics = #{mainTopics}</if>
+            <if test="resolutionsFormed != null  and resolutionsFormed != ''"> and u.resolutions_formed = #{resolutionsFormed}</if>
+            <if test="remarks != null  and remarks != ''"> and u.remarks = #{remarks}</if>
+            <if test="deptId != null and deptId != 0">
+                AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) <![CDATA[ <> ]]> 0 )))
+            </if>
+            and u.del_flag = 0
         </where>
-        order by meeting_time desc
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by u.meeting_time desc
     </select>
     
     <select id="selectTBranchMeetingMgrByMeetingId" parameterType="Long" resultMap="TBranchMeetingMgrResult">
         <include refid="selectTBranchMeetingMgrVo"/>
-        where meeting_id = #{meetingId}
+        where u.meeting_id = #{meetingId}
+        and u.del_flag = 0
     </select>
         
     <insert id="insertTBranchMeetingMgr" parameterType="TBranchMeetingMgr">
@@ -76,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="deptId != null and deptId != 0">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="meetingId != null">#{meetingId},</if>
@@ -95,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="deptId != null and deptId != ''">#{deptId},</if>
          </trim>
     </insert>
 
@@ -117,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
         </trim>
         where meeting_id = #{meetingId}
     </update>

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

@@ -19,32 +19,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="deptId"       column="dept_id"      />
     </resultMap>
 
     <sql id="selectTBranchStudyVo">
-        select study_id, study_time, study_venue, lecturer, recorder, participants, absentees, contents, remarks, del_flag, create_by, create_time, update_by, update_time from t_branch_study
+        select
+            u.study_id,
+            u.study_time,
+            u.study_venue,
+            u.lecturer,
+            u.recorder,
+            u.participants,
+            u.absentees,
+            u.contents,
+            u.remarks,
+            u.del_flag,
+            u.create_by,
+            u.create_time,
+            u.update_by,
+            u.update_time,
+            u.dept_id
+        from t_branch_study u
+        left join sys_dept d on u.dept_id = d.dept_id
     </sql>
 
     <select id="selectTBranchStudyList" parameterType="TBranchStudy" resultMap="TBranchStudyResult">
         <include refid="selectTBranchStudyVo"/>
         <where>  
-            <if test="studyId != null "> and study_id = #{studyId}</if>
-            <if test="studyTime != null "> and study_time = #{studyTime}</if>
-            <if test="studyVenue != null  and studyVenue != ''"> and study_venue = #{studyVenue}</if>
-            <if test="lecturer != null  and lecturer != ''"> and lecturer = #{lecturer}</if>
-            <if test="recorder != null  and recorder != ''"> and recorder = #{recorder}</if>
-            <if test="participants != null  and participants != ''"> and participants = #{participants}</if>
-            <if test="absentees != null  and absentees != ''"> and absentees = #{absentees}</if>
-            <if test="contents != null  and contents != ''"> and contents = #{contents}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            and del_flag = 0
+            <if test="studyId != null "> and u.study_id = #{studyId}</if>
+            <if test="studyTime != null "> and u.study_time = #{studyTime}</if>
+            <if test="studyVenue != null  and studyVenue != ''"> and u.study_venue = #{studyVenue}</if>
+            <if test="lecturer != null  and lecturer != ''"> and u.lecturer = #{lecturer}</if>
+            <if test="recorder != null  and recorder != ''"> and u.recorder = #{recorder}</if>
+            <if test="participants != null  and participants != ''"> and u.participants = #{participants}</if>
+            <if test="absentees != null  and absentees != ''"> and u.absentees = #{absentees}</if>
+            <if test="contents != null  and contents != ''"> and u.contents = #{contents}</if>
+            <if test="remarks != null  and remarks != ''"> and u.remarks = #{remarks}</if>
+            <if test="deptId != null and deptId != 0">
+                AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) <![CDATA[ <> ]]> 0 )))
+            </if>
+            and u.del_flag = 0
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
     
     <select id="selectTBranchStudyByStudyId" parameterType="Long" resultMap="TBranchStudyResult">
         <include refid="selectTBranchStudyVo"/>
-        where study_id = #{studyId}
-        and del_flag = 0
+        where u.study_id = #{studyId}
+        and u.del_flag = 0
     </select>
         
     <insert id="insertTBranchStudy" parameterType="TBranchStudy">
@@ -67,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="deptId != null and deptId != 0">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="studyId != null">#{studyId},</if>
@@ -83,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="deptId != null and deptId != ''">#{deptId},</if>
          </trim>
     </insert>
 
@@ -102,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
         </trim>
         where study_id = #{studyId}
     </update>

ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml

@@ -24,11 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach> 
  	</delete>
 	
-	<insert id="batchRoleMenu">
-		insert into sys_role_menu(role_id, menu_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.roleId},#{item.menuId})
+	<insert id="batchRoleMenu" useGeneratedKeys="false">
+		insert all
+		<foreach item="item" index="index" collection="list">
+			into sys_role_menu(role_id, menu_id) values (#{item.roleId},#{item.menuId})
 		</foreach>
+		SELECT 1 FROM DUAL
 	</insert>
 	
 </mapper> 

ruoyi-ui/src/views/branch/meeting/index.vue

@@ -160,24 +160,16 @@
           <span>{{ parseTime(scope.row.meetingTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="地点" align="center" prop="meetingVenue">
-      </el-table-column>
-      <el-table-column label="主持人" align="center" prop="host">
-      </el-table-column>
-      <el-table-column label="记录人" align="center" prop="recorder">
-      </el-table-column>
-      <el-table-column label="参加人员" align="center" prop="participants" width="120">
-      </el-table-column>
-      <el-table-column label="缺席人员" align="center" prop="absentees">
-      </el-table-column>
-      <el-table-column label="列席人员" align="center" prop="attendees">
-      </el-table-column>
-      <el-table-column label="主要议题" align="left" prop="mainTopics" width="350">
-      </el-table-column>
-      <el-table-column label="形成决议" align="left" prop="resolutionsFormed" width="350">
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks">
-      </el-table-column>
+      <el-table-column label="地点" align="center" prop="meetingVenue"/>
+      <el-table-column label="主持人" align="center" prop="host"/>
+      <el-table-column label="记录人" align="center" prop="recorder"/>
+      <el-table-column label="参加人员" align="center" prop="participants" width="120"/>
+      <el-table-column label="缺席人员" align="center" prop="absentees"/>
+      <el-table-column label="列席人员" align="center" prop="attendees"/>
+      <el-table-column label="主要议题" align="left" prop="mainTopics" width="350"/>
+      <el-table-column label="形成决议" align="left" prop="resolutionsFormed" width="350"/>
+      <el-table-column label="备注" align="center" prop="remarks"/>
+      <el-table-column label="数据归属部门" align="center" prop="deptId"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
         <template slot-scope="scope">
           <el-button

ruoyi-ui/src/views/branch/study/index.vue

@@ -134,13 +134,14 @@
           <span>{{ parseTime(scope.row.studyTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="地点" align="center" prop="studyVenue" :formatter="studyVenueFormat" />
-      <el-table-column label="授课人" align="center" prop="lecturer" :formatter="lecturerFormat" />
-      <el-table-column label="记录人" align="center" prop="recorder" :formatter="recorderFormat" />
-      <el-table-column label="参加人员" align="center" prop="participants" :formatter="participantsFormat" width="120" />
-      <el-table-column label="缺席人员" align="center" prop="absentees" :formatter="absenteesFormat" />
-      <el-table-column label="内容" align="center" prop="contents" :formatter="contentsFormat" width="350" />
-      <el-table-column label="备注" align="center" prop="remarks" :formatter="remarksFormat" width="350" />
+      <el-table-column label="地点" align="center" prop="studyVenue" />
+      <el-table-column label="授课人" align="center" prop="lecturer" />
+      <el-table-column label="记录人" align="center" prop="recorder" />
+      <el-table-column label="参加人员" align="center" prop="participants" width="120" />
+      <el-table-column label="缺席人员" align="center" prop="absentees" />
+      <el-table-column label="内容" align="center" prop="contents" width="350" />
+      <el-table-column label="备注" align="center" prop="remarks"/>
+      <el-table-column label="数据归属部门" align="center" prop="deptId" />
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -199,7 +200,7 @@
           <el-input v-model="form.contents" placeholder="请输入内容" type="textarea" rows="4" />
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" type="textarea" rows="4" />
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -273,34 +274,6 @@ export default {
       clientHeight:300,
       // 是否显示弹出层
       open: false,
-      // 主键id字典
-      studyIdOptions: [],
-      // 时间字典
-      studyTimeOptions: [],
-      // 地点字典
-      studyVenueOptions: [],
-      // 授课人字典
-      lecturerOptions: [],
-      // 记录人字典
-      recorderOptions: [],
-      // 参加人员字典
-      participantsOptions: [],
-      // 缺席人员字典
-      absenteesOptions: [],
-      // 内容字典
-      contentsOptions: [],
-      // 备注字典
-      remarksOptions: [],
-      // 删除标志字典
-      delFlagOptions: [],
-      // 创建者字典
-      createByOptions: [],
-      // 创建时间字典
-      createTimeOptions: [],
-      // 更新者字典
-      updateByOptions: [],
-      // 更新时间字典
-      updateTimeOptions: [],
         // 用户导入参数
         upload: {
             // 是否显示弹出层（用户导入）
@@ -321,23 +294,14 @@ export default {
         pageNum: 1,
         pageSize: 20,
         studyId: null,
-
         studyTime: null,
-
         studyVenue: null,
-
         lecturer: null,
-
         recorder: null,
-
         participants: null,
-
         absentees: null,
-
         contents: null,
-
         remarks: null,
-
       },
       // 表单参数
       form: {},
@@ -346,7 +310,6 @@ export default {
         // studyId: [
         //   { required: true, message: "主键id不能为空", trigger: "blur" }
         // ],
-
       }
     };
   },
@@ -362,49 +325,7 @@ export default {
           this.clientHeight = document.body.clientHeight -250
       })
     this.getList();
-    this.getTreeselect();
-    this.getDicts("${column.dictType}").then(response => {
-      this.studyIdOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.studyTimeOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.studyVenueOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.lecturerOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.recorderOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.participantsOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.absenteesOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.contentsOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.remarksOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.delFlagOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.createByOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.createTimeOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.updateByOptions = response.data;
-    });
-    this.getDicts("${column.dictType}").then(response => {
-      this.updateTimeOptions = response.data;
-    });
+    // this.getTreeselect();
   },
   methods: {
     /** 查询支部党课学习列表 */
@@ -416,68 +337,12 @@ export default {
         this.loading = false;
       });
     },
-     // /** 查询部门下拉树结构 */
+     /** 查询部门下拉树结构 */
      // getTreeselect() {
      //      treeselect().then(response => {
      //          this.deptOptions = response.data;
      //      });
      // },
-    // 主键id字典翻译
-    studyIdFormat(row, column) {
-      return this.selectDictLabel(this.studyIdOptions, row.studyId);
-    },
-    // 时间字典翻译
-    studyTimeFormat(row, column) {
-      return this.selectDictLabel(this.studyTimeOptions, row.studyTime);
-    },
-    // 地点字典翻译
-    studyVenueFormat(row, column) {
-      return this.selectDictLabel(this.studyVenueOptions, row.studyVenue);
-    },
-    // 授课人字典翻译
-    lecturerFormat(row, column) {
-      return this.selectDictLabel(this.lecturerOptions, row.lecturer);
-    },
-    // 记录人字典翻译
-    recorderFormat(row, column) {
-      return this.selectDictLabel(this.recorderOptions, row.recorder);
-    },
-    // 参加人员字典翻译
-    participantsFormat(row, column) {
-      return this.selectDictLabel(this.participantsOptions, row.participants);
-    },
-    // 缺席人员字典翻译
-    absenteesFormat(row, column) {
-      return this.selectDictLabel(this.absenteesOptions, row.absentees);
-    },
-    // 内容字典翻译
-    contentsFormat(row, column) {
-      return this.selectDictLabel(this.contentsOptions, row.contents);
-    },
-    // 备注字典翻译
-    remarksFormat(row, column) {
-      return this.selectDictLabel(this.remarksOptions, row.remarks);
-    },
-    // 删除标志字典翻译
-    delFlagFormat(row, column) {
-      return this.selectDictLabel(this.delFlagOptions, row.delFlag);
-    },
-    // 创建者字典翻译
-    createByFormat(row, column) {
-      return this.selectDictLabel(this.createByOptions, row.createBy);
-    },
-    // 创建时间字典翻译
-    createTimeFormat(row, column) {
-      return this.selectDictLabel(this.createTimeOptions, row.createTime);
-    },
-    // 更新者字典翻译
-    updateByFormat(row, column) {
-      return this.selectDictLabel(this.updateByOptions, row.updateBy);
-    },
-    // 更新时间字典翻译
-    updateTimeFormat(row, column) {
-      return this.selectDictLabel(this.updateTimeOptions, row.updateTime);
-    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -487,33 +352,19 @@ export default {
     reset() {
       this.form = {
         studyId: null,
-
         studyTime: null,
-
         studyVenue: null,
-
         lecturer: null,
-
         recorder: null,
-
         participants: null,
-
         absentees: null,
-
         contents: null,
-
         remarks: null,
-
         delFlag: null,
-
         createBy: null,
-
         createTime: null,
-
         updateBy: null,
-
         updateTime: null,
-
       };
       this.resetForm("form");
     },

ruoyi-ui/src/views/index.vue

@@ -1,239 +1,18 @@
 <template>
   <div class="app-container home">
-    <!--<el-row :gutter="20">-->
-      <!--<el-col :xs="24" :sm="24" :md="12" :lg="8">-->
-        <!--<el-card class="update-log">-->
-          <!--<div slot="header" class="clearfix">-->
-            <!--<span class="title">-->
-              <!--<i class="el-icon-postcard"></i> 通知公告-->
-            <!--</span>-->
-          <!--</div>-->
-          <!--<div class="body">-->
-            <!--<p>-->
-              <!--<a class="link">2023年5月11日机关党委党员学习...</a>-->
-              <!--<span class="date">2023-05-09</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">2023年4月6日机关党委党员学习...</a>-->
-              <!--<span class="date">2023-05-09</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">2023年3月9日机关党委党员学习...</a>-->
-              <!--<span class="date">2023-05-09</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">2023年2月9日机关党委党员学习...</a>-->
-              <!--<span class="date">2023-05-09</span>-->
-            <!--</p>-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">2023年1月12日机关党委党员学习...</a>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="date">2023-05-09</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">2022年11月10日机关党委党员学习...</a>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="date">2023-05-09</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-          <!--</div>-->
-        <!--</el-card>-->
-      <!--</el-col>-->
-      <!--<el-col :xs="24" :sm="24" :md="12" :lg="8">-->
-        <!--<el-card class="update-log">-->
-          <!--<div slot="header" class="clearfix">-->
-            <!--<span class="title">-->
-              <!--<i class="el-icon-thumb"></i> 服务指南-->
-            <!--</span>-->
-          <!--</div>-->
-          <!--<div class="body">-->
-            <!--<p>-->
-              <!--<a class="link">《中国共产党入党志愿书》...</a>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">学校举行中国革命史和党史...</a>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">学校举办“不忘初心、牢记...</a>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">学校举行“不忘初心、牢记...</a>-->
-            <!--</p>-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">我校“不忘初心、牢记使命...</a>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-          <!--</div>-->
-        <!--</el-card>-->
-      <!--</el-col>-->
-      <!--<el-col :xs="24" :sm="24" :md="12" :lg="8">-->
-        <!--<el-card class="update-log">-->
-          <!--<div slot="header" class="clearfix">-->
-            <!--<span class="title">-->
-              <!--<i class="el-icon-download"></i> 常用下载-->
-            <!--</span>-->
-          <!--</div>-->
-          <!--<div class="body">-->
-            <!--<p>-->
-              <!--<a class="link">党内管理系统安装程序及培...</a>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">审核转入党员档案常用材料</a>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">发展党员工作常用模板样表</a>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">“发展党员纪实公示系统”...</a>-->
-            <!--</p>-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">“灯塔-党建在线”管理员...</a>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">党组织关系转接有关表格</a>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-          <!--</div>-->
-        <!--</el-card>-->
-      <!--</el-col>-->
-    <!--</el-row>-->
-    <!--<br/>-->
-    <!--<el-row :gutter="20">-->
-      <!--<el-col :xs="24" :sm="24" :md="12" :lg="8">-->
-        <!--<el-card class="update-log">-->
-          <!--<div slot="header" class="clearfix">-->
-            <!--<span class="title">-->
-              <!--<i class="el-icon-news"></i> 组工动态-->
-            <!--</span>-->
-          <!--</div>-->
-          <!--<div class="body">-->
-            <!--<p>-->
-              <!--<a class="link">机关党委开展主题党日观影活动</a>-->
-              <!--<span class="date">2023-03-30</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">学校召开党的建设工作领导小组会议</a>-->
-              <!--<span class="date">2023-03-07</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">我校机关党委与新城街道举行党建共建签约...</a>-->
-              <!--<span class="date">2023-02-20</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">学校召开2022年度党组织书记履行全面...</a>-->
-              <!--<span class="date">2023-01-07</span>-->
-            <!--</p>-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">组织部党支部开展主题党日学习活动</a>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="date">2022-11-18</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">开展党员“双报到”，助力社区疫情防控</a>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="date">2022-09-22</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">学校召开党建工作调度会议</a>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="date">2022-09-16</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">学校召开党的建设工作领导小组会议</a>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="date">2022-09-08</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">学校举行暑期中层干部能力素质提升专题...</a>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="date">2022-08-28</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">暑期中层干部能力素质提升专题培训班开班</a>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="date">2022-08-23</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">团委党支部开展“青春心向党 喜迎...</a>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="date">2022-07-11</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">安顺校区管理办公室党支部开展...</a>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="date">2022-07-11</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-            <!--&lt;!&ndash;<p>&ndash;&gt;-->
-              <!--&lt;!&ndash;<a class="link">机关党委理论学习中心组进行集体学习</a>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="date">2022-06-29</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</p>&ndash;&gt;-->
-          <!--</div>-->
-        <!--</el-card>-->
-      <!--</el-col>-->
-      <!--<el-col :xs="24" :sm="24" :md="12" :lg="8">-->
-        <!--<el-card class="update-log">-->
-          <!--<div slot="header" class="clearfix">-->
-            <!--<span class="title">-->
-              <!--<i class="el-icon-guide"></i> 基层一线-->
-            <!--</span>-->
-          <!--</div>-->
-          <!--<div class="body">-->
-            <!--<p>-->
-              <!--<a class="link">机关党委开展主题党日观影活动</a>-->
-              <!--<span class="date">2023-03-30</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">学校领导到茌平调研“第一书记”工作</a>-->
-              <!--<span class="date">2022-01-19</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">我校驻村“第一书记”积极开展工作</a>-->
-              <!--<span class="date">2021-11-09</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">校领导为第五轮省派“第一书记”送行</a>-->
-              <!--<span class="date">2021-11-03</span>-->
-            <!--</p>-->
-          <!--</div>-->
-        <!--</el-card>-->
-      <!--</el-col>-->
-      <!--<el-col :xs="24" :sm="24" :md="12" :lg="8">-->
-        <!--<el-card class="update-log">-->
-          <!--<div slot="header" class="clearfix">-->
-            <!--<span class="title">-->
-              <!--<i class="el-icon-link"></i> 先进风采-->
-            <!--</span>-->
-          <!--</div>-->
-          <!--<div class="body">-->
-            <!--<p>-->
-              <!--<a class="link">让党旗在疫情防控一线高高飘扬...</a>-->
-              <!--<span class="date">2022-05-10</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">我校王昕、李新宁作为“四进”攻坚工作组...</a>-->
-              <!--<span class="date">2022-04-04</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">“第一书记”帮包村客人来我校赠送锦旗</a>-->
-              <!--<span class="date">2021-05-31</span>-->
-            <!--</p>-->
-            <!--<p>-->
-              <!--<a class="link">我校第三轮“第一书记”载誉归来</a>-->
-              <!--<span class="date">2019-04-25</span>-->
-            <!--</p>-->
-          <!--</div>-->
-        <!--</el-card>-->
-      <!--</el-col>-->
-    <!--</el-row>-->
-
-    <!--<div class="swipe">-->
-      <!--<input type="radio" name="indicator" id="indicator1" hidden checked>-->
-      <!--<label for="indicator1"></label>-->
-      <!--<input type="radio" name="indicator" id="indicator2" hidden>-->
-      <!--<label for="indicator2"></label>-->
-      <!--<input type="radio" name="indicator" id="indicator3" hidden>-->
-      <!--<label for="indicator3"></label>-->
-      <!--<ul>-->
-        <!--<li><img src="../assets/images/5dbbfff0-356e-4a6c-9433-7fe52cbe8aff_s.jpg"></li>-->
-        <!--<li><img src="../assets/images/5e9c6851-e51a-45b4-a20d-06f2d5be5346_s.jpg"></li>-->
-        <!--<li><img src="../assets/images/52f5de39-ebe1-413f-9d23-0fb7a6d58d54_s.jpg"></li>-->
-      <!--</ul>-->
-    <!--</div>-->
-    
-    <!--<img src="../assets/images/党支部主要任务.png"/>-->
 
     <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="24" :lg="24">
+      <el-col :xs="12" :sm="12" :md="12" :lg="12">
         <el-carousel height="350px" style="margin-bottom: 20px;">
-          <el-carousel-item v-for="item in 4" :key="item">
-            <h3 class="small">{{ item }}</h3>
+          <el-carousel-item v-for="item in urls" :key="item">
+            <el-image :src="item"></el-image>
+          </el-carousel-item>
+        </el-carousel>
+      </el-col>
+      <el-col :xs="12" :sm="12" :md="12" :lg="12">
+        <el-carousel height="350px" style="margin-bottom: 20px;">
+          <el-carousel-item v-for="item in urls" :key="item">
+            <el-image :src="item"></el-image>
           </el-carousel-item>
         </el-carousel>
       </el-col>
@@ -330,6 +109,11 @@ export default {
   name: "Index",
   data() {
     return {
+      urls: [
+        'https://p5.img.cctvpic.com/photoworkspace/contentimg/2023/06/08/2023060807144929248.jpg',
+        'https://p1.img.cctvpic.com/photoworkspace/contentimg/2023/06/08/2023060821005989847.jpg',
+        'https://p4.img.cctvpic.com/photoAlbum/page/performance/img/2022/6/23/1655955351125_157.jpg'
+      ],
       // 版本号
       version: "3.8.5"
     };
@@ -426,13 +210,13 @@ export default {
   text-align: center;
 }
 
-.el-carousel__item:nth-child(2n) {
-  background-color: #99a9bf;
-}
+/*.el-carousel__item:nth-child(2n) {*/
+  /*background-color: #99a9bf;*/
+/*}*/
 
-.el-carousel__item:nth-child(2n+1) {
-  background-color: #d3dce6;
-}
+/*.el-carousel__item:nth-child(2n+1) {*/
+  /*background-color: #d3dce6;*/
+/*}*/
 
 img{
   width: auto;