实验报告、登录

src/api/index.js

@@ -46,6 +46,8 @@ export default {
     schoolCourseByAchievement: `nakadai/nakadai/curriculum/schoolCourseByAchievement`, // 获取学校购买订单后的课程
     exportLabReport: `occupationlab/achievement/exportLabReport`,
     exportBankExperimentReport: `occupationlab/achievement/exportBankExperimentReport`,
+    queryBcJudgmentPointByBcId: 'judgment/bcJudgmentPoint/queryBcJudgmentPointByBcId',
+    editExperimentalData: 'occupationlab/experimentalReport/editExperimentalData',
 
     // 考核列表
     pageStuAssessment: `occupationlab/assessment/pageStuAssessment`, // 学生端——学生考核列表

src/pages/account/login/index.vue

@@ -378,11 +378,11 @@ export default {
         // 验证手机号
         verifyPhone(phone) {
           if (!phone) {
-            util.warningMsg("请输入手机号")
+            this.$message.error("请输入手机号")
             return false
           }
           if (!/^1[3456789]\d{9}$/.test(phone) && !/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(phone)) {
-            util.warningMsg("请输入正确的手机号/邮箱")
+            this.$message.error("请输入正确的手机号/邮箱")
             return false
           }
           return true

src/pages/record/list/index.vue

@@ -112,7 +112,6 @@ export default {
                 if (res.data && res.data.length) {
                     this.curriculumList = [...this.curriculumList, ...res.data]
                     this.curriculumId = this.currId || this.curriculumList[0].cid
-                    console.log(22, this.curriculumId)
                 }
             }).catch(err => {
                 console.log(err);

src/pages/record/show/index.vue

@@ -191,28 +191,15 @@ export default {
         quill
     },
     mounted() {
-        this.getData();
+        this.getData()
     },
     methods: {
         getData() { // 查询详情
-            this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(res => {
-                this.form = res.report
-                const list = res.userScores
-                this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
-                let form = this.form
-                form.className = this.className
-                if (this.project) {
-                  list.map(e => {
-                    e.assessmentPoint = ''
-                    e.referenceAnswer = ''
-                    e.answer = ''
-                    e.lcRuleRecords.map((n, i) => {
-                      e.assessmentPoint += `${i + 1}.${n.name}`
-                      e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
-                      e.answer += `${i + 1}.${n.userAnswer}`
-                    })
-                  })
-                }
+            const { reportId } = this
+            this.$get(`${this.api.reportDetail}?reportId=${reportId}`).then(({ report, userScores }) => {
+                this.form = report
+                const form = this.form
+
                 this.infoData = {
                     workNumber: form.workNumber,
                     experimentalClassName: form.experimentalClassName,
@@ -223,11 +210,40 @@ export default {
                     score: form.score,
                     userName: form.userName
                 }
-                this.expData = list
                 form.assessmentId && (this.breadPath = ['实验记录', '实验报告'])
+                const data = report.data
+                // 如果没有data，则添加，否则，直接使用
+                if (!data) {
+                  this.handleList(userScores)
+                  this.$post(this.api.editExperimentalData, {
+                    reportId,
+                    data: JSON.stringify(userScores)
+                  }).then(res => {}).catch(err => {})
+                } else {
+                  this.handleList(JSON.parse(data))
+                }
             }).catch(res => {})
         },
+        // 处理实验数据
+        handleList(list) {
+          this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
+          this.form.className = this.className
+          if (this.project) {
+            list.map(e => {
+              e.assessmentPoint = ''
+              e.referenceAnswer = ''
+              e.answer = ''
+              e.lcRuleRecords.map((n, i) => {
+                e.assessmentPoint += `${i + 1}.${n.name}`
+                e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
+                e.answer += `${i + 1}.${n.userAnswer}`
+              })
+            })
+          }
+          this.expData = list
+        },
         exportPage() {
+          return
           const form = JSON.parse(JSON.stringify(this.form))
           const list = JSON.parse(JSON.stringify(this.expData))
           list.map((e, i) => {

src/pages/station/preview/index.vue

@@ -315,7 +315,6 @@ $height: 700px;
 .video_wid,.cover{
     position: relative;
     width: 76%;
-    max-width: 1400px;
     height: $height !important;
     border: 0;
 }

src/plugins/requests/index.js

@@ -2,6 +2,7 @@ import axios from "axios";
 import util from "@/libs/util";
 import router from "@/router";
 import Setting from "@/setting";
+import { Message } from "element-ui";
 
 const service = axios.create({
     baseURL: Setting.apiBaseURL,
@@ -35,10 +36,16 @@ service.interceptors.response.use(
             return Promise.resolve(res).catch(e => {});
         } else if (!res.status) {
             return Promise.resolve(res).catch(e => {});
+        } else if (res.status === 10008) {
+          Message.error({
+            message: res.message,
+            showClose: true,
+            duration: 1500
+          })
+          return Promise.reject(res)
         } else {
             util.errorMsg(res.message);
             return Promise.reject(res)
-            // return Promise.resolve(res).catch(e => {});
         }
     },
     // 服务器状态码不是200的情况

src/setting.js

@@ -29,7 +29,7 @@ if (isHh) {
     systemPath = `http://www.huorantech.cn/banksystem`
 } else if (isDev) {
     // 本地
-    systemPath = `http://192.168.31.125:8093`
+    systemPath = `http://${location.hostname}:8093/#/`
     // host = "http://39.108.250.202:9000/"; // 中台测试服
     host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.137:9000/"; // 赓