diff --git a/README.md b/README.md deleted file mode 100644 index 91fc601..0000000 --- a/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# python_demo - -## Project setup -``` -npm install -``` - -### Compiles and hot-reloads for development -``` -npm run serve -``` - -### Compiles and minifies for production -``` -npm run build -``` - -### Customize configuration -See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/src/assets/element-variables.scss b/src/assets/element-variables.scss index fb4e31d..dda8034 100644 --- a/src/assets/element-variables.scss +++ b/src/assets/element-variables.scss @@ -1,6 +1,6 @@ /* 改变主题色变量 */ - -$--color-primary: #239685; +@import 'styles/var.scss'; +$--color-primary: $main-color; /* 改变 icon 字体路径变量，必需 */ diff --git a/src/assets/img/bg1.png b/src/assets/img/bg1.png new file mode 100644 index 0000000..0d127ff Binary files /dev/null and b/src/assets/img/bg1.png differ diff --git a/src/assets/img/btn.png b/src/assets/img/btn.png new file mode 100644 index 0000000..8bd999e Binary files /dev/null and b/src/assets/img/btn.png differ diff --git a/src/assets/img/header.png b/src/assets/img/header.png new file mode 100644 index 0000000..5bcd421 Binary files /dev/null and b/src/assets/img/header.png differ diff --git a/src/assets/img/left.png b/src/assets/img/left.png index e1e75d0..407d5f8 100644 Binary files a/src/assets/img/left.png and b/src/assets/img/left.png differ diff --git a/src/assets/img/right.png b/src/assets/img/right.png index b5a00eb..765f963 100644 Binary files a/src/assets/img/right.png and b/src/assets/img/right.png differ diff --git a/src/assets/img/yes.png b/src/assets/img/yes.png index 4580459..08863aa 100644 Binary files a/src/assets/img/yes.png and b/src/assets/img/yes.png differ diff --git a/src/assets/styles/var.scss b/src/assets/styles/var.scss new file mode 100644 index 0000000..344176b --- /dev/null +++ b/src/assets/styles/var.scss @@ -0,0 +1 @@ +$main-color: #ff6400; \ No newline at end of file diff --git a/src/components/TestPanel.vue b/src/components/TestPanel.vue index b53707e..c4499c0 100644 --- a/src/components/TestPanel.vue +++ b/src/components/TestPanel.vue @@ -3,7 +3,7 @@
-
+

实训项目

重新开始 - 提交 + 提交
@@ -55,7 +56,9 @@

实验目标

-

{{experimentalGoal}}

