diff --git a/public/img/correct1.png b/public/img/correct1.png
new file mode 100644
index 0000000..93c9659
Binary files /dev/null and b/public/img/correct1.png differ
diff --git a/public/img/correct2.png b/public/img/correct2.png
new file mode 100644
index 0000000..75f86dc
Binary files /dev/null and b/public/img/correct2.png differ
diff --git a/src/components/Custom-Loading/index.vue b/src/components/Custom-Loading/index.vue
index a604d9e..2d19f10 100644
--- a/src/components/Custom-Loading/index.vue
+++ b/src/components/Custom-Loading/index.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="loading-container" v-show="visible">
-      <div class="content">
-        <img src="@/assets/loading.gif" :style="{width: Sized, height: Sized}">
-        <div class="text">
-          {{loadingText}}
-        </div>
+    <div class="content">
+      <img src="@/assets/loading.gif" :style="{width: Sized, height: Sized}">
+      <div class="text">
+        {{ loadingText }}
       </div>
+      <slot></slot>
+    </div>
   </div>
 </template>
 
@@ -50,7 +51,7 @@ export default {
   },
   computed: {
     Sized() {
-      if(Object.keys(classEnum).some((item) => item === this.size)) {
+      if (Object.keys(classEnum).some((item) => item === this.size)) {
         return classEnum[this.size]
       } else {
         return classEnum.default
@@ -61,7 +62,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.loading-container{
+.loading-container {
   position: absolute;
   left: 0;
   top: 0;
@@ -72,24 +73,28 @@ export default {
   justify-content: center;
   background: rgba(255, 255, 255, 0.9);
 
-  .content{
+  .content {
     display: flex;
     align-items: center;
     justify-content: center;
     flex-direction: column;
-    .image_small{
+
+    .image_small {
       width: 56px;
       height: 56px;
     }
-    .image_default{
+
+    .image_default {
       width: 100px;
       height: 100px;
     }
-    .image_large{
+
+    .image_large {
       width: 180px;
       height: 180px;
     }
-    .text{
+
+    .text {
       text-align: center;
       width: 100%;
       color: #666666;
diff --git a/src/router/axios.js b/src/router/axios.js
index 1038e70..3ea9ad1 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -52,6 +52,26 @@ service.interceptors.request.use(config => {
 }, error => {
   return Promise.reject(error)
 });
+
+axios.interceptors.request.use(config => {
+  //开启 progress bar
+  NProgress.start();
+  const meta = (config.meta || {});
+  const isToken = meta.isToken === false;
+  config.headers['Authorization'] =
+    `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`;
+  if (getToken() && !isToken) {
+    //让每个请求携带token--['Authorization']为自定义key 请根据实际情况自行修改
+    config.headers['Jobslink-Auth'] = 'bearer ' + getToken()
+  }
+  // headers中配置serialize为true开启序列化
+  if (config.method === 'post' && meta.isSerialize === true) {
+    config.data = serialize(config.data);
+  }
+  return config
+}, error => {
+  return Promise.reject(error)
+});
 // http response 拦截
 service.interceptors.response.use(
   res => {
diff --git a/src/views/tenant/main/serve/Dialog/pushService2.vue b/src/views/tenant/main/serve/Dialog/pushService2.vue
new file mode 100644
index 0000000..411d25a
--- /dev/null
+++ b/src/views/tenant/main/serve/Dialog/pushService2.vue
@@ -0,0 +1,373 @@
+<template>
+  <el-drawer size="100%" append-to-body title="推送服务" :visible.sync="viewDrawer">
+    <div>
+      <div class="push-header">
+        <div>
+          <el-button type="primary" size="small" @click="changeTabs(0)">匹配政策</el-button>
+          <el-button type="primary" @click="changeTabs(1)" size="small">匹配岗位</el-button>
+          <el-input style="width: 300px; margin-left: 15px" placeholder="搜索岗位" v-show="rightTabs === 1" size="small"
+                    prefix-icon="el-icon-search"
+                    @input="searchInputChange" v-model="searchInput" clearable>
+          </el-input>
+        </div>
+        <el-button type="primary" style="width: 80px" size="small" :disabled="pushState" @click="onSubmit">
+          {{ pushState ? '推送中...' : rightTabs ? '推送岗位' : '推送政策' }}
+        </el-button>
+      </div>
+      <div class="content-right relative">
+        <avue-crud height="900" ref="crud2" :data="rightDataList"
+                   :option="rightTabs ? rightPostOptions : rightPolicyOptions" :page.sync="rightPages"
+                   @current-change="rightCurrentPageChange" @size-change="rightSizePageChange"
+                   @selection-change="rightSelectionChange">
+          <template slot="labelName" slot-scope="{row}">
+            <TextTooltip :content="row.labelName" length="40"></TextTooltip>
+          </template>
+          <template slot="jobDescription" slot-scope="{row}">
+            <TextTooltip :content="row.jobDescription" length="40"></TextTooltip>
+          </template>
+          <template slot="address" slot-scope="{row}">
+            <TextTooltip :content="row.address" length="40"></TextTooltip>
+          </template>
+        </avue-crud>
+        <CustomLoading :visible="rightLoading" size="largeXXL" loading-text="智能分析匹配中...">
+          <div class="loading-box">
+            <div class="row-loading">
+              <span>结构化数据匹配:地理位置、学历、薪资要求</span>
+              <img v-if="progress < 1" class="imgcorrect" src="/img/correct1.png">
+              <img v-else class="imgcorrect" src="/img/correct2.png">
+            </div>
+            <div class="row-loading">
+              <span>非结构化数据:工作经历和简历、工作岗位和招聘岗位 相似度计算</span>
+              <img v-if="progress < 2" class="imgcorrect" src="/img/correct1.png">
+              <img v-else class="imgcorrect" src="/img/correct2.png">
+            </div>
+          </div>
+        </CustomLoading>
+      </div>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+import {
+  getListByids,
+  getSearchAll,
+  getSearchAllByUserId,
+  pushPolicyUserServe,
+  pushPostUserServe,
+  getListAllByPolicy
+} from "@/api/tenant/serve.js";
+import TextTooltip from "@/components/text-tooltip/index.vue";
+import {debounce} from '@/util/util'
+import {DateTime} from "@/util/dateTime";
+import CustomLoading from "@/components/Custom-Loading/index.vue";
+
+const pages = {pagerCount: 3, total: 0, size: 10, currentPage: 1}
+const baseOptions = {
+  size: 'medium',
+  dateBtn: false,
+  addBtn: false,
+  editBtn: false,
+  delBtn: false,
+  height: "auto",
+  reserveSelection: false,
+  border: true,
+  columnBtn: false,
+  refreshBtn: false,
+  menu: false,
+  tip: false,
+  selection: true,
+  align: 'center',
+}
+let rightPolicyOptions = {
+  ...baseOptions,
+  column: [{
+    label: '政策名称',
+    prop: 'name',
+  }, {
+    label: '政策标签',
+    prop: 'labelName',
+    slot: true,
+  }]
+}
+let rightPostOptions = {
+  ...baseOptions,
+  column: [
+    {
+      label: '岗位名称',
+      prop: 'jobName',
+    }, {
+      label: '用工单位',
+      prop: 'companyName',
+    }, {
+      label: '详细地址',
+      prop: 'address',
+      slot: true,
+    }, {
+      label: '岗位描述',
+      prop: 'jobDescription',
+      slot: true,
+    }, {
+      label: "岗位类型",
+      prop: "type1",
+      type: "select",
+      dicData: [
+        {
+          value: "0",
+          label: "零工岗位",
+        },
+        {
+          value: "1",
+          label: "全职岗位",
+        },
+      ],
+      display: false,
+      hide: true,
+    },
+  ]
+}
+export default {
+  components: {TextTooltip, CustomLoading},
+  data() {
+    return {
+      leftUserSelections: [],
+      rightDataList: [],
+      rightLoading: false,
+      rightTabs: 0, // 0： 政策， 1： 岗位
+      rightPages: Object.assign({}, pages),
+      rightPolicyOptions: Object.assign({}, rightPolicyOptions),
+      rightPostOptions: Object.assign({}, rightPostOptions),
+      rightDataSelections: [],
+      searchInput: '',
+      pushState: false,
+      progress: 0,
+      timer: null,
+    }
+  },
+  props: {
+    visible: Boolean,
+    rowData: {default: null, type: Function},
+    changeVisible: {default: null, type: Function},
+  },
+  computed: {
+    viewDrawer: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:visible", val);
+      },
+    },
+  },
+  methods: {
+    changeTabs(type) {
+      this.rightDataList = []
+      this.rightTabs = type
+      this.rightDataSelections = []
+      this.$message.success('智能分析匹配中');
+      type === 0 && this.getRightListPolicy()
+      type === 1 && this.getRightSearchByUserId()
+    },
+    upDateUser(user) {
+      this.leftUserSelections = [user]
+    },
+    searchInputChange: debounce(function (val) {
+      this.getRightSearch()
+    }, 1000),
+    refLeftSearch(name) {
+    },
+    rightCurrentPageChange(current) {
+      this.rightPages.currentPage = current
+      this.rightTabs === 0 && this.getRightListPolicy()
+      this.rightTabs === 1 && this.getRightSearchByUserId()
+    },
+    rightSizePageChange(current) {
+      this.rightPages.size = current
+      this.rightTabs === 0 && this.getRightListPolicy()
+      this.rightTabs === 1 && this.getRightSearchByUserId()
+    },
+    rightSelectionChange(val) {
+      this.rightDataSelections = val
+    },
+    onSubmit() {
+      if (!this.leftUserSelections.length) return this.$message.info('请选择推送用户')
+      if (!this.rightDataSelections.length) return this.$message.info('请选择推送政策或岗位')
+      if (this.rightTabs === 0) {
+        this.pushPolicyAndUser()
+      } else {
+        this.pushPostAndUser()
+      }
+    },
+    async pushPostAndUser() {
+      this.pushState = true
+      const createTime = Date.now() + 2000
+      let params = {
+        serveId: this.rowData.id,
+        posts: this.rightDataSelections.map((item) => ({id: item.id, type: item.type1, jobName: item.jobName})),
+        users: this.leftUserSelections.map((item) => ({
+          idNumber: item.idNumber,
+          talentsId: item.id,
+          userId: item.userId,
+          userName: item.name
+        }))
+      }
+      let resData = await pushPostUserServe(params)
+      if (resData.data.code === 200) {
+        const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        setTimeout(() => {
+          this.$message.success('岗位推送成功')
+          this.$refs.crud2.selectClear()
+          this.pushState = false
+        }, timed)
+
+      }
+    },
+    async pushPolicyAndUser() {
+      this.pushState = true
+      const createTime = Date.now() + 2000
+      let params = {
+        serveId: this.rowData.id,
+        policyIds: this.rightDataSelections.map((item) => item.id),
+        users: this.leftUserSelections.map((item) => ({
+          idNumber: item.idNumber,
+          talentsId: item.id,
+          userId: item.userId,
+          userName: item.name
+        }))
+      }
+      let resData = await pushPolicyUserServe(params)
+      if (resData.data.code === 200) {
+        const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        setTimeout(() => {
+          this.$message.success('政策推送成功')
+          this.$refs.crud2.selectClear()
+          this.pushState = false
+        }, timed)
+      }
+    },
+    async getRightSearch() {
+      this.progress = 0
+      let params = {keywords: this.searchInput || '1'}
+      const createTime = Date.now() + 4000
+      this.rightLoading = true
+      let resData = await getSearchAll(params)
+
+      if (resData.data.code === 200) {
+        this.setProgress().then(() => {
+          setTimeout(() => {
+            this.rightLoading = false
+            this.rightDataList = resData.data.data
+            this.rightPages = {total: 10, currentPage: 1}
+          }, 200)
+        })
+        // const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        // setTimeout(() => {
+        //   this.rightLoading = false
+        //   this.rightDataList = resData.data.data
+        //   this.rightPages = {total: 10, currentPage: 1}
+        // }, timed)
+      }
+    },
+    async getRightListPolicy() {
+      this.searchInput = ''
+      this.progress = 0
+      const {currentPage, size} = this.rightPages
+      let params = {
+        ids: this.rowData.policyIds,
+        current: currentPage,
+        size,
+      }
+      // const createTime = Date.now() + 4000
+      this.rightLoading = true
+      let resData = await getListByids(params)
+      if (resData.data.code === 200) {
+        this.setProgress().then(() => {
+          setTimeout(() => {
+            this.rightLoading = false
+            this.rightPages = {total: resData.data.data.length, currentPage: 1}
+            this.rightDataList = resData.data.data
+          }, 200)
+        })
+        // const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        // setTimeout(() => {
+        //
+        // }, timed)
+      }
+    },
+    async getRightSearchByUserId() {
+      this.progress = 0
+      this.searchInput = ''
+      const {currentPage, size} = this.rightPages
+      const idNumbers = this.leftUserSelections.map(item => item.idNumber).join(',');
+      const willingJobs = this.leftUserSelections.map(item => item.willingJob);
+      // const createTime = Date.now() + 4000
+      this.rightLoading = true
+      let params = {
+        idNumbers,
+        current: currentPage,
+        size,
+      }
+      let paramsBody = {
+        willingJobs: willingJobs
+      }
+      let resData = await getSearchAllByUserId(params, paramsBody)
+      if (resData.data.code === 200) {
+        this.setProgress().then(() => {
+          setTimeout(() => {
+            const {records, total, size, current} = resData.data.data
+            this.rightLoading = false
+            this.rightDataList = records
+            this.rightPages = {total, size, currentPage: current}
+          }, 200)
+        })
+        // const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        // setTimeout(() => {
+        //   const {records, total, size, current} = resData.data.data
+        //   this.rightLoading = false
+        //   this.rightDataList = records
+        //   this.rightPages = {total, size, currentPage: current}
+        // }, timed)
+      }
+    },
+    setProgress(beforResolve) {
+      return new Promise((resolve) => {
+        const time = (Math.random() * 1000) + 500
+        this.timer = setTimeout(() => {
+          this.progress += 1
+          if (this.progress >= 2) {
+            clearTimeout(this.timer)
+            resolve()
+            beforResolve()
+          } else {
+            return this.setProgress(resolve)
+          }
+        }, time)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.push-header {
+  display: flex;
+  justify-content: space-between;
+}
+
+.loading-box {
+  min-width: 600px;
+}
+
+.row-loading {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  color: #666666;
+  margin-top: 10px;
+}
+
+.imgcorrect {
+  width: 20px;
+  height: 20px;
+}
+</style>
diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue
index c6cdf9b..32706cd 100644
--- a/src/views/tenant/main/serve/index.vue
+++ b/src/views/tenant/main/serve/index.vue
@@ -57,9 +57,9 @@
             @search-reset="serveResetChange"
             @size-change="infoSizeChange"
             @current-change="infoCurrentChange">
-            <template slot="menuLeft">
-              <el-button type="primary" size="small" @click="selectPushService">推送服务</el-button>
-            </template>
+            <!--            <template slot="menuLeft">-->
+            <!--              <el-button type="primary" size="small" @click="selectPushService">推送服务</el-button>-->
+            <!--            </template>-->
             <template slot-scope="{row,index}" slot="menu">
               <!--              <el-button type="text"-->
               <!--                         icon="el-icon-document"-->
@@ -267,7 +267,7 @@ import missionView from "../../mission/Table/missionView.vue";
 import workView from "../../works/Table/missionView.vue"
 import TextTooltip from "@/components/text-tooltip/index.vue";
 import {serviceType} from "@/common/dic";
-import PushService from './Dialog/pushService.vue'
+import PushService from './Dialog/pushService2.vue'
 
 const page = {
   pageSize: 10,
@@ -382,18 +382,36 @@ export default {
             searchLabelWidth: 60,
             searchSpan: 7,
           },
+          // {
+          //   label: "手机号",
+          //   prop: "telphone",
+          // },
           {
-            label: "手机号",
-            prop: "telphone",
+            label: '专业',
+            prop: 'aac183Major'
+          },
+          {
+            label: '文化程度',
+            prop: 'aac011',
+            type: 'select',
+            dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC011",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
+          },
+          {
+            label: '户口所在地',
+            prop: 'aac010'
           },
           // {
           //   label: "用户类型",
           //   prop: "userId",
           // },
-          {
-            label: "身份标签",
-            prop: "labelsBase",
-          },
+          // {
+          //   label: "身份标签",
+          //   prop: "labelsBase",
+          // },
         ]
       }
     },
@@ -649,7 +667,7 @@ export default {
     selectPushUserService(row) {
       this.selectPushService().then(() => {
         this.$nextTick(() => {
-          console.log(this.$refs.pushRef, row.name)
+          this.$refs.pushRef.upDateUser(row)
           this.$refs.pushRef.refLeftSearch(row.name)
         })
       })
diff --git a/vue.config.js b/vue.config.js
index 74507a2..3962b32 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,7 +24,8 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        target: 'http://10.165.0.173:8000',
+        target: 'http://192.168.1.115:8000',
+        // target: 'http://10.165.0.173:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {