diff --git a/public/static/ueditor/ueditor.config.js b/public/static/ueditor/ueditor.config.js index 5a27678..9b8abe9 100644 --- a/public/static/ueditor/ueditor.config.js +++ b/public/static/ueditor/ueditor.config.js @@ -1,6 +1,6 @@ !function () { window.UEDITOR_HOME_URL = "./static/ueditor/"; var s = window.UEDITOR_HOME_URL || l(); function l (s, l) { return function (s, l) { var t = l; /^(\/|\\\\)/.test(l) ? t = /^.+?\w(\/|\\\\)/.exec(s)[0] + l.replace(/^(\/|\\\\)/, "") : /^[a-z]+:/i.test(l) || (s = s.split("#")[0].split("?")[0].replace(/[^\\\/]+$/, ""), t = s + "" + l); return function (s) { var l = /^[a-z]+:\/\//.exec(s)[0], t = null, e = []; (s = (s = s.replace(l, "").split("?")[0].split("#")[0]).replace(/\\/g, "/").split(/\//))[s.length - 1] = ""; for (; s.length;)".." === (t = s.shift()) ? e.pop() : "." !== t && e.push(t); return l + e.join("/") }(t) }(s || self.document.URL || self.location.href, l || (t = document.getElementsByTagName("script"))[t.length - 1].src); var t } window.UEDITOR_CONFIG = { - UEDITOR_HOME_URL: s, serverHeaders: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept, Authorization', 'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS' }, serverUrl: "http://192.168.31.51:9000/exam/exam/upload/configAndUpload", toolbars: [[ + UEDITOR_HOME_URL: s, serverHeaders: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept, Authorization', 'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS' }, serverUrl: "http://192.168.31.51:9950/exam/exam/upload/configAndUpload", toolbars: [[ "fullscreen", "source", "|", diff --git a/src/App.vue b/src/App.vue index 7f56b68..5227dba 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,10 @@ @@ -10,6 +15,12 @@ import util from '@/libs/util' export default { name: "App", + data () { + return { + Setting, + ip: localStorage.getItem('ip') ? +localStorage.getItem('ip') : 0, + }; + }, created () { //在页面加载时读取localStorage里的状态信息 if (util.local.get(Setting.storeKey)) { @@ -20,6 +31,12 @@ export default { window.addEventListener("beforeunload", () => { util.local.get(Setting.tokenKey) && util.local.set(Setting.storeKey, this.$store.state); }); + }, + methods: { + ipChange (val) { + localStorage.setItem('ip', val) + location.reload() + }, } }; \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index 565fd00..ba5f710 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,6 +1,5 @@ import Setting from '@/setting' -const { apiBaseURL: host } = Setting -// const host = 'http://192.168.31.217:9000/' +const host = 'http://192.168.31.51:9000' export default { categoriesDel: `/exam/question/bank/categories/batchDeletion`, @@ -14,4 +13,34 @@ export default { questionBankList: `/exam/questionBank/pagingQuery`, questionBankSave: `/exam/questionBank/saveOrUpdate`, questionBankDisable: `/exam/questionBank/updateStatus`, + copyQuestionBank: `/exam/questionBank/copyQuestionBank`, + + TreeStructure: `/exam/knowledgeHierarchy/TreeStructure`, + knowledgeHierarchyDel: `/exam/knowledgeHierarchy/batchDeletion`, + knowledgeHierarchyFind: `/exam/knowledgeHierarchy/findById`, + knowledgeHierarchySave: `/exam/knowledgeHierarchy/saveOrUpdate`, + + knowledgePointsDel: `/exam/knowledgePoints/batchDeletion`, + knowledgePointsFind: `/exam/knowledgePoints/findById`, + knowledgePointsList: `/exam/knowledgePoints/pagingQuery`, + knowledgePointsSave: `/exam/knowledgePoints/saveOrUpdate`, + knowledgePointsDisable: `/exam/knowledgePoints/updateStatus`, + + libraryClassificationDel: `/exam/exam/libraryClassification/delete`, + libraryClassificationSave: `/exam/exam/libraryClassification/save`, + libraryClassificationList: `/exam/exam/libraryClassification/treeList`, + libraryClassificationUpdate: `/exam/exam/libraryClassification/update`, + libraryClassificationDisable: `/exam/exam/libraryClassification/updateStatus`, + libraryClassificationFind: `/exam/exam/libraryClassification/details`, + + paperLibraryDel: `/exam/exam/paperLibrary/delete`, + libraryList: `/exam/exam/paperLibrary/libraryList`, + paperLibrarySave: `/exam/exam/paperLibrary/save`, + paperLibraryUpdate: `/exam/exam/paperLibrary/update`, + paperLibraryDisable: `/exam/exam/paperLibrary/updateStatus`, + + examClassificationDel: `/exam/exam/classification/delete`, + examClassificationSave: `/exam/exam/classification/save`, + examClassificationList: `/exam/exam/classification/treeList`, + examClassificationUpdate: `/exam/exam/classification/update`, } \ No newline at end of file diff --git a/src/components/breadcrumb/index.vue b/src/components/breadcrumb/index.vue index 5fca155..585c0ad 100644 --- a/src/components/breadcrumb/index.vue +++ b/src/components/breadcrumb/index.vue @@ -3,15 +3,10 @@
@@ -21,36 +16,40 @@ + diff --git a/src/pages/theoryExam/knowledge.vue b/src/pages/theoryExam/knowledge.vue deleted file mode 100644 index b4d2846..0000000 --- a/src/pages/theoryExam/knowledge.vue +++ /dev/null @@ -1,487 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js index 330fb1d..4882b52 100644 --- a/src/plugins/requests/index.js +++ b/src/plugins/requests/index.js @@ -36,14 +36,14 @@ service.interceptors.response.use( } else if (res.code === 401) { // 账号互踢 if (!logouted) { - Util.local.remove(Setting.storeKey) - Util.local.remove(Setting.tokenKey) - Util.errorMsg(res.msg.includes('顶') ? '您的账号已在其他设备登录，您已被迫下线！' : '登录过期，请重新登录！') - setTimeout(() => { - store.dispatch('user/logout') - logouted = 0 - }, 2000) - logouted = 1 + // Util.local.remove(Setting.storeKey) + // Util.local.remove(Setting.tokenKey) + // Util.errorMsg(res.msg.includes('顶') ? '您的账号已在其他设备登录，您已被迫下线！' : '登录过期，请重新登录！') + // setTimeout(() => { + // store.dispatch('user/logout') + logouted = 0 + // }, 5000) + // logouted = 1 } } else if (!res.status) { return Promise.resolve(res).catch(e => { }); diff --git a/src/setting.js b/src/setting.js index a65868d..9758e21 100644 --- a/src/setting.js +++ b/src/setting.js @@ -4,7 +4,9 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境 let host = location.origin if (isDev) { - host = 'http://192.168.31.217:9000' + host = 'http://192.168.31.51:9000' + const ips = ['http://192.168.31.217:9000', 'http://192.168.31.51:9000', 'http://121.37.12.51'] + host = ips[+localStorage.getItem('ip')] } const Setting = { diff --git a/src/styles/common.scss b/src/styles/common.scss index 46995c2..b712077 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -409,4 +409,29 @@ } .tinymce-load { z-index: 3000 !important; +} + +.del-dia { + .el-dialog__body { + padding: 10px 30px; + } + + .del-wrap { + display: flex; + } + + .icon { + margin-right: 15px; + font-size: 24px; + color: #E6A23C; + } + + .tips { + margin: 5px 0 10px; + } + + .el-checkbox__label { + white-space: normal; + vertical-align: top; + } } \ No newline at end of file