diff --git a/src/api/index.js b/src/api/index.js
index bd2cf4b..96da157 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -74,7 +74,7 @@ export default {
     getPracticeDetail: `${host}occupationlab/achievement/getPracticeDetail`, // 管理端练习成绩详情
     myClass: `${host}occupationlab/achievement/myClass`, // 教师端:我的班级
     deleteReportById: `${host}occupationlab/achievement/deleteReportById`, // 批量删除成绩管理中的项目/批量删除成绩管理中的考核
-    experimentOverview: `${host}occupationlab/achievement/reportDetail`, // 查看实验报告
+    reportDetail: `${host}occupationlab/achievement/reportDetail`, // 查看实验报告
     schoolCourseByAchievement: `${host}nakadai/nakadai/curriculum/schoolCourseByAchievement`, // 获取学校购买订单后的课程
     spliceClass: `${host}occupationlab/achievement/spliceClass`,
 
diff --git a/src/assets/img/point.png b/src/assets/img/point.png
new file mode 100644
index 0000000..6f6692f
Binary files /dev/null and b/src/assets/img/point.png differ
diff --git a/src/assets/img/report2.png b/src/assets/img/report2.png
new file mode 100644
index 0000000..9ecb819
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..6513f79
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..3637e00
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..fd0ecc8
Binary files /dev/null and b/src/assets/img/report5.png differ
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index f72e487..d1aef8e 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -58,7 +58,6 @@ export default {
         ])
     },
     mounted() {
-        console.log(33, this.customer, this.userName)
         this.getSystemDetail();
         this.getUserDetail();
     },
diff --git a/src/pages/achievement/ass/index.vue b/src/pages/achievement/ass/index.vue
index 83a8ff2..7bf586f 100644
--- a/src/pages/achievement/ass/index.vue
+++ b/src/pages/achievement/ass/index.vue
@@ -42,7 +42,7 @@
                     <el-button type="primary" @click="exportData">导出</el-button>
                 </div>
             </div>
-            <el-table :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="reportId">
+            <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="reportId">
                 <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
                 <el-table-column type="index" width="100" label="序号" align="center">
                     <template slot-scope="scope">
@@ -122,7 +122,6 @@ export default {
                 this.classInfo.push(classInfo[i])
             }
         }
