素质测评测试优化

packageCa/apiCa/user.js

@@ -3,9 +3,9 @@ import request from '@/packageCa/utilCa/request.js'
 const api = {}
 
 //根据openId,获取token,并判断用户是否已绑定账号
-api.queryKaShiToken = (userId,name) => request.globalRequest(`/Home/QueryKaShiToken?userId=${userId}&name=${name}&schoolId=2371`,'GET', {})
+api.queryKaShiToken = (idCard,name) => request.globalRequest(`/Home/QueryKaShiToken?userIdNO=${idCard}&name=${name}&schoolId=2371`,'GET', {})
 // 获取ai面试路径
-api.queryAIUrl = (userId,name) => request.globalRequest(`/Home/QueryAIUrl?userId=${userId}&name=${name}&schoolId=2371`,'GET', {})
+api.queryAIUrl = (idCard,name) => request.globalRequest(`/Home/QueryAIUrl?userIdNO=${idCard}&name=${name}&schoolId=2371`,'GET', {})
 
 // 获取个人档案
 api.queryStudentProfile = () => request.globalRequest(`/StudentResource/QueryStudentProfile`,'GET', {})

packageCa/pagesTest/customTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-    <view class="title-wrap">
+    <view class="title-wrap" style="padding-top: 40rpx;">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" v-if="taskId ==0" @click="goback"></view>
-            <text v-if="testTitle != ''">{{testTitle}}</text>
-        </view>
         <view class="progress-block">
             <view class="row">
                 <view class="title-index">

packageCa/pagesTest/interestTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-	<view class="title-wrap">
+	<view class="title-wrap" style="padding-top: 40rpx;">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback"></view>
-			<text>职业兴趣测评</text>
-		</view>
 		<view class="progress-block">
 			<view class="row">
 				<view class="title-index">

packageCa/pagesTest/personalTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-	<view class="title-wrap">
+	<view class="title-wrap" style="padding-top: 40rpx;">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback()"></view>
-			<text>人格测评</text>
-		</view>
 		<view class="progress-block">
 			<view class="row">
 				<view class="title-index">

packageCa/pagesTest/testList.vue

@@ -1,10 +1,6 @@
 <template>
 	<view class="test-list-wrap" style="display:block;">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
+		<view class="content" style="overflow:hidden; padding-top: 40rpx;" >
-			<view class="go-back" @click="goback"></view>
-			<text>生涯测评</text>
-		</view>
-		<view class="content" style="overflow:hidden;">
 			<view class="p-item" >
 				<view class="item" v-for="(item,index) in dataList" :key="index">
 				    <view class="h2">{{item.Name}}</view>

packageCa/pagesTest/workValuesTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-	<view class="title-wrap">
+	<view class="title-wrap" style="padding-top: 40rpx;">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback"></view>
-			<text>工作价值观测评</text>
-		</view>
 		<view class="progress-block">
 			<view class="row">
 				<view class="title-index">

packageCa/search/search.vue

@@ -1,10 +1,6 @@
 <template>
 	<view class="index-wrap">
 		<view class="yanshi-wrap">
-			<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-				<view class="go-back"  @click="goback"></view>
-				<text>素质测评</text>
-			</view>
 			<view class="section">
 				<view class="head-title">测评中心</view>
 				<view class="nav-block">