+
+
+
@@ -94,7 +97,9 @@ - {{caseDescription}} + +
+ @@ -102,11 +107,13 @@ {{loop.judgmentPointsName}} -
{{loop.experimentalRequirements}}
+
- {{experimentSuggests}} + +
+ @@ -154,6 +161,7 @@ function formatDate(fmt,date) { export default { data() { return { + systemId: this.$config.systemId, test: [], ishow: false, grade: "00", @@ -195,6 +203,8 @@ export default { stopTime: '', isSelected: false, userId: '', + workbenchCus: this.workbench, + isRecovery: false }; }, watch: { @@ -233,6 +243,10 @@ export default { codeId: { type: Number, default: 0 + }, + workbench: { + type: Array, + default: [] } }, computed: { @@ -262,6 +276,29 @@ export default { this.getQueryProject(); }else{ this.getProjects(); + let codeCache = localStorage.getItem('codeCache') + if(codeCache){ + codeCache = JSON.parse(codeCache) + if(codeCache.systemId && codeCache.systemId == this.$config.systemId){ + this.$confirm('是否要继续上次的实验？', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'success' + }).then(() => { + this.value1 = codeCache.projectId + this.workbenchCus = codeCache.workbench + this.isRecovery = true + this.selectProject() + let codeIds = [] + codeCache.workbench.map(n => codeIds.push(n.code.codeId)) + codeIds = codeIds.filter(n => n) + this.codeIds = codeIds + this.$emit('recoveryCode',codeCache.workbench1) + }).catch(() => { + localStorage.removeItem('codeCache') + }) + } + } } this.assessmentId && this.projectId && this.checkVer() this.codeId && this.codeIds.push(this.codeId) @@ -271,6 +308,14 @@ export default { let codeId = this.codeid; this.codeIds.push(codeId); }); + // 更改tableData + newmain.$on("updateJud", item => { + let list = this.tableData + list.map(n => { + if(n.judgmentPointsId == item.id) n.isError = item.isError + }) + this.tableData = list + }); }, methods: { checkVer() { @@ -288,12 +333,30 @@ export default { //重新开始 reload() { this.$post(this.api.DeleteCodes, this.codeIds).then(res => { - this.getClearTime(); - this.$router.go(0); - this.startCountFn(); + this.getClearTime() + localStorage.removeItem('codeCache') + this.codeIds = [] + this.isSubmit = false + newmain.$emit("isSubmit", this.isSubmit) + let workbench = this.workbench + workbench.map(n => { + n.code = { + code: '', + codeId: '' + } + }) + this.$emit('recoveryCode',workbench) + let tableData = this.tableData + tableData.map(n => { + delete n.score + delete n.right + }) + this.tableData = JSON.parse(JSON.stringify(tableData)) + this.startCountFn() }); }, Submit() { + if(!this.codeIds.length) return this.$message.error('请先完成实验') this.$confirm("此操作将视为结束考试, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", @@ -326,9 +389,23 @@ export default { } }) .then(res => { - this.assessmentId && (this.isSubmit = true); + localStorage.removeItem('codeCache') + this.isSubmit = true newmain.$emit("isSubmit", this.isSubmit); - this.tableData = res.message; + let list = res.message + let workbench = this.workbenchCus.length ? this.workbenchCus : this.workbench + let result = [] + workbench.map(n => { + result.push(list.find(e => e.judgmentPointsId == n.judgmentPointsId)) + }) + let tableData = this.tableData + result.map(n => { + if(tableData.find(e => e.judgmentPointsId == n.judgmentPointsId).isError){ + n.score = 0 + n.right = -1 + } + }) + this.tableData = result //计算总分 var s = 0; this.tableData.forEach(element => { @@ -381,11 +458,12 @@ export default { this.projectId = type == 2 ? project[0].projectId : this.projectId if(type == 2) this.getQueryProject(0,1) this.projectPermissions = type == 1 ? project[0].projectPermissions : this.projectPermissions - this.$emit("tell", this.value1, this.projectPermissions); + this.$emit("tell", this.value1, this.projectPermissions,this.isRecovery ? this.workbenchCus : []); this.experimentalGoal = project[0].experimentalGoal; this.caseDescription = project[0].caseDescription; this.experimentSuggests = project[0].experimentSuggests; this.actEndTime = project[0].endTime; + this.isRecovery = false }, getQueryProject(projectId,type) { //项目名称+实验目标+案例描述+实验提示+实验要求 @@ -457,8 +535,9 @@ export default { }, getProjects(){ let data = { - systemId: 5, - schoolId: this.schoolId + systemId: this.systemId, + // schoolId: this.schoolId + schoolId: '' } this.$get(`${this.api.queryTestProject}`,data).then(res => { this.handleData(res.message,2) @@ -467,7 +546,12 @@ export default { selectProject(){ this.isSelected = true this.assessmentId = '' + this.judgmentPointsIds = [] + this.codeIds = [] this.getQueryProject(this.value1) + this.isSubmit = false + this.countVal = 0 + newmain.$emit("isSubmit", this.isSubmit) }, counterFn(counterTime) { let leave1 = counterTime % (24 * 3600 * 1); //计算天数后剩余的毫秒数 @@ -523,15 +607,16 @@ export default { \ No newline at end of file diff --git a/src/config/index.js b/src/config/index.js new file mode 100644 index 0000000..e7218ac --- /dev/null +++ b/src/config/index.js @@ -0,0 +1,16 @@ +export default { + /** + * @description 配置显示在浏览器标签的title + */ + title: '金融随机过程实验教学系统', + /** + * @description 是否使用国际化，默认为false + * 如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'} + * 用来在菜单中显示文字 + */ + locale: 'zh', + /** + * @description 跳转子系统链接 + */ + systemId: 6 +} \ No newline at end of file diff --git a/src/main.js b/src/main.js index 840eb9c..0a36d96 100644 --- a/src/main.js +++ b/src/main.js @@ -16,6 +16,7 @@ import "codemirror/lib/codemirror.css"; import vuescroll from "vuescroll"; //引入vuescroll import "vuescroll/dist/vuescroll.css"; //引入vuescroll样式 import VueDraggableResizable from 'vue-draggable-resizable' +import config from '@/config' // optionally import default styles import 'vue-draggable-resizable/dist/VueDraggableResizable.css' @@ -32,6 +33,8 @@ Vue.prototype.$post = post; Vue.prototype.$del = del; Vue.prototype.$put = put; +Vue.prototype.$config = config + Vue.config.productionTip = false; router.beforeEach((to, from, next) => { diff --git a/src/utils/api.js b/src/utils/api.js index d341106..28c7e2e 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -1,6 +1,11 @@ -// let host = 'http://192.168.0.113' -// let host = 'http://192.168.31.125:8081/python' -let host = 'http://www.liuwanr.cn/python' +// let host = 'http://192.168.31.125:8081/python'//林 +// let host = 'http://192.168.31.152:8081/python'//榕 +let host = '' +if(location.host.includes('liuwanr.cn')){ + host = 'http://www.liuwanr.cn/python' +}else{ + host = 'http://www.occupationlab.com/python' +} export default { QueryProject: `${host}/python/queryProject`, //项目选择下拉框+项目信息+判分点信息展示 diff --git a/src/views/Home.vue b/src/views/Home.vue index d2edce9..27fae89 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,7 +1,7 @@