diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 115812c..f72e487 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -8,10 +8,10 @@
             <el-dropdown class="user-wrap" @command="userCommand">
                 <div class="user">
                     <el-avatar :size="40" :src="avatar"></el-avatar>
-                    <span class="m-l-10">{{ customer ? customerName : userName }}</span>
+                    <span class="m-l-10">{{ customerName || userName }}</span>
                 </div>
                 <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item v-if="!customer" command="person">个人中心</el-dropdown-item>
+                    <el-dropdown-item v-if="!customerName" command="person">个人中心</el-dropdown-item>
                     <el-dropdown-item v-else command="resetPw">修改密码</el-dropdown-item>
                 </el-dropdown-menu>
             </el-dropdown>
@@ -58,6 +58,7 @@ export default {
         ])
     },
     mounted() {
+        console.log(33, this.customer, this.userName)
         this.getSystemDetail();
         this.getUserDetail();
     },
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index c9de844..bdf557c 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -131,13 +131,16 @@ export default {
                         if (res && res.status == 30001) {
                             this.phoneVisible = true;
                         }
-                        this.getVerImg();
-                        this.loginForm.code = "";
+                        this.getVerImg()
+                        this.loginForm.code = ''
                         util.local.set(Setting.tokenKey, res.data.token, Setting.tokenExpires);
                         this.SET_FROM(false)
                         this.getRole()
                         this.queryCustomer()
-                    }).catch(res => {})
+                    }).catch(res => {
+                        this.getVerImg()
+                        this.loginForm.code = ''
+                    })
                 } else {
                     return util.errorMsg("请检查表单数据");
                 }
