人员统计

src/views/peopleManage/PersonnelStatistics/index.vue

@@ -22,9 +22,13 @@
     <el-table :data="peopleList" :header-cell-style="{ background: '#004d86', color: 'white' }">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="单位名称" align="center" prop="name" />
-      <el-table-column label="军官" align="center" prop="zbgb" />
-      <el-table-column label="士官" align="center" prop="zbsb"></el-table-column>
-      <el-table-column label="义务兵" align="center" prop="zbyw" />
+      <el-table-column label="军官/指挥管理军官" align="center" prop="zhjg" />
+      <el-table-column label="军官/专业技术军官" align="center" prop="zyjg" />
+      <el-table-column label="文职人员" align="center" prop="wz"></el-table-column>
+      <el-table-column label="士兵/初级士官" align="center" prop="cjsg"></el-table-column>
+      <el-table-column label="士兵/中级士官" align="center" prop="zjsg"></el-table-column>
+      <el-table-column label="士兵/高级士官" align="center" prop="gjsg"></el-table-column>
+      <el-table-column label="士兵/义务兵" align="center" prop="sb" />
       <el-table-column label="各单位人数" align="center">
         <template scope="scope">
           <span v-if="scope.row.type==2">
@@ -55,10 +59,14 @@ export default {
   data() {
     return {
       tongJiList: [
-        { name: "总人数", num: 0 },
-        { name: "军官", num: 0 },
-        { name: "士官", num: 0 },
-        { name: "义务兵", num: 0 }
+        { name: "总人员数", num: 0 },
+        { name: "士兵/初级士官", num: 0 },
+        { name: "士兵/中级士官", num: 0 },
+        { name: "士兵/高级士官", num: 0 },
+        { name: "文职人员", num: 0 },
+        { name: "士兵/义务兵", num: 0 },
+        { name: "军官/指挥管理军官", num: 0 },
+        { name: "军官/专业技术军官", num: 0 }
       ],
       peopleList: []
     };
@@ -66,14 +74,22 @@ export default {
   created() {
     countNumber().then(res => {
       this.tongJiList.forEach(item => {
-        if (item.name == "军官") {
-          item.num = res.data.zbgb;
+        if (item.name == "军官/指挥管理军官") {
+          item.num = res.data.zhjg;
         } else if (item.name == "总人数") {
           item.num = res.data.zongRenShu;
-        } else if (item.name == "士官") {
-          item.num = res.data.zbsb;
-        } else if (item.name == "义务兵") {
-          item.num = res.data.zbyw;
+        } else if (item.name == "军官/专业技术军官") {
+          item.num = res.data.zyjg;
+        } else if (item.name == "文职人员") {
+          item.num = res.data.wz;
+        } else if (item.name == "士兵/初级士官") {
+          item.num = res.data.cjsg;
+        } else if (item.name == "士兵/中级士官") {
+          item.num = res.data.zjsg;
+        } else if (item.name == "士兵/高级士官") {
+          item.num = res.data.gjsg;
+        } else if (item.name == "士兵/义务兵") {
+          item.num = res.data.sb;
         }
       });
       this.peopleList = res.data.各单位;