@@ -55,20 +51,16 @@
 			return {
 				barHeight: wx.getWindowInfo().statusBarHeight,
 				user: null,//用户信息
-				userId: 0,
+				name: "",
-				name: ""
+				idCard: ""
 			}
 		},
 		onLoad(e) {
-			this.userId = e.userId;
+			this.idCard = e.idCard;
 			this.name = e.name;
 			this.queryKaShiToken();
 		},
 		methods: {
-			// 返回
-			goback() {
-				uni.navigateBack(-1);
-			},
 			// 演示入
 			navDetail(index){
 				switch (index){
@@ -114,7 +106,7 @@
 			
 			// 登录获取用户信息
 			async queryKaShiToken() {
-				const res = await api.queryKaShiToken(this.userId,this.name)
+				const res = await api.queryKaShiToken(this.idCard,this.name)
 				if(res.Result == 1){
 					let params = {
 						token:res.Data.token,

packageCa/testReport/generalCareerTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
 			 <contrastBox  @updateValue="handleChildValueChange" :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -75,7 +71,7 @@
 	import contrastBox from "@/packageCa/testReport/components/contrastBox.vue"
     import api from "@/packageCa/apiCa/testManage.js";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
+	const echarts = require('../utilCa/echarts.min.js');
     // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);

packageCa/testReport/interestTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
 			<contrastBox  :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -245,7 +241,7 @@
 	import contrastBox from "@/packageCa/testReport/components/contrastBox.vue"
     import api from "@/packageCa/apiCa/testManage.js";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
+	const echarts = require('../utilCa/echarts.min.js');
     // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);

packageCa/testReport/multipleAbilityTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
             <contrastBox  :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -115,7 +111,7 @@
     import api from "@/packageCa/apiCa/testManage.js"
     import wayData from "./multipleAbilityData.json";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
+	const echarts = require('../utilCa/echarts.min.js');
     // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);

packageCa/testReport/personalTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
             <contrastBox   :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -402,7 +398,7 @@
     import opts from "./chartOpts.js"
     import api from "@/packageCa/apiCa/testManage.js";
 	import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
+	const echarts = require('../utilCa/echarts.min.js');
     // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);

packageCa/testReport/workValuesTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
 			<contrastBox  :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
 			<view class="section-block">
@@ -43,8 +39,7 @@
 	import contrastBox from "@/packageCa/testReport/components/contrastBox.vue"
     import api from "@/packageCa/apiCa/testManage.js";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
+	const echarts = require('../utilCa/echarts.min.js');
-    // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);
     export default {

packageCa/userCenter/careerCompass.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-		    <text>生涯罗盘</text>
-		</view>
 		<view class="content">
 			<view class="title">
 				生涯罗盘
@@ -119,9 +115,6 @@
 			this.getGXCareerPlanList();
 		},
 		methods: {
-			goBack() {
-				uni.navigateBack(-1);
-			},			
 			//选中职业添加
 			async checkedJob(ITEM){
 				uni.showLoading({

packageCa/userCenter/learningPlan.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-		    <text>学习计划制定</text>
-		</view>
 		<view class="content">
 			<view class="title-h1">PDCA 循环法</view>
 			<view class="banner"></view>
@@ -150,9 +146,6 @@
 			this.queryPlanList();
 		},
 		methods: {
-			goBack(){
-				uni.navigateBack(-1);
-			},
 			// 切换目标标签
 			changeTarget(ITEM){
 				if(ITEM.EncodeId == this.checkedTargetCode){

packageCa/userCenter/personDocument.vue

@@ -1,10 +1,5 @@
 <template>
 	<view class="document">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback"></view>
-			<text>生涯档案</text>
-		</view>
-	
 	<!-- 	<view class="section" style="margin-top:60rpx;">
 			<view class="head">
 				<view class="left-txt">
@@ -33,7 +28,7 @@
 				<navigator url="/packageCa/job/index" class="btn">添加意向职业</navigator>
 			</view>
 		</view> -->
-		<view class="section"  style="margin-top:60rpx;">
+		<view class="section" >
 			<view class="head">
 				<view class="left-txt">
 					<view class="icon icon-4"></view>
@@ -308,9 +303,6 @@ import api1 from "@/packageCa/apiCa/studentProfile.js"
 		created() {
 		},
 		methods: {
-			goback(){
-				uni.navigateBack(-1);
-			},
 			// 获取个人档案
 			async queryStudentProfile() {
 				uni.showLoading({

packageCa/userCenter/professionPath.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-		    <text>职业路径</text>
-		</view>
 		<view class="content">
 			<view class="section">
 				<view class="title-h1">
@@ -224,9 +220,6 @@
 					icon:"none"
 				});
 			},
-			goBack(){
-				uni.navigateBack(-1);
-			},
 		}
 	}
 </script>

packageCa/userCenter/smartTarget.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-			<text>smart目标制定</text>
-		</view>
 		<view class="content">
 			<view class="banner-wrap"></view>
 			<view class="desc">
@@ -216,9 +212,6 @@
 					url:"/packageCa/userCenter/learningPlan"
 				})	
 			},
-			goBack(){
-				uni.navigateBack(-1);
-			},
 			// 添加目标
 			addTarget(){
 				this.targetForm = {
@@ -396,7 +389,6 @@
 
 	.index-wrap {
 		.content {
-			padding-top: 60rpx;
 			padding-bottom: 60rpx;
 
 			.banner-wrap {

pages.json

@@ -497,7 +497,7 @@
           {
             "path": "search/search",
             "style": {
-              "navigationBarTitleText": "生涯规划"
+              "navigationBarTitleText": "素质测评"
             }
           },
           {
@@ -563,13 +563,13 @@
           {
             "path": "pagesTest/testList",
             "style": {
-              "navigationBarTitleText": "生涯测评"
+              "navigationBarTitleText": "职业测评"
             }
           },
           {
             "path": "pagesTest/customTestTitle",
             "style": {
-              "navigationBarTitleText": "自定义测评"
+              "navigationBarTitleText": "能力测评"
             }
           },
           {

pages/index/components/index-one.vue

@@ -131,13 +131,13 @@
                     </view>
                     <view class="service-title">题库和考试</view>
                 </view>
-                <view class="service-item press-button" @click="handleServiceClick('quality-assessment')">
+                <view class="service-item press-button" @click="goCa()">
                     <view class="service-icon service-icon-8">
                         <IconfontIcon name="suzhicepingtiku" :size="48" color="#FFFFFF" />
                     </view>
                     <view class="service-title">素质测评</view>
                 </view>
-                <view class="service-item press-button" @click="handleServiceClick('ai-interview')">
+                <view class="service-item press-button" @click="goCaAI()">
                     <view class="service-icon service-icon-9">
                         <IconfontIcon name="ai" :size="68" color="#FFFFFF" />
                     </view>
@@ -865,8 +865,8 @@ function navToService(serviceType) {
         'skill-training': '/pages/service/skill-training',
         // 'skill-evaluation': '/pages/service/skill-evaluation',
         'question-bank': '/pages/service/question-bank',
-        'quality-assessment': '/pages/service/quality-assessment',
+        // 'quality-assessment': '/packageCa/search/search',
-        'ai-interview': '/pages/chat/chat',
+        // 'ai-interview': '/pages/chat/chat',
         'job-search': '/pages/search/search',
         'career-planning': '/pages/service/career-planning',
         'salary-query': '/pages/service/salary-query',
@@ -1074,6 +1074,24 @@ function goRc(){
         });
     }
 }
+// 跳转到素质测评
+function goCa(){
+    if (checkLogin()) {
+        let userInfo = uni.getStorageSync('userInfo')
+        storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
+            navTo(`/packageCa/search/search?name=${userInfo.name}&idCard=${userInfo.idCard}`);
+        });
+    }
+}
+// 跳转到AI面试
+function goCaAI(){
+    if (checkLogin()) {
+        let userInfo = uni.getStorageSync('userInfo')
+        storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
+            navTo(`/packageCa/search/AIAudition?name=${userInfo.name}&idCard=${userInfo.idCard}`);
+        });
+    }
+}
 
 
 defineExpose({ loadData });