+
-
-
-
-
-
快速选人
-
-
-
- {{ item.realName }}
-
-
-
-
-
-
- {{ item.realName }}
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
项目内学员
+
+
+
+ {{ item.userNickName }}
+
+
+
+
+
+
+ {{ item.userNickName }}
+
+
+
+
+
+
+
+
+
+
快速选人
+
+
+
+ {{ item.realName }}
+
+
+
+
+
+
+ {{ item.realName }}
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
diff --git a/src/components/growthpath/GrowthExa.vue b/src/components/growthpath/GrowthExa.vue
index 53c8705c..8d6524e2 100644
--- a/src/components/growthpath/GrowthExa.vue
+++ b/src/components/growthpath/GrowthExa.vue
@@ -511,9 +511,11 @@ const closeDrawer = () => {
if (step.value > 1) {
step.value = step.value - 1;
} else {
- formData.value.info = {};
visible.value = false;
formData.reset();
+ formData.value.info = {
+ examType: 1,
+ };
dateTime.value = [];
}
};
@@ -523,10 +525,9 @@ function timeChange(time, timeStr) {
formData.value.info.examinationEndTime = timeStr[1];
}
-
// 系统考试
async function confirm() {
- console.log(formData.value)
+ console.log(formData.value);
if (formData.value.info.examinationName.trim() == "") {
message.warning("请输入考试名称");
return;
@@ -552,7 +553,7 @@ async function confirm() {
// 任务名称
formData.value.taskName = formData.value.info.examinationName;
// 任务时长
- formData.value.duration = formData.value.info.examinationDuration
+ formData.value.duration = formData.value.info.examinationDuration;
saveTask(formData.value).then((res) => {
if (res.data.code == 200) {
if (formData.value.id) {
@@ -566,7 +567,6 @@ async function confirm() {
}
closeDrawer();
});
-
}
function openDrawer(row) {
diff --git a/src/components/growthpath/GrowthFaceStu.vue b/src/components/growthpath/GrowthFaceStu.vue
new file mode 100644
index 00000000..4a700eb5
--- /dev/null
+++ b/src/components/growthpath/GrowthFaceStu.vue
@@ -0,0 +1,1272 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 第{{ data.length - n }}次开课
+
+
+ {{ item.name }}
+
+
+

+ {{ item.beginTime }} ~ {{ item.endTime }}
+
+
+

+ {{ item.address }}
+
+
+

+ {{
+ item.offteachers.map((item) => item.teacherName).join(",")
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/growthpath/GrowthFaceTaskManage.vue b/src/components/growthpath/GrowthFaceTaskManage.vue
new file mode 100644
index 00000000..903f2884
--- /dev/null
+++ b/src/components/growthpath/GrowthFaceTaskManage.vue
@@ -0,0 +1,1070 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 第{{ data.length - n }}次开课
+
+
+ {{ item.name }}
+
+
+

+ {{ item.beginTime }} ~ {{ item.endTime }}
+
+
+

+ {{ item.address }}
+
+
+

+ {{ item.teacher }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/growthpath/GrowthInvist.vue b/src/components/growthpath/GrowthInvist.vue
index 1b7ce255..b7f684fd 100644
--- a/src/components/growthpath/GrowthInvist.vue
+++ b/src/components/growthpath/GrowthInvist.vue
@@ -86,6 +86,7 @@ import { saveTask } from "@/api/growthpath";
// import { useRouter } from "vue-router";
import { useRowsPage } from "@/api/request";
import { ASSESSMENT_PAGE } from "@/api/apis";
+import dialog from "@/utils/dialog";
const emit = defineEmits(["refresh"]);
const props = defineProps({
type: Number,
@@ -195,24 +196,29 @@ const closeDrawer = () => {
};
async function confirm(record) {
- if (!formData?.value?.id) {
- await saveTask({
- growthId: props.growId,
- taskName: record.assessmentName,
- taskType: props.type,
- taskId: record.id,
- type: props.activeKey,
- });
- message.success("添加成功");
- } else {
- // 编辑
- formData.value.taskName = record.assessmentName;
- formData.value.taskId = record.id;
- await saveTask(formData.value);
- message.success("编辑成功");
- }
- closeDrawer();
- emit("refresh");
+ dialog({
+ content: "确定选择该评估吗?",
+ ok: async () => {
+ if (!formData?.value?.id) {
+ await saveTask({
+ growthId: props.growId,
+ taskName: record.assessmentName,
+ taskType: props.type,
+ taskId: record.id,
+ type: props.activeKey,
+ });
+ message.success("添加成功");
+ } else {
+ // 编辑
+ formData.value.taskName = record.assessmentName;
+ formData.value.taskId = record.id;
+ await saveTask(formData.value);
+ message.success("编辑成功");
+ }
+ closeDrawer();
+ emit("refresh");
+ },
+ });
}
function openDrawer(row) {
diff --git a/src/components/growthpath/GrowthOnlineManage.vue b/src/components/growthpath/GrowthOnlineManage.vue
index 5e4dd76e..63c798ad 100644
--- a/src/components/growthpath/GrowthOnlineManage.vue
+++ b/src/components/growthpath/GrowthOnlineManage.vue
@@ -322,10 +322,8 @@ export default {
className: "h",
customRender: ({ record: { joinMethod } }) =>
({
- 1: "自动匹配",
- 2: "手动添加",
- 3: "导入",
- 4: "添加",
+ 1: "系统加入",
+ 2: "手动加入",
}[joinMethod]),
},
{
diff --git a/src/components/growthpath/GrowthOpenCourse.vue b/src/components/growthpath/GrowthOpenCourse.vue
index 8de0fa2a..e50ddabf 100644
--- a/src/components/growthpath/GrowthOpenCourse.vue
+++ b/src/components/growthpath/GrowthOpenCourse.vue
@@ -449,7 +449,7 @@