Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2022-12-06 16:57:24 +08:00
13 changed files with 617 additions and 776 deletions

View File

@@ -388,7 +388,11 @@
<img
class="i_upload_img"
v-if="feng_mian_1"
:src="feng_mian_1"
:src="
feng_mian_1.indexOf(',') > -1
? feng_mian_1.split(',')[0]
: feng_mian_1
"
alt="avatar"
/>
<!-- <a-upload
@@ -672,7 +676,7 @@
:mode="mode"
/>
<Editor
style="height: 300px; overflow-y: hidden"
style="height: 250px; overflow-y: hidden"
v-model="valueHtml"
:defaultConfig="editorConfig"
:mode="mode"
@@ -826,7 +830,11 @@
<img
class="i_upload_img"
v-if="feng_mian_2"
:src="feng_mian_2"
:src="
feng_mian_2.indexOf(',') > -1
? feng_mian_2.split(',')[0]
: feng_mian_2
"
alt="avatar"
/>
<!-- <a-upload
@@ -1109,7 +1117,7 @@
:mode="mode"
/>
<Editor
style="height: 500px; overflow-y: hidden"
style="height: 250px; overflow-y: hidden"
v-model="valueHtml"
:defaultConfig="editorConfig"
:mode="mode"
@@ -2170,6 +2178,7 @@
</div>
<div class="b_input">
<a-input
maxlength="30"
v-model:value="xjkkinputV1"
style="width: 440px; height: 40px; border-radius: 8px"
placeholder="请输入开课名称"
@@ -2942,9 +2951,12 @@
<div class="close_exit" @click="delete_exit1"></div>
</div>
<div class="body">
<div :style="{ display: del_hs ? 'block' : 'none' }">
<div :style="{ display: del_hs && !del_hs_stu ? 'block' : 'none' }">
<span>您确定要删除此课程吗</span>
</div>
<div :style="{ display: del_hs && del_hs_stu ? 'block' : 'none' }">
<span>您确定要删除此学员吗</span>
</div>
<div :style="{ display: copy_hs ? 'block' : 'none' }">
<span>您确定要复制此课程吗</span>
</div>
@@ -3339,7 +3351,7 @@ const columns6 = [
title: "序号",
dataIndex: "num",
key: "num",
width: "8%",
width: "6%",
align: "center",
customRender: ({ index }) => {
//{ text, record, index, column }
@@ -3350,8 +3362,9 @@ const columns6 = [
title: "课程名称",
dataIndex: "organization",
key: "organization",
width: "10%",
width: "25%",
align: "center",
ellipsis: true,
customRender: ({ text }) => {
return text ? text : "-";
},
@@ -3360,8 +3373,9 @@ const columns6 = [
title: "场地",
dataIndex: "address",
key: "saddress",
width: "10%",
width: "25%",
align: "center",
ellipsis: true,
customRender: ({ text }) => {
return text ? text : "-";
},
@@ -3370,7 +3384,7 @@ const columns6 = [
title: "开始时间",
dataIndex: "starttime",
key: "starttime",
width: "18%",
width: "12%",
align: "center",
customRender: ({ text }) => {
return text ? getdateToTime(text * 1000) : "-";
@@ -3380,7 +3394,7 @@ const columns6 = [
title: "创建时间",
dataIndex: "createtime",
key: "createtime",
width: "18%",
width: "12%",
align: "center",
customRender: ({ text }) => {
return text ? getdateToTime(text * 1000) : "-";
@@ -3388,7 +3402,7 @@ const columns6 = [
},
{
title: "操作",
width: "30%",
width: "20%",
dataIndex: "operation",
key: "operation",
align: "center",
@@ -3712,6 +3726,7 @@ export default defineComponent({
rejectstudy_hs: false,
delete_hs: false,
del_hs: false,
del_hs_stu: false,
copy_hs: false,
nouse_hs: false,
// 二维码标题状态
@@ -4009,7 +4024,7 @@ export default defineComponent({
state.imgList.splice(index, 1);
};
const handleDel2 = (index) => {
state.fileList.splice(index, 1);
state.filesList.splice(index, 1);
};
// 渲染列表1操作
@@ -4110,6 +4125,7 @@ export default defineComponent({
state.delete_hs = true;
state.del_hs = true;
state.del_hs_stu = true;
};
const handlJoinStu = (itm) => {
console.log(itm);
@@ -4270,7 +4286,7 @@ export default defineComponent({
let newArr = [];
arr.forEach((item) => {
newArr.push({
value: item.dictValue,
value: item.dictValue + "," + item.dictCode,
label: item.dictName,
});
});
@@ -4650,6 +4666,8 @@ export default defineComponent({
};
const handleCancelStu = () => {
state.cstm_hs = false;
state.filesList = [];
state.kk_eidt = false;
state.xjkkradioV1 = "";
state.completeType = "";
@@ -4829,6 +4847,7 @@ export default defineComponent({
const delete_exit1 = () => {
state.delete_hs = false;
state.del_hs = false;
state.del_hs_stu = false;
state.copy_hs = false;
state.nouse_hs = false;
state.rg_hs = false;
@@ -5190,8 +5209,6 @@ export default defineComponent({
};
const handleLook = async (itm, type) => {
// state.isEdit = 0;
// console.log(45555);
// console.log(itm);
if (type === "1") {
return;
}
@@ -5205,42 +5222,6 @@ export default defineComponent({
state.lookCourseModal = true;
item.attach = item.attach == "" ? [] : item.attach.split(",");
state.faceDetailObj = item;
// // heroImg.value.src = item.picUrl;
// // valueHtmlRef.value = item.outline;
// // attachMap.value = item.attach == "" ? [] : item.attach.split(",");
// console.log("res222222222");
// console.log(item);
// console.log(state.lookCourseModal);
// state.qdms_inputV1 = item.name;
// state.imageUrl = item.picUrl;
// state.qdms_inputV2 = item.targetUser;
// state.qdms_inputV3 = item.meaning;
// state.fen_lei = String(item.categoryId);
// state.chang_jin = String(item.sceneId);
// state.tags_val = item.tips ? item.tips.split(",") : [];
// //state.qdms_inputV5 = item.teacherId;
// state.teacher = item.teacher;
// state.teacherId = item.teacherId;
// state.qdms_inputV6 = item.intro;
// state.member = { value: item.teacherId, name: item.teacher };
// if (item.attach == "") {
// state.imgList = [];
// } else {
// if (item.attach.indexOf(",")) {
// const arr = item.attach.split(",");
// arr.forEach((item) => {
// state.imgList.push({ img: item });
// });
// } else {
// state.imgList = [{ img: item.attach }];
// }
// }
// valueHtml.value = item.outline;
// state.lookMs = true;
};
// const handleTea = async () => {
// console.log("item22224444");
@@ -5387,12 +5368,13 @@ export default defineComponent({
console.log(file);
fileUp(formData).then((res) => {
if (res.data.code === 200) {
state.filesList.push({
img: res.data.data,
name: file.name,
size: file.size,
});
console.log(state.filesList);
// state.filesList.push({
// img: res.data.data,
// name: file.name,
// size: file.size,
// });
// console.log(state.filesList);
state.filesList = [res.data.data];
// state.hasImgName = res.data.data;
}
});
@@ -7193,6 +7175,7 @@ export default defineComponent({
}
.fotarea {
width: calc(100% - 150px);
position: relative;
.fuwenben {