Skip to content

P
pica.cloud.web-education-admin
提交 54c7cc1f 编写于 作者: yi.li's avatar yi.li
浏览文件
操作

Merge branch 'dev-yqLive-20200611' of... 

Merge branch 'dev-yqLive-20200611' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-yqLive-20200611
上级 c6772182 dd5adecd
显示空白字符变更
内嵌 并排
正在显示 包含 43 行增加 和 70 行删除
src/views/yqrange/create-live.vue
浏览文件 @ 54c7cc1f
<template>
<div class="yqrange-index-wrapper">
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond":curmbThird="curmbThird"></bread-crumb>
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" curmbThird="curmbThird"></bread-crumb>
<div class="yqrange-index-content screenSet" id="screenSet">
<el-row class="step-content">
<el-col :span="12">
......@@ -277,11 +277,10 @@
curmbFirst: '云鹊小圈',
curmbSecond: '直播管理',
curmbThird: '新建直播',
circleId: null,
//页面展示位置
isCollectShow: false,
formData: {
circleId: "",// 圈子ID
circleId: "1",// 圈子ID
name: '',// 直播名称
scope: "1",// 直播范围 1-非公开 2-公开
infoCollect: "0",// 是否采集用户信息 0-否 1-是
......@@ -401,9 +400,6 @@
},
mounted() {
const rtcId = this.$route.query.rtcId;
const circleId = this.$route.query.circleId;
this.circleId = circleId;
this.formData.circleId = circleId;
// if(rtcId){
// this.curmbThird = "编辑直播";
// }
......@@ -428,7 +424,6 @@
}).then((data) => {
if(data.code == "000000") {
this.formData = data.data;
this.formData.circleId = this.circleId;
this.initFormData();
console.log(this.formData);
}
......@@ -692,8 +687,7 @@
// 封装数据
setFormData(){
if(!this.formData.circleId){
// this.formData.circleId = 1;// 测试用
this.formData.circleId = '';
this.formData.circleId = 1;// 测试用
}
if(this.formData.textContent){
this.formData.rtcIntroduces[0].type = 1;
......@@ -754,9 +748,6 @@
this.$message.success("操作成功");
this.$router.push({
path: '/live-manage',
query: {
id: this.circleId
}
})
}
else {
......
src/views/yqrange/live-manage.vue
浏览文件 @ 54c7cc1f
......@@ -307,7 +307,8 @@ export default {
path: "/create-live",
query: {
// rtcId: "16"
rtcId: row.id
rtcId: row.id,
}
});
},
......@@ -326,8 +327,8 @@ export default {
circleId: this.circleId,
name: name,
liveStatus: status,
pageNo: 1,
pageSize: 10
pageNo: this.searchForm.pageNo,
pageSize: this.searchForm.pageSize
};
console.log("alex name = " + name + ", status = " + status);
vm.POST("rtc/liveAdmin/list", req).then(res => {
......@@ -347,6 +348,8 @@ export default {
listData.push(obj);
}
this.tableData = listData;
this.totalRows = res.data.totalRows;
} else {
this.tableData = [];
}
......
src/views/yqrange/role-manage.vue
浏览文件 @ 54c7cc1f
......@@ -65,49 +65,31 @@
<el-table-column label="操作" min-width="300" align="center">
<template slot-scope="scope">
<el-button
v-if="this.idType != 1 && scope.row.level == 0"
v-if="(idType == 1 && scope.row.level == 0) ||
(idType != 1 && scope.row.level == 0 && selfRoleId > scope.row.level)"
@click="promote(scope.row, 1)"
type="text"
size="small"
>升为管理员</el-button>
<el-button
v-if="this.idType != 1 && scope.row.level == 0"
@click="promote(scope.row, 2)"
type="text"
size="small"
>升为主管理员</el-button>
<el-button
v-if="this.idType != 1 && scope.row.level == 1"
@click="promote(scope.row, 2)"
type="text"
size="small"
>升为主管理员</el-button>
<el-button
v-if="this.idType != 1 && scope.row.level == 1"
@click="promote(scope.row, 0)"
type="text"
size="small"
>降为普通成员</el-button>
<el-button
v-if="this.idType != 1 && scope.row.level == 2"
@click="promote(scope.row, 1)"
type="text"
size="small"
>降为管理员</el-button>
<el-button
v-if="this.idType != 1 && scope.row.level == 2"
v-if="(idType == 1 && scope.row.level == 1) ||
(idType != 1 && scope.row.level == 1 && selfRoleId > scope.row.level)"
@click="promote(scope.row, 0)"
type="text"
size="small"
>降为普通成员</el-button>
<el-button
v-if="this.idType != 1 && scope.row.status == 1"
v-if="scope.row.level != 2 &&
(idType == 1 || selfRoleId > scope.row.level) &&
scope.row.status == 1"
@click="addBlackList(scope.row)"
type="text"
size="small"
>加入黑名单</el-button>
<el-button
v-if="this.idType != 1 && scope.row.status == 2"
v-if="scope.row.level != 2 &&
(idType == 1 || selfRoleId > scope.row.level) &&
scope.row.status == 2"
@click="addBlackList(scope.row)"
type="text"
size="small"
......@@ -215,26 +197,27 @@ export default {
name: "第二医院"
}
],
id: null
id: null,
selfRoleId: 0
};
},
created() {
vm = this;
this.id = this.$route.query.id;
// vm.getOrganization();
this.searchList();
this.idType = localStorage.getItem("storageIdType");
console.log("storageIdType = " + localStorage.getItem("storageIdType"));
console.log("storageIdType = " + this.idType);
this.searchList();
},
methods: {
searchList() {
console.log("查询");
let req = {
name: this.searchForm.searchName,
hospitaName: this.searchForm.searchHospital,
hospitalName: this.searchForm.searchHospital,
id: this.id,
pageNo: 1,
pageSize: 10
pageNo: this.searchForm.pageNo,
pageSize: this.searchForm.pageSize
};
vm.POST("circle/circle/members", req)
.then(res => {
......@@ -253,9 +236,9 @@ export default {
let listData = [];
for (let i = 0; i < res.data.memberList.length; i++) {
let roleName = "";
switch (res.data.memberList[i].role_id) {
switch (res.data.memberList[i].roleId) {
case 0:
roleName = "普通成员 1:管理员 2:主管理员 3:审核人员";
roleName = "普通成员";
break;
case 1:
roleName = "管理员";
......@@ -276,13 +259,20 @@ export default {
proTitle: res.data.memberList[i].title,
department: res.data.memberList[i].departmentName,
hospital: res.data.memberList[i].hospitalName,
level: res.data.memberList[i].role_id,
level: res.data.memberList[i].roleId,
doctorId: res.data.memberList[i].id,
status: res.data.memberList[i].status
};
listData.push(obj);
}
this.tableData = listData;
this.selfRoleId = res.data.roleId;
// console.log("searchList() : this.selfRoleId = " + this.selfRoleId +
// ", name = " + tableData[1].name + ", level = " + tableData[1].level +
// ", doctorId = " + tableData[1].doctorId + ", status = " + tableData[1].status);
console.log("searchList() : this.selfRoleId = " + this.selfRoleId)
this.totalRows = res.data.count;
} else {
// vm.$message.info(res.message);
// vm.$message.info("操作失败，请重试");
......@@ -291,20 +281,6 @@ export default {
.catch(function(error) {
vm.$message.error(error);
});
//model data
// let listData = [];
// let obj = {
// role: "大总管",
// name: "小小",
// proTitle: "妇科老大",
// department: "总经办",
// hospital: "青山神经病院",
// level: 3,
// doctorId: 789
// };
// listData.push(obj);
// this.tableData = listData;
},
resetForm() {
console.log("重置");
......@@ -415,6 +391,7 @@ export default {
message: "操作成功"
});
// vm.search();
vm.searchList();
if (res.message != "success") {
vm.$message({
message: res.message,
......@@ -437,9 +414,9 @@ export default {
//加入黑名单
addBlackList(row) {
vm = this;
let option = "加入黑名单"
let option = "加入黑名单";
if (row.status == 2) {
option = "移出黑名单"
option = "移出黑名单";
}
this.$confirm(`确定将“${row.name}”${option}吗`, "", {
confirmButtonText: "确定",
......@@ -453,10 +430,12 @@ export default {
);
let req = {
id: this.id,
doctorId: row.doctorId,
doctorId: row.doctorId
};
vm.GET(
"circle/circle/" + this.id + "/" + row.doctorId + "/freeControl", req)
"circle/circle/" + this.id + "/" + row.doctorId + "/freeControl",
req
)
.then(res => {
if (res.code == "000000") {
vm.$message({
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或