Merge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_occupationlab_server

src/api/index.js

@@ -14,11 +14,9 @@ export default {
 
     logins: `${host}users/users/user/login`, //登录
     verification: `${host}users/users/user/captcha`,// 验证码图片
-    // bindPhoneOrEmail:`${host}users/users/userAccount/bindPhoneOrEmail`,// 绑定手机
-    // sendPhoneOrEmailCode:`${host}users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码
 
     // 权限管理
-    getUserRolesPermissionMenu: `${host}users/user-role/getUserRolesPermissionMenu`, 
+    getUserRolesPermissionMenu: `${host}users/user-role/getUserRolesPermissionMenu`,
 
     //学生管理
     resetPassword: `${host}users/users/userAccount/resetPwd`, // 密码重置
@@ -87,18 +85,14 @@ export default {
     addProjectManage: `${host}occupationlab/projectManage/addProjectManage`, // 新增项目管理
     updateProjectManage: `${host}occupationlab/projectManage/updateProjectManage`, // 修改项目管理
     copyProjectManage: `${host}occupationlab/projectManage/copyProjectManage`, // 复制项目管理
-    
+
     // 判分点
     getBcJudgmentPoint: `${host}judgment/bcJudgmentPoint/getBcJudgmentPoint`, // 获取编程类判分点列表(分页)
     getLcJudgmentPoint: `${host}judgment/lcJudgmentPoint/queryAllJudgmentPoint`, // 获取流程类判分点列表(分页)
-
     addProjectJudgment: `${host}occupationlab/projectJudgment/addProjectJudgment`, // 添加项目管理、判分点中间表
     updateProjectJudgment: `${host}occupationlab/projectJudgment/updateProjectJudgment`, // 判分点中间表批量更新
     deleteProjectJudgment: `${host}occupationlab/projectJudgment/deleteProjectJudgment`, // 判分点中间表批量删除
 
-
-
-
     // 赛事管理
     addContest: `${host}occupationlab/enterprise/match/contest/addContest`,
     deleteContest: `${host}occupationlab/enterprise/match/contest/deleteContest`,
@@ -163,10 +157,25 @@ export default {
 
     // 阿里云文件/视频管理
     fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件
-    fileupload: `${uploadURL}oss/manage/fileUpload`, // 文件上传
+    fileupload: `${uploadURL}oss/manage/fileupload`, // 文件上传
     getPlayAuth: `${uploadURL}oss/manage/getPlayAuth`, // 获取播放凭证
+    removeMoreVideo: `${uploadURL}oss/manage/removeMoreVideo`, // 批量删除视频文件
+    removeVideo: `${uploadURL}oss/manage/removeVideo`, // 删除视频文件
 
+    queryProvince: `${host}nakadai/nakadai/province/queryProvince`, //查询省份
+    queryCity: `${host}nakadai/nakadai/city/queryCity`, //查询城市
+    querySchoolData: `${host}nakadai/nakadai/school/querySchool`, //根据学校名称查询学校信息
+    queryCourseDiscipline: `${host}nakadai/nakadai/subject/courseDiscipline`, //查询课程学科
+    queryCourseProfessionalClass: `${host}nakadai/nakadai/subject/courseProfessionalClass`, //查询专业类
+    queryCourseProfessional: `${host}nakadai/nakadai/subject/courseProfessional`, //查询专业
 
+    // 个人中心
+    uploadUserAvatars: `${host}users/users/userAccount/updateUserAvatars`, //更改头像
+    queryUserInfoDetails: `${host}users/users/userAccount/queryUserInfoDetails`,//个人中心信息展示
+    updatePersonCenter: `${host}users/users/userAccount/updatePersonCenter`,//个人中心信息修改
+    examinePassword: `${host}users/users/userAccount/examinePassword`,//更换密码
+    bindPhoneOrEmail: `${host}/users/users/userAccount/bindPhoneOrEmail`,// 绑定手机或邮箱
+    sendPhoneOrEmailCode: `${host}/users/users/userAccount/sendPhoneOrEmailCode`,// 更换手机号或邮箱--发送手机验证码
 
 
 
@@ -174,19 +183,7 @@ export default {
 
 
 
-
-
-    // getPlayAuth: `${host}occupationlab/oss/manage/getPlayAuth`,
-    removeMoreVideo: `${host}occupationlab/oss/manage/removeMoreVideo`,
-    removeVideo: `${host}occupationlab/oss/manage/removeVideo`,
-
-
     updateLogInNumber: `${host}liuwanr/userInfo/updateLogInNumber`, //用户登录修改登录次数和登陆时间
-    uploadUserAvatars: `${host}liuwanr/userInfo/uploadUserAvatars`, //上传头像
-    queryProvince: `${host}liuwanr/province/queryProvince`, //查询省份
-    queryCity: `${host}liuwanr/city/queryCity`, //查询城市
-    querySchoolData: `${host}liuwanr/customer/querySchool`, //根据学校名称查询学校信息
-
     queryAccountIsExist: `${host}liuwanr/userInfo/queryAccountIsExist`,//查询员工，学生账号是否存在接口
     queryWorkNumberIsExist: `${host}liuwanr/userInfo/queryWorkNumberIsExist`,//查询学号、工号是否存在
     querySchool: `${host}liuwanr/customer/querySchool`, //根据学校名称查询学校信息
@@ -201,21 +198,11 @@ export default {
     queryStaffGradeDetails: `${host}liuwanr/staffGrade/queryStaffGradeDetails`, //查询员工部门详情
     addStaffGrade: `${host}liuwanr/staffGrade/addStaffGrade`, //新增员工部门
     updateStaffGrade: `${host}liuwanr/staffGrade/updateStaffGrade`, //编辑员工部门
-    queryCourseDiscipline: `${host}liuwanr/course/queryCourseDiscipline`, //查询课程学科
-    queryCourseProfessionalClass: `${host}liuwanr/course/queryCourseProfessionalClass`, //查询专业类
-    queryCourseProfessional: `${host}liuwanr/course/queryCourseProfessional`, //查询专业
     queryPhone: `${host}liuwanr/user/queryPhone`, //查询电话是否存在
     queryEmail: `${host}liuwanr/user/queryEmail`, //查询邮箱是否存在
     queryStaffPAN: `${host}liuwanr/staffProfessionalArchitecture/queryStaffPAN`,//查询员工专业是否存在
 
-    // 个人中心
+
-    userinfo: `${host}evaluation/tms/userInfo/userinfo`,
-    userinfoUpdate: `${host}evaluation/tms/userInfo/updateUser`,
-    sendEmailCode: `${host}evaluation/tms/user/sendEmailCode`,//发送邮箱验证码
-    bingEmail: `${host}evaluation/tms/user/bingEmail`,//邮箱验证并更新
-    sendPhoneCode: `${host}evaluation/tms/user/sendPhoneCode`,//发送手机验证码
-    bindPhone: `${host}evaluation/tms/user/bindPhone`,//校验手机验证码
-    examinePassword: `${host}evaluation/tms/user/examinePassword`,//更换密码
 
     // 员工管理
     addStaff: `${host}evaluation/tms/system/addStaff`,

src/pages/setting/person/index.vue

@@ -383,7 +383,6 @@
 </template>
 
 <script>
-import Setting from "@/setting";
 import util from "@/libs/util";
 import { mapState, mapActions } from "vuex";
 

src/setting.js

@@ -42,9 +42,10 @@ if (isHh) {
     schoolId = 2105;
 } else if (isDev) {
     jumpPath = "http://192.168.31.154:8087/";
-    // host = "http://39.108.250.202:9000/"; // 中台测试服
+    host = "http://39.108.250.202:9000/"; // 中台测试服
     // host = "http://192.168.31.151:9000/"; // 榕
-    host = "http://192.168.31.125:9000/"; // 坤
+    // host = "http://192.168.31.125:9000/"; // 坤
+    // host = 'http://192.168.31.137:9000/'; // 赓
     title = "职站服务端管理系统";
     schoolId = 2105;
 } else {
@@ -109,7 +110,7 @@ const Setting = {
     dynamicRoute: false,
     // 文件上传
     upload: {
-        apiURL: "http://39.108.250.202:10000/",
+        apiURL: "http://39.108.250.202:9000/",
         maxSize: 30
     }
 };