From 7de73bad9d422c93dd8e366100509a16f02898dd Mon Sep 17 00:00:00 2001 From: "jialong.yu" Date: Wed, 22 Dec 2021 00:47:17 +0800 Subject: [PATCH] =?UTF-8?q?8=E4=B8=AA=E7=B3=BB=E7=BB=9F=E6=95=B4=E5=90=88?= =?UTF-8?q?=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/logo.png | Bin 6849 -> 0 bytes src/assets/style/common.scss | 17 + src/assets/style/index.scss | 2 + src/assets/style/reset.scss | 379 ++++++++++++++++++ .../theme/theme1.scss} | 5 +- src/assets/style/theme/theme10.scss | 5 + src/assets/styles/var.scss | 1 - src/components/TestPanel.vue | 24 -- src/components/codemirror.vue | 175 ++++---- src/config/index.js | 47 ++- src/main.js | 12 +- src/views/Home.vue | 52 +-- vue.config.js | 3 - 13 files changed, 532 insertions(+), 190 deletions(-) delete mode 100644 src/assets/logo.png create mode 100644 src/assets/style/common.scss create mode 100644 src/assets/style/index.scss create mode 100644 src/assets/style/reset.scss rename src/assets/{element-variables.scss => style/theme/theme1.scss} (60%) create mode 100644 src/assets/style/theme/theme10.scss delete mode 100644 src/assets/styles/var.scss diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 -
+
运行
@@ -97,6 +97,7 @@ export default { token: util.getCookie('admin-token'), assessmentId: util.getCookie('assessmentId'), // 考核id courseId: util.getCookie('courseId'), // 课程id + systemId: util.getCookie('systemId'), showTips: false, // 显示隐藏提示按钮 answer: '', // 正确答案 codeVal: this.code, @@ -359,73 +360,68 @@ export default { .text-wrapper { white-space: pre-wrap; } -//答案提示 -.answer ::v-deep .el-tab-pane { - padding: 0 10px; - height: 340px; - overflow: hidden; - overflow-y: auto; - white-space: pre-wrap; -} -.answer ::v-deep .el-dialog--center { - width: 500px; - height: 500px; -} -.answer ::v-deep .el-dialog__title { - font-size: 22px; - font-weight: 500; -} -.answer ::v-deep .el-tabs__nav-wrap::after { - background-color: #333; -} -.answer ::v-deep .el-tabs__active-bar { - background-color: #fff; - height: 0; -} -.answer ::v-deep .el-tabs__header { - background-color: #333; -} -.answer ::v-deep .el-dialog--center .el-dialog__body { - padding: 0; -} -.answer ::v-deep .el-tabs__item { - color: #fff; - width: 80px; -} -.answer ::v-deep .el-tabs--top .el-tabs__item.is-top:nth-child(2) { - padding-left: 20px; -} -.answer ::v-deep .el-tabs__item.is-active { - color: #fff !important; - background-color: #333 !important; +/deep/.answer { + .el-tab-pane { + padding: 0 10px; + height: 340px; + overflow: hidden; + overflow-y: auto; + white-space: pre-wrap; + } + .el-dialog--center { + width: 500px; + height: 500px; + } + .el-dialog__title { + font-size: 22px; + font-weight: 500; + } + .el-tabs__nav-wrap::after { + background-color: #333; + } + .el-tabs__active-bar { + height: 0; + background-color: #fff; + } + .el-tabs__header { + background-color: #333; + } + .el-dialog--center .el-dialog__body { + padding: 0; + } + .el-tabs__item { + width: 80px; + color: #fff; + } + .el-tabs--top .el-tabs__item.is-top:nth-child(2) { + padding-left: 20px; + } + .el-tabs__item.is-active { + color: #fff !important; + background-color: #333 !important; + } + .tips-btn { + margin-top: 10px; + height: 40px; + width: 90px; + border: none; + position: absolute; + right: 0; + background: rgba(255, 49, 49, 1); + color: rgba(255, 255, 255, 1); + &:hover, + &:focus, + &:active { + background: rgba(255, 49, 49, 1); + color: rgba(255, 255, 255, 1); + } + } } - ::v-deep .CodeMirror-wrap pre.CodeMirror-line, .CodeMirror-wrap pre.CodeMirror-line-like { height: 30px; line-height: 30px; } - -.cm-s-monokai .CodeMirror-linenumber { - height: 30px; - line-height: 30px; -} -.code-right ::v-deep .tips-btn { - margin-top: 10px; - height: 40px; - width: 90px; - border: none; - position: absolute; - right: 0; - background: rgba(255, 49, 49, 1); - color: rgba(255, 255, 255, 1); -} -.code-right ::v-deep .tips-btn:hover, -.tips-btn:focus, -.tips-btn:active { - background: rgba(255, 49, 49, 1); - color: rgba(255, 255, 255, 1); -} .code_error img { width: 40px; height: 40px; @@ -454,17 +450,8 @@ export default { left: 20px; right: 20px; padding: 0 10px; - // padding-right: 20px; box-sizing: border-box; } -.code-right p { - font-size: 18px; - margin: 10px; - position: absolute; - width: calc(100% - 14px); - height: calc(100vh - 230px); - overflow: auto; -} .code-right { width: 500px; color: #ffffff; @@ -472,6 +459,14 @@ export default { display: inline-block; position: relative; overflow-x: auto; + p { + font-size: 18px; + margin: 10px; + position: absolute; + width: calc(100% - 14px); + height: calc(100vh - 230px); + overflow: auto; + } } .button ::v-deep .el-button--warning:hover, .el-button--warning:focus, @@ -479,26 +474,6 @@ export default { background: #fdca17; color: #333; } -.flex { - display: flex; -} -// 滚动条的宽度 -.scrollbar ::-webkit-scrollbar { - width: 2px; // 横向滚动条 - height: 6px; // 纵向滚动条 必写 -} -// 滚动条的滑块 -.scrollbar ::-webkit-scrollbar-thumb { - background-color: #fdca17; - border-radius: 3px; - box-shadow: inset 0 0 5px #dddddd; -} -.scrollbar ::-webkit-scrollbar-track { - /*滚动条里面轨道*/ - box-shadow: inset 0 0 5px #dddddd; - border-radius: 0; - background: #dddddd; -} .pic-wrap{ position: absolute; left: 0; @@ -518,27 +493,21 @@ export default { bottom: 0; right: 0; } -.func-btn{ - width:100px; - position:absolute; +.run{ z-index:99; - background:$main-color; - color:#fff !important; - right: 50px; + position:absolute; + right: 50px; bottom:15px; - border-color: $main-color; + width:100px; + color:#fff !important; } .download-btn{ - background:$main-color; color:#fff; - border-color: $main-color } /deep/.answer-wrap{ pre{ width: 100%; white-space: pre-wrap; - // height: 320px; - // overflow-x: scroll; } img{ max-width: 100%; diff --git a/src/config/index.js b/src/config/index.js index 7ce86c6..5c5817a 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -25,17 +25,44 @@ export default { /** * @description 配置显示在浏览器标签的title */ - title: isHh ? 'Python程序设计教学系统' : 'Python程序设计教学系统', + title: 'Python程序设计教学系统', /** - * @description 是否使用国际化，默认为false - * 如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'} - * 用来在菜单中显示文字 - */ - locale: 'zh', - /** - * @description 跳转子系统链接 - */ - systemId: 1, + * python子系统 + **/ + pythonList: [ + { + id: 1, + name: 'Python程序设计教学系统' + }, + { + id: 4, + name: 'pyFinance' + }, + { + id: 5, + name: 'pyProjects' + }, + { + id: 6, + name: 'pyRandom' + }, + { + id: 7, + name: 'pyQuantification' + }, + { + id: 8, + name: 'pyAnalysis' + }, + { + id: 9, + name: 'pyDataclean' + }, + { + id: 10, + name: 'pyAcquisition' + } + ], /** * @description 长时间未操作，自动退出登录时间 */ diff --git a/src/main.js b/src/main.js index d795c18..7f5213a 100644 --- a/src/main.js +++ b/src/main.js @@ -3,7 +3,15 @@ import App from "./App.vue"; import router from "./router"; import store from "./store"; import ElementUI from 'element-ui' -import './assets/element-variables.scss' +import util from '@/util' +import './assets/style/index.scss'; +const systemId = util.getCookie('systemId') +if (systemId == 1) { + console.log(systemId) + require('./assets/style/theme/theme1.scss') +} else { + require('./assets/style/theme/theme10.scss') +} import api from './api'; import { post, @@ -17,8 +25,6 @@ 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' Vue.component('vue-draggable-resizable', VueDraggableResizable) diff --git a/src/views/Home.vue b/src/views/Home.vue index 55dda36..cad8f6d 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,6 +1,6 @@