重构，联调提交等

src/components/TestPanel.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-container class="scrollbar" v-if="ishow">
+    <el-container class="scrollbar" v-if="pannelVisible">
       <el-header>
         <div class="flex between">
           <div class="flex" style="width: 28%">
@@ -23,7 +23,7 @@
           </div>
           <div class="countDownBox">
             <div style="margin-left: -40px;">
-              <div :sendSync="sendSync" :autoStart="autoStart" :defaultVal="defaultVal">
+              <div :autoStart="autoStart">
                 实训{{text}}时间
                 <span class="timeSpan">{{day}}</span>天
                 <span class="timeSpan">{{hour}}</span>小时
@@ -44,7 +44,7 @@
               v-show="projectPermissions == 0"
               @click="reload"
             >重新开始</el-button>
-            <el-button style="margin-right:7px" @click="Submit" :disabled="isSubmit">提交</el-button>
+            <el-button style="margin-right:7px" @click="submit" :disabled="isSubmit">提交</el-button>
           </div>
         </div>
       </el-header>
@@ -70,9 +70,9 @@
               <el-row>
                 <el-col :span="24">
                   <el-card shadow="hover">
-                    <el-table :data="tableData" :stripe="true" height="405">
+                    <el-table :data="taskList" :stripe="true" height="405">
                       <el-table-column type="index"></el-table-column>
-                      <el-table-column prop="judgmentPointsName" label="判分标准" align="center"></el-table-column>
+                      <el-table-column prop="name" label="判分标准" align="center"></el-table-column>
                       <el-table-column prop="right" label="完成结果" align="center">
                         <template slot-scope="scope">
                           <i
@@ -87,7 +87,7 @@
                           ></i>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="score" label="得分" align="center"></el-table-column>
+                      <el-table-column prop="score1" label="得分" align="center"></el-table-column>
                     </el-table>
                   </el-card>
                 </el-col>
@@ -101,7 +101,7 @@
               <div class="break-all" v-html="experimentDescription"></div>
             </el-tab-pane>
             <el-tab-pane label="实验要求" name="second">
-              <el-collapse v-model="activeNames">
+              <el-collapse v-model="curReq">
                 <el-collapse-item v-for="(loop, index) in points" :key="index">
                   <template slot="title">
                     <i class="el-icon-s-ticket"></i>
@@ -121,11 +121,11 @@
     <!-- </div> -->
 
     <div
-      :style="ishow ? {position: 'fixed', left: '85%',top:'50%'} : {position: 'fixed',top:'50%'}"
+      :style="pannelVisible ? {position: 'fixed', left: '85%',top:'50%'} : {position: 'fixed',top:'50%'}"
     >
-      <div @click="step()">
+      <div @click="togglePannel">
-        <img src="../assets/img/left.png" alt class="m_step" v-if="ishow" />
+        <img src="../assets/img/left.png" alt class="left-btn" v-if="pannelVisible" />
-        <img src="../assets/img/right.png" alt class="n_step" v-if="!ishow" />
+        <img src="../assets/img/right.png" alt class="right-btn" v-if="!pannelVisible" />
       </div>
     </div>
   </div>
@@ -133,107 +133,44 @@
 
 <script>
 import newmain from "../util/newMain";
