diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html
index 8927ac9..c1f4a87 100644
--- a/ruoyi-admin/src/main/resources/templates/login.html
+++ b/ruoyi-admin/src/main/resources/templates/login.html
@@ -58,22 +58,22 @@
             </div>
         </div>
     </div>
-<div id="poem_sentence" style="position: absolute;bottom: 0;left: 50%;"></div>
+<!--<div id="poem_sentence" style="position: absolute;bottom: 0;left: 50%;"></div>-->
 <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-<script src="https://sdk.jinrishici.com/v2/browser/jinrishici.js" charset="utf-8"></script>
+<!--<script src="https://sdk.jinrishici.com/v2/browser/jinrishici.js" charset="utf-8"></script>-->
 <script type="text/javascript">
-    jinrishici.load(function (result) {
-        var sentence = document.querySelector("#poem_sentence")
-        sentence.innerHTML = result.data.content
-    });
-    var poem_sentence = document.querySelector("#poem_sentence")
-    poem_sentence.addEventListener('contextmenu', function(event) {
-        event.preventDefault();
-        jinrishici.load(function (result) {
-            var sentence = document.querySelector("#poem_sentence")
-            sentence.innerHTML = result.data.content
-        });
-    });
+    // jinrishici.load(function (result) {
+    //     var sentence = document.querySelector("#poem_sentence")
+    //     sentence.innerHTML = result.data.content
+    // });
+    // var poem_sentence = document.querySelector("#poem_sentence")
+    // poem_sentence.addEventListener('contextmenu', function(event) {
+    //     event.preventDefault();
+    //     jinrishici.load(function (result) {
+    //         var sentence = document.querySelector("#poem_sentence")
+    //         sentence.innerHTML = result.data.content
+    //     });
+    // });
 </script>
 <script th:inline="javascript"> var ctx = [[@{/}]];</script>
 <!--[if lte IE 8]><script>window.location.href=ctx+'html/ie.html';</script><![endif]-->
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/exam/add.html b/ruoyi-admin/src/main/resources/templates/system/elExam/exam/add.html
new file mode 100644
index 0000000..0ae0988
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/exam/add.html
@@ -0,0 +1,489 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+	<th:block th:include="include :: header('新增题库')" />
+	<th:block th:include="include :: element-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
+		<div class="app-container">
+			<h3>组卷信息</h3>
+			<el-card style="margin-top: 20px">
+				<div style="float: right; font-weight: bold; color: #ff0000">试卷总分：{{ postForm.totalScore }}分</div>
+				<div>
+					<el-button class="filter-item" size="small" type="primary" icon="el-icon-plus" @click="handleAdd">
+						添加题库
+					</el-button>
+					<el-table
+						:data="repoList"
+						:border="false"
+						empty-text="请点击上面的`添加题库`进行设置"
+						style="width: 100%; margin-top: 15px"
+					>
+						<el-table-column
+							label="题库"
+							width="200"
+						>
+							<template v-slot="scope">
+								<el-select v-model="scope.row.repoId" @change="repoChange($event, scope.row)" placeholder="请选择">
+									<el-option
+										th:each="item : ${repo}"
+										th:text="${item.title}"
+										th:label="${item.title}"
+										th:value="${item.id}"
+									>
+									</el-option>
+								</el-select>
+							</template>
+						</el-table-column>
+						<el-table-column
+							label="单选数量"
+							align="center"
+						>
+							<template v-slot="scope">
+								<el-input-number v-model="scope.row.radioCount" :min="0" :max="scope.row.totalRadio" :controls="false" style="width: 100px"></el-input-number> / {{ scope.row.totalRadio }}
+							</template>
+						</el-table-column>
+						<el-table-column
+							label="单选分数"
+							align="center"
+						>
+							<template v-slot="scope">
+								<el-input-number v-model="scope.row.radioScore" :min="0" :controls="false" style="width: 100%" />
+							</template>
+						</el-table-column>
+						<el-table-column
+							label="多选数量"
+							align="center"
+						>
+							<template v-slot="scope">
+								<el-input-number v-model="scope.row.multiCount" :min="0" :max="scope.row.totalMulti" :controls="false" style="width: 100px" ></el-input-number> / {{ scope.row.totalMulti }}
+							</template>
+						</el-table-column>
+						<el-table-column
+							label="多选分数"
+							align="center"
+						>
+							<template v-slot="scope">
+								<el-input-number v-model="scope.row.multiScore" :min="0" :controls="false" style="width: 100%" />
+							</template>
+						</el-table-column>
+						<el-table-column
+							label="判断题数量"
+							align="center"
+						>
+							<template v-slot="scope">
+								<el-input-number v-model="scope.row.judgeCount" :min="0" :max="scope.row.totalJudge" :controls="false" style="width: 100px" > </el-input-number> / {{ scope.row.totalJudge }}
+							</template>
+						</el-table-column>
+						<el-table-column
+							label="判断题分数"
+							align="center"
+						>
+							<template v-slot="scope">
+								<el-input-number v-model="scope.row.judgeScore" :min="0" :controls="false" style="width: 100%" />
+							</template>
+						</el-table-column>
+						<el-table-column
+							label="删除"
+							align="center"
+							width="80px"
+						>
+							<template v-slot="scope">
+								<el-button type="danger" icon="el-icon-delete" circle @click="removeItem(scope.$index)" />
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
+			</el-card>
+			<h3>考试配置</h3>
+			<el-card style="margin-top: 20px">
+				<el-form ref="postForm" :model="postForm" :rules="rules" label-position="left" label-width="120px">
+					<el-form-item label="考试名称" prop="title">
+						<el-input v-model="postForm.title" />
+					</el-form-item>
+					<el-form-item label="考试描述" prop="content">
+						<el-input v-model="postForm.content" type="textarea" />
+					</el-form-item>
+					<el-form-item label="总分数" prop="totalScore">
+						<el-input-number :value="postForm.totalScore" disabled />
+					</el-form-item>
+					<el-form-item label="及格分" prop="qualifyScore">
+						<el-input-number v-model="postForm.qualifyScore" :max="postForm.totalScore" />
+					</el-form-item>
+					<el-form-item label="考试时长(分钟)" prop="totalTime">
+						<el-input-number v-model="postForm.totalTime" />
+					</el-form-item>
+					<el-form-item label="是否限时">
+						<el-checkbox v-model="postForm.timeLimit" />
+					</el-form-item>
+					<el-form-item v-if="postForm.timeLimit" label="考试时间" prop="totalTime">
+						<el-date-picker
+							v-model="dateValues"
+							format="yyyy-MM-dd"
+							value-format="yyyy-MM-dd"
+							type="daterange"
+							range-separator="至"
+							start-placeholder="开始时间"
+							end-placeholder="结束时间"
+						/>
+					</el-form-item>
+				</el-form>
+			</el-card>
+
+			<h3>权限配置</h3>
+			<el-card style="margin-top: 20px;">
+				<el-radio-group v-model="postForm.openType" style="margin-bottom: 20px">
+					<el-radio :label="1" border>完全公开</el-radio>
+					<el-radio :label="2" border>部门开放</el-radio>
+				</el-radio-group>
+				<el-alert
+					v-if="postForm.openType===1"
+					title="开放的，任何人都可以进行考试！"
+					type="warning"
+				/>
+				<div v-if="postForm.openType===2">
+					<el-input
+						v-model="filterText"
+						placeholder="输入关键字进行过滤"
+					/>
+					<el-tree
+						v-loading="treeLoading"
+						ref="tree"
+						:data="treeData"
+						:default-checked-keys="postForm.departIds"
+						:props="defaultProps"
+						:filter-node-method="filterNode"
+						empty-text=" "
+						default-expand-all
+						show-checkbox
+						node-key="id"
+						@check-change="handleCheckChange"
+					/>
+				</div>
+			</el-card>
+			<div style="margin-top: 20px">
+				<el-button type="primary" icon="el-icon-check" @click="handleSave">保存</el-button>
+				<el-button type="info" icon="el-icon-back" onclick="closeItem()">返回</el-button>
+			</div>
+		</div>
+	</div>
+    <th:block th:include="include :: footer" />
+	<th:block th:include="include :: element-js" />
+    <script type="text/javascript">
+        var prefix = ctx + "system/repo";
+		$("#form-repo-add").validate({
+			focusCleanup: true
+		});
+		function submitHandler() {
+	        if ($.validate.form()) {
+				$.operate.saveTab(prefix + "/add", $('#form-repo-add').serialize());
+	        }
+	    }
+		var app = new Vue({
+			el: '#app',
+			data:{
+				treeData: [],
+				defaultProps: {
+					label: 'deptName'
+				},
+				filterText: '',
+				treeLoading: false,
+				dateValues: [],
+				// 题库
+				repoList: [],
+				// 已选择的题库
+				excludes: [],
+				postForm: {
+					// 总分数
+					totalScore: 0,
+					// 题库列表
+					repoList: [],
+					// 开放类型
+					openType: 1,
+					// 考试班级列表
+					departIds: []
+				},
+				rules: {
+					title: [
+						{ required: true, message: '考试名称不能为空！' }
+					],
+
+					content: [
+						{ required: true, message: '考试名称不能为空！' }
+					],
+
+					open: [
+						{ required: true, message: '考试权限不能为空！' }
+					],
+
+					totalScore: [
+						{ required: true, message: '考试分数不能为空！' }
+					],
+
+					qualifyScore: [
+						{ required: true, message: '及格分不能为空！' }
+					],
+
+					totalTime: [
+						{ required: true, message: '考试时间不能为空！' }
+					],
+
+					ruleId: [
+						{ required: true, message: '考试规则不能为空' }
+					],
+					password: [
+						{ required: true, message: '考试口令不能为空！' }
+					]
+				}
+			},
+			watch: {
+
+				filterText(val) {
+					this.$refs.tree.filter(val)
+				},
+
+				dateValues: {
+
+					handler() {
+						this.postForm.startTime = this.dateValues[0]
+						this.postForm.endTime = this.dateValues[1]
+					}
+				},
+
+				// 题库变换
+				repoList: {
+
+					handler(val) {
+						let totalScore = 0
+						this.excludes = []
+						for (let i = 0; i<val.length; i++) {
+							const item = val[i]
+							if (item.radioCount > 0 && item.radioScore>0) {
+								totalScore += item.radioCount * item.radioScore
+							}
+
+							if (item.multiCount>0 && item.multiScore>0) {
+								totalScore += item.multiCount * item.multiScore
+							}
+
+							if (item.judgeCount>0 && item.judgeScore>0) {
+								totalScore += item.judgeCount * item.judgeScore
+							}
+							this.excludes.push(item.id)
+						}
+
+						// 赋值
+						this.postForm.totalScore = totalScore
+						this.postForm.repoList = val
+						this.$forceUpdate()
+					},
+					deep: true
+				}
+
+			},
+			created() {
+				// const id = this.$route.params.id
+				// if (typeof id !== undefined) {
+				// 	this.fetchData(id)
+				// }
+				//
+				// fetchTree({}).then(response => {
+				// 	this.treeData = response.data
+				// })
+
+			},
+			methods: {
+				handleSave() {
+					this.$refs.postForm.validate((valid) => {
+						if (!valid) {
+							return
+						}
+						this.postForm.repoList.forEach(item => {
+							item.repoId = item.repoId.split(",")[0].match(/\d+/)[0];
+						});
+						if (this.postForm.totalScore === 0) {
+							this.$notify({
+								title: '提示信息',
+								message: '考试规则设置不正确，请确认！',
+								type: 'warning',
+								duration: 2000
+							})
+
+							return
+						}
+
+						for (let i = 0; i < this.postForm.repoList.length; i++) {
+							const repo = this.postForm.repoList[i]
+							if (!repo.repoId) {
+								this.$notify({
+									title: '提示信息',
+									message: '考试题库选择不正确！',
+									type: 'warning',
+									duration: 2000
+								})
+								return
+							}
+
+							if ((repo.radioCount > 0 && repo.radioScore === 0) || (repo.radioCount === 0 && repo.radioScore > 0)) {
+								this.$notify({
+									title: '提示信息',
+									message: '题库第：[' + (i + 1) + ']项存在无效的单选题配置！',
+									type: 'warning',
+									duration: 2000
+								})
+
+								return
+							}
+
+							if ((repo.multiCount > 0 && repo.multiScore === 0) || (repo.multiCount === 0 && repo.multiScore > 0)) {
+								this.$notify({
+									title: '提示信息',
+									message: '题库第：[' + (i + 1) + ']项存在无效的多选题配置！',
+									type: 'warning',
+									duration: 2000
+								})
+
+								return
+							}
+
+							if ((repo.judgeCount > 0 && repo.judgeScore === 0) || (repo.judgeCount === 0 && repo.judgeScore > 0)) {
+								this.$notify({
+									title: '提示信息',
+									message: '题库第：[' + (i + 1) + ']项存在无效的判断题配置！',
+									type: 'warning',
+									duration: 2000
+								})
+								return
+							}
+						}
+
+						this.$confirm('确实要提交保存吗？', '提示', {
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							type: 'warning'
+						}).then(() => {
+							this.submitForm()
+						})
+					})
+				},
+
+				handleCheckChange() {
+					const that = this
+					// 置空
+					this.postForm.departIds = []
+					const nodes = this.$refs.tree.getCheckedNodes()
+					nodes.forEach(function(item) {
+						that.postForm.departIds.push(item.id)
+					})
+				},
+
+				// 添加子项
+				handleAdd() {
+					this.repoList.push({ id: '', rowId: new Date().getTime(), radioCount: 0, radioScore: 0, multiCount: 0, multiScore: 0, judgeCount: 0, judgeScore: 0, saqCount: 0, saqScore: 0 })
+				},
+
+				removeItem(index) {
+					this.repoList.splice(index, 1)
+				},
+
+				fetchData(id) {
+					fetchDetail(id).then(response => {
+						this.postForm = response.data
+
+						if (this.postForm.startTime && this.postForm.endTime) {
+							this.dateValues[0] = this.postForm.startTime
+							this.dateValues[1] = this.postForm.endTime
+						}
+						this.repoList = this.postForm.repoList
+					})
+				},
+				// 选项卡成功回调执行事件（父窗体静默更新）
+				successTabCallback(result) {
+					if (result.data.code == web_status.SUCCESS) {
+						var topWindow = $(window.parent.document);
+						var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-panel');
+						var topWindow = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0];
+						if ($.common.isNotEmpty(topWindow) && $.common.isNotEmpty(currentId)) {
+							var $contentWindow = topWindow.contentWindow;
+							$contentWindow.$.modal.msgSuccess(result.data.msg);
+							$contentWindow.$(".layui-layer-padding").removeAttr("style");
+							if ($contentWindow.table.options.type == table_type.bootstrapTable) {
+								$contentWindow.$.table.refresh();
+							} else if ($contentWindow.table.options.type == table_type.bootstrapTreeTable) {
+								$contentWindow.$.treeTable.refresh();
+							}
+						} else {
+							$.modal.msgSuccess(result.data.msg);
+						}
+						$.modal.close();
+						$.modal.closeTab();
+					} else if (result.data.code == web_status.WARNING) {
+						$.modal.alertWarning(result.data.msg)
+					} else {
+						$.modal.alertError(result.data.msg);
+					}
+					$.modal.closeLoading();
+				},
+				submitForm() {
+					// 校验和处理数据
+					this.postForm.repoList = this.repoList
+					let that = this
+					axios.post(ctx + 'system/newExam/add', this.postForm)
+						.then(function (response) {
+							if (response.data.code === 0) {
+								that.successTabCallback(response)
+							}
+						})
+						.catch(function (error) {
+							console.log(error);
+						});
+				},
+				filterNode(value, data) {
+					if (!value) return true
+					return data.deptName.indexOf(value) !== -1
+				},
+				repoChange(e,row) {
+					let dataString = '[[${repo}]]'
+					// 使用正则表达式提取每个对象的部分
+					const regex = /RepoVO\((.*?)\)/g;
+					let match;
+					const dataArray = [];
+
+					while ((match = regex.exec(dataString)) !== null) {
+						const objString = match[1];
+						const objArray = objString.split(', ');
+
+						// 将每个对象的属性解析为键值对并存入数组
+						const obj = {};
+						objArray.forEach(item => {
+							const [key, value] = item.split('=');
+							obj[key.trim()] = value.trim();
+						});
+
+						dataArray.push(obj);
+					}
+					const obj = dataArray.find((item) => {
+						return item.id === e
+					})
+					this.getRepoList(obj,row)
+				},
+				getRepoList(e,row){
+					row.id = e.id
+
+					if (e != null) {
+						row.totalRadio = parseInt(e.radioCount)
+						row.totalMulti = parseInt(e.multiCount)
+						row.totalJudge = parseInt(e.judgeCount)
+					} else {
+						row.totalRadio = 0
+						row.totalMulti = 0
+						row.totalJudge = 0
+					}
+				}
+
+			}
+		})
+	</script>
+</body>
+</html>
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
new file mode 100644
index 0000000..577f9d0
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/exam/edit.html
@@ -0,0 +1,494 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增题库')" />
+    <th:block th:include="include :: element-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
+    <div class="app-container">
+        <h3>组卷信息</h3>
+        <el-card style="margin-top: 20px">
+            <div style="float: right; font-weight: bold; color: #ff0000">试卷总分：{{ postForm.totalScore }}分</div>
+            <div>
+                <el-button class="filter-item" size="small" type="primary" icon="el-icon-plus" @click="handleAdd">
+                    添加题库
+                </el-button>
+                <el-table
+                        :data="repoList"
+                        :border="false"
+                        empty-text="请点击上面的`添加题库`进行设置"
+                        style="width: 100%; margin-top: 15px"
+                >
+                    <el-table-column
+                            label="题库"
+                            width="200"
+                    >
+                        <template v-slot="scope">
+                            <el-select v-model="scope.row.repoId" @change="repoChange($event,scope.row)" placeholder="请选择">
+                                <el-option
+                                    th:each="item : ${repo}"
+                                    th:text="${item.title}"
+                                    th:label="${item.title}"
+                                    th:value="${item.id}"
+                                >
+                                </el-option>
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            label="单选数量"
+                            align="center"
+                    >
+                        <template v-slot="scope">
+                            <el-input-number v-model="scope.row.radioCount" :min="0" :max="scope.row.totalRadio" :controls="false" style="width: 100px"></el-input-number> / {{ scope.row.totalRadio }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            label="单选分数"
+                            align="center"
+                    >
+                        <template v-slot="scope">
+                            <el-input-number v-model="scope.row.radioScore" :min="0" :controls="false" style="width: 100%" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            label="多选数量"
+                            align="center"
+                    >
+                        <template v-slot="scope">
+                            <el-input-number v-model="scope.row.multiCount" :min="0" :max="scope.row.totalMulti" :controls="false" style="width: 100px" ></el-input-number> / {{ scope.row.totalMulti }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            label="多选分数"
+                            align="center"
+                    >
+                        <template v-slot="scope">
+                            <el-input-number v-model="scope.row.multiScore" :min="0" :controls="false" style="width: 100%" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            label="判断题数量"
+                            align="center"
+                    >
+                        <template v-slot="scope">
+                            <el-input-number v-model="scope.row.judgeCount" :min="0" :max="scope.row.totalJudge" :controls="false" style="width: 100px" > </el-input-number> / {{ scope.row.totalJudge }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            label="判断题分数"
+                            align="center"
+                    >
+                        <template v-slot="scope">
+                            <el-input-number v-model="scope.row.judgeScore" :min="0" :controls="false" style="width: 100%" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            label="删除"
+                            align="center"
+                            width="80px"
+                    >
+                        <template v-slot="scope">
+                            <el-button type="danger" icon="el-icon-delete" circle @click="removeItem(scope.$index)" />
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </el-card>
+        <h3>考试配置</h3>
+        <el-card style="margin-top: 20px">
+            <el-form ref="postForm" :model="postForm" :rules="rules" label-position="left" label-width="120px">
+                <el-form-item label="考试名称" prop="title">
+                    <el-input v-model="postForm.title" />
+                </el-form-item>
+                <el-form-item label="考试描述" prop="content">
+                    <el-input v-model="postForm.content" type="textarea" />
+                </el-form-item>
+                <el-form-item label="总分数" prop="totalScore">
+                    <el-input-number :value="postForm.totalScore" disabled />
+                </el-form-item>
+                <el-form-item label="及格分" prop="qualifyScore">
+                    <el-input-number v-model="postForm.qualifyScore" :max="postForm.totalScore" />
+                </el-form-item>
+                <el-form-item label="考试时长(分钟)" prop="totalTime">
+                    <el-input-number v-model="postForm.totalTime" />
+                </el-form-item>
+                <el-form-item label="是否限时">
+                    <el-checkbox v-model="postForm.timeLimit" />
+                </el-form-item>
+                <el-form-item v-if="postForm.timeLimit" label="考试时间" prop="totalTime">
+                    <el-date-picker
+                            v-model="dateValues"
+                            format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd"
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间"
+                    />
+                </el-form-item>
+            </el-form>
+        </el-card>
+
+        <h3>权限配置</h3>
+        <el-card style="margin-top: 20px;">
+            <el-radio-group v-model="postForm.openType" style="margin-bottom: 20px">
+                <el-radio :label="1" border>完全公开</el-radio>
+                <el-radio :label="2" border>部门开放</el-radio>
+            </el-radio-group>
+            <el-alert
+                    v-if="postForm.openType===1"
+                    title="开放的，任何人都可以进行考试！"
+                    type="warning"
+            />
+            <div v-if="postForm.openType===2">
+                <el-input
+                        v-model="filterText"
+                        placeholder="输入关键字进行过滤"
+                />
+                <el-tree
+                        v-loading="treeLoading"
+                        ref="tree"
+                        :data="treeData"
+                        :default-checked-keys="postForm.departIds"
+                        :props="defaultProps"
+                        :filter-node-method="filterNode"
+                        empty-text=" "
+                        default-expand-all
+                        show-checkbox
+                        node-key="id"
+                        @check-change="handleCheckChange"
+                />
+            </div>
+        </el-card>
+        <div style="margin-top: 20px">
+            <el-button type="primary" icon="el-icon-check" @click="handleSave">保存</el-button>
+            <el-button type="info" icon="el-icon-back" onclick="closeItem()">返回</el-button>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: element-js" />
+<script type="text/javascript">
+    var prefix = ctx + "system/repo";
+    $("#form-repo-add").validate({
+        focusCleanup: true
+    });
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.saveTab(prefix + "/add", $('#form-repo-add').serialize());
+        }
+    }
+    var app = new Vue({
+        el: '#app',
+        data:{
+            treeData: [],
+            defaultProps: {
+                label: 'deptName'
+            },
+            filterText: '',
+            treeLoading: false,
+            dateValues: [],
+            // 题库
+            repoList: [],
+            // 已选择的题库
+            excludes: [],
+            postForm: {
+                // 总分数
+                totalScore: 0,
+                // 题库列表
+                repoList: [],
+                // 开放类型
+                openType: 1,
+                // 考试班级列表
+                departIds: []
+            },
+            rules: {
+                title: [
+                    { required: true, message: '考试名称不能为空！' }
+                ],
+
+                content: [
+                    { required: true, message: '考试名称不能为空！' }
+                ],
+
+                open: [
+                    { required: true, message: '考试权限不能为空！' }
+                ],
+
+                totalScore: [
+                    { required: true, message: '考试分数不能为空！' }
+                ],
+
+                qualifyScore: [
+                    { required: true, message: '及格分不能为空！' }
+                ],
+
+                totalTime: [
+                    { required: true, message: '考试时间不能为空！' }
+                ],
+
+                ruleId: [
+                    { required: true, message: '考试规则不能为空' }
+                ],
+                password: [
+                    { required: true, message: '考试口令不能为空！' }
+                ]
+            }
+        },
+        watch: {
+
+            filterText(val) {
+                this.$refs.tree.filter(val)
+            },
+
+            dateValues: {
+
+                handler() {
+                    this.postForm.startTime = this.dateValues[0]
+                    this.postForm.endTime = this.dateValues[1]
+                }
+            },
+
+            // 题库变换
+            repoList: {
+
+                handler(val) {
+                    let totalScore = 0
+                    this.excludes = []
+                    for (let i = 0; i<val.length; i++) {
+                        const item = val[i]
+                        if (item.radioCount > 0 && item.radioScore>0) {
+                            totalScore += item.radioCount * item.radioScore
+                        }
+
+                        if (item.multiCount>0 && item.multiScore>0) {
+                            totalScore += item.multiCount * item.multiScore
+                        }
+
+                        if (item.judgeCount>0 && item.judgeScore>0) {
+                            totalScore += item.judgeCount * item.judgeScore
+                        }
+                        this.excludes.push(item.id)
+                    }
+
+                    // 赋值
+                    this.postForm.totalScore = totalScore
+                    this.postForm.repoList = val
+                    this.$forceUpdate()
+                },
+                deep: true
+            }
+
+        },
+        created() {
+            // const id = this.$route.params.id
+            // if (typeof id !== undefined) {
+            	this.fetchData()
+            // }
+            //
+            // fetchTree({}).then(response => {
+            // 	this.treeData = response.data
+            // })
+
+        },
+        methods: {
+
+            handleSave() {
+                this.$refs.postForm.validate((valid) => {
+                    if (!valid) {
+                        return
+                    }
+                    this.postForm.repoList.forEach(item => {
+                        item.repoId = item.repoId.split(",")[0].match(/\d+/)[0];
+                    });
+                    if (this.postForm.totalScore === 0) {
+                        this.$notify({
+                            title: '提示信息',
+                            message: '考试规则设置不正确，请确认！',
+                            type: 'warning',
+                            duration: 2000
+                        })
+
+                        return
+                    }
+
+                    for (let i = 0; i < this.postForm.repoList.length; i++) {
+                        const repo = this.postForm.repoList[i]
+                        if (!repo.repoId) {
+                            this.$notify({
+                                title: '提示信息',
+                                message: '考试题库选择不正确！',
+                                type: 'warning',
+                                duration: 2000
+                            })
+                            return
+                        }
+
+                        if ((repo.radioCount > 0 && repo.radioScore === 0) || (repo.radioCount === 0 && repo.radioScore > 0)) {
+                            this.$notify({
+                                title: '提示信息',
+                                message: '题库第：[' + (i + 1) + ']项存在无效的单选题配置！',
+                                type: 'warning',
+                                duration: 2000
+                            })
+
+                            return
+                        }
+
+                        if ((repo.multiCount > 0 && repo.multiScore === 0) || (repo.multiCount === 0 && repo.multiScore > 0)) {
+                            this.$notify({
+                                title: '提示信息',
+                                message: '题库第：[' + (i + 1) + ']项存在无效的多选题配置！',
+                                type: 'warning',
+                                duration: 2000
+                            })
+
+                            return
+                        }
+
+                        if ((repo.judgeCount > 0 && repo.judgeScore === 0) || (repo.judgeCount === 0 && repo.judgeScore > 0)) {
+                            this.$notify({
+                                title: '提示信息',
+                                message: '题库第：[' + (i + 1) + ']项存在无效的判断题配置！',
+                                type: 'warning',
+                                duration: 2000
+                            })
+                            return
+                        }
+                    }
+
+                    this.$confirm('确实要提交保存吗？', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        this.submitForm()
+                    })
+                })
+            },
+
+            handleCheckChange() {
+                const that = this
+                // 置空
+                this.postForm.departIds = []
+                const nodes = this.$refs.tree.getCheckedNodes()
+                nodes.forEach(function(item) {
+                    that.postForm.departIds.push(item.id)
+                })
+            },
+
+            // 添加子项
+            handleAdd() {
+                this.repoList.push({ id: '', rowId: new Date().getTime(), radioCount: 0, radioScore: 0, multiCount: 0, multiScore: 0, judgeCount: 0, judgeScore: 0, saqCount: 0, saqScore: 0 })
+            },
+
+            removeItem(index) {
+                this.repoList.splice(index, 1)
+            },
+
+            fetchData() {
+                let that = this
+                axios.get(ctx + 'system/newExam/detail', {params: {id: '[[${detailDTO.id}]]'}})
+                    .then(function (res) {
+                        that.postForm = res.data.data
+                        if (that.postForm.startTime && that.postForm.endTime) {
+                            that.dateValues[0] = that.postForm.startTime
+                            that.dateValues[1] = that.postForm.endTime
+                        }
+                        that.repoList = that.postForm.repoList
+                    })
+                    .catch(function (error) {
+                        console.log(error);
+                    });
+            },
+            // 选项卡成功回调执行事件（父窗体静默更新）
+            successTabCallback(result) {
+                if (result.data.code == web_status.SUCCESS) {
+                    var topWindow = $(window.parent.document);
+                    var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-panel');
+                    var topWindow = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0];
+                    if ($.common.isNotEmpty(topWindow) && $.common.isNotEmpty(currentId)) {
+                        var $contentWindow = topWindow.contentWindow;
+                        $contentWindow.$.modal.msgSuccess(result.data.msg);
+                        $contentWindow.$(".layui-layer-padding").removeAttr("style");
+                        if ($contentWindow.table.options.type == table_type.bootstrapTable) {
+                            $contentWindow.$.table.refresh();
+                        } else if ($contentWindow.table.options.type == table_type.bootstrapTreeTable) {
+                            $contentWindow.$.treeTable.refresh();
+                        }
+                    } else {
+                        $.modal.msgSuccess(result.data.msg);
+                    }
+                    $.modal.close();
+                    $.modal.closeTab();
+                } else if (result.data.code == web_status.WARNING) {
+                    $.modal.alertWarning(result.data.msg)
+                } else {
+                    $.modal.alertError(result.data.msg);
+                }
+                $.modal.closeLoading();
+            },
+            submitForm() {
+                // 校验和处理数据
+                this.postForm.repoList = this.repoList
+                let that = this
+                axios.post(ctx + 'system/newExam/add', this.postForm)
+                    .then(function (response) {
+                        if (response.data.code === 0) {
+                            that.successTabCallback(response)
+                        }
+                    })
+                    .catch(function (error) {
+                        console.log(error);
+                    });
+            },
+            filterNode(value, data) {
+                if (!value) return true
+                return data.deptName.indexOf(value) !== -1
+            },
+            repoChange(e,row) {
+                let dataString = '[[${repo}]]'
+                // 使用正则表达式提取每个对象的部分
+                const regex = /RepoVO\((.*?)\)/g;
+                let match;
+                const dataArray = [];
+
+                while ((match = regex.exec(dataString)) !== null) {
+                    const objString = match[1];
+                    const objArray = objString.split(', ');
+
+                    // 将每个对象的属性解析为键值对并存入数组
+                    const obj = {};
+                    objArray.forEach(item => {
+                        const [key, value] = item.split('=');
+                        obj[key.trim()] = value.trim();
+                    });
+
+                    dataArray.push(obj);
+                }
+                const obj = dataArray.find((item) => {
+                    return item.id === e
+                })
+                this.getRepoList(obj,row)
+            },
+            getRepoList(e,row){
+                row.id = e.id
+
+                if (e != null) {
+                    row.totalRadio = parseInt(e.radioCount)
+                    row.totalMulti = parseInt(e.multiCount)
+                    row.totalJudge = parseInt(e.judgeCount)
+                } else {
+                    row.totalRadio = 0
+                    row.totalMulti = 0
+                    row.totalJudge = 0
+                }
+            }
+
+        }
+    })
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/exam/exam.html b/ruoyi-admin/src/main/resources/templates/system/elExam/exam/exam.html
index 488ded2..b6e3842 100644
--- a/ruoyi-admin/src/main/resources/templates/system/elExam/exam/exam.html
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/exam/exam.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-	<th:block th:include="include :: header('题库列表')" />
+	<th:block th:include="include :: header('考试管理')" />
 </head>
 <body class="gray-bg">
     <div class="container-div">
@@ -33,19 +33,19 @@
 					</div>
 				</form>
 			</div>
-			
+
 	        <div class="btn-group-sm" id="toolbar" role="group">
-		        <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="system:exam:add">
+		        <a class="btn btn-success" onclick="$.operate.addTab()" shiro:hasPermission="system:exam:add">
 		            <i class="fa fa-plus"></i> 新增
 		        </a>
-		        <a class="btn btn-primary single disabled" onclick="$.operate.editFull()" shiro:hasPermission="system:exam:edit">
+		        <a class="btn btn-primary single disabled" onclick="$.operate.editTab()" shiro:hasPermission="system:exam:edit">
 		            <i class="fa fa-edit"></i> 修改
 		        </a>
 		        <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:exam:remove">
 		            <i class="fa fa-remove"></i> 删除
 		        </a>
 	        </div>
-	        
+
 	        <div class="col-sm-12 select-table table-striped">
 	            <table id="bootstrap-table"></table>
 	        </div>
@@ -109,7 +109,7 @@
 		            align: 'center',
 		            formatter: function(value, row, index) {
 		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
 						return actions.join('');
 		            }
@@ -119,4 +119,4 @@
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
