From a8233655098a2366fb2ccabc460fb15907855a3b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 4 Jul 2023 14:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                             |  161 +--
 src/components/case/index.vue           | 1558 ++++++++++++-----------
 src/components/selectBusiness/index.vue |  386 +++---
 src/layouts/header/index.vue            |  152 +--
 src/pages/index/list/index.vue          |  548 ++++----
 src/pages/report/index.vue              |  653 +++++-----
 6 files changed, 1812 insertions(+), 1646 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a27ce58..4411f19 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,84 +1,88 @@
 <template>
-    <div id="app" >
-            <select-business class="selectBusiness" :showIt.sync="showIt" v-show="!showIt && showBusiness" />
-            <router-view></router-view>
-            <vCase :showIt.sync="showIt"></vCase>
-            <tip-dialog class="Z-9999" />
-    </div>
+  <div id="app">
+    <select-business class="selectBusiness"
+                     :showIt.sync="showIt"
+                     v-show="!showIt && showBusiness" />
+    <router-view></router-view>
+    <vCase :showIt.sync="showIt"></vCase>
+    <tip-dialog class="Z-9999" />
+  </div>
 </template>
 <script>
-    import vCase from '@/components/case'
-    import Setting from '@/setting';
-    import util from '@/libs/util';
-    import selectBusiness from '@/components/selectBusiness'
-    import TipDialog from '@/components/tipDialog'
-    import { mapState, mapMutations } from 'vuex'
-    export default {
-        name: 'App',
-        components: {
-                vCase,
-                selectBusiness,
-                TipDialog
-            },
-        created () {
-            //在页面加载时读取localStorage里的状态信息
-            if (util.local.get(Setting.storeKey) ) {
-                this.$store.replaceState(Object.assign({}, this.$store.state,util.local.get(Setting.storeKey)))
-                this.$store.system.replaceState(Object.assign({}, sessionStorage.getItem('systemData')))
-                
-            } 
+import vCase from '@/components/case'
+import Setting from '@/setting';
+import util from '@/libs/util';
+import selectBusiness from '@/components/selectBusiness'
+import TipDialog from '@/components/tipDialog'
+import { mapState, mapMutations } from 'vuex'
+export default {
+  name: 'App',
+  components: {
+    vCase,
+    selectBusiness,
+    TipDialog
+  },
+  created () {
+    //在页面加载时读取localStorage里的状态信息
+    if (util.local.get(Setting.storeKey)) {
+      this.$store.replaceState(Object.assign({}, this.$store.state, util.local.get(Setting.storeKey)))
+      this.$store.system.replaceState(Object.assign({}, sessionStorage.getItem('systemData')))
 
-            //在页面刷新时将vuex里的信息保存到localStorage里
-            window.addEventListener("beforeunload",()=>{
-                if(this.$route.fullPath.includes('/counter/list/manage')) {
-                    sessionStorage.setItem('computerPath', this.$route.fullPath)
-                }
-                
-                util.local.get(Setting.tokenKey) && util.local.set(Setting.storeKey,this.$store.state)
-                sessionStorage.setItem('systemData', this.$store.system.state)
-            })                                                                                      
-        },
-        data() {
-            return {
-                showIt: true,
-                showSelect: false
-            }
-        },
-        methods: {
-            ...mapMutations({
-                setShowBusiness: 'system/setShowBusiness',
-                setTipsOperate: 'system/setTipsOperate'
-            }),
-        },
-        watch: {
-            showIt: {
-                handler(newVal) {
-                    if(!newVal && !this.businessKey) {
-                        this.setShowBusiness(true)
-                    }else {
-                        if(!newVal) {
-                            // 如果未选择业务，则关闭后继续弹出弹框
-                            if(!this.businessKey) {
-                                this.$nextTick(() => { this.setShowBusiness(true) })
-                            }else {
-                                // this.setTipsOperate('您正在进行' + this.businessKey + ',加油！');
-                            }
-                        }else {
-                            this.$nextTick(() => { this.setShowBusiness(false) })
-                        }
-                    }
-                },
-                immediate: true
+    }
+
+    //在页面刷新时将vuex里的信息保存到localStorage里
+    window.addEventListener("beforeunload", () => {
+      if (this.$route.fullPath.includes('/counter/list/manage')) {
+        sessionStorage.setItem('computerPath', this.$route.fullPath)
+      }
+
+      util.local.get(Setting.tokenKey) && util.local.set(Setting.storeKey, this.$store.state)
+      sessionStorage.setItem('systemData', this.$store.system.state)
+    })
+  },
+  data () {
+    return {
+      showIt: true,
+      showSelect: false
+    }
+  },
+  methods: {
+    ...mapMutations({
+      setShowBusiness: 'system/setShowBusiness',
+      setTipsOperate: 'system/setTipsOperate'
+    }),
+  },
+  watch: {
+    showIt: {
+      handler (newVal) { 
+        console.log("🚀 ~ file: App.vue:58 ~ handler ~ newVal:", newVal, this.businessKey, sessionStorage.getItem('submited'))
+        if (!newVal && !this.businessKey && !sessionStorage.getItem('submited')) {
+          this.setShowBusiness(true)
+        } else {
+          if (!newVal) {
+            // 如果未选择业务，则关闭后继续弹出弹框
+            if (!this.businessKey && !sessionStorage.getItem('submited')) {
+              console.log("🚀 ~ file: App.vue:65 ~ handler ~ submited:", sessionStorage.getItem('submited'))
+              this.$nextTick(() => { this.setShowBusiness(true) })
+            } else {
+              // this.setTipsOperate('您正在进行' + this.businessKey + ',加油！');
             }
-        },
-        computed: {
-            ...mapState({
-                businessKey: state => state.system.businessKey,
-                showBusiness: state => state.system.showBusiness,
-                businessKey: state => state.system.businessKey
-            })
-        },
+          } else {
+            this.$nextTick(() => { this.setShowBusiness(false) })
+          }
+        }
+      },
+      immediate: true
     }
+  },
+  computed: {
+    ...mapState({
+      businessKey: state => state.system.businessKey,
+      showBusiness: state => state.system.showBusiness,
+      businessKey: state => state.system.businessKey
+    })
+  },
+}
 </script>
 
 <style lang="scss" scoped>
@@ -91,11 +95,12 @@
     height: 100%;
 }
 
-.fade-enter-active, .fade-leave-active {
-  transition: opacity .5s;
+.fade-enter-active,
+.fade-leave-active {
+    transition: opacity 0.5s;
 }
 .fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
-  opacity: 0;
+    opacity: 0;
 }
 
 .Z-9999 {
diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index fd4f5a2..791c2b2 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -1,24 +1,29 @@
 <template>
   <div>
     <!-- <transition name="slide-fade" enter-active-class="animate__animated animate__bounceInLeft" leave-active-class=" animate__animated animate__bounceOutLeft"> -->
-            
+
     <el-container v-show="showIt">
       <el-header>
         <div class="flex a-center j-between">
-          <div class="flex a-center" style="width: 28%">
+          <div class="flex a-center"
+               style="width: 28%">
             <p>实训项目</p>
-            <el-select v-model.trim="projectId" placeholder="请选择" class="select" :disabled="projectPermissions != 0" @change="selectProject">
-              <el-option
-                v-for="item in topicList"
-                :key="item.projectId"
-                :label="item.projectName"
-                :value="item.projectId"
-              ></el-option>
+            <el-select v-model.trim="projectId"
+                       placeholder="请选择"
+                       class="select"
+                       :disabled="projectPermissions != 0"
+                       @change="selectProject">
+              <el-option v-for="item in topicList"
+                         :key="item.projectId"
+                         :label="item.projectName"
+                         :value="item.projectId"></el-option>
             </el-select>
           </div>
           <div class="countDownBox">
             <div style="margin-left: -40px;">
-              <div :sendSync="sendSync" :autoStart="autoStart" :defaultVal="defaultVal">
+              <div :sendSync="sendSync"
+                   :autoStart="autoStart"
+                   :defaultVal="defaultVal">
                 实训{{text}}时间
                 <span class="timeSpan">{{day}}</span>天
                 <span class="timeSpan">{{hour}}</span>小时
@@ -34,19 +39,25 @@
             </div>
           </div>
           <div>
-            <!-- <el-button @click="toReport" v-if="popContainer">查看实验报告</el-button> -->
-            <el-button style="background: #202020;color: #d0d0d0;font-size:16px;" v-show="projectPermissions == 0"
-                       @click="reload" :disabled="popContainer && (assessmentId!='' && assessmentId!='null' && assessmentId!=null)">
-                重新开始
+            <el-button @click="toReport"
+                       v-if="popContainer">查看实验报告</el-button>
+            <el-button style="background: #202020;color: #d0d0d0;font-size:16px;"
+                       v-show="projectPermissions == 0"
+                       @click="reload"
+                       :disabled="popContainer && (assessmentId!='' && assessmentId!='null' && assessmentId!=null)">
+              重新开始
             </el-button>
-            <el-button class="submit-btn" style="margin-right:7px" @click="Submit()" :disabled="popContainer || requires.length == 0">提交</el-button>
+            <el-button class="submit-btn"
+                       style="margin-right:7px"
+                       @click="Submit()"
+                       :disabled="popContainer || requires.length == 0">提交</el-button>
           </div>
         </div>
       </el-header>
 
-      
       <el-container>
-        <el-aside width="30%" class="flex flex-col">
+        <el-aside width="30%"
+                  class="flex flex-col">
           <div class="aside-header">
             <div class="header_h flex a-center">
               <i class="el-icon-s-order"></i>
@@ -54,7 +65,9 @@
             </div>
             <div class="font_css">
               <div class="experimentalGoal">
-                <div class="break-all" v-html="projectManage.experimentTarget" style="font-size: 0.875rem;">
+                <div class="break-all"
+                     v-html="projectManage.experimentTarget"
+                     style="font-size: 0.875rem;">
                 </div>
               </div>
             </div>
@@ -68,27 +81,37 @@
               <el-row>
                 <el-col :span="24">
                   <el-card shadow="hover">
-                    <el-table :data="requires" height="43.5vh" v-loading="loading" ref='testTable'>
+                    <el-table :data="requires"
+                              height="43.5vh"
+                              v-loading="loading"
+                              ref='testTable'>
                       <el-table-column type="index"></el-table-column>
-                      <el-table-column prop="name" label="判分点" align="left">
+                      <el-table-column prop="name"
+                                       label="判分点"
+                                       align="left">
                       </el-table-column>
-                      <el-table-column prop="score" label="分值" width="60" align="center">
+                      <el-table-column prop="score"
+                                       label="分值"
+                                       width="60"
+                                       align="center">
                       </el-table-column>
-                      <el-table-column prop="right" label="完成结果" width="80" align="center">
+                      <el-table-column prop="right"
+                                       label="完成结果"
+                                       width="80"
+                                       align="center">
                         <template slot-scope="scope">
-                          <i
-                            v-if="scope.row.right==true"
-                            class="el-icon-check"
-                            style="color:green;"
-                          ></i>
-                          <i
-                            v-else-if="scope.row.right==false"
-                            class="el-icon-close"
-                            style="color:red;"
-                          ></i>
+                          <i v-if="scope.row.right==true"
+                             class="el-icon-check"
+                             style="color:green;"></i>
+                          <i v-else-if="scope.row.right==false"
+                             class="el-icon-close"
+                             style="color:red;"></i>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="scores" label="得分" width="60" align="center"></el-table-column>
+                      <el-table-column prop="scores"
+                                       label="得分"
+                                       width="60"
+                                       align="center"></el-table-column>
                     </el-table>
                   </el-card>
                 </el-col>
@@ -97,24 +120,36 @@
           </div>
         </el-aside>
         <el-main>
-          <el-tabs v-model.trim="activeName" type="card">
-            <el-tab-pane label="案例" name="first">
-              <div class="break-all" v-html="projectManage.experimentDescription"></div>
+          <el-tabs v-model.trim="activeName"
+                   type="card">
+            <el-tab-pane label="案例"
+                         name="first">
+              <div class="break-all"
+                   v-html="projectManage.experimentDescription"></div>
             </el-tab-pane>
-            <el-tab-pane label="实验要求" name="second">
-              <el-collapse :value="activeNames" accordion >
-                <el-collapse-item  v-for="(item,index) in requires" :key="index" :name="item.id">
-                    <template slot="title" style='line-height: 0px;'>
-                        <i class='el-icon-s-ticket'></i> 
-                        <span style="margin: 0px 10px;font-size: 1rem;">{{ item.name }}</span>
-                    </template>
-                   <div class="break-all" v-html="item.experimentalRequirements"></div>
+            <el-tab-pane label="实验要求"
+                         name="second">
+              <el-collapse :value="activeNames"
+                           accordion>
+                <el-collapse-item v-for="(item,index) in requires"
+                                  :key="index"
+                                  :name="item.id">
+                  <template slot="title"
+                            style='line-height: 0px;'>
+                    <i class='el-icon-s-ticket'></i>
+                    <span style="margin: 0px 10px;font-size: 1rem;">{{ item.name }}</span>
+                  </template>
+                  <div class="break-all"
+                       v-html="item.experimentalRequirements"></div>
                 </el-collapse-item>
                 <!-- <p ref="scrollTag" style="font-size:16px;"></p> -->
               </el-collapse>
             </el-tab-pane>
-            <el-tab-pane label="实验提示" name="fifth" v-if="hintOpen == 0">
-              <div class="break-all" v-html="projectManage.experimentHint"></div>
+            <el-tab-pane label="实验提示"
+                         name="fifth"
+                         v-if="hintOpen == 0">
+              <div class="break-all"
+                   v-html="projectManage.experimentHint"></div>
             </el-tab-pane>
           </el-tabs>
         </el-main>
@@ -122,33 +157,39 @@
     </el-container>
     <!-- </transition> -->
     <!-- </div> -->
-    <div class="panel" :class="{active: showIt}">
+    <div class="panel"
+         :class="{active: showIt}">
       <div @click="toggleCase">
-        <img src="../../assets/img/case/left.png" alt v-if="showIt" />
-        <img src="../../assets/img/case/right.png" alt v-else />
+        <img src="../../assets/img/case/left.png"
+             alt
+             v-if="showIt" />
+        <img src="../../assets/img/case/right.png"
+             alt
+             v-else />
       </div>
     </div>
 
-    <div class='popContainer' v-if='popContainer'></div>
-
+    <div class='popContainer'
+         v-if='popContainer'></div>
 
     <!-- 遮罩层 -->
-    <div class="absolute z-50 h-screen bg-transparent inset-0" v-show="showIt"></div> 
+    <div class="absolute z-50 h-screen bg-transparent inset-0"
+         v-show="showIt"></div>
 
-    <el-dialog
-      title="提示"
-      :visible.sync="closePaneJudge"
-      width="30%"
-      center>
+    <el-dialog title="提示"
+               :visible.sync="closePaneJudge"
+               width="30%"
+               center>
       <h4 class="antialiased text-center text-2xl">请选择你将进行的操作</h4>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="closePane()">再试一次</el-button>
         <!-- <el-button type="primary" @click="closePane(true)">其他业务</el-button> -->
       </span>
     </el-dialog>
-    
+
   </div>
-  
+
 </template>
 
 <script>
@@ -156,7 +197,7 @@ import Cookie from 'js-cookie'
 import util from '@/libs/util'
 import Setting from '@/setting'
 // 引入封装好的接口
-import {getProjectBySystemId,getProjectDetail,submit,getQueryCache,deleteCache,checkTest,checkTest2} from "@/api/http.js";
+import { getProjectBySystemId, getProjectDetail, submit, getQueryCache, deleteCache, checkTest, checkTest2 } from "@/api/http.js";
 import { mapMutations } from 'vuex'
 import { async } from 'q';
 export default {
@@ -182,7 +223,7 @@ export default {
       required: true
     }
   },
-  data() {
+  data () {
     return {
       closePaneJudge: false,
       lockIt: false,
@@ -210,7 +251,7 @@ export default {
       actEndTime: "", //倒计时结束时间
       projectId: "" || sessionStorage.getItem('projectId'), //选中后绑定的对象
       value: [
-        {projectName:'项目1',projectId:1}
+        { projectName: '项目1', projectId: 1 }
       ],
       experimentalGoal: "", //实验目标
       caseDescription: "", //案例描述
@@ -223,9 +264,8 @@ export default {
       schoolId: '',
       studentId: "",
       courseId: "",
-      // projectId: "",
       assessmentId: "",
-        classId:'',
+      classId: '',
       projectPermissions: 0, //项目权限(0、练习 1、考核 2、竞赛)
       competitionId: '',
       stageId: '',
@@ -236,53 +276,53 @@ export default {
       stopTime: '',
       isSelected: false,
       userId: '',
-        hintOpen: 0,
-      topicList:[],
-      projectManage:{},
-      requires:[],
-      projectName:'',
-      loading:false,
-      sss:1,
-      popContainer:false,
-      timestamp:'',
+      hintOpen: 0,
+      topicList: [],
+      projectManage: {},
+      requires: [],
+      projectName: '',
+      loading: false,
+      sss: 1,
+      popContainer: false,
+      timestamp: '',
       curSystemId: '',
       reportId: '',
       submitType: false
     }
   },
-  created() {
+  created () {
     let assessmentId = this.getQueryVariable('assessmentId')
-    sessionStorage.setItem('assessmentId',assessmentId)
+    sessionStorage.setItem('assessmentId', assessmentId)
     this.assessmentId = assessmentId
-    if(assessmentId == '' || assessmentId == null || assessmentId == 'null') {
+    if (assessmentId == '' || assessmentId == null || assessmentId == 'null') {
 
-    }else {
-        this.intervalJudge = setInterval(() => {
-            const data = {
-                id: parseInt(sessionStorage.getItem('assessmentId')),
-            }
-            checkTest(data).then(data => {
-                const { data: { data: { status } } } = data
-                if(status !== 1) {
-                    this.popContainer = true
-                    clearInterval(this.intervalJudge)
-                    this.$alert('考试已结束，已自动为您提交。', '提示', {
-                        confirmButtonText: '确定',
-                        type: 'warning',
-                        center: true
-                    });
-                    // 提交
-                    this.sureSubmit(true)
-                }else {
-                }
-            })
-        }, 4000)
+    } else {
+      this.intervalJudge = setInterval(() => {
+        const data = {
+          id: parseInt(sessionStorage.getItem('assessmentId')),
+        }
+        checkTest(data).then(data => {
+          const { data: { data: { status } } } = data
+          if (status !== 1) {
+            this.popContainer = true
+            clearInterval(this.intervalJudge)
+            this.$alert('考试已结束，已自动为您提交。', '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              center: true
+            });
+            // 提交
+            this.sureSubmit(true)
+          } else {
+          }
+        })
+      }, 4000)
     }
   },
   watch: {
     countVal: {
       deep: true,
-      handler: function(val, oldVal) {
+      handler: function (val, oldVal) {
         let vm = this;
         if (vm.needSendSunc) {
           vm.passToParent(val);
@@ -291,7 +331,7 @@ export default {
     },
     needSendSunc: {
       deep: true,
-      handler: function(val) {
+      handler: function (val) {
         let vm = this;
         if (val) {
           vm.passToParent(vm.countString);
@@ -304,97 +344,86 @@ export default {
     //   }
     // }
   },
-  
+
   computed: {
-    needSendSunc: function() {
+    needSendSunc: function () {
       return this.sendSync;
     },
     // 倒计时
-    second: function() {
+    second: function () {
       return this.num(this.seconds);
     },
-    minute: function() {
+    minute: function () {
       return this.num(this.minutes);
     },
-    activeNames() {
+    activeNames () {
       // 默认展开所有
       return this.requires.map(item => item.id)
     },
   },
-  mounted() {
-      // let token = this.getQueryVariable('token')
-      // let cid = this.getQueryVariable('cid')
-      // let systemId = this.getQueryVariable('systemId')
-      // let projectId = this.getQueryVariable('projectId')
-      // let assessmentId = this.getQueryVariable('assessmentId')
-      // let competitionId = this.getQueryVariable('competitionId')
-      // let stageId = this.getQueryVariable('stageId')
-      // let teamId = this.getQueryVariable('teamId')
-      // let classId = this.getQueryVariable('classId')
-      // let stopTime = this.getQueryVariable('stopTime')
-      let token = sessionStorage.getItem('token') ||  this.getQueryVariable('token')
-      let cid = sessionStorage.getItem('cid') || this.getQueryVariable('cid')
-      let systemId = sessionStorage.getItem('systemId') || this.getQueryVariable('systemId')
-      let projectId
-      if (sessionStorage.getItem('projectId')) {
-        projectId = sessionStorage.getItem('projectId')
-      }else {
-        projectId = this.getQueryVariable('projectId')
-      }
-      console.log(projectId)
-      let assessmentId = sessionStorage.getItem('assessmentId') || this.getQueryVariable('assessmentId')
-      let competitionId = sessionStorage.getItem('competitionId') || this.getQueryVariable('competitionId')
-      let stageId = sessionStorage.getItem('stageId') || this.getQueryVariable('stageId')
-      let teamId = sessionStorage.getItem('teamId') || this.getQueryVariable('teamId')
-      let classId = sessionStorage.getItem('classId') || this.getQueryVariable('classId')
-      let stopTime = sessionStorage.getItem('stopTime') || this.getQueryVariable('stopTime')
-      let timestamp = +stopTime;
-      if (timestamp != null){
-      }else{
-          sessionStorage.setItem('timestamp', null)
-      }
-      if (token != null){
-          sessionStorage.setItem('token', token)
-          sessionStorage.setItem('cid', cid)
-          sessionStorage.setItem('systemId', systemId)
-          sessionStorage.setItem('timestamp', timestamp)
-          sessionStorage.setItem('projectId', projectId)
-          sessionStorage.setItem('assessmentId', assessmentId)
-          sessionStorage.setItem('competitionId', competitionId)
-          sessionStorage.setItem('stageId', stageId)
-          sessionStorage.setItem('teamId', teamId)
-          sessionStorage.setItem('classId', classId)
-          this.assessmentId = assessmentId
-          this.competitionId = JSON.parse(competitionId)
-          this.stageId = stageId
-          this.teamId = teamId
-          this.classId = classId
+  mounted () {
+    let token = sessionStorage.getItem('token') || this.getQueryVariable('token')
+    let cid = sessionStorage.getItem('cid') || this.getQueryVariable('cid')
+    let systemId = sessionStorage.getItem('systemId') || this.getQueryVariable('systemId')
+    let projectId
+    if (sessionStorage.getItem('projectId')) {
+      projectId = sessionStorage.getItem('projectId')
+    } else {
+      projectId = this.getQueryVariable('projectId')
+    }
+    console.log('mounted', projectId)
+    let assessmentId = sessionStorage.getItem('assessmentId') || this.getQueryVariable('assessmentId')
+    let competitionId = sessionStorage.getItem('competitionId') || this.getQueryVariable('competitionId')
+    let stageId = sessionStorage.getItem('stageId') || this.getQueryVariable('stageId')
+    let teamId = sessionStorage.getItem('teamId') || this.getQueryVariable('teamId')
+    let classId = sessionStorage.getItem('classId') || this.getQueryVariable('classId')
+    let stopTime = sessionStorage.getItem('stopTime') || this.getQueryVariable('stopTime')
+    let timestamp = +stopTime;
+    if (timestamp != null) {
+    } else {
+      sessionStorage.setItem('timestamp', null)
+    }
+    if (token != null) {
+      sessionStorage.setItem('token', token)
+      sessionStorage.setItem('cid', cid)
+      sessionStorage.setItem('systemId', systemId)
+      sessionStorage.setItem('timestamp', timestamp)
+      sessionStorage.setItem('projectId', projectId)
+      sessionStorage.setItem('assessmentId', assessmentId)
+      sessionStorage.setItem('competitionId', competitionId)
+      sessionStorage.setItem('stageId', stageId)
+      sessionStorage.setItem('teamId', teamId)
+      sessionStorage.setItem('classId', classId)
+      this.assessmentId = assessmentId
+      this.competitionId = JSON.parse(competitionId)
+      this.stageId = stageId
+      this.teamId = teamId
+      this.classId = classId
+    }
+    let tokens = sessionStorage.getItem('token')
+    if (tokens || token) {
+      this.projectPermissions = this.assessmentId ?
+        1 :
+        this.competitionId ?
+          2 :
+          0
+      this.assessmentId && this.projectId && this.checkVer()
+      this.codeId && this.codeIds.push(this.codeId)
+      if (JSON.parse(assessmentId != null && assessmentId != '' && assessmentId != 'null' || this.competitionId)) {
+        this.selectProjects({
+          projectId
+        })
+      } else {
+        this.getData()
       }
-      let tokens = sessionStorage.getItem('token')
-        if(tokens || token){
-            this.projectPermissions = this.assessmentId ?
-              1 :
-              this.competitionId ?
-                2 :
-                0 
-            this.assessmentId && this.projectId && this.checkVer()
-            this.codeId && this.codeIds.push(this.codeId)
-            if (JSON.parse(assessmentId !=null && assessmentId != '' && assessmentId !='null' || this.competitionId)){
-                let params = {
-                    "projectId":projectId,
-                }
-                this.selectProjects(params)
-            }else{
-                this.getData()
-            }
-        }
+    }
   },
   methods: {
     ...mapMutations({
       initState: 'system/initState',
       setShowBusiness: 'system/setShowBusiness',
     }),
-    clearStore() {
+    clearStore () {
       // // 清空缓存
       let token = sessionStorage.getItem('token')
       let cid = sessionStorage.getItem('cid')
@@ -404,211 +433,212 @@ export default {
       let classId = sessionStorage.getItem('classId')
       let timestamp = sessionStorage.getItem('timestamp')
       let startTime = sessionStorage.getItem('startTime')
+
       const storeProjectId = sessionStorage.getItem('storeProjectId')
       sessionStorage.clear()
       sessionStorage.setItem('token', token)
       sessionStorage.setItem('cid', cid)
       sessionStorage.setItem('systemId', systemId)
       sessionStorage.setItem('projectId', projectId)
-      if(assessmentId) {
+      if (assessmentId) {
         sessionStorage.setItem('assessmentId', assessmentId)
       }
-      if(classId) {
+      if (classId) {
         sessionStorage.setItem('classId', classId)
       }
-      if(timestamp) {
+      if (timestamp) {
         sessionStorage.setItem('timestamp', timestamp)
       }
-      if(startTime) {
+      if (startTime) {
         sessionStorage.setItem('startTime', startTime)
       }
-      if(storeProjectId) {
+      if (storeProjectId) {
         sessionStorage.setItem('storeProjectId', storeProjectId)
       }
-      
-      
+
+
       // 初始化vuex中的state
       this.initState();
     },
-    closePane(judge = false){
+    closePane (judge = false) {
       this.closePaneJudge = false
       // this.lockIt = false
       this.reload()
-      if(judge) {
+      if (judge) {
         this.toggleCase()
       }
     },
-    getQueryVariable(name) {
-        var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)')
-        if(window.location.href.split('?')[1]){
-            var r = window.location.href.split('?')[1].match(reg)
-            if (r != null){
-                return (r[2])
-            }else{
-                return null
-            }
+    getQueryVariable (name) {
+      var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)')
+      if (window.location.href.split('?')[1]) {
+        var r = window.location.href.split('?')[1].match(reg)
+        if (r != null) {
+          return (r[2])
+        } else {
+          return null
         }
-        // if(sessionStorage.getItem(name)) {
-        //   return sessionStorage.getItem(name)
-        // }else {
-        //   var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)')
-        //   if(window.location.href.split('?')[1]){
-        //       var r = window.location.href.split('?')[1].match(reg)
-        //       if (r != null){
-        //           return (r[2])
-        //       }else{
-        //           return null
-        //       }
-        //   }
-        // }
-        
+      }
+      // if(sessionStorage.getItem(name)) {
+      //   return sessionStorage.getItem(name)
+      // }else {
+      //   var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)')
+      //   if(window.location.href.split('?')[1]){
+      //       var r = window.location.href.split('?')[1].match(reg)
+      //       if (r != null){
+      //           return (r[2])
+      //       }else{
+      //           return null
+      //       }
+      //   }
+      // }
+
     },
     //获取项目列表
-    getData(){
+    getData () {
       let params = {
-          "systemId":sessionStorage.getItem('systemId'),
-          "cId":sessionStorage.getItem('cid'),
-          "permissions":0,
+        "systemId": sessionStorage.getItem('systemId'),
+        "cId": sessionStorage.getItem('cid'),
+        "permissions": 0,
       }
-      getProjectBySystemId(params).then((data)=>{
-        if(data.status == 200){
-            // this.getQueryCaches()
-            //获取当前时间
-            this.getBeginTime()
-            this.topicList = []
-            
-            for (var i=0;i<data.data.projects.length;i++){
-                if (data.data.projects[i].projectId){
-                    this.topicList.push(data.data.projects[i])
-                    
-                }
-                
+      getProjectBySystemId(params).then((data) => {
+        if (data.status == 200) {
+          // this.getQueryCaches()
+          //获取当前时间
+          this.getBeginTime()
+          this.topicList = []
+
+          for (var i = 0; i < data.data.projects.length; i++) {
+            if (data.data.projects[i].projectId) {
+              this.topicList.push(data.data.projects[i])
+
             }
-            console.log('---this.topicList')
-                    console.log(this.topicList)
-            if(this.topicList.length > 0){
-                const storeProjectId = sessionStorage.getItem('storeProjectId') || this.$route.query.projectId
-                if(storeProjectId) {
-                  this.selectProjects({
-                    projectId: storeProjectId
-                  })
-                }else {
-                  this.selectProjects({
-                    projectId: this.topicList[0].projectId
-                  })
-                }
-                this.gotuQueryVariable()
-                 // 加的
+
+          }
+          console.log('---this.topicList')
+          console.log(this.topicList)
+          if (this.topicList.length > 0) {
+            const storeProjectId = sessionStorage.getItem('storeProjectId') || this.$route.query.projectId
+            if (storeProjectId) {
+              this.selectProjects({
+                projectId: storeProjectId
+              })
+            } else {
+              this.selectProjects({
+                projectId: this.topicList[0].projectId
+              })
             }
-            this.getQueryCaches()
+            this.gotuQueryVariable()
+            // 加的
+          }
+          this.getQueryCaches()
         }
-      }).catch((error)=>{
+      }).catch((error) => {
       })
     },
-      getBeginTime(){
-          let dates = new Date().getTime();
-          let date = new Date(dates)
-          let y = date.getFullYear();
-          let MM = date.getMonth() + 1;
-          MM = MM < 10 ? ('0' + MM) : MM;
-          let d = date.getDate();
-          d = d < 10 ? ('0' + d) : d;
-          let h = date.getHours();
-          h = h < 10 ? ('0' + h) : h;
-          let m = date.getMinutes();
-          m = m < 10 ? ('0' + m) : m;
-          let s = date.getSeconds();
-          s = s < 10 ? ('0' + s) : s;
-          this.startTime = y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
-          sessionStorage.setItem('startTime', this.startTime)
-      },
-      getQueryCaches(){
-          getQueryCache(params).then((data)=>{
-              if(data.data.status == 200){
-                  this.$confirm('有项目未做完,是否回到未做完的项目?', '提示', {
-                      center: true,
-                      confirmButtonText: '确定',
-                      cancelButtonText: '取消',
-                      type: 'warning'
-                  }).then(() => {
-                      this.$message({
-                          type: 'success',
-                          message: '切换成功!'
-                      });
-                      this.projectId=data.data.projectId
-                      let params = {
-                          "projectId":data.data.projectId,
-                      }
-                      sessionStorage.setItem('projectId', data.data.projectId)
-                      this.selectProjects(params)
-                  }).catch(() => {
-                      deleteCache().then((data)=>{
-                          this.$message({
-                              type: 'info',
-                              message: '已取消'
-                          });
-                      }).catch(() => {
-                      })
-                      this.gotuQueryVariable()
-                  });
-              }else{
-                  this.gotuQueryVariable()
-              }
-          }).catch((error)=>{
-              this.gotuQueryVariable()
-          })
-      },
-      gotuQueryVariable(){
-          let projectId = sessionStorage.getItem('projectId') ||  this.getQueryVariable('projectId')
-          if(projectId){
-              this.projectId = projectId
-          }else{
-              const storeProjectId = sessionStorage.getItem('storeProjectId')
-              if(storeProjectId) {
-                this.projectId = storeProjectId;
-              }else {
-                this.projectId = this.topicList[0].projectId;
-              }
-          }
-          sessionStorage.setItem('projectId', this.projectId)
-          let params = {
-              "projectId":this.projectId,
+    getBeginTime () {
+      let dates = new Date().getTime();
+      let date = new Date(dates)
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? ('0' + MM) : MM;
+      let d = date.getDate();
+      d = d < 10 ? ('0' + d) : d;
+      let h = date.getHours();
+      h = h < 10 ? ('0' + h) : h;
+      let m = date.getMinutes();
+      m = m < 10 ? ('0' + m) : m;
+      let s = date.getSeconds();
+      s = s < 10 ? ('0' + s) : s;
+      this.startTime = y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
+      sessionStorage.setItem('startTime', this.startTime)
+    },
+    getQueryCaches () {
+      getQueryCache(params).then((data) => {
+        if (data.data.status == 200) {
+          this.$confirm('有项目未做完,是否回到未做完的项目?', '提示', {
+            center: true,
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.$message({
+              type: 'success',
+              message: '切换成功!'
+            });
+            this.projectId = data.data.projectId
+            let params = {
+              "projectId": data.data.projectId,
+            }
+            sessionStorage.setItem('projectId', data.data.projectId)
+            this.selectProjects(params)
+          }).catch(() => {
+            deleteCache().then((data) => {
+              this.$message({
+                type: 'info',
+                message: '已取消'
+              });
+            }).catch(() => {
+            })
+            this.gotuQueryVariable()
+          });
+        } else {
+          this.gotuQueryVariable()
+        }
+      }).catch((error) => {
+        this.gotuQueryVariable()
+      })
+    },
+    gotuQueryVariable () {
+      let projectId = sessionStorage.getItem('projectId') || this.getQueryVariable('projectId')
+      if (projectId) {
+        this.projectId = projectId
+      } else {
+        const storeProjectId = sessionStorage.getItem('storeProjectId')
+        if (storeProjectId) {
+          this.projectId = storeProjectId;
+        } else {
+          this.projectId = this.topicList[0].projectId;
+        }
+      }
+      sessionStorage.setItem('projectId', this.projectId)
+      let params = {
+        "projectId": this.projectId,
+      }
+      this.selectProjects(params)
+    },
+    selectProjects (params) {
+      getProjectDetail(params).then((data) => {
+        if (data.status == 200) {
+          this.globalTimer = "";
+          let stopTime = sessionStorage.getItem('timestamp')
+          let timestamp = +stopTime;
+          this.countVal = timestamp;
+          this.sss = 1;
+          this.hintOpen = data.data.projectManage.hintOpen;
+          this.countDown(timestamp);
+          this.curSystemId = data.data.projectManage.systemId
+          let assessmentId = this.getQueryVariable('assessmentId')
+          if (assessmentId != null && assessmentId != '' && assessmentId != 'null') {
+            //获取当前时间
+            this.getBeginTime()
+            this.topicList = [data.data.projectManage];
+            this.projectId = +params.projectId
+            this.projectName = data.data.projectManage.projectName
+            this.projectId = data.data.projectManage.projectId;
+            this.projectManage = data.data.projectManage;
+            this.requires = data.data.projectJudgmentVos;
+          } else {
+            this.projectName = data.data.projectManage.projectName
+            this.projectId = data.data.projectManage.projectId;
+            this.projectManage = data.data.projectManage;
+            this.requires = data.data.projectJudgmentVos;
           }
-          this.selectProjects(params)
-      },
-      selectProjects(params){
-          getProjectDetail(params).then((data)=>{
-              if(data.status == 200){
-                  this.globalTimer = "";
-                  let stopTime = sessionStorage.getItem('timestamp')
-                  let timestamp = +stopTime;
-                  this.countVal = timestamp;
-                  this.sss = 1;
-                  this.hintOpen = data.data.projectManage.hintOpen;
-                  this.countDown(timestamp);
-                  this.curSystemId = data.data.projectManage.systemId
-                  let assessmentId = this.getQueryVariable('assessmentId')
-                  if(assessmentId != null && assessmentId != '' && assessmentId != 'null'){
-                      //获取当前时间
-                      this.getBeginTime()
-                      this.topicList = [data.data.projectManage];
-                      this.projectId = +params.projectId
-                      this.projectName = data.data.projectManage.projectName
-                      this.projectId = data.data.projectManage.projectId;
-                      this.projectManage = data.data.projectManage;
-                      this.requires = data.data.projectJudgmentVos;
-                  }else{
-                      this.projectName = data.data.projectManage.projectName
-                      this.projectId = data.data.projectManage.projectId;
-                      this.projectManage = data.data.projectManage;
-                      this.requires = data.data.projectJudgmentVos;
-                  }
-              }
-          }).catch((error)=>{
-          })
-      },
+        }
+      }).catch((error) => {
+      })
+    },
     //选择好题目
-    selectProject(){
+    selectProject () {
       this.lockIt = false
       this.submitType = false
       this.$router.push('/index/list')
@@ -618,7 +648,7 @@ export default {
       })
 
       let params = {
-          "projectId":this.projectId,
+        "projectId": this.projectId,
       }
       sessionStorage.setItem('storeProjectId', this.projectId)
       let formList = []
@@ -626,8 +656,9 @@ export default {
       sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
       sessionStorage.setItem('accountPasswordAll', '')
       sessionStorage.setItem('projectId', this.projectId)
-      getProjectDetail(params).then((data)=>{
-        if(data.status == 200){
+      sessionStorage.setItem('submited', 0)
+      getProjectDetail(params).then((data) => {
+        if (data.status == 200) {
           const { systemId, projectId } = data.data.projectManage
           // systemId=11 为银行项目，为其他值则是python项目，直接跳python
           if (systemId === 11) {
@@ -656,279 +687,281 @@ export default {
                 `${location.origin}/pyTrials`
           }
         }
-      }).catch((error)=>{
+      }).catch((error) => {
       })
       //获取当前时间
-       this.getBeginTime()
-        this.globalTimer = "";
-        this.countVal = "";
-        this.day = "00";
-        this.seconds = "00";
-        this.minutes = "00";
-        this.hour = "00";
-        this.sss = 1
+      this.getBeginTime()
+      this.globalTimer = "";
+      this.countVal = "";
+      this.day = "00";
+      this.seconds = "00";
+      this.minutes = "00";
+      this.hour = "00";
+      this.sss = 1
       this.startCountFn();
     },
     // 查看实验报告
-    toReport() {
-      // this.lockIt = false
-      this.setShowBusiness(false)
+    toReport () {
+      this.popContainer = false
+      // this.setShowBusiness(false)
       this.$emit('update:showIt', !this.showIt)
       this.$router.push(`/index/report?reportId=${this.reportId}`)
     },
     //提交
-    Submit() {
-        this.$confirm('此操作将视为结束考试, 是否继续?', '提示', {
-            center: true,
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        }).then(res => {
-            this.sureSubmit(true)
-        }).catch(() => {
-              this.$message({
-                type: "info",
-                message: "已取消提交"
-              });
+    Submit () {
+      this.$confirm('此操作将视为结束考试, 是否继续?', '提示', {
+        center: true,
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(res => {
+        this.sureSubmit(true)
+      }).catch(() => {
+        this.$message({
+          type: "info",
+          message: "已取消提交"
         });
+      });
     },
-    async sureSubmit(judge){
-        // 初始化vuex中的state
-        // this.initState();
-        this.actEndTime = new Date().getTime();
-        let ruleReqs = sessionStorage.getItem('ruleReqs')
-        let startTime = sessionStorage.getItem('startTime')
-        let ruleReqsList = JSON.parse(ruleReqs);
-        let lcld = []
-        for (var i=0;i<this.requires.length;i++){
-            lcld.push(this.requires[i].judgmentId)
-        }
-        let cid = sessionStorage.getItem('cid')
-        let  params = {
-            "assessmentId":this.assessmentId,
-            "classId":this.classId,
-            "curriculumId":+cid,
-            "endTime": this.actEndTime,
-            "lcId": lcld,
-            "projectId": this.projectId,
-            "projectName":this.projectName,
-            "purpose":this.projectManage.experimentTarget,
-            "ruleReqs": ruleReqsList,
-            "startTime": startTime,
-            "submitTime": this.actEndTime,
-            "systemId": this.curSystemId,
-            competitionId: this.competitionId,
-            stageId: this.stageId,
-            teamId: this.teamId,
-        }
-        this.loading = true;
-        submit(params).then((data)=>{
-          console.log(4, data)
-            if(data.status == 200){
-                this.clearStore()
-                const { retMap } = data.data
-                this.reportId = retMap.reportId
-                let firstLoad = null
-                let firstLoad2 = null
-                if(sessionStorage.getItem('firstLoad')) {
-                  firstLoad = sessionStorage.getItem('firstLoad')
-                }
-                if(sessionStorage.getItem('firstLoad2')) {
-                  firstLoad2 = sessionStorage.getItem('firstLoad2')
-                }
-                
-                 this.lockIt = true
-                if (this.assessmentId) {
-                  this.submitType = true
-                }
-                if(firstLoad) {
-                  sessionStorage.setItem('firstLoad', firstLoad)
-                }
-                if(firstLoad2) {
-                  sessionStorage.setItem('firstLoad2', firstLoad2)
-                }
-               
-                
-                let datas= retMap.scoreInfo;
-                let formList = []
-                sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
-                sessionStorage.setItem('accountPasswordAll', '')
-                let list = this.requires
-                this.grade = retMap.totalScore
-                for (var j=0;j<list.length;j++){
-                    for (var i=0;i<datas.length;i++){
-                        if (datas[i].lcId== list[j].judgmentId){
-                            list[j].flag = datas[i].flag
-                            list[j].scores = datas[i].questionScore
-                            list[j].right = datas[i].calculate
-                        }
-                    }
-                }
-                this.sss = 0;
-                this.popContainer = true;
-                if(judge) {
-                  this.$message({
-                      type: 'success',
-                      message: '提交成功'
-                  });
-                }
-                this.requires.splice(0, this.requires.length, ...list)
+    async sureSubmit (judge) {
+      // 初始化vuex中的state
+      // this.initState();
+      this.actEndTime = new Date().getTime();
+      let ruleReqs = sessionStorage.getItem('ruleReqs')
+      let startTime = sessionStorage.getItem('startTime')
+      let ruleReqsList = JSON.parse(ruleReqs);
+      let lcld = []
+      for (var i = 0; i < this.requires.length; i++) {
+        lcld.push(this.requires[i].judgmentId)
+      }
+      let cid = sessionStorage.getItem('cid')
+      let params = {
+        "assessmentId": this.assessmentId,
+        "classId": this.classId,
+        "curriculumId": +cid,
+        "endTime": this.actEndTime,
+        "lcId": lcld,
+        "projectId": this.projectId,
+        "projectName": this.projectName,
+        "purpose": this.projectManage.experimentTarget,
+        "ruleReqs": ruleReqsList,
+        "startTime": startTime,
+        "submitTime": this.actEndTime,
+        "systemId": this.curSystemId,
+        competitionId: this.competitionId,
+        stageId: this.stageId,
+        teamId: this.teamId,
+      }
+      this.loading = true;
+      submit(params).then((data) => {
+        console.log(4, data)
+        if (data.status == 200) {
+          this.clearStore()
+          const { retMap } = data.data
+          this.reportId = retMap.reportId
+          let firstLoad = null
+          let firstLoad2 = null
+          if (sessionStorage.getItem('firstLoad')) {
+            firstLoad = sessionStorage.getItem('firstLoad')
+          }
+          if (sessionStorage.getItem('firstLoad2')) {
+            firstLoad2 = sessionStorage.getItem('firstLoad2')
+          }
+
+          this.lockIt = true
+          if (this.assessmentId) {
+            this.submitType = true
+          }
+          if (firstLoad) {
+            sessionStorage.setItem('firstLoad', firstLoad)
+          }
+          if (firstLoad2) {
+            sessionStorage.setItem('firstLoad2', firstLoad2)
+          }
+
+
+          let datas = retMap.scoreInfo;
+          let formList = []
+          sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
+          sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
+          sessionStorage.setItem('accountPasswordAll', '')
+          sessionStorage.setItem('submited', 1)
+          let list = this.requires
+          this.grade = retMap.totalScore
+          for (var j = 0; j < list.length; j++) {
+            for (var i = 0; i < datas.length; i++) {
+              if (datas[i].lcId == list[j].judgmentId) {
+                list[j].flag = datas[i].flag
+                list[j].scores = datas[i].questionScore
+                list[j].right = datas[i].calculate
+              }
             }
-            this.loading = false
-        }).catch((error)=>{
-            this.loading = false
-        })
+          }
+          this.sss = 0;
+          this.popContainer = true;
+          if (judge) {
+            this.$message({
+              type: 'success',
+              message: '提交成功'
+            });
+          }
+          this.requires.splice(0, this.requires.length, ...list)
+        }
+        this.loading = false
+      }).catch((error) => {
+        this.loading = false
+      })
     },
-      //开始计时
-    startCountFn() {
+    //开始计时
+    startCountFn () {
       if (!this.isStart) {
         // this.countVal = this.countVal ? this.countVal : 0;
         this.globalTimer = setInterval(() => {
-            if(this.sss == 0){
-                this.globalTimer = null;
-                clearInterval(this.globalTimer);
-            }else if (this.timestamp){
-                this.counterFn(this.countVal--);
-            }else{
-                this.counterFn(this.countVal++);
-            }
+          if (this.sss == 0) {
+            this.globalTimer = null;
+            clearInterval(this.globalTimer);
+          } else if (this.timestamp) {
+            this.counterFn(this.countVal--);
+          } else {
+            this.counterFn(this.countVal++);
+          }
         }, 1000);
         this.isStart = true;
       }
     },
-      //倒计时
-    countDown(timestamp){
-        this.timestamp = timestamp
-        this.sss = 1;
-        this.globalTimer = null;
-        clearInterval(this.globalTimer);
-        this.startCountFn()
+    //倒计时
+    countDown (timestamp) {
+      this.timestamp = timestamp
+      this.sss = 1;
+      this.globalTimer = null;
+      clearInterval(this.globalTimer);
+      this.startCountFn()
     },
-    counterFn(counterTime) {
-        if (this.timestamp){
-            let countDown = (new Date(counterTime).getTime() - new Date().getTime()) / 1000
-            if (countDown > 0) {
-                let d = Math.floor(countDown / (60 * 60 * 24));
-                let h = Math.floor(countDown / (60 * 60));
-                let m = Math.floor(countDown % (60 * 60) / 60);
-                let s = Math.floor(countDown % (60 * 60) % 60);
-                this.day = `${d > 9 ? d : `0${d}`}`;
-                this.hour = `${h > 9 ? h : `0${h}`}`;
-                this.minutes = `${m > 9 ? m : `0${m}`}`;
-                this.seconds = `${s > 9 ? s : `0${s}`}`;
-            } else {
-              this.$confirm('此操作将视为结束考试, 是否继续?', '提示', {
-                  center: true,
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消',
-                  type: 'warning'
-              }).then(() => {
-                  this.sureSubmit(true)
-                  
-              }).catch(() => {
-                    // this.$message({
-                    //   type: "info",
-                    //   message: "已取消提交"
-                    // });
-              });
-                // this.$alert('考试已结束，已自动为您提交。', '提示', {
-                //         confirmButtonText: '确定',
-                //         type: 'warning',
-                //         center: true
-                //     });
-                this.sss = 0
-                this.sureSubmit(true)
-                this.day = '00';
-                this.hour = '00';
-                this.minutes = '00';
-                this.seconds = '00';
-            }
-        }else{
-            let leave1 = counterTime % (24 * 3600 * 1); //计算天数后剩余的毫秒数
-            let leave2 = leave1 % (3600 * 1); //计算小时数后剩余的毫秒数
-            let leave3 = leave2 % (60 * 1); //计算分钟数后剩余的毫秒数
-            let day = Math.floor(counterTime / (24 * 3600 * 1)); //计算相差天数
-            let hour = Math.floor(leave1 / (3600 * 1)); //计算相差小时
-            let minutes = Math.floor(leave2 / (60 * 1)); //计算相差分钟
-            let seconds = Math.round(leave3 / 1); //计算相差秒
-            day = day >= 10 ? day : "0" + day;
-            hour = hour >= 10 ? hour : "0" + hour;
-            minutes = minutes >= 10 ? minutes : "0" + minutes;
-            seconds = seconds >= 10 ? seconds : "0" + seconds;
-            this.day = day;
-            this.hour = hour;
-            this.minutes = minutes;
-            this.seconds = seconds;
+    counterFn (counterTime) {
+      if (this.timestamp) {
+        let countDown = (new Date(counterTime).getTime() - new Date().getTime()) / 1000
+        if (countDown > 0) {
+          let d = Math.floor(countDown / (60 * 60 * 24));
+          let h = Math.floor(countDown / (60 * 60));
+          let m = Math.floor(countDown % (60 * 60) / 60);
+          let s = Math.floor(countDown % (60 * 60) % 60);
+          this.day = `${d > 9 ? d : `0${d}`}`;
+          this.hour = `${h > 9 ? h : `0${h}`}`;
+          this.minutes = `${m > 9 ? m : `0${m}`}`;
+          this.seconds = `${s > 9 ? s : `0${s}`}`;
+        } else {
+          this.$confirm('此操作将视为结束考试, 是否继续?', '提示', {
+            center: true,
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.sureSubmit(true)
+
+          }).catch(() => {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消提交"
+            // });
+          });
+          // this.$alert('考试已结束，已自动为您提交。', '提示', {
+          //         confirmButtonText: '确定',
+          //         type: 'warning',
+          //         center: true
+          //     });
+          this.sss = 0
+          this.sureSubmit(true)
+          this.day = '00';
+          this.hour = '00';
+          this.minutes = '00';
+          this.seconds = '00';
         }
+      } else {
+        let leave1 = counterTime % (24 * 3600 * 1); //计算天数后剩余的毫秒数
+        let leave2 = leave1 % (3600 * 1); //计算小时数后剩余的毫秒数
+        let leave3 = leave2 % (60 * 1); //计算分钟数后剩余的毫秒数
+        let day = Math.floor(counterTime / (24 * 3600 * 1)); //计算相差天数
+        let hour = Math.floor(leave1 / (3600 * 1)); //计算相差小时
+        let minutes = Math.floor(leave2 / (60 * 1)); //计算相差分钟
+        let seconds = Math.round(leave3 / 1); //计算相差秒
+        day = day >= 10 ? day : "0" + day;
+        hour = hour >= 10 ? hour : "0" + hour;
+        minutes = minutes >= 10 ? minutes : "0" + minutes;
+        seconds = seconds >= 10 ? seconds : "0" + seconds;
+        this.day = day;
+        this.hour = hour;
+        this.minutes = minutes;
+        this.seconds = seconds;
+      }
     },
-    reload() {
-        this.submitType = false
-        this.lockIt = false
-        this.clearStore()
-        let token = sessionStorage.getItem('token')
-        let cid = sessionStorage.getItem('cid')
-        let systemId = sessionStorage.getItem('systemId')
-        let projectId = sessionStorage.getItem('projectId')
-        let formList = []
-        sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-        sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
-        sessionStorage.setItem('accountPasswordAll', '')
-        let params = {
-            "projectId":projectId,
-        }
-        this.selectProjects(params)
-        this.popContainer = false
-        this.sss = 1
-        this.startCountFn();
-        deleteCache().then((data)=>{
+    reload () {
+      this.submitType = false
+      this.lockIt = false
+      this.clearStore()
+      let token = sessionStorage.getItem('token')
+      let cid = sessionStorage.getItem('cid')
+      let systemId = sessionStorage.getItem('systemId')
+      let projectId = sessionStorage.getItem('projectId')
+      let formList = []
+      sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
+      sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
+      sessionStorage.setItem('accountPasswordAll', '')
+      sessionStorage.setItem('submited', 0)
+      let params = {
+        "projectId": projectId,
+      }
+      this.selectProjects(params)
+      this.popContainer = false
+      this.sss = 1
+      this.startCountFn();
+      deleteCache().then((data) => {
 
-        }).catch(() => {
+      }).catch(() => {
 
-        })
-        this.globalTimer = "";
-        this.countVal = "";
-        this.day = "00";
-        this.seconds = "00";
-        this.minutes = "00";
-        this.hour = "00";
-        this.grade = '00'
-        this.$router.push('/index/list')
-        this.getBeginTime()
+      })
+      this.globalTimer = "";
+      this.countVal = "";
+      this.day = "00";
+      this.seconds = "00";
+      this.minutes = "00";
+      this.hour = "00";
+      this.grade = '00'
+      this.$router.push('/index/list')
+      this.getBeginTime()
     },
-    
-    checkVer() {
+
+    checkVer () {
       let data = {
         userId: this.userId,
         id: this.assessmentId
       }
-      this.$get(this.api.qualifications,data).then(res => {
-        if(res.message == 'false'){
+      this.$get(this.api.qualifications, data).then(res => {
+        if (res.message == 'false') {
           this.isSubmit = true;
         }
       });
     },
     // 倒计时
-    timeFormat(param) {
+    timeFormat (param) {
       return param < 10 ? "0" + param : param;
     },
-    toggleCase() {
-      if (this.submitType) return 
-      if(!this.lockIt) {
+    toggleCase () {
+      if (this.submitType) return
+      if (!this.lockIt) {
         this.$emit('update:showIt', !this.showIt)
-      }else {
+      } else {
         this.closePaneJudge = true
       }
-      
+
       // this.caseVisible = !this.caseVisible
     },
-    collapse(){
+    collapse () {
 
     },
-    passToParent(data) {
+    passToParent (data) {
       this.$emit("getDataFromChild", data);
     },
-    getCookie(cookie_name) {
+    getCookie (cookie_name) {
       //获取cookie中指定key的value
       var allcookies = document.cookie; //索引长度，开始索引的位置
       var cookie_pos = allcookies.indexOf(cookie_name); //如果找到了索引，就代表cookie存在,否则不存在
@@ -952,17 +985,17 @@ export default {
 $togetherFontSize: 16px;
 
 /deep/ .el-tab-pane {
-  font-size: 1rem!important;
+    font-size: 1rem !important;
 }
 
 .scrollbar {
-  z-index: 100000000;
+    z-index: 100000000;
 }
 
 .popContainer {
     position: absolute;
-    width:100%;  /*宽度设置为100%，这样才能使隐藏背景层覆盖原页面*/
-    height:100%;
+    width: 100%; /*宽度设置为100%，这样才能使隐藏背景层覆盖原页面*/
+    height: 100%;
     z-index: 1000;
     top: 0;
     left: 0;
@@ -970,274 +1003,275 @@ $togetherFontSize: 16px;
     bottom: 0;
     background: rgba(0, 0, 0, 0.3);
 }
-  /deep/.el-container {
+/deep/.el-container {
     height: 80%;
     &.is-vertical {
-      position: fixed;
-      top: 200px;
-      bottom: 20px;
-      left: 0;
-      width: 85%;
-      height: 70%;
-      background-color: #f5f5f5;
-      z-index: 1001;
+        position: fixed;
+        top: 200px;
+        bottom: 20px;
+        left: 0;
+        width: 85%;
+        height: 70%;
+        background-color: #f5f5f5;
+        z-index: 1001;
     }
     .el-header {
-      color: #333;
-      padding: 0 12px 0 20px;
+        color: #333;
+        padding: 0 12px 0 20px;
 
-      .el-button {
-        background-color: $main-color;
-        color: #fff;
-        border: none;
-        margin: 5px 0px 5px 5px;
-        font-size: 16px;
-      }
+        .el-button {
+            background-color: $main-color;
+            color: #fff;
+            border: none;
+            margin: 5px 0px 5px 5px;
+            font-size: 16px;
+        }
 
-      .submit-btn {
-        padding-left: 30px;
-        padding-right: 30px;
-        background: $main-color url(../../assets/img/case/btn.png) 0 0/100% 100% no-repeat;
-      }
+        .submit-btn {
+            padding-left: 30px;
+            padding-right: 30px;
+            background: $main-color url(../../assets/img/case/btn.png) 0 0/100% 100% no-repeat;
+        }
     }
-    .el-aside{
-      font-size: $togetherFontSize;
-      color: #333;
-      [class*=" el-icon-"],[class^="el-icon-"]{
-        line-height: 40px;
-        font-size: 16px;
+    .el-aside {
         font-size: $togetherFontSize;
-      }
+        color: #333;
+        [class*=' el-icon-'],
+        [class^='el-icon-'] {
+            line-height: 40px;
+            font-size: 16px;
+            font-size: $togetherFontSize;
+        }
     }
     .el-main {
-      width: 60%;
-      background-color: #fff;
-      color: #333;
-      padding: 0;
-      font-size: $togetherFontSize;
-      margin: 0px 20px 10px 10px;
-      white-space: pre-wrap;
-      background: #fff url(../../assets/img/case/bg.png) top right no-repeat;
-      // overflow: visible;
+        width: 60%;
+        background-color: #fff;
+        color: #333;
+        padding: 0;
+        font-size: $togetherFontSize;
+        margin: 0px 20px 10px 10px;
+        white-space: pre-wrap;
+        background: #fff url(../../assets/img/case/bg.png) top right no-repeat;
+        // overflow: visible;
     }
     .aside-header {
-      margin: 0px 10px 10px 10px;
-      background-color: #fff;
-      font-size: .875rem;
+        margin: 0px 10px 10px 10px;
+        background-color: #fff;
+        font-size: 0.875rem;
     }
     .aside-footer {
-      margin: 0px 10px 10px 10px;
-      background-color: #fff;
+        margin: 0px 10px 10px 10px;
+        background-color: #fff;
     }
     .header_h {
-      height: 40px;
-      background: url(../../assets/img/case/header.png) 0 0/100% 100% no-repeat;
-      justify-content: center;
-      i{
-        color: #fff;
-      }
-      p {
-        line-height: 40px;
-        font-size: 16px;
-        color: #fff;
-        padding-left: 10px;
-      }
+        height: 40px;
+        background: url(../../assets/img/case/header.png) 0 0/100% 100% no-repeat;
+        justify-content: center;
+        i {
+            color: #fff;
+        }
+        p {
+            line-height: 40px;
+            font-size: 16px;
+            color: #fff;
+            padding-left: 10px;
+        }
     }
-    .el-card{
-      border: 0;
-      border-radius: 0;
-      .el-card__body {
-        padding: 0;
-      }
+    .el-card {
+        border: 0;
+        border-radius: 0;
+        .el-card__body {
+            padding: 0;
+        }
     }
-    .select{
-      flex: 1;
-      input::-webkit-input-placeholder {
-        color: #333;
-      }
-      .el-input__icon {
-        line-height: 60px;
-      }
-      .el-select__caret:before {
-        content: "\e78f";
-        font-size: 16px;
-        padding: 3px;
-        background-color: $main-color;
-        border-radius: 50%;
-        color: #ffffff;
-      }
-      .el-input--suffix .el-input__inner {
-        color: #333;
-        font-size: $togetherFontSize;
-        border-radius: 30px;
-        border: none;
-        background-color: #fff;
-        margin-left: 15px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-      .el-input {
-        padding: 10px 0;
-      }
+    .select {
+        flex: 1;
+        input::-webkit-input-placeholder {
+            color: #333;
+        }
+        .el-input__icon {
+            line-height: 60px;
+        }
+        .el-select__caret:before {
+            content: '\e78f';
+            font-size: 16px;
+            padding: 3px;
+            background-color: $main-color;
+            border-radius: 50%;
+            color: #ffffff;
+        }
+        .el-input--suffix .el-input__inner {
+            color: #333;
+            font-size: $togetherFontSize;
+            border-radius: 30px;
+            border: none;
+            background-color: #fff;
+            margin-left: 15px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        .el-input {
+            padding: 10px 0;
+        }
     }
 
     .font_css {
-      margin: 0 10px;
-      text-indent: 2em;
-      font-size: $togetherFontSize;
-      padding: 10px 0;
+        margin: 0 10px;
+        text-indent: 2em;
+        font-size: $togetherFontSize;
+        padding: 10px 0;
     }
-    
+
     .countDownBox {
-      font-size: $togetherFontSize;
-      margin: 0 10px;
-      padding: 20px 0;
+        font-size: $togetherFontSize;
+        margin: 0 10px;
+        padding: 20px 0;
     }
     .timeSpan {
-      color: #333333;
-      padding: 5px 15px;
-      font-size: $togetherFontSize;
-      background: #ffffff;
-      border-radius: 18px;
-      margin: 0 5px;
-      text-align: center;
+        color: #333333;
+        padding: 5px 15px;
+        font-size: $togetherFontSize;
+        background: #ffffff;
+        border-radius: 18px;
+        margin: 0 5px;
+        text-align: center;
     }
     .gradeSpan {
-      color: #878787;
-      padding: 10px;
-      font-size: $togetherFontSize;
-      background: #e0e0e0;
-      border-radius: 6px;
-      text-align: center;
+        color: #878787;
+        padding: 10px;
+        font-size: $togetherFontSize;
+        background: #e0e0e0;
+        border-radius: 6px;
+        text-align: center;
     }
     .el-header /deep/.el-button:hover,
     .el-button:focus,
     .el-button:active {
-      background-color: $main-color;
-      color: #fff;
-    }
-    
-    /deep/.el-table{
-      font-size: 12px;
-      thead {
+        background-color: $main-color;
         color: #fff;
-      }
-      .el-table__cell {
-        padding: 12px 0;
-      }
-      .cell {
-        font-weight: 100;
+    }
+
+    /deep/.el-table {
         font-size: 12px;
-      }
-      td,
-      th.is-leaf {
-        border-bottom: 0 !important;
-      }
+        thead {
+            color: #fff;
+        }
+        .el-table__cell {
+            padding: 12px 0;
+        }
+        .cell {
+            font-weight: 100;
+            font-size: 12px;
+        }
+        td,
+        th.is-leaf {
+            border-bottom: 0 !important;
+        }
     }
 
-    .el-table__header-wrapper{
-        thead{
+    .el-table__header-wrapper {
+        thead {
             color: #ffffff;
             font-size: 12px;
-            th{
+            th {
                 font-weight: 100;
             }
         }
-        th,tr{
+        th,
+        tr {
             background-color: #badfff;
         }
     }
-      .el-table__row--striped {
-          td{
-              background-color: #badfff!important;
-          }
-      }
-    /deep/ .el-collapse{
-      font-size: .875rem;
+    .el-table__row--striped {
+        td {
+            background-color: #badfff !important;
+        }
     }
-    .el-collapse-item__content{
-      padding-left: 10px;
-      padding-right: 10px;
-      font-size: $togetherFontSize;
+    /deep/ .el-collapse {
+        font-size: 0.875rem;
+    }
+    .el-collapse-item__content {
+        padding-left: 10px;
+        padding-right: 10px;
+        font-size: $togetherFontSize;
     }
     .el-collapse-item__wrap {
-      border-bottom: none;
+        border-bottom: none;
     }
     /deep/.el-collapse-item__header {
         font-size: 1rem;
-        
-      border-bottom: none;
+
+        border-bottom: none;
     }
     .el-tabs__content {
-      margin: 0 20px;
+        margin: 0 20px;
     }
     .el-icon-s-ticket:before {
-      font-size: togetherFontSize;
-      //padding: 5px;
-      color: $main-color;
+        font-size: togetherFontSize;
+        //padding: 5px;
+        color: $main-color;
     }
     .el-collapse-item__arrow {
-      margin: 0 5px 0 0;
+        margin: 0 5px 0 0;
     }
     .el-icon-arrow-right:before {
-      font-size: 12px;
-      font-size: $togetherFontSize;
-      //padding: 1px;
-      //margin-left: 10px;
-      background-color: $main-color;
-      border-radius: 50%;
-      color: #ffffff;
+        font-size: 12px;
+        font-size: $togetherFontSize;
+        //padding: 1px;
+        //margin-left: 10px;
+        background-color: $main-color;
+        border-radius: 50%;
+        color: #ffffff;
     }
     .el-tabs__item {
-      font-size: 16px;
+        font-size: 16px;
     }
     .el-tabs--card > .el-tabs__header .el-tabs__nav {
-      border: none;
+        border: none;
     }
     .el-tabs--card > .el-tabs__header .el-tabs__item {
-      border-left: none;
+        border-left: none;
     }
     .el-tabs--card > .el-tabs__header {
-      border-bottom: none;
+        border-bottom: none;
     }
     .el-collapse {
-      border-bottom: none;
-      border-top: none;
-      height: calc(100vh - 422px);
-      overflow: hidden;
-      overflow-y: auto;
-      
+        border-bottom: none;
+        border-top: none;
+        height: calc(100vh - 422px);
+        overflow: hidden;
+        overflow-y: auto;
     }
     /deep/.el-collapse-item {
-      font-size: $togetherFontSize;
-      background-color: red;
-      color: red;
+        font-size: $togetherFontSize;
+        background-color: red;
+        color: red;
     }
     .el-tabs__item.is-active {
-      color: #fff;
-      background-color: $main-color;
+        color: #fff;
+        background-color: $main-color;
     }
     .el-tabs__header {
-      padding: 5px 20px;
+        padding: 5px 20px;
     }
-  }
-  .break-all{
+}
+.break-all {
     font-size: 16px;
     word-break: break-all;
-  }
-  .panel{
+}
+.panel {
     position: fixed;
-      z-index: 10010000;
+    z-index: 10010000;
     top: 50%;
-    &.active{
+    &.active {
         //z-index: 10;
-      left: 85%;
+        left: 85%;
         z-index: 1001;
     }
-    img{
-      height: 175px;
-      cursor: pointer;
+    img {
+        height: 175px;
+        cursor: pointer;
     }
-  }
+}
 </style>
\ No newline at end of file
diff --git a/src/components/selectBusiness/index.vue b/src/components/selectBusiness/index.vue
index 708da8a..6526ac9 100644
--- a/src/components/selectBusiness/index.vue
+++ b/src/components/selectBusiness/index.vue
@@ -1,173 +1,190 @@
 <template>
-    <!-- 业务选择列表 -->
-    <el-dialog :visible="true" class="" :modal="false" @close="closeData" :close-on-click-modal="false" :show-close="false" custom-class="data-dia 2xl:w-7/12 xl:w-9/12 lg:w-full h-9/12">
-        <div slot="title" class="dia-header2">
-            <div class="data-title2">业务选择</div>
-            <div class="close"><img v-lazy="closeImg" alt="" @click="showBusinessSelect(false)" /></div>
-        </div>
-        <p class="tips2">请选择您要办理的业务:</p>
-        <ul class="take-list2">
-            <li v-for="(item) in getBusinessSelectList" :class="{checked: takeCheck == item.myKey}" :key="item.myKey" @click="checkTake(item.myKey)">
-                <img v-lazy="businessImg" alt="">
-                <p>{{ item.myKey + item.text}}</p>
-            </li>
-            <li v-for="(item) in (3 - getBusinessSelectList.length%3)" class="sitting" :key="item"></li>
-        </ul>
-        <div class="dia-footer2">
-            <div class='busyButtonBox'>
-                <el-button @click="showBusinessSelect(false)">取消</el-button>
-                <el-button type="primary" @click="selectBusiness()">确定</el-button>
-            </div>
-        </div>
-    </el-dialog>
+  <!-- 业务选择列表 -->
+  <el-dialog :visible="true"
+             class=""
+             :modal="false"
+             @close="closeData"
+             :close-on-click-modal="false"
+             :show-close="false"
+             custom-class="data-dia 2xl:w-7/12 xl:w-9/12 lg:w-full h-9/12">
+    <div slot="title"
+         class="dia-header2">
+      <div class="data-title2">业务选择</div>
+      <div class="close"><img v-lazy="closeImg"
+             alt=""
+             @click="showBusinessSelect(false)" /></div>
+    </div>
+    <p class="tips2">请选择您要办理的业务:</p>
+    <ul class="take-list2">
+      <li v-for="(item) in getBusinessSelectList"
+          :class="{checked: takeCheck == item.myKey}"
+          :key="item.myKey"
+          @click="checkTake(item.myKey)">
+        <img v-lazy="businessImg"
+             alt="">
+        <p>{{ item.myKey + item.text}}</p>
+      </li>
+      <li v-for="(item) in (3 - getBusinessSelectList.length%3)"
+          class="sitting"
+          :key="item"></li>
+    </ul>
+    <div class="dia-footer2">
+      <div class='busyButtonBox'>
+        <el-button @click="showBusinessSelect(false)">取消</el-button>
+        <el-button type="primary"
+                   @click="selectBusiness()">确定</el-button>
+      </div>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
 import { mapState, mapMutations, mapGetters } from 'vuex';
 
 export default {
-    props: {
-        // showBusiness: {
-        //     type: Boolean,
-        //     default: false
-        // }
-        // default: '本业务需要授权'
+  props: {
+    // showBusiness: {
+    //     type: Boolean,
+    //     default: false
+    // }
+    // default: '本业务需要授权'
+  },
+  mounted () {
+    if (this.businessKey) {
+      // 如果上次保存有 那么直接赋值
+      this.takeCheck = this.businessKey
+    }
+  },
+  data () {
+    return {
+      checkList: [],
+      takeCheck: '',
+      businessImg: require('@/assets/img/业务列表2.png'),
+      closeImg: require('@/assets/svg/close.svg'),
+      // 选择业务逻辑        
+    }
+  },
+  methods: {
+    ...mapMutations({
+      setBusinessKey: 'system/setBusinessKey',
+      setShowBusiness: 'system/setShowBusiness',
+      setTipsOperate: 'system/setTipsOperate',
+    }),
+    closeData () {
+      this.checkList = [];
     },
-    mounted() {
-        if(this.businessKey) {
-            // 如果上次保存有 那么直接赋值
-            this.takeCheck = this.businessKey
-        }
+    // 开启/关闭业务选择列表
+    showBusinessSelect (judge) {
+      // 如果点击关闭的时候未选择业务，则返回实验面板，不能进去业务。
+      if (!judge && !this.businessKey) {
+        this.$confirm('由于您未选择一个业务,这将回到业务列表,是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          center: true,
+          type: 'warning'
+        }).then(() => {
+          this.$emit('update:showIt', true)
+          this.setShowBusiness(false)
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '请选择一个业务'
+          });
+        });
+        return
+      }
+      this.setShowBusiness(judge)
+      // 如果有选择过项目，则提示加油。
+      this.setTipsOperate('您正在进行' + this.businessKey + ',加油！');
     },
-    data() {
-        return {
-            checkList: [],
-            takeCheck: '',
-            businessImg: require('@/assets/img/业务列表2.png'),
-            closeImg: require('@/assets/svg/close.svg'),
-            // 选择业务逻辑        
-        }
+    checkTake (myKey) {
+      // 选择业务如果点击第二次则取消选择当前业务。
+      if (this.takeCheck === myKey) {
+        this.takeCheck = ''
+      } else {
+        this.takeCheck = myKey
+      }
     },
-    methods: {
-        ...mapMutations({
-            setBusinessKey: 'system/setBusinessKey',
-            setShowBusiness: 'system/setShowBusiness',
-            setTipsOperate: 'system/setTipsOperate',
-        }),
-        closeData() {
-            this.checkList = [];
-        },
-        // 开启/关闭业务选择列表
-        showBusinessSelect (judge) {
-            // 如果点击关闭的时候未选择业务，则返回实验面板，不能进去业务。
-            if(!judge && !this.businessKey) {
-                this.$confirm('由于您未选择一个业务,这将回到业务列表,是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    center: true,
-                    type: 'warning'
-                }).then(() => {
-                    this.$emit('update:showIt', true)
-                    this.setShowBusiness(false)
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '请选择一个业务'
-                    });      
-                });
-                return
-            }
-            this.setShowBusiness(judge)
-            // 如果有选择过项目，则提示加油。
-            this.setTipsOperate('您正在进行' + this.businessKey + ',加油！');
-        },
-        checkTake(myKey){
-            // 选择业务如果点击第二次则取消选择当前业务。
-            if(this.takeCheck === myKey) {
-                this.takeCheck = ''
-            }else {
-                this.takeCheck = myKey
-            }
-        },
-        selectBusiness() {
-            // 如果没选中一个项目就点确认，提示请选择一个业务
-            if(!this.takeCheck) {
-                this.$message({
-                    type: 'info',
-                    message: '请选择一个业务'
-                });
-                return 
-            }
-            // 在system的selectBusiness中设置当前项目id
-            this.setBusinessKey(this.takeCheck)
-            // this.$store.dispatch('system/getJudgeData')
-            // 一开始开发时容错 因为有些业务还未分配id，无法进行。现在没啥用了
-            if(!this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id) {
-                this.$message({
-                    type: 'info',
-                    message: '业务开发中，尽请期待!'
-                });
-                return 
-            }
+    selectBusiness () {
+      // 如果没选中一个项目就点确认，提示请选择一个业务
+      if (!this.takeCheck) {
+        this.$message({
+          type: 'info',
+          message: '请选择一个业务'
+        });
+        return
+      }
+      // 在system的selectBusiness中设置当前项目id
+      this.setBusinessKey(this.takeCheck)
+      // this.$store.dispatch('system/getJudgeData')
+      // 一开始开发时容错 因为有些业务还未分配id，无法进行。现在没啥用了
+      if (!this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id) {
+        this.$message({
+          type: 'info',
+          message: '业务开发中，尽请期待!'
+        });
+        return
+      }
 
-            // 因为已经点击确定选择业务了，将业务选择框关掉。
-            this.setShowBusiness(false)
+      // 因为已经点击确定选择业务了，将业务选择框关掉。
+      this.setShowBusiness(false)
 
-            // 清除缓存 详情请参考clearStore
-            let systemData  = sessionStorage.getItem('systemData')
-            let token = sessionStorage.getItem('token')
-            let cid = sessionStorage.getItem('cid')
-            let systemId = sessionStorage.getItem('systemId')
-            let projectId = sessionStorage.getItem('projectId')
-            let assessmentId = sessionStorage.getItem('assessmentId')
-            let classId = sessionStorage.getItem('classId')
-            let timestamp = sessionStorage.getItem('timestamp')
-            let startTime = sessionStorage.getItem('startTime')
-            const storeProjectId = sessionStorage.getItem('storeProjectId')
-            sessionStorage.clear()
-            sessionStorage.setItem('token', token)
-            sessionStorage.setItem('cid', cid)
-            sessionStorage.setItem('systemId', systemId)
-            sessionStorage.setItem('projectId', projectId)
-            if(assessmentId) {
-                sessionStorage.setItem('assessmentId', assessmentId)
-            }
-            if(classId) {
-                sessionStorage.setItem('classId', classId)
-            }
-            if(timestamp) {
-                sessionStorage.setItem('timestamp', timestamp)
-            }
-            if(startTime) {
-                sessionStorage.setItem('startTime', startTime)
-            }
-            if(storeProjectId) {
-                sessionStorage.setItem('storeProjectId', storeProjectId)
-            }
-            
-            // sessionStorage.setItem('systemData', systemData)
+      // 清除缓存 详情请参考clearStore
+      let systemData = sessionStorage.getItem('systemData')
+      let token = sessionStorage.getItem('token')
+      let cid = sessionStorage.getItem('cid')
+      let systemId = sessionStorage.getItem('systemId')
+      let projectId = sessionStorage.getItem('projectId')
+      let assessmentId = sessionStorage.getItem('assessmentId')
+      let classId = sessionStorage.getItem('classId')
+      let timestamp = sessionStorage.getItem('timestamp')
+      let startTime = sessionStorage.getItem('startTime')
+      const storeProjectId = sessionStorage.getItem('storeProjectId')
+      sessionStorage.clear()
+      sessionStorage.setItem('token', token)
+      sessionStorage.setItem('cid', cid)
+      sessionStorage.setItem('systemId', systemId)
+      sessionStorage.setItem('projectId', projectId)
+      sessionStorage.removeItem('submited')
+      if (assessmentId) {
+        sessionStorage.setItem('assessmentId', assessmentId)
+      }
+      if (classId) {
+        sessionStorage.setItem('classId', classId)
+      }
+      if (timestamp) {
+        sessionStorage.setItem('timestamp', timestamp)
+      }
+      if (startTime) {
+        sessionStorage.setItem('startTime', startTime)
+      }
+      if (storeProjectId) {
+        sessionStorage.setItem('storeProjectId', storeProjectId)
+      }
+
+      // sessionStorage.setItem('systemData', systemData)
+
+      sessionStorage.setItem('businessKey', this.$store.state.system.businessKey)
 
-            sessionStorage.setItem('businessKey', this.$store.state.system.businessKey)
-            
-        },
-    },
-    computed: {
-        ...mapState({
-            showBusiness: state => state.system.showBusiness,
-            businessKey: state => state.system.businessKey
-        }),
-        ...mapGetters({
-            getBusinessSelectList: 'system/getBusinessSelectList'
-        })
     },
-    watch: {
-        showBusiness(newVal) {
-            console.log('what')
-            if(newVal) {
-                this.takeCheck = this.businessKey
-            }
-        }
+  },
+  computed: {
+    ...mapState({
+      showBusiness: state => state.system.showBusiness,
+      businessKey: state => state.system.businessKey
+    }),
+    ...mapGetters({
+      getBusinessSelectList: 'system/getBusinessSelectList'
+    })
+  },
+  watch: {
+    showBusiness (newVal) {
+      console.log('what')
+      if (newVal) {
+        this.takeCheck = this.businessKey
+      }
     }
+  }
 
 }
 </script>
@@ -187,7 +204,7 @@ export default {
     max-height: 600px;
     overflow: auto;
     // 业务选择中的
-    .take-list2{
+    .take-list2 {
         width: 100%;
         display: flex;
         justify-content: space-around;
@@ -195,30 +212,30 @@ export default {
         flex-wrap: wrap;
         height: 40vh;
         overflow: auto;
-        li{
+        li {
             display: inline-flex;
             align-items: center;
             width: 30%;
             height: 10vh;
             font-size: 16px;
             margin: 1vh 0;
-            border: 4px solid #DBDBDB;
+            border: 4px solid #dbdbdb;
             border-radius: 20px;
             cursor: pointer;
-            background-color: rgba(216,216,216,0.10);
+            background-color: rgba(216, 216, 216, 0.1);
             // &:first-child{
             //     margin: 0 0px 50px 0;
             // }
             // &:last-child{
             //     margin-left: 50px;
             // }
-            img{
+            img {
                 width: 15%;
                 margin: 0;
                 //height: 154px;
                 //margin: 0 45px;
             }
-            p{
+            p {
                 font-size: 16px;
                 color: #000;
                 text-align: left;
@@ -231,27 +248,28 @@ export default {
                 text-overflow: ellipsis;
                 display: -webkit-box;
                 -webkit-line-clamp: 2;
-                -webkit-box-orient: vertical
+                -webkit-box-orient: vertical;
             }
-            &.checked{
-                background: rgba(97,145,255,0.10) url('../../assets/svg/checked.svg') 96% 7%/auto no-repeat;
-                border-color: #6191FF;
+            &.checked {
+                background: rgba(97, 145, 255, 0.1) url('../../assets/svg/checked.svg') 96% 7% / auto no-repeat;
+                border-color: #6191ff;
             }
         }
     }
     .dia-header2 {
-        position: relative;height: 50px;
+        position: relative;
+        height: 50px;
         line-height: 50px;
-        background-color: rgb(98, 149, 243) ;
-        border-top-left-radius:14px;
-        border-top-right-radius:14px;
+        background-color: rgb(98, 149, 243);
+        border-top-left-radius: 14px;
+        border-top-right-radius: 14px;
         .data-title2 {
             position: absolute;
             left: 15px;
             height: 50px;
             font-size: 16px;
             line-height: 50px;
-            color:#fff;
+            color: #fff;
         }
         .close {
             height: 50px;
@@ -280,7 +298,7 @@ export default {
         margin: 0 auto;
         display: flex;
         align-items: center;
-        .img-wrap{
+        .img-wrap {
             background: url('../../assets/img/data-frame.png') 0 0 / cover no-repeat;
             width: 180px;
             height: 180px;
@@ -294,7 +312,7 @@ export default {
                 max-width: 180px;
                 max-height: 130px;
                 text-align: center;
-                margin: 10px 10px ;
+                margin: 10px 10px;
                 img {
                     margin-top: 45px;
                 }
@@ -308,13 +326,13 @@ export default {
                     color: #000;
                 }
             }
-            .text{
+            .text {
                 font-size: 18px;
-                white-space:nowrap;
+                white-space: nowrap;
                 position: absolute;
                 bottom: 15px;
                 left: 50%;
-                transform: translate(-50%,0);
+                transform: translate(-50%, 0);
             }
             &.checked {
                 background: url('../../assets/img/data-frame-checked.png') 0 0 / cover no-repeat,
@@ -325,19 +343,19 @@ export default {
             }
         }
     }
-    .seal{
+    .seal {
         width: 1100px;
         padding: 0 5%;
         display: flex;
         justify-content: space-between;
-        .box{
+        .box {
             border: 2px solid #e6e6e6;
             width: 45%;
             min-height: 300px;
             border-radius: 10px;
             padding: 10px;
         }
-        .left{
+        .left {
             display: flex;
             width: 50%;
             flex-wrap: wrap;
@@ -349,14 +367,14 @@ export default {
                 background: url('../../assets/img/data-frame.png') 0 0 / cover no-repeat;
                 cursor: pointer;
                 margin: 5px 7px;
-                img{
+                img {
                     width: 130px;
                     max-height: 90px;
                 }
                 &:last-child {
                     margin-right: 0;
                 }
-                &:nth-child(n>1){
+                &:nth-child(n > 1) {
                     margin-top: 0;
                 }
                 img {
@@ -377,7 +395,7 @@ export default {
                 &.checked {
                     background: url('../../assets/img/data-frame-checked.png') 0 0 / cover no-repeat,
                         url('../../assets/svg/checked.svg') 163px 7% / auto no-repeat;
-                    
+
                     p {
                         color: #fff;
                     }
@@ -394,10 +412,10 @@ export default {
                 }
             }
         }
-        .right{
+        .right {
             margin-left: 5%;
         }
-        .else{
+        .else {
             width: 100%;
         }
     }
@@ -416,6 +434,6 @@ export default {
 
 .sitting {
     opacity: 0;
-    cursor: default!important;
+    cursor: default !important;
 }
 </style>
\ No newline at end of file
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 150cdb7..d4a9478 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,91 +1,97 @@
 <template>
-    <div class="header" ref="exitHeader">
-        <div class="inner" style="width: 100%">
-            <div class="logo" @click="toIndex" style="float: left">
-                <img src="../../assets/img/logo.png" alt="">
-            </div>
-          <div style="float: right;margin:0 60px;font-size: 18px">
-            <span style="cursor:pointer" @click="exit">
-              退出<i class="icon el-icon-s-unfold"></i>
-            </span>
-          </div>
-        </div>
+  <div class="header"
+       ref="exitHeader">
+    <div class="inner"
+         style="width: 100%">
+      <div class="logo"
+           @click="toIndex"
+           style="float: left">
+        <img src="../../assets/img/logo.png"
+             alt="">
+      </div>
+      <div style="float: right;margin:0 60px;font-size: 18px">
+        <span style="cursor:pointer"
+              @click="exit">
+          退出<i class="icon el-icon-s-unfold"></i>
+        </span>
+      </div>
     </div>
+  </div>
 </template>
 <script>
-import { mapState,mapActions } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 import Setting from '@/setting'
 import util from '@/libs/util'
 import Cookie from 'js-cookie'
 export default {
-    data() {
-        return {
-            token: util.local.get(Setting.tokenKey),
-        };
+  data () {
+    return {
+      token: util.local.get(Setting.tokenKey),
+    };
+  },
+  mounted () {
+    this.$route.query.manager && Cookie.set('manager', 1)
+  },
+  methods: {
+    toIndex () {
+      this.$refs.nav.jump({
+        index: '/index/list',
+        title: '首页'
+      })
     },
-    mounted(){
-      this.$route.query.manager && Cookie.set('manager', 1)
+    exit () {
+      const url = location.href
+      let href = process.env.NODE_ENV === 'development' ?
+        `http://${location.hostname}:8082/#/` :
+        `${url.includes('huorantech.cn') ? `https://www.occupationlab.com` : location.origin}${Cookie.get('manager') ?
+          '/admin' :
+          (url.includes('huorantech.cn') || url.includes('izhixinyun.com')) ?
+            '' :
+            '/student'}/#/`
+      let assessmentId = sessionStorage.getItem('assessmentId')
+      if (assessmentId != 'null' && assessmentId != null && assessmentId != '') {
+        href += `ass/list`
+      } else {
+        const cid = sessionStorage.getItem('cid')
+        href += `station/preview?courseId=${cid}&curriculumName=银行项目`
+      }
+      location.href = href
     },
-    methods: {
-        toIndex(){
-            this.$refs.nav.jump({
-                index: '/index/list',
-                title: '首页'
-            })
-        },
-      exit(){
-        const url = location.href
-        let href = process.env.NODE_ENV === 'development' ? 
-          `http://${location.hostname}:8082/#/` :
-          `${url.includes('huorantech.cn') ? `http://www.occupationlab.com` : location.origin}${Cookie.get('manager') ?
-            '/admin' :
-            (url.includes('huorantech.cn') || url.includes('izhixinyun.com')) ?
-              '' :
-              '/student'}/#/`
-        let assessmentId = sessionStorage.getItem('assessmentId')
-        if (assessmentId != 'null' && assessmentId != null && assessmentId != ''){
-          href += `ass/list`
-        }else{
-          const cid = sessionStorage.getItem('cid')
-          href += `station/preview?courseId=${cid}&curriculumName=银行项目`
-        }
-        location.href = href
+  },
+  watch: {
+    '$route.path': {
+      handler (newVal) {
+        this.$nextTick(() => {
+          console.log(newVal)
+          if (newVal === '/index/list') {
+            this.$refs.exitHeader.style.backgroundColor = 'rgb(250, 250, 250)'
+          } else {
+            this.$refs.exitHeader.style.backgroundColor = 'rgb(244, 245, 248)'
+          }
+        })
       },
-    },
-    watch: {
-      '$route.path': {
-        handler(newVal) {
-          this.$nextTick(() => {
-            console.log(newVal)
-            if(newVal === '/index/list') {
-              this.$refs.exitHeader.style.backgroundColor = 'rgb(250, 250, 250)'
-            }else {
-              this.$refs.exitHeader.style.backgroundColor = 'rgb(244, 245, 248)'
-            }
-          })
-        },
-        immediate: true
-      }
+      immediate: true
     }
+  }
 };
 </script>
 <style lang="scss" scoped>
-    .header{
-        width:100%;
-        display: flex;
-        align-items: center;
-        position: relative;
-        height: 68px;
-        // background-color: #fff;
-        background-color: rgb(244,245,248);
-        z-index: 1001;
-        .logo{
-            width: 500px;
-            margin-left: 42px;
-            cursor: pointer;
-            img{
-                width: 100%;
-            }
+.header {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    position: relative;
+    height: 68px;
+    // background-color: #fff;
+    background-color: rgb(244, 245, 248);
+    z-index: 1001;
+    .logo {
+        width: 500px;
+        margin-left: 42px;
+        cursor: pointer;
+        img {
+            width: 100%;
         }
     }
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index c175336..6656931 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -1,300 +1,320 @@
 <template>
-    <div class="wrap">
-        <img class="sth bg" src="@/assets/img/index-bg.png" alt="">
-        <div class="case" @click="setShowBusiness(true)">业务选择</div>
-        
+  <div class="wrap">
+    <img class="sth bg"
+         src="@/assets/img/index-bg.png"
+         alt="">
+    <div class="case"
+         @click="setShowBusiness(true)">业务选择</div>
 
-        <!-- 业务选择 --弹框 -->
-        
-        
-        <div class="sth integrated-counter cp">
-            <img width="100%" v-lazy="lazy1" alt="" @click="toPart('/counter')"> 
-            <!-- src="@/assets/img/integrated-counter.png" -->
-            <div class="name" @click="toPart('/counter')">综合柜台</div>
-        </div>
+    <!-- 业务选择 --弹框 -->
 
-        <div class="sth international cp">
-            <!-- <img width="100%" v-lazy="lazy1" alt="" @click="toPart('/counter')">  -->
-            <img width="100%" v-lazy="lazy2" alt="" @click="showComing" />
-            <!-- src="@/assets/img/integrated-counter.png" -->
-            <!-- <div class="name" @click="showComing">国际结算部</div> -->
-        </div>
-        
-        <!-- <img class="sth international cp" v-lazy="lazy2" alt="" @click="showComing"> -->
-        <div class="sth manager cp" @click="toPart('/lobbyManager')">
-            <img width="100%" v-lazy="lazy3" alt="">
-            <div class="name">大堂经理</div>
-        </div>
-        
-        <img class="sth credit-dep cp" v-lazy="lazy4" alt="" @click="showComing">
-        <img class="sth company-finance cp" v-lazy="lazy5" alt="" @click="showComing">
-        <img class="sth personal-finance cp" v-lazy="lazy6" alt="" @click="showComing">
+    <div class="sth integrated-counter cp">
+      <img width="100%"
+           v-lazy="lazy1"
+           alt=""
+           @click="toPart('/counter')">
+      <!-- src="@/assets/img/integrated-counter.png" -->
+      <div class="name"
+           @click="toPart('/counter')">综合柜台</div>
+    </div>
+
+    <div class="sth international cp">
+      <!-- <img width="100%" v-lazy="lazy1" alt="" @click="toPart('/counter')">  -->
+      <img width="100%"
+           v-lazy="lazy2"
+           alt=""
+           @click="showComing" />
+      <!-- src="@/assets/img/integrated-counter.png" -->
+      <!-- <div class="name" @click="showComing">国际结算部</div> -->
+    </div>
 
+    <!-- <img class="sth international cp" v-lazy="lazy2" alt="" @click="showComing"> -->
+    <div class="sth manager cp"
+         @click="toPart('/lobbyManager')">
+      <img width="100%"
+           v-lazy="lazy3"
+           alt="">
+      <div class="name">大堂经理</div>
+    </div>
+
+    <img class="sth credit-dep cp"
+         v-lazy="lazy4"
+         alt=""
+         @click="showComing">
+    <img class="sth company-finance cp"
+         v-lazy="lazy5"
+         alt=""
+         @click="showComing">
+    <img class="sth personal-finance cp"
+         v-lazy="lazy6"
+         alt=""
+         @click="showComing">
 
-        <div class="coming" :class="{active: comingVisible}">
-            <div style="width: 20%;margin: auto">
-              <img style="width: 100%" v-lazy="lazy7" alt="">
-            </div>
-            <p class="text">敬请期待</p>
-        </div>
+    <div class="coming"
+         :class="{active: comingVisible}">
+      <div style="width: 20%;margin: auto">
+        <img style="width: 100%"
+             v-lazy="lazy7"
+             alt="">
+      </div>
+      <p class="text">敬请期待</p>
     </div>
+  </div>
 </template>
 
 <script>
 import { mapMutations, mapState } from 'vuex';
 import saveSystemModule from '@/mixins/saveSystemModule'
 export default {
-    name: 'index',
-    mixins: [ saveSystemModule ],
-    data() {
-        return {
-            caseVisible: true,
-            comingVisible: false,
-            timer: null,
-            lazy1: require('@/assets/img/integrated-counter.png'),
-            lazy2: require('@/assets/img/international.png'),
-            lazy3: require('@/assets/img/manager-index.png'),
-            lazy4: require('@/assets/img/credit-dep.png'),
-            lazy5: require('@/assets/img/company-finance.png'),
-            lazy6: require('@/assets/img/personal-finance.png'), // @/assets/svg/coming.svg
-            lazy7: require('@/assets/svg/coming.svg')
-        }
-    },
-    created() {
-        if(!sessionStorage.getItem('firstLoad2')) {
-            const loading = this.$loading({
-            lock: true,
-            // text: 'Loading',
-            text: '努力加载中，请稍等...',
-            spinner: 'el-icon-loading',
-            background: 'rgba(0, 0, 0, 0.7)'
-            });
-            setTimeout(() => {
-            loading.close();
-            sessionStorage.setItem('firstLoad2', true)
-            }, 1000);
-        }
+  name: 'index',
+  mixins: [saveSystemModule],
+  data () {
+    return {
+      caseVisible: true,
+      comingVisible: false,
+      timer: null,
+      lazy1: require('@/assets/img/integrated-counter.png'),
+      lazy2: require('@/assets/img/international.png'),
+      lazy3: require('@/assets/img/manager-index.png'),
+      lazy4: require('@/assets/img/credit-dep.png'),
+      lazy5: require('@/assets/img/company-finance.png'),
+      lazy6: require('@/assets/img/personal-finance.png'), // @/assets/svg/coming.svg
+      lazy7: require('@/assets/svg/coming.svg')
+    }
+  },
+  created () {
+    if (!sessionStorage.getItem('firstLoad2')) {
+      const loading = this.$loading({
+        lock: true,
+        // text: 'Loading',
+        text: '努力加载中，请稍等...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+      setTimeout(() => {
+        loading.close();
+        sessionStorage.setItem('firstLoad2', true)
+      }, 1000);
+    }
 
-        if(!this.businessKey) {
-            this.setShowBusiness(true)
-        }
-    },
-    mounted() {
-        let token = this.getQueryVariable('token')
-        let cid = this.getQueryVariable('cid')
-        let systemId = this.getQueryVariable('systemId')
-        let stopTime = this.getQueryVariable('stopTime')
-        let timestamp =+stopTime;
-        if (token != null){
-            sessionStorage.setItem('token', token)
-            sessionStorage.setItem('cid', cid)
-            sessionStorage.setItem('systemId', systemId)
-            sessionStorage.setItem('timestamp', timestamp)
+    if (!this.businessKey) {
+      this.setShowBusiness(true)
+    }
+  },
+  mounted () {
+    let token = this.getQueryVariable('token')
+    let cid = this.getQueryVariable('cid')
+    let systemId = this.getQueryVariable('systemId')
+    let stopTime = this.getQueryVariable('stopTime')
+    let timestamp = +stopTime;
+    if (token != null) {
+      sessionStorage.setItem('token', token)
+      sessionStorage.setItem('cid', cid)
+      sessionStorage.setItem('systemId', systemId)
+      sessionStorage.setItem('timestamp', timestamp)
+    }
+  },
+  computed: {
+    ...mapState({
+      showBusiness: state => state.system.showBusiness,
+      businessKey: state => state.system.businessKey
+    })
+  },
+  methods: {
+    ...mapMutations({
+      setShowBusiness: 'system/setShowBusiness'
+    }),
+    getQueryVariable (name) {
+      var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)')
+      if (window.location.href.split('?')[1]) {
+        var r = window.location.href.split('?')[1].match(reg)
+        if (r != null) {
+          return (r[2])
+        } else {
+          return null
         }
+      }
     },
-    computed: {
-        ...mapState({
-            showBusiness: state => state.system.showBusiness,
-            businessKey: state => state.system.businessKey
-        })
+    toPart (path) {
+      this.$router.push(path)
     },
-    methods: {
-        ...mapMutations({
-            setShowBusiness: 'system/setShowBusiness'
-        }),
-        getQueryVariable(name) {
-            var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)')
-            if( window.location.href.split('?')[1]){
-                var r = window.location.href.split('?')[1].match(reg)
-                if (r != null){
-                    return (r[2])
-                }else{
-                    return null
-                }
-            }
-        },
-        toPart(path){
-            this.$router.push(path)
-        },
-        showComing(){
-            this.comingVisible = true
-            clearTimeout(this.timer)
-            this.timer = setTimeout(() => {
-                this.comingVisible = false
-            },1500)
-        }
+    showComing () {
+      this.comingVisible = true
+      clearTimeout(this.timer)
+      this.timer = setTimeout(() => {
+        this.comingVisible = false
+      }, 1500)
     }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
-    // 标牌文字
-    @mixin nameTip {
-        width: 200px;
-        height: 70px;
-        line-height: 60px;
-        text-align: center;
-        font-size: 20px;
-        background: url(../../../assets/img/index-btn-bg.png);
-        // background-position: center center;
-        background-size: 100%;
-        color: #fff;
-        border-radius: 16px;
-        // box-shadow: 0 6px 8px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
-        z-index: 100;
-    }
-
+// 标牌文字
+@mixin nameTip {
+    width: 200px;
+    height: 70px;
+    line-height: 60px;
+    text-align: center;
+    font-size: 20px;
+    background: url(../../../assets/img/index-btn-bg.png);
+    // background-position: center center;
+    background-size: 100%;
+    color: #fff;
+    border-radius: 16px;
+    // box-shadow: 0 6px 8px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+    z-index: 100;
+}
 
-    .wrap{
-        position: relative;
-        min-height: calc(100vh - 68px);
-        .sth{
-            position: absolute;
-            &.cp{
-                cursor: pointer;
-            }
-        }
-        .bg{
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
+.wrap {
+    position: relative;
+    min-height: calc(100vh - 68px);
+    .sth {
+        position: absolute;
+        &.cp {
+            cursor: pointer;
         }
-        .integrated-counter{
-            top: -14%;
-            left: 24%;
-            width: 43%;
-            transition: all .5s;
-            &:hover{
-                margin-top: -10px;
-            }
-            .name{
-                position: absolute;
-                top: 23%;
-                left: 20%;
-                @include nameTip;
-            }
+    }
+    .bg {
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+    }
+    .integrated-counter {
+        top: -14%;
+        left: 24%;
+        width: 43%;
+        transition: all 0.5s;
+        &:hover {
+            margin-top: -10px;
         }
-        .international{
-            top: -9%;
-            left: 72%;
-            width: 28%;
-            transition: all .5s;
-            // &:hover{
-            //     margin-top: -10px;
-            // }
-            // img{
-            //     transition: all .5s;
-            //     &:hover{
-            //         margin-top: -10px;
-            //     }
-            // }
-            .name{
-                position: absolute;
-                top: 23%;
-                right: 0;
-                @include nameTip;
-            }
-            
+        .name {
+            position: absolute;
+            top: 23%;
+            left: 20%;
+            @include nameTip;
         }
-        .manager{
-            bottom: 0;
-            left: 57%;
-            width: 39%;
-            transition: all .5s;
-            &:hover{
-                bottom: 10px;
-            }
-            .name {
-                position: absolute;
-                top: 65%;
-                left: 37%;
-                @include nameTip;
-            }
+    }
+    .international {
+        top: -9%;
+        left: 72%;
+        width: 28%;
+        transition: all 0.5s;
+        // &:hover{
+        //     margin-top: -10px;
+        // }
+        // img{
+        //     transition: all .5s;
+        //     &:hover{
+        //         margin-top: -10px;
+        //     }
+        // }
+        .name {
+            position: absolute;
+            top: 23%;
+            right: 0;
+            @include nameTip;
         }
-        .credit-dep{
-            top: 31%;
-            left: 0;
-            width: 20%;
-            transition: all .5s;
-            // &:hover{
-            //     top: 29%;
-            // }
+    }
+    .manager {
+        bottom: 0;
+        left: 57%;
+        width: 39%;
+        transition: all 0.5s;
+        &:hover {
+            bottom: 10px;
         }
-        .company-finance{
-            top: 52%;
-            left: 9%;
-            width: 28%;
-            transition: all .5s;
-            // &:hover{
-            //     top: 50%;
-            // }
+        .name {
+            position: absolute;
+            top: 65%;
+            left: 37%;
+            @include nameTip;
         }
-        .personal-finance{
-            bottom: 0;
-            left: 25%;
-            width: 30%;
-            transition: all .5s;
-            // &:hover{
-            //     bottom: 10px;
-            // }
+    }
+    .credit-dep {
+        top: 31%;
+        left: 0;
+        width: 20%;
+        transition: all 0.5s;
+        // &:hover{
+        //     top: 29%;
+        // }
+    }
+    .company-finance {
+        top: 52%;
+        left: 9%;
+        width: 28%;
+        transition: all 0.5s;
+        // &:hover{
+        //     top: 50%;
+        // }
+    }
+    .personal-finance {
+        bottom: 0;
+        left: 25%;
+        width: 30%;
+        transition: all 0.5s;
+        // &:hover{
+        //     bottom: 10px;
+        // }
+    }
+    .case {
+        position: absolute;
+        top: 92px;
+        left: 150px;
+        width: 150px;
+        height: 50px;
+        line-height: 50px;
+        text-align: center;
+        color: #fff;
+        font-size: 24px;
+        background: url(../../../assets/img/case.png) 0 0 / cover no-repeat;
+        background-size: 150px 50px;
+        cursor: pointer;
+        // &:hover{
+        //     top: 76px;
+        // }
+    }
+    @media (max-width: 1440px) {
+        .credit-dep {
+            top: 32%;
         }
-        .case{
-            position: absolute;
-            top: 92px;
-            left: 150px;
-            width: 150px;
-            height: 50px;
-            line-height: 50px;
-            text-align: center;
-            color: #fff;
-            font-size: 24px;
-            background: url(../../../assets/img/case.png) 0 0 /cover no-repeat;
-            background-size: 150px 50px;
-            cursor: pointer;
-            // &:hover{
-            //     top: 76px;
-            // }
+        .company-finance {
+            top: 53%;
         }
-        @media(max-width: 1440px){
-            .credit-dep{
-                top: 32%;
-            }
-            .company-finance{
-                top: 53%;
-            }
-            .personal-finance{
-                top: 72%;
-            }
-            .integrated-counter{
-                width: 44%;
-            }
+        .personal-finance {
+            top: 72%;
         }
-        @media(max-width: 1300px){
-          & {
-              min-height: calc(100vh - 76px);
-          }
+        .integrated-counter {
+            width: 44%;
         }
     }
-    .coming{
-        position: fixed;
-        top: -200%;
-        left: 50%;
-        width: 376px;
-        padding: 40px 0;
-        text-align: center;
-        transform: translate(-50%,-50%);
-        border-radius: 16px;
-        background-color: rgba(0,0,0,0.80);
-        transition: all .3s;
-        &.active{
-            top: 50%;
-        }
-        .text{
-            margin-top: 24px;
-            font-size: 22px;
-            font-weight: 400;
-            color: #fff;
+    @media (max-width: 1300px) {
+        & {
+            min-height: calc(100vh - 76px);
         }
     }
+}
+.coming {
+    position: fixed;
+    top: -200%;
+    left: 50%;
+    width: 376px;
+    padding: 40px 0;
+    text-align: center;
+    transform: translate(-50%, -50%);
+    border-radius: 16px;
+    background-color: rgba(0, 0, 0, 0.8);
+    transition: all 0.3s;
+    &.active {
+        top: 50%;
+    }
+    .text {
+        margin-top: 24px;
+        font-size: 22px;
+        font-weight: 400;
+        color: #fff;
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/report/index.vue b/src/pages/report/index.vue
index 0cb7531..93e9aa0 100644
--- a/src/pages/report/index.vue
+++ b/src/pages/report/index.vue
@@ -1,142 +1,216 @@
 <template>
-    <!--  实验报告  -->
-    <div class="wrap">
-      <breadcrumb data="返回实验/我的数据"></breadcrumb>
-      <div class="content" :class="{loading}" id="pdfDom">
-          <div style="text-align: right" v-if="!loading">
-              <el-button size="mini" @click="editReport">
-                  {{ editing ? "保存" : "编辑" }}
-              </el-button>
-              <el-button type="primary" size="mini" @click="exportPage">导出报告</el-button>
-          </div>
-          <h6 class="r-title">标准实验报告</h6>
-          <div class="info">
-              <h6 class="l-title">
-                  <img src="@/assets/img/report1.png" alt="">
-                  基本信息
-              </h6>
-              <ul :class="['info-list', {edit: editing}]">
-                  <li>
-                      <label>学生姓名：</label>
-                      <el-input v-if="editing" v-model="infoData.userName" disabled></el-input>
-                      <span v-else>{{ infoData.userName }}</span>
-                  </li>
-                  <li>
-                      <label>学生学号：</label>
-                      <el-input v-if="editing" v-model="infoData.workNumber" disabled></el-input>
-                      <span v-else>{{ infoData.workNumber }}</span>
-                  </li>
-                  <li>
-                      <label>实验时间：</label>
-                      <el-input v-if="editing" v-model="infoData.submitTime" disabled></el-input>
-                      <span v-else>{{ infoData.submitTime }}</span>
-                  </li>
-                  <li>
-                      <label>实验成绩：</label>
-                      <el-input v-if="editing" v-model="infoData.score" disabled></el-input>
-                      <div v-else class="score-wrap">
-                          <em>{{ infoData.score }}</em>
-                          <img src="@/assets/img/point.png" alt="">
-                      </div>
-                  </li>
-                  <li>
-                      <label>学生班级：</label>
-                      <el-input v-if="editing" v-model="infoData.className"></el-input>
-                      <span v-else>{{ infoData.className }}</span>
-                  </li>
-                  <li>
-                      <label>指导老师：</label>
-                      <el-input v-if="editing" v-model="infoData.instructor"></el-input>
-                      <span v-else>{{ infoData.instructor }}</span>
-                  </li>
-                  <li>
-                      <label>实验学时：</label>
-                      <el-input v-if="editing" v-model="infoData.period"></el-input>
-                      <span v-else>{{ infoData.period }}</span>
-                  </li>
-              </ul>
-              <div class="m-b-20">
-                  <h6 class="l-title">
-                      <img src="@/assets/img/report2.png" alt="">
-                      实验项目名称
-                  </h6>
-                  <el-input v-if="editing" v-model="infoData.projectName" type="textarea"></el-input>
-                  <div v-else class="pre-wrap" v-html="infoData.projectName"></div>
-              </div>
-              <div class="m-b-20">
-                  <h6 class="l-title">
-                      <img src="@/assets/img/report3.png" alt="">
-                      实验目的
-                  </h6>
-                  <quill v-if="editing" :border="true" v-model="infoData.purpose" :height="150" />
-                  <div v-else :class="['pre-wrap', {edit: editing}]" v-html="infoData.purpose"></div>
-              </div>
-              <div class="m-b-20">
-                  <h6 class="l-title">
-                      <img src="@/assets/img/report4.png" alt="">
-                      实验数据
-                  </h6>
-                  <el-table :data="expData" class="table" border stripe header-align="center">
-                      <el-table-column type="index" label="序号" align="center" width="60">
-                          <template slot-scope="scope">
-                              {{ scope.$index + 1 }}
-                          </template>
-                      </el-table-column>
-                      <el-table-column prop="judgmentName" label="判分点" width="270" align="center"></el-table-column>
-                      <el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150">
-                          <template slot-scope="scope">
-                              <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                  <span>
-                                      <span>{{index+1}}. </span>{{item.name}}
-                                  </span>
-                              </div>
-                          </template>
-                      </el-table-column>
-                      <el-table-column prop="ruleAnswer" label="参考答案" style='word-wrap: break-word'>
-                          <template slot-scope="scope">
-                              <div v-if='scope.row.lcRuleRecords'>
-                                  <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                  <span>
-                                      <span>{{index+1}}. </span>{{item.ruleAnswer}}
-                                  </span>
-                                  </div>
-                              </div>
-                              <div v-else v-html="scope.row.referenceAnswer"></div>
-                          </template>
-                      </el-table-column>
-                      <el-table-column prop="userAnswer" label="学生答案">
-                          <template slot-scope="scope">
-                              <div v-if='scope.row.lcRuleRecords'>
-                                  <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                      <span v-if='item.userAnswer'>
-                                          <span>{{index+1}}. </span>{{item.userAnswer}}
-                                      </span>
-                                      <span v-else>
-                                          <span>{{index+1}}. </span>未填写
-                                      </span>
-                                  </div>
-                              </div>
-                              <div v-else v-html='scope.row.answer' style='white-space: pre-wrap'></div>
-                              <template v-if="scope.row.runThePictureList">
-                                <img v-for="(img, i) in scope.row.runThePictureList" :key="i" width="200" class="result-pic" :src="img" alt="">
-                              </template>
-                          </template>
-                      </el-table-column>
-                      <el-table-column prop="quesScore" label="分值" width="80" align="center"></el-table-column>
-                      <el-table-column prop="score" label="得分" width="80" align="center"></el-table-column>
-                  </el-table>
-              </div>
-              <div class="m-b-20">
-                  <h6 class="l-title">
-                      <img src="@/assets/img/report5.png" alt="">
-                      实验总结与体会
-                  </h6>
-                  <quill v-show="editing" :border="true" v-model="infoData.summarize" :height="150" />
-                  <div v-show="!editing" class="pre-wrap" v-html="infoData.summarize"></div>
-              </div>
-          </div>
+  <!--  实验报告  -->
+  <div class="wrap">
+    <breadcrumb data="返回实验/实验报告"></breadcrumb>
+    <div class="content"
+         :class="{loading}"
+         id="pdfDom">
+      <div style="text-align: right"
+           v-if="!loading">
+        <el-button size="mini"
+                   @click="editReport">
+          {{ editing ? "保存" : "编辑" }}
+        </el-button>
+        <el-button type="primary"
+                   size="mini"
+                   @click="exportPage">导出报告</el-button>
+      </div>
+      <h6 class="r-title">标准实验报告</h6>
+      <div class="info">
+        <h6 class="l-title">
+          <img src="@/assets/img/report1.png"
+               alt="">
+          基本信息
+        </h6>
+        <ul :class="['info-list', {edit: editing}]">
+          <li>
+            <label>学生姓名：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.userName"
+                      disabled></el-input>
+            <span v-else>{{ infoData.userName }}</span>
+          </li>
+          <li>
+            <label>学生学号：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.workNumber"
+                      disabled></el-input>
+            <span v-else>{{ infoData.workNumber }}</span>
+          </li>
+          <li>
+            <label>实验时间：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.submitTime"
+                      disabled></el-input>
+            <span v-else>{{ infoData.submitTime }}</span>
+          </li>
+          <li>
+            <label>实验成绩：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.score"
+                      disabled></el-input>
+            <div v-else
+                 class="score-wrap">
+              <em>{{ infoData.score }}</em>
+              <img src="@/assets/img/point.png"
+                   alt="">
+            </div>
+          </li>
+          <li>
+            <label>学生班级：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.className"></el-input>
+            <span v-else>{{ infoData.className }}</span>
+          </li>
+          <li>
+            <label>指导老师：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.instructor"></el-input>
+            <span v-else>{{ infoData.instructor }}</span>
+          </li>
+          <li>
+            <label>实验学时：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.period"></el-input>
+            <span v-else>{{ infoData.period }}</span>
+          </li>
+        </ul>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report2.png"
+                 alt="">
+            实验项目名称
+          </h6>
+          <el-input v-if="editing"
+                    v-model="infoData.projectName"
+                    type="textarea"></el-input>
+          <div v-else
+               class="pre-wrap"
+               v-html="infoData.projectName"></div>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report3.png"
+                 alt="">
+            实验目的
+          </h6>
+          <quill v-if="editing"
+                 :border="true"
+                 v-model="infoData.purpose"
+                 :height="150" />
+          <div v-else
+               :class="['pre-wrap', {edit: editing}]"
+               v-html="infoData.purpose"></div>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report4.png"
+                 alt="">
+            实验数据
+          </h6>
+          <el-table :data="expData"
+                    class="table"
+                    border
+                    stripe
+                    header-align="center">
+            <el-table-column type="index"
+                             label="序号"
+                             align="center"
+                             width="60">
+              <template slot-scope="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="judgmentName"
+                             label="判分点"
+                             width="200"
+                             align="center"></el-table-column>
+            <el-table-column v-if='project'
+                             prop="judgmentName"
+                             label="考核点"
+                             align="center"
+                             width="150">
+              <template slot-scope="scope">
+                <div v-for="(item, index) in scope.row.lcRuleRecords"
+                     :key="index">
+                  <span>
+                    <span>{{index+1}}. </span>{{item.name}}
+                  </span>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="ruleAnswer"
+                             label="参考答案"
+                             width="280"
+                             style='word-wrap: break-word'>
+              <template slot-scope="scope">
+                <div v-if='scope.row.lcRuleRecords'>
+                  <div v-for="(item, index) in scope.row.lcRuleRecords"
+                       :key="index">
+                    <span>
+                      <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                    </span>
+                  </div>
+                </div>
+                <div v-else
+                     v-html="scope.row.referenceAnswer"></div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userAnswer"
+                             width="280"
+                             label="学生答案">
+              <template slot-scope="scope">
+                <div v-if='scope.row.lcRuleRecords'>
+                  <div v-for="(item, index) in scope.row.lcRuleRecords"
+                       :key="index">
+                    <span v-if='item.userAnswer'>
+                      <span>{{index+1}}. </span>{{item.userAnswer}}
+                    </span>
+                    <span v-else>
+                      <span>{{index+1}}. </span>未填写
+                    </span>
+                  </div>
+                </div>
+                <div v-else
+                     v-html='scope.row.answer'
+                     style='white-space: pre-wrap'></div>
+                <template v-if="scope.row.runThePictureList">
+                  <img v-for="(img, i) in scope.row.runThePictureList"
+                       :key="i"
+                       width="200"
+                       class="result-pic"
+                       :src="img"
+                       alt="">
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column prop="quesScore"
+                             label="分值"
+                             width="80"
+                             align="center"></el-table-column>
+            <el-table-column prop="score"
+                             label="得分"
+                             width="80"
+                             align="center"></el-table-column>
+          </el-table>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report5.png"
+                 alt="">
+            实验总结与体会
+          </h6>
+          <quill v-show="editing"
+                 :border="true"
+                 v-model="infoData.summarize"
+                 :height="150" />
+          <div v-show="!editing"
+               class="pre-wrap"
+               v-html="infoData.summarize"></div>
+        </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -144,153 +218,149 @@ import { Loading } from "element-ui";
 import util from '@/libs/util'
 import breadcrumb from '@/components/breadcrumb'
 import quill from "@/components/quill";
-import {reportDetail,exportBankExperimentReport,updateReport} from "@/api/http.js";
+import { reportDetail, exportBankExperimentReport, updateReport } from "@/api/http.js";
 export default {
-    data() {
-        return {
-            reportId: this.$route.query.reportId,
-            title: "实验报告",
-            form: {},
-            infoData: {},
-            expData: [],
-            editing: false,
-            loadIns: null,
-            loading: false,
-            project:false,
-            userScores: []
-        };
+  data () {
+    return {
+      reportId: this.$route.query.reportId,
+      title: "实验报告",
+      form: {},
+      infoData: {},
+      expData: [],
+      editing: false,
+      loadIns: null,
+      loading: false,
+      project: false,
+      userScores: []
+    };
+  },
+  components: {
+    breadcrumb,
+    quill
+  },
+  mounted () {
+    this.getData()
+  },
+  methods: {
+    getData () { // 查询详情
+      const { reportId } = this
+      reportDetail(reportId).then(({ data }) => {
+        const { report, userScores } = data
+        this.form = report
+        const form = this.form
+        this.infoData = {
+          reportId,
+          className: form.className,
+          workNumber: form.workNumber,
+          experimentalClassName: form.experimentalClassName,
+          instructor: form.instructor,
+          period: form.period,
+          laboratory: form.laboratory,
+          submitTime: form.submitTime,
+          score: form.score,
+          userName: form.userName,
+          projectName: form.projectName,
+          purpose: form.purpose,
+          summarize: form.summarize
+        }
+        const expData = report.data
+        this.userScores = userScores
+        // 如果没有data，则添加，否则，直接使用
+        if (!expData) {
+          this.handleList(userScores)
+          this.$post(this.api.editExperimentalData, {
+            reportId,
+            data: JSON.stringify(userScores)
+          }).then(res => { }).catch(err => { })
+        } else {
+          this.handleList(userScores)
+        }
+      }).catch(res => { })
     },
-    components: {
-        breadcrumb,
-        quill
+    // 处理实验数据
+    handleList (list) {
+      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
     },
-    mounted() {
-        this.getData()
+    exportPage () {
+      const form = Object.assign(this.form, this.infoData)
+      const list = JSON.parse(JSON.stringify(this.expData))
+      list.map((e, i) => {
+        const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
+        if (item && item.runThePicture) e.runThePicture = item.runThePicture
+        if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
+        e.id = i + 1
+        if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+        if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+      })
+      for (const i in form) {
+        if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
+      }
+      form.purpose = form.purpose.replace(/<[^>]+>/g, '')
+      this.loading = true;
+      this.loadIns = Loading.service({
+        background: "#fff"
+      });
+      exportBankExperimentReport({
+        ...form,
+        experimentalData: list
+      }).then(res => {
+        this.loadIns.close();
+        this.loading = false;
+        util.downloadFileDirect(`实验报告.docx`, new Blob([res.data]))
+      }).catch(res => {
+        this.loadIns.close();
+        this.loading = false;
+      })
     },
-    methods: {
-        getData() { // 查询详情
-            const { reportId } = this
-            reportDetail({
-              reportId
-            }).then((data)=>{
-              console.log(33, data)
-            // this.$get(`${this.api.reportDetail}?reportId=${reportId}`).then(({ report, userScores }) => {
-                this.form = report
-                const form = this.form
-                this.infoData = {
-                    reportId,
-                    className: form.className,
-                    workNumber: form.workNumber,
-                    experimentalClassName: form.experimentalClassName,
-                    instructor: form.instructor,
-                    period: form.period,
-                    laboratory: form.laboratory,
-                    submitTime: form.submitTime,
-                    score: form.score,
-                    userName: form.userName,
-                    projectName: form.projectName,
-                    purpose: form.purpose,
-                    summarize: form.summarize
-                }
-                // const data = report.data
-                // this.userScores = userScores
-                // // 如果没有data，则添加，否则，直接使用
-                // if (!data) {
-                //   this.handleList(userScores)
-                //   this.$post(this.api.editExperimentalData, {
-                //     reportId,
-                //     data: JSON.stringify(userScores)
-                //   }).then(res => {}).catch(err => {})
-                // } else {
-                //   this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data))
-                // }
-            }).catch(res => {})
-        },
-        // 处理实验数据
-        handleList(list) {
-          this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
-          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() {
-          const form = Object.assign(this.form, this.infoData)
-          const list = JSON.parse(JSON.stringify(this.expData))
-          list.map((e, i) => {
-            const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
-            if (item && item.runThePicture) e.runThePicture = item.runThePicture
-            if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
-            e.id = i + 1
-            if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
-            if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
-          })
-          for (const i in form) {
-            if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
-          }
-          form.purpose = form.purpose.replace(/<[^>]+>/g, '')
-          this.loading = true;
-          this.loadIns = Loading.service({
-              background: "#fff"
-          });
-          this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
-            ...form,
-            experimentalData: list
-          }).then(res => {
-            this.loadIns.close();
-            this.loading = false;
-            util.downloadFileDirect(`实验报告.docx`,new Blob([res]))
-          }).catch(res => {
-            this.loadIns.close();
-            this.loading = false;
-          })
-        },
-        editReport() { // 编辑实验报告
-            if (this.editing) {
-                this.$post(`${this.api.updateReport}`, this.infoData).then(res => {
-                    this.editing = false;
-                    this.$message.success('修改成功')
-                }).catch(err => {});
-            } else {
-                this.editing = true;
-            }
-        }
+    editReport () { // 编辑实验报告
+      if (this.editing) {
+        updateReport(this.infoData).then(res => {
+          this.editing = false;
+          this.$message.success('修改成功')
+        }).catch(err => { });
+      } else {
+        this.editing = true;
+      }
     }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 .m-b-20 {
-  margin-bottom: 20px;
+    margin-bottom: 20px;
 }
 .wrap {
     padding: 12px 300px 20px;
 }
-code, kbd, samp{
-    font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
+code,
+kbd,
+samp {
+    font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
     word-wrap: break-word;
     white-space: pre-wrap;
 }
-/deep/ pre{
-    white-space: pre-wrap;       /* css-3 */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
-    word-wrap: break-word;       /* Internet Explorer 5.5+ */
-    word-break:break-all;
-    overflow:hidden;
+/deep/ pre {
+    white-space: pre-wrap; /* css-3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: pre-wrap; /* Opera 4-6 */
+    white-space: -o-pre-wrap; /* Opera 7 */
+    word-wrap: break-word; /* Internet Explorer 5.5+ */
+    word-break: break-all;
+    overflow: hidden;
     font-size: 12px;
-    font-weight:400;
-    font-family:'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif
+    font-weight: 400;
+    font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
 }
 .content {
     padding: 16px 0;
@@ -306,19 +376,19 @@ code, kbd, samp{
     }
     .info {
         padding: 20px 16px;
-        border: 1px solid #E1E6F2;
+        border: 1px solid #e1e6f2;
     }
-    .l-title{
-      display: flex;
-      align-items: center;
-      padding: 5px 8px;
-      margin-bottom: 12px;
-      font-size: 14px;
-      color: #333;
-      background-color: #F7F9FC;
-      img{
-        margin-right: 5px;
-      }
+    .l-title {
+        display: flex;
+        align-items: center;
+        padding: 5px 8px;
+        margin-bottom: 12px;
+        font-size: 14px;
+        color: #333;
+        background-color: #f7f9fc;
+        img {
+            margin-right: 5px;
+        }
     }
     .info-list {
         display: flex;
@@ -343,7 +413,7 @@ code, kbd, samp{
         span {
             min-width: 150px;
             padding: 0 10px 3px;
-            border-bottom: 1px solid #E1E6F2;
+            border-bottom: 1px solid #e1e6f2;
         }
         /deep/.el-input {
             width: 174px;
@@ -352,7 +422,7 @@ code, kbd, samp{
     .score-wrap {
         position: relative;
         min-width: 150px;
-        border-bottom: 1px solid #E1E6F2;
+        border-bottom: 1px solid #e1e6f2;
         em {
             position: absolute;
             top: -12px;
@@ -360,7 +430,7 @@ code, kbd, samp{
             font-family: din;
             font-size: 30px;
             font-weight: 600;
-            color: #0B1D30;
+            color: #0b1d30;
         }
         img {
             position: absolute;
@@ -368,16 +438,17 @@ code, kbd, samp{
             left: 0;
         }
     }
-    /deep/.el-textarea .el-textarea__inner, .pre-wrap {
+    /deep/.el-textarea .el-textarea__inner,
+    .pre-wrap {
         min-height: 72px;
         padding: 10px 16px;
         font-size: 14px;
         color: #333;
         &.edit {
-            color: #ABB3C6;
-            border: 1px solid #CACFDB;
+            color: #abb3c6;
+            border: 1px solid #cacfdb;
             border-radius: 4px;
-            background-color: #F6F7F9;
+            background-color: #f6f7f9;
         }
     }
     /deep/ .table th {
@@ -388,8 +459,20 @@ code, kbd, samp{
         }
     }
 }
+/deep/ .el-table {
+    width: 100%;
+    .el-table__header-wrapper table,
+    .el-table__body-wrapper table {
+        width: 100% !important;
+    }
+    .el-table__body,
+    .el-table__footer,
+    .el-table__header {
+        table-layout: auto;
+    }
+}
 .result-pic {
-  margin: 10px 0;
+    margin: 10px 0;
 }
 @media (max-width: 1650px) {
     .wrap {