Skip to content

P
pica.cloud.web-education-admin
提交 d20d9c47 编写于 作者: kai.wang's avatar kai.wang
浏览文件
操作

Merge branch 'dev-circle-nine-20201231' of... 

Merge branch 'dev-circle-nine-20201231' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-circle-nine-20201231
上级 3199fc1e 4904990e
隐藏空白字符变更
内嵌 并排
正在显示 包含 111 行增加 和 195 行删除
src/utils/activitymanagement/activitymanagementApi.js
浏览文件 @ d20d9c47
......@@ -70,6 +70,7 @@ export const removeDoc = (params) => {
method: 'post',
data: params,
description: '后台管理--专区活动成员移除',
withCredentials: true
})
};
......
src/utils/plaza/plazaApi.js
浏览文件 @ d20d9c47
......@@ -57,8 +57,9 @@ export const delPlaza = (params) => {
headers,
url: getBaseUrl(`circle/sso/square/remove`),
method: 'delete',
data: params,
params: params,
description: '后台管理--广场内专区移除',
withCredentials: true
})
};
......@@ -74,10 +75,10 @@ export const getPlaza = (params) => {
})
};
export const getSelectPlazaList = () => {
export const getSelectPlazaList = (params) => {
return fetch({
headers,
url: getBaseUrl(`circle/sso/square/circle/list`),
url: getBaseUrl(`circle/sso/square/circle/list/${params.businessId}`),
method: 'get',
description: '后台管理--待选专区列表',
})
......
src/views/activitymanagement/activity-member.vue
浏览文件 @ d20d9c47
......@@ -14,12 +14,12 @@
<!--</el-upload>-->
</el-col>
<el-col class="organization-search">
<el-form :inline="true" :model="formOrganization" class="demo-form-inline" >
<el-form :inline="true" :model="memberForm" class="demo-form-inline" >
<el-form-item label="机构:">
<el-input style="width:140px;" size="small" v-model="formOrganization.orgName" placeholder="请输入机构名称"></el-input>
<el-input style="width:140px;" size="small" v-model="memberForm.hospitalName" placeholder="请输入机构名称"></el-input>
</el-form-item>
<el-form-item label="姓名:">
<el-input style="width:140px;" size="small" v-model="formOrganization.name" placeholder="请输入人员姓名"></el-input>
<el-input style="width:140px;" size="small" v-model="memberForm.doctorName" placeholder="请输入人员姓名"></el-input>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="serch()">搜索</el-button>
......@@ -30,10 +30,10 @@
</el-form>
</el-col>
</el-row>
<el-table class="rim" ref="multipleOrganization" :data="peoplesDtoList" tooltip-effect="dark" style="width: 100%">
<el-table-column prop="name" label="人员" min-width="100" align="center"></el-table-column>
<el-table-column prop="department" label="所属科室" align="center"></el-table-column>
<el-table-column prop="hospital" label="所属医院" align="center"></el-table-column>
<el-table class="rim" ref="multipleOrganization" :data="activityDoctorModelList" tooltip-effect="dark" style="width: 100%">
<el-table-column prop="doctorName" label="人员" min-width="100" align="center"></el-table-column>
<el-table-column prop="departmentName" label="所属科室" align="center"></el-table-column>
<el-table-column prop="hospitalName" label="所属医院" align="center"></el-table-column>
<el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column>
<el-table-column prop="cityName" label="所属城市" align="center"></el-table-column>
<el-table-column prop="countyName" label="所属区县" align="center"></el-table-column>
......@@ -56,7 +56,7 @@
</el-table>
<div class="pagination">
<el-pagination background @size-change="handleSizeOrganization" @current-change="handleCurrentOrganization"
:current-page="formOrganization.pageNum" :page-sizes="[10, 30, 50, 100, 200]" :page-size="formOrganization.pageSize"
:current-page="memberForm.pageNum" :page-sizes="[10, 30, 50, 100, 200]" :page-size="memberForm.pageSize"
layout="total, sizes, prev, pager, next, jumper" :total="totalPeople"></el-pagination>
</div>
<el-dialog
......@@ -149,37 +149,41 @@
</el-dialog>
<el-dialog
title="批量导入"
:visible.sync="dialogImportVisible"
width="650px"
:close-on-click-modal="false"
@close="handleImportClose"
center>
<div style="float:left;width: 250px;">
<span>1.下载模板，填写信息</span>
<br>
<div>
<el-button type="primary" size="small" style="float:left; margin-top: 30px;" @click="download1">下载模板1</el-button>
<span style="float:left; margin-top: 72px;margin-left: -90px;">填写人员明细导入</span>
</div>
<div>
<el-button type="primary" size="small" style="margin-top: 30px;margin-left: 48px;" @click="download2">下载模板2</el-button>
<span style="float: right;margin-top:10px;">填写人员ID导入</span>
</div>
</div>
<div style="float:left;margin-left: 90px;width: 1px;height: 100px; background: #c8cbd2;"></div>
<div style="margin-left: 400px;height: 130px;">
<span>2.上传填写好的文件</span>
<br>
<el-upload
class="bg-uploader"
action="#"
:show-file-list="false"
:before-upload="beforeUploadDoc">
<el-button type="primary" size="small" style="margin-top: 30px;">上传文件</el-button>
</el-upload>
<el-dialog
title="批量导入"
:visible.sync="dialogImportVisible"
width="650px"
:close-on-click-modal="false"
@close="handleImportClose"
center>
<div style="float:left;width: 250px;">
<span>1.下载模板，填写信息</span>
<br>
<div>
<el-button type="primary" size="small" style="float:left; margin-top: 30px;" @click="download1">下载模板</el-button>
</div>
</div>
<div style="float:left;margin-left: 40px;width: 1px;height: 100px; background: #c8cbd2;"></div>
<div style="margin-left: 400px;height: 130px;">
<span>2.上传填写好的文件</span>
<br>
<el-upload
class="bg-uploader"
action="#"
:show-file-list="false"
:before-upload="beforeUploadDoc">
<el-button type="primary" size="small" style="margin-top: 30px;">上传文件</el-button>
</el-upload>
</el-dialog>
</div>
</el-dialog>
</div>
</div>
......@@ -207,37 +211,6 @@
},
data() {
return {
props: {
lazy: true,
lazyLoad(node, resolve) {
const { level } = node;
if (node.level == 1) {
let req = {
provinceId: node.data.value
};
vm.GET("basic-data/position/cities", req).then(res => {
let newData = vm.setMoreOption(res.data.cityList, "cities");
resolve(newData);
});
} else if (node.level == 2) {
let req = {
cityId: node.data.value
};
vm.GET("basic-data/position/counties", req).then(res => {
let newData = vm.setMoreOption(res.data.countyList, "counties");
resolve(newData);
});
} else if (node.level == 3) {
let req = {
countyId: node.data.value
};
vm.GET("basic-data/position/towns", req).then(res => {
let newData = vm.setMoreOption(res.data.townList, "towns");
resolve(newData);
});
}
}
},
curmbFirst: '活动管理',
// curmbSecond: '直播管理',
curmbThird: '新建直播',// /live-manage?id=
......@@ -258,10 +231,10 @@
value: 2
},
],
peoplesDtoList: [],
activityDoctorModelList: [],
totalPeople: 10,
selectionList:[],
formOrganization: {
memberForm: {
name: '',
orgName: '',
source: 0,
......@@ -291,7 +264,7 @@
//Idtype:1,内部 2.外部
vm.idType = localStorage.getItem("storageIdType");
this.initRange();
this.init();
if(vm.idType == 1){
this.showImportFlag = true;
}
......@@ -313,46 +286,25 @@
mounted() {
},
methods: {
initRange() {
this.formOrganization.pageNum = 1;
this.formOrganization.name = "";
this.formOrganization.orgName = "";
this.formOrganization.source = 0
init() {
this.memberForm.pageNum = 1;
this.memberForm.name = "";
this.memberForm.orgName = "";
this.memberForm.source = 0
this.getList(1)
},
setMoreOption(data, type) {
let option = [];
for (let i = 0; i < data.length; i++) {
let obj = data[i];
if (type == "cities") {
obj.label = data[i].cityName;
obj.value = data[i].cityId;
} else if (type == "counties") {
obj.label = data[i].countyName;
obj.value = data[i].countyId;
} else if (type == "towns") {
obj.label = data[i].townName;
obj.value = data[i].townId;
obj.leaf = true;
}
option.push(obj);
}
return option;
},
serch() {
this.formOrganization.pageNum = 1;
this.memberForm.pageNum = 1;
this.getList()
},
getList(first) {
let idType = localStorage.getItem("storageIdType");
let req = {
circleId: this.circleId,
countryFlag: true,
name: this.formOrganization.name.trim(),
orgName: this.formOrganization.orgName.trim(),
pageNo: this.formOrganization.pageNum,
pageSize: this.formOrganization.pageSize,
source: this.formOrganization.source,
activityId: this.id,
hospitalName: this.memberForm.hospitalName,
doctorName: this.memberForm.hospitalName,
pageNo: this.memberForm.pageNum,
pageSize: this.memberForm.pageSize
};
openLoading(vm);
getActivityDocList(req).then(res => {
......@@ -361,7 +313,7 @@
}
if (res.code == "000000") {
this.peoplesDtoList = res.data.peoplesDtoList;
this.activityDoctorModelList = res.data.activityDoctorModelList;
this.totalPeople = res.data.total;
this.setPleTotal()
} else {
......@@ -374,36 +326,40 @@
//重置机构、人员查询
reset() {
this.initRange()
this.memberForm.hospitalName = "";
this.memberForm.doctorName = "";
this.init()
},
//机构table修改
handleSizeOrganization(val) {
console.log(`每页 ${val} 条`);
this.formOrganization.pageSize = val;
this.memberForm.pageSize = val;
this.getList();
},
handleCurrentOrganization(val) {
//console.log(`当前页: ${val}`);
this.formOrganization.pageNum = val;
this.memberForm.pageNum = val;
this.getList();
},
detel(item) {
this.detelMessage = `删除后 "${item.name}" 将无法访问本圈, 确定删除么?`
this.detelMessage = `删除后 "${item.doctorName}" 将无法看到该活动, 确定删除么?`
this.deleteVisible = true
this.clickItem = item
},
confirmDelete() {
let params = {
circleId: this.circleId,
docIds: [this.clickItem.id]
// activityDoctorRemoveReq: {
activityId: this.id,
removeDoctorId: this.clickItem.doctorId
// }
}
mprDeleteOrg(params).then((res) => {
removeDoc(params).then((res) => {
this.$message({
type: 'success',
message: '删除成功!'
});
this.deleteVisible = false
this.formOrganization.pageNum = 1;
this.memberForm.pageNum = 1;
this.getList()
}).catch(() => {
this.$message.error('删除失败，请稍后重试');
......@@ -425,7 +381,7 @@
},
addPeople() {
this.dialogOrg = false
this.initRange()
this.init()
},
......@@ -450,12 +406,12 @@
openLoading(vm);
let formData = new FormData();
formData.append("circleId", vm.circleId);
formData.append("activityId", vm.id);
formData.append("file", file);
// let files = new window.File();
uploadDoc(formData).then(res => {
importDoc(formData).then(res => {
closeLoading(vm);
if (res.code == "000000") {
......@@ -467,7 +423,7 @@
vm.dialogTitle = "导入成功";
vm.importSuccessFlag = true;
vm.importNum = res.data.successNum;
vm.initRange();
vm.init();
// vm.searchOrganization();
// vm.$emit('refreshRenYuan');
}
......@@ -479,11 +435,6 @@
vm.importNum = res.data.failNum;
vm.errorFileUrl = res.data.file;
// this.$message({
// type: 'success',
// message: '导入成功!'
// });
}
}
else {
......@@ -493,35 +444,7 @@
});
}
// if (res.code == "000000") {
//
//
// if(res.data.successNum == 0 && res.data.wrongDataList.length > 0){
//
// this.dialogVisible = true;
//
// this.dialogErrorData = res.data.wrongDataList;
// }
// else {
// this.$message({
// type: 'success',
// message: '导入成功!'
// });
// vm.initRange();
// }
//
// }
// else {
// this.$message({
// type: 'error',
// message: res.message
// });
// }
// vm.setDialog(res);
});
// };
// reader.readAsDataURL(file);
},
handleErrorClose() {
......@@ -537,11 +460,16 @@
this.dialogImportVisible = false;
},
// 下载模板
// 下载模板1
download1(){
const url = "https://files.yunqueyi.com/template/import_people_by_name_mobile.xlsx";
window.location.href = url;
},
// 下载模板2
download2(){
const url = "https://files.yunqueyi.com/template/import_hospital_by_id.xlsx";
window.location.href = url;
},
// 下载错误数据文件
downloadFile(){
window.location.href = vm.errorFileUrl;
......@@ -551,11 +479,10 @@
</script>
<style lang="scss" scoped>
.organization {
.add-organization {
margin-left: 20px;
line-height: 20px;
width: 60px;
width: 100px;
cursor: pointer;
padding-top: 10px;
i {
......@@ -569,5 +496,4 @@
margin-right: 10px;
text-align: right;
}
}
</style>
src/views/plaza/plaza-list.vue
浏览文件 @ d20d9c47
......@@ -21,7 +21,7 @@
<el-select multiple :multiple-limit="5"
v-model="searchForm.diseaseIdList"
id="statusSelector"
placeholder="请选择发布状态"
placeholder="请选择疾病标签"
clearable
style="margin-left:20px;height: 32px;line-height: 32px;"
>
......@@ -41,7 +41,7 @@
<el-select multiple :multiple-limit="5"
v-model="searchForm.deptIdList"
id="statusSelector"
placeholder="请选择发布状态"
placeholder="请选择科室标签"
clearable
style="margin-left:20px;height: 32px;line-height: 32px;"
>
......@@ -59,7 +59,7 @@
<el-select multiple :multiple-limit="5"
v-model="searchForm.subjectIdList"
id="statusSelector"
placeholder="请选择发布状态"
placeholder="请选择学科标签"
clearable
style="margin-left:20px;height: 32px;line-height: 32px;"
>
......@@ -131,7 +131,7 @@
</div>
<el-dialog
title="添加专区"
:title="title"
:visible.sync="dialogVisible"
width="700px"
:close-on-click-modal="false"
......@@ -305,9 +305,9 @@
plazaForm: {
id:'',
businessId: "",
deptIdList: [],
diseaseIdList: [],
subjectIdList: []
diseaseTagIds: [],
deptTagIds: [],
subjectTagIds: []
},
disabledOpenFlag: false, // 开启回放是否可点
downloadVideoFlag: true,// 拉流直播不显示下载
......@@ -345,7 +345,8 @@
deptList: [],
subjectList: [],
selectPlazaList: [],
editFlag: false
editFlag: false,
title: "",
};
},
props:{
......@@ -397,8 +398,11 @@
},
getSelectPlazaList(){
getSelectPlazaList().then(res => {
getSelectPlazaList(businessId){
let params = {
businessId: businessId
};
getSelectPlazaList(params).then(res => {
if (res.code == "000000") {
vm.selectPlazaList = res.data;
}
......@@ -410,20 +414,19 @@
this.getPlazaList("", "");
},
resetForm() {
console.log("重置alex");
// this.$router.push({
// path: '/role-manage',
// })
this.searchForm.liveName = "";
this.searchForm.liveStatus = "";
vm.searchForm.squareName = "";
vm.searchForm.deptIdList = [];
vm.searchForm.diseaseIdList = [];
vm.searchForm.subjectIdList = [];
this.search();
},
//添加专区
createPlaza() {
vm.plazaForm.businessId = "";
vm.dialogVisible = true;
vm.title = "添加专区";
vm.editFlag = false;
vm.getSelectPlazaList();
vm.getSelectPlazaList(0);
},
......@@ -601,10 +604,6 @@
editPlaza(row) {
vm.editFlag = true;
vm.plazaForm.id = row.id;
// vm.plazaForm.businessId = row.businessId;
if(vm.selectPlazaList.length == 0){
vm.getSelectPlazaList();
}
let params = {
id:row.id
}
......@@ -614,7 +613,8 @@
if(res.code == "000000") {
vm.dialogVisible = true;
vm.plazaForm = res.data;
vm.plazaForm.diseaseIdList = [780,781];
vm.title = "编辑专区";
vm.getSelectPlazaList(vm.plazaForm.businessId);
} else {
this.$message.error("添加失败，请重试");
}
......@@ -625,32 +625,24 @@
},
//删除专区
delPlaza(row) {
// 直播中
if(row.liveStatus == 2){
vm.$message({
type: "warning",
message: "直播中无法删除，请直播结束后重试"
});
}
// 1:直播预告；4:直播结束后，可以删除
else if(row.liveStatus == 1 || row.liveStatus == 4){
this.$confirm(`确定删除“${row.name}”吗？`, "", {
this.$confirm(`移除专区后，用户将无法在广场中看到，但不会删除专区本身，确定移除？`, "", {
confirmButtonText: "删除",
cancelButtonText: "取消",
type: "warning"
// customClass: 'range-make-box',
})
.then(() => {
let params = {
id: row.id
}
// confirm
vm.DELETE("rtc/liveAdmin/" + row.id, {}).then(res => {
delPlaza(params).then(res => {
if (res.code == "000000") {
vm.$message({
type: "success",
message: "删除成功"
});
this.getLiveList("", "");
this.getPlazaList("", "");
} else {
vm.$message({
type: "warning",
......@@ -660,10 +652,6 @@
});
})
.catch(() => {});
}
},
// //编辑直播
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或