@@ -153,7 +156,7 @@ export default {
             this.$get(this.api.isClient).then(res => {
                 util.successMsg("登录成功");
                 this.setCustomer(res.customer);
-                this.setCustomerName(res.customerName);
+                res.customerName && this.setCustomerName(res.customerName);
                 // let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index";
                 this.$router.replace('/index');
             }).catch(res => {});
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index a41741a..a808c55 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -102,21 +102,21 @@
                         </el-table-column>
                         <el-table-column prop="name" label="判分指标" align="center"></el-table-column>
                         <el-table-column prop="name" label="判分点名称" align="center"></el-table-column>
-                        <el-table-column label="实验要求" align="center">
+                        <el-table-column label="实验要求" align="center" width="600">
                             <template slot-scope="scope">
                                 <quill :border="true" :readonly="true" elseRead="true" v-model="scope.row.experimentalRequirements" :minHeight="150" :height="150" />
                             </template>
                         </el-table-column>
-                        <el-table-column label="操作" width="140" align="center">
+                        <el-table-column prop="score" label="分数" align="center" width="120">
                             <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 || item == 0" type="text" @click="delJudgePoint(scope.$index)">删除</el-button>
+                                <!--type="number" @blur="updateProjectJudgment"-->
+                                <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-column prop="score" label="分数" align="center">
+                        <el-table-column label="操作" width="100" align="center">
                             <template slot-scope="scope">
-                                <!--type="number" @blur="updateProjectJudgment"-->
-                                <el-input :disabled="isDetail || item == 0" v-model.trim="scope.row.score" @input="scoreChange(scope.row, scope.$index,$event)"></el-input>
+                                <!--<el-button :disabled="isDetail" type="text" style="margin-right: 10px" @click="toJudgePoint('edit', scope.row)">自定义</el-button>-->
+                                <el-button :disabled="isDetail || item == 0" type="text" @click="delJudgePoint(scope.$index)">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -142,13 +142,14 @@
         </el-form>
 
         <!--选择判分点对话框-->
-        <el-dialog title="添加判分点" v-loading="visibleLoading" :visible.sync="dialogVisible" width="40%" :close-on-click-modal="false">
+        <el-dialog title="添加判分点" :visible.sync="dialogVisible" width="40%" :close-on-click-modal="false">
             <div class="text-right m-b-10">
                 <div>
                     <el-input placeholder="请输入需要查找的判分点" prefix-icon="el-icon-search" v-model.trim="judgementpointsquery" clearable></el-input>
                 </div>
             </div>
             <el-table
+                v-loading="visibleLoading"
                 :data="judgementData"
                 ref="judgementTable"
                 class="table"
@@ -196,7 +197,7 @@ export default {
             item: this.$route.query.item,
             founder: this.$route.query.founder,
             systemList: [],
-            token: util.local.get(Setting.tokenKey),
+            token: btoa(util.local.get(Setting.tokenKey)),
             isDetail: Boolean(this.$route.query.show),
 
             projectManage: {
@@ -601,10 +602,10 @@ export default {
                     console.log(systemId);
                 } else if (systemId == 11) {
                     // 交易类判分点（银行综合系统）
-                    href = `${jumpPath}#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
+                    href = `${jumpPath}#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${window.btoa(location.href)}`;
                 } else {
                     // 编程类判分点（python子系统）
-                    href = `${jumpPath}#/program?isView=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
+                    href = `${jumpPath}#/program?isView=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${window.btoa(location.href)}`;
                 }
             } else if (type === "edit") {
                 // 自定义（老师端隐藏此功能）
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index a813050..884898c 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -74,6 +74,7 @@
                     <el-cascader
                         v-model="item.cascaderValue"
                         :options="orgList"
+                        :props="casProps"
                         style="width: 100%"
                     ></el-cascader>
                 </el-form-item>
@@ -161,6 +162,9 @@ export default {
             teacherVisible: false,
             roleList: [], // 角色列表
             orgList: [], // 员工组织架构列表
+            casProps: {
+                value: 'id'
+            },
             teacherForm: {
                 accountId: "",
                 account: "",
@@ -304,18 +308,17 @@ export default {
             this.isAdd = true;
             this.teacherVisible = true;
             this.orgList = this.$refs.org.orgList;
-            // console.log(JSON.stringify(this.orgList));
         },
         getStaffDetail(accountId) { // 获取员工详情
             this.$get(`${this.api.staffDetail}?accountId=${accountId}`).then(res => {
                 let { data } = res;
                 this.teacherForm = data;
-                // this.roleList = data.roleAndDeptList
-                this.teacherForm.roleValue = data.roleAndDeptList.map(i => i.roleName);
+                this.teacherForm.roleValue = data.roleAndDeptList.map(i => i.roleId);
                 this.teacherForm.roleAndDeptList = data.roleAndDeptList.map(i => {
                     i.cascaderValue = [i.staffArchitectureId, i.gradeId]
                     return i;
                 });
+                console.log(22, this.teacherForm)
             }).catch(res => {});
         },
         resetPassword(row) { // 重置密码
diff --git a/src/router/index.js b/src/router/index.js
index af8fcd5..d80cecb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -229,7 +229,7 @@ function getPermission() {
             console.log(permissionRouters, "处理好的");
             const station = permissionRouters.findIndex(e => e.name === 'station')
             console.log(333, station)
-            if (station) {
+            if (station !== -1) {
                 permissionRouters[station].children.push({
                     name: `stationPreview`,
                     path: `/station/preview`,
@@ -243,7 +243,7 @@ function getPermission() {
             router.app.$options.store.commit("routers", nav);
             let redirect = [{
                 path: "/index",
-                redirect: station ? '/station' : permissionRouters[0].path
+                redirect: station !== -1 ? '/station' : permissionRouters[0].path
             }];
             router.addRoutes(redirect);
             router.addRoutes(permissionRouters);
diff --git a/src/setting.js b/src/setting.js
index cdbd4cd..81ad999 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -37,11 +37,11 @@ if (isHh) {
     bankPath = `${bankPath}/banksystem`
     title = "职站服务端管理系统";
 } else if (isDev) {
-    jumpPath = "http://192.168.31.154:8087/";
+    jumpPath = "http://192.168.31.125:8087/";
     bankPath = `http://192.168.31.125:8093`
     // host = "http://www.occupationlab.com:9000/";//线上
-    // host = "http://39.108.250.202:9000/"; // 中台测试服
-    host = "http://192.168.31.151:9000/"; // 榕
+    host = "http://39.108.250.202:9000/"; // 中台测试服
+    // host = "http://192.168.31.151:9000/"; // 榕
     // host = 'http://192.168.31.137:9000/'; // 赓
     title = "职站服务端管理系统";
 } else {