8.16汇报后修改内容

ruoyi-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: /ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 8092
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -55,6 +55,72 @@ public class SysDept extends BaseEntity
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 
+    /** 职工总数 */
+    private Long employeeTotal;
+
+    /** 党员总数 */
+    private Long memberTotal;
+
+    /** 党员占职工总数的百分比 （％） */
+    private Long memEmpRatio;
+
+    /** 党小组数 */
+    private Long memGroupTotal;
+
+    /** 班组数量 */
+    private Long shiftTotal;
+
+    /** 空白班组数量 */
+    private Long emptyShiftTotal;
+
+    public Long getEmployeeTotal() {
+        return employeeTotal;
+    }
+
+    public void setEmployeeTotal(Long employeeTotal) {
+        this.employeeTotal = employeeTotal;
+    }
+
+    public Long getMemberTotal() {
+        return memberTotal;
+    }
+
+    public void setMemberTotal(Long memberTotal) {
+        this.memberTotal = memberTotal;
+    }
+
+    public Long getMemEmpRatio() {
+        return memEmpRatio;
+    }
+
+    public void setMemEmpRatio(Long memEmpRatio) {
+        this.memEmpRatio = memEmpRatio;
+    }
+
+    public Long getMemGroupTotal() {
+        return memGroupTotal;
+    }
+
+    public void setMemGroupTotal(Long memGroupTotal) {
+        this.memGroupTotal = memGroupTotal;
+    }
+
+    public Long getShiftTotal() {
+        return shiftTotal;
+    }
+
+    public void setShiftTotal(Long shiftTotal) {
+        this.shiftTotal = shiftTotal;
+    }
+
+    public Long getEmptyShiftTotal() {
+        return emptyShiftTotal;
+    }
+
+    public void setEmptyShiftTotal(Long emptyShiftTotal) {
+        this.emptyShiftTotal = emptyShiftTotal;
+    }
+
     public Long getDeptId()
     {
         return deptId;

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

@@ -20,10 +20,16 @@
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
+		<result property="employeeTotal"    column="employee_total"    />
+		<result property="memberTotal"    column="member_total"    />
+		<result property="memEmpRatio"    column="mem_emp_ratio"    />
+		<result property="memGroupTotal"    column="mem_group_total"    />
+		<result property="shiftTotal"    column="shift_total"    />
+		<result property="emptyShiftTotal"    column="empty_shift_total"    />
 	</resultMap>
 
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time, d.employee_total, d.member_total, d.mem_emp_ratio, d.mem_group_total, d.shift_total, d.empty_shift_total
         from sys_dept d
     </sql>
 
@@ -129,6 +135,12 @@
 		<if test="email != null and email != ''">email,</if>
 		<if test="status != null">status,</if>
 		<if test="createBy != null and createBy != ''">create_by,</if>
+		<if test="employeeTotal != null">employee_total,</if>
+		<if test="memberTotal != null">member_total,</if>
+		<if test="memEmpRatio != null">mem_emp_ratio,</if>
+		<if test="memGroupTotal != null">mem_group_total,</if>
+		<if test="shiftTotal != null">shift_total,</if>
+		<if test="emptyShiftTotal != null">empty_shift_total,</if>
 		create_time
 		)values(
 		<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -141,6 +153,12 @@
 		<if test="email != null and email != ''">#{email},</if>
 		<if test="status != null">#{status},</if>
 		<if test="createBy != null and createBy != ''">#{createBy},</if>
+		<if test="employeeTotal != null">#{employeeTotal},</if>
+		<if test="memberTotal != null">#{memberTotal},</if>
+		<if test="memEmpRatio != null">#{memEmpRatio},</if>
+		<if test="memGroupTotal != null">#{memGroupTotal},</if>
+		<if test="shiftTotal != null">#{shiftTotal},</if>
+		<if test="emptyShiftTotal != null">#{emptyShiftTotal},</if>
 		sysdate
 		)
 	</insert>
