diff --git a/src/pages/achievement/ass/index.vue b/src/pages/achievement/ass/index.vue
index 6164da1..e6f9822 100644
--- a/src/pages/achievement/ass/index.vue
+++ b/src/pages/achievement/ass/index.vue
@@ -56,8 +56,6 @@
                         {{ experimentalName }}
                     </template>
                 </el-table-column>
-                <el-table-column v-if="className" prop="class" label="班级" align="center">
-                </el-table-column>
                 <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="score" label="分数" align="center"></el-table-column>
diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index 933b8d0..6f78d13 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -173,7 +173,6 @@ export default {
                     let expData = res.userScores;
                     let form = this.form;
                     let score = form.score;
-
                     if (expData) {
                         if (score) {
                             expData.map(n => {
@@ -187,16 +186,16 @@ export default {
 
                         this.expData = expData;
                     }
-
                     this.infoData.push({
                         workNumber: form.workNumber,
                         experimentalClassName: form.experimentalClassName,
-                        instructor: form.instructor,
+                        instructor: form.teacherName,
                         period: form.period,
                         laboratory: form.laboratory,
                         submitTime: form.submitTime,
                         score: form.score,
-                        userName: form.userName
+                        userName: form.userName,
+                        className:form.className,
                     });
                 }).catch(res => {
                 });
@@ -230,12 +229,13 @@ export default {
                     this.infoData.push({
                         workNumber: form.workNumber,
                         experimentalClassName: form.experimentalClassName,
-                        instructor: form.instructor,
+                        instructor: form.teacherName,
                         period: form.period,
                         laboratory: form.laboratory,
                         submitTime: form.submitTime,
                         score: form.score,
-                        userName: form.userName
+                        userName: form.userName,
+                        className:form.className,
                     });
                 }).catch(res => {
                 });
diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue
index 3627c86..b78f8d1 100644
--- a/src/pages/achievement/teach/index.vue
+++ b/src/pages/achievement/teach/index.vue
@@ -163,7 +163,7 @@ export default {
                     },
                     responseType: 'blob'
                 }).then((res) => {
-                    util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+                    util.downloadFileDirect(`学生考核成绩.xls`,new Blob([res.data]))
                 }).catch(res => {})
             } else {
                 axios.get(`${this.api.exportAssessmentInfo}?assessmentId=${this.assessmentId}&classId=${this.classId}&ids=`,{
@@ -172,7 +172,7 @@ export default {
                     },
                     responseType: 'blob'
                 }).then((res) => {
-                    util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+                    util.downloadFileDirect(`学生考核成绩.xls`,new Blob([res.data]))
                 }).catch(res => {})
             }
         },
diff --git a/src/pages/achievement/vir/index.vue b/src/pages/achievement/vir/index.vue
index f73d1f9..36ce388 100644
--- a/src/pages/achievement/vir/index.vue
+++ b/src/pages/achievement/vir/index.vue
@@ -133,7 +133,7 @@ export default {
                     },
                     responseType: 'blob'
                 }).then((res) => {
-                    util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+                    util.downloadFileDirect(`学生练习成绩.xls`,new Blob([res.data]))
                 }).catch(res => {})
                 // location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=${ids.toString()}`;
             } else {
@@ -143,7 +143,7 @@ export default {
                     },
                     responseType: 'blob'
                 }).then((res) => {
-                    util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+                    util.downloadFileDirect(`学生练习成绩.xls`,new Blob([res.data]))
                 }).catch(res => {})
                 // location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=`;
             }
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 13e2c05..5e20733 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -99,7 +99,7 @@
             <el-table-column label="操作" align="center" width="170">
                 <template slot-scope="scope" v-if="scope.row.show">
                     <template v-if="scope.row.status == 0">
-                        <el-button v-if="auth('启动')" type="text" @click="start(scope.row)">启动</el-button>
+                        <el-button v-if="scope.row.type == 1" type="text" @click="start(scope.row)">启动</el-button>
                         <el-button v-if="auth('修改')" type="text" @click="edit(scope.row)">修改</el-button>
                     </template>
                     <template v-else-if="scope.row.status == 1">
