This commit is contained in:
Pengxiansen
2025-02-25 17:40:36 +08:00
parent 1b45ae804b
commit cb3bff4fa8
11 changed files with 557 additions and 559 deletions

View File

@@ -267,7 +267,7 @@ const rulesRef = ref({
},
],
});
let validate = Form.useForm(formData.value.info, rulesRef).validate;
let validate = null;
const durationText = computed(() =>
dateTime.value?.length
? dayjs(dateTime.value[1]).diff(dayjs(dateTime.value[0]), "minute")
@@ -349,7 +349,7 @@ function openDrawer(row) {
dayjs(row.info.activityStartTime, "YYYY-MM-DD HH:mm"),
dayjs(row.info.activityEndTime, "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;
}

View File

@@ -94,7 +94,7 @@ const props = defineProps({
growId: String,
});
const visible = ref(false);
const formData = useResetRef({
const formData = ref({
info: {
discussName: "",
discussExplain: "",
@@ -118,12 +118,17 @@ 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: {
discussName: "",
discussExplain: "",
discussSettings: true,
},
};
};
async function confirm() {
@@ -161,7 +166,7 @@ function openDrawer(row) {
row.info.discussSettings === "false" || row.info.discussSettings === false
? false
: true);
row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
validate = Form.useForm(formData.value.info, rulesRef).validate;
visible.value = true;
}

View File

@@ -198,12 +198,13 @@ async function confirm() {
} else {
message.success("添加成功");
}
closeDrawer();
emit("refresh");
} else {
message.error(res.msg);
}
});
closeDrawer();
}
let validate = null;
function openDrawer(row) {

View File

@@ -356,7 +356,7 @@ const props = defineProps({
});
const visible = ref(false);
const headers = { token: getCookieForName("token") };
const formData = useResetRef({
const formData = ref({
info: {
liveName: "",
liveLink: "",
@@ -436,7 +436,7 @@ const rulesRef = ref({
},
],
});
let validate = Form.useForm(formData.value.info, rulesRef).validate;
let validate = null;
const { resetFields } = Form.useForm(formData.value.info, rulesRef);
const durationText = computed(() =>
dateTime.value?.length
@@ -451,8 +451,26 @@ const closeDrawer = () => {
imageUrl.value = "";
visible.value = false;
dateTime.value = [];
formData.reset();
formData.value.info = {};
formData.value = {
info: {
liveName: "",
liveLink: "",
liveStartTime: "",
liveEndTime: "",
liveNotice: "",
liveDuration: "",
liveTeacherId: "",
liveTeacherName: "",
liveCover: "",
beforeSignIn: "",
afterSignIn: "",
isEvaluate: false,
assessmentId: "",
assessmentName: "",
livePlayback: "",
liveExplain: "",
},
};
resetFields();
}
};
@@ -495,11 +513,11 @@ async function confirm() {
} else {
message.success("添加成功");
}
closeDrawer();
emit("refresh");
} else {
message.error(res.msg);
}
closeDrawer();
});
}
@@ -507,7 +525,7 @@ function openDrawer(row) {
row && (formData.value = row);
row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]);
row && (imageUrl.value = row.info.liveCover);
row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
validate = Form.useForm(formData.value.info, rulesRef).validate;
visible.value = true;
}

View File

