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

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": "服务总人数",
-  "policyCount": "政策推送总数",
-  "jobCount": "岗位推送总数",
-  "serveCount": "跟踪服务次数",
-  "successfulCount": "服务成功次数"
+  "data1": "推送总人数",
+  "data2": "推送服务中总人数",
+  "data3": "推送任务总数",
+  "data4": "推送岗位总数",
+  "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,
         },