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

src/api/tenant/serve.js

@@ -1,209 +1,206 @@
-import request from '@/router/axios';
+import request from "@/router/axios";
 /*获取人才列表*/
-export const getList =
-    (current, size, params, groupId) => {
+export const getList = (current, size, params, groupId) => {
   return request({
-        url: '/api/jobslink-api/serve/list',
-        method: 'get',
+    url: "/api/jobslink-api/serve/list",
+    method: "get",
     params: { ...params, current, size, groupId }
-      })
-    }
+  });
+};
 
 /*新增人才*/
-export const add =
-    (row) => {
-      return request(
-          {url: '/api/jobslink-api/serve/save', method: 'post', data: row})
-    }
+export const add = row => {
+  return request({
+    url: "/api/jobslink-api/serve/save",
+    method: "post",
+    data: row
+  });
+};
 
 /*编辑人才*/
-export const update =
-    (row) => {
+export const update = row => {
   return request({
-        url: '/api/jobslink-api/serve/update',
-        method: 'post',
+    url: "/api/jobslink-api/serve/update",
+    method: "post",
     data: row
-      })
-    }
+  });
+};
 
 /*删除人才*/
-export const remove =
-    (ids) => {
+export const remove = ids => {
   return request({
-        url: '/api/jobslink-api/serve/remove',
-        method: 'post',
+    url: "/api/jobslink-api/serve/remove",
+    method: "post",
     params: { ids }
-      })
-    }
+  });
+};
 
 /*人才详情*/
-export const detail =
-    (id) => {
+export const detail = id => {
   return request({
-        url: '/api/jobslink-api/serve/detail',
-        method: 'get',
+    url: "/api/jobslink-api/serve/detail",
+    method: "get",
     params: { id }
-      })
-    }
-
+  });
+};
 
 /*获取分组*/
-export const getDept =
-    () => {
+export const getDept = () => {
   return request({
-        url: '/api/jobslink-api/serve/group/listAll',
-        method: 'get',
+    url: "/api/jobslink-api/serve/group/listAll",
+    method: "get",
     params: {}
-      })
-    }
+  });
+};
 
 /*新建分组*/
-export const addDept =
-    (row) => {
+export const addDept = row => {
   return request({
-        url: '/api/jobslink-api/serve/group/save',
-        method: 'post',
+    url: "/api/jobslink-api/serve/group/save",
+    method: "post",
     data: row
-      })
-    }
-
+  });
+};
 
 /*编辑分组*/
-export const updateDept =
-    (row) => {
+export const updateDept = row => {
   return request({
-        url: '/api/jobslink-api/serve/group/update',
-        method: 'post',
+    url: "/api/jobslink-api/serve/group/update",
+    method: "post",
     data: row
-      })
-    }
-
+  });
+};
 
 /*删除分组*/
-export const removeDept =
-    (ids) => {
+export const removeDept = ids => {
   return request({
-        url: '/api/jobslink-api/serve/group/remove',
-        method: 'post',
+    url: "/api/jobslink-api/serve/group/remove",
+    method: "post",
     params: { ids }
-      })
-    }
-
+  });
+};
 
 /*转移分组*/
-export const transferDept =
-    (groupIds, ids) => {
+export const transferDept = (groupIds, ids) => {
   return request({
-        url: '/api/jobslink-api/serve/updateAllGroup',
-        method: 'post',
+    url: "/api/jobslink-api/serve/updateAllGroup",
+    method: "post",
     params: { groupIds, ids }
-      })
-    }
+  });
+};
 
 /*导入人才库*/
 export const upload = () => {
-  return `/api/jobslink-api/serve/group/import?isCovered=1`
-}
+  return `/api/jobslink-api/serve/group/import?isCovered=1`;
+};
 
 /*转移分组*/
-export const getServeListTalents =
-  (params) => {
+export const getServeListTalents = params => {
   return request({
-      url: '/api/jobslink-api/serve/listTalents',
-      method: 'get',
+    url: "/api/jobslink-api/serve/listTalents",
+    method: "get",
     params: params
-    })
-  }
+  });
+};
 
 /*匹配岗位和任务*/
-export const getMatchWorkStation =
-  (params) => {
+export const getMatchWorkStation = params => {
   return request({
-      url: '/api/jobslink-api/tenant/mainServeUserPost/postPage',
-      method: 'get',
+    url: "/api/jobslink-api/tenant/mainServeUserPost/postPage",
+    method: "get",
     params: params
-    })
-  }
+  });
+};
 
 /*匹配政策*/
-export const getMatchPolicy =
-  (params) => {
+export const getMatchPolicy = params => {
   return request({
-      url: '/api/jobslink-api/serve/listPolicy',
-      method: 'get',
+    url: "/api/jobslink-api/serve/listPolicy",
+    method: "get",
     params: params
-    })
-  }
+  });
+};
 
 /*服务日志*/