-import * as $ from "jquery";
-import { get } from "http";
 import util from '@/util'
 export default {
   data() {
     return {
-      userId: util.getCookie("userId"),
+      classId: util.getCookie('classId'),
-      studentId: util.getCookie("studentId"),
+      className: util.getCookie("className"),
       courseId: util.getCookie("courseId"),
       projectId: util.getCookie("projectId"),
       assessmentId: util.getCookie("assessmentId"),
       projectPermissions: 0, // 项目权限(0、练习 1、考核 2、竞赛)
-      isSubmit: false,
+      isSubmit: false, // 是否提交的标识
-      entryTime: util.formatDate('yyyy-MM-dd hh:mm:ss'),
+      entryTime: new Date(),
       startTime: util.getCookie("startTime") ? new Date(util.getCookie("startTime")).getTime() : '',
-      stopTime: util.getCookie("stopTime") ? new Date(util.getCookie("stopTime")).getTime() : '',
+      endTime: util.getCookie("stopTime") ? new Date(util.getCookie("stopTime")).getTime() : '',
-      test: [],
+      autoStart: true,
-      ishow: true,
+      pannelVisible: true, // 实验面板显示标识
-      grade: "00",
+      grade: '00', // 得分
-      exampleData: "",
+      text: '', // 倒计时前面的文字，练习：所用；考核：剩余。练习是计时，考核是倒计时
-      codeid: "",
+      counterTimer: null, // 获取setInterval对象值
-      text: "",
+      day: 0, // 天数
-      isStart: false, // 是否开启倒计时的标识
+      seconds: 0, // 秒数
-      globalTimer: null, //获取setInterval对象值
+      minutes: 0, // 分钟数
-      millisecond: 0,
+      hour: 0, // 小时数
-      countVal: this.defaultVal, //获取初始值
-      pauseTime: 0,
-      day: 0,
-      seconds: 0,
-      minutes: 0,
-      hour: 0,
       createTime: '', // 开始时间
       actEndTime: '', // 倒计时结束时间
-      projectList: [],
+      projectList: [], // 项目列表
       experimentTarget: "", //实验目标
       experimentDescription: "", //案例描述
       experimentHint: "", //实验提示
-      judgmentPointsName: "", //	判分点名称
+      hintOpen: 1, // 是否显示实验提示
-      points: [],
+      points: [], // 判分点列表
-      activeNames: [],
+      judgmentId: '', // 当前判分点id
-      tableData: [],
+      curReq: [], // 当前实验要求
-      pannelTab: "first",
+      taskList: [], // 实验任务列表
-      isSelected: false, // 是否选择过项目的标识，选择了会置为true
+      pannelTab: "first", // 面板信息切换值
-      hintOpen: 1 // 是否显示实验提示
+      isSelected: false // 是否选择过项目的标识，选择了会置为true
     };
   },
-  watch: {
-    countVal: {
-      deep: true,
-      handler: function(val, oldVal) {
-        let vm = this;
-        // console.log(11,vm)
-        if (vm.needSendSunc) {
-          vm.passToParent(val);
-        }
-      }
-    },
-    needSendSunc: {
-      deep: true,
-      handler: function(val) {
-        let vm = this;
-        if (val) {
-          vm.passToParent(vm.countString);
-        }
-      }
-    }
-  },
-  props: {
-    sendSync: {
-      type: Boolean,
-      default: false
-    },
-    autoStart: {
-      type: Boolean,
-      default: false
-    },
-    defaultVal: {
-      type: Number,
-      default: null
-    },
-    codeId: {
-      type: Number,
-      default: 0
-    },
-    workbench: {
-      type: Array,
-      default: []
-    }
-  },
-  computed: {
-    needSendSunc: function() {
-      return this.sendSync;
-    },
-    // 倒计时
-    second: function() {
-      return this.num(this.seconds);
-    },
-    minute: function() {
-      return this.num(this.minutes);
-    }
-  },
   mounted() {
     this.projectPermissions = this.projectId ? 1 : 0 // 考核/练习
     if(this.projectId){ // 考核（考核才会从外面带进来projectId，练习是默认显示第一个项目)
@@ -241,163 +178,39 @@ export default {
     }else{ // 练习
       // 获取项目列表
       this.getList().then(() => {
-        let cache = localStorage.getItem('codeCache')
+        let cache = localStorage.getItem('codeCache') // 获取本地缓存
-        if(cache){
+        // 如果有缓存，再调接口取上次运行的代码
+        if (cache) {
           cache = JSON.parse(cache)
           this.getCache(cache.projectId, cache.judgmentId)
+        } else {
+          this.getCache()
         }
       }).catch(res => {})
     }
-    //兄弟组件传值
-    newmain.$on("codeid", val => {
-      this.codeid = val;
-      let codeId = this.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: {
-    // 获取上次缓存记录
+    // 获取项目列表
-    getCache(projectId, judgmentId) {
+    getList(){
-      this.$post(this.api.getLastCache, {
+      let data = {
-        bcId: judgmentId ? judgmentId : this.judgmentId,
+        systemId: 1,
-        cid: this.courseId,
+        cId: this.courseId, // 课程id
-        projectId: projectId ? projectId : this.projectId
+        permissions: this.projectPermissions // 练习/考核
-      }).then(res => {
+      }
-        const code = res.getLastCache
+      return new Promise((resolve, reject) => {
-        if (code) {
+        this.$get(`${this.api.queryTestProject}`,data).then(res => {
-          this.$confirm('是否要继续上次的实验？', '提示', {
+          const list = res.projects
-            confirmButtonText: '是',
+          this.projectList = list
-            cancelButtonText: '否',
+          this.projectId = list ? list[0].projectId : 0 // 默认取第一个项目
-            type: 'success'
+          this.getProDetail().then(() => {
-          }).then(() => {
+            resolve()
-            localStorage.removeItem('codeCache')
+          }).catch(res => {
-            this.projectId = projectId
+            reject()
-            this.judgmentId = judgmentId
-            this.points[0].code = code
-            this.$emit("tell", this.projectId, this.projectPermissions, this.points)
-            // this.$emit('recoveryCode', cache.curTab)
-          }).catch(() => {
-            localStorage.removeItem('codeCache')
           })
-        }
+        }).catch(res => {
-      }).catch(res => {})
+          reject()
-    },
-    //重新开始
-    reload() {
-      this.$post(this.api.DeleteCodes).then(res => {
-        this.getClearTime()
-        this.grade = '00'
-        localStorage.removeItem('codeCache')
-        this.isSubmit = false
-        newmain.$emit("isSubmit", this.isSubmit)
-        let workbench = this.workbench
-        workbench.map(n => {
-          n.code = {
-            code: ''
-          }
-        })
-        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: "取消",
-        type: "warning",
-        center: true
-      }).then(() => {
-          this.actEndTime = new Date().getTime();
-          this.getClearTime();
-          //提交代码与判分点进行判断
-          this.$post(this.api.Submit, {
-            createTime: this.startTime,
-            endTime: this.stopTime,
-            projectId: this.projectId,
-            projectPermissions: this.projectPermissions,
-            assessmentId: this.assessmentId ? this.assessmentId : '',
-            studentId: this.studentId,
-            record: {
-              courseId: 1,
-              // courseId: this.courseId,
-              projectId: this.projectId,
-              createTime: this.startTime,
-              endTime: this.stopTime,
-              startTime: this.entryTime
-            }
-          })
-            .then(res => {
-              localStorage.removeItem('codeCache')
-              this.isSubmit = true
-              newmain.$emit("isSubmit", this.isSubmit);
-              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 => {
-                this.test = element.score;
-                s += this.test;
-                this.grade = s;
-              });
-            })
-            .catch(err => {});
-        }).catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消提交"
-          });
-        });
-    },
-    // 倒计时
-    timeFormat(param) {
-      return param < 10 ? "0" + param : param;
-    },
-    //控制面板
-    step() {
-      $(".m_step").toggleClass("n_step");
-      this.ishow = !this.ishow;
-    },
-    // 清除时间
-    getClearTime() {
-      // clearInterval(this.globalTimer);
-      clearInterval(this.countVal);
-      this.globalTimer = "";
-      // if(this.projectPermissions != 0){
-        this.countVal = "";
-        this.day = "00";
-        this.seconds = "00";
-        this.minutes = "00";
-        this.hour = "00";
-      // }else{
-      //   this.text = '所用'
-      // }
     },
     // 获取项目详情
     getProDetail() {
@@ -409,18 +222,20 @@ export default {
           const points = res.projectJudgmentVos
           const project = res.projectManage
           points.map(e => {
-            e.code = ''
+            e.code = '' // 后端返回的字段没有code，要手动加上以存储运行的代码
+            e.codeId = '' // 代码通过接口传给后端运行后，接口会返回一个codeId，提交的时候需要传这个codeId
           })
           this.points = points
-          this.judgmentId = points[0].judgmentId
+          this.taskList = points // 实验任务
+          this.judgmentId = points[0].judgmentId // 默认取第一个判分点
           this.experimentTarget = project.experimentTarget
           this.experimentDescription = project.experimentDescription
           this.experimentHint = project.experimentHint
           // this.actEndTime = project[0].endTime
           this.hintOpen = !res.projectManage.hintOpen // 0显示，1不显示
           this.$emit("tell", projectId, this.projectPermissions, this.points)
-          if (this.projectPermissions == "1") {
+          if (this.projectPermissions == 1) {
-            this.text = "剩余";
+            this.text = "剩余"
             var interval = setInterval(() => {
               // 获取当前时间，同时得到活动结束时间数组
               let newTime = new Date().getTime();
@@ -454,13 +269,13 @@ export default {
               this.minutes = obj.min;
               this.seconds = obj.sec;
             }, 1000);
-          } else if (this.projectPermissions == "0") {
+          } else {
             this.text = "已用";
             // 获取当前时间
             this.createTime = new Date().getTime();
             //自动开始
             if (this.autoStart) {
-              this.startCountFn();
+              this.startCount()
             }
           }
           resolve()
@@ -469,44 +284,158 @@ export default {
         })
       })
     },
-    // 获取项目列表
+    // 获取上次缓存记录
-    getList(){
+    getCache(pId, jId) {
-      let data = {
+      const projectId = pId ? pId : this.projectId
-        systemId: 1,
+      const judgmentId = jId ? jId : this.judgmentId
-        cId: this.courseId, // 课程id
+      this.$post(this.api.getLastCache, {
-        permissions: this.projectPermissions
+        bcId: judgmentId, // 如果传进来了判分点id，说明本地有缓存，则直接取本地缓存的判分点id，否则，取第一个项目的第一个判分点id
-      }
+        projectId, // 项目id，同上
-      return new Promise((resolve, reject) => {
+        cid: this.courseId // 课程id
-        this.$get(`${this.api.queryTestProject}`,data).then(res => {
+      }).then(res => {
-          const list = res.projects
+        const code = res.getLastCache
-          this.projectList = list
+        // 如果有缓存代码，再提示用户是否要继续上次的实验
-          this.projectId = list ? list[0].projectId : 0
+        if (code) {
-          this.getProDetail().then(() => {
+          this.$confirm('是否要继续上次的实验？', '提示', {
-            resolve()
+            confirmButtonText: '是',
-          }).catch(res => {
+            cancelButtonText: '否',
-            reject()
+            type: 'success'
+          }).then(() => {
+            localStorage.removeItem('codeCache') // 恢复代码后清除本地缓存
+            this.projectId = projectId
+            this.judgmentId = judgmentId
+            const item = this.points.find(e => e.judgmentId === judgmentId)
+            if (item) item.code = code
+            // debugger
+            this.$emit("tell", this.projectId, this.projectPermissions, this.points)
+            this.$emit('recoveryCode', judgmentId + '')
+          }).catch(() => {
+            localStorage.removeItem('codeCache')
           })
-        }).catch(res => {
+        }
-          reject()
+      }).catch(res => {})
-        })
-      })
     },
     // 项目选择回调
     selectProject(){
       this.isSelected = true
-      this.assessmentId = ''
+      this.getProDetail().then(() => {
-      // 切换实训项目-标签页回到第一个位置
+        this.getCache()
-      this.$parent.workbench1 = '0'
+      }).catch(res => {})
-      this.getProDetail()
       this.isSubmit = false
       this.countVal = 0
       this.grade = 0
-      newmain.$emit("isSubmit", this.isSubmit)
+      // 切换实训项目-标签页回到第一个位置
+      this.$emit('recoveryCode')
+      newmain.$emit('isSubmit', this.isSubmit)
+    },
+    //重新开始
+    reload() {
+      this.reloadCount()
+      this.grade = '00'
+      localStorage.removeItem('codeCache')
+      this.isSubmit = false
+      newmain.$emit('isSubmit', this.isSubmit)
+      this.$emit('recoveryCode')
+      this.startCount()
+      // let taskList = this.taskList
+      // taskList.map(n => {
+      //   delete n.score
+      //   delete n.right
+      // })
+      // this.taskList = JSON.parse(JSON.stringify(taskList))
+    },
+    // 提交
+    submit() {
+      const pointList = this.$parent.workbench
+      if(!pointList.find(e => e.codeId)) return this.$message.error('请先完成实验')
+      this.$confirm("此操作将视为结束考试, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true
+      }).then(() => {
+        const date = new Date()
+        const entryTime = this.entryTime
+        const timeSum = Math.ceil((date.getTime() - entryTime.getTime()) / 60000) // 计算实验用时（分钟），向上取整
+        const endTime = util.formatDate('yyyy-MM-dd hh:mm:ss', date) // 结束时间
+        const projectId = this.projectId
+        const projectName = this.projectList.find(e => e.projectId == projectId).projectName // 获取项目名称
+        this.actEndTime = date
+        this.reloadCount()
+        const attributesReqList = []
+        pointList.map(e => {
+          e.codeId && attributesReqList.push({
+            codeId: e.codeId,
+            bcId: e.judgmentId,
+            isSubmit: 0
+          })
+        })
+        const data = {
+          classId: this.classId ? this.classId : '',
+          className: this.className ? this.className : '',
+          curriculumId: this.courseId,
+          startTime: util.formatDate('yyyy-MM-dd hh:mm:ss', entryTime),
+          endTime,
+          submitTime: endTime,
+          timeSum,
+          projectId,
+          projectName,
+          assessmentId: this.assessmentId ? this.assessmentId : '',
+          systemId: 1,
+          purpose: this.experimentTarget,
+          attributesReqList
+        }
+        this.$post(this.api.submit, data).then(res => {
+            localStorage.removeItem('codeCache')
+            this.isSubmit = true
+            newmain.$emit("isSubmit", this.isSubmit);
+            let list = res.message
+            let result = []
+            let taskList = this.taskList
+            result.map(n => {
+              if(taskList.find(e => e.judgmentPointsId == n.judgmentPointsId).isError){
+                n.score = 0
+                n.right = -1
+              }
+            })
+            this.taskList = result
+            //计算总分
+            var s = 0;
+            this.taskList.forEach(element => {
+              // this.test = element.score;
+              // s += this.test;
+              this.grade = s;
+            });
+          })
+          .catch(err => {})
+      }).catch(() => {
+        this.$message({
+          type: "info",
+          message: "已取消提交"
+        })
+      })
+    },
+    // 实验面板显示隐藏
+    togglePannel() {
+      this.pannelVisible = !this.pannelVisible
+    },
+    // 倒计时
+    timeFormat(param) {
+      return param < 10 ? '0' + param : param
+    },
+    // 清除时间
+    reloadCount() {
+      clearInterval(this.counterTimer)
+      this.countVal = ''
+      this.day = '00'
+      this.seconds = '00'
+      this.minutes = '00'
+      this.hour = '00'
     },
     counterFn(counterTime) {
-      let leave1 = counterTime % (24 * 3600 * 1); //计算天数后剩余的毫秒数
+      let leave1 = counterTime % (24 * 3600) //计算天数后剩余的毫秒数
-      let leave2 = leave1 % (3600 * 1); //计算小时数后剩余的毫秒数
+      let leave2 = leave1 % 3600 //计算小时数后剩余的毫秒数
-      let leave3 = leave2 % (60 * 1); //计算分钟数后剩余的毫秒数
+      let leave3 = leave2 % 60 //计算分钟数后剩余的毫秒数
       let day = Math.floor(counterTime / (24 * 3600 * 1)); //计算相差天数
       let hour = Math.floor(leave1 / (3600 * 1)); //计算相差小时
       let minutes = Math.floor(leave2 / (60 * 1)); //计算相差分钟
@@ -521,18 +450,12 @@ export default {
       this.seconds = seconds;
     },
     // 倒计时
-    startCountFn() {
+    startCount() {
-      if (!this.isStart) { // 未开始倒计时
+      clearInterval(this.counterTimer)
-        this.countVal = this.countVal ? this.countVal : 0;
+      this.countVal = this.countVal ? this.countVal : 0
-        let timer = setInterval(() => {
+      this.counterTimer = setInterval(() => {
-          this.counterFn(this.countVal++);
+        this.counterFn(this.countVal++)
-        }, 1000);
+      }, 1000)
-        this.globalTimer = timer;
-        this.isStart = true;
-      }
-    },
-    passToParent(data) {
-      this.$emit("getDataFromChild", data);
     }
   }
 };
@@ -542,13 +465,13 @@ export default {
 .break-all{
   word-break: break-all;
 }
-.m_step {
+.left-btn {
   height: 150px;
   width: 35px;
   cursor: pointer;
   display: block !important;
 }
-.n_step {
+.right-btn {
   height: 150px;
   width: 35px;
   cursor: pointer;

src/components/codemirror.vue

@@ -90,11 +90,11 @@ import axios from 'axios';
 import util from '@/util'
 const CANCEL_TOKEN = axios.CancelToken // 用于input中中断请求
 export default {
-  props: ["workbench1", "code", "projectId"],
+  props: ['workbench1', 'code', 'codeId', 'projectId'],
   data() {
     return {
-      assessmentId: util.getCookie("assessmentId"), // 考核id
+      assessmentId: util.getCookie(';assessmentId'), // 考核id
-      courseId: util.getCookie("courseId"), // 课程id
+      courseId: util.getCookie('courseId'), // 课程id
       showTips: false, // 显示隐藏提示按钮
       answer: '', // 正确答案
       codeVal: this.code,
@@ -223,10 +223,6 @@ export default {
           }else if(!res.message.isError){
             this.isError = 0
             this.runResult += result
-            newmain.$emit("updateJud",{
-              id: res.data.judgmentPointsId,
-              isError: res.data.isError
-            })
           }
         }).catch(e => {
           if(e && e.message == 'interrupt'){
@@ -301,7 +297,7 @@ export default {
               this.loadIns.close()
               this.picSrc = ''
               if(photo){
-                this.isError = 0
+                this.isError = data.retResult
                 this.runResult = ''
                 this.picSrc = `${photo}?id=${new Date().getTime()}`
               }else{
@@ -323,6 +319,7 @@ export default {
                   this.isError = data.retResult
                   this.runResult = result
                   this.errLine = parseInt(result.substring(result.indexOf("line") + 4, result.length))
+                  this.$emit('update:codeId', res.codeId)
                 }
               }
             }).catch(res => {
@@ -339,13 +336,13 @@ export default {
         })
       }
     },
+    // 获取正式答案
     getTips() {
       this.tipsVisible = true
-      //提示答案
+      this.$get(this.api.queryBcJudgmentByBcId, {
-      this.$get(this.api.QueryAnswer, {
+        bcId: this.workbench1
-        judgmentPointsId: this.workbench1
       }).then(res => {
-        this.answer = res.message
+        this.answer = res.experimentCode
       }).catch(err => {})
     }
   }

src/utils/api.js

@@ -1,13 +1,9 @@
-import config from '@/config'
-let host = `${config.host}`
-
 export default {
-    QueryProject: `${host}occupationlab/projectManage/getProjectDetail`,
+    QueryProject: 'occupationlab/projectManage/getProjectDetail',
-    Submit: `${host}/python/submit`,
+    submit: 'python/python/submit',
-    runPythonCode: `${host}python/python/runPythonCode`,
+    runPythonCode: 'python/python/runPythonCode',
-    QueryAnswer: `${host}/python/queryAnswer`,
+    queryBcJudgmentByBcId: 'judgment/bcJudgmentPoint/queryBcJudgmentByBcId',
-    DeleteCodes: `${host}/python/deleteCodes`,
+    queryTestProject: 'occupationlab/projectManage/getProjectBySystemId',
-    queryTestProject: `${host}occupationlab/projectManage/getProjectBySystemId`,
+    saveCache: 'python/python/saveCache',
-    saveCache: `${host}python/python/saveCache`,
+    getLastCache: 'python/python/getLastCache',
-    getLastCache: `${host}python/python/getLastCache`
 }

src/utils/http.js

@@ -4,26 +4,19 @@ import {
 } from 'element-ui'
 import router from '../router/index'
 import util from '@/util'
+import config from '@/config'
 
-// 环境的切换
+const service = axios.create({
-// if (process.env.NODE_ENV == 'development') {
+    baseURL: config.host,
-//     axios.defaults.baseURL = '/api';
+    timeout: 10000000
-// } else if (process.env.NODE_ENV == 'debug') {
+})
-//     axios.defaults.baseURL = '';
-// } else if (process.env.NODE_ENV == 'production') {
-//     axios.defaults.baseURL = 'http://api.123dailu.com/';
-// }
-
-// 请求超时时间
-axios.defaults.timeout = 30000;
 
 // post请求头
-axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8';
+service.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8';
 // 请求拦截器
-axios.interceptors.request.use(config => {
+service.interceptors.request.use(config => {
     const token = util.getCookie('admin-token')
     if (token) {
-      //  存在将token写入 request header
       config.headers.token = token
     }
     return config;
@@ -38,320 +31,75 @@ axios.interceptors.request.use(config => {
 })
 
 // 响应拦截器
-// axios.interceptors.response.use(
+service.interceptors.response.use(
-//     response => {
+    response => {
-//         consol.log(response.status)
+        const res = response.data;
-//         if (response.status === 200) {
+        if (res.status == 200 || res.status == 10000 || res.status == 30001) {
-//             return Promise.resolve(response);
+            return Promise.resolve(res).catch(e => {});
-//         } else {
+        } else if (!res.status) {
-//             return Promise.reject(response);
+            return Promise.resolve(res).catch(e => {});
-//         }
+        } else {
-//     },
+            Message.error(res.message)
-//     // 服务器状态码不是200的情况
+            return Promise.reject(res)
-//     error => {
+        }
-//         if (error.response.status) {
+    },
-//             switch (error.response.status) {
+    // 服务器状态码不是200的情况
-//                 // 401: 未登录
+    error => {
-//                 // 未登录则跳转登录页面，并携带当前页面的路径
+        if (error.response.status) {
-//                 // 在登录成功后返回当前页面，这一步需要在登录页操作。
+            switch (error.response.status) {
-//                 case 500:
+                // 401: 未登录
-//                     router.replace({
+                case 401:
-//                         path: '/login',
+                    history.back()
-//                         // query: { redirect: router.currentRoute.fullPath }
+                    break;
-//                     });
+                default:
-//                     break;
+                    Message.error(error.response.data.message)
-//                 // 403 token过期
+                    Promise.reject(res);
-//                 // 登录过期对用户进行提示
+            }
-//                 // 清除本地token和清空vuex中token对象
+            return Promise.reject(error.response);
-//                 // 跳转登录页面
+        }
-//                 case 403:
+    }
-//                     // Toast({
+);
-//                     //     message: '登录过期，请重新登录',
-//                     //     duration: 1000,
-//                     //     forbidClick: true
-//                     // });
-//                     // 清除token
-//                     sessionStorage.removeItem('token');
-//                     store.commit('loginSuccess', null);
-//                     // 跳转登录页面，并将要浏览的页面fullPath传过去，登录成功后跳转需要访问的页面
-//                     setTimeout(() => {
-//                         router.replace({
-//                             path: '/login',
-//                             query: {
-//                                 redirect: router.currentRoute.fullPath
-//                             }
-//                         });
-//                     }, 1000);
-//                     break;
-//                 // 404请求不存在
-//                 case 404:
-//                     router.replace({
-//                         path: '/404',
-//                     });
-//                 break;
-//                 // 其他错误，直接抛出错误提示
-//                 default:
-//                 router.replace({
-//                     path: '/500',
-//                 });
-//             }
-//             return Promise.reject(error.response);
-//         }
-//     }
-// );
 
-/**
+function get(url, params) {
- * get方法，对应get请求
- */
-export function get(url, params) {
     return new Promise((resolve, reject) => {
-        axios.get(url, {
+        service.get(url, { params: params }).then(res => {
-                params: params
+            resolve(res);
-            })
+        }).catch(err => {
-            .then(res => {
+            reject(err);
-                if (res.data.status) {
+        });
-                    switch (res.data.status) {
-                        case 200:
-                            resolve(res.data);
-                            break;
-                        case 10000:
-                            resolve(res.data);
-                            break;
-                        case 300:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 500:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 404:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 403:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 401:
-                            Message.error("token失效,请重新登录");
-                            sessionStorage.removeItem('token');
-                            router.replace('/login')
-                            break;
-                        case 405:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 406:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                    }
-                }
-
-            })
-            .catch(err => {
-                reject(err.data)
-                this.$message({
-                    showClose: true,
-                    message: '请求失败，请刷新页面重新进行请求',
-                    type: 'error'
-                });
-            })
     });
 }
-/**
+
- * post方法，对应post请求
+function post(url, params) {
- */
-export function post(url, params) {
     return new Promise((resolve, reject) => {
-        axios.post(url, params)
+        service.post(url, params).then(res => {
-            .then(res => {
+            resolve(res);
-                if (res.data.status) {
+        }).catch(err => {
-                    switch (res.data.status) {
+            reject(err.data);
-                        case 200:
+        });
-                            resolve(res.data);
-                            break;
-                        case 300:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 500:
-                            reject(res.data)
-                            break;
-                        case 404:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 403:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 401:
-                            Message.error("token失效,请重新登录");
-                            sessionStorage.removeItem('token');
-                            router.replace('/login')
-                            break;
-                        case 405:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 406:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                    }
-                }
-            })
-            .catch(err => {
-                reject(err.data)
-                this.$message({
-                    showClose: true,
-                    message: '请求失败，请刷新页面重新进行请求',
-                    type: 'error'
-                });
-            })
     });
 }
 
-/**
+function del(url, params) {
- * delete方法，对应delete请求
- */
-export function del(url, params) {
     return new Promise((resolve, reject) => {
-        axios.delete(url, {
+        service.delete(url, {
-                params: params
+            params
-            })
+        }).then(res => {
-            .then(res => {
+            resolve(res);
-                if (res.data.status) {
+        }).catch(err => {
-                    switch (res.data.status) {
+            reject(err.data);
-                        case 200:
+        });
-                            resolve(res.data);
-                            break;
-                        case 300:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 500:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 404:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            router.replace({
-                                path: '/404',
-                            });
-                            break;
-                        case 403:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 401:
-                            Message.error("token失效,请重新登录");
-                            sessionStorage.removeItem('token');
-                            router.replace('/login')
-                            break;
-                        case 405:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 406:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                    }
-                }
-
-            })
-            .catch(err => {
-                reject(err.data)
-                this.$message({
-                    showClose: true,
-                    message: '请求失败，请刷新页面重新进行请求',
-                    type: 'error'
-                });
-            })
     });
 }
 
-/**
+function put(url, params) {
- * put修改
- * @param {} url 
- * @param {*} params 
- */
-export function put(url, params) {
     return new Promise((resolve, reject) => {
-        axios.put(url, params)
+        service.put(url, params).then(res => {
-            .then(res => {
+            resolve(res);
-                if (res.data.status) {
+        }).catch(err => {
-                    switch (res.data.status) {
+            reject(err.data);
-                        case 200:
+        });
-                            resolve(res.data);
-                            break;
-                        case 300:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 500:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 404:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 403:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 401:
-                            Message.error("token失效,请重新登录");
-                            sessionStorage.removeItem('token');
-                            router.replace('/login')
-                            break;
-                        case 405:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                        case 406:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
-                            break;
-                    }
-                }
-
-            })
-            .catch(err => {
-                reject(err.data)
-                this.$message({
-                    showClose: true,
-                    message: '请求失败，请刷新页面重新进行请求',
-                    type: 'error'
-                });
-            })
     });
-}
+}
+
+export { get, post, del, put }

src/views/Home.vue

@@ -27,7 +27,7 @@
             :projectId.sync="projectId"
             :code.sync="item.code"
             :workbench1="item.judgmentId"
-            :codeid.sync="item.codeId"
+            :codeId.sync="item.codeId"
           ></codemirror>
         </el-tab-pane>
       </el-tabs>
@@ -38,13 +38,7 @@
         @tell="getQueryIndex"
         @recoveryCode="recoveryCode"
         ref="mainindex"
-        :autoStart="autoStart"
-        :sendSync="sendSync"
-        :defaultVal="defaultVal"
-        @getDataFromChild="getDataFromChild"
-        :codeId="codeId"
         :workbench.sync="workbench"
-        :key="codeId"
       ></testPanel>
     </div>
   </div>
@@ -58,23 +52,12 @@ export default {
   data() {
     return {
       courseId: util.getCookie("courseId"), // 课程id
+      assessmentId: util.getCookie("assessmentId"), // 考核id
       projectPermissions: 0, // 项目权限(0、练习 1、考核 2、竞赛)
-      codeId: 0,
+      language: 'Python', // 编程语言
-      language: "Python", // 编程语言
+      curTab: '', // 选中后绑定的对象
-      curTab: "", //选中后绑定的对象
       workbench: [], // 判分点切换列表
-      editableTabs: [],
+      codeKey: 1 // 编辑器索引
-      tabIndex: 2,
-      name: "",
-      judgmentPointsIds: [],
-      autoStart: true,
-      sendSync: true,
-      entryTime: util.formatDate('yyyy-MM-dd hh:mm:ss'),
-      assessmentId: util.getCookie("assessmentId"),
-      defaultVal: sessionStorage.getItem("timer")
-        ? parseInt(sessionStorage.getItem("timer"))
-        : 0,
-      codeKey: 1,
     };
   },
   components: {
@@ -91,28 +74,26 @@ export default {
     // 页面离开的时候保存未提交的代码（只有练习和未提交状态下才会调用该接口）
     leavePage(){
       const list = this.workbench
-      if(!this.$refs.mainindex.isSubmit && !this.assessmentId && list.length){
+      if(!this.$refs.mainindex.isSubmit && !this.assessmentId && list.length && list.some(e => e.code)){
-        if(list.some(e => e.code)){
+        const cache = {
-          const cache = {
+          projectId: this.projectId,
-            projectId: this.projectId,
+          judgmentId: list[this.curTab].judgmentId
-            judgmentId: list[this.curTab].judgmentId
-          }
-          localStorage.setItem('codeCache', JSON.stringify(cache))
-          list.map(e => {
-            if (e.code) {
-              let data = {
-                code: e.code,
-                bcId: e.judgmentId,
-                cid: this.courseId,
-                projectId: this.projectId
-              }
-              this.$post(this.api.saveCache,data).then(res => {}).catch(e => {})
-            }
-          })
         }
+        localStorage.setItem('codeCache', JSON.stringify(cache))
+        list.map(e => {
+          if (e.code) {
+            let data = {
+              code: e.code,
+              bcId: e.judgmentId,
+              cid: this.courseId,
+              projectId: this.projectId
+            }
+            this.$post(this.api.saveCache,data).then(res => {}).catch(e => {})
+          }
+        })
       }
     },
-    // 自动退出
+    // 长时间未点击页面，就自动退出页面
     autoLogout(){
       let lastTime = new Date().getTime()
       let logout = false
@@ -120,6 +101,7 @@ export default {
       document.onmousedown = () => {
         lastTime = new Date().getTime()
       }
+      // 每秒钟判断一次，如果当前时间距离上次点击页面的试卷超过了设置的时间，就退出登录
       setInterval(() => {
         if((new Date().getTime() - lastTime) > this.$config.autoLogoutTime){
             logout || this.$message.error('用户登录过期，请重新登录')
@@ -128,16 +110,10 @@ export default {
         }
       },1000)
     },
-    getDataFromChild(data) {
+    // 重置编辑器
-      sessionStorage.setItem("timer", parseInt(data));
+    recoveryCode(curTab){
-    },
-    recoveryCode(workbench){
-      this.workbench = workbench
-      this.codeKey++
       this.curTab = '0'
-    },
+      this.codeKey++
-    reload(){
-      this.$refs.mainindex.reload()
     },
     // 退出实验
     back() {
@@ -156,14 +132,11 @@ export default {
       }
       this.$refs.mainindex.getClearTime();
     },
-    //工作台展示
+    // 赋值项目id、权限、项目列表
-    getQueryIndex(value1, projectPermissions,workBench) {
+    getQueryIndex(projectId, projectPermissions, workBench) {
-      //父子组件传值
+      this.projectId = projectId
-      console.log(5555,workBench)
-      this.projectId = value1
       this.projectPermissions = projectPermissions
       this.workbench = workBench
-      this.codeKey++
     },
   }
 };