Skip to content

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

Merge branch 'release' into dev-advert-0629 

* release:
  优化编辑直播的样式1
  屏蔽人员等
  优化编辑直播的样式
  修改管理员查询本省机构和新建直播嘉宾
  之前项目的bug等
  单文件最大500M
上级 5050ed24 3a90108b
隐藏空白字符变更
内嵌 并排
正在显示 包含 103 行增加 和 77 行删除
src/components/education/custom-resource/edit-course-dialog.vue
浏览文件 @ c7b624dd
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
> >
<el-button slot="trigger" ref="uploadFileBtn" type="primary"><img style="width:12px;height:12px;position:relative;top:1px;" src="../../../assets/image/phrase3/icon-upload.png" /> <span style="font-size:14px;"> 上传文件</span></el-button> <el-button slot="trigger" ref="uploadFileBtn" type="primary"><img style="width:12px;height:12px;position:relative;top:1px;" src="../../../assets/image/phrase3/icon-upload.png" /> <span style="font-size:14px;"> 上传文件</span></el-button>
<div slot="tip" class="el-upload__tip"> <div slot="tip" class="el-upload__tip">
<span class="upload-tips">只支持MP4格式，课程视频最多上传100个，单文件最大2G</span> <span class="upload-tips">只支持MP4格式，课程视频最多上传100个，单文件最大500M</span>
<ul v-show="formData.courseCustomChapterModels[0].courseCustomLectureModelList.length" class="custom-list"> <ul v-show="formData.courseCustomChapterModels[0].courseCustomLectureModelList.length" class="custom-list">
<li v-for="(lecture, index) in formData.courseCustomChapterModels[0].courseCustomLectureModelList" :key="index" class="valid-msg video-wrappe"> <li v-for="(lecture, index) in formData.courseCustomChapterModels[0].courseCustomLectureModelList" :key="index" class="valid-msg video-wrappe">
<ul class="video"> <ul class="video">
......
src/components/education/template/templateMessage.vue
浏览文件 @ c7b624dd
...@@ -666,8 +666,8 @@ export default { ...@@ -666,8 +666,8 @@ export default {
vm.POST("portal/portalInfo/insertOrUpdate", baseobj) vm.POST("portal/portalInfo/insertOrUpdate", baseobj)
.then(res => { .then(res => {
closeLoading(vm); closeLoading(vm);
vm.formData.id = res.data.id;
if (res.code == "000000") { if (res.code == "000000") {
vm.formData.id = res.data.id;
// 暂存不会跳到下一页 // 暂存不会跳到下一页
if (status == 1) { if (status == 1) {
vm.$message.info('成功'); vm.$message.info('成功');
...@@ -684,7 +684,7 @@ export default { ...@@ -684,7 +684,7 @@ export default {
.catch((err) => { .catch((err) => {
vm.$message({ vm.$message({
type: "warning", type: "warning",
message: res.message message: err.message
}); });
}) })
}, },
......
src/components/yqrange/baseinfo.vue
浏览文件 @ c7b624dd
...@@ -55,6 +55,9 @@ ...@@ -55,6 +55,9 @@
<el-form-item label="圈子介绍" prop="introduce"> <el-form-item label="圈子介绍" prop="introduce">
<el-col :span="13"> <el-col :span="13">
<el-input <el-input
type="textarea"
rows="2"
maxlength="40"
size="small" size="small"
v-model="formData.introduce" v-model="formData.introduce"
placeholder="请输入圈子介绍" placeholder="请输入圈子介绍"
......
src/components/yqrange/organzation.vue
浏览文件 @ c7b624dd
...@@ -103,11 +103,11 @@ ...@@ -103,11 +103,11 @@
totalOrganization: 10, totalOrganization: 10,
pageSizeOrganization: 2, pageSizeOrganization: 2,
activeName:"", activeName:"",
selectionList:"", selectionList:[],
formOrganization: { formOrganization: {
name: "", name: "",
administrativeId: "0", administrativeId: "",
administrativeIdList: ["0"], administrativeIdList: [],
level: "", level: "",
chechAll: true, chechAll: true,
pageNum: 1, pageNum: 1,
...@@ -136,7 +136,8 @@ ...@@ -136,7 +136,8 @@
this.activeName = "second"; this.activeName = "second";
this.formOrganization.pageNum = 1; this.formOrganization.pageNum = 1;
this.formOrganization.name = ""; this.formOrganization.name = "";
this.formOrganization.administrativeIdList = ["0"]; // this.formOrganization.administrativeIdList = ["0"];
// this.formOrganization.administrativeIdList = ["310"];
this.formOrganization.level = ""; this.formOrganization.level = "";
}, },
setMoreOption(data, type) { setMoreOption(data, type) {
...@@ -175,9 +176,9 @@ ...@@ -175,9 +176,9 @@
vm.optionsRegion = operationData.setRegionOption3( vm.optionsRegion = operationData.setRegionOption3(
res.data.provinceList res.data.provinceList
); );
} }
this.getOrganization(); vm.formOrganization.administrativeIdList.push(vm.optionsRegion[0].value);
vm.getOrganization();
} else { } else {
this.$message(res.message); this.$message(res.message);
} }
...@@ -378,6 +379,7 @@ ...@@ -378,6 +379,7 @@
if (row.status == 1) { if (row.status == 1) {
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.multipleOrganization.toggleRowSelection(row); this.$refs.multipleOrganization.toggleRowSelection(row);
this.selectionList.push(row);
}); });
} }
}); });
...@@ -385,8 +387,11 @@ ...@@ -385,8 +387,11 @@
//重置机构、人员查询 //重置机构、人员查询
resetOrgOrPerson() { resetOrgOrPerson() {
vm.formOrganization.name = ""; vm.formOrganization.name = "";
vm.formOrganization.administrativeId = "0"; // vm.formOrganization.administrativeId = "0";
vm.formOrganization.administrativeIdList = ["0"]; // vm.formOrganization.administrativeIdList = ["0"];
vm.formOrganization.administrativeId = vm.optionsRegion[0].id;
vm.formOrganization.administrativeIdList = [];
vm.formOrganization.administrativeIdList.push(vm.optionsRegion[0].value);
vm.formOrganization.level = ""; vm.formOrganization.level = "";
vm.formOrganization.pageNum = 1; vm.formOrganization.pageNum = 1;
vm.searchOrganization(); vm.searchOrganization();
......
src/utils/operation.js
浏览文件 @ c7b624dd
...@@ -309,8 +309,10 @@ export function setRegionOption3(data) { ...@@ -309,8 +309,10 @@ export function setRegionOption3(data) {
let option = []; let option = [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
let obj = data[i]; let obj = data[i];
obj.id = data[i].id;
obj.label = data[i].provinceName; obj.label = data[i].provinceName;
obj.value = data[i].provinceId; obj.value = data[i].provinceId + "";
// obj.leaf = true;
option.push(obj); option.push(obj);
} }
return option; return option;
......
src/views/education/edit-custom.vue
浏览文件 @ c7b624dd
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<div class="add-content-new screenSet" id="screenSet"> <div class="add-content-new screenSet" id="screenSet">
<div class="step-content-new"> <div class="step-content-new">
<el-col style="width: 530px;"> <el-col>
<el-steps :active="active" simple class> <el-steps :active="active" simple class style="width: 530px;">
<span class="step-num" v-bind:class="{ 'on-step': active==0 }">1</span> <span class="step-num" v-bind:class="{ 'on-step': active==0 }">1</span>
<el-step title="选择项目课程">1</el-step> <el-step title="选择项目课程">1</el-step>
<span class="step-num" v-bind:class="{ 'on-step': active==1 }">2</span> <span class="step-num" v-bind:class="{ 'on-step': active==1 }">2</span>
......
src/views/education/item-shield.vue
浏览文件 @ c7b624dd
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
<el-radio-button label="1">屏蔽人员</el-radio-button> <el-radio-button label="1">屏蔽人员</el-radio-button>
</el-radio-group> </el-radio-group>
<!-- <el-button class="complete" type="primary" size="small" @click="complete">完成</el-button> --> <!-- <el-button class="complete" type="primary" size="small" @click="complete">完成</el-button> -->
<el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;"> <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px">
<el-form :model="formInline" ref="formInline" label-width="75px" class="form-inline"> <el-form :model="formInline" ref="formInline" label-width="75px" class="form-inline" style=";width:1000px;">
<el-col :span="6" v-if=" shieldType == 0"> <el-col :span="6" v-if=" shieldType == 0">
<el-form-item label="地区："> <el-form-item label="地区：">
<el-cascader <el-cascader
style="width:130px"
size="small" size="small"
ref="cascaderRegion" ref="cascaderRegion"
:options="optionsRegion" :options="optionsRegion"
...@@ -26,12 +27,12 @@ ...@@ -26,12 +27,12 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="机构："> <el-form-item label="机构：">
<el-input size="small" v-model="formInline.hospitalName" placeholder="请输入机构名称"></el-input> <el-input style="width:130px" size="small" v-model="formInline.hospitalName" placeholder="请输入机构名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="shieldType == 1"> <el-col :span="6" v-if="shieldType == 1">
<el-form-item label="名称："> <el-form-item label="名称：">
<el-input size="small" v-model="formInline.doctorName" placeholder="请输入人员名称"></el-input> <el-input style="width:130px" size="small" v-model="formInline.doctorName" placeholder="请输入人员名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
......
src/views/yqrange/create-live.vue
浏览文件 @ c7b624dd
...@@ -183,63 +183,75 @@ ...@@ -183,63 +183,75 @@
</div> </div>
<el-form-item label="直播角色"> <el-form-item label="直播角色">
<div style="color:#666666;font-size:10px;">讲师（必填）</div> <div style="color:#666666;font-size:10px;">讲师（必填）</div>
<el-col :span="10"> <el-row>
<el-form-item label="姓名" prop="lecturesUserName" label-width="60px;"> <el-col :span="10">
<el-form-item label="姓名" prop="lecturesUserName" label-width="80px">
<el-input <el-input
size="small" size="small"
v-model="formData.lecturesUserName" v-model="formData.lecturesUserName"
placeholder="请输入姓名" placeholder="请输入姓名"
style="width:70%;" style="width:85%;"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="1">
<el-form-item label="手机" prop="lecturesPhone"> <img style="vertical-align: middle" src="../../assets/image/lianjie_icon.png" />
<el-input maxlength="11" </el-col>
size="small" <el-col :span="10">
v-model="formData.lecturesPhone" <!--<img src="../../assets/image/lianjie_icon.png" />-->
placeholder="请输入手机号" <el-form-item label="手机号" prop="lecturesPhone" label-width="80px">
style="width:70%;" <el-input maxlength="11"
></el-input> size="small"
</el-form-item> v-model="formData.lecturesPhone"
</el-col> placeholder="请输入手机号"
<el-col :span="15"> style="width:85%;"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-col :span="24">
<div style="color:#666666;font-size:10px;">嘉宾（选填）</div> <div style="color:#666666;font-size:10px;">嘉宾（选填）</div>
</el-col> </el-col>
<div v-for="(item, index) in formData.guests" :key="index"> <div v-for="(item, index) in formData.guests" :key="index">
<el-col :span="10"> <el-row>
<el-form-item label="姓名" label-width="60px;"> <el-col :span="10">
<el-input <el-form-item label=" 姓名" label-width="80px">
size="small" <el-input
v-model="item.username" size="small"
placeholder="请输入姓名" v-model="item.username"
style="width:70%;" placeholder="请输入姓名"
></el-input> style="width:85%;"
</el-form-item> ></el-input>
</el-col> </el-form-item>
<el-col :span="13"> </el-col>
<el-form-item label="手机"> <el-col :span="1">
<el-input maxlength="11" <img style="vertical-align: middle" src="../../assets/image/lianjie_icon.png" />
size="small" </el-col>
v-model="item.phone" <el-col :span="10">
placeholder="请输入手机号" <el-form-item label="手机号" label-width="80px">
style="width:70%;" <el-input maxlength="11"
></el-input> size="small"
v-model="item.phone"
 <img placeholder="请输入手机号"
@click="addGuest(index)" style="width:85%;"
class="edit-img" ></el-input>
src="../../assets/image/plus.png" </el-form-item>
v-if="isPreview!=1" </el-col>
/> <el-col :span="2">
<img <img
@click="delGuest(index)" @click="addGuest(index)"
v-if="index >= 1 && isPreview!=1" class="edit-img"
class="edit-img" src="../../assets/image/plus.png"
src="../../assets/image/trash.png" v-if="isPreview!=1"
/> />
</el-form-item> <img
</el-col> @click="delGuest(index)"
v-if="index >= 1 && isPreview!=1"
class="edit-img"
src="../../assets/image/trash.png"
/>
</el-col>
</el-row>
</div> </div>
<!--<el-col :span="15">--> <!--<el-col :span="15">-->
<!--<p class="err-text" v-if="guestErrFlag"><img src="../../assets/image/err-icon.svg" alt="">{{guestErrText}}</p>--> <!--<p class="err-text" v-if="guestErrFlag"><img src="../../assets/image/err-icon.svg" alt="">{{guestErrText}}</p>-->
...@@ -925,4 +937,7 @@ ...@@ -925,4 +937,7 @@
width: 20px; width: 20px;
vertical-align: middle; vertical-align: middle;
} }
.guest-label .el-form-item__label{
width: 57px;
}
</style> </style>
src/views/yqrange/role-manage.vue
浏览文件 @ c7b624dd
...@@ -422,15 +422,15 @@ export default { ...@@ -422,15 +422,15 @@ export default {
}); });
// vm.search(); // vm.search();
this.searchList(); this.searchList();
if (res.message != "success") { // if (res.message != "success") {
vm.$message({ // vm.$message({
message: res.message, // message: res.message,
type: "warning" // type: "warning"
}); // });
} // }
} else { } else {
// vm.$message.info(res.message); // vm.$message.info(res.message);
vm.$message.info("操作失败，请重试"); vm.$message.error("操作失败，请重试");
} }
}) })
.catch(function(error) { .catch(function(error) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或