From 0a7a86a00ef7d45d9383cd33958ca6e0e52f6092 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Sun, 4 Dec 2022 15:00:02 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix:=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/AddHomework.vue | 3 ++-
src/views/learningpath/LevelAdd.vue | 1 +
src/views/projectcenter/TaskAdd.vue | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index ea551f0b..80ac0ad9 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -31,6 +31,7 @@
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index cbb4af89..36649fe6 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1914,6 +1914,7 @@ export default {
GetRouterDetail(state.routerId)
.then((res) => {
console.log('router-list',res)
+ state.fileList = JSON.parse(res.data.data.routerInfo.attach)
if (res.data.data.routerInfo.status == 1) {
state.nodata = false;
}
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 17295e1e..19d4ec2f 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1608,9 +1608,9 @@ export default {
});
} else {
//默认阶段
- if (state.stageList.length === 1 && !state.stageList.name) {
+ // if (state.stageList.length === 1 && !state.stageList.name) {
- }
+ // }
let obj = {
name: state.valuesname,
projectId: state.projectId,
From db432bfc87f6b32122fe1fbac95d5e5a28c44b5b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 4 Dec 2022 15:05:50 +0800
Subject: [PATCH 02/11] =?UTF-8?q?--=E9=A1=B9=E7=9B=AE=20=E9=98=B6=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/projectcenter/TaskAdd.vue | 35 +++++++++++++++-------------
src/views/projectcenter/TaskPage.vue | 5 ++--
2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 17295e1e..e0431530 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -590,6 +590,7 @@
style="
width: 120px;
text-align: center;
+ text-align: center;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -1358,13 +1359,13 @@ export default {
};
//获取任务列表
- const getTask = () => {
+ const getTask = async () => {
// console.log("state.projectId", state.projectId);
let obj = {
projectId: state.projectId,
// projectId: 28,
};
- api
+ await api
.getTask(obj)
.then((res) => {
if (res.status == 200) {
@@ -1375,9 +1376,7 @@ export default {
state.stageList = res.data.data.stageList;
let leng = res.data.data.stageList.length;
if (leng > 0) {
- let stage = localStorage.getItem("stageId")
- ? localStorage.getItem("stageId")
- : null;
+ let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null;
// console.log("stage",Object.prototype.toString.call(stage))
getStageData(res.data.data.stageList);
@@ -1438,6 +1437,8 @@ export default {
} else {
state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
}
+ let final = state.level.find((item) => item.id == state.chooseStageId);
+ getTableData(final.taskList);
}
})
.catch((err) => {
@@ -1579,7 +1580,7 @@ export default {
}
};
//添加阶段
- const editStage = () => {
+ const editStage = async () => {
if (!state.valuesname) {
message.destroy();
return message.warning("请输入阶段名称");
@@ -1591,9 +1592,9 @@ export default {
remark: state.valuesnotice,
stageId: state.updateStageID,
};
- apistage
+ await apistage
.editStage(obj)
- .then((res) => {
+ .then(async (res) => {
console.log("修改阶段成功", res);
state.valuesname = "";
state.valuesnotice = "";
@@ -1601,31 +1602,33 @@ export default {
state.updateStageID = null;
message.destroy();
message.success("修改阶段成功");
- getTask();
+ await getTask();
+ state.chooseStageId = res.data.data.stageId;
+ let final = state.level.find((item) => item.id == state.chooseStageId);
+ getTableData(final.taskList);
})
.catch((err) => {
console.log("添加阶段失败", err);
});
} else {
- //默认阶段
- if (state.stageList.length === 1 && !state.stageList.name) {
-
- }
let obj = {
name: state.valuesname,
projectId: state.projectId,
remark: state.valuesnotice,
};
- apistage
+ await apistage
.editStage(obj)
- .then((res) => {
+ .then(async (res) => {
console.log("添加阶段成功", res);
state.valuesname = "";
state.valuesnotice = "";
closeModal();
message.destroy();
message.success("添加阶段成功");
- getTask();
+ await getTask();
+ state.chooseStageId = res.data.data.stageId;
+ let final = state.level.find((item) => item.id == state.chooseStageId);
+ getTableData(final.taskList);
})
.catch((err) => {
console.log("添加阶段失败", err);
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index c7490d9e..53ec7e58 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -343,7 +343,8 @@
编辑
-->
-
Date: Sun, 4 Dec 2022 16:35:58 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E9=99=90=E5=88=B6=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=AD=97=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/ActiveAttendance.vue | 1 +
src/components/drawers/AddActive.vue | 29 +++++++++--
src/components/drawers/AddCase.vue | 2 +
src/components/drawers/AddDiscuss.vue | 1 +
src/components/drawers/AddEval.vue | 29 +++++++++--
src/components/drawers/AddFaceteach.vue | 32 +++++++++---
src/components/drawers/AddGroup.vue | 2 +
src/components/drawers/AddHomework.vue | 37 ++++++++++++--
src/components/drawers/AddLevelAddStu.vue | 3 ++
src/components/drawers/AddLive.vue | 27 +++++++++-
src/components/drawers/AddOnline.vue | 1 +
src/components/drawers/AddProject.vue | 7 +--
src/components/drawers/AddRef.vue | 6 ++-
src/components/drawers/AddTest.vue | 52 +++++++++++++++-----
src/components/drawers/CourseOwner.vue | 1 +
src/components/drawers/SelFacet.vue | 2 +-
src/views/courselibrary/CoursewareManage.vue | 1 +
17 files changed, 199 insertions(+), 34 deletions(-)
diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index ca47dbdf..75a1a3b0 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -32,6 +32,7 @@
v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
+ maxlength="20"
/>
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index e918556b..081dea2f 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -33,7 +33,7 @@
v-model:value="inputV1"
style="width: 424px; height: 32px"
placeholder="请输入活动名称"
- maxlength="20"
+ maxlength="50"
/>
@@ -52,7 +52,8 @@
v-model:value="textV1"
placeholder="请输入活动公告"
allow-clear
- maxlength="150"
+ :rows="6"
+ show-count :maxlength="200"
/>
@@ -65,7 +66,8 @@
v-model:value="textV2"
placeholder="请输入活动说明"
allow-clear
- maxlength="150"
+ :rows="6"
+ show-count :maxlength="200"
/>
@@ -127,6 +129,7 @@
v-model:value="inputV3"
style="width: 424px; height: 32px"
placeholder="请输入活动地址"
+ maxlength="100"
/>
@@ -589,7 +592,27 @@ export default {
display: flex;
align-items: flex-start;
margin-bottom: 32px;
+ .textarea {
+ width: 423px;
+ .ant-input {
+ width: 100%;
+ }
+
+ .ant-input-textarea-show-count {
+ position: relative;
+ }
+
+ .ant-input-textarea-show-count::after {
+ position: absolute;
+ right: 10px;
+ bottom: 0px;
+ }
+
+ .ant-input {
+ border-radius: 8px;
+ }
+ }
.signbox {
width: 120px;
display: flex;
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index f6f3b511..9ac7873e 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -27,6 +27,8 @@
v-model:value="inputV1"
style="width: 264px; height: 40px; border-radius: 8px"
placeholder="请输入案例标题"
+ show-count
+ :maxlength="20"
/>
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index 90e8184f..c69aede3 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -46,6 +46,7 @@
v-model:value="textV1"
placeholder="请输入讨论说明"
allow-clear
+ :rows="6"
show-count
:maxlength="200"
/>
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 5fdb0a61..1c09a8ab 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -18,7 +18,8 @@
+ show-count
+ :maxlength="50" />
@@ -53,9 +54,9 @@
测评说明:
-
-
{{ description.length }}/150
+
+
@@ -423,7 +424,27 @@ export default {
display: flex;
align-items: flex-start;
margin-bottom: 32px;
+ .textarea {
+ width: 423px;
+ .ant-input {
+ width: 100%;
+ }
+
+ .ant-input-textarea-show-count {
+ position: relative;
+ }
+
+ .ant-input-textarea-show-count::after {
+ position: absolute;
+ right: 10px;
+ bottom: 0px;
+ }
+
+ .ant-input {
+ border-radius: 8px;
+ }
+ }
.signbox {
width: 120px;
display: flex;
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 818fcf65..2942df5e 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -18,7 +18,7 @@
@@ -30,7 +30,7 @@
@@ -103,7 +103,7 @@
@@ -209,7 +209,7 @@
- 删除作业
+ 删除作业{{EditWorkId}}
@@ -233,7 +233,7 @@
- 删除考试
+ 删除考试{{EditTestId}}
@@ -793,7 +793,27 @@ export default {
display: flex;
align-items: flex-start;
margin-bottom: 32px;
+ .textarea {
+ width: 423px;
+ .ant-input {
+ width: 100%;
+ }
+
+ .ant-input-textarea-show-count {
+ position: relative;
+ }
+
+ .ant-input-textarea-show-count::after {
+ position: absolute;
+ right: 10px;
+ bottom: 0px;
+ }
+
+ .ant-input {
+ border-radius: 8px;
+ }
+ }
.signbox {
width: 120px;
display: flex;
diff --git a/src/components/drawers/AddGroup.vue b/src/components/drawers/AddGroup.vue
index 0606e0a7..ac0db9e4 100644
--- a/src/components/drawers/AddGroup.vue
+++ b/src/components/drawers/AddGroup.vue
@@ -29,6 +29,7 @@
v-model:value="valuen"
placeholder="请输入小组名称"
style="border-radius: 8px; height: 40px"
+ maxlength="20"
/>
@@ -45,6 +46,7 @@
v-model:value="valueg"
placeholder="请输入小组长"
style="border-radius: 8px; height: 40px"
+ maxlength="20"
/>
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index ea551f0b..e0c27c82 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -12,7 +12,7 @@
+
+
+ show-count :maxlength="200"
+ />
@@ -95,7 +99,7 @@
@@ -283,6 +287,10 @@ export default {
state.workEnclosureAddress = "";
resetForm();
};
+ const closeDrawer2 = () => {
+ ctx.emit("update:addhomeworkVisible", false);
+ resetForm();
+ };
const afterVisibleChange = () => {
if (props.EditWorkId > 0) {
state.EditWorkId = props.EditWorkId;
@@ -438,6 +446,7 @@ export default {
return {
afterVisibleChange,
closeDrawer,
+ closeDrawer2,
handleChange,
fileList,
formState,
@@ -527,7 +536,27 @@ export default {
display: flex;
align-items: flex-start;
margin-bottom: 32px;
+ .textarea {
+ width: 423px;
+
+ .ant-input {
+ width: 100%;
+ }
+ .ant-input-textarea-show-count {
+ position: relative;
+ }
+
+ .ant-input-textarea-show-count::after {
+ position: absolute;
+ right: 10px;
+ bottom: 0px;
+ }
+
+ .ant-input {
+ border-radius: 8px;
+ }
+ }
.signbox {
width: 120px;
display: flex;
diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue
index 935f71c2..4de33e02 100644
--- a/src/components/drawers/AddLevelAddStu.vue
+++ b/src/components/drawers/AddLevelAddStu.vue
@@ -31,6 +31,7 @@
v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
+ maxlength="20"
/>
@@ -126,6 +127,7 @@
v-model:value="nameadd"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
+ maxlength="20"
/>
@@ -205,6 +207,7 @@
v-model:value="nameaddd"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
+ maxlength="20"
/>
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 367eb606..46e0b339 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -47,7 +47,10 @@
v-model:value="textV1"
placeholder="请输入考试说明"
allow-clear
- maxlength="364px"
+ show-count
+ :maxlength="200"
+ :rows="6"
+
/>
@@ -155,6 +158,7 @@
v-model:value="inputV4"
style="width: 424px; height: 32px"
placeholder="请输入直播链接"
+ :maxlength="100"
/>
@@ -176,6 +180,7 @@
v-model:value="inputV5"
style="width: 424px; height: 32px"
placeholder="请输入回放链接"
+ :maxlength="100"
/>
@@ -872,7 +877,27 @@ export default {
display: flex;
align-items: flex-start;
margin-bottom: 32px;
+ .textarea {
+ width: 423px;
+ .ant-input {
+ width: 100%;
+ }
+
+ .ant-input-textarea-show-count {
+ position: relative;
+ }
+
+ .ant-input-textarea-show-count::after {
+ position: absolute;
+ right: 10px;
+ bottom: 0px;
+ }
+
+ .ant-input {
+ border-radius: 8px;
+ }
+ }
.signbox {
width: 120px;
display: flex;
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 1d587c4d..d52c7a4e 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -27,6 +27,7 @@
v-model:value="inputV1"
style="width: 240px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称"
+ maxlength="20"
/>
diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index 48a0cd5a..23dc5b6c 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -15,21 +15,22 @@
项目名称:
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index 32d4e39d..a6b55e71 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -42,7 +42,7 @@
v-model:value="inputV1"
style="width: 424px; height: 32px"
placeholder="请输入外链名称"
- maxlength="20"
+ show-count :maxlength="50"
/>
@@ -61,6 +61,8 @@
v-model:value="inputV2"
style="width: 424px; height: 32px"
placeholder="请输入链接"
+
+ show-count :maxlength="100"
/>
@@ -73,6 +75,8 @@
v-model:value="textV1"
placeholder="请输入外链说明"
allow-clear
+ :rows="6"
+ show-count :maxlength="200"
/>
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 38876d14..8557182f 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -12,7 +12,7 @@
@@ -58,7 +58,7 @@
style="width: 424px; height: 32px; margin-left: 35px"
autocomplete="off"
placeholder="请输入考试名称"
- maxlength="20"
+ show-count :maxlength="50"
/>
@@ -68,14 +68,15 @@
has-feedback
label="考试说明"
name="examinationExplain"
- >
+ >
+ show-count :maxlength="200"
+ />
@@ -306,7 +307,7 @@
@@ -335,7 +336,7 @@
style="width: 424px; height: 32px; margin-left: 35px"
autocomplete="off"
placeholder="请输入考试名称"
- maxlength="20"
+ show-count :maxlength="50"
/>
@@ -352,7 +353,7 @@
style="width: 424px; height: 32px; margin-left: 35px"
autocomplete="off"
placeholder="数据来源"
- maxlength="20"
+ show-count :maxlength="50"
/>
@@ -364,19 +365,21 @@
label="考试说明"
name="examinationExplain"
>
+
+ show-count :maxlength="200"
+ />
@@ -652,6 +655,11 @@ export default {
localStorage.setItem("chapterId", props.isactive);
resetForm();
};
+ const closeDrawer2 = () => {
+ formState.choosedTime = "";
+ ctx.emit("update:addtestVisible", false);
+ resetForm();
+ };
const afterVisibleChange = () => {
if (props.addtestVisible && props.edit) {
// 该页面显示同时 edit为true 时,发送查询请求,
@@ -856,6 +864,7 @@ export default {
formState,
afterVisibleChange,
closeDrawer,
+ closeDrawer2,
selectTest,
cloradio1,
cloradio2,
@@ -963,6 +972,27 @@ export default {
display: flex;
align-items: flex-start;
margin-bottom: 32px;
+ .textarea {
+ width: 423px;
+
+ .ant-input {
+ width: 100%;
+ }
+
+ .ant-input-textarea-show-count {
+ position: relative;
+ }
+
+ .ant-input-textarea-show-count::after {
+ position: absolute;
+ right: 10px;
+ bottom: 0px;
+ }
+
+ .ant-input {
+ border-radius: 8px;
+ }
+ }
.signbox {
width: 120px;
display: flex;
diff --git a/src/components/drawers/CourseOwner.vue b/src/components/drawers/CourseOwner.vue
index ab3c53f8..ecc69bbf 100644
--- a/src/components/drawers/CourseOwner.vue
+++ b/src/components/drawers/CourseOwner.vue
@@ -31,6 +31,7 @@
v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
+ maxlength="20"
/>
diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index a6a845cb..eb59795d 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -136,7 +136,7 @@
//import { ApiFilled } from "@ant-design/icons-vue";
import {reactive, toRefs, ref, computed} from "vue";
// import { planList } from "../../api/indexTaskadd";
-import {detail} from "../../api/indexCourse";
+//import {detail} from "../../api/indexCourse";
import {list} from "../../api/indexTaskadd";
import {toDate} from "../../api/method";
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 8c60136d..1de45dc8 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3980,6 +3980,7 @@ export default defineComponent({
state.valueE1 = "";
state.qdms_inputV1 = state.xzinputV1;
state.xzinputV1 = "";
+ getDictList("faceclassPic");
}
if (state.bs_hs && state.valueE1 != "") {
state.addOnlineCoursevisible = true;
From b854ea028b8bd6d26121f6e9305c4e4ff97df570 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Sun, 4 Dec 2022 16:48:14 +0800
Subject: [PATCH 04/11] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=AE=A1?=
=?UTF-8?q?=E6=A0=B8=E9=A1=B9=E7=9B=AE=E6=89=80=E5=B1=9E=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=AF=B4=E6=98=8E=E5=AD=97=E6=AE=B5=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/examine/ProjectReviewed.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index cd88764e..fc8c5776 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -188,7 +188,7 @@ export default {
key: "topName",
align: "center",
width: "10%",
- customRender: ({record: {parentId,name}}) =>
{parentId==0?name:(parentId)}
,
+ customRender: ({record: {gaName,faName,name}}) =>
{ faName ?gaName!==null?gaName+'/'+faName:faName:name}
,
},
{
title: "项目经理",
From 52d6e2441070b8942032bc0a29ac041c2a7b5141 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Sun, 4 Dec 2022 17:02:16 +0800
Subject: [PATCH 05/11] =?UTF-8?q?fix:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?=
=?UTF-8?q?=E5=9B=BE=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/learningpath/LevelAdd.vue | 34 ++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 36649fe6..4f106a65 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -768,7 +768,7 @@
上传共享文档
@@ -1909,12 +1909,42 @@ export default {
console.log("获取失败" + err);
});
};
+
+ // 设置上传图片开关
+ const checkedClose = (data,a) => {
+ console.log(data,a)
+ state.docChecked = data
+ console.log({
+ routerId: state.routerId,
+ status: state.action,
+ attachSwitch: data ? 1: -1
+ })
+ // 更新开关状态
+ editRoutered({
+ attach:JSON.stringify(state.fileList),
+ name: state.styTitle,
+ picUrl: state.picUrl,
+ remark: state.remark,
+ routerId: state.routerId,
+ status: state.action,
+ attachSwitch: data ? 1: -1
+ })
+ .then((res) => {
+ console.log(res);
+ })
+ .catch((err) => {
+ console.log(err);
+ });
+
+ }
+
// 获取路径列表
const myGetRouterDetail = () => {
GetRouterDetail(state.routerId)
.then((res) => {
console.log('router-list',res)
state.fileList = JSON.parse(res.data.data.routerInfo.attach)
+ state.docChecked = res.data.data.routerInfo.attachSwitch == 1?true:false
if (res.data.data.routerInfo.status == 1) {
state.nodata = false;
}
@@ -1960,6 +1990,7 @@ export default {
remark: state.remark,
routerId: state.routerId,
status: state.action,
+ attachSwitch: state.docChecked?1:-1
})
.then((res) => {
console.log(res);
@@ -2182,6 +2213,7 @@ export default {
deleteStu,
totask,
tostudent,
+ checkedClose
};
},
};
From d4a36e2bb62af5ce57c4cf84d56f53a401f9fc9b Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Sun, 4 Dec 2022 17:28:14 +0800
Subject: [PATCH 06/11] =?UTF-8?q?style:=E5=A2=9E=E5=8A=A0=E9=9D=A2?=
=?UTF-8?q?=E6=8E=88=E8=AF=BE=E6=9F=A5=E7=9C=8B=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/courselibrary/CoursewareManage.vue | 472 ++++++++++++++++++-
1 file changed, 471 insertions(+), 1 deletion(-)
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 9c7f63bd..28dc35e0 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -678,6 +678,418 @@
+
+
+
+
+
+
+
课程信息
+
+
+
+
+
+

+
+
课程名称
+
+
+
+
+
+
+
+ 1、课程名称统一不加书名号。
+ 2、项目名称、属地等信息如需体现在课程名称中,请放在课程名称信息
+ 之后,如“时间管理(GROW180项目)”或“时间管理(B*)”确保首先
+ 看到的是课程内容主题。
+ 3、同一课程如先后有多个版本,原则上仅开放最新版本,旧版本应停用
+ 版本如必须以年份标明,请以“沟通技巧(2022年)”的方式呈现。
+
+
+
+
+
+
+

+
+
封面图
+
+
+
+
+
+
+
+
+ 高宽比为16:9 (如:800*450) png或jpg图片
+
+
+
+
+
+
+
+

+
+
目标人群
+
+
+
+
+
+
+
+

+
+
内容分类
+
+
+
+
+
+
+
+
+
+
+

+
+
授课教师
+
+
+
+
+
+ 课程简介
+
+
+
+
+
+
+ {{ qdms_inputV6.length }}/150
+
+
+
+
+
+
+
+ 附件
+
+
+
+
+
+

+
+
添加附件
+
+
+
+ 支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -904,7 +1316,7 @@
{
- handleEdit(record, String(record.courseform));
+ handleLook(record, String(record.courseform));
}
"
>查看 {
+ state.lookMs = false
+ }
//保存面授课
const handlePush = (param) => {
//state.isEdit = 1;
@@ -4611,6 +5028,57 @@ export default defineComponent({
state.ft_hs = true;
state.ft_eidt = true;
};
+
+
+ const handleLook = async (itm, type) => {
+ state.isEdit = 0;
+ console.log(45555);
+ console.log(itm);
+ if (type === "1") {
+ return;
+ }
+ state.offcourseId = itm.offcourseId;
+
+ const item = await detail({
+ offcourseId: Number(state.offcourseId),
+ }).then((res) => {
+ if (res.data.code === 200) return res.data.data;
+ });
+ console.log("res");
+ console.log(item);
+ console.log(options2.value);
+ console.log(options3.value);
+
+ 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");
// // const item = await getMemberInfo({
@@ -5038,6 +5506,8 @@ export default defineComponent({
showManagePrower,
closeOnlineCoursevisible,
+ handlelookMs,
+ handleLook
};
},
});
From 39ad9b06dacbe35775e7b597241ce7ab0d9fddfa Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Sun, 4 Dec 2022 17:31:02 +0800
Subject: [PATCH 07/11] =?UTF-8?q?style:=E9=9A=90=E8=97=8F=E5=8F=96?=
=?UTF-8?q?=E6=B6=88=E7=A1=AE=E5=AE=9A=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/courselibrary/CoursewareManage.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 28dc35e0..a7865fd4 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1078,12 +1078,12 @@
From a09bbd6fde1fd0bfadfd977d95f062cfd6b0b707 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 4 Dec 2022 17:51:53 +0800
Subject: [PATCH 08/11] =?UTF-8?q?--=E9=A1=B9=E7=9B=AE=20=E9=98=B6=E6=AE=B5?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/projectcenter/ProjectManage.vue | 1 +
src/views/projectcenter/TaskAdd.vue | 195 +--
src/views/projectcenter/TaskPage.vue | 1717 +++++++++++----------
3 files changed, 962 insertions(+), 951 deletions(-)
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 889990b4..93034fa7 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1526,6 +1526,7 @@ export default {
onClick={() => {
router.push({
path: "/taskpage",
+ query: {projectId: value.record.projectId}
});
storage.set("projectId", value.record.projectId);
}}
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index e0431530..9201c955 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1027,7 +1027,7 @@