-export const getMatchServeList =
-  (params) => {
+export const getMatchServeList = params => {
   return request({
-      url: '/api/jobslink-api/tenant/mainserveuserlog/page',
-      method: 'get',
+    url: "/api/jobslink-api/tenant/mainserveuserlog/page",
+    method: "get",
     params: params
-    })
-  }
+  });
+};
 
-  export const getListAllPolicy =
-  (params) => {
+export const getListAllPolicy = params => {
   return request({
-      url: '/api/jobslink-api/serve/listAllPolicy',
-      method: 'get',
+    url: "/api/jobslink-api/serve/listAllPolicy",
+    method: "get",
     params: params
-    })
-  }
+  });
+};
 
+export const getListAllByLabels = params =>
+  request({
+    url: "/api/jobslink-api/tenant/talents/listAllByLabels",
+    method: "get",
+    params: params
+  });
+export const getListGroupByLabels = params =>
+  request({
+    url: "/api/jobslink-api/tenant/talents/listGroupByLabels",
+    method: "get",
+    params: params
+  });
+export const getListAllByPolicy = params =>
+  request({
+    url: "/api/jobslink-api/tenant/talents/listAllByPolicy",
+    method: "get",
+    params: params
+  });
 
-  export const getListAllByLabels = (params) => request({
-      url: '/api/jobslink-api/tenant/talents/listAllByLabels',
-      method: 'get',
+export const getServeAllPolicyList = params =>
+  request({
+    url: "/api/jobslink-api/serve/listAllPolicy",
+    method: "get",
     params: params
-    })
-  export const getListGroupByLabels = (params) => request({
-      url: '/api/jobslink-api/tenant/talents/listGroupByLabels',
-      method: 'get',
-      params: params
-    })
-  export const getListAllByPolicy = (params) => request({
-      url: '/api/jobslink-api/tenant/talents/listAllByPolicy',
-      method: 'get',
-      params: params
-    })
+  });
 
-  export const getServeAllPolicyList = (params) => request({
-      url: '/api/jobslink-api/serve/listAllPolicy',
-      method: 'get',
+export const getListByids = params =>
+  request({
+    url: "/api/jobslink-api/policy/listByids",
+    method: "get",
     params: params
-    })
+  });
 
- export const getListByids = (params) => request({
-      url: '/api/jobslink-api/policy/listByids',
-      method: 'get',
+export const getSearchAll = params =>
+  request({
+    url: "/api/jobslink-api/serve/searchAll",
+    method: "get",
     params: params
-    })
-
- export const getSearchAll = (params) => request({
-      url: '/api/jobslink-api/serve/searchAll',
-      method: 'get',
+  });
+export const getSearchAllByUserId = params =>
+  request({
+    url: "/api/jobslink-api/serve/pushSearchList",
+    method: "get",
     params: params
-    })
+  });
 
- export const pushPolicyUserServe  = (params) => request({
-      url: '/api/jobslink-api/serve/push/policyUserServe',
-      method: 'post',
+export const pushPolicyUserServe = params =>
+  request({
+    url: "/api/jobslink-api/serve/push/policyUserServe",
+    method: "post",
     data: params
-    })
+  });
 
- export const pushPostUserServe  = (params) => request({
-      url: '/api/jobslink-api/serve/push/postUserServe',
-      method: 'post',
+export const pushPostUserServe = params =>
+  request({
+    url: "/api/jobslink-api/serve/push/postUserServe",
+    method: "post",
     data: params
-    })
+  });
 
- export const getListAllTalents  = (params) => request({
-      url: '/api/jobslink-api/serve/listAllTalents',
-      method: 'get',
+export const getListAllTalents = params =>
+  request({
+    url: "/api/jobslink-api/serve/listAllTalents",
+    method: "get",
     params
-    })
-
+  });

src/views/tenant/main/serve/Dialog/pushService.vue

@@ -1,32 +1,18 @@
 <template>
-  <el-drawer
-    size="100%"
-    append-to-body
-    title="推送服务"
-    :visible.sync="viewDrawer"
-  >
+  <el-drawer size="100%" append-to-body title="推送服务" :visible.sync="viewDrawer">
     <div>
       <div class="content">
         <!--  用户板块  -->
         <div class="content-left relative">
-           <avue-crud
-             height="900"
-             ref="crud1"
-             :data="leftUserDataList"
-             :option="leftUserOptions"
-             :page.sync="leftPages"
-             @current-change="leftCurrentPageChange"
-             @size-change="leftSizePageChange"
-             @selection-change="leftSelectionChange"
-           >
+          <avue-crud height="900" ref="crud1" :data="leftUserDataList" :option="leftUserOptions" :page.sync="leftPages"
+            @current-change="leftCurrentPageChange" @size-change="leftSizePageChange"
+            @selection-change="leftSelectionChange">
             <template slot="menuLeft">
               <div class="leftInput">
                 <el-input size="small" v-model="formInline.userName" class="input-with-select" placeholder="用户名">
