Merge remote-tracking branch 'origin/manage-release' into manage-release

# Conflicts:
#	src/components/student/ChangeLevelModal.vue
#	src/components/student/TableStudent.vue
This commit is contained in:
yuping
2022-12-22 19:08:42 +08:00

View File

@@ -117,7 +117,7 @@ import { computed, defineProps, onMounted, ref, watch } from "vue";
import { delStudentList, getStuPage } from "@/api/index1"; import { delStudentList, getStuPage } from "@/api/index1";
import CommonStudent from "@/components/student/CommonStudent"; import CommonStudent from "@/components/student/CommonStudent";
import ChangeLevelModal from "./ChangeLevelModal.vue"; import ChangeLevelModal from "./ChangeLevelModal.vue";
import { message } from "ant-design-vue"; import {message} from "ant-design-vue";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
id: String, id: String,
@@ -266,7 +266,7 @@ function submitCall(flag) {
flag && getStuList(); flag && getStuList();
} }
//调整关卡 // 调整关卡;
const visiblene = ref(false); const visiblene = ref(false);
const showChangeModal = () => { const showChangeModal = () => {
if(!stuSelectKeys.value.length){ if(!stuSelectKeys.value.length){