diff --git a/apiCa/job.js b/apiCa/job.js index e478386..431db35 100644 --- a/apiCa/job.js +++ b/apiCa/job.js @@ -2,10 +2,10 @@ import request from '@/utilCa/request.js' const api = {} // 获取职业大类 中类 -api.queryJobDictionaryListByParentCode = (code) => request.globalRequest(`/Job/QueryJobDictionaryListByParentCode?code=${code}`,'GET', {}, 1,3) +api.queryJobDictionaryListByParentCode = (code) => request.globalRequest(`/Job/QueryJobDictionaryListByParentCode?code=${code}`,'GET', {}, 1) // 搜索 -api.queryJobListByParentCode = (name,code) => request.globalRequest(`/Job/QueryJobListByParentCode?name=${name}&code=${code}`,'GET', {}, 1,3) +api.queryJobListByParentCode = (name,code) => request.globalRequest(`/Job/QueryJobListByParentCode?name=${name}&code=${code}`,'GET', {}, 1) // 职业详情 -api.queryJobDetailById = (id) => request.globalRequest(`/Job/QueryJobDetailById?id=${id}`,'GET', {}, 2,3) +api.queryJobDetailById = (id) => request.globalRequest(`/Job/QueryCeremonyDetail?id=${id}`,'GET', {}, 2) export default api diff --git a/apiCa/studentProfile.js b/apiCa/studentProfile.js index 40fe498..9a64032 100644 --- a/apiCa/studentProfile.js +++ b/apiCa/studentProfile.js @@ -2,31 +2,32 @@ import request from '@/utilCa/request.js' const api = {} // 获取生涯罗盘 -api.getCareerCompassList = (name) => request.globalRequest(`/StudentProfile/GetCareerCompassList`,'GET', {}, 1) +api.getCareerCompassList = (name) => request.globalRequest(`/GXCareerPlan/GetGXWechatCoursePlanList`,'GET', {}) // 保存生涯罗盘--职业方向 -api.saveGXCareerPlan = (jobId) => request.globalRequest(`/StudentProfile/SaveGXCareerPlan?jobId=${jobId}`,'POST', {}, 1) +api.saveGXCareerPlan = (jobId) => request.globalRequest(`/GXCareerPlan/SaveGXCareerPlan?jobId=${jobId}`,'POST', {}) // 生涯罗盘--获取职业规划 -api.getGXCareerPlanList = (keyword,page,ps) => request.globalRequest(`/StudentProfile/GetGXCareerPlanList?keyword=${keyword}&page=${page}&ps=${ps}`,'GET', {}, 1) +api.getGXCareerPlanList = (keyword,page,ps) => request.globalRequest(`/GXCareerPlan/GetGXCareerPlanList?keyword=${keyword}&page=${page}&ps=${ps}`,'GET', {}) // smart目标制定：获取学习目标 -api.querySmartTargets = () => request.globalRequest(`/StudentProfile/QuerySmartTargets`,'GET', {}, 1) +api.querySmartTargets = () => request.globalRequest(`/GXStudent/QuerySmartTargets`,'GET', {}) // smart目标制定：获取单个目标 -api.querySmartInfo = (encodeId) => request.globalRequest(`/StudentProfile/QuerySmartInfo?encodeId=${encodeId}`,'GET', {}, 1) +api.querySmartInfo = (encodeId) => request.globalRequest(`/GXStudent/QuerySmartInfo?encodeId=${encodeId}`,'GET', {}) // smart目标制定：保存smart目标 -api.saveSmartTarget = (data) => request.globalRequest(`/StudentProfile/SaveSmartTarget`,'POST', data, 1) +api.saveSmartTarget = (data) => request.globalRequest(`/GXStudent/SaveSmartTargetNew`,'POST', data) // smart目标制定：删除Smart目标 -api.deleteSmartTarg = (encodeId) => request.globalRequest(`/StudentProfile/DeleteSmartTarg?encodeId=${encodeId}`,'POST', {}, 1) +api.deleteSmartTarg = (encodeId) => request.globalRequest(`/GXStudent/DeleteSmartTarg?encodeId=${encodeId}`,'POST', {}) // smart目标制定：获取年度计划 -api.queryPlanList = (encodeId) => request.globalRequest(`/StudentProfile/QueryPlanList?encodeId=${encodeId}`,'GET', {}, 1) +api.queryPlanList = (encodeId) => request.globalRequest(`/GXStudent/QueryPlanList?encodeId=${encodeId}`,'GET', {}) // smart目标制定：保存年度计划 -api.savePlanList = (data) => request.globalRequest(`/StudentProfile/SavePlanList`,'POST', data, 1) +api.savePlanList = (data) => request.globalRequest(`/GXStudent/SavePlanListNew`,'POST', data) + // 获取生涯档案（高校 -api.getGXWechatStudentProfile = () => request.globalRequest(`/StudentProfile/GetGXWechatStudentProfile`,'GET', {}, 1) +api.getGXWechatStudentProfile = () => request.globalRequest(`/GXStudentProfile/GetGXStudentProfile`,'GET', {}) //获取职业路径职业列表 -api.queryCareerPath = () => request.globalRequest(`/StudentManage/QueryCareerPath`,'POST', {}, 1) +api.queryCareerPath = () => request.globalRequest(`/GXStudent/QueryCareerPath`,'POST', {}) // 获取职业详情，参数encodeId 加密id -api.queryPathInfo = (encodeId) => request.globalRequest(`/StudentManage/QueryPathInfo?encodeId=${encodeId}`,'POST', {}, 1) +api.queryPathInfo = (encodeId) => request.globalRequest(`/GXStudent/QueryPathInfo?encodeId=${encodeId}`,'POST', {}) export default api diff --git a/apiCa/testManage.js b/apiCa/testManage.js index 0050dfe..d0ad051 100644 --- a/apiCa/testManage.js +++ b/apiCa/testManage.js @@ -2,124 +2,52 @@ import request from '@/utilCa/request.js' const api = {} -// 检查综合解释是否完成 -api.checkUnionTest = () => request.globalRequest(`/TaskManage/CheckUnionTest`,'GET', {}, 2,5) -api.queryUnionTestResult = () => request.globalRequest(`/Test/QueryUnionTestResult`,'GET', {}, 2,5) - // 测评列表 -api.queryTaskListForWeChart = (eduLevel) => request.globalRequest(`/TaskManage/QueryTaskListForWeChart?eduLevel=${eduLevel}`,'GET', {}, 2,5) +api.queryTaskListForWeChart = () => request.globalRequest(`/TestRecordProcess/GetTestTypeList`,'GET', {}) // 获取测评题目 -api.queryTestContent = (type) => request.globalRequest(`/TaskManage/QueryTestContent?type=${type}`,'GET', {}, 2,5) +api.queryTestContent = (type) => request.globalRequest(`/TestManage/QueryTestContent?type=${type}`,'GET', {}) -// 保存学科信心测评结果 -api.saveSubjectTest = (testStr) => request.globalRequest(`/TaskManage/SaveSubjectTest?testStr=${testStr}`,'POST', "", 2,5) -// 保存自我评估 -api.saveStudentSscoreResult = (data) => request.globalRequest(`/Test/SaveStudentSscoreResult`,'POST', data, 2,5) -// 保存MBTI -api.saveMBTITest = (data) => request.globalRequest(`/TaskManage/SaveMBTITest`,'POST', data, 2,5) // 保存工作价值 -api.saveWorkValuesResult = (data) => request.globalRequest(`/TaskManage/SaveWorkValuesResult`,'POST', data, 2,5) -// 保存多元智能 -api.saveMultipleIntelligenceResult = (data) => request.globalRequest(`/TaskManage/SaveMultipleIntelligenceResult`,'POST', data, 2,5) +api.saveWorkValuesResult = (data) => request.globalRequest(`/TestManagenew/SaveWorkValuesResultNew`,'POST', data) // 保存人格测评 -api.saveCharacterTestResult = (data) => request.globalRequest(`/TaskManage/SaveCharacterTestResult`,'POST', data, 2,5) +api.saveCharacterTestResult = (data) => request.globalRequest(`/TestManagenew/SavePersonTestNew`,'POST', data) // 保存兴趣测评 -api.saveInterestTestResult = (data) => request.globalRequest(`/TaskManage/SaveInterestTestResult`,'POST', data, 2,5) -// 保存初中测评结果 -api.querySaveTestRecord = (data) => request.globalRequest(`/ResearchStudy/QuerySaveTestRecord`,'POST', data, 1) -// 保存简易测评 -api.saveCustomerTestResult = (data) => request.globalRequest(`/TaskManage/SaveCustomerTestResult`,'POST', data, 2,5) +api.saveInterestTestResult = (data) => request.globalRequest(`/TestManagenew/SaveInterestTestNew`,'POST', data) //保存测评结果(通用能力，多元能力，领导力) -api.saveCustomTestResult = (data) => request.globalRequest(`/TaskManage/SaveCustomTestResult`,'POST', data, 2,5) -//保存结果(学习力相关测评(文本类)，图形类(-45：推理能力测评，),(生涯构建)(生涯适应力)) -api.saveStudyCustomTestResult = (data) => request.globalRequest(`/TestManage/SaveStudyCustomTestResult`,'POST', data, 1,0) -//保存结果(学习力:图形类：22：注意力测评，23：记忆力测评，25：场独立-场依存认知风格测评) -api.saveStudyGraphic_TestResult = (data) => request.globalRequest(`/TestManage/SaveStudyGraphic_TestResult`,'POST', data, 1,0) -//保存结果(学习力:图形类：沉思型-冲动型认知风格测评， -api.saveStudyGraphic_DependencyResult = (data) => request.globalRequest(`/TestManage/SaveStudyGraphic_DependencyResult`,'POST', data, 1,0) +api.saveCustomTestResult = (data) => request.globalRequest(`/TestManagenew/SaveCustomTestResultNew`,'POST', data) - -// 获取自我评估结果 -api.querySubjectScoreResult = () => request.globalRequest(`/TaskManage/QuerySubjectScoreResult`,'GET', {}, 2,5) // 获取兴趣测评结果 -api.queryInterestTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryInterestTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1) -// 获取学科信心结果 -api.querySubjectResult = (year,term,recordId) => request.globalRequest(`/TestManage/QuerySubjectResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {},1) -// 获取MBTI结果 -api.queryMBTIResult = (year,term,recordId)=> request.globalRequest(`/TestManage/QueryMBTIResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1) -// 获取多元智能结果 -api.multipleIntelligenceResult = (year,term,recordId) => request.globalRequest(`/TestManage/MultipleIntelligenceResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1) +api.queryInterestTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryInterestTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}) // 获取工作价值结果 -api.workValuesResult = (year,term,recordId) => request.globalRequest(`/TestManage/WorkValuesResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1) +api.workValuesResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryWorkValuesResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}) // 获取人格测评结果 -api.personalityTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/PersonalityTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {},1) -// 获取初中兴趣题目 -api.getTestTitle = (testtype) => request.globalRequest(`/ResearchStudy/GetTestTitle?testtype=${testtype}`,'GET', {}, 1) -// 获取初中测评结果 -api.queryJuniorTestRecord = (year,term,recordId) => request.globalRequest(`/ResearchStudy/QueryJuniorTestRecord?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1) -// 获取简易测评 -api.queryCustomerTestTite = (testtype) => request.globalRequest(`/TaskManage/QueryTestContent?type=${testtype}`,'GET', {}, 2,5) -// 获取简易测评报告 -api.queryPrimaryInterestResult = () => request.globalRequest(`/TaskManage/QueryPrimaryInterestResult`,'GET', {}, 2,5) -// 获取多元智能结果（简版） -api.multipleIntelligenceSimpleResult = () => request.globalRequest(`/Test/MultipleIntelligenceSimpleResult`,'GET', {}, 2,5) +api.personalityTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryPersonalityTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}) // 获取测评结果(通用能力，多元能力，领导力) -api.queryCustomTestResult = (testType,year,term,recordId) => request.globalRequest(`/TestManage/QueryCustomTestResult?type=${testType}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1) -//获取测评结果(生涯构建和学习力相关测评) -api.getStudyCustomTestResult = (testType,year,term,recordId) => request.globalRequest(`/TestManage/GetStudyCustomTestResult?testType=${testType}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1,0) -//获取结果时间维度对比(生涯构建和学习力相关测评) -api.getStudyTimeGroupTestResult = (testType,userId,year,term,recordId) => request.globalRequest(`/TestManage/GetStudyTimeGroupTestResult?testType=${testType}&userId=${userId}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1,0) -//小程序获取时间维度接口(所有生涯测评) -api.getCareerYearAndTermList = (testType) => request.globalRequest(`/TestManage/GetCareerYearAndTermList?testType=${testType}`,'GET', {}, 1,0) +api.queryCustomTestResult = (testType,year,term,recordId) => request.globalRequest(`/TestManage/QueryCustomTestResult?type=${testType}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {}) +//小程序获取时间维度接口(所有生涯测评) +api.getCareerYearAndTermList = (testType) => request.globalRequest(`/TestManage/GetCareerYearAndTermList?testType=${testType}`,'GET', {}) //兴趣测评对比数据 -api.getInterestTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetInterestTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) +api.getInterestTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetInterestTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}) //人格测评对比数据 -api.getPersonTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetPersonTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) -//多元智能测评对比数据 -api.getMultipleTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMultipleTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) +api.getPersonTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetPersonTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}) //工作价值观测评对比数据 -api.getWorkValuesTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetWorkValuesTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) -//MBTI测评对比数据 -api.getMBTITestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMBTITestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) - -//学科信心测评对比数据 -api.getSubjectTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetSubjectTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) - -//SCL-90对比/领导力数据 -api.getCustomTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,typeId,userId,recordId) => request.globalRequest(`/TestManage/GetCustomTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&typeId=${typeId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) +api.getWorkValuesTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetWorkValuesTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}) //多元能力测评对比数据 -api.getMultipleAbilityGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMultipleAbilityGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) +api.getMultipleAbilityGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMultipleAbilityGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}) //通用职业能力测评对比数据 -api.getBeCurrentJobGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetBeCurrentJobGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) - -//获取学习力测评(文本类)群体维度对比数据,(生涯构建) -api.getStudyTestGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetStudyTestGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) -//记忆力测评群体维度对比数据 -api.getLearningMemoryGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetLearningMemoryGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) -//场独立-场依存认知风格测评群体维度对比数据 -api.getLearningUniqueGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetLearningUniqueGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) -//沉思型-冲动型认知风格测评群体维度对比数据 -api.getLearningDependencyGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetLearningDependencyGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) -//学习力（图形类）测评群体维度对比数据(22：注意力测评，-45：推理能力测评) -api.getGraphic_TestGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetGraphic_TestGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0) +api.getBeCurrentJobGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetBeCurrentJobGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}) //获取测评分类标签 -api.getTestTypeTagLIst = () => request.globalRequest(`/TestManage/GetTestTypeTagLIst`,'GET', {}, 1) +api.getTestTypeTagLIst = () => request.globalRequest(`/TestRecordProcess/GetTestTypeList`,'GET', {}) //获取测评报告日期列表 -api.getCareerYearAndTermListNew = (testType,userId) => request.globalRequest(`/TestManage/GetCareerYearAndTermListNew?testType=${testType}&userId=${userId}`,'GET', {}, 1) +api.getCareerYearAndTermListNew = (testType,userId) => request.globalRequest(`/TestManage/GetCareerYearAndTermListNew?testType=${testType}&userId=${userId}`,'GET', {}) // 保存测评答题过程记录 -api.saveTestRecordProcess = (data) => request.globalRequest(`/TestRecordProcess/SaveTestRecordProcess`,'POST', data, 1) -//获取测评答题记录 -api.getTestRecordProcessList = (testType) => request.globalRequest(`/TestRecordProcess/GetTestRecordProcessList?testType=${testType}`,'GET', {}, 1) -// 删除测评数据 -api.removeTestRecordProcess = (testType) => request.globalRequest(`/TestRecordProcess/RemoveTestRecordProcess?testType=${testType}`,'POST', {}, 1) -// 获取测评列表答题记录状态 -api.getUserTestTypeProcessList = (testTypes) => request.globalRequest(`/TestRecordProcess/GetUserTestTypeProcessList?testTypes=${testTypes}`,'GET', {}, 1) +api.saveTestRecordProcess = (data) => request.globalRequest(`/TestRecordProcess/SaveTestRecordProcess`,'POST', data) export default api diff --git a/apiCa/user.js b/apiCa/user.js index 8542f8e..07f98e8 100644 --- a/apiCa/user.js +++ b/apiCa/user.js @@ -3,78 +3,13 @@ import request from '@/utilCa/request.js' const api = {} //根据openId,获取token,并判断用户是否已绑定账号 -api.queryKaShiToken = (userId,name) => request.globalRequest(`/KaShi/QueryKaShiToken?userId=${userId}&name=${name}&schoolId=2268`,'GET', {}) +api.queryKaShiToken = (userId,name) => request.globalRequest(`/Home/QueryKaShiToken?userId=${userId}&name=${name}&schoolId=2371`,'GET', {}) // 获取ai面试路径 -api.queryAIUrl = (userId,name) => request.globalRequest(`/KaShi/QueryAIUrl?userId=${userId}&name=${name}&schoolId=2268`,'GET', {}) - -//根据openId,获取token,并判断用户是否已绑定账号 -api.getAccessTokenAndUser = (params) => request.globalRequest(`/WeChartToken/GetAccessTokenAndUser?openId=${params}`,'GET', {}) - -//获取用户token 生涯平台token -api.queryWechartToken = (userId,schoolId,userType) => request.globalRequest(`/Auth/QueryWechartToken?userId=${userId}&schoolId=${schoolId}&userType=${userType}`,'GET', {},1,4) -// 获取openid -api.getOpenId = (params) => request.globalRequest(`/WishOrder/GetOpenId?code=${params}`,'GET', {}, "") - -// 微信支付 -api.createWeiXinOrder = (data) => request.globalRequest(`/TenpayOrder/CreateWeiXinOrder`, 'POST', data) - -// 用户绑定登录 -api.userBindLogin = (data) => request.globalRequest(`/user/UserBindLogin`, 'POST', data) -//用户解绑账号或切换账号（有返回User, Token话,前端重新绑定到header上） -api.userUnBindOrChangeCodeNumber = (userId,type) => request.globalRequest(`/user/UserUnBindOrChangeCodeNumber?userId=${userId}&type=${type}`,'GET', {}, 1) -//获取当前微信用户已绑定的账号列表 -api.getUserCodeNumber = () => request.globalRequest(`/user/GetUserCodeNumber`,'GET', {}, 1) -//根据学号获取学校列表 -api.getSchoolByCodeNumber = (params) => request.globalRequest(`/user/GetSchoolByCodeNumber?codeNumber=${params}`,'GET', {}, 1) - -// 判断学生是否完成生涯成熟度问卷, taskId大于0，需要进行问卷，taskId 等于0，不需要问卷 -// api.getQuestionnaireTitlePower = () => request.globalRequest(`/CareerMaturityTask/GetQuestionnaireTitlePower`,'GET', {}, 1) -// 获取生涯成熟度题目 -// api.getTestTitleListList = () => request.globalRequest(`/CareerMaturityTask/GetTestTitleListList`,'GET', {}, 1) -// 保存生涯成熟度测评结果 -// api.saveCareerMaturityTestResult = (data) => request.globalRequest(`/CareerMaturityTask/SaveCareerMaturityTestResult`, 'POST', data, 1) - -// 获取手机验证码 -api.getMobileCode = (mobile) => request.globalRequest(`/WeChartUser/GetMobileCode?mobile=${mobile}&token=SQEIfNmlFufmOMNVPZCvNVWpDeldYjH`,'GET', {}, 1) -// 提交手机注册 -api.checkSmsCode = (data) => request.globalRequest(`/user/CheckSmsCode`, 'POST', data, 1) +api.queryAIUrl = (userId,name) => request.globalRequest(`/Home/QueryAIUrl?userId=${userId}&name=${name}&schoolId=2371`,'GET', {}) // 获取个人档案 -api.queryStudentProfile = () => request.globalRequest(`/StudentResource/QueryStudentProfile`,'GET', {}, 2,4) -// 添加，取消个人意向 -api.doIntention = (type,id,actionType) => request.globalRequest(`/StudentResource/DoIntention?type=${type}&actionType=${actionType}&id=${id}`,'GET', {}, 2,4) -//绑vip卡 -api.bindCard = (data) => request.globalRequest(`/user/BindCard`,'POST', data, 1) +api.queryStudentProfile = () => request.globalRequest(`/StudentResource/QueryStudentProfile`,'GET', {}) -// 一体机激活 绑定 获取列表 -api.queryMachineOrderCountList = (machineNumber) => request.globalRequest(`/Onemachine/QueryMachineOrderCountList?machineNumber=${machineNumber}`,'GET', {}, 1) -// 绑定设备 -api.activityMachine = (data) => request.globalRequest(`/Onemachine/ActivityMachine`,'POST', data, 1) -// 解绑 -api.removeMachine = (orderId,machineModelId,machineNumber) => request.globalRequest(`/Onemachine/RemoveMachine?orderId=${orderId}&machineModelId=${machineModelId}&machineNumber=${machineNumber}`,'POST', {}, 1) -// ai咨询问题 -api.aISearch = (keyword,sessionId) => request.globalRequest(`/AIAgents/search?keyword=${keyword}&sessionId=${sessionId}`,'GET', {}, 1) -// ai获取历史咨询 -api.aIGetHistoryRecord = (page) => request.globalRequest(`/AIAgents/GetHistoryRecord?page=${page}&pageSize=20`,'GET', {}, 1) - -// 保存人脸图片 -api.queryUploadPhoto = (address) => request.globalRequest(`/user/QueryUploadPhoto?address=${address}`,'GET', {}, 1) - -// 保存操作日志 -api.saveUserOperationLog = (data) => request.globalRequest(`/UserOperationLog/SaveUserOperationLog`,'POST', data, 3) - -// 获取操作日志 -api.getUserOperationLogList = (pageIndex,pageSize,keyword,operationType) => request.globalRequest(`/UserOperationLog/GetUserOperationLogList?pageIndex=${pageIndex}&pageSize=${pageSize}&keyword=${keyword}&operationType=${operationType}`,'GET', {}, 1) -// 设备登录 -api.loginOneMachine = (machineNo) => request.globalRequest(`/user/LoginOneMachine?machineNo=${machineNo}`,'POST', {}, 1) -// 获取系统菜单权限 -api.querySchoolMenu = () => request.globalRequest(`/user/QuerySchoolMenu`,'GET', {}, 1) - -// 保存高校个人信息 -api.saveUserBasisInfo = (mobileCode,data) => request.globalRequest(`/user/SaveUserBasisInfo?mobileCode=${mobileCode}`,'POST', data, 1) - -// 获取高校个人信息 -api.getUserBasisInfo = () => request.globalRequest(`/user/GetUserBasisInfo`,'GET', {}, 1) export default api diff --git a/packageCa/job/details.vue b/packageCa/job/details.vue index 9f7d7df..8b0f332 100644 --- a/packageCa/job/details.vue +++ b/packageCa/job/details.vue @@ -3,125 +3,80 @@ - {{jobDetailData.Name}} + {{jonInfo.Name}} - 所属大类：{{jobDetailData.BigCategoryName}} - 所属中类：{{jobDetailData.MidCategoryName}} - 所属小类：{{jobDetailData.SmallCategoryName}} - + 所属大类：{{bigType}} + 所属中类：{{midType}} + 所属小类：{{smallType}} - + 职业新说： - + - + 职业说明： - + - + 工作内容： - + - + 从业要求： - + - + 能力要求： - + - + 薪资范围： - + - + 就业前景： - + - + 职业技能： - - - - {{index + 1}}{{item.Name}} - - - {{item.Explain}} - - - + - + 职业能力： - - - - {{index + 1}}{{item.Name}} - - - {{item.Explain}} - - - + - + 具备知识： - - - - {{index + 1}}{{item.Name}} - - - {{item.Explain}} - - - + - + 职业素养： - - - - {{index + 1}}{{item.Name}} - - - {{item.Explain}} - - - + - + + 职业活动： - - - - {{index + 1}}{{item.Name}} - - - {{item.Explain}} - - - + - + 发展路径： - + - + 推荐专业： - - - {{item.Name}} - - + + + + 薪资范围： + + + + 就业前景： + - - 请先登录 - - @@ -135,21 +90,27 @@ isVisitor: false, //游客 user: uni.getStorageSync("CAuserInfo").user, id: 0, - jobDetailData: { - Name: "", - BigCategoryName: "", - MidCategoryName: "", - SmallCategoryName: "", - VideoUrl: "", - TopIntroduction: "", - TopWorkContent: "", - QualityRequirements: "", - }, - listOne: [],//职业技能 - listTwo: [],//职业能力 - listThree: [],//具备知识 - listFour: [],//职业素养 - listFive: [],//职业活动 + // jonInfo: { + // Name: "", + // BigCategoryName: "", + // MidCategoryName: "", + // SmallCategoryName: "", + // VideoUrl: "", + // TopIntroduction: "", + // TopWorkContent: "", + // QualityRequirements: "", + // }, + // listOne: [],//职业技能 + // listTwo: [],//职业能力 + // listThree: [],//具备知识 + // listFour: [],//职业素养 + // listFive: [],//职业活动 + + jonInfo: {}, + isIntention: "", + bigType: "", + midType: "", + smallType: "", } }, onLoad(e) { @@ -162,23 +123,15 @@ this.queryJobDetailById(); }, methods: { - showConfirmInfor(){ - uni.showModal({ - content:"观看完整内容,请先登录", - confirmText:"确认", - confirmColor:"#1677ff", - showCancel:false - }) - }, changeIntention(){ uni.showLoading({ title: "加载中" }) - let isIntention = this.jobDetailData.IsIntention; + let isIntention = this.jonInfo.IsIntention; api1.doIntention(2,this.id,isIntention?1:0).then((res)=>{ uni.hideLoading(); if(res.Result == 1){ - this.jobDetailData.IsIntention = !this.jobDetailData.IsIntention; + this.jonInfo.IsIntention = !this.jonInfo.IsIntention; } }) }, @@ -190,44 +143,11 @@ api.queryJobDetailById(this.id).then((res) => { uni.hideLoading(); if(res.Result == 1){ - this.jobDetailData = res.Data; - let attList = res.Data.AttList; - if(attList != null){ - let listOne = [],//职业技能 - listTwo = [],//职业能力 - listThree = [],//具备知识 - listFour = [],//职业素养 - listFive = [];//职业活动 - attList.forEach(item => { - switch(item.Identify){ - case 1 :{ - listOne.push(item); - break; - } - case 2 :{ - listTwo.push(item); - break; - } - case 3 :{ - listThree.push(item); - break; - } - case 5 :{ - listFour.push(item); - break; - } - case 6 :{ - listFive.push(item); - break; - } - } - }); - this.listOne = listOne; - this.listTwo = listTwo; - this.listThree = listThree; - this.listFour = listFour; - this.listFive = listFive; - } + this.jonInfo = res.Data.info; + this.isIntention = res.Data.exit; + this.bigType = res.Data.parent3 + this.midType = res.Data.parent2 + this.smallType = res.Data.parent1 } }) }, diff --git a/packageCa/job/index.vue b/packageCa/job/index.vue index bf2caf4..f424892 100644 --- a/packageCa/job/index.vue +++ b/packageCa/job/index.vue @@ -37,17 +37,6 @@ - - 请先登录 - - @@ -59,7 +48,6 @@ return { kw: "", //搜索关键 user: uni.getStorageSync("CAuserInfo").user, - isVisitor: false, //游客 barHeight: wx.getWindowInfo().statusBarHeight, winHeight: wx.getWindowInfo().windowHeight, jobDataList: [], @@ -81,10 +69,8 @@ }, onLoad(e) { if(this.user == undefined || this.user == null){ - this.isVisitor = true; this.loginHeight=99; }else { - this.isVisitor = false; this.loginHeight=0; } this.scrollRightTop = 1; diff --git a/packageCa/job/smallList.vue b/packageCa/job/smallList.vue index f1dcb56..ade305d 100644 --- a/packageCa/job/smallList.vue +++ b/packageCa/job/smallList.vue @@ -75,7 +75,7 @@ //this.showLogin = true; }else { uni.navigateTo({ - url: `/packageCa/job/details?id=${item.Id}&name=${item.Name}` + url: `/packageCa/job/details?id=${item.EnCodeId}&name=${item.Name}` }) } }, diff --git a/packageCa/pagesTest/customTestTitle.vue b/packageCa/pagesTest/customTestTitle.vue index 98f8ba5..5f64b73 100644 --- a/packageCa/pagesTest/customTestTitle.vue +++ b/packageCa/pagesTest/customTestTitle.vue @@ -104,7 +104,7 @@ this.taskId = e.taskId } this.computeTitle(this.testType); - this.getHistoryTitle(); + this.getTitle(); }, methods: { // 返回 @@ -141,16 +141,6 @@ } } }, - //获取答题记录 - getHistoryTitle(){ - api.getTestRecordProcessList(this.testType).then(res => { - if (res.Result === 1) { - let data = res.Data; - this.historyTitle = data; - this.getTitle(); - } - }) - }, // 获取题目 getTitle() { uni.showLoading({ @@ -162,45 +152,7 @@ let list = res.Data.List.Item1; list.forEach(item => { item.Value = ""; - this.historyTitle.forEach(ritem=>{ - if(item.Id == ritem.TestTitleId){ - switch (ritem.TestResult) { - case "A": { - item.Value = 1; - break; - } - case "B": { - item.Value = 2; - break; - } - case "C": { - item.Value = 3; - break; - } - case "D": { - item.Value = 4; - break; - } - case "E": { - item.Value = 5; - break; - } - case "F": { - item.Value = 6; - break; - } - } - } - }) }) - if(this.historyTitle.length == 0){ - this.pageIndex = 0; - }else if(this.historyTitle.length == list.length){ - this.pageIndex = list.length - 1; - }else { - this.pageIndex = this.historyTitle.length; - } - this.allNum = list.length; this.list = list; this.testTitle = res.Data.List.Item2; @@ -225,54 +177,14 @@ console.log('单击事件被触发'); this.lastTapTime = now; this.list[INDEX].Value = NUM; - this.saveTestRecordProcess(this.list[INDEX].Id,NUM); setTimeout(() => { - if (this.pageIndex != this.list.length - 1) { - this.pageIndex = INDEX + 1; - } + if(this.pageIndex != this.list.length - 1){ + this.pageIndex = INDEX + 1; + } }, 300) } }, - //存储答题记录 - saveTestRecordProcess(ID,VALUE){ - let val = "" - switch (VALUE) { - case 1: { - val = "A"; - break; - } - case 2: { - val = "B"; - break; - } - case 3: { - val = "C"; - break; - } - case 4: { - val = "D"; - break; - } - case 5: { - val = "E"; - break; - } - case 6: { - val = "F"; - break; - } - } - let data = { - testType: this.testType, - testTitleId: ID, - testResult: val - } - api.saveTestRecordProcess(data).then(res => { - if (res.Result === 1) { - } - }) - }, - // 提交题目 + // 提交题目 submitTitle() { let testStr = ""; this.list.forEach(item => { @@ -308,42 +220,41 @@ title: "提交中" }) let data = { - testType: this.testType, + testType: Number(this.testType), taskId: this.taskId, testStr } - api.removeTestRecordProcess(this.testType).then((res) => { - return api.saveCustomTestResult(data); - }).then((res) => { - uni.hideLoading(); - if (res.Result === 1) { - uni.showToast({ - title: "提交成功", - icon: "success" - }) - let pages = getCurrentPages(); // 当前页面 - let beforePage = pages[pages.length - 2]; // 上一页 - if (beforePage != undefined) { - beforePage.data.refreshIfNeeded = true; - } - setTimeout(() => { - if (this.testType == -27) { - uni.redirectTo({ - url: `/packageCa/testReport/multipleAbilityTestReport?id=${res.Data.TestId}` - }) - } else if (this.testType == -28) { - uni.redirectTo({ - url: `/packageCa/testReport/generalCareerTestReport?id=${res.Data.TestId}` - }) - } - }, 1000) - } else { - uni.showToast({ - title: res.Message, - icon: "none" - }) - } - }) + api.saveCustomTestResult(data).then((res) => { + uni.hideLoading(); + if (res.Result === 1) { + uni.showToast({ + title: "提交成功", + icon: "success" + }) + let pages = getCurrentPages(); // 当前页面 + let beforePage = pages[pages.length - 2]; // 上一页 + if (beforePage != undefined) { + beforePage.data.refreshIfNeeded = true; + } + setTimeout(() => { + if (this.testType == -27) { + uni.redirectTo({ + url: `/packageCa/testReport/multipleAbilityTestReport` + }) + } else if (this.testType == -28) { + uni.redirectTo({ + url: `/packageCa/testReport/generalCareerTestReport` + }) + } + }, 1000) + } else { + uni.hideLoading(); + uni.showToast({ + title: res.Message, + icon: "none" + }) + } + }) } } } diff --git a/packageCa/pagesTest/interestTestTitle.vue b/packageCa/pagesTest/interestTestTitle.vue index 0ee12ac..585a541 100644 --- a/packageCa/pagesTest/interestTestTitle.vue +++ b/packageCa/pagesTest/interestTestTitle.vue @@ -158,7 +158,7 @@ } }, onLoad(e) { - this.getHistoryTitle(); + this.getTitle(); }, methods: { // 返回 @@ -179,16 +179,6 @@ }); //uni.navigateBack(-1); }, - //获取答题记录 - getHistoryTitle(){ - api.getTestRecordProcessList(11).then(res => { - if (res.Result === 1) { - let data = res.Data; - this.historyTitle = data; - this.getTitle(); - } - }) - }, // 获取题目 getTitle() { uni.showLoading({ @@ -200,26 +190,7 @@ let list = res.Data; list.forEach(item => { item.Value = 0 - this.historyTitle.forEach(ritem=>{ - if(item.Id == ritem.TestTitleId){ - item.Value = Number(ritem.TestResult); - } - }) }) - if(this.historyTitle.length > 180){ - let len = this.historyTitle.length - 180; - for(let i = 0; i < len; i++){ - this.checkTitleList[i].Value = this.historyTitle[i + 180]; - this.checkTitleList[i].Checked = true; - } - } - if(this.historyTitle.length == 0){ - this.pageIndex = 0; - }else if(this.historyTitle.length == list.length){ - this.pageIndex = list.length - 1; - }else { - this.pageIndex = this.historyTitle.length; - } this.allNum = list.length + 3; this.list = list; } @@ -241,11 +212,8 @@ // 处理单击事件 this.lastTapTime = now; this.list[INDEX].Value = NUM; - this.saveTestRecordProcess(this.list[INDEX].Id,NUM); setTimeout(()=>{ - if(this.pageIndex != this.allNum - 1){ this.pageIndex = INDEX + 1; - } },400) } }, @@ -260,7 +228,6 @@ this.firstDescVal = ITEM.Value; this.secondDescVal = ""; this.thirdDescVal = ""; - this.saveTestRecordProcess(181,ITEM.Value); break; } case 2: { @@ -272,13 +239,11 @@ this.checkTitleList[INDEX].Checked = true; this.secondDescVal = ITEM.Value; this.thirdDescVal = ""; - this.saveTestRecordProcess(182,ITEM.Value); break; } case 3: { this.checkTitleList[INDEX].Checked = true; this.thirdDescVal = ITEM.Value; - this.saveTestRecordProcess(183,ITEM.Value); break; } } @@ -289,27 +254,8 @@ },400) }, - //存储答题记录 - saveTestRecordProcess(ID,VALUE){ - let data = { - testType: 11, - testTitleId: ID, - testResult: VALUE - } - api.saveTestRecordProcess(data).then(res => { - if (res.Result === 1) { - } - }) - }, // 提交题目 submitTitle() { - - // uni.showToast({ - // title: "请选择三个特质描述", - // icon: "none" - // }) - // return; - let testStr = ""; this.list.forEach(item => { testStr += `${item.Id}|${item.Value - 1},` @@ -319,9 +265,7 @@ title: "提交中" }) let data = {testStr} - api.removeTestRecordProcess(11).then((res) => { - return api.saveInterestTestResult(data); - }).then((res) => { + api.saveInterestTestResult(data).then((res) => { uni.hideLoading(); if (res.Result === 1) { uni.showToast({ diff --git a/packageCa/pagesTest/personalTestTitle.vue b/packageCa/pagesTest/personalTestTitle.vue index 2648cc4..8853c85 100644 --- a/packageCa/pagesTest/personalTestTitle.vue +++ b/packageCa/pagesTest/personalTestTitle.vue @@ -86,7 +86,7 @@ } }, created() { - this.getHistoryTitle(); + this.getTitle(); }, methods: { // 返回 @@ -107,16 +107,6 @@ }); //uni.navigateBack(-1); }, - //获取答题记录 - getHistoryTitle(){ - api.getTestRecordProcessList(15).then(res => { - if (res.Result === 1) { - let data = res.Data; - this.historyTitle = data; - this.getTitle(); - } - }) - }, // 获取题目 getTitle() { uni.showLoading({ @@ -128,37 +118,7 @@ let list = res.Data.List; list.forEach(item => { item.Value = 0 - this.historyTitle.forEach(ritem=>{ - if(item.TitleId == ritem.TestTitleId){ - switch (ritem.TestResult) { - case "A": { - item.Value = 4; - break; - } - case "B": { - item.Value = 3; - break; - } - case "C": { - item.Value = 2; - break; - } - case "D": { - item.Value = 1; - break; - } - } - } - }) }) - if(this.historyTitle.length == 0){ - this.pageIndex = 0; - }else if(this.historyTitle.length == list.length){ - this.pageIndex = list.length - 1; - }else { - this.pageIndex = this.historyTitle.length; - } - this.allNum = list.length; this.list = list; } @@ -180,7 +140,6 @@ // 处理单击事件 this.lastTapTime = now; this.list[INDEX].Value = NUM; - this.saveTestRecordProcess(this.list[INDEX].TitleId,NUM); setTimeout(()=>{ if(this.pageIndex != this.list.length - 1){ this.pageIndex = INDEX + 1; @@ -188,37 +147,6 @@ },400) } }, - //存储答题记录 - saveTestRecordProcess(ID,VALUE){ - let val = "" - switch (VALUE) { - case 4: { - val = "A"; - break; - } - case 3: { - val = "B"; - break; - } - case 2: { - val = "C"; - break; - } - case 1: { - val = "D"; - break; - } - } - let data = { - testType: 15, - testTitleId: ID, - testResult: val - } - api.saveTestRecordProcess(data).then(res => { - if (res.Result === 1) { - } - }) - }, // 提交题目 submitTitle() { let testStr = ""; @@ -249,9 +177,7 @@ testStr, testType: 15 } - api.removeTestRecordProcess(15).then((res) => { - return api.saveCharacterTestResult(data); - }).then((res) => { + api.saveCharacterTestResult(data).then((res) => { uni.hideLoading(); if (res.Result === 1) { uni.showToast({ @@ -263,7 +189,7 @@ beforePage.data.refreshIfNeeded = true; setTimeout(()=>{ uni.redirectTo({ - url: `/packageCa/testReport/personalTestReport?year=${res.Data.Year}` + url: `/packageCa/testReport/personalTestReport` }) },1000) diff --git a/packageCa/pagesTest/testList.vue b/packageCa/pagesTest/testList.vue index 49d3fc2..6271f25 100644 --- a/packageCa/pagesTest/testList.vue +++ b/packageCa/pagesTest/testList.vue @@ -4,22 +4,10 @@ 生涯测评 - - - - - {{item}} - - - - 筛选 - - - - {{pitem.title}} - - {{item.TestName}} + + + {{item.Name}} 约{{item.AvgTime == 0 ? '1' : item.AvgTime}}分钟 @@ -27,51 +15,16 @@ {{item.Brief}} - - 重新测评 + + - - 开始测评 - - - 继续测评 - - + 查看报告 - - - - - - 筛选 - - - - 测评等级 - - {{item.name}} - - 测评类型 - - {{item.name}} - - 测评功能 - - {{item.name}} - - - - - 确认筛选 - - - - @@ -83,145 +36,12 @@ barHeight: wx.getWindowInfo().statusBarHeight, refreshIfNeeded: false, //是否返回刷新 dataList: [], - selectTypeStr: ["全部"], - showContrast: false,//显示筛选 - levelOption: [ - { - name: "全部", - value: 0 - }, - { - name: "基础型", - value: 1 - }, - { - name: "进阶型", - value: 2 - }, - { - name: "专项型", - value: 3 - }, - ], - typeOption: [ - { - name: "全部", - value: 0 - }, - { - name: "生涯类", - value: 1 - }, - { - name: "学习力类", - value: 2 - }, - { - name: "心理健康类", - value: 3 - }, - { - name: "其他", - value: 4 - }, - ], - fnOption: [ - { - name: "全部", - value: 0 - }, - { - name: "情感态度", - value: 1 - }, - { - name: "智力能力", - value: 2 - }, - { - name: "认知学习", - value: 3 - }, - { - name: "人格特质", - value: 4 - }, - { - name: "心理健康", - value: 5 - } - ], - testLevel:0 ,// 测评等级 - testType: 0,// 测评类型 - testFun: 0,// 测评功能 - checkedTestLevel: 0,// 测评等级 - checkedTestType: 0,// 测评类型 - checkedTestFun: 0,// 测评功能 - testList1: [], //情感 - testList2: [], //智力 - testList3: [], //认知学习 - testList4: [], //人格特质 - testList5: [], //心理健康 - testList6: [], //其他测评 - filteredData: [],//筛选后数据 } }, onShow() { this.queryTaskListForWeChart(); }, methods: { - closeDialog(){ - this.$refs.pop_card.close(); - }, - //确认筛选 - confirmCompute(){ - this.testLevel = this.checkedTestLevel; - this.testType = this.checkedTestType; - this.testFun = this.checkedTestFun; - if(this.checkedTestLevel == 0 && this.checkedTestType == 0 && this.checkedTestFun == 0){ - this.selectTypeStr = ["全部"]; - }else { - let arr = []; - if(this.checkedTestLevel != 0){ - arr.push(this.levelOption[this.checkedTestLevel].name); - } - if(this.checkedTestType != 0){ - arr.push(this.typeOption[this.checkedTestType].name); - } - if(this.checkedTestFun != 0){ - arr.push(this.fnOption[this.checkedTestFun].name); - } - this.selectTypeStr = arr; - } - - this.filteredData = this.dataList.map(category => { - const filteredList = category.list.filter(item => { - // 处理TestLevel筛选 - const levelMatch = this.testLevel === 0 || item.TestLevel === this.testLevel; - - // 处理TestType特殊映射（其他类对应TestType=0） - const typeMatch = this.testType === 0 ? true : - this.testType === 4 ? item.TestType === 0 : - item.TestType === this.testType; - - // 处理TestFun筛选 - const funMatch = this.testFun === 0 || item.TestFun === this.testFun; - - return levelMatch && typeMatch && funMatch; - }); - return { ...category, list: filteredList }; - }).filter(category => category.list.length > 0); // 过滤空分组 - //this.showContrast = false; - this.$refs.pop_card.close(); - }, - // 显示筛选列表 - showContrastLayer(){ - //this.showContrast = true; - this.$refs.pop_card.open('bottom') //底部弹出 - this.checkedTestLevel = this.testLevel; - this.checkedTestType = this.testType; - this.checkedTestFun = this.testFun; - }, // 返回 goback(){ uni.navigateBack(-1); @@ -231,195 +51,16 @@ uni.showLoading({ title: "加载中" }) - let eduLevel = uni.getStorageSync("CAuserInfo").user.GradeLevel; - new Promise((resolve,reject)=>{ - return api.getTestTypeTagLIst().then((res)=>{ - resolve(res) - }) - }).then((res)=>{ - let arr = []; - res.Data.forEach(item=>{ - return arr.push(item.Type); - }) - return api.getUserTestTypeProcessList(JSON.stringify(arr)).then((res1)=>{ - return [res, res1]; - }) - }).then(([res1, res2]) => { - if (res1.Result === 1 && res2.Result === 1) { - return api.queryTaskListForWeChart(eduLevel).then((res) => { - return [res, res1, res2]; - }); - } - }).then(([res, res1, res2]) => { - uni.hideLoading(); - if (res && res.Result === 1) { - this.testList1 = []; - this.testList2 = []; - this.testList3 = []; - this.testList4 = []; - this.testList5 = []; - this.testList6 = []; - let list = res.Data.TestList; - list.forEach(item=>{ - // 处理答题记录匹配 - item.HasTestRecordProcess = false; - res2.Data.forEach(ritem=>{ - if(item.TestType == ritem.TestType){ - item.HasTestRecordProcess = ritem.HasTestRecordProcess; - } - }) - }) - let num = 0; - let arr = []; - let arr1 = []; - list.forEach(item=>{ - if(item.HasTest){ - num++ - } - let isMatch = false; - // 处理测评分类匹配 - res1.Data.forEach((yitem, yindex) => { - if (item.TestType == yitem.Type) { - item.Type = item.TestType; - item.TestType = yitem.TestType; - item.TestLevel = yitem.TestLevel; - item.TestFun = yitem.TestFun; - arr.push(item); - isMatch = true; - } - }) - if (!isMatch) { - item.Type = item.TestType; - item.TestType = 0; - item.TestLevel = 0; - item.TestFun = 0; - arr1.push(item); - } - }) - this.testList6 = arr1; - this.testList = list; - arr.forEach((item, index) => { - switch (item.Type) { - // 1 情感态度 - // 高中，大学职业兴趣11 - // 工作价值观17 - // 学习动机测评-33 - // 自我效能感测评-34 - // 小学兴趣测评-31 - //初中兴趣测评18 - case 11: - case 17: - // case 18: - // case -31: - // case -33: - // case -34: - { - this.testList1.push(item); - // this.interestList.push(item); - break; - } - // 2 智力能力 - // 注意力22 - // 记忆力23 - // 多元智能16 - // 小学多元智能 -32 - // 多元性向潜能发展6 - // 推理能力测评-45 - // 批判性思维倾向测评-38 - // 创造力倾向测评-37 - // 多元(职业)能力测评-27 - // 通用(职业)能力测评-28 - // case 22: - // case 23: - // case 16: - // case 6: - // case -32: - // case -45: - // case -38: - // case -37: - case -27: - case -28: { - this.testList2.push(item); - break; - } - // 3认知学习 - // 学科信心-2 - // 学科能力测评20 - // 学科自评-9999 - // 学习习惯-36 - // 领导力测评-29 - // 生涯建构测评-42 - // 生涯适应力测评-43 - // 意志力测评 -35 - // 场独立-场依存认知风格测评 25 - // 沉思型-冲动型认知风格测评 26 - // 儿童元认知测评 -39 - // 元认知测评 -40 - // 学习资源管理能力测评 -41 - // 问题解决能力测评-44 - // case -2: - // case 20: - // case -9999: - // case -36: - // case -29: - // case -42: - // case -43: - // case -35: - // case 25: - // case 26: - // case -39: - // case -40: - // case -41: - // case -44: - // { - // this.testList3.push(item); - // // this.workValueList.push(item); - // break; - // } - // 4.人格特质 - // MBTI 4 - // 人格测评15 - // case 4: - case 15: { - this.testList4.push(item); - break; - } - // 5.心理健康 - // SCL-90 - // case -10: { - // this.testList5.push(item); - // break; - // } - } - }) - let allList = []; - if(this.testList1.length>0){ - allList.push({title: '情感态度', list: this.testList1}); - } - if(this.testList2.length>0){ - allList.push({title: '智力能力', list: this.testList2}); - } - if(this.testList3.length>0){ - allList.push({title: '认知学习', list: this.testList3}); - } - if(this.testList4.length>0){ - allList.push({title: '人格特质', list: this.testList4}); - } - // if(this.testList5.length>0){ - // allList.push({title: '心理健康', list: this.testList5}); - // } - // if(this.testList6.length>0){ - // allList.push({title: '其他测评', list: this.testList6}); - // } - this.dataList = allList; - this.confirmCompute(); - } - }).catch((error) => { - console.error('请求出错:', error); - }); + api.queryTaskListForWeChart().then((res)=>{ + uni.hideLoading(); + if (res && res.Result === 1) { + this.dataList = res.Data.DataList.filter(item=>(item.Type !== 4 && item.Type != -29)); + } + }) + }, - routerUrl(TYPE){ - switch (TYPE) { + navTest(item,index) { + switch (item.Type) { case 11: { // 高中兴趣测评 uni.navigateTo({ @@ -458,21 +99,6 @@ } } }, - navTest(item,index) { - if(index == 1){ - uni.showLoading({ - title: "加载中..." - }) - api.removeTestRecordProcess(item.Type).then((res) => { - if (res.Result == 1) { - uni.hideLoading(); - this.routerUrl(item.Type) - } - }) - }else { - this.routerUrl(item.Type) - } - }, navReport(item) { switch (item.Type) { case 11: { @@ -543,50 +169,7 @@ background-size: 38rpx 38rpx; } } - .progress-box { - display: flex; - align-items: center; - margin-bottom: 36rpx; - .progress-txt { - display: flex; - align-items: center; - font-size: 24rpx; - width: 175rpx; - color: #333333; - margin-right: 20rpx; - .strong { - font-size: 32rpx; - color: #20B664; - font-weight: 600; - margin-left: 6rpx; - } - } - .progress-bar { - width: 500rpx; - height: 24rpx; - background: #F8F8F8; - border-radius: 20rpx 20rpx 20rpx 20rpx; - .progress { - position: relative; - background-image: repeating-linear-gradient(-45deg, #20B664, #20B664 20rpx, #47C580 20rpx, #47C580 30rpx); - height: 24rpx; - border-radius: 20rpx; - transition: width 1s ease-in-out; - &::after { - display: block; - content: ""; - position: absolute; - right: -20rpx; - top: -8rpx; - width: 40rpx; - height: 40rpx; - background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAA2FBMVEUAAAA60X84z4A60YE50X850n860H860IA6z4A4z4A60X850IA50X84z4Awz4D///860X8iv2khu2ciwmskyW8guWUlzHEky3Ajx20hvWglznEl0HMm0nQjxWwm1HUgt2Q3z3zk+O112KK67dGR47Yu03kyznktzXYuyHQz0nsvxXIqwm/I8NoqyHInv2ys6Mc9yHwr0Xbx+/Wt7Mpa15NZ0ZBO1os/0IEyynfI8tyD3Ktn1Jjx/PbW8+Of5b6E4q9LzYZA1oVLyYTW9eSf6cGf5r+C2qpp35/QM//cAAAAD3RSTlMA70B/37+vn2Agz7+PYBCLRPBlAAACh0lEQVQ4y6XV2XqqMBAAYKKI1i2DgNZWK6AHEHetS7X72d7/jc4kGBJFvTlzARf833yTySRo55HLV8oEgOhGNVdXP2RlEZ0MUsxdpSUdgRuEi8fHx05nMRwCQOEyvzNQhs1m8wGD887TD8bvLqQlSFutVhNDasZJ7dzmAYKmbaPmWOonLCafseG9jZHJjcmFlnZyf6/oh+u6hraL+EbuUtoHAlG3i/pGbiJ6UoDAsjIa+dfz36/hcZVGYnMAlpXVmxVl8ZLkFoUUILIyetunSXii37pMfKY3HhVxrBsgh7gIkWmmejsbD2zbp2l46c4XNa1OwDRTPeDf+XP18cJe/WNPFkBYFYEp9HwsMw5areAV379EB4dYRxWi9lH7HpXxjKv8ie+N6PcQt9GAUTvRPlVjZdtb1rl0LxdQ0XQw24nu05MYsz6/btK9XEBZI9BuNLieUbr0lvQkPuScdHCFAA3ETMf+Ghd5kn+gzgkAw1yLVc5Uq84gwwSxqt8VvLW5FphoZZg6nDM9f5vPFdxXZhCxrlUQOyL3mI7NwUmzZe4QDDxRsSP0H/zum/ulLFqZ7wCquN07R+j4e0aXezNeH2bHzMp8u7jdbIVcc+6h8D4ta83tb/U0AKmzER31hPZpf8wqsT6Z9aKu1CEU+fC7PaG//fbBm2MH9wyv1bPDhh9Dx9RpbmVO3tWzE0IhueXAbUiNPMFvJyeNJeZhQNQ7yx0ffKRSB1CQl8zoXGMoOpSXDBYC01t6AlBTL0ZXaoxTPclco9criaSVeudc0t2dsErUCLgjJ6MnLpDShR9QAcCNHbVuCykYd5f/gshhF0/bjE5HUQAAeun/fpoy6rmqoRN05Uo+I/8B7R+IPTrIPJ8AAAAASUVORK5CYII='); - background-size: 100%; - } - } - } - } - .test-list-wrap { + .test-list-wrap { padding: 0 20rpx 130rpx; .content { @@ -747,196 +330,4 @@ } } } - .contrast-box { - display: flex; - align-items: center; - justify-content: space-between; - width: 666rpx; - height: 76rpx; - margin-bottom: 20rpx; - padding: 0 20rpx; - background: #E7F1FF; - border-radius: 12rpx 12rpx 12rpx 12rpx; - border: 2rpx solid #FFFFFF; - - .desc { - display: flex; - align-items: center; - - .icon { - width: 28rpx; - height: 28rpx; - background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAHfSURBVEiJ1Va9btswEP5OlBNr01JAMgpUeYNm7FDAeoP2Ddq1UzK5Roc6Q6AoS7auzps4QDt0i4fu1lYVWThFP7Z4HSIpspC4cCMmyLeQR+nu4/GOvAOeAwYn+dQ9zWf/o0vtBSdIvE0KBpkvmfg7AKyY3i5T85eckLzRZS/NICvZnrBdze8kdMN8AWAj4V1gVfgkxFcwhqX8EcAFGeISYPl7tLtXb7jl2dZkJTww7FoyzFelLRsgzwm4tmu0NbcBMz6tVtiPx9Z5kvR8VoXPqvDjUe+oUKI+yjRDPa+P1AkSjwyx2IZQAW/+jHZ+3vd9EGbvlFIyHlsX1dqDPPznhpSSTU+1EjpBMiRDzEwTM3vCdXy1eljC7u/eJpSpiyXN+nPLyiMAiMcUaSeUE5IS2Guvaz1SN1yeuWF+9iiETpAMAT4AcNDZxd+E+y6+NsKrLztzYpwD6rD5gGtLGgC4TnuH7WqhM4aeZS0XbpitPZc6s9RD19ViE54macDvWRV+M47Pq1oQY7/qgZwg8ZwgGb44zl+XcvfVggjfSIgpAJAQ05Lg0gmSD43f1qpFTRiPrQhAtDWputGpxgpp1p8DHAEcNavFg9vEq8+9H7e6621iZ3BP89ngJJ92alQX/gLMKt2XTOFMygAAAABJRU5ErkJggg==") no-repeat; - background-size: 100%; - } - - .txt-item { - width: 400rpx; - line-height: 21px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - margin-left: 20rpx; - text { - - display: inline-block; - line-height: 50rpx; - font-size: 24rpx; - color: #1677ff; - margin-left: 16rpx; - - &::after { - content: ""; - display: inline-block; - width: 2rpx; - height: 12rpx; - margin-left: 16rpx; - background: #1677ff; - } - } - } - } - - .btn { - display: flex; - align-items: center; - justify-content: center; - width: 120rpx; - height: 48rpx; - background: #FFFFFF; - border-radius: 8rpx 8rpx 8rpx 8rpx; - font-size: 24rpx; - color: #333333; - - &::after { - content: ""; - display: block; - width: 0; - height: 0; - margin-left: 6rpx; - border-top: 12rpx solid #333; - border-left: 12rpx solid #fff; - border-right: 12rpx solid #fff; - } - } - } - .search-content { - width: 100%; - background: #fff; - border-top-left-radius: 28rpx; - border-top-right-radius: 28rpx; - overflow: hidden; - - .head-title { - width: 100%; - height: 96rpx; - line-height: 96rpx; - text-align: center; - font-size: 36rpx; - color: #333; - font-weight:550; - margin-top:10rpx; - position:relative; - } - - .item-content { - padding: 0 0 0 30rpx; - - .s-line { - position: relative; - width: 630rpx; - margin: 15rpx auto 45rpx; - height: 2rpx; - background: #FAFAFA; - - &:before { - content: ""; - display: block; - position: absolute; - left: -85rpx; - top: -16rpx; - width: 32rpx; - height: 32rpx; - border-radius: 50%; - background: #EEF1F8; - } - - &::after { - content: ""; - display: block; - position: absolute; - right: -58rpx; - top: -16rpx; - width: 32rpx; - height: 32rpx; - border-radius: 50%; - background: #EEF1F8; - } - } - - .title { - font-size: 28rpx; - color: #333333; - padding: 30rpx 0 20rpx; - } - - .options { - display: flex; - flex-wrap: wrap; - - .v-line { - border-bottom: 1px dotted #f1ececb8; - margin: 26rpx 0; - } - - .item { - position: relative; - min-width: 170rpx; - margin-right: 30rpx; - height: 76rpx; - text-align: center; - line-height: 76rpx; - background: #F5F5F5; - margin-bottom: 30rpx; - padding: 0 20rpx; - border-radius: 12rpx; - font-size: 28rpx; - color: #333333; - - &.disable { - color: #C6C6C6; - background: #F8F8F8; - } - - &.on { - background: #E7F1FF; - color: #1677ff; - - } - } - } - } - - .btn-wrap { - display: flex; - justify-content: center; - padding-top: 10rpx; - padding-bottom: 40rpx; - - .btn { - width: 688rpx; - height: 88rpx; - line-height: 88rpx; - text-align: center; - background: #1677ff; - font-size: 32rpx; - color: #fff; - border-radius: 60rpx; - } - } - } -.s_close{position:absolute;top:30rpx;right:6%;width:30rpx;height:30rpx; -background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAgCAYAAAAFQMh/AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RjkzQkY4QkFCMjY0MTFGMDlGOThGMzcyM0VCRTJGMkYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RjkzQkY4QkJCMjY0MTFGMDlGOThGMzcyM0VCRTJGMkYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTNCRjhCOEIyNjQxMUYwOUY5OEYzNzIzRUJFMkYyRiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTNCRjhCOUIyNjQxMUYwOUY5OEYzNzIzRUJFMkYyRiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PvssjGYAAAO/SURBVHjatJf7a5V1HMef5bN2tduObjp1hMlOTbCpaKTifpI0b1EKXgo0U4Lw/0j8ZSoohkpFKjLvUYrWREX8Qa0oQaw5O7Yzt45jbW7u4nZ8f+R14MvDOdtz9PSB13jOs+37/n6u3+/Ji0aj2zzPaxenxF9i2Mu9lYo66BG/+foxT3SLAXFUtORY9AUxWywTM0WvKDHhWlEkqsSgaBD/5kj0Rdb/VKzms0U34bMjs6jYIvLFd+JBDoTfYc1FiJr9IS6PiUQiteTgZVEhyghHC/l41vDOFRvEKtbuE1fEAXHehBOEOErIJxL2TnFH9GcpmifeFl8gWsJ7E90lfhRtJhzXQ5xqnuR4Pk4kRbN4lIXwfLFZvC9e5d1ZPD2DQ0kTHtLDfUJbgrcW+smiXHSJfwj/SJZPIW0U68QrTni/EqdZ66mZcOrZiumuvRNviUIxXkwl17dpuUw2S2wVK4ia2UWxQ5yjZb10whbWBK2U74S9nJANsrG+NKJzaJkPxGuO6H7xfVA0KJyyNhEjVNWiQEwRlfRgM5tIVe+btMzH4iVhqftV7BQnMnVGOmEPgTjP1YS9HPFOejH1O6velY6nl8Qe8YOb06D5I+TsBq1hLbaENnuXdHSQ7/lMpAieXhffiOPpwhtW2CNk9fSyDYNixMsI9wREk4jWZ8pp2FC7BdcO3bRZFUyh1xOIfU2f/hem2f2QQ+EavV5BXoucGR/nYGnIdqaGtQHyGLRhp8pD22ihTtkMsUYsZKLlBTafz6ZaRxkyoUNti74h1lNcZeSwiYKz0L/O7ycz9c6FOdVG83i6+Fx8SAWn+nQ7g7+HaBTSbjbtHoo/M6QllMc1TKPVDA+zX8QhcZLPCTa0lApfyEk2gOdd2Xo8jTG4gQXNbjLwjzvz2oTvkYIaUlOF5/c5z4fCCtsCm8RH5NBjOOxDNBHo81YmWQH1UIhwhN5Pe3MNCk+lUDaSsyS7tlPmIIMknf2NeITQF7NWKf/TFqx2PxDez2ib8by7JXaHvHleZaN2YVhLy9WhUciVZ8D1eAzh/YRCqnIK6VtxmHCOZkN43uWEeyztVsKGYqlh43MbXMpBnvK0idl7aITwZrKfKT5bezHjdTmbsd6/YJVvHn/JH1Q69969hLfVy96SVHQ7ua4h7BVgvd/lc0cqdnJ6BJ7nq4zlspFRauFewDXqPSo84n6TiHEFfV5R9/BoJPePcTCPm2ivz2Fv0+YncYwLXa6snxFbRE9Pp8jiPvfeDg7x2P/wFbWPVitAx3L8+xMBBgBa0QNtbOSplwAAAABJRU5ErkJggg==") center no-repeat; -background-size:30rpx; -} \ No newline at end of file diff --git a/packageCa/pagesTest/workValuesTestTitle.vue b/packageCa/pagesTest/workValuesTestTitle.vue index 1a0e6ff..35dc01b 100644 --- a/packageCa/pagesTest/workValuesTestTitle.vue +++ b/packageCa/pagesTest/workValuesTestTitle.vue @@ -86,7 +86,7 @@ } }, created() { - this.getHistoryTitle(); + this.getTitle(); }, methods: { // 返回 @@ -114,16 +114,6 @@ } this.pageIndex-- }, - //获取答题记录 - getHistoryTitle(){ - api.getTestRecordProcessList(17).then(res => { - if (res.Result === 1) { - let data = res.Data; - this.historyTitle = data; - this.getTitle(); - } - }) - }, // 获取题目 getTitle() { uni.showLoading({ @@ -135,20 +125,7 @@ let list = res.Data.List; list.forEach(item => { item.Value = 0; - this.historyTitle.forEach(ritem=>{ - if(item.TitleId == ritem.TestTitleId){ - item.Value = Number(ritem.TestResult) + 1; - } - }) }) - if(this.historyTitle.length == 0){ - this.pageIndex = 0; - }else if(this.historyTitle.length == list.length){ - this.pageIndex = list.length - 1; - }else { - this.pageIndex = this.historyTitle.length; - } - this.allNum = list.length; this.list = list; } @@ -165,28 +142,14 @@ console.log('单击事件被触发'); this.lastTapTime = now; this.list[INDEX].Value = NUM; - // - this.saveTestRecordProcess(this.list[INDEX].TitleId,NUM-1); + setTimeout(()=>{ if(this.pageIndex != this.list.length - 1){ this.pageIndex = INDEX + 1; - } },300) } }, - //存储答题记录 - saveTestRecordProcess(ID,VALUE){ - let data = { - testType: 17, - testTitleId: ID, - testResult: VALUE - } - api.saveTestRecordProcess(data).then(res => { - if (res.Result === 1) { - } - }) - }, // 提交题目 submitTitle() { let testStr = ""; @@ -217,9 +180,7 @@ let data = { testStr } - api.removeTestRecordProcess(17).then((res) => { - return api.saveWorkValuesResult(data); - }).then((res) => { + api.saveWorkValuesResult(data).then((res) => { uni.hideLoading(); if (res.Result === 1) { uni.showToast({ @@ -231,7 +192,7 @@ beforePage.data.refreshIfNeeded = true; setTimeout(()=>{ uni.redirectTo({ - url: `/packageCa/testReport/workValuesTestReport?year=${res.Data.Year}` + url: `/packageCa/testReport/workValuesTestReport` }) },1000) } else { diff --git a/packageCa/search/search.vue b/packageCa/search/search.vue index 83f8958..1e4fdcd 100644 --- a/packageCa/search/search.vue +++ b/packageCa/search/search.vue @@ -62,36 +62,13 @@ onLoad(e) { this.userId = e.userId; this.name = e.name; - this.queryWechartToken(); + this.queryKaShiToken(); }, methods: { // 返回 goback() { uni.navigateBack(-1); }, - async getUserInfor(){ - const res = await api.getUserBasisInfo(); - if (res.Result == 1) { - const data = res.Data.data; - if(data === null){ - uni.showToast({ - title: "请先完善个人信息", - duration:2000, - icon: "none" - }) - setTimeout(() => { - uni.navigateTo({ - url: "/packageCa/userCenter/fillInInformation" - }) - }, 2000); - } - } else { - uni.showToast({ - title: res.Message, - icon: "none" - }) - } - }, // 演示入 navDetail(index){ switch (index){ @@ -139,42 +116,15 @@ async queryKaShiToken() { const res = await api.queryKaShiToken(this.userId,this.name) if(res.Result == 1){ - return res.Data; + let params = { + token:res.Data.token, + user: res.Data.userInfo + }; + uni.setStorageSync('CAuserInfo',params); }else { return null } }, - // 获取token - async queryWechartToken() { - uni.showLoading({ - title: "加载中" - }) - const data = await this.queryKaShiToken(); - if(data.userInfo != null){ - const res = await api.queryWechartToken(data.userInfo.Id,2268,1) - uni.hideLoading(); - if(res.Result == 1){ - let params = { - token:data.token, - user:data.userInfo, - userToken: res.Data.token - }; - uni.setStorageSync('CAuserInfo',params); - this.getUserInfor(); - } - }else { - uni.showToast({ - title: "获取用户信息失败", - icon: "none" - }) - setTimeout(()=>{ - uni.reLaunch({ - url: "/pages/index/index" - }) - },1500) - - } - } } } diff --git a/packageCa/testReport/components/contrastBox.vue b/packageCa/testReport/components/contrastBox.vue index 8c42f56..b9f81c0 100644 --- a/packageCa/testReport/components/contrastBox.vue +++ b/packageCa/testReport/components/contrastBox.vue @@ -30,9 +30,9 @@ {{optionStr2}} - + 我的报告 @@ -54,19 +54,21 @@ {{optionStr2}} - + + 全体人员 受测对象 男 女 - --> + @@ -340,22 +342,25 @@ //选中群体维度 selectSchoolLevel(info) { console.log(info); - if (this.platformType == 1) { - this.departName = info.Name; - //高校 - this.schoolLevel = info.DepartId; - this.sexType = 0; - } else { - if(!this.gradeShow && info < 3){ - return uni.showToast({ - title: "当前学期未进行分班,无法进行对比", - icon: "none" - }) - } - //普教 - this.schoolLevel = info; - this.sexType = 0; - } + // if (this.platformType == 1) { + // this.departName = info.Name; + // //高校 + // this.schoolLevel = info.DepartId; + // this.sexType = 0; + // } else { + // if(!this.gradeShow && info < 3){ + // return uni.showToast({ + // title: "当前学期未进行分班,无法进行对比", + // icon: "none" + // }) + // } + // //普教 + // this.schoolLevel = info; + // this.sexType = 0; + // } + this.departName = "全体人员" + this.sexType = 0; + this.schoolLevel = info; this.optionStr2 = ""; this.selYTItem2 = null; this.selRepItem2 = null; diff --git a/packageCa/userCenter/careerCompass.vue b/packageCa/userCenter/careerCompass.vue index e6beb5c..9032b2f 100644 --- a/packageCa/userCenter/careerCompass.vue +++ b/packageCa/userCenter/careerCompass.vue @@ -124,8 +124,12 @@ }, //选中职业添加 async checkedJob(ITEM){ + uni.showLoading({ + title: "添加中..." + }) this.checkedIndex = ITEM.JobId; const res = await api.saveGXCareerPlan(ITEM.JobId); + uni.hideLoading(); if (res.Result == 1) { uni.showToast({ title: "添加成功", @@ -162,9 +166,9 @@ const res = await api.getGXCareerPlanList("",this.page,10); if (res.Result == 1) { this.jobList = res.Data.list; - // if(res.Data.list.length < 10){ - // this.noMore = true; - // } + if(res.Data.list.length == 0){ + this.noMore = true; + } } else { uni.showToast({ title: res.Message, diff --git a/packageCa/userCenter/fillInInformation.vue b/packageCa/userCenter/fillInInformation.vue deleted file mode 100644 index 43690b3..0000000 --- a/packageCa/userCenter/fillInInformation.vue +++ /dev/null @@ -1,563 +0,0 @@ - - - - \ No newline at end of file diff --git a/packageCa/userCenter/personDocument.vue b/packageCa/userCenter/personDocument.vue index ceb5c90..de89b7d 100644 --- a/packageCa/userCenter/personDocument.vue +++ b/packageCa/userCenter/personDocument.vue @@ -4,20 +4,8 @@ 生涯档案 - - + + + @@ -223,7 +211,7 @@ - 优势的能力： + 优秀的能力： {{item}} 、 @@ -233,6 +221,17 @@ 无 + + 优势的能力： + + + {{item}} 、 + + + + 无 + + @@ -298,6 +297,7 @@ multGroupList1: [],//多元能力能力强 universalResult: "",//通用能力 universalGroupList1: [],//通用能力 优势 + universalGroupList2: [],//通用能力 优势 } }, onShow() { @@ -317,10 +317,10 @@ title: "加载中" }) const gradeLevel = this.user.GradeLevel; - const res = gradeLevel == 3? await api1.getGXWechatStudentProfile() : await api.queryStudentProfile(); + const res = await api1.getGXWechatStudentProfile(); uni.hideLoading(); if(res.Result == 1){ - let data = gradeLevel == 3? res.Data.list : res.Data; + let data = res.Data; // 意向职业 this.intentionJobList = data.IntentionJobList; // 意向专业 @@ -373,6 +373,7 @@ this.multResult = data.MultResult; // 通用能力 this.universalGroupList1 = data.UniversalGroupList1; + this.universalGroupList2 = data.UniversalGroupList2; this.universalResult = data.UniversalResult; } } diff --git a/packageCa/userCenter/professionPath.vue b/packageCa/userCenter/professionPath.vue index 935428d..9fea0f4 100644 --- a/packageCa/userCenter/professionPath.vue +++ b/packageCa/userCenter/professionPath.vue @@ -51,7 +51,7 @@ 去测评 - + 职业介绍 @@ -60,7 +60,7 @@ {{jobIntroduce}} - + 发展路径 @@ -68,9 +68,9 @@ {{jobPath}} - + - 大学生 + 我 @@ -183,6 +183,9 @@ // 获取职业 async queryPathInfo(){ this.isLoadingEnd = false; + if(this.jobList.length == 0){ + return; + } const res = await api.queryPathInfo(this.checkedCode); if (res.Result == 1) { let data = res.Data; diff --git a/packageCa/userCenter/smartTarget.vue b/packageCa/userCenter/smartTarget.vue index baccbea..3da29ac 100644 --- a/packageCa/userCenter/smartTarget.vue +++ b/packageCa/userCenter/smartTarget.vue @@ -186,6 +186,7 @@ tabs:['目标一 ', '目标二 ', '目标三 ', '目标四 ', '目标五 '], targetList: [],////目标列表 checkedTargetCode: "",//// 目标码 + videoUrlVisitor: "", newTargetParams: { Id: 0, TargetDesc: "", @@ -383,6 +384,15 @@ background-size: 38rpx 38rpx; } } + .video-content { + padding: 0; + width: 710rpx; + background: #000; + .video { + width: 100%; + // height: 400rpx; + } + } .index-wrap { .content { diff --git a/pages.json b/pages.json index 0b0ad08..0a2e217 100644 --- a/pages.json +++ b/pages.json @@ -571,12 +571,6 @@ "navigationStyle": "custom" } }, - { - "path": "userCenter/fillInInformation", - "style": { - "navigationBarTitleText": "完善个人信息" - } - }, { "path": "pagesTest/testList", "style": { diff --git a/utilCa/config.js b/utilCa/config.js index 299c8ae..89806a7 100644 --- a/utilCa/config.js +++ b/utilCa/config.js @@ -1,39 +1,13 @@ let baseUrl = "" -let baseUrl1 = "" -let baseUrl2 = "" -let baseUrl3 = "" -let baseUrl4 = "" -let baseUrl5 = "" -let baseUrl6 = "" -let baseUrl7 = "" -let baseUrl8 = "" -let filestore_site = ""; // #ifdef MP-WEIXIN // 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译 if (wx.getAccountInfoSync().miniProgram.envVersion === 'develop') { - baseUrl = 'http://dev.51xuanxiao.com:8005/api' // 开发环境 - baseUrl3 = 'http://dev.51xuanxiao.com:8007/api' // 职业环境 - baseUrl4 = 'http://dev.51xuanxiao.com:8009/api' // 用户环境 - baseUrl5 = 'http://dev.51xuanxiao.com:8006/api' // 测评环境 - filestore_site = 'http://192.168.1.168:31128' //文件地址 + baseUrl = 'https://localhost:7026' // 开发环境 } else { - baseUrl = 'https://yanxueapi.51xuanxiao.com/api' // 生产环境 - baseUrl3 = "https://jobapi.51xuanxiao.com/api"// 职业环境 - baseUrl4 = "https://authapi.51xuanxiao.com/api"// 用户环境 - baseUrl5 = "https://testapi.51xuanxiao.com/api"// 测评环境 - filestore_site = 'https://filestore.plan.51xuanxiao.com' //文件地址 + baseUrl = 'https://yanxueapi.51xuanxiao.com' // 生产环境 } // #endif export { - baseUrl, - baseUrl1, - baseUrl2, - baseUrl3, - baseUrl4, - baseUrl5, - baseUrl6, - baseUrl7, - baseUrl8, - filestore_site + baseUrl } \ No newline at end of file diff --git a/utilCa/request.js b/utilCa/request.js index 5e4ccc3..ca45567 100644 --- a/utilCa/request.js +++ b/utilCa/request.js @@ -1,14 +1,4 @@ -import { - baseUrl, - baseUrl1, - baseUrl2, - baseUrl3, - baseUrl4, - baseUrl5, - baseUrl6, - baseUrl7, - baseUrl8 -} from './config.js' +import { baseUrl} from './config.js' const request = {} const headers = {} @@ -18,77 +8,20 @@ request.globalRequest = (url, method, data, power, type) => { // 1 == 不通过access_token校验的接口 // 2 == 文件下载接口列表 const userInfo = uni.getStorageSync('CAuserInfo') - // console.log('缓存userinfo:',userInfo); - switch (power) { - case 1: - case 3: - headers['Token'] = userInfo.token - // if(power == 3){ - // const deviceInfo = wx.getDeviceInfo() - // let data = { - // model: deviceInfo.model, - // system: deviceInfo.system, - // platform: deviceInfo.platform - // } - // headers['DeviceInfo'] = JSON.stringify(data) - // } - break; - case 2: - headers['Authorization'] = userInfo.userToken - break; - default: - break; - } - let host = ""; - let key = ""; - if (type == 1) { - host = baseUrl1; - } else if (type == 2) { - host = baseUrl2; - } else if (type == 3) { - host = baseUrl3; - } else if (type == 4) { - host = baseUrl4; - } else if (type == 5) { - host = baseUrl5; - } else if (type == 7) { - host = baseUrl7; - key = `?PartnerKey=51xuanxiao&PartnerSecret=mC6XRjDWUzGAdxcCqRBWGb88uR`; - } else if (type == 8) { - host = baseUrl8; - //key = `?AppKey=51xuanxiao&AppSecret=mC6XRjDWUzGAdxcCqRBWGb88uR`; - } else { - host = baseUrl; - } + headers['Token'] = userInfo.token return uni.request({ timeout: 60000, - url: host + url + key, + url: baseUrl + url, method, data: data, dataType: 'json', header: headers }).then(res => { - //console.log("ressss===="+JSON.stringify(res.data)); - // console.log("type===="+type); - if (type == 7) { - if (res[1].data.code == 0) { - return res[1].data - } else { - throw res[1].data - } - } else if (type == 8) { - if (res[1].data.Code == 0) { - return res[1].data - } else { - throw res[1].data - } - } else { - if (res.data.Result) { - return res.data - } else { - throw res.data - } - } + if (res.data.Result) { + return res.data + } else { + throw res.data + } }).catch(parmas => { switch (parmas.status) { case 401: