完善功能，bug修复

src/api/index.js

@@ -11,6 +11,7 @@ export default {
     // 登录
     logins: `${host}users/users/user/login`, //登录
     verification: `${host}users/users/user/captcha`,// 验证码图片
+    logoDetail: `${host}occupationlab/sys/logo/detail`, //查看系统设置信息
 
     //实验台
     curriculumDetail: `${host}nakadai/nakadai/curriculum/curriculumDetail`, // 课程详情
@@ -96,121 +97,6 @@ export default {
 
 
 
-    // logins: `${loginhost}userInfo/logins`, //登录
-    updateLogInNumber: `${loginhost}userInfo/updateLogInNumber`, //用户登录修改登录次数和登陆时间
-
-    loginSchool: `${loginhost}userInfo/loginSchoolClient`, //登陆查询学校
-    loginRole: `${loginhost}userInfo/loginRole`, //登陆查询角色
-    save: `${host}tms/userInfo/add`, //注册
-
-    queryToken: `${loginhost}userInfo/queryToken`,
-    queryWorkNumberIsExist: `${loginhost}userInfo/queryWorkNumberIsExist`,//查询学号、工号是否存在
-    queryAccountIsExist: `${loginhost}userInfo/queryAccountIsExist`,//查询员工，学生账号是否存在接口
-
-    addStuPro: `${host}stuProfessionalArchitecture/addStuProfessionalArchitecture`, //添加学生专业
-    queryStuPro: `${host}stuProfessionalArchitecture/queryStuProfessionalArchitecture`, //查询学生专业
-    // queryStuGrade: `${host}stuProfessionalArchitecture/queryStuGrade`, //查询学生年级
-    // queryStuClass: `${host}stuProfessionalArchitecture/queryStuClass`, //查询学生班级
-    deleteStuPro: `${host}stuProfessionalArchitecture/deleteStuProfessionalArchitecture`, //删除学生专业
-    updateStuPro: `${host}stuProfessionalArchitecture/updateStuProfessionalArchitecture`, //编辑学生专业
-
-    findPasswordByEmail: `${host}tms/userInfo/findPasswordByEmail`,
-    findPasswordByPhone: `${host}tms/userInfo/findPasswordByPhone`,
-    resetPassword: `${host}tms/userInfo/resetPassword`,
-    checkCode: `${host}tms/userInfo/checkCode`,
-
-    queryStudentData: `${host}student/queryStudent`, //查询学生
-    queryStudentDetails: `${host}student/queryStudentDetails`, //查询学生详情
-    addStudent: `${host}student/addStudent`, //添加学生
-    deleteStudent: `${host}student/deleteStudent`, //删除学生
-    updateStudent: `${host}student/updateStudent`, //编辑学生
-    updateStuGrade: `${host}stuProfessionalArchitecture/updateStuGrade`, //编辑学生年级
-    addStuGrade: `${host}stuProfessionalArchitecture/addStuGrade`, //添加学生年级
-    deleteStuGrade: `${host}stuProfessionalArchitecture/deleteStuGrade`, //删除学生年级
-    updateStuClass: `${host}stuProfessionalArchitecture/updateStuClass`, //编辑学生班级
-    addStuClass: `${host}stuProfessionalArchitecture/addStuClass`, //添加学生班级
-    deleteStuClass: `${host}stuProfessionalArchitecture/deleteStuClass`, //删除学生班级
-
-    queryPersonalCenter: `${host}personalCenter/queryPersonalCenter`,
-    addStaffPro: `${host}staffProfessionalArchitecture/addStaffProfessionalArchitecture`, //添加员工专业
-    queryStaffPro: `${host}staffProfessionalArchitecture/queryAllStaffProfessionalArchitecture`, //查询员工专业
-    deleteStaffPro: `${host}staffProfessionalArchitecture/deleteStaffProfessionalArchitecture`, //删除员工专业
-    deleteStaffGrade: `${host}staffGrade/deleteStaffGrade`, //删除员工部门
-    updateStaffPro: `${host}staffProfessionalArchitecture/updateStaffProfessionalArchitecture`, //编辑员工专业
-    queryStaffGrade: `${host}staffGrade/queryStaffGrade`, //查询员工部门
-    queryStaffGradeDetails: `${host}staffGrade/queryStaffGradeDetails`, //查询员工部门详情
-    addStaffGrade: `${host}staffGrade/addStaffGrade`, //新增员工部门
-    updateStaffGrade: `${host}staffGrade/updateStaffGrade`, //编辑员工部门
-
-    queryPhone: `${loginhost}userInfo/queryPhone`, //查询电话是否存在
-
-    queryStaff: `${host}staff/queryStaff`, //查询员工
-    addStaff: `${host}staff/addStaff`, //添加员工
-    queryStaffDetails: `${host}staff/queryStaffDetails`, //员工详情
-    deleteStaff: `${host}staff/deleteStaff`, //删除员工
-    updateStaff: `${host}staff/updateStaff`, //更新员工
-    readStaff: `${host}staff/readStaff`, //上传员工模板
-
-    queryGetByClassName: `${host}makeuplist/queryGetByClassName`,
-    deleteExperimentalClass: `${host}experimentalClass/deleteExperimentalClass`,//删除实验班级
-    queryAssesmentcondition: `${host}assesment/queryAssesmentcondition`,//考核成绩表格
-    queryGetById: `${host}assesment/queryGetById`,//查询考核信息
-    updateAssesment: `${host}assesment/updateAssesment`,//修改考核
-    // updateState: `${host}assesment/updateState`,//点击启动修改考核时间
-    updateAssesmentTime: `${host}assesment/updateAssesmentTime`,//点击提前结束获取当前时间
-    queryAssesmentScore: `${host}assesment/queryAssesmentScore`,//获取查询成绩页面
-    queryAssesmentAchievement: `${host}assesment/queryAssesmentAchievement`,//查询成绩明细板块
-    excelExport: `${host}makeuplist/excelExport`,//模板下载
-    importMakeuplist: `${host}makeuplist/importMakeuplist`, //模板上传
-    queryAllExperiment: `${host}experiment/queryAllExperiment`,//实验项目渲染，
-    queryAttendanceSignIn: `${host}attendance/queryAttendanceSignIn`,//获得用户ID 及考勤总数
-    insertAttendance: `${host}Experimentallearning/insertAttendance`,//改变签到状态
-    queryExperimentallearning: `${host}Experimentallearning/queryExperimentallearning`,//获取项目名和签到状态
-    queryCourseDetails: `${host}course/queryCourseDetails`,//获取课程简介和课程目标
-    queryTeacherName: `${host}Experimentallearning/queryTeacherName`,//获取教师信息
-    queryStudentName: `${host}Experimentallearning/queryStudentName`,//获取学生信息
-    queryPracticeVo: `${host}experiment/queryPracticeVo`,//获取表格数据
-    queryStudentAssessment: `${host}assesmentRecord/queryStudentAssessment`, //查询姓名和个人平均分和最高分
-    queryAssesmentRecordMaxScore: `${host}assesmentRecord/queryAssesmentRecordMaxScore`, //查询学校平均分最高分
-    queryAssesmentRecordWhole: `${host}assesmentRecord/queryAssesmentRecordWhole`,//查询全国平均考核得分
-    queryAssesmentRecordMaxWhole: `${host}assesmentRecord/queryAssesmentRecordMaxWhole`, //查询全国平均分最高分
-    queryStudentByPage: `${host}experiment/queryStudentByPage`, //查询练习记录表格数据
-    queryProject: `${host}ProjectAndCourse/queryProject`,//实验项目信息展示
-    updateIsExperiment: `${host}ProjectAndCourse/updateIsExperiment`,//修改是否开启项目
-    updateIsAttendance: `${host}ProjectAndCourse/updateIsAttendance`,//修改是否考勤
-    addAssesment: `${host}assesment/addAssesment`,//添加考核
-    queryStuProfessionalArchitecture: `${host}stuProfessionalArchitecture/queryStuProfessionalArchitecture`,//修改是否考勤
-    queryStuGrade: `${host}stuProfessionalArchitecture/queryStuGrade`,//修改是否考勤
-    queryStuClass: `${host}stuProfessionalArchitecture/queryStuClass`,//修改是否考勤
-    queryStudent: `${host}stuProfessionalArchitecture/queryStudent`,//修改是否考勤
-    queryAttendanceDetailed: `${host}attendance/queryAttendanceDetailed`,//获取考勤列表数据
-
-    queryExperimentClass: `${host}experimentalClass/queryExperimentalClass`,//查询实验班级
-    queryExperimentalClassSP: `${host}experimentalClass/queryExperimentalClassSP`,//查询实验班级学生专业
-    queryStudentClass: `${host}experimentalClass/queryStudentClass`,//查询学生行政班级
-    queryClassDetails: `${host}experimentalClass/queryExperimentClassDetails`,//查询实验班级详情
-    updateClassName: `${host}experimentalClass/updateExperimentClassName`,//修改实验班级名称
-    updateState: `${host}assesment/updateState`,//修改考核状态
-    experimentClassDeleteStudent: `${host}experimentalClass/experimentClassDeleteStudent`, //移除实验班学生
-    addExperimentalClass: `${host}experimentalClass/addExperimentalClass`,//添加实验班级
-    platformQueryCourse: `${host}course/platformQueryCourse`,
-    queryAssesment: `${host}Experimentallearning/queryAssesment`,
-    getCourse: `${host}course/getCourse`,//获取课程简介，教学目标，课程名称
-    getProfessionals: `${host}experimentalClass/getProfessionals`,// 请求专业下拉框数据
-    getStudentClass: `${host}experimentalClass/getStudentClass`,//请求行政班级下拉框数据
-    getCourseSchedule: `${host}ProjectAndCourse/getCourseSchedule`,//课程进度
-    releaseAssesment: `${host}assesment/releaseAssesment`,//发布考核
-    experimentClassAddStudent: `${host}experimentalClass/experimentClassAddStudent`,//发布考核
-    getExperimentalClass: `${host}assesment/getExperimentalClass`,//实验班级一级标题
-    getCreationTime: `${host}assesment/getCreationTime`,//实验班级二级标题
-    deleteAssesment: `${host}assesment/deleteAssesment`,//删除考核
-    queryStudentCourse: `${host}Experimentallearning/queryStudentCourse`,//学生查询课程
-    getByCourseId: `${host}assesment/getByCourseId`,//查询系统列表
-    getCoursevideo: `${host}tms/classTech/simulationPlayList`,//开始课程-课程视频
-    queryStaffPAN: `${host}staffProfessionalArchitecture/queryStaffPAN`,//查询员工专业是否存在
-    queryStudentisAssess: `${host}assesment/queryStudentisAssess`,//查看正在参与考核的学生
-
-
 
 
 

src/layouts/header/index.vue

@@ -2,8 +2,10 @@
     <div class="header">
         <div v-if="this.$route.path=='/setting/person'" class="goBack" @click="back"><i class="el-icon-arrow-left"></i>返回</div>
         <template v-else>
-            <img class="logo hh" v-if="isHh" src="@/assets/img/logo-hh.png" />
-            <img class="logo" v-else src="@/assets/img/logo.png">
+            <div>
+                <img class="logo" :src="logoUrl" />
+                <span class="title">{{title}}</span>
+            </div>
         </template>
         <div class="header-right">
             <div class="header-user-con">
@@ -30,7 +32,7 @@ export default {
     },
     computed: {
         ...mapState("user", [
-            "avatar", "userName"
+            "title", "logoUrl", "avatar", "userName"
         ])
     },
     mounted() {
@@ -38,12 +40,22 @@ export default {
     },
     methods: {
         ...mapActions("user", [
-            "logout", "setAvatar", "setUserName"
+            "logout", "setTitle", "setLogoUrl", "setAvatar", "setUserName"
         ]),
+        getSystemDetail () {
+            this.$get(this.api.logoDetail).then(res => {
+                if (res.status === 200) {
+                    if (res.data) {
+                        this.setTitle(res.data.title);
+                        this.setLogoUrl(res.data.logoUrl);
+                    }
+                }
+            }).catch(res => {});
+        },
         getUserInfo() {
             this.$get(this.api.queryUserInfoDetails).then(res => {
                 let {userAvatars, userName} = res.result.hrUserInfo;
-                this.setAvatar(userAvatars);
+                userAvatars && this.setAvatar(userAvatars);
                 this.setUserName(userName);
             }).catch(err => {})
         },

src/pages/account/login/index.vue

@@ -1,8 +1,5 @@
 <template>
     <div class="wrap">
-        <div class="header">
-            <img class="logo" src="@/assets/img/logo.png" />
-        </div>
         <div class="bg">
             <div class="left">
                 <div class="text">
@@ -214,27 +211,11 @@ export default {
     height: 100%;
     overflow: hidden;
 
-    .header {
-        width: 100%;
-        height: 60px;
-        background-color: #fff;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        font-size: 18px;
-        box-shadow: 1px 1px 3px 2px #ececec;
-
-        .logo {
-            width: 150px;
-            margin-left: 20px;
-        }
-    }
-
     .bg {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        height: calc(100% - 116px);
+        height: calc(100% - 56px);
 
         .left {
             position: relative;

src/pages/ass/list/index.vue

@@ -53,7 +53,7 @@
                     </li>
                     <li>
                         <label>课程名称</label>
-                        <el-select size="small" v-model="form.systemId" @change="initData">
+                        <el-select size="small" v-model="form.curriculumId" @change="initData">
                             <el-option label="不限" value=""></el-option>
                             <el-option
                                 v-for="(item,index) in courseList"
@@ -165,7 +165,7 @@ export default {
                 startTime: "",
                 endTime: "",
                 status: "",
-                systemId: "",
+                curriculumId: "",
                 classId: ""
             },
             keyword: "",
@@ -369,7 +369,7 @@ export default {
                 invitationCode: Number(this.invitationCode)
             };
             this.$post(this.api.joinPractice, data).then(res => {
-                if (res.errmessage == "success") {
+                if (res.status == 200) {
                     util.successMsg("验证成功！");
                     this.icVisible = false;
                     setTimeout(() => {
@@ -390,9 +390,9 @@ export default {
             util.cookies.set("projectId", this.curRow.projectId);
             util.cookies.set("startTime", this.curRow.startTime);
             util.cookies.set("stopTime", this.curRow.stopTime);
-            let systemId = this.curRow.systemId;
+            let curriculumId = this.curRow.curriculumId;
             let href = "";
-            switch (systemId) {
+            switch (curriculumId) {
                 case 1:
                     href = `${host}pyTrials/#/`;
                     break;

src/pages/setting/person/index.vue

@@ -720,7 +720,7 @@ export default {
             data.userid = this.userId;
             this.$post(this.api.examinePassword, data)
                 .then(res => {
-                    if (res.errmessage == "success") {
+                    if (res.status === 200) {
                         util.successMsg("更换成功");
                         this.passwordVisible = false;
                     }

src/pages/station/preview/index.vue

@@ -131,7 +131,7 @@ export default {
     },
     computed: {
         ...mapState("user", [
-            "userId", "schoolId", "studentId", "roleId", "userName"
+            "userId", "studentId", "roleId", "userName"
         ])
     },
     mounted() {
@@ -312,7 +312,6 @@ export default {
             if (type != 21 && type != 22) {
                 util.cookies.set("userId", this.userId);
                 util.cookies.set("studentId", this.studentId);
-                util.cookies.set("schoolId", this.schoolId);
                 util.cookies.set("assessmentId", "", -1);
                 util.cookies.set("projectId", "", -1);
                 util.cookies.set("startTime", "", -1);

src/plugins/requests/index.js

@@ -36,7 +36,7 @@ service.interceptors.response.use(
         } else if (!res.status) {
             return Promise.resolve(res).catch(e => {});
         } else {
-            util.errorMsg(res.errmessage || res.message);
+            util.errorMsg(res.message);
             return Promise.resolve(res).catch(e => {});
         }
     },

src/store/modules/user.js

@@ -39,7 +39,7 @@ export default {
         login({ state, commit }, userInfo) {
             return new Promise((resolve, reject) => {
                 post(api.logins, userInfo).then(res => {
-                    console.log(JSON.stringify(res));
+                    // console.log(JSON.stringify(res));
                     if (res.status == 200) {
                         let { data } = res;
                         // 生成路由权限
@@ -48,11 +48,11 @@ export default {
                         //res.message.listValue && Setting.dynamicRoute && addRoutes(res.message.listValue)
                         util.local.set(Setting.tokenKey, data.token, Setting.tokenExpires);
                         util.successMsg("登录成功");
-                        console.log(data, "登录保存的数据");
+                        // console.log(data, "登录保存的数据");
                         commit("SET_INFO", data);
                         resolve();
                     } else {
-                        util.errorMsg(res.errmessage || res.message);
+                        util.errorMsg(res.message);
                         reject(res);
                     }
                 }).catch(error => {