-
+
+
-
+
@@ -145,12 +149,15 @@
import { toRefs, reactive, onMounted, onUnmounted } from "vue";
import { message } from "ant-design-vue";
// import ViewAssess from "../ViewAssess";
-import { checkGrowthPer } from "@/utils/utils";
+import EScore from "@/components/growthpath/GrowthScore.vue";
+
import {
getStudentTaskPage,
batchSendMessage,
exportStudentTaskPage,
} from "@/api/growthpath";
+
+import * as api from "@/api/index1";
import { TASK_TYPE } from "@/utils/constGrown";
import PostSelectNew from "@/components/growthpath/PostSelect";
import OfficeSelect from "@/components/growthpath/OfficeSelect";
@@ -160,6 +167,7 @@ export default {
components: {
OfficeSelect,
PostSelectNew,
+ EScore,
},
props: {
createId: {
@@ -199,6 +207,8 @@ export default {
visible: props.Tvisible,
name: "",
pageNum: 1,
+ step: 1, // 步骤数
+ Evisible: false, //录入成绩抽屉
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
@@ -228,6 +238,12 @@ export default {
evalDataSource: "",
Assessvisible: false,
});
+ // 关闭导入成绩
+ const closeImport = () => {
+ state.step = 1;
+ state.tableDataTotalLoading = true;
+ getData();
+ };
const tableDataFunc = () => {
const columns = [
{
@@ -427,13 +443,19 @@ export default {
};
const closeDrawer = () => {
- ctx.emit("update:Tvisible", false);
- state.currentPage = 1;
- state.name = "";
- state.completionStatus = undefined;
- state.tableData = [];
- state.stdPosition = null;
- state.qualsLevelCode = null;
+ if (state.step == 1) {
+ ctx.emit("update:Tvisible", false);
+ state.currentPage = 1;
+ state.name = "";
+ state.completionStatus = undefined;
+ state.tableData = [];
+ state.stdPosition = null;
+ state.qualsLevelCode = null;
+ } else {
+ state.step = 1;
+ state.tableDataTotalLoading = true;
+ getData();
+ }
};
const afterVisibleChange = (bol) => {
if (bol == true) {
@@ -447,9 +469,9 @@ export default {
};
//催促
const godie = () => {
- if(!state.tableData.length){
+ if (!state.tableData.length) {
message.warning("当前学习任务没有可催促的学员");
- return
+ return;
}
var obj = {
courseId: props.datasource.taskId
@@ -472,7 +494,10 @@ export default {
const onChange = (pageNumber) => {
console.log("Page: ", pageNumber);
};
-
+ // 导入成绩
+ const showEntryScore = () => {
+ state.step = 2;
+ };
// 获取数据
function getData() {
getStudentTaskPage({
@@ -556,32 +581,15 @@ export default {
//显示导出作业弹窗
const exportHomeWorkShow = () => {
- // state.exportHomeWorkV = true;
- // exportHomeWork();
- let obj = {
- currentStageId: props.datasource.chapterId,
- pid: props.datasource.routerId,
+ let params = {
taskId: props.datasource.id,
- taskType: props.datasource.type,
- type: 2,
};
- api
- .exportHomeWork(obj)
- .then((res) => {
- console.log("导出作业", res.data.data);
- if (res.data.code === 200) {
- // debugger
- // message.destroy();
- // message.success("导出作业成功");
- state.exportHomeWorkV = true;
- state.downloadUrl = res.data.data;
- }
- })
- .catch((err) => {
- message.destroy();
- message.error("导出作业失败");
- console.log("导出作业失败", err);
- });
+ window.open(
+ buildUrl(
+ `${process.env.VUE_APP_BOE_API_URL}${process.env.VUE_APP_BASE_API_GROWTH}/professional/task/workExport`,
+ params
+ )
+ );
};
return {
...toRefs(state),
@@ -592,9 +600,11 @@ export default {
afterVisibleChange,
tableDataFunc,
godie,
+ closeImport,
onMounted,
onUnmounted,
onChange,
+ showEntryScore,
searchTaskList,
resetTaskList,
changePaginationStu,
diff --git a/src/components/growthpath/GrowthRef.vue b/src/components/growthpath/GrowthRef.vue
index 4d5d3ee3..bc6f6b4b 100644
--- a/src/components/growthpath/GrowthRef.vue
+++ b/src/components/growthpath/GrowthRef.vue
@@ -96,7 +96,7 @@ const props = defineProps({
growId: String,
});
const visible = ref(false);
-const formData = useResetRef({
+const formData = ref({
info: {
linkName: "",
linkAddress: "",
@@ -121,13 +121,18 @@ const rulesRef = ref({
],
});
-let validate = Form.useForm(formData.value.info, rulesRef).validate;
+let validate = null;
const closeDrawer = () => {
visible.value = false;
dateTime.value = [];
- formData.reset();
- formData.value.info = {};
+ formData.value = {
+ info: {
+ linkName: "",
+ linkAddress: "",
+ linkDescription: "",
+ },
+ };
};
async function confirm() {
@@ -160,7 +165,7 @@ async function confirm() {
function openDrawer(row) {
row && (formData.value = row);
- row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
+ validate = Form.useForm(formData.value.info, rulesRef).validate;
visible.value = true;
}
diff --git a/src/components/growthpath/GrowthScore.vue b/src/components/growthpath/GrowthScore.vue
new file mode 100644
index 00000000..7f6daee5
--- /dev/null
+++ b/src/components/growthpath/GrowthScore.vue
@@ -0,0 +1,647 @@
+
+
+
+
请下载
+
模板
+
，按要求填写数据并导入
+
+
+
上传：
+
+
+
+
+
+
+ 点击或将文件拖拽到此处上传
+ 支持扩展名：.xls/.xlsx
+
+
+
+
+
+
+
+
+
+
{{ fileName }}
+
正在上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ fileName }}
+
上传失败
+
+
+
+
+
+
+
+
+ {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
+
+
+
+
+
+
+
+
+
+
+
{{ fileName }}
+
上传成功
+
+
+
+
+
+
+
+
+
+
![]()
+
+ {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/growthpath/GrowthVote.vue b/src/components/growthpath/GrowthVote.vue
index 71bd3911..3e238a43 100644
--- a/src/components/growthpath/GrowthVote.vue
+++ b/src/components/growthpath/GrowthVote.vue
@@ -144,7 +144,7 @@ const title = computed(() => {
// 步骤数
const step = ref(1);
const visible = ref(false);
-const formData = useResetRef({
+const formData = ref({
info: {
voteName: "",
voteStartTime: "",
@@ -182,7 +182,7 @@ const rulesRef = ref({
],
});
-let validate = Form.useForm(formData.value.info, rulesRef).validate;
+let validate = null;
// 关闭弹窗
const closeDrawer = () => {
if (step.value > 1) {
@@ -190,9 +190,14 @@ const closeDrawer = () => {
} else {
visible.value = false;
dateTime.value = [];
- formData.reset();
- formData.value.info = {
- voteStemDtoList: [],
+ formData.value = {
+ info: {
+ voteName: "",
+ voteStartTime: "",
+ voteEndTime: "",
+ voteStemDtoList: [],
+ voteExplain: "",
+ },
};
}
};
@@ -245,7 +250,7 @@ function openDrawer(row) {
dayjs(row.info.voteStartTime, "YYYY-MM-DD HH:mm"),
dayjs(row.info.voteEndTime, "YYYY-MM-DD HH:mm"),
]);
- row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
+ validate = Form.useForm(formData.value.info, rulesRef).validate;
visible.value = true;
}
diff --git a/src/components/growthpath/ImportStu.vue b/src/components/growthpath/ImportStu.vue
index b368995b..a8072eb6 100644
--- a/src/components/growthpath/ImportStu.vue
+++ b/src/components/growthpath/ImportStu.vue
@@ -35,8 +35,7 @@
:multiple="false"
@change="handleChange"
:data="{
- growthId: Number(courseId),
- type: courseType,
+ growthId: String(growId),
}"
:showUploadList="false"
>
@@ -219,7 +218,7 @@ export default {
type: Boolean,
default: false,
},
- courseId: {
+ growId: {
type: String,
default: "",
},
@@ -238,7 +237,6 @@ export default {
importStudent: `${process.env.VUE_APP_BOE_API_URL}${
process.env.VUE_APP_BASE_API_GROWTH || ""
}/professional/allocation/importLearner`,
-
timers: "", // 定时器，用于清空定时器使用
isAddStudent: false, // 用于判断用户是否关闭弹框需要重新获取学员列表
uploadpercent: -1,
@@ -268,7 +266,7 @@ export default {
if (state.redisKey && state.succNum != 0 && item) {
saveStudent({
redisKey: state.redisKey,
- growId: props.courseId,
+ growId: props.growId,
isImportNotMatchStudent: state.groupValue ? 1 : 0,
})
.then((res) => {
@@ -343,7 +341,7 @@ export default {
console.log("上传成功返回的UUID----->", info);
console.log("我是导入学员接口传递的参数", {
file: info.file.originFileObj,
- targetId: props.courseId,
+ targetId: props.growId,
type: 14,
});
state.fileName = info.file.name;
diff --git a/src/components/growthpath/StudentManage.vue b/src/components/growthpath/StudentManage.vue
index 61216ed7..42469a50 100644
--- a/src/components/growthpath/StudentManage.vue
+++ b/src/components/growthpath/StudentManage.vue
@@ -286,7 +286,7 @@
@@ -732,11 +732,8 @@ const AddImpStuvisible = ref(false); //导入学员抽屉
const showImpStu = () => {
AddImpStuvisible.value = true;
};
-const AddImpStuvisibleClose = (isget) => {
- console.log("关闭了导入学员弹框", isget);
- if (isget) {
- getStuList();
- }
+const AddImpStuvisibleClose = () => {
+ getStuList();
};
function startLoading() {
diff --git a/src/views/growthpath/PathManage.vue b/src/views/growthpath/PathManage.vue
index dd5241b9..ab7e1f07 100644
--- a/src/views/growthpath/PathManage.vue
+++ b/src/views/growthpath/PathManage.vue
@@ -47,12 +47,10 @@
-
-
-
返回
-
+
+
返回
+
- 
-