diff --git a/src/api/index.js b/src/api/index.js
index 17ea5a8..4ad0e9b 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -77,7 +77,7 @@ export default {
 
     queryProvince: `${host}nakadai/nakadai/province/queryProvince`, //查询省份
     queryCity: `${host}nakadai/nakadai/city/queryCity`, //查询城市
-    querySchoolData: `${host}nakadai/nakadai/school/querySchool`, //根据学校名称查询学校信息
+    querySchool: `${host}nakadai/nakadai/school/querySchool`, //根据学校名称查询学校信息
     queryCourseDiscipline: `${host}nakadai/nakadai/subject/courseDiscipline`, //查询课程学科
     queryCourseProfessionalClass: `${host}nakadai/nakadai/subject/courseProfessionalClass`, //查询专业类
     queryCourseProfessional: `${host}nakadai/nakadai/subject/courseProfessional`, //查询专业
diff --git a/src/assets/img/report1.png b/src/assets/img/report1.png
new file mode 100644
index 0000000..6f9ed93
Binary files /dev/null and b/src/assets/img/report1.png differ
diff --git a/src/assets/img/report2.png b/src/assets/img/report2.png
new file mode 100644
index 0000000..4611672
Binary files /dev/null and b/src/assets/img/report2.png differ
diff --git a/src/assets/img/report3.png b/src/assets/img/report3.png
new file mode 100644
index 0000000..e3c2ab4
Binary files /dev/null and b/src/assets/img/report3.png differ
diff --git a/src/assets/img/report4.png b/src/assets/img/report4.png
new file mode 100644
index 0000000..fc4dad9
Binary files /dev/null and b/src/assets/img/report4.png differ
diff --git a/src/assets/img/report5.png b/src/assets/img/report5.png
new file mode 100644
index 0000000..6d71daa
Binary files /dev/null and b/src/assets/img/report5.png differ
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 0345efb..6f2b6f3 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -15,11 +15,11 @@
                     <li v-for="(item,index) in tabList" :key="index" :class="{active: form.distinguish == item.id}" @click="typeClick(item)">{{item.label}}</li>
                 </ul>
                 <el-form :model="form" :rules="loginRules" ref="form" style="margin-top: 20px">
-                    <el-form-item v-if="activeName === '1'" prop="account">
+                    <el-form-item v-if="form.distinguish === '1'" prop="account">
                         <label class="account"></label>
                         <el-input v-model.trim="form.account" placeholder="请输入账号"></el-input>
                     </el-form-item>
-                    <el-form-item v-if="activeName === '2'" prop="account">
+                    <el-form-item v-if="form.distinguish === '2'" prop="account">
                         <label class="account"></label>
                         <el-input v-model.trim="form.account" placeholder="请输入手机号/邮箱"></el-input>
                     </el-form-item>
@@ -91,7 +91,6 @@ export default {
                 }
             ],
             verificationIMG: "",