-                   <el-select size="small" v-model="formInline.groupId" slot="prepend" class="selectWidth" placeholder="请选择">
-                     <el-option
-                       v-for="item in leftServeOptions"
-                       :key="item.id"
-                       :label="item.groupName"
+                  <el-select size="small" v-model="formInline.groupId" slot="prepend" class="selectWidth"
+                    placeholder="请选择">
+                    <el-option v-for="item in leftServeOptions" :key="item.id" :label="item.groupName"
                       :value="item.value">
                     </el-option>
                   </el-select>
@@ -43,27 +29,18 @@
         <!--  操作  -->
         <div class="content-center">
           <div><el-button type="primary" size="small" @click="changeTabs(0)">匹配政策</el-button></div>
-           <div style="margin-top: 30px"><el-button type="primary" @click="changeTabs(1)" size="small">匹配岗位</el-button></div>
+          <div style="margin-top: 30px"><el-button :disabled="leftUserSelections.length > 0 ? false : true"
+              type="primary" @click="changeTabs(1)" size="small">匹配岗位</el-button>
+          </div>
         </div>
         <!--  列表  -->
         <div class="content-right relative">
-             <avue-crud
-               height="900"
-               ref="crud2"
-               :data="rightDataList"
-               :option="rightTabs ? rightPostOptions : rightPolicyOptions"
-               :page.sync="rightPages"
-               @selection-change="rightSelectionChange"
-             >
+          <avue-crud height="900" ref="crud2" :data="rightDataList"
+            :option="rightTabs ? rightPostOptions : rightPolicyOptions" :page.sync="rightPages"
+            @selection-change="rightSelectionChange">
             <template slot="menuLeft">
-                 <el-input
-                   style="width: 300px"
-                   placeholder="搜索岗位"
-                   v-show="rightTabs === 1"
-                   prefix-icon="el-icon-search"
-                   @input="searchInputChange"
-                   v-model="searchInput"
-                   clearable>
+              <el-input style="width: 300px" placeholder="搜索岗位" v-show="rightTabs === 1" prefix-icon="el-icon-search"
+                @input="searchInputChange" v-model="searchInput" clearable>
               </el-input>
             </template>
             <template slot="labelName" slot-scope="{row}">
@@ -92,6 +69,7 @@ import {
   getServeAllPolicyList,
   getListByids,
   getSearchAll,
+  getSearchAllByUserId,
   pushPolicyUserServe,
   pushPostUserServe,
   getListAllByPolicy
@@ -233,8 +211,9 @@ export default {
       this.rightTabs = type
       this.rightDataSelections = []
       this.$message.success('智能分析匹配中');
+
       type === 0 && this.getRightListPolicy()
-      type === 1 && this.getRightSearch()
+      type === 1 && this.getRightSearchByUserId()
     },
     searchInputChange: debounce(function (val) {
       this.getRightSearch()
@@ -256,6 +235,7 @@ export default {
     },
     leftSelectionChange(val) {
       this.leftUserSelections = val
+      console.log(val, '--------------------00000');
     },
     rightSelectionChange(val) {
       this.rightDataSelections = val
@@ -325,6 +305,19 @@ export default {
 
       }
     },
+    async getRightSearchByUserId() {
+      const ids = this.leftUserSelections.map(item => item.userId).join(',');
+      const createTime = Date.now() + 3000
+      this.rightLoading = true
+      let resData = await getSearchAllByUserId({ ids })
+      if (resData.data.code === 200) {
+        const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        setTimeout(() => {
+          this.rightLoading = false
+          this.rightDataList = resData.data.data
+        }, timed)
+      }
+    },
     async getRightListPolicy() {
       let params = { ids: this.rowData.policyIds }
       const createTime = Date.now() + 3000
@@ -382,9 +375,9 @@ export default {
   display: grid;
   grid-template-columns: 1fr 60px 1fr;
   grid-gap: 20px;
-  .content-left{
 
-  }
+  .content-left {}
+
   .content-center {
     width: 100%;
     height: 100%;
@@ -393,21 +386,27 @@ export default {
     justify-content: center;
     flex-direction: column;
   }
+
   .content-right {
+
     //修改动画的大小  给文字加粗效果
     .right-search {
       width: 100%;
     }
 
   }
+
   .leftInput {
     width: 500px;
+
     .selectWidth {
       width: 160px !important;
     }
+
     .el-input__inner {
       width: 300px;
     }
+
     .input-search {
       margin-right: -15px;
       margin-bottom: -10px;
@@ -415,10 +414,12 @@ export default {
   }
 
 }
+
 /deep/.el-loading-spinner {
   font-size: 80px;
   font-weight: bold;
 }
+
 /deep/.el-loading-spinner .circular {
   width: 80px;
   height: 80px;
@@ -427,6 +428,7 @@ export default {
 .content-footer {
   float: right;
 }
+
 .relative {
   position: relative;
 }