diff --git a/src/api/boe/userbasic.js b/src/api/boe/userbasic.js
index e39caf97..efdaa20d 100644
--- a/src/api/boe/userbasic.js
+++ b/src/api/boe/userbasic.js
@@ -40,6 +40,13 @@ const getUserCrowds = function() {
return ajax.postJson(baseURL,'/audience/userAudiences',{});
}
+/**
+ * 获取用户过滤后的受众,只是查询已发布的
+ * {"page":1,pageSize:100,"keyword":""}
+ */
+const getUserAudiences = function(data) {
+ return ajax.postJson(baseURL,'/audience/userAudiencesFilter',data);
+}
/**
* 获取hrbp数据
@@ -63,6 +70,7 @@ export default {
findOrgTreeByOrgId,
getUserInfoById,
getUserCrowds,
+ getUserAudiences,
getOrgHrbpInfo,
modifyPassword
}
diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index 3834ef69..22f2b98b 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -606,6 +606,11 @@ export default {
}),
loadUserGroup(){
let $this=this;
+ let params = {
+ keyword:'',
+ page:1,
+ pageSize:1000
+ }
// apiUserGroup.findByName('').then(rs=>{
// if(rs.status==200){
// let crowdList=[];
@@ -619,10 +624,10 @@ export default {
// this.userGroupList=crowdList;
// }
// });
- apiUserBasic.getUserCrowds().then(rs=>{
+ apiUserBasic.getUserAudiences(params).then(rs=>{
if(rs.status==200){
let crowdList=[];
- rs.result.forEach(item=>{
+ rs.result.audienceList.forEach(item=>{
crowdList.push({
id:item.id,
name:item.audienceName,
diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue
index 39bb78da..b99369e9 100644
--- a/src/views/exam/ExamList.vue
+++ b/src/views/exam/ExamList.vue
@@ -628,10 +628,10 @@
未发布
-
+
- 普通受众
- 自动受众
+ 普通受众
+ 自动受众
@@ -861,12 +861,11 @@ export default {
this.pushLoading=false;
},
getUserGroup(){
- // let params = {
- // status:'1',
- // name:this.pushData.keyword,
- // pageIndex:this.pushData.pageIndex,
- // pageSize:this.pushData.pageSize
- // }
+ let params = {
+ keyword:this.pushData.keyword,
+ page:this.pushData.pageIndex,
+ pageSize:this.pushData.pageSize
+ }
// usergroupApi.list(params).then((res) => {
// if (res.status == 200) {
// this.pushData.data = res.result.list;
@@ -874,19 +873,24 @@ export default {
// }
// });
//从接口中获取受众数据,22/11/28
- apiUserBasic.getUserCrowds().then(res=>{
+ apiUserBasic.getUserAudiences(params).then(res=>{
if(res.status==200){
let list=[];
- res.result.forEach(crowd=>{
+ this.pushData.count = res.result.totalElement;
+ res.result.audienceList.forEach(crowd=>{
list.push({
id:crowd.id,
kid:crowd.kid,
name:crowd.audienceName,
+ sysCreateTime:crowd.createAt,
audienceType:crowd.audienceType,
- type:crowd.type
+ users:crowd.totalMember,
+ type:crowd.type,
+ status:crowd.status
})
});
- this.pushData.data=list
+ this.pushData.data=list;
+ //计算总页面
}
})