Skip to content

P
pica.cloud.web-education-admin
提交 3ee370ef 编写于 作者: alex.zhang's avatar alex.zhang
浏览文件
操作

fix bug

上级 fb24358a
显示空白字符变更
内嵌 并排
正在显示 包含 159 行增加 和 126 行删除
src/utils/fetch.js
浏览文件 @ 3ee370ef
......@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
}
if( process.env.BUILD_ENV == "development" ){ // 本地开发环境qgit
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
config.headers['token'] = 'A73290A265634DA9B0CF2A09C5F2B7F8';
config.headers['token'] = 'B27DC440F5A04807AEA8E31B2B58EDF8';
// config.headers['token'] = '4559D8D1D615430991878A1264830A04';
// config.headers['token'] = 'B6A38C32790E4462BC451C335F65848E';
// config.headers['token'] = localStorage.getItem('storageToken')
......
src/views/yqrange/live-manage.vue
浏览文件 @ 3ee370ef
......@@ -20,6 +20,7 @@
<el-form-item label="直播状态">
<el-select
v-model="searchForm.liveStatus"
id="statusSelector"
placeholder="请选择发布状态"
clearable
style="margin-left:20px;"
......@@ -203,6 +204,8 @@ export default {
// this.$router.push({
// path: '/role-manage',
// })
this.searchForm.liveName = ""
this.searchForm.liveStatus = ""
},
//新建直播
createLive() {
......@@ -212,20 +215,13 @@ export default {
},
//弹出直播链接弹窗
liveLink(row) {
// this.dialogLivelinkVisible = true;
this.dialogLivelinkVisible = true;
this.liveScope = row.liveScope;
this.liveStatus = row.liveStatus;
console.log("liveLink() : liveScope = " + this.liveScope + ", liveStatus = " + this.liveStatus)
let req = {
rtcId: row.rtcId
};
vm.GET("rtc/liveAdmin/url", req).then(res => {
vm.GET("rtc/liveAdmin/url/" + row.rtcId, "").then(res => {
if (res.code == "000000") {
let listData = [];
let obj = {
peopleNum: res.data.viewedPersonTime,
liveDuration: res.data.liveDuration
};
this.lecturerUrl = res.data.lecturerUrl
this.guestUrl = res.data.guestUrl
this.audienceUrl = res.data.audienceUrl
......@@ -245,10 +241,7 @@ export default {
countLive(row) {
this.dialogStatisticsVisible = true;
console.log("getStatisticsData() : this.circleId = " + this.circleId);
let req = {
rtcId: row.rtcId
};
vm.GET("rtc/liveAdmin/data", req).then(res => {
vm.GET("rtc/liveAdmin/data/" + row.rtcId, "").then(res => {
if (res.code == "000000") {
let listData = [];
let obj = {
......@@ -338,7 +331,7 @@ export default {
if (res.code == "000000") {
// console.log(res);
let listData = [];
for (let i = 0; i < res.data.length; i++) {
for (let i = 0; i < res.data.pageContents.length; i++) {
let obj = {
liveName: res.data.pageContents[i].name,
liveScope: res.data.pageContents[i].scope,
......
src/views/yqrange/role-manage.vue
浏览文件 @ 3ee370ef
......@@ -68,37 +68,50 @@
v-if="this.idType != 1 && scope.row.level == 0"
@click="promote(scope.row, 1)"
type="text"
size="small">升为管理员</el-button>
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>
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>
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>
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>
size="small"
>降为管理员</el-button>
<el-button
v-if="this.idType != 1 && scope.row.level == 2"
@click="promote(scope.row, 0)"
type="text"
size="small">降为普通成员</el-button>
size="small"
>降为普通成员</el-button>
<el-button
v-if="this.idType != 1"
v-if="this.idType != 1 && scope.row.status == 1"
@click="addBlackList(scope.row)"
type="text"
size="small">加入黑名单</el-button>
size="small"
>加入黑名单</el-button>
<el-button
v-if="this.idType != 1 && scope.row.status == 2"
@click="addBlackList(scope.row)"
type="text"
size="small"
>移出黑名单</el-button>
</template>
</el-table-column>
</el-table>
......@@ -208,9 +221,10 @@ export default {
created() {
vm = this;
this.id = this.$route.query.id;
vm.getOrganization();
this.idType = localStorage.getItem('storageIdType')
console.log("storageIdType = " + localStorage.getItem('storageIdType'));
// vm.getOrganization();
this.searchList();
this.idType = localStorage.getItem("storageIdType");
console.log("storageIdType = " + localStorage.getItem("storageIdType"));
},
methods: {
searchList() {
......@@ -222,73 +236,75 @@ export default {
pageNo: 1,
pageSize: 10
};
// vm.POST("eco/circle/members", req)
// .then(res => {
// if (res.code == "000000") {
// // this.tableData = vm.$message({
// // type: "success",
// // message: "操作成功"
// // });
// // vm.search();
// // if (res.message != "success") {
// // vm.$message({
// // message: res.message,
// // type: "warning"
// // });
// // }
// let listData = [];
// for (let i = 0; i < data.length; i++) {
// let roleName = "";
// switch (data[i].role_id) {
// case 0:
// roleName = "普通成员 1:管理员 2:主管理员 3:审核人员";
// break;
// case 1:
// roleName = "管理员";
// break;
// case 2:
// roleName = "主管理员";
// break;
// case 3:
// roleName = "审核人员";
// break;
// default:
// roleName = "普通成员";
// }
// let obj = {
// role: roleName,
// name: data[i].name,
// proTitle: data[i].title,
// department: data[i].departmentName,
// hospital: data[i].hospitalName,
// level: data[i].role_id,
// doctorId: data[i].id,
// status: data[i].status
// };
// listData.push(obj);
// }
// this.tableData = listData;
// } else {
// // vm.$message.info(res.message);
// // vm.$message.info("操作失败，请重试");
// }
// })
// .catch(function(error) {
// vm.$message.error(error);
vm.POST("circle/circle/members", req)
.then(res => {
if (res.code == "000000") {
// this.tableData = vm.$message({
// type: "success",
// message: "操作成功"
// });
// vm.search();
// if (res.message != "success") {
// vm.$message({
// message: res.message,
// type: "warning"
// });
// }
let listData = [];
for (let i = 0; i < res.data.memberList.length; i++) {
let roleName = "";
switch (res.data.memberList[i].role_id) {
case 0:
roleName = "普通成员 1:管理员 2:主管理员 3:审核人员";
break;
case 1:
roleName = "管理员";
break;
case 2:
roleName = "主管理员";
break;
case 3:
roleName = "审核人员";
break;
default:
roleName = "普通成员";
}
let obj = {
role: "大总管",
name: "小小",
proTitle: "妇科老大",
department: "总经办",
hospital: "青山神经病院",
level: 3,
doctorId: 789
role: roleName,
name: res.data.memberList[i].name,
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,
doctorId: res.data.memberList[i].id,
status: res.data.memberList[i].status
};
listData.push(obj);
}
this.tableData = listData;
} else {
// vm.$message.info(res.message);
// vm.$message.info("操作失败，请重试");
}
})
.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("重置");
......@@ -302,19 +318,19 @@ export default {
id: this.id
};
console.log("alex id = " + this.id);
// vm.GET("eco/circle/hospitals", req).then(res => {
// if (res.code == "000000") {
// // console.log(res);
// vm.organization = vm.dealOrganizationData(res.data.list);
// } else {
// vm.organization = [
// {
// id: "0",
// label: "请选择机构"
// }
// ];
// }
// });
vm.GET("eco/circle/hospitals", req).then(res => {
if (res.code == "000000") {
// console.log(res);
vm.organization = vm.dealOrganizationData(res.data.list);
} else {
vm.organization = [
{
id: "0",
label: "请选择机构"
}
];
}
});
const org = [
{
......@@ -330,10 +346,10 @@ export default {
},
dealOrganizationData(data) {
let org = [];
org[0] = {
id: "-1",
name: "请选择机构"
};
// org[0] = {
// id: "-1",
// name: "请选择机构"
// };
for (let i = 0; i < data.length; i++) {
let obj = {
id: data[i].id,
......@@ -347,7 +363,8 @@ export default {
promote(row, willLevel) {
vm = this;
let currentName = "",
willName, operation;
willName,
operation;
if (row.level == 0) {
currentName = "普通成员";
} else if (row.level == 1) {
......@@ -367,26 +384,37 @@ export default {
} else if (willLevel == 2) {
willName = "主管理员";
}
vm.$confirm(`确定将${currentName}“${row.name}”${operation}${willName}？`, "", {
vm.$confirm(
`确定将${currentName}“${row.name}”${operation}${willName}？`,
"",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
customClass: "range-make-box"
})
}
)
.then(() => {
// confirm
// vm.$message({
// message: "操作成功!!!"
// });
vm
.GET("circle/circle/" + this.id + "/entrust/" + row.doctorId +"/" + willLevel, null)
vm.GET(
"circle/circle/" +
this.id +
"/entrust/" +
row.doctorId +
"/" +
willLevel,
null
)
.then(res => {
if (res.code == "000000") {
vm.$message({
type: "success",
message: "操作成功"
});
vm.search();
// vm.search();
if (res.message != "success") {
vm.$message({
message: res.message,
......@@ -409,22 +437,34 @@ export default {
//加入黑名单
addBlackList(row) {
vm = this;
this.$confirm(`确定将“${row.name}”加入黑名单吗`, "", {
let option = "加入黑名单"
if (row.status == 2) {
option = "移出黑名单"
}
this.$confirm(`确定将“${row.name}”${option}吗`, "", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "alert",
customClass: "range-make-box"
})
.then(() => {
console.log("查询： this.id = " + this.id + ", row.doctorId = " + row.doctorId);
vm.GET("eco/circle/" + this.id + "/" + row.doctorId + "/freeControl", req)
console.log(
"查询： this.id = " + this.id + ", row.doctorId = " + row.doctorId
);
let req = {
id: this.id,
doctorId: row.doctorId,
};
vm.GET(
"circle/circle/" + this.id + "/" + row.doctorId + "/freeControl", req)
.then(res => {
if (res.code == "000000") {
vm.$message({
type: "success",
message: "操作成功"
});
vm.search();
// vm.search();
this.searchList();
if (res.message != "success") {
vm.$message({
message: res.message,
......@@ -452,7 +492,7 @@ export default {
handleNumChange(val) {
this.searchForm.pageNo = val;
this.searchList();
},
}
}
};
</script>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或