Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/views/report/auditInfo.vue

@@ -54,20 +54,41 @@ export default {
     options() {
       return {
         ...baseOptions,
-        column: [{
+        column: [
+        {
           label: '机构名称',
           prop: 'name',
           search: true,
-        },{
+        },
-          label: '认证企业数',
+        {
-          prop: 'companyCount',
+          label: '登记企业数',
-        },{
+          prop: 'data1',
-          label: '审核任务数',
+        },
-          prop: 'missionCount',
+        {
-        },{
+          label: '企业发布任务数',
-          label: '审核岗位数',
+          prop: 'data2',
-          prop: 'roleCount'
+        },
-        },{
+        {
+          label: '企业待审核任务数',
+          prop: 'data3'
+        },
+        {
+          label: '企业审核通过任务数',
+          prop: 'data4'
+        },
+        {
+          label: '企业发布岗位数',
+          prop: 'data5',
+        },
+        {
+          label: '企业待审核岗位数',
+          prop: 'data6'
+        },
+        {
+          label: '企业审核通过岗位数',
+          prop: 'data7'
+        },
+        {
           label: '日期',
           prop: 'date',
           hide: true,

src/views/report/main/innovation.vue

@@ -21,11 +21,12 @@ import CustomLoading from "@/components/Custom-Loading/index.vue";
 import { dateFormat } from "@/util/date";
 import { deepClone } from "@/util/util";
 const columnEnum = {
-  "personCount": "服务总人数",
+  "data1": "推送总人数",
-  "policyCount": "政策推送总数",
+  "data2": "推送服务中总人数",
-  "jobCount": "岗位推送总数",
+  "data3": "推送任务总数",
-  "serveCount": "跟踪服务次数",
+  "data4": "推送岗位总数",
-  "successfulCount": "服务成功次数"
+  "data5": "跟踪服务总次数",
+  "data6": "服务成功次数"
 }
 const pages = { total: 0, size: 10, currentPage: 1 }
 const baseOptions = {
@@ -101,7 +102,7 @@ export default {
           }
         },{
           label: '机构名称',
-          prop: 'companyName',
+          prop: 'name',
           search: true,
           searchSpan: 6,
         },

src/views/report/main/unemployment.vue

@@ -22,11 +22,12 @@ import { dateFormat } from "@/util/date";
 import search from "@/page/index/search.vue";
 import {deepClone} from "@/util/util";
 const columnEnum = {
-  "personCount": "服务总人数",
+  "data1": "推送总人数",
-  "policyCount": "政策推送总数",
+  "data2": "推送服务中总人数",
-  "jobCount": "岗位推送总数",
+  "data3": "推送任务总数",
-  "serveCount": "跟踪服务次数",
+  "data4": "推送岗位总数",
-  "successfulCount": "服务成功次数"
+  "data5": "跟踪服务总次数",
+  "data6": "服务成功次数"
 }
 const pages = { total: 0, size: 10, currentPage: 1 }
 const baseOptions = {
@@ -102,7 +103,7 @@ export default {
           }
         },{
           label: '机构名称',
-          prop: 'companyName',
+          prop: 'name',
           search: true,
           searchSpan: 6,
         },

src/views/report/main/vocational.vue

@@ -22,11 +22,12 @@ import { dateFormat } from "@/util/date";
 import search from "@/page/index/search.vue";
 import {deepClone} from "@/util/util";
 const columnEnum = {
-  "personCount": "服务总人数",
+  "data1": "推送总人数",
-  "policyCount": "政策推送总数",
+  "data2": "推送服务中总人数",
-  "jobCount": "岗位推送总数",
+  "data3": "推送任务总数",
-  "serveCount": "跟踪服务次数",
+  "data4": "推送岗位总数",
-  "successfulCount": "服务成功次数"
+  "data5": "跟踪服务总次数",
+  "data6": "服务成功次数"
 }
 const pages = { total: 0, size: 10, currentPage: 1 }
 const baseOptions = {
@@ -102,7 +103,7 @@ export default {
           }
         },{
           label: '机构名称',
-          prop: 'companyName',
+          prop: 'name',
           search: true,
           searchSpan: 6,
         },

src/views/report/main/vocationalTraining.vue

@@ -22,11 +22,12 @@ import { dateFormat } from "@/util/date";
 import search from "@/page/index/search.vue";
 import {deepClone} from "@/util/util";
 const columnEnum = {
-  "personCount": "服务总人数",
+  "data1": "推送总人数",
-  "policyCount": "政策推送总数",
+  "data2": "推送服务中总人数",
-  "jobCount": "岗位推送总数",
+  "data3": "推送任务总数",
-  "serveCount": "跟踪服务次数",
+  "data4": "推送岗位总数",
-  "successfulCount": "服务成功次数"
+  "data5": "跟踪服务总次数",
+  "data6": "服务成功次数"
 }
 const pages = { total: 0, size: 10, currentPage: 1 }
 const baseOptions = {
@@ -103,7 +104,7 @@ export default {
           },
         },{
           label: '机构名称',
-          prop: 'companyName',
+          prop: 'name',
           search: true,
           searchSpan: 6,
         },

src/views/report/policy.vue

@@ -60,18 +60,12 @@ export default {
           searchSpan: 6,
         },{
           label: '政策名称',
-          prop: 'policyName',
+          prop: 'name2',
           search: true,
           searchSpan: 6,
         },{
-          label: '推送数',
+          label: '成功推送总次数',
-          prop: 'serveCount',
+          prop: 'data1',
-        },{
-          label: '跟踪服务次数 ',
-          prop: 'traceCount'
-        },{
-          label: '服务成功次数 ',
-          prop: 'successCount'
         },{
           label: '日期',
           prop: 'date',

src/views/report/postInfo.vue

@@ -54,23 +54,41 @@ export default {
     options() {
       return {
         ...baseOptions,
-        column: [{
+        column: [
+        {
           label: '机构名称',
           prop: 'name',
           search:true,
-        },{
+        },
+        {
+          label: '岗位总数',
+          prop: 'data1',
+        },
+        {
           label: '发布岗位数',
-          prop: 'count',
+          prop: 'data2',
-        },{
+        },
-          label: '推送数',
+        {
-          prop: 'serveCount',
+          label: '招聘中岗位数',
-        },{
+          prop: 'data3',
-          label: '服务成功次数',
+        },
-          prop: 'successCount',
+        {
-        },{
+          label: '关闭岗位数',
-          label: '跟踪服务次数',
+          prop: 'data4'
-          prop: 'traceCount'
+        },
-        },{
+        {
+          label: '待审核岗位数',
+          prop: 'data5'
+        },
+        {
+          label: '审核通过岗位数',
+          prop: 'data6'
+        },
+        {
+          label: '推送成功岗位数',
+          prop: 'data7'
+        },
+        {
           label: '日期',
           prop: 'date',
           hide: true,

src/views/report/taskInfo.vue

@@ -54,23 +54,41 @@ export default {
     options() {
       return {
         ...baseOptions,
-        column: [{
+        column: [
+        {
           label: '机构名称',
           prop: 'name',
           search:true,
-        },{
+        },
+        {
+          label: '任务总数',
+          prop: 'data1',
+        },
+        {
           label: '发布任务数',
-          prop: 'count',
+          prop: 'data2',
-        },{
+        },
-          label: '推送数',
+        {
-          prop: 'serveCount',
+          label: '招聘中任务数',
-        },{
+          prop: 'data3',
-          label: '服务成功次数',
+        },
-          prop: 'successCount',
+        {
-        },{
+          label: '关闭任务数',
-          label: '跟踪服务次数',
+          prop: 'data4'
-          prop: 'traceCount'
+        },
-        },{
+        {
+          label: '待审核任务数',
+          prop: 'data5'
+        },
+        {
+          label: '审核通过任务数',
+          prop: 'data6'
+        },
+        {
+          label: '推送成功任务数',
+          prop: 'data7'
+        },
+        {
           label: '日期',
           prop: 'date',
           hide: true,