@@ -18,6 +18,7 @@
@click="closeDrawer"
/>
</div>
<template v-if="step == 1">
<div class="main">
<template v-if="datasource.taskType == 4">
<div class="endtime">
@@ -75,6 +76,7 @@
</div>
</div>
<div class="btnss" style="margin-top: 20px">
<template v-if="tableData.length">
<div class="btn btn1" @click="godie" style="margin-right: 20px">
<div class="img1"></div>
<div class="wz">催促学习</div>
@@ -97,6 +99,7 @@
<div class="wz" @click="showEntryScore">导入成绩</div>
</div>
</template>
</template>
</div>
<div class="tab" style="margin-top: 20px; margin-bottom: 100px">
<a-table
@@ -124,17 +127,19 @@
</div>
</div>
</div>
</div>
</a-drawer>
</template>
<template v-if="step == 2">
<EScore
v-model:eScorevisible="Evisible"
:type="2"
@close="closeImport"
:id="datasource?.id"
:pid="datasource?.growthId"
v-model:searchTaskList="searchTaskList"
/>
</template>
</div>
</a-drawer>
<!-- <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="datasource.info?.assessmentName"
:basicdata="datasource.info" /> -->
</template>
@@ -143,7 +148,6 @@
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 {
@@ -202,6 +206,7 @@ export default {
visible: props.Tvisible,
name: "",
pageNum: 1,
step: 1, // 步骤数
Evisible: false, //录入成绩抽屉
pageSize: 10,
currentPage: 1,
@@ -232,6 +237,12 @@ export default {
evalDataSource: "",
Assessvisible: false,
});
// 关闭导入成绩
const closeImport = () => {
state.step = 1;
state.tableDataTotalLoading = true;
getData();
};
const tableDataFunc = () => {
const columns = [
{
@@ -431,6 +442,7 @@ export default {
};
const closeDrawer = () => {
if (state.step == 1) {
ctx.emit("update:Tvisible", false);
state.currentPage = 1;
state.name = "";
@@ -438,6 +450,11 @@ export default {
state.tableData = [];
state.stdPosition = null;
state.qualsLevelCode = null;
} else {
state.step = 1;
state.tableDataTotalLoading = true;
getData();
}
};
const afterVisibleChange = (bol) => {
if (bol == true) {
@@ -478,7 +495,7 @@ export default {
};
// 导入成绩
const showEntryScore = () => {
state.Evisible = true;
state.step = 2;
};
// 获取数据
function getData() {
@@ -582,6 +599,7 @@ export default {
afterVisibleChange,
tableDataFunc,
godie,
closeImport,
onMounted,
onUnmounted,
onChange,

View File

@@ -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;
}

View File

@@ -1,26 +1,8 @@
<template>
<a-drawer
:visible="eScorevisible"
class="drawerStyle ExportScore"
placement="right"
width="700px"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">导入成绩</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="main">
<div class="ExportScore">
<div class="minatitl">
<div class="up1">请下载</div>
<div class="up2" @click="downTemplate" style="cursor: pointer">
模板
</div>
<div class="up2" @click="downTemplate" style="cursor: pointer">模板</div>
<div class="up1">按要求填写数据并导入</div>
</div>
<div class="upload">
@@ -94,18 +76,13 @@
<div class="curloading">
<!-- <div class="cur">55%</div> -->
<div
style="color: #387df7; margin-left: 20px; cursor: pointer"
>
<div style="color: #387df7; margin-left: 20px; cursor: pointer">
下载失败数据
</div>
<!-- <div class="cancel" style="margin-left: 20px">暂停</div>
<div class="cancel" style="margin-left: 15px">取消</div> -->
</div>
<div
class="defeat"
style="display: flex; align-items: center"
>
<div class="defeat" style="display: flex; align-items: center">
<div style="color: #ff7474">
{{ succNum }}条数据导入成功{{ errNum }}条数据导入失败
</div>
@@ -182,12 +159,10 @@
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>
<!-- 加载动画 -->
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="" />
</div>
</a-drawer>
</template>
<script>
import { reactive, toRefs } from "vue";
@@ -248,6 +223,7 @@ export default {
state.fileList = [];
state.uploadpercent = -1;
state.uploadErr = false; //上传失败
ctx.emit("close");
};
const afterVisibleChange = (bool) => {
@@ -420,33 +396,6 @@ export default {
<style lang="scss">
.ExportScore {
.drawerMain {
min-width: 600px;
margin: 0px 32px 0px 32px;
overflow-x: auto;
display: flex;
flex-direction: column;
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
// background-color: red;
margin-bottom: 20px;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
// margin-left: 24px;
}
}
.main {
overflow-y: auto;
.minatitl {
@@ -660,7 +609,6 @@ export default {
}
}
}
}
.btnn {
height: 72px;
@@ -696,5 +644,4 @@ export default {
}
}
}
}
</style>

View File

@@ -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 = {
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;
}

View File

@@ -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: "",
},
@@ -235,10 +234,10 @@ export default {
const store = useStore();
const state = reactive({
redisKey: "",
importStudent: `${process.env.VUE_APP_BOE_API_URL}${
process.env.VUE_APP_BASE_API_GROWTH || ""
}/professional/allocation/importLearner`,
// importStudent: `${process.env.VUE_APP_BOE_API_URL}${
// process.env.VUE_APP_BASE_API_GROWTH || ""
// }/professional/allocation/importLearner`,
importStudent: `http://192.168.31.211:32002/professional/allocation/importLearner`,
timers: "", // 定时器,用于清空定时器使用
isAddStudent: false, // 用于判断用户是否关闭弹框需要重新获取学员列表
uploadpercent: -1,
@@ -268,7 +267,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 +342,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;

View File

@@ -286,7 +286,7 @@
<ImportStu
v-model:AddImpStuvisible="AddImpStuvisible"
@AddImpStuvisibleClose="AddImpStuvisibleClose"
:courseId="id"
:growId="growId"
:courseType="type"
/>
<GrowthDrawer ref="GrowthDrawerRef" title="新增学员" width="1200px">
@@ -732,11 +732,8 @@ const AddImpStuvisible = ref(false); //导入学员抽屉
const showImpStu = () => {
AddImpStuvisible.value = true;
};
const AddImpStuvisibleClose = (isget) => {
console.log("关闭了导入学员弹框", isget);
if (isget) {
const AddImpStuvisibleClose = () => {
getStuList();
}
};
function startLoading() {

View File

@@ -47,12 +47,10 @@
<div class="line"></div>
</template>
<router-link to="/growthpath"
><div style="display: flex">
<div style="display: flex" @click="goBack">
<img class="img2" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div>
</div>
</router-link>
</div>
</div>
<div class="split"></div>
@@ -623,7 +621,6 @@
:title="showTimeText"
:datasource="commonData"
/>
</a-spin>
</div>
@@ -838,6 +835,11 @@ export default {
query: { growId: state.routerId, pre: state.preId },
});
};
// 返回
const goBack = () => {
router.go(-1);
};
// 列表拖动结束
const draggableOnEnd = () => {
// 开启加载弹窗getListTask请求完成后会关闭弹框
@@ -1440,6 +1442,7 @@ export default {
qrcodeAssement,
handleMenuClickpg,
draggableOnEnd,
goBack,
handleMenuClick,
qrcodeVisible,
handlerSuperiors,