From c9c53af1508df9d29638ce54487aab425b5a8bd0 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Wed, 6 Jul 2022 16:17:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 32 ++++++++++++++++---------------- src/components/TestPanel.vue | 4 ++-- src/config/index.js | 19 ++++++++++--------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 7e2667e..9a38b53 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,25 +1,25 @@ import config from '@/config' export default { - getProjectDetail: 'occupationlab/projectManage/getProjectDetail', + getProjectDetail: 'occupationlab/occupationlab/projectManage/getProjectDetail', submit: 'python/python/submit', runPythonCode: 'python/python/runPythonCode', - queryBcJudgmentByBcId: 'judgment/bcJudgmentPoint/queryBcJudgmentByBcId', - queryTestProject: 'occupationlab/projectManage/getProjectBySystemId', - editExperimentalData: 'occupationlab/experimentalReport/editExperimentalData', - queryBcJudgmentPointByBcId: 'judgment/bcJudgmentPoint/queryBcJudgmentPointByBcId', + queryBcJudgmentByBcId: 'judgment/judgment/bcJudgmentPoint/queryBcJudgmentByBcId', + queryTestProject: 'occupationlab/occupationlab/projectManage/getProjectBySystemId', + editExperimentalData: 'occupationlab/occupationlab/experimentalReport/editExperimentalData', + queryBcJudgmentPointByBcId: 'judgment/judgment/bcJudgmentPoint/queryBcJudgmentPointByBcId', saveCache: 'python/python/saveCache', getLastCache: 'python/python/getLastCache', delCache: 'python/python/delCache', - getDetailById: 'occupationlab/assessment/getDetailById', - pageStuAssessment: 'occupationlab/assessment/pageStuAssessment', - modelClassList: `nakadai/model/reference/modelClassList`, - referenceDemoList: `nakadai/model/reference/demo/referenceDemoList`, - referenceFindById: `nakadai/model/reference/demo/findById`, - checkIsShowBySystemId: `nakadai/model/reference/checkIsShowBySystemId`, + getDetailById: 'occupationlab/occupationlab/assessment/getDetailById', + pageStuAssessment: 'occupationlab/occupationlab/assessment/pageStuAssessment', + modelClassList: `nakadai/nakadai/model/reference/modelClassList`, + referenceDemoList: `nakadai/nakadai/model/reference/demo/referenceDemoList`, + referenceFindById: `nakadai/nakadai/model/reference/demo/findById`, + checkIsShowBySystemId: `nakadai/nakadai/model/reference/checkIsShowBySystemId`, fileUpload: `${config.host}nakadai/nakadai/oss/fileUpload`, - importData: `occupationlab/python/file/data/importData`, - lookExcel: `occupationlab/python/file/data/lookExcel`, - lookOver: `occupationlab/python/file/data/lookOver`, - batchDeletion: `occupationlab/python/file/data/batchDeletion`, - myData: `occupationlab/python/file/data/myData` + importData: `occupationlab/occupationlab/python/file/data/importData`, + lookExcel: `occupationlab/occupationlab/python/file/data/lookExcel`, + lookOver: `occupationlab/occupationlab/python/file/data/lookOver`, + batchDeletion: `occupationlab/occupationlab/python/file/data/batchDeletion`, + myData: `occupationlab/occupationlab/python/file/data/myData` } \ No newline at end of file diff --git a/src/components/TestPanel.vue b/src/components/TestPanel.vue index a3a840c..9b0e5a0 100644 --- a/src/components/TestPanel.vue +++ b/src/components/TestPanel.vue @@ -505,9 +505,9 @@ export default { e.examScore = item.score e.finishedResult = item.finishedResult // 1:正确,2:错误 } else { - e.score = 0 + e.examScore = 0 } - score += e.score // 计算总分 + score += e.examScore // 计算总分 }) this.grade = util.handleZero(score) // 前置加0 this.editReport(res.reportId) diff --git a/src/config/index.js b/src/config/index.js index a107f32..6ccb8c3 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,11 +1,16 @@ import util from '@/util' -const isHh = location.host.includes('10.196.131.73') //是否是河海版本 -const isBeta = process.env.NODE_ENV === 'development' || location.host.includes('39.108.250.202') //是否是职站测试 +const url = location.host +const isHh = url.includes('10.196.131.73') //是否是河海版本 +const isPro = url.includes('occupationlab.com') //是否职站生产 -let host = location.origin + ':9000/' -// 39.108.250.202 | 192.168.31.151 -if (process.env.NODE_ENV === 'development') host = 'http://192.168.31.151:9000/' +let host = location.origin + '/' +// 121.37.12.51 | 192.168.31.151 +if (process.env.NODE_ENV === 'development') { + host = 'http://192.168.31.151:9000/' +} else if (isPro) { + host = 'https://occupationlab.com/' +} const systemId = util.getCookie('systemId') /** * python8个系统的id和名称 @@ -54,10 +59,6 @@ export default { * @description 是否是河海版本 */ isHh, - /** - * @description 是否是开发/测试版本 - */ - isBeta, /** * @description 系统主题色 */