@@ -200,7 +206,7 @@
// 题库列表
repoList: [],
// 开放类型
- openType: 1,
+ openType: 0,
// 考试班级列表
departIds: []
},
@@ -283,17 +289,36 @@
},
created() {
- // const id = this.$route.params.id
- // if (typeof id !== undefined) {
- // this.fetchData(id)
- // }
- //
- // fetchTree({}).then(response => {
- // this.treeData = response.data
- // })
-
},
methods: {
+ async handleLoad(node, resolve) {
+ if (node.level === 0 && this.treeData.length === 0) {
+ try {
+ const response = await axios.get('/system/dept/detpList', { params: { deptId: 0 } });
+ this.treeData = response.data.data;
+ resolve(this.treeData);
+ } catch (error) {
+ console.error('Error fetching root nodes', error);
+ resolve([]);
+ }
+ } else {
+ this.fetchChildren(node.data.deptId).then(children => {
+ resolve(children);
+ }).catch(error => {
+ console.error(`Error fetching children for node ${node.data.deptId}`, error);
+ resolve([]);
+ });
+ }
+ },
+ async fetchChildren(parentId) {
+ try {
+ const response = await axios.get('/system/dept/detpList/',{params:{deptId: parentId}});
+ return response.data.data;
+ } catch (error) {
+ console.error(`Error fetching children for node ${parentId}`, error);
+ return [];
+ }
+ },
handleSave() {
this.$refs.postForm.validate((valid) => {
if (!valid) {
@@ -375,7 +400,7 @@
this.postForm.departIds = []
const nodes = this.$refs.tree.getCheckedNodes()
nodes.forEach(function(item) {
- that.postForm.departIds.push(item.id)
+ that.postForm.departIds.push(item.deptId)
})
},
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/exam/edit.html b/ruoyi-admin/src/main/resources/templates/system/elExam/exam/edit.html
index 577f9d0..7116dac 100644
--- a/ruoyi-admin/src/main/resources/templates/system/elExam/exam/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/exam/edit.html
@@ -49,7 +49,7 @@
align="center"
>
-
+
-
+
-
+
-
+
+
@@ -100,22 +101,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
+ >
+
@@ -141,25 +143,26 @@
v-if="postForm.openType===1"
title="开放的，任何人都可以进行考试！"
type="warning"
- />
+ >
+ >
+ v-loading="treeLoading"
+ ref="tree"
+ lazy
+ :data="treeData"
+ :default-checked-keys="postForm.departIds"
+ :props="defaultProps"
+ :filter-node-method="filterNode"
+ empty-text=" "
+ show-checkbox
+ node-key="id"
+ :load="handleLoad"
+ @check-change="handleCheckChange"
+ >
@@ -200,7 +203,7 @@
// 题库列表
repoList: [],
// 开放类型
- openType: 1,
+ openType: 0,
// 考试班级列表
departIds: []
},
@@ -294,7 +297,34 @@
},
methods: {
-
+ async handleLoad(node, resolve) {
+ if (node.level === 0 && this.treeData.length === 0) {
+ try {
+ const response = await axios.get('/system/dept/detpList', { params: { deptId: 0 } });
+ this.treeData = response.data.data;
+ resolve(this.treeData);
+ } catch (error) {
+ console.error('Error fetching root nodes', error);
+ resolve([]);
+ }
+ } else {
+ this.fetchChildren(node.data.deptId).then(children => {
+ resolve(children);
+ }).catch(error => {
+ console.error(`Error fetching children for node ${node.data.deptId}`, error);
+ resolve([]);
+ });
+ }
+ },
+ async fetchChildren(parentId) {
+ try {
+ const response = await axios.get('/system/dept/detpList/',{params:{deptId: parentId}});
+ return response.data.data;
+ } catch (error) {
+ console.error(`Error fetching children for node ${parentId}`, error);
+ return [];
+ }
+ },
handleSave() {
this.$refs.postForm.validate((valid) => {
if (!valid) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/paper/view.html b/ruoyi-admin/src/main/resources/templates/system/elExam/paper/view.html
index 3daa3b8..2e0cc25 100644
--- a/ruoyi-admin/src/main/resources/templates/system/elExam/paper/view.html
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/paper/view.html
@@ -49,7 +49,7 @@
- 考生姓名：{{ paperData.userId }}
+ 考生姓名：{{ paperData.userName}}
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html
index a51407f..f57b13c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html
@@ -6,51 +6,53 @@