diff --git a/src/pages/match/manage/index.vue b/src/pages/match/manage/index.vue
index 2a18e47..48eb140 100644
--- a/src/pages/match/manage/index.vue
+++ b/src/pages/match/manage/index.vue
@@ -51,7 +51,11 @@ export default {
     },
     beforeDestroy() {
         // 关闭所以EventBus事件
+<<<<<<< HEAD
        EventBus.$off()
+=======
+        EventBus.$off()
+>>>>>>> 8af271dbd54e96d906dc849c3b61128fbf4e7018
     },
     methods: {
         goBack() {
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index e34ffa0..54b1715 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -5,8 +5,8 @@
                 <div class="flex-between">
                     <el-page-header @back="goBack" content="项目配置"></el-page-header>
                     <div v-if="!isDetail">
-                        <el-button v-if="!projectId" type="success" @click="handleSubmit(0)">保存为草稿</el-button>
-                        <el-button type="primary" @click="handleSubmit(1)">确定并发布</el-button>
+                        <el-button v-if="!projectId && item != 0" type="success" @click="handleSubmit(0)">保存为草稿</el-button>
+                        <el-button v-if='item != 0' type="primary" @click="handleSubmit(1)">确定并发布</el-button>
                     </div>
                 </div>
             </el-card>
@@ -17,17 +17,17 @@
                     <el-form label-width="80px">
                         <div class="flex">
                             <el-form-item label="项目名称">
-                                <el-input :disabled="isDetail" v-model.trim="projectManage.projectName" placeholder="20个字符以内" @blur="projectNameExistis"></el-input>
+                                <el-input :disabled="isDetail || item == 0" v-model.trim="projectManage.projectName" placeholder="20个字符以内" @blur="projectNameExistis"></el-input>
                             </el-form-item>
                             <el-form-item label="项目权限">
-                                <el-select :disabled="isDetail" v-model="projectManage.permissions" placeholder="请选择">
+                                <el-select :disabled="isDetail || item == 0" v-model="projectManage.permissions" placeholder="请选择">
                                     <el-option label="练习" :value="0"></el-option>
                                     <el-option label="考核" :value="1"></el-option>
                                     <el-option label="竞赛" :value="2"></el-option>
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="系统">
-                                <el-select :disabled="isDetail" v-model="projectManage.systemId" placeholder="请选择" @change="systemChange">
+                                <el-select :disabled="isDetail || item == 0" v-model="projectManage.systemId" placeholder="请选择" @change="systemChange">
                                     <el-option
                                         v-for="item in systemList"
                                         :key="item.id"
@@ -46,7 +46,7 @@
                 <div>
                     <el-form label-width="0">
                         <el-form-item>
-                            <quill :border="true" :readonly="isDetail" v-model="projectManage.experimentTarget" :minHeight="150" :height="150" />
+                            <quill :border="true" :readonly="isDetail || item == 0" v-model="projectManage.experimentTarget" :minHeight="150" :height="150" />
                         </el-form-item>
                     </el-form>
                 </div>
@@ -57,7 +57,7 @@
                 <div>
                     <el-form label-width="0">
                         <el-form-item>
-                            <quill :border="true" :readonly="isDetail" v-model="projectManage.experimentDescription" :minHeight="150" :height="150" />
+                            <quill :border="true" :readonly="isDetail || item == 0" v-model="projectManage.experimentDescription" :minHeight="150" :height="150" />
                         </el-form-item>
                     </el-form>
                 </div>
@@ -76,13 +76,13 @@
                         <!-- <div>权重&emsp;<div class="dib"><el-input></el-input></div></div> -->
                     </div>
                     <div>
-                        <el-button :disabled="isDetail" class="m-r-20" type="text" @click="avgDistributionScore">平均分配分值</el-button>
-                        <el-button :disabled="isDetail" class="m-r-20" type="text" @click="manualDistributionScore">手动分配分值</el-button>
+                        <el-button :disabled="isDetail || item == 0" class="m-r-20" type="text" @click="avgDistributionScore">平均分配分值</el-button>
+                        <el-button :disabled="isDetail || item == 0" class="m-r-20" type="text" @click="manualDistributionScore">手动分配分值</el-button>
                         <span>(待分配分值: {{ handDistributionScore }}/100分)</span>
                     </div>
                 </div>
-                <el-button :disabled="isDetail" type="primary" icon="el-icon-plus" round @click="handleQueryJudgment" style="margin-bottom: 10px">判分点</el-button>
-                <el-button :disabled="isDetail" type="primary" icon="el-icon-delete" round @click="batchDeleteProjectJudgment" style="margin-bottom: 10px">批量删除</el-button>
+                <el-button :disabled="isDetail || item == 0" type="primary" icon="el-icon-plus" round @click="handleQueryJudgment" style="margin-bottom: 10px">判分点</el-button>
+                <el-button :disabled="isDetail || item == 0" type="primary" icon="el-icon-delete" round @click="batchDeleteProjectJudgment" style="margin-bottom: 10px">批量删除</el-button>
                 <div class="draggable">
                     <el-table
                         ref="projectJudgementTable"
@@ -110,13 +110,13 @@
                         <el-table-column label="操作" width="140" align="center">
                             <template slot-scope="scope">
                                 <!--<el-button :disabled="isDetail" type="text" style="margin-right: 10px" @click="toJudgePoint('edit', scope.row)">自定义</el-button>-->
-                                <el-button :disabled="isDetail" type="text" @click="delJudgePoint(scope.$index)">删除</el-button>
+                                <el-button :disabled="isDetail || item == 0" type="text" @click="delJudgePoint(scope.$index)">删除</el-button>
                             </template>
                         </el-table-column>
                         <el-table-column prop="score" label="分数" align="center">
                             <template slot-scope="scope">
                                 <!--type="number" @blur="updateProjectJudgment"-->
-                                <el-input :disabled="isDetail" v-model.trim="scope.row.score" @input="scoreChange(scope.row, scope.$index,$event)"></el-input>
+                                <el-input :disabled="isDetail || item == 0" v-model.trim="scope.row.score" @input="scoreChange(scope.row, scope.$index,$event)"></el-input>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -128,13 +128,13 @@
                     <h6 class="p-title" style="margin-bottom: 0">实验提示</h6>
                     <div>
                         启用
-                        <el-switch :disabled="isDetail" :active-value="0" :inactive-value="1" v-model="projectManage.hintOpen"></el-switch>
+                        <el-switch :disabled="isDetail || item == 0" :active-value="0" :inactive-value="1" v-model="projectManage.hintOpen"></el-switch>
                     </div>
                 </div>
                 <div>
                     <el-form label-width="0">
                         <el-form-item prop="tips" label="">
-                            <quill :border="true" :readonly="isDetail" v-model="projectManage.experimentHint" :minHeight="150" :height="150" />
+                            <quill :border="true" :readonly="isDetail || item == 0" v-model="projectManage.experimentHint" :minHeight="150" :height="150" />
                         </el-form-item>
                     </el-form>
                 </div>
@@ -193,6 +193,7 @@ export default {
     data() {
         return {
             projectId: this.$route.query.projectId,
+            item: this.$route.query.item,
             systemList: [],
             token: util.local.get(Setting.tokenKey),
             isDetail: Boolean(this.$route.query.show),
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index 8adc55c..3e075f0 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -86,7 +86,8 @@
                 </el-table-column>
                 <el-table-column label="操作">
                     <template slot-scope="scope">
-                        <el-button v-if="scope.row.founder != 0" type="text" @click="edit(scope.row)">编辑</el-button>
+                        <el-button type="text" @click="edit(scope.row,'0')">查看</el-button>
+                        <el-button v-if="scope.row.founder != 0" type="text" @click="edit(scope.row,'1')">编辑</el-button>
                         <el-button v-if="scope.row.founder != 0" type="text" @click="handleDelete(scope.row.projectId)">删除</el-button>
                         <el-button v-if="auth('复制')" type="text" @click="copyData(scope.row.projectId)">复制</el-button>
                         <el-switch
@@ -102,8 +103,7 @@
                 </el-table-column>
             </el-table>
             <div class="pagination">
-                <el-pagination background @current-change="handleCurrentChange" :current-page="page"
-                               layout="total, prev, pager, next" :total="total"></el-pagination>
+                <el-pagination background @current-change="handleCurrentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
             </div>
 
             <el-dialog title="复制" :visible.sync="copyVisible" width="24%" center :close-on-click-modal="false">
@@ -271,9 +271,9 @@ export default {
             this.setSystemId(this.systemId);
             this.$router.push("/project/add");
         },
-        edit(row) { // 编辑
+        edit(row,item) { // 编辑
             this.setSystemId(row.systemId);
-            this.$router.push(`/project/add?projectId=${row.projectId}`);
+            this.$router.push(`/project/add?projectId=${row.projectId}&item=${item}`);
         },
         handleSelectionChange(val) { // 处理多选
             this.multipleSelection = val;
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index cbd3b01..f95cec4 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -176,7 +176,7 @@ export default {
             },
             rules: {
                 account: [
-                    { validator: accountPass, trigger: 'blur' }
+                    { required: true, validator: accountPass, trigger: 'blur' }
                 ],
                 userName: [
                     { required: true, message: "请输入用户姓名", trigger: "blur" }
@@ -185,7 +185,7 @@ export default {
                     { required: true, message: "请选择账号角色", trigger: "change" }
                 ],
                 workNumber: [
-                    { validator: workNumberPass , trigger: 'blur' }
+                    { required: true, validator: workNumberPass , trigger: 'blur' }
                 ],
                 uniqueIdentification: [
                     // { required: true, message: '请输入唯一标识', trigger: 'blur' },
@@ -471,7 +471,7 @@ export default {
             }
         },
         roleRemove(value) { // 处理移除角色
-            let index = this.teacherForm.roleAndDeptList.findIndex(i => i.roleId === value);
+            let index = this.teacherForm.roleAndDeptList.findIndex(i => i.roleName === value);
             if (index !== -1) {
                 this.teacherForm.roleAndDeptList.splice(index, 1);
             }
diff --git a/src/router/index.js b/src/router/index.js
index f0c8967..2431210 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -268,7 +268,11 @@ router.beforeEach(function(to, from, next) {
     }
     // 根据路由元信息设置文档标题
     // window.document.title = to.meta.title ? to.meta.title : "";
+<<<<<<< HEAD
     window.document.title = "教师管理端"
+=======
+    window.document.title = "职站教师端"
+>>>>>>> 8af271dbd54e96d906dc849c3b61128fbf4e7018
     next();
 
 });
\ No newline at end of file