From 1d2b7098d1ac27b6af73acbf0e28466aea95e35d Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 28 Jul 2022 15:53:37 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                     |  1 +
 src/api/index.js              |  1 +
 src/components/TestPanel.vue  | 30 ++++++++++++++++++++++--------
 src/components/codemirror.vue |  1 +
 src/config/index.js           | 24 +++++++++++++++++++++---
 src/views/Home.vue            | 13 +++++++++++--
 vue.config.js                 |  5 ++++-
 7 files changed, 61 insertions(+), 14 deletions(-)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..cbed4bb
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+# python子系统前端
\ No newline at end of file
diff --git a/src/api/index.js b/src/api/index.js
index 9a38b53..572e2d8 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -10,6 +10,7 @@ export default {
     saveCache: 'python/python/saveCache',
     getLastCache: 'python/python/getLastCache',
     delCache: 'python/python/delCache',
+    getTheMostRecentlyRunProject: 'python/python/getTheMostRecentlyRunProject',
     getDetailById: 'occupationlab/occupationlab/assessment/getDetailById',
     pageStuAssessment: 'occupationlab/occupationlab/assessment/pageStuAssessment',
     modelClassList: `nakadai/nakadai/model/reference/modelClassList`,
diff --git a/src/components/TestPanel.vue b/src/components/TestPanel.vue
index 9b0e5a0..721d413 100644
--- a/src/components/TestPanel.vue
+++ b/src/components/TestPanel.vue
@@ -128,16 +128,19 @@
 <script>
 import newmain from "../util/newMain";
 import util from '@/util'
+import Config from '@/config'
 import Cookie from 'js-cookie'
 export default {
   data() {
     return {
+      token: Cookie.get('admin-token'),
       systemId: Cookie.get('admin-systemId') || 1,
       classId: Cookie.get('admin-classId'),
       className: Cookie.get('admin-className') ? decodeURI(Cookie.get('admin-className')) : '',
       courseId: Cookie.get('admin-courseId'),
       projectId: Cookie.get('admin-projectId') ? Number(Cookie.get('admin-projectId')) : '',
       assessmentId: Cookie.get('admin-assessmentId'),
+      curriculumName: Cookie.get('admin-curriculumName') ? unescape(Cookie.get('admin-curriculumName')) : 'python', // 课程名称
       curSystemId: 1,
       projectPermissions: 0, // 项目权限(0、练习 1、考核 2、竞赛)
       isSubmit: false, // 是否提交的标识
@@ -167,8 +170,8 @@ export default {
     };
   },
   mounted() {
-    this.projectPermissions = this.projectId ? 1 : 0 // 1：考核，0：练习
-    if(this.projectId){ // 考核（考核才会从外面带进来projectId，练习是默认显示第一个项目)
+    this.projectPermissions = this.assessmentId ? 1 : 0 // 1：考核，0：练习
+    if(this.assessmentId){ // 考核（考核才会从外面带进来assessmentId，练习是默认显示第一个项目)
       this.getAssList()
     }else{ // 练习
       // 获取项目列表
@@ -195,7 +198,7 @@ export default {
         this.$get(`${this.api.queryTestProject}`,data).then(res => {
           const list = res.projects
           this.projectList = list
-          if (!this.projectPermissions) this.projectId = list ? list[0].projectId : 0 // 默认取第一个项目
+          if (!this.projectPermissions && !this.projectId) this.projectId = list ? list[0].projectId : 0 // 默认取第一个项目
           this.getProDetail().then(() => {
             resolve()
           }).catch(res => {
@@ -217,6 +220,10 @@ export default {
           const points = res.projectJudgmentVos
           const project = res.projectManage
           const curReq = []
+          // 跳转银行
+          if (project.systemId == 11) {
+            return location.href = `${Config.bankPath}/#/index/list?curriculumName=${this.curriculumName}&token=${this.token}&cid=${this.courseId}&systemId=${this.systemId}&projectId=${projectId}&assessmentId=&classId=&stopTime=&test=true`
+          }
           if (!points.length) {
             this.$message.error('该项目没有判分点，请换个项目重试')
             this.projectId = this.projectList[0].projectId
@@ -231,7 +238,7 @@ export default {
           })
           if (this.projectPermissions) {
             this.projectList = [{
-              projectId: projectId,
+              projectId,
               projectName: project.projectName
             }]
           }
@@ -302,7 +309,7 @@ export default {
       const assessmentId = this.assessmentId
       const list = this.projectList
       let points = []
-      if (pId && cache.judgmentIdList) {
+      if (pId && cache.judgmentIdList && !Cookie.get('admin-projectId')) {
         cache.judgmentIdList.map(e => {
           points.push({
             judgmentId: e
@@ -313,12 +320,19 @@ export default {
         points = JSON.parse(JSON.stringify(this.points))
       }
       // 如果是没有代码的缓存，则只需要恢复项目，否则，就调接口查询缓存代码
-      if (cache && cache.empty && list.find(e => e.projectId === projectId)) {
-        this.projectId = projectId
-        this.getProDetail()
+      if (cache && cache.empty && list.find(e => e.projectId === projectId) && !Cookie.get('admin-projectId')) {
+        if (Cookie.get('admin-projectId')) {
+          Cookie.remove('admin-projectId')
+        } else {
+          this.projectId = projectId
+          this.getProDetail()
+        }
         this.closeLoad()
         localStorage.removeItem('codeCache')
       } else {
+        if (Cookie.get('admin-projectId')) {
+          Cookie.remove('admin-projectId')
+        }
         let newJudgmentId = '' // 要恢复到第一个有代码的判分规则，因为有代码的规则可能不是第一个，所以要判断如果这个为空，才把索引赋给该变量
         const promiseList = [] // promise数组
         let hasCache = 0 // 是否有缓存
diff --git a/src/components/codemirror.vue b/src/components/codemirror.vue
index 8d8bdef..71d282b 100644
--- a/src/components/codemirror.vue
+++ b/src/components/codemirror.vue
@@ -407,6 +407,7 @@ export default {
             })
           } else {
             this.loadIns = Loading.service({
+              text: '代码运行中请稍等几分钟',
               background: 'transparent'
             })
             // 如果代码有savefig(python里的保存图片的方法),则要把savefig里的图片名字加上个时间戳，防止后台保存图片到服务器的时候图片名字重复导致覆盖
diff --git a/src/config/index.js b/src/config/index.js
index 6ccb8c3..34a7f57 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,17 +1,22 @@
-import util from '@/util'
+import Cookie from 'js-cookie'
 
 const url = location.host
+const isDev = process.env.NODE_ENV === 'development' //是否本地
 const isHh = url.includes('10.196.131.73') //是否是河海版本
 const isPro = url.includes('occupationlab.com') //是否职站生产
 
 let host = location.origin + '/'
+let bankPath = `${location.origin}/banksystem` // 银行系统
 // 121.37.12.51 | 192.168.31.151
-if (process.env.NODE_ENV === 'development') {
+if (isDev) {
   host = 'http://192.168.31.151:9000/'
+  host = 'http://121.37.12.51:9000/'
+  bankPath = `http://${location.hostname}:8093`
 } else if (isPro) {
   host = 'https://occupationlab.com/'
+  bankPath = `https://www.huorantech.cn/banksystem`
 }
-const systemId = util.getCookie('systemId')
+const systemId = Cookie.get('admin-systemId')
 /**
  * python8个系统的id和名称
  * id即systemId，从cookie里取
@@ -55,18 +60,31 @@ export default {
      * @description 域名
      */
     host,
+    /**
+      * @description 是否本地
+      */
+    isDev,
     /**
       * @description 是否是河海版本
       */
     isHh,
+    /**
+      * @description 是否是职站生产
+      */
+    isPro,
     /**
      * @description 系统主题色
+     * 如果有多个systemId，则显示系统7的主题色
      */
     defaultSystem: systemId.includes(',') ? 7 : systemId,
     /**
      * python子系统
      **/
     pythonList,
+    /**
+     * 银行系统
+     **/
+    bankPath,
     /**
      * @description 长时间未操作，自动退出登录时间
      */
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 0bc5b4c..60b7950 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -95,7 +95,6 @@ export default {
     // 页面离开的时候缓存未提交的代码（只有未提交状态下才会调用该接口）
     leavePage() {
       const list = this.workbench
-      console.log("🚀 ~ file: Home.vue ~ line 95 ~ leavePage ~ this.workbench", this.workbench)
       // 未提交，且有判分点，才需要缓存
       if (!this.$refs.mainindex.isSubmit && list.length) {
         const cache = {
@@ -164,7 +163,17 @@ export default {
     },
     // 退出实验
     back() {
-      history.back()
+      let href = this.$config.isDev ? 
+        `http://${location.hostname}:8082/#/` :
+        `${location.origin}${this.$config.isPro ? '' : '/student'}/#/`
+      // 考核
+      if (this.assessmentId) {
+        href += `ass/list`
+      } else {
+        // 练习
+        href += `station/preview?courseId=${this.courseId}&curriculumName=${this.curriculumName}`
+      }
+      location.href = href
     },
     // 赋值项目id、项目列表
     setPoints(projectId, systemId, workbench) {
diff --git a/vue.config.js b/vue.config.js
index c8e7584..236448b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,5 +2,8 @@ module.exports = {
   lintOnSave: true,
   publicPath: './',
   outputDir: 'dist',
-  assetsDir: 'static'
+  assetsDir: 'static',
+  devServer: {
+      port: 8085 // 固定端口
+  }
 }
\ No newline at end of file