Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
#	src/views/learningpath/LearningPath.vue
#	src/views/learningpath/LevelAdd.vue
This commit is contained in:
yuping
2023-02-01 20:25:12 +08:00
7 changed files with 252 additions and 117 deletions

View File

@@ -1350,7 +1350,6 @@ import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import TableStudent from "@/components/student/TableStudent";
// import * as student from "@/api/student";
import { getStuPage, moveStudent } from "@/api/index1";
import { checkPer } from "@/utils/utils";
import RouterFaceTeachManage from "../../components/drawers/router/RouterFaceTeachManage";
import RouterExaminationManage from "../../components/drawers/router/RouterExaminationManage";
@@ -1389,7 +1388,7 @@ export default {
const router = useRouter();
// const store = useStore();
const state = reactive({
permissions:'',
permissions: "",
hasTask: false,
stage: [],
statess: [],
@@ -2242,7 +2241,7 @@ export default {
.then((res) => {
console.log("router-list", res);
state.fileList = JSON.parse(res.data.data.routerInfo.attach);
state.permissions = res.data.data.routerInfo.permissions
state.permissions = res.data.data.routerInfo.permissions;
console.log("asdasdasd-------->", state.fileList);
state.docChecked =
res.data.data.routerInfo.attachSwitch == 1 ? true : false;
@@ -2715,7 +2714,6 @@ export default {
setLevels,
selectProjectName4,
changeLevel,
checkPer
};
},
};