diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 06762db8..52fc3a35 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -182,6 +182,7 @@ export default { }); const state = reactive({ addLoading: false, + fileUrl: null, }); const formRef = ref(); @@ -250,12 +251,18 @@ export default { console.log(args); }; const handleChange = (info) => { + console.log("info", info); if (info.file.status !== "uploading") { console.log(info.file, info.fileList); } if (info.file.status === "done") { message.success(`${info.file.name} 文件上传成功`); + console.log("info.file", info.file.response.data); + if (info.file.response && info.file.response.data) { + // console.log("fileList", fileList); + // fileList.value = [info]; + } } else if (info.file.status === "error") { message.error(`${info.file.name} 文件上传失败.`); } @@ -285,7 +292,7 @@ export default { let obj = { submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"), submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"), - workEnclosureAddress: "", + workEnclosureAddress: state.fileUrl, workId: props.edit ? props.EditWorkId : 0, workName: formState.workName, workRequirement: formState.workRequirement, @@ -410,7 +417,7 @@ export default { let obj = { submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"), submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"), - workEnclosureAddress: "", + workEnclosureAddress: state.fileUrl, workId: props.EditWorkId > 0 ? props.EditWorkId : 0, workName: formState.workName, workRequirement: formState.workRequirement, diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 39870031..9eafbca2 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -92,7 +92,6 @@ " v-model:value="inputV2" > - 分钟 @@ -157,7 +156,6 @@ -
直播链接: @@ -192,7 +190,6 @@
-
评估: @@ -223,7 +220,6 @@ />
-
考勤设置: @@ -337,7 +333,6 @@ import { getMemberInfo } from "@/api/index1"; import dayjs from "dayjs"; import { fileUp } from "../../api/indexEval"; import AssessmentList from "../drawers/ AssessmentList.vue"; - import { debounce } from "lodash-es"; // import { useRouter } from "vue-router"; function getBase64(img, callback) { @@ -345,7 +340,6 @@ function getBase64(img, callback) { reader.addEventListener("load", () => callback(reader.result)); reader.readAsDataURL(img); } - export default { name: "AddLive", components: { @@ -356,7 +350,6 @@ export default { type: Boolean, default: false, }, - EditLiveId: { type: Number, default: null, @@ -513,20 +506,17 @@ export default { //message.error(`查询失败`); }); }; - const cloradio1 = (value) => { if (state.radioV1 === value.target._value) { state.radioV1 = ""; } }; - const handleChange = (info) => { if (info.file.status === "uploading") { state.loading = true; console.log("info", info); return; } - if (info.file.status === "done") { // Get this url from response in real world. getBase64(info.file.originFileObj, (base64Url) => { @@ -535,14 +525,12 @@ export default { console.log("imgURL", state.imageUrl); }); } - if (info.file.status === "error") { state.loading = false; message.destroy(); message.error("upload error"); } }; - const updateTask = (res) => { if (props.isLevel == 1) { RouterEditTask({ @@ -622,7 +610,6 @@ export default { message.destroy(); return message.warning("直播时长需大于0"); } - let startTime = toDate( new Date(state.time[0].$d).getTime() / 1000, "Y-M-D" @@ -631,7 +618,6 @@ export default { new Date(state.time[1].$d).getTime() / 1000, "Y-M-D" ); - state.obj = { afterSignIn: state.inputV6, beforeSignIn: state.inputV7, @@ -689,7 +675,6 @@ export default { message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!"); return reject(false); } - let reader = new FileReader(); reader.readAsDataURL(file); reader.onload = () => { @@ -707,11 +692,9 @@ export default { return resolve(true); }; }; - return reject(false); }); }; - const templateScroll = (e) => { console.log("滚动", e); const { target } = e; @@ -760,11 +743,10 @@ export default { options.value = []; state.fetching = true; state.currentPage = 1; - state.memberValue = memberValue; + state.memberValue.label = memberValue; queryMember(); state.fetching = false; }, 300); - const handleChange2 = (value) => { console.log(`selected ${value}`); state.inputV3 = value; @@ -779,7 +761,6 @@ export default { state.discussSettings = "false"; } }; - return { ...toRefs(state), afterVisibleChange, @@ -1012,5 +993,4 @@ export default { } } } - - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/drawers/TaskFaceIn.vue b/src/components/drawers/TaskFaceIn.vue index c55e492b..5ffe4dc0 100644 --- a/src/components/drawers/TaskFaceIn.vue +++ b/src/components/drawers/TaskFaceIn.vue @@ -7,14 +7,15 @@ @after-visible-change="afterVisibleChange" >
-
+ +
请下载
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 0b38341b..02073ad2 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -596,7 +596,8 @@
- + +
+ {/** + 2022-11-30注释 后面放开 { showCheckStu(text.record.studentId); @@ -1510,6 +1514,9 @@ export default { > 查看 + */} + {/** + 2022-11-30注释 后面放开 { state.visiblene = true; @@ -1519,6 +1526,7 @@ export default { > 调整 + */} { @@ -1963,7 +1971,7 @@ export default { cancelText: "取消", onOk() { api - .delStudent({ routerId: 100, studentIds: [id] }) + .delStudent({ routerId: state.routerId, studentIds: [id] }) .then((res) => { message.success("删除成功"); getStudent(); @@ -2001,7 +2009,7 @@ export default { return; } let obj = { - routerId: 100, + routerId: state.routerId, studentIds: state.selectedRowKeys, }; api diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 2b62dc46..e2bb3f89 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -182,7 +182,8 @@
-
+ + -
+
-->
@@ -744,7 +744,8 @@
-
+ + -
+
-->
@@ -1053,7 +1053,7 @@ import { editTask } from "../../api/indexTaskadd"; // import { RouterEditTask } from "@/api/indexTask"; import { useRouter } from "vue-router"; import { toDate } from "../../api/method"; -import UnlockMode from "../../components/drawers/UnlockMode.vue"; +// import UnlockMode from "../../components/drawers/UnlockMode.vue"; export default { name: "LevelAddDetail", components: { @@ -1071,7 +1071,7 @@ export default { AddLive, AddRef, draggable, - UnlockMode, + // UnlockMode, AddFaceteach, AddProject, }, diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 3400df12..5d106d8e 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -158,16 +158,17 @@ return triggerNode.parentNode || document.body; } " - :value="classifySelect1" - mode="multiple" + v-model:value="classifySelect1" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1" @change="classificationChange1" allowClear showSearch + mode="multiple" :disabled="viewDetail ? true : false" @popupScroll="memberScroll" + @search="getMember" >
@@ -798,12 +799,13 @@ export default { // 项目经理 后续接口调用 const classifyList1 = ref([]); //获取学员 - const getMember = () => { + const getMember = (e) => { + console.log("state.classifySelect1", e, state.classifySelect1); api1 .getMemberInfo({ pageNo: state.currentPage1, pageSize: state.pageSize1, - keyWord: "", + keyWord: e ? e : "", }) .then((res) => { if (res.data.code === 200) { @@ -817,7 +819,7 @@ export default { array.push(obj); }); classifyList1.value = array; - console.log("获取学员", res.data); + console.log("获取学员", res.data, classifyList1.value); // classifyList1.value = res.data.data.rows; // state.tableDataTotal = res.data.data.total; // return res.data.data.rows; @@ -825,6 +827,7 @@ export default { }); }; getMember(); + //学员滚动加载信息 const memberScroll = (e) => { // console.log("滚动", e, b); @@ -1221,6 +1224,7 @@ export default { templateScroll, memberScroll, + getMember, }; }, }; diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index edc4defe..875aa677 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -2488,20 +2488,10 @@ export default { // options={state.projectNameList} dropdownClassName="tabledropdown" > - {/* - - 基础信息 - - -
{ - showStartModal(); - }} - > - 存为模版 -
-
*/} - + {/** +2022-11-30注释 后面放开 + +
{ showCopyModal(value.record.projectId); @@ -2510,6 +2500,8 @@ export default { 复制
+*/} +
{ @@ -2587,19 +2579,8 @@ export default { dropdownClassName="tabledropdown" > {/* - - 基础信息 - - -
{ - showStartModal(); - }} - > - 存为模版 -
-
*/} - + 2022-11-30注释 后面放开 +
{ showCopyModal(value.record.projectId); @@ -2608,6 +2589,8 @@ export default { 复制
+ + */}
@@ -2675,19 +2658,8 @@ export default { dropdownClassName="tabledropdown" > {/* - - 基础信息 - - -
{ - showStartModal(); - }} - > - 存为模版 -
-
*/} - + 2022-11-30注释 后面放开 +
{ showCopyModal(value.record.projectId); @@ -2696,6 +2668,8 @@ export default { 复制
+ */} +
{ @@ -2805,7 +2779,9 @@ export default { // options={state.projectNameList} dropdownClassName="tabledropdown" > - + {/* + 2022-11-30注释 后面放开 +
{ showCopyModal(value.record.projectId); @@ -2814,6 +2790,8 @@ export default { 复制
+ */} +
{ @@ -2887,7 +2865,9 @@ export default { // options={state.projectNameList} dropdownClassName="tabledropdown" > - + {/* + 2022-11-30注释 后面放开 +
{ showCopyModal(value.record.projectId); @@ -2896,6 +2876,7 @@ export default { 复制
+ */}
@@ -2957,7 +2938,9 @@ export default { // options={state.projectNameList} dropdownClassName="tabledropdown" > - + {/* + 2022-11-30注释 后面放开 +
{ showCopyModal(value.record.projectId); @@ -2966,6 +2949,8 @@ export default { 复制
+ */} +
{ @@ -3180,7 +3165,9 @@ export default { // options={state.projectNameList} dropdownClassName="tabledropdown" > - + {/* + 2022-11-30注释 后面放开 +
{ showCopyModal(value.record.projectId); @@ -3189,6 +3176,8 @@ export default { 复制
+ */} +
{ @@ -3230,7 +3219,9 @@ export default { // options={state.projectNameList} dropdownClassName="tabledropdown" > - + {/* + 2022-11-30注释 后面放开 +
{ showCopyModal(value.record.projectId); @@ -3239,6 +3230,8 @@ export default { 复制
+ */} +
{ @@ -3295,7 +3288,9 @@ export default { 存为模版
- + {/* + 2022-11-30注释 后面放开 +
{ showCopyModal(value.record.projectId); @@ -3304,6 +3299,8 @@ export default { 复制
+ */} +
{ @@ -3345,7 +3342,9 @@ export default { 存为模版
- + {/* + 2022-11-30注释 后面放开 +
{ showCopyModal(value.record.projectId); @@ -3354,6 +3353,7 @@ export default { 复制
+ */}
-
+ +
切换模式
-
-
+
-->
+
-
+ -
-
--> + +
@@ -636,10 +634,11 @@ 添加学员
-
+ +
批量删除 @@ -805,10 +804,10 @@ > - + - +
排行榜
@@ -2920,7 +2919,9 @@ export default { {text.record.excellent ? "取消优秀" : "优秀学员"}
-
{ state.Seevisible = true; @@ -2930,6 +2931,7 @@ export default { > 查看
+ */}
-
+ +
切换模式
-
-
+
-->