@@ -157,6 +175,12 @@
 			<if test="email != null">email = #{email},</if>
 			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="employeeTotal != null">employee_total = #{employeeTotal},</if>
+			<if test="memberTotal != null">member_total = #{memberTotal},</if>
+			<if test="memEmpRatio != null">mem_emp_ratio = #{memEmpRatio},</if>
+			<if test="memGroupTotal != null">mem_group_total = #{memGroupTotal},</if>
+			<if test="shiftTotal != null">shift_total = #{shiftTotal},</if>
+			<if test="emptyShiftTotal != null">empty_shift_total = #{emptyShiftTotal},</if>
 			update_time = sysdate
 		</set>
 		where dept_id = #{deptId}

ruoyi-ui/.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 基层党组织信息化管理系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/party'

ruoyi-ui/src/assets/styles/element-variables.scss

@@ -4,7 +4,7 @@
 **/
 
 /* theme color */
-$--color-primary: #1890ff;
+$--color-primary: #f5222d;
 $--color-success: #13ce66;
 $--color-warning: #ffba00;
 $--color-danger: #ff4949;

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -88,6 +88,14 @@
       color: $base-menu-color-active !important;
     }
 
+    & .theme-light .is-active > .el-submenu__title {
+      color: #f5222d !important;
+    }
+
+    .el-menu-item.is-active {
+      color: #f5222d !important;
+    }
+
     & .nest-menu .el-submenu>.el-submenu__title,
     & .el-submenu .el-menu-item {
       min-width: $base-sidebar-width !important;

ruoyi-ui/src/layout/components/TagsView/index.vue

@@ -268,6 +268,8 @@ export default {
         background-color: #42b983;
         color: #fff;
         border-color: #42b983;
+        background: #f5222d !important;
+        border-color: #f5222d !important;
         &::before {
           content: '';
           background: #fff;

ruoyi-ui/src/settings.js

@@ -2,7 +2,7 @@ module.exports = {
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
    */
-  sideTheme: 'theme-dark',
+  sideTheme: 'theme-light',
 
   /**
    * 是否系统布局配置

ruoyi-ui/src/views/system/dept/index.vue

@@ -56,19 +56,25 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+      <el-table-column prop="deptName" label="部门名称" width="160"></el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="100"></el-table-column>
       <el-table-column prop="status" label="状态" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="职工总数" align="center" prop="employeeTotal" />
+      <el-table-column label="党员总数" align="center" prop="memberTotal" />
+      <el-table-column label="党员占职工总数的百分比 " align="center" prop="memEmpRatio" />
+      <el-table-column label="党小组数" align="center" prop="memGroupTotal" />
+      <el-table-column label="班组数量" align="center" prop="shiftTotal" />
+      <el-table-column label="空白班组数量" align="center" prop="emptyShiftTotal" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -148,6 +154,42 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="职工总数" prop="employeeTotal">
+              <el-input v-model="form.employeeTotal" placeholder="请输入职工总数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="党员总数" prop="memberTotal">
+              <el-input v-model="form.memberTotal" placeholder="请输入党员总数" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="党员占职工总数的百分比 " prop="memEmpRatio">
+              <el-input v-model="form.memEmpRatio" placeholder="请输入党员占职工总数的百分比 " />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="党小组数" prop="memGroupTotal">
+              <el-input v-model="form.memGroupTotal" placeholder="请输入党小组数" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="班组数量" prop="shiftTotal">
+              <el-input v-model="form.shiftTotal" placeholder="请输入班组数量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="空白班组数量" prop="emptyShiftTotal">
+              <el-input v-model="form.emptyShiftTotal" placeholder="请输入空白班组数量" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

ruoyi-ui/vue.config.js

@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || '基层党组织信息化管理系统' // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 92 // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: `http://43.143.92.79:8092`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''