1

src/api/peopleManage/people.js

@@ -72,6 +72,7 @@ export function treeselect() {
 export function countNumber() {
   return request({
     url: '/peopleManage/people/countNumber',
-    method: 'get'
+    method: 'get',
+    timeout: 50000,
   })
 }

src/views/peopleManage/PersonnelStatistics/index.vue

@@ -22,13 +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="zhjg" />
-      <el-table-column label="军官/专业技术军官" align="center" prop="zyjg" />
+      <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" 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">
@@ -59,14 +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 },
-        { name: "军官/专业技术军官", num: 0 }
+        { name: "指挥管理军官", num: 0 },
+        { name: "专业技术军官", num: 0 }
       ],
       peopleList: []
     };
@@ -74,21 +74,21 @@ export default {
   created() {
     countNumber().then(res => {
       this.tongJiList.forEach(item => {
-        if (item.name == "军官/指挥管理军官") {
+        if (item.name == "指挥管理军官") {
           item.num = res.data.zhjg;
-        } else if (item.name == "总人员数") {
+        } else if (item.name == "总人数") {
           item.num = res.data.zongRenShu;
-        } else if (item.name == "军官/专业技术军官") {
+        } else if (item.name == "专业技术军官") {
           item.num = res.data.zyjg;
         } else if (item.name == "文职人员") {
           item.num = res.data.wz;
-        } else if (item.name == "士兵/初级士官") {
+        } else if (item.name == "初级士官") {
           item.num = res.data.cjsg;
-        } else if (item.name == "士兵/中级士官") {
+        } else if (item.name == "中级士官") {
           item.num = res.data.zjsg;
-        } else if (item.name == "士兵/高级士官") {
+        } else if (item.name == "高级士官") {
           item.num = res.data.gjsg;
-        } else if (item.name == "士兵/义务兵") {
+        } else if (item.name == "义务兵") {
           item.num = res.data.sb;
         }
       });