Merge remote-tracking branch 'origin/master'

src/views/report/auditInfo.vue

@@ -32,7 +32,7 @@ const baseOptions = {
   refreshBtn: false,
   menu: false,
   tip: false,
-  searchMenuSpan: 4,
+  searchMenuSpan: 6,
   selection: false,
 }
 export default {
@@ -57,13 +57,13 @@ export default {
           prop: 'name',
           search: true,
         },{
-          label: '企业数',
+          label: '认证企业数',
           prop: 'companyCount',
         },{
-          label: '任务数',
+          label: '审核任务数',
           prop: 'missionCount',
         },{
-          label: '岗位数',
+          label: '审核岗位数',
           prop: 'roleCount'
         },{
           label: '日期',

src/views/report/mian/policy.vue

@@ -0,0 +1,133 @@
+<template>
+  <basic-container style="position: relative">
+    <avue-crud
+      :data="infoData"
+      :option="options"
+      :search.sync="search"
+      :page.sync="infoPages"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="sizeChange"
+      @current-change="currentChange"
+    >
+    </avue-crud>
+    <CustomLoading :visible="visible" loadingText="加载中..."></CustomLoading>
+  </basic-container>
+</template>
+
+<script>
+import {reviewCount} from '@/api/report/report'
+import CustomLoading from "@/components/Custom-Loading/index.vue";
+import { dateFormat } from "@/util/date";
+const pages = { total: 0, size: 10, currentPage: 1 }
+const baseOptions = {
+  dateBtn: false,
+  addBtn: false,
+  editBtn: false,
+  delBtn: false,
+  height: "auto",
+  reserveSelection: false,
+  border: true,
+  columnBtn: false,
+  refreshBtn: false,
+  menu: false,
+  tip: false,
+  searchMenuSpan: 6,
+  selection: false,
+}
+export default {
+  components: {CustomLoading},
+  data() {
+    return {
+      infoPages: Object.assign({}, pages),
+      infoData: [],
+      visible: false,
+      search: {},
+    }
+  },
+  created() {
+    this.getList()
+  },
+  computed: {
+    options() {
+      return {
+        ...baseOptions,
+        column: [{
+          label: '机构名称',
+          prop: 'name',
+          search: true,
+        },{
+          label: '政策名称',
+          prop: 'companyCount',
+        },{
+          label: '推送数',
+          prop: 'missionCount',
+        },{
+          label: '跟踪服务次数 ',
+          prop: 'roleCount'
+        },{
+          label: '服务成功次数 ',
+          prop: 'roleCount'
+        },{
+          label: '日期',
+          prop: 'date',
+          hide: true,
+          display: false,
+          type:'date',
+          searchSpan: 8,
+          searchRange:true,
+          search:true,
+        }]
+      }
+    }
+  },
+  methods: {
+    sizeChange(size) {
+      this.infoPages.size = size
+      this.getList()
+    },
+    currentChange(page) {
+      this.infoPages.page = page
+      this.getList()
+    },
+    searchChange(values, done) {
+      this.getList().then(() => {done()})
+    },
+    resetChange() {
+      this.search = {}
+      let params = {  size: 10, current: 1 }
+      this.getList()
+    },
+    getList(values) {
+      return new Promise(async(resolve, reject) => {
+        this.visible = true
+        let params = {
+          size: this.infoPages.size,
+          current: this.infoPages.currentPage,
+          ...this.search,
+        }
+        if( Array.isArray(this.search.date) &&  this.search.date.length ) {
+          const [stime, etime] =  this.search.date
+          params.stime = dateFormat(stime, "yyyy-MM-dd")
+          params.etime = dateFormat(etime, "yyyy-MM-dd")
+          delete params.date
+        }
+        console.log(123123, params)
+        let resData = await reviewCount(params)
+        if(resData.data.code === 200) {
+          const { records, current, total, size } = resData.data.data
+          this.infoData = records
+          this.infoPages = { ...this.infoPages, currentPage: current, total, size}
+          this.$api.sleep(1000).then(() => {this.visible = false; resolve(true)})
+        } else {
+          reject()
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/report/postInfo.vue

@@ -32,7 +32,7 @@ const baseOptions = {
   refreshBtn: false,
   menu: false,
   tip: false,
-  searchMenuSpan: 4,
+  searchMenuSpan: 6,
   selection: false,
 }
 export default {
@@ -57,16 +57,16 @@ export default {
           prop: 'name',
           search:true,
         },{
-          label: '发布数',
+          label: '发布岗位数',
           prop: 'count',
         },{
           label: '推送数',
           prop: 'serveCount',
         },{
-          label: '成功数',
+          label: '服务成功次数',
           prop: 'successCount',
         },{
-          label: '跟踪数',
+          label: '跟踪服务次数',
           prop: 'traceCount'
         },{
           label: '日期',

src/views/report/taskInfo.vue

@@ -32,7 +32,7 @@ const baseOptions = {
   refreshBtn: false,
   menu: false,
   tip: false,
-  searchMenuSpan: 4,
+  searchMenuSpan: 6,
   selection: false,
 }
 export default {
@@ -57,16 +57,16 @@ export default {
           prop: 'name',
           search:true,
         },{
-          label: '发布数',
+          label: '发布任务数',
           prop: 'count',
         },{
           label: '推送数',
           prop: 'serveCount',
         },{
-          label: '成功数',
+          label: '服务成功次数',
           prop: 'successCount',
         },{
-          label: '跟踪数',
+          label: '跟踪服务次数',
           prop: 'traceCount'
         },{
           label: '日期',