-        console.log(this.classInfo)
         for(var i=0;i<this.classInfo.length;i++){
             let id = this.classInfo[i].id
             this.classInfo[i].id = id.toString()
@@ -179,8 +178,6 @@ export default {
             }
         },
         show(row) {
-            // console.log(row)
-            
             if (this.systemId == 2) {
                 this.$router.push(`showexperimentOption?id=${row.reportId}&stuId=${row.userId}&studentName=${row.studentName}&class=${row.class}`);
             } else if (this.systemId == 3) {
@@ -246,6 +243,7 @@ export default {
                         }
                         this.$post(`${this.api.deleteExperimentalReport}`,ids).then(res => {
                             util.successMsg("删除成功");
+                            this.$refs.table.clearSelection()
                             this.getData();
                         }).catch(res => {
                         });
diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue
index 9c196a1..099d458 100644
--- a/src/pages/achievement/list/index.vue
+++ b/src/pages/achievement/list/index.vue
@@ -89,7 +89,7 @@
             <el-table-column label="操作" align="center" min-width="300">
                 <template slot-scope="scope">
                     <el-button v-if="auth('练习成绩管理') || auth('考核成绩管理')" type="text" @click="entry(scope.row)">成绩管理</el-button>
-                    <el-button type="text" v-if="scope.row.isDel == 1" @click="handleDelete(scope.row)" >删除</el-button>
+                    <el-button type="text" v-if="(scope.row.isAdmin === 1 && (scope.row.isDel === 1 || scope.row.courseDel === 1)) || (scope.row.isAdmin === 0 && scope.row.isDel === 1)" @click="handleDelete(scope.row)" >删除</el-button>
                     <el-button type="text" v-else style='color:#999' >删除</el-button>
                 </template>
             </el-table-column>
@@ -176,7 +176,6 @@ export default {
     },
     mounted() {
         let per = this.$route.query.per
-        console.log(per)
         if(per == '1'){
             per = 1
         }else{
@@ -209,16 +208,19 @@ export default {
             this.loadIns = Loading.service({
                 background: "rgba(255,255,255,.6)"
             });
+            const curriculumId = this.curriculumId
+            const curr = this.curriculumList.find(e => e.cid == curriculumId)
             let data = {
                 classId: this.classId,
                 permissions: this.projectPermissions,
-                curriculumId: this.curriculumId,
+                curriculumId,
                 keyWord: this.keyword,
                 startTime: this.startingtime,
                 endTime: this.endTime,
                 month: this.month,
                 pageNum: this.page,
-                pageSize: this.pageSize
+                pageSize: this.pageSize,
+                systemId: curr ? curr.systemId : ''
             };
             this.$post(this.api.getAchievementInfo, data).then(res => {
                 if(this.projectPermissions == 0){
@@ -241,8 +243,8 @@ export default {
             this.getData();
         },
         disabledSelection(row, index) { // 禁用勾选
-            if (row.isDel == 0) return false;
-            return true;
+            if ((row.isAdmin === 1 && (row.isDel === 1 || row.courseDel === 1)) || (row.isAdmin === 0 && row.isDel === 1)) return true
+            return false
         },
         entry(row) { // 成绩管理
             if (this.projectPermissions === 1) {
diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index 8cbe7b1..1ba512e 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -1,508 +1,305 @@
 <template>
-    <div class="box">
-        <el-row :gutter="24">
-            <el-col :span="24">
-                <el-card shadow="hover" class="m-b-20">
-                    <div class="flex-between">
-                        <el-page-header @back="goBack" content="查看报告"></el-page-header>
-                    </div>
-                </el-card>
-
-                <div id="pdfDom">
-                    <h6 style="text-align: center;font-size: 20px">标准实验报告</h6>
-                    <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">
-                            </el-table-column>
-                            <el-table-column prop="instructor" label="指导老师" align="center">
-                            </el-table-column>
-                            <el-table-column prop="period" label="实验学时" align="center">
-                            </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 v-model="form.projectName" type="textarea" :disabled="true" rows="5"></el-input>
-                    </div>
-
-                    <div class="m-b-20">
-                        <div class="meta-title-wrap">
-                            <p class="meta-title">实验目的</p>
-                        </div>
-                        <!-- <el-input v-model="form.purpose" type="textarea" :disabled="true" rows="5"></el-input> -->
-                        <div 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 class="wrap">
+        <el-card shadow="hover" class="m-b-20">
+            <el-page-header @back="$router.back()" content="查看报告"></el-page-header>
+        </el-card>
+
+        <div class="content">
+            <h6 class="r-title">标准实验报告</h6>
+            <div class="info">
+                <h6 class="l-title">
+                    <img src="@/assets/img/info1.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>
-                        <el-table :data="expData" class="table" stripe border header-align="center">
-                            <el-table-column type="index" label="序号" align="center" width="80">
-                                <template slot-scope="scope">
-                                    {{ scope.$index + 1 }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="judgmentName" label="判分点" align="center" min-width="200">
-                            </el-table-column>
-                            <el-table-column v-if='project' prop="userAnswer" label="考核点" align="center" >
-                                <template slot-scope="scope">
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords">
+                    </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="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' align="center">
+                            <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>
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="answer" label="参考答案" align="center" min-width="400">
-                                <template slot-scope="scope">
-                                    <div v-if=' scope.row.lcRuleRecords'>
-                                        <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                            <span>{{index+1}}. </span>{{item.ruleAnswer}}
-                                        </div>
-                                    </div>
-                                    <div v-else v-html='scope.row.referenceAnswer'>
-<!--                                        {{scope.row.referenceAnswer}}-->
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="userAnswer" label="学生答案" align="center" min-width="400">
-                                <template slot-scope="scope">
-                                    <div v-if=' scope.row.lcRuleRecords'>
-                                        <div v-for="(item, index) in scope.row.lcRuleRecords">
+                                </div>
+                                <div v-else v-html="scope.row.referenceAnswer"></div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="userAnswer" label="学生答案" align="center">
+                            <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}}
-                                        </div>
+                                        </span>
+                                        <span v-else>
+                                            <span>{{index+1}}. </span>未填写
+                                        </span>
                                     </div>
-                                    <div v-else v-html='scope.row.answer' style='white-space: pre-wrap'>
-<!--                                        {{scope.row.answer}}-->
-                                    </div>
-                                </template>
-                            </el-table-column>
-
-                            <el-table-column prop="score" label="得分" align="center" width="80">
-                            </el-table-column>
-                        </el-table>
-                    </div>
-
-                    <div class="m-b-20">
-                        <div class="meta-title-wrap">
-                            <p class="meta-title">实验总结与体会</p>
-                        </div>
-                        <el-input type="textarea" v-model="form.summarize" rows="5" disabled></el-input>
-                    </div>
+                                </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="得分" 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-if="editing" :border="true" v-model="form.summarize" :minHeight="150" :height="150" />
+                    <div v-else class="pre-wrap" v-html="form.summarize"></div>
                 </div>
-            </el-col>
-        </el-row>
+            </div>
+        </div>
     </div>
 </template>
 
 <script>
-import { mapState } from "vuex";
-import util from "@/libs/util";
-
 export default {
     data() {
         return {
+            reportId: this.$route.query.reportId,
+            projectId: this.$route.query.projectId,
             title: "实验报告",
             form: {
-                analysis: "",
-                conclusion: "",
-                content: ``,
-                data: "",
-                purpose: ``,
-                experimentId: "",
-                experimentalClassName: "",
-                improvement: "",
-                laboratory: "",
+                className: "",
+                instructor: "",
                 period: "",
-                principle: "",
-                proName: "",
-                score: 0,
-                step: ``,
-                submitTime: "",
+                projectName: "",
                 summarize: "",
-                instructor: "",
-                userId: this.userId,
-                userName: "",
-                workNumber: ""
             },
-            type: this.$route.query.type,
-            id: this.$route.query.id,
-            recordId: this.$route.query.recordId,
-            reportId: this.$route.query.reportId,
-            projectId: this.$route.query.projectId,
-            studentId: this.$route.query.studentId,
-            infoData: [],
+            infoData: {},
             expData: [],
-            accountData: [],
-            showData: "1",
-            autograph: "1",
-            pages: 1,
-            ipVisible: false,
-            project:false,
-            fileList: [{ name: "food.jpeg", url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100" }, {
-                name: "food2.jpeg",
-                url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100"
-            }],
-            conclusionOptions: [
-                {
-                    value: 1,
-                    label: "结论符合预期"
-                }
-            ]
+            editing: false,
+            loadIns: null,
+            loading: false,
+            project:false
         };
     },
-    computed: {
-        ...mapState("user", [
-            "userId"
-        ])
-    },
     mounted() {
-
-        this.getData();
+        this.getData()
     },
     methods: {
-        getData() {
-            if (this.type) {
-                let data = {
-                    reportId: this.reportId
-                };
-                this.$get(this.api.experimentOverview, data).then(res => {
-                    this.form = res.report;
-                    let expData = res.userScores;
-                    let form = this.form;
-                    let score = form.score;
-                    for(var i=0;i<expData.length;i++){
-                        console.log(expData[i].referenceAnswer)
-                        if (expData[i].referenceAnswer != undefined && expData[i].referenceAnswer){
-                            console.log('123')
-                            this.project = false
-                        }else{
-                            console.log('456')
-                            this.project = true
-                        }
-                    }
-                    if (expData) {
-                        if (score) {
-                            expData.map(n => {
-                                if (n.isError) {
-                                    score -= n.codeScore;
-                                    n.codeScore = 0;
-                                }
-                            });
-                            form.score = score;
-                        }
-                        this.expData = expData;
-                    }
-                    this.infoData.push({
-                        workNumber: form.workNumber,
-                        experimentalClassName: form.experimentalClassName,
-                        instructor: form.instructor,
-                        period: form.period,
-                        laboratory: form.laboratory,
-                        submitTime: form.submitTime,
-                        score: form.score,
-                        userName: form.userName,
-                        className:form.className,
-                    });
-                }).catch(res => {
-                });
-            } else {
-                let data = {
-                    studentId: this.studentId,
-                    projectId: this.projectId,
-                    // recordId: this.id,
-                    reportId: this.reportId
-                };
-                this.$get(this.api.experimentOverview, data).then(res => {
-                    console.log(res)
-                    this.form = res.report ? res.report : {};
-                    let expData = res.userScores;
-                    let form = this.form;
-                    let score = form.score;
-                    for(var i=0;i<expData.length;i++){
-                        console.log(expData[i].referenceAnswer)
-                        if (expData[i].referenceAnswer != undefined && expData[i].referenceAnswer){
-                            console.log('123')
-                            this.project = false
-                        }else{
-                            console.log('456')
-                            this.project = true
-                        }
-                    }
-                    if (expData) {
-                        if (score) {
-                            expData.map(n => {
-                                if (n.isError) {
-                                    score -= n.codeScore;
-                                    n.codeScore = 0;
-                                }
-                            });
-                            form.score = score;
-                        }
-
-                        this.expData = expData;
-                    }
-                    this.infoData.push({
-                        workNumber: form.workNumber,
-                        experimentalClassName: form.experimentalClassName,
-                        instructor: form.instructor,
-                        period: form.period,
-                        laboratory: form.laboratory,
-                        submitTime: form.submitTime,
-                        score: form.score,
-                        userName: form.userName,
-                        className:form.className,
-                    });
-                }).catch(res => {
-                });
-            }
-        },
-        handleRemove(file, fileList) {
-            console.log(file, fileList);
-        },
-        handlePreview(file) {
-            console.log(file);
-        },
-        saveAdd() {
-            let data = {
-                systemId: this.configId,
-                systemName: this.form.systemName,
-                systemType: this.form.systemType,
-                systemAttribution: this.form.systemAttribution
-            };
-            if (this.configId) {
-                this.$post(this.api.updateServiceConfig, data).then((res) => {
-                    util.successMsg("编辑成功");
-                    this.goBack();
-                }).catch((res) => {
-                });
-            } else {
-                this.$post(this.api.updateServiceConfig, data).then((res) => {
-                    util.successMsg("添加成功");
-                    this.goBack();
-                }).catch((res) => {
-                });
-            }
-        },
-        handlePictureCardPreview(file) {
-            this.dialogImageUrl = file.url;
-            this.dialogVisible = true;
-        },
-        SpanMethod({ row, column, rowIndex, columnIndex }) {
-            if (rowIndex % 2 === 0) {
-                if (columnIndex === 6) {
-                    if (!row.Intranet) {
-                        return [1, 2];
-                    }
-                }
-                // else if (columnIndex === 1) {
-                //     return [0, 0];
-                // }
-            }
-        },
-        goBack() {
-            this.$router.back();
-        },
-        exportPage() {
-            var title = this.title;
-            html2Canvas(document.querySelector("#pdfDom"), {
-                allowTaint: true
-            }).then(function(canvas) {
-                    let contentWidth = canvas.width;
-                    let contentHeight = canvas.height;
-                    let pageHeight = contentWidth / 592.28 * 841.89;
-                    let leftHeight = contentHeight;
-                    let position = 0;
-                    let imgWidth = 595.28;
-                    let imgHeight = 592.28 / contentWidth * contentHeight;
-                    let pageData = canvas.toDataURL("image/jpeg", 1.0);
-                    let PDF = new JsPDF("", "pt", "a4");
-                    if (leftHeight < pageHeight) {
-                        PDF.addImage(pageData, "JPEG", 0, 0, imgWidth, imgHeight);
-                    } else {
-                        while (leftHeight > 0) {
-                            PDF.addImage(pageData, "JPEG", 0, position, imgWidth, imgHeight);
-                            leftHeight -= pageHeight;
-                            position -= 841.89;
-                            if (leftHeight > 0) {
-                                PDF.addPage();
-                            }
-                        }
-                    }
-                    PDF.save(title + ".pdf");
+        getData() { // 查询详情
+            this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(res => {
+                this.form = res.report
+                this.expData = res.userScores
+                this.project = this.expData.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
+                let form = this.form;
+                this.infoData = {
+                    workNumber: form.workNumber,
+                    experimentalClassName: form.experimentalClassName,
+                    instructor: form.instructor,
+                    period: form.period,
+                    laboratory: form.laboratory,
+                    submitTime: form.submitTime,
+                    score: form.score,
+                    userName: form.userName
                 }
-            );
+            }).catch(res => {})
         }
     }
 };
 </script>
 
 <style lang="scss" scoped>
-.box {
-    //padding: 0 20px;
-    //background-color: #fff;
+.wrap {
+    padding: 12px 300px 20px;
 }
-
-/deep/ .el-textarea.is-disabled .el-textarea__inner {
-    color: #777;
-    background-color: #e5dfff;
+code, kbd, samp{
+    font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
+    word-wrap: break-word;
+    white-space: pre-wrap;
 }
-
-.pre-wrap {
-    min-height: 117px;
-    padding: 5px 15px;
-    color: #777;
-    background-color: #e5dfff;
+/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
 }
-
-#pdfDom {
-    padding: 50px;
+.content {
+    padding: 16px 40px;
     background: #fff;
-    /deep/ .info-table {
+    &.loading {
+        padding-top: 30px;
+    }
+    .r-title {
         margin-bottom: 40px;
-        border: 0;
-        th {
-            background-color: #fff !important;
-            .cell {
-                color: #444;
-                line-height: 35px;
+        font-size: 24px;
+        text-align: center;
+        color: #333;
+    }
+    .info {
+        padding: 20px 16px;
+        border: 1px solid #E1E6F2;
+    }
+    .l-title {
+        display: flex;
+        align-items: center;
+        padding: 5px 8px;
+        margin-bottom: 12px;
+        font-size: 14px;
+        color: #333;
+        background-color: #f7f5ff;
+    }
+    .info-list {
+        display: flex;
+        flex-wrap: wrap;
+        padding: 10px 0 0 20px;
+        li {
+            display: inline-flex;
+            width: 25%;
+            padding: 0 10px;
+            margin-bottom: 34px;
+        }
+        &.edit {
+            li {
+                align-items: center;
             }
         }
-
-        tr {
-            border: 0;
+        label {
+            font-size: 14px;
+            color: #333;
+            white-space: nowrap;
         }
-
-        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;
+        }
+    }
+    .score-wrap {
+        position: relative;
+        min-width: 150px;
+        border-bottom: 1px solid #E1E6F2;
+        em {
+            position: absolute;
+            top: -12px;
+            left: 30px;
+            font-family: din;
+            font-size: 30px;
+            font-weight: 600;
+            color: #0B1D30;
+        }
+        img {
+            position: absolute;
+            bottom: -15px;
+            left: 0;
+        }
+    }
+    /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;
-
+        background-color: #e5dfff !important;
         .cell {
             line-height: 35px;
             color: #555555;
         }
     }
 }
-/deep/ pre, 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;
-}
-/deep/ .cell {
-    font-size: 12px;
-}
-
-/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;
+@media (max-width: 1650px) {
+    .wrap {
+        padding: 12px 200px 20px;
     }
 }
-
-.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;
+@media (max-width: 1430px) {
+    .wrap {
+        padding: 12px 100px 20px;
     }
 }
-
-.step-title {
-    margin-bottom: 10px;
-    font-size: 16px;
-    color: #9278ff;
-}
-
-.bd-title {
-    padding-top: 20px;
-    border-top: 1px dashed #ccc;
-}
-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
-}
 </style>
\ No newline at end of file
diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue
index ed0e5bc..61a5469 100644
--- a/src/pages/achievement/teach/index.vue
+++ b/src/pages/achievement/teach/index.vue
@@ -42,7 +42,7 @@
                     <el-button type="primary" @click="exportData">导出</el-button>
                 </div>
             </div>
-            <el-table :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="reportId">
+            <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="reportId">
                 <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
                 <el-table-column type="index" width="100" label="序号" align="center">
                     <template slot-scope="scope">
@@ -181,7 +181,6 @@ export default {
             }
         },
         handleDelete(row) { // 删除
-        console.log(row)
             this.$confirm("确定要删除吗？", "提示", {
                 type: "warning"
             }).then(() => {
@@ -201,7 +200,6 @@ export default {
                     let ids = this.multipleSelection.map(item => {
                         return item.reportId;
                     });
-                    console.log(ids)
                     this.$post(this.api.deleteExperimentalReport, ids).then(res => {
                         this.multipleSelection = [];
                         this.$refs.table.clearSelection();
diff --git a/src/pages/assessment/add/index.vue b/src/pages/assessment/add/index.vue
index 7139717..08033fe 100644
--- a/src/pages/assessment/add/index.vue
+++ b/src/pages/assessment/add/index.vue
@@ -264,7 +264,6 @@ export default {
         ])
     },
     mounted() {
-        // console.log(22,this.assFields)
         this.date = [util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(new Date().getTime() + 300000)), util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(new Date().getTime() + 300000))];
         this.form.id && this.getData();
         this.recoveryData();
@@ -321,7 +320,6 @@ export default {
             });
             // 缓存全选和半选状态下的所有节点
             this.allCheckedNodes = [...checked.checkedNodes, ...checked.halfCheckedNodes];
-            // console.log(this.allCheckedNodes)
         },
         filterNode(value, data) { // 对树节点进行过滤
             if (!value) return true;
@@ -378,7 +376,6 @@ export default {
             this.$get(this.api.schoolCourse).then(res => {
                 this.curriculumList = res.data;
                 if (this.curriculumList.length) {
-                    console.log(this.form.curriculumId)
                     if (this.form.curriculumId){
                         for(let i=0;i<this.curriculumList.length; i++) {
                            if(this.curriculumList[i].cid == this.form.curriculumId){
@@ -418,7 +415,6 @@ export default {
         handlePage() {
             let result = this.projectDataAll.slice((this.page - 1) * this.pageSize, this.page * this.pageSize);
             this.projectData = result;
-            console.log(this.projectData)
         },
         initData() {
             this.page = 1;
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 1ec715a..670a869 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -235,7 +235,6 @@ export default {
     },
     methods: {
         pickerInput(){
-            console.log(this.date)
             this.form.month = '6'
         },
         beginTimer() {
@@ -345,7 +344,6 @@ export default {
             this.$router.push(`add?id=${row.id}`);
         },
         show(row) {
-            console.log(row)
             this.$router.push(`/achievement/ass?id=${row.id}&classId=${row.classId}&projectId=${row.projectId}&classInfo=${JSON.stringify(row.classInfo)}&experimentalName=${row.experimentalName}&class=${row.experimentalClassName}`);
         },
         start(row) {
@@ -407,7 +405,6 @@ export default {
                     }).catch(res => {
                     });
                     if(this.multipleSelection.length === this.listData.length && this.pageNum>1) {
-                        console.log(this.pageNum - 1)
                         this.handleCurrentChange(this.pageNum - 1)
                     }
                 }).catch(() => {
diff --git a/src/pages/course/contentSettings/index.vue b/src/pages/course/contentSettings/index.vue
index d89cd6d..2f26cc0 100644
--- a/src/pages/course/contentSettings/index.vue
+++ b/src/pages/course/contentSettings/index.vue
@@ -461,7 +461,6 @@ export default {
             this.sectionId = "";
         },
         preview(row) {
-            // console.log(JSON.stringify(row));
             if (this.transferType(row.fileType) == "视频") {
                 this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
                     this.playAuth = res.data.playAuth;
diff --git a/src/pages/evaluation/list/index.vue b/src/pages/evaluation/list/index.vue
index fb4d539..699c1f2 100644
--- a/src/pages/evaluation/list/index.vue
+++ b/src/pages/evaluation/list/index.vue
@@ -549,7 +549,6 @@ export default {
         },
         uploadSuccess(res, file, fileList) {
             this.uploadFaild = false;
-            console.log(JSON.stringify(res));
             let { message, status, data } = res;
             if (status === 200) {
                 util.successMsg(`上传成功：${data.successNum}，上传失败：${data.failureNum}`);
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index f09c0f6..d008314 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -63,28 +63,28 @@
 
             <el-table :data="listData" class="table" ref="table" stripe header-align="center"
                       @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" align="center"></el-table-column>
+                <el-table-column type="selection" width="55" align="center" :selectable="disabledSelection"></el-table-column>
                 <el-table-column type="index" width="100" label="序号" align="center">
                     <template slot-scope="scope">{{ scope.$index + (page - 1) * pageSize + 1 }}</template>
                 </el-table-column>
-                <el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column>
-                <el-table-column prop="founder" label="创建人" align="center">
+                <el-table-column prop="projectName" label="实验项目名称" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="founder" label="创建人" width="150" align="center">
                     <template slot-scope="scope">
                         {{ founderKeys[scope.row.founder] }}
                     </template>
                 </el-table-column>
-                <el-table-column label="权限" align="center">
+                <el-table-column label="权限" width="120" align="center">
                     <template slot-scope="scope">
                         {{ permissionsKeys[scope.row.permissions] }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
-                <el-table-column prop="status" label="状态" align="center">
+                <el-table-column prop="createTime" label="创建时间" width="150" align="center"></el-table-column>
+                <el-table-column prop="status" label="状态" width="100" align="center">
                     <template slot-scope="scope">
                         {{ stateKeys[scope.row.state] }}
                     </template>
                 </el-table-column>
-                <el-table-column label="操作">
+                <el-table-column label="操作" width="250">
                     <template slot-scope="scope">
                         <el-button type="text" @click="edit(scope.row,'0',queryData.founder)">查看</el-button>
                         <el-button v-if="scope.row.founder && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))" type="text" @click="edit(scope.row,'1',queryData.founder)">编辑</el-button>
@@ -278,6 +278,11 @@ export default {
             this.page = 1;
             this.getData();
         },
+        disabledSelection(row, index) { // 禁用勾选
+            const roleName = this.roleName
+            if (row.founder && (roleName.includes('超级') || roleName === row.roleName  || (roleName === '管理员' && !row.roleName.includes('超级')))) return true
+            return false
+        },
         handleCurrentChange(val) { // 切换页码
             this.page = val;
             this.getData();
@@ -310,6 +315,7 @@ export default {
             }).then(() => {
                 this.$post(`${this.api.deleteProjectManage}?projectIds=${ids}&platformId=${this.queryData.platformId}`).then(res => {
                     util.successMsg("删除成功");
+                    this.$refs.table.clearSelection()
                     this.getData();
                 }).catch(err => {
                     console.log(err);
diff --git a/src/pages/station/list/index.vue b/src/pages/station/list/index.vue
index 7321c59..a879977 100644
--- a/src/pages/station/list/index.vue
+++ b/src/pages/station/list/index.vue
@@ -89,13 +89,13 @@ export default {
 }
 
 .station {
+    min-height: calc(100vh - 520px);
     background: url(../../../assets/img/station1.png) (top left)/auto no-repeat,
                 url(../../../assets/img/station2.png) bottom right/auto no-repeat;
     .inner {
         display: flex;
         flex-wrap: wrap;
         width: 1072px;
-        min-height: calc(100vh - 520px);
         padding-top: 60px;
         margin: 0 auto;
     }
diff --git a/src/pages/system/list/role.vue b/src/pages/system/list/role.vue
index 82d6901..6b9493a 100644
--- a/src/pages/system/list/role.vue
+++ b/src/pages/system/list/role.vue
@@ -15,9 +15,9 @@
 
         <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" :row-key="getRowKeys">
             <el-table-column type="selection" width="55" align="center" :selectable="practiceSelectable" :reserve-selection="true"></el-table-column>
-            <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
-            <el-table-column prop="roleName" label="角色名称" align="center" width="200"></el-table-column>
-            <el-table-column label="角色描述" align="center">
+            <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
+            <el-table-column prop="roleName" label="角色名称" align="center" min-width="250" show-overflow-tooltip></el-table-column>
+            <el-table-column label="角色描述" min-width="400" align="center">
                 <template slot-scope="scope">
                     <el-input placeholder="该角色用于管理全部功能权限" v-model="scope.row.remark" disabled></el-input>
                 </template>
diff --git a/src/router/index.js b/src/router/index.js
index d80cecb..b986ee6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -59,7 +59,6 @@ function getPermission() {
 
         let data = res.permissionMenu[0].children;
         if (data.length > 0) {
-            console.log(11, data)
             data.forEach(e => {
                 // 第一级路由,需要根据匹配到的path，塞进对应的路由children里
                 let str = e.path.split("/")[1];
@@ -79,7 +78,6 @@ function getPermission() {
                         e.children.forEach(i => {
                             // 避免重复生成路由
                             if (i.path && permissionRouters[index] && !permissionRouters[index].children.some(e => i.path === e.path)) {
-                                // console.log(i.path,'当前二级路由的路径')
                                 let obj = {
                                     path: i.path,
                                     name: arr[index] + "-" + i.path.split("/").pop(),
@@ -228,7 +226,6 @@ function getPermission() {
             });
             console.log(permissionRouters, "处理好的");
             const station = permissionRouters.findIndex(e => e.name === 'station')
-            console.log(333, station)
             if (station !== -1) {
                 permissionRouters[station].children.push({
                     name: `stationPreview`,
diff --git a/src/styles/common.scss b/src/styles/common.scss
index a215699..bcaf4d9 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -360,4 +360,21 @@
 }
 .el-switch__label span {
   font-size: 12px;
+}
+.el-tooltip__popper.is-dark {
+  padding: 18px 20px;
+  color: #606266;
+  line-height: 1.8;
+  background-color: #fff;
+  border: .0625rem solid #ebeef5;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+}
+.el-tooltip__popper[x-placement^="top"] {
+  .popper__arrow {
+    border-top-color: #fff;
+    &:after {
+      border-top-color: #fff;
+    }
+  }
 }
\ No newline at end of file