-            activeName: "1",
             form: {
                 account: "",
                 password: "",
@@ -136,14 +135,16 @@ export default {
             this.verificationIMG = this.api.verification + "?random=" + `${this.form.random}`;
         },
         typeClick(tab) { // 切换标签
+        console.log(tab)
+            this.form.distinguish = tab.id
             this.form.account = "";
             this.$refs.form.clearValidate();
-            this.loginRules.account[0].message = tab.index === "1" ? "请输入账号" : "请输入手机号/邮箱";
+            this.loginRules.account[0].message = tab.id === "1" ? "请输入账号" : "请输入手机号/邮箱";
         },
         submitFormLogin() { // 提交登录
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    this.form.distinguish = Number(this.activeName);
+                    this.form.distinguish = Number(this.form.distinguish);
                     this.login(this.form).then(() => {
                         let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/station";
                         this.$router.replace(redirect);
diff --git a/src/pages/info/details/index.vue b/src/pages/info/details/index.vue
index 62ad201..6b3fbe9 100644
--- a/src/pages/info/details/index.vue
+++ b/src/pages/info/details/index.vue
@@ -73,6 +73,7 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
+    padding-bottom: 20px;
     .title{
         margin-top: 30px;
         text-align: center;
diff --git a/src/pages/record/details/index.vue b/src/pages/record/details/index.vue
index d3ac795..dbca346 100644
--- a/src/pages/record/details/index.vue
+++ b/src/pages/record/details/index.vue
@@ -17,7 +17,6 @@
                 class="table"
                 stripe
                 header-align="center"
-                :cell-style="tableRowStyle"
                 :data="listData"
                 @selection-change="handleSelectionChange"
                 row-key="reportId"
diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue
index a082440..a495272 100644
--- a/src/pages/record/show/index.vue
+++ b/src/pages/record/show/index.vue
@@ -1,137 +1,134 @@
 <template>
     <!--  实验报告  -->
-    <div class="box">
-        <div class="exp-header">
-            <div class="flex-between">
-                <el-page-header @back="goBack" content="查看报告"></el-page-header>
-                <div>
-                    <el-button v-if="!loading" size="mini" @click="editReport">
-                        {{ editing ? "保存" : "编辑" }}
-                    </el-button>
-                    <el-button type="primary" size="mini" @click="exportPage">导出实验报告</el-button>
-                </div>
+    <div class="wrap">
+        <breadcrumb data="实验记录/实验情况/实验情况"></breadcrumb>
+        <div class="content" :class="{loading}" id="pdfDom">
+            <div class="text-right">
+                <el-button v-if="!loading" @click="editReport">
+                    {{ editing ? "保存" : "编辑" }}
+                </el-button>
+                <el-button type="primary" @click="exportPage">导出报告</el-button>
             </div>
-        </div>
-        <div style='width: 1125.25px;background: #fff;box-shadow: 0px 2px 25px 2px #D1D1D1;margin:50px auto;'>
-            <div class="report-wrap" :class="{loading}" id="pdfDom">
-                <div style='padding: 30px 100px;overflow: hidden;width:100%'>
-                    <div style="position: relative;margin-top:30px">
-                        <h6 style="text-align: center;font-size: 20px">标准实验报告</h6>
-                    </div>
-                    <div class="flex-center m-b-20 user_header">
-                        <p class="addhr_tag"></p>
-                        <span style="font-size: 18px">基本信息</span>
-                    </div>
-                    <div>
-                        <el-table :data="infoData" class="info-table" stripe header-align="center">
-                            <el-table-column prop="userName" label="学生姓名" align="center"></el-table-column>
-                            <el-table-column prop="workNumber" label="学生学号" align="center"></el-table-column>
-                            <el-table-column prop="className" label="学生班级" align="center">
-                                <template slot-scope="scope">
-                                    <template v-if="editing">
-                                        <el-input v-model="form.className"></el-input>
-                                    </template>
-                                    <template v-else>{{ form.className }}</template>
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="instructor" label="指导老师" align="center">
-                                <template slot-scope="scope">
-                                    <template v-if="editing">
-                                        <el-input v-model="form.instructor"></el-input>
-                                    </template>
-                                    <template v-else>{{ form.instructor }}</template>
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="period" label="实验学时" align="center">
-                                <template slot-scope="scope">
-                                    <template v-if="editing">
-                                        <el-input v-model="form.period"></el-input>
-                                    </template>
-                                    <template v-else>{{ form.period }}</template>
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="submitTime" label="实验时间" align="center"></el-table-column>
-                            <el-table-column prop="score" label="实验成绩" align="center">
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                    <div class="m-b-20">
-                        <div class="meta-title-wrap">
-                            <p class="meta-title"><img src="@/assets/img/cup.png" alt=""> 实验项目名称</p>
-                        </div>
-                        <el-input style='font-size: 14px' class='textAreaFont' v-model="form.projectName" type="textarea" :disabled="!editing" rows="5"></el-input>
-                    </div>
-                    <div class="m-b-20">
-                        <div class="meta-title-wrap">
-                            <p class="meta-title">实验目的</p>
-                        </div>
-                        <div style='font-size: 14px' class="pre-wrap" v-html="form.purpose"></div>
-                    </div>
-                    <div class="m-b-20">
-                        <div class="meta-title-wrap">
-                            <p class="meta-title">实验数据</p>
-                        </div>
-                        <el-table :data="expData" class="table" border stripe header-align="center">
-                            <el-table-column type="index" label="序号" align="center" width="100">
-                                <template slot-scope="scope">
-                                    {{ scope.$index + 1 }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="judgmentName" label="判分指标" align="center"></el-table-column>
-                            <el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150">
-                                <template slot-scope="scope">
+            <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>
+                        <span v-else>{{ infoData.score }}</span>
+                    </li>
+                    <li>
+                        <label>学生班级：</label>
+                        <el-input v-if="editing" v-model="infoData.workNumber"></el-input>
+                        <span v-else>{{ infoData.workNumber }}</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="form.projectName" type="textarea"></el-input>
+                    <div v-else class="pre-wrap" v-html="form.projectName"></div>
+                </div>
+                <div class="m-b-20">
+                    <h6 class="l-title">
+                        <img src="@/assets/img/report3.png" alt="">
+                        实验目的
+                    </h6>
+                    <div :class="['pre-wrap', {edit: editing}]" v-html="form.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="100">
+                            <template slot-scope="scope">
+                                {{ scope.$index + 1 }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="judgmentName" label="判分指标" 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">
+                                    <span>
+                                        <span>{{index+1}}. </span>{{item.name}}
+                                    </span>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="ruleAnswer" label="参考答案" width="200" style='word-wrap: break-word' align="center">
+                            <template slot-scope="scope">
+                                <div v-if='scope.row.lcRuleRecords'>
                                     <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                        <span>
-                                            <span>{{index+1}}. </span>{{item.name}}
-                                        </span>
+                                    <span>
+                                        <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                                    </span>
                                     </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="ruleAnswer" label="参考答案" width="200" style='word-wrap: break-word' align="center">
-                                <template slot-scope="scope">
-                                    <div v-if='scope.row.lcRuleRecords'>
-                                        <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                        <span>
-                                            <span>{{index+1}}. </span>{{item.ruleAnswer}}
-                                        </span>
-                                        </div>
-                                    </div>
-                                    <div v-else v-html="scope.row.referenceAnswer">
+                                </div>
+                                <div v-else v-html="scope.row.referenceAnswer">
 <!--                                        {{}}-->
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="userAnswer" label="学生答案" width="200" align="center">
+                            <template slot-scope="scope">
+                                <div v-if='scope.row.lcRuleRecords'>
+                                    <div v-for="(item, index) in scope.row.lcRuleRecords">
+                                        <span v-if='item.userAnswer'>
+                                            <span>{{index+1}}. </span>{{item.userAnswer}}
+                                        </span>
+                                        <span v-else>
+                                            <span>{{index+1}}. </span>未填写
+                                        </span>
                                     </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="userAnswer" label="学生答案" width="200" align="center">
-                                <template slot-scope="scope">
-                                    <div v-if='scope.row.lcRuleRecords'>
-                                        <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                            <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>
+                                <div v-else v-html='scope.row.answer' style='white-space: pre-wrap'>
 <!--                                        {{}}-->
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="score" label="得分" align="center"></el-table-column>
-                        </el-table>
-                    </div>
-                    <div class="m-b-20">
-                        <div class="meta-title-wrap">
-                            <p class="meta-title">实验总结与体会</p>
-                        </div>
-                        <div v-if='!editing' style='background: #e5dfff;color: #777;min-height: 100px;overflow: hidden'>
-                            <div style='padding: 10px;font-size: 14px'>
-                                {{form.summarize}}
-                            </div>
-                        </div>
-                        <el-input v-else type="textarea" v-model="form.summarize" rows="5" :disabled="!editing"></el-input>
-                    </div>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="score" label="得分" 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>
+                    <el-input v-if="editing" type="textarea" v-model="form.summarize"></el-input>
+                    <div v-else class="pre-wrap" v-html="form.summarize"></div>
                 </div>
             </div>
         </div>
@@ -143,6 +140,7 @@ import { Loading } from "element-ui";
 import html2Canvas from "html2canvas";
 import JsPDF from "jspdf";
 import util from "@/libs/util";
+import breadcrumb from '@/components/breadcrumb'
 
 export default {
     data() {
@@ -156,7 +154,7 @@ export default {
                 projectName: "",
                 summarize: "",
             },
-            infoData: [],
+            infoData: {},
             expData: [],
             editing: false,
             loadIns: null,
@@ -164,6 +162,9 @@ export default {
             project:false
         };
     },
+    components: {
+        breadcrumb
+    },
     mounted() {
         this.getData();
     },
@@ -177,7 +178,7 @@ export default {
                 this.expData = res.userScores
                 this.project = this.expData.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
                 let form = this.form;
-                this.infoData.push({
+                this.infoData = {
                     workNumber: form.workNumber,
                     experimentalClassName: form.experimentalClassName,
                     instructor: form.instructor,
@@ -186,8 +187,8 @@ export default {
                     submitTime: form.submitTime,
                     score: form.score,
                     userName: form.userName
-                });
-            }).catch(res => {});
+                }
+            }).catch(res => {})
         },
         exportPage() { // 导出实验报告
             document.querySelector("body").setAttribute("style", "overflow: visible");
@@ -251,27 +252,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.box {
-    //background-color: #EAEAEA;
-    background: #fff;
-    font-size: 18px;
-    overflow: hidden;
-    //overflow: auto;
-}
-
-.exp-header {
-    background: #fff;
-    box-shadow: 0px 2px 25px 2px rgba(48, 115, 248, 0.14);
-    z-index: 999;
-    padding: 20px 100px;
-    margin: 2px auto;
-}
-
-/deep/ .el-textarea.is-disabled .el-textarea__inner {
-    color: #777;
-    background-color: #e5dfff;
-
-}
 /deep/ pre, code, kbd, samp{
     font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
     word-wrap: break-word;
@@ -280,144 +260,74 @@ export default {
 /deep/ pre{
     white-space: pre-wrap;
 }
-#pdfDom {
-    width: 100%;
-    height: 100%;
-    //height: calc(100vh - 200px);
+.content {
+    padding: 16px 40px;
     background: #fff;
-    box-sizing: border-box;
-    //box-shadow: 0px 2px 25px 2px #D1D1D1;
     &.loading {
         height: auto;
         overflow: visible;
     }
-
-    /deep/ .info-table {
+    .r-title {
         margin-bottom: 40px;
-        border: 0;
-
-        th {
-            background-color: #fff !important;
-
-            .cell {
-                line-height: 35px;
-                color: #444;
+        font-size: 24px;
+        text-align: center;
+        color: #333;
+    }
+    .info {
+        padding: 20px 16px;
+        border: 1px solid #E1E6F2;
+    }
+    .l-title {
+        padding: 5px 8px;
+        background-color: #F7F9FC;
+    }
+    .info-list {
+        display: flex;
+        flex-wrap: wrap;
+        padding: 10px 0 0 20px;
+        li {
+            display: inline-flex;
+            width: 25%;
+            margin-bottom: 34px;
+        }
+        &.edit {
+            li {
+                align-items: center;
             }
         }
-
-        tr {
-            border: 0;
+        label {
+            font-size: 14px;
+            color: #333;
         }
-
-        tr:hover, tr:hover > td {
-            background-color: #e5dfff !important;
+        span {
+            min-width: 150px;
+            padding: 0 10px 3px;
+            border-bottom: 1px solid #E1E6F2;
         }
-
-        td {
-            border: {
-                left: 4px solid #fff;
-                right: 4px solid #fff;
-            }
-
-            &:first-child {
-                border-left: 0;
-            }
-
-            &:last-child {
-                border-right: 0;
-            }
-
-            background-color: #e5dfff;
-            border-bottom: 0;
+        /deep/.el-input {
+            width: 174px;
+        }
+    }
+    /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;
+            border-radius: 4px;
+            background-color: #F6F7F9;
         }
     }
-
     /deep/ .table th {
         background-color: #e1eaff !important;
-
         .cell {
             line-height: 35px;
             color: #555555;
         }
     }
 }
-
-.pre-wrap {
-    min-height: 117px;
-    padding: 5px 15px;
-    color: #777;
-    background-color: #e5dfff;
-}
-
-/deep/ .cell {
-    font-size: 14px;
-    line-height: 25px;
-}
-
-// /deep/.el-row{
-//     // padding-top: 20px;
-//     margin: 0 !important;
-// }
-.form-item {
-    display: flex;
-    align-items: center;
-}
-
-.form-item .el-input {
-    width: auto;
-}
-
-.form-item span {
-    margin-right: 10px;
-}
-
-.meta-title-wrap {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    span {
-        font-size: 13px;
-        color: #444;
-    }
-}
-
-.flex-between {
-    span {
-        font-size: 13px;
-        color: #444;
-    }
-}
-
-.meta-title {
-    display: flex;
-    align-items: center;
-    padding: 10px 20px;
-    margin-bottom: 10px;
-    font-size: 16px;
-    color: #fff;
-    background-color: #9278ff;
-
-    img {
-        width: 20px;
-        margin-right: 10px;
-    }
-}
-
-.step-title {
-    margin-bottom: 10px;
-    font-size: 16px;
-    color: #9278ff;
-}
-
-.bd-title {
-    padding-top: 20px;
-    border-top: 1px dashed #ccc;
-}
-
-.textAreaFont {
-    font-size: 18px;
-}
 pre {
     white-space: pre-wrap;       /* css-3 */
     white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
diff --git a/src/router/permission.js b/src/router/permission.js
index ec7d4b5..126781c 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -2,13 +2,13 @@ import router from "./index";
 import Setting from "@/setting";
 import util from "@/libs/util";
 
-const whiteList = ['/index/list', '/cityPartner/list', '/devPlatform/list'] // 白名单
+const whiteList = ['/login', '/index/list', '/cityPartner/list', '/devPlatform/list'] // 白名单
 router.beforeEach((to, from, next) => {
     document.title = Setting.titleSuffix;
     const role = util.local.get(Setting.tokenKey);
-    if (!role && to.path !== '/login' && !whiteList.includes(to.path)) {
+    if (!role && !whiteList.includes(to.path)) {
         next('/index/list')
-    } else if(role && to.path == '/login') {
+    } else if(role && whiteList.includes(to.path)) {
         next('/station')
     } else {
         next()
diff --git a/src/styles/common.scss b/src/styles/common.scss
index f3a48a7..28caa55 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -33,7 +33,7 @@
   .view {
     min-width: $min-width;
     min-height: calc(100vh - 134px);
-    padding: 12px 200px 0;
+    padding: 12px 200px 20px;
     margin: 0 auto;
     background-color: #F3F6FA;
     &.no-pd {
@@ -46,12 +46,13 @@
   .wrap-inner {
     min-width: $min-width;
     width: 100%;
-    padding: 0 200px;
+    padding: 0 200px 20px;
     margin: 0 auto;
   }
   .center-wrap {
     width: 1000px;
-    margin: 40px auto 20px;
+    padding-bottom: 20px;
+    margin: 40px auto 0;
   }
 }
 .l-title{
@@ -162,7 +163,7 @@
 }
 
 .pagination {
-  margin: 20px 0;
+  margin-top: 20px;
   text-align: center;
   button,.number,.more,.el-input__inner{
       min-width: 32px !important;