Merge branch '2025北京诚祥' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥

components/questions/useQuestionTools.js

@@ -30,6 +30,9 @@ export function useQuestionTools() {
 	}
 
 	function checkDanxuanReply(item) {
+		if (item.reply === 0 || item.reply === '0') {
+			return true
+		}
 		if (!item.reply || item.reply === '' || item.reply === [] || item.reply.length === 0) {
 			return false;
 		} else {

components/zhuapaiConfirm/submitScore.vue

@@ -1,12 +1,12 @@
 <template>
 	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false" type="bottom"
-		mask-background-color="rgba(0, 0, 0, 0.4);" >
+		mask-background-color="rgba(0, 0, 0, 0.4);">
 		<view class="exam-score-dialog">
 			<view class="icon-title-bjcolor-navBar-box">
 				<view @click="handleClose" class="nav-bar-icon"></view>
 				<text class="nav-bar-title">{{title}}</text>
 			</view>
-			
+
 			<view class="score-content-box">
 				<view class="score-content-name">{{data.ksName}}</view>
 				<view class="score-content-text">{{labelName}}：{{data.ksScore}}</view>
@@ -15,6 +15,9 @@
 				<view class="score-content-text">试题总数：{{data.shitiTotal}}</view>
 				<view class="score-content-text">用户得分：{{data.userScore}}</view>
 			</view>
+
+			<c-progress-circle :progress='data.userAccuracy/100' color='#3ec3c1' size='200rpx'
+				boderWidth="200rpx"></c-progress-circle>
 			<button type="default" class="phone-green-btn score-dialog-btn" @click="handleCheckSj">查看成绩</button>
 		</view>
 	</uni-popup>
@@ -22,7 +25,8 @@
 
 <script setup>
 	import {
-		ref,reactive
+		ref,
+		reactive
 	} from "vue";
 	const popupRef = ref(null)
 	const data = reactive({
@@ -33,7 +37,7 @@
 		shitiTotal: '',
 		userScore: '',
 	})
-	
+
 	defineProps({
 		title: {
 			type: String,
@@ -42,21 +46,21 @@
 		labelName: {
 			type: String,
 			default: '考试总分'
-		}	
+		}
 	})
-	
+
 	const emits = defineEmits(['confirm', 'close'])
-	
+
 	function handleClose() {
 		emits('close');
 		popupRef.value.close()
 	}
-	
+
 	function handleCheckSj() {
 		emits('confirm', data);
 		popupRef.value.close()
 	}
-	
+
 	function showDialog(options) {
 		data.ksName = options.ksName;
 		data.ksScore = options.ksScore;
@@ -64,11 +68,27 @@
 		data.rightCount = options.rightCount;
 		data.shitiTotal = options.shitiTotal;
 		data.userScore = options.userScore;
+		data.userAccuracy = options.userAccuracy;
 		popupRef.value.open()
 	}
 
 	defineExpose({
 		showDialog
 	})
-	
 </script>
+
+<style lang="scss">
+	 .content{
+	        display: flex;
+	        flex-direction: column;
+	        align-items: center;
+	        padding-top: 20rpx;
+	        font-size: 28rpx;
+	    }
+	    .btnBox{
+	        width: 100%;
+	        display: flex;
+	        align-items: center;
+	        margin-top:30rpx;
+	    }
+</style>

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -23,8 +23,7 @@
 	export default {
 		data() {
 			return {
-				current: 0,
-				tabCurrent: 0,
+				current:1,
 			//	tabs: ['个人资料', '求职信息', '照片资料', '办证信息']
 				tabs: [
 				  { id: 1, name: '个人资料', disabled: false },
@@ -61,7 +60,8 @@
 				this.current = num - 1
 			},
 			goNextQiuzhixinxi(data,num){
-				
+				this.current = num + 1
+				this.tabs[this.current].disabled = false
 			},
 		}
 	}

pages/admin/Jiazheng/qiuzhiXinxi.vue

@@ -1,11 +1,18 @@
 <template>
 	<view class="jz-content-box">
 		<view class="form-label-radio form-top-margin flex-start-row">
-			<view class="phone-form-label"> <text class="form-label-require"></text>类型</view>
+			<view class="phone-form-label"> <text class="form-label-require">*</text>类型</view>
 			<dataChecked :list="typeList" mode="multiple" :defaultCount="9" @change="selectChangeType" @add="addType" />
 		</view>
 		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require"></text>经验</view>
+			<view class="phone-form-label"><text class="form-label-require">*</text>经验</view>
+			<picker :range="jingyanList" mode='selector' :value="jingyanIndex" range-key="name"
+				@change="jingyanChange" @cancel="jingyanCancel">
+				<view class="form-radio-select">
+					<view>{{ jingyan }}</view>
+					<icon></icon>
+				</view>
+			</picker>
 		</view>
 		<view class="form-label-radio flex-start-row">
 			<view class="phone-form-label"><text class="form-label-require">*</text>技能</view>
@@ -18,20 +25,20 @@
 		</view>
 		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require"></text>薪资级别</view>
-			<picker :range="xinziJibie" mode='selector' @change="xinziJibieChange" @cancel="xinziJibieCancel">
+			<picker :range="xinziJibieList" mode='selector' @change="xinziJibieChange" @cancel="xinziJibieCancel">
 				<view class="form-radio-select">
-					<view></view><icon></icon>
+					<view>{{jibiexinzi}}</view><icon></icon>
 				</view>
 			</picker>
 		</view>
 		
 		<view class="form-label-input">
 			<view class="phone-form-label"><text class="form-label-require"></text>期望薪资</view>
-			<input v-model="inputValue"  placeholder="请输入期望薪资" />
+			<input v-model="qiwangxinzi"  placeholder="请输入期望薪资" />
 		</view>	
 		<view class="form-label-input">
 			<view class="phone-form-label"><text class="form-label-require"></text>工作经历</view>
-			<input v-model="inputValue"  placeholder="请填写工作经历" />
+			<input v-model="jingli"  placeholder="请填写工作经历" />
 		</view>
 		<view class="page-btn-box">
 			<button type="default" @click="goUp" class="phone-white-btn">上一步</button>
@@ -45,7 +52,8 @@
 	import {
 		getJiazhengLeixing,
 		getJiazhengJineng,
-		getJiazhengZhuangtai
+		getJiazhengZhuangtai,
+		
 	} from "@/api/jiazheng.js";
 
 	export default {
@@ -60,25 +68,41 @@
 		},
 		data() {
 			return {
+				formData:{},
 				// 从后端获取的技能列表
 				skillList: [],
 				typeList: [],
+				leixing:"",
+				jineng:"",
 				zhuangtaiList: [],
-				inputValue: '',
-				xinziJibie: ["一", "二","三","四","五",],
+				zhuangtai:'',
+				jingyan:"",
+				jingyanIndex:0,
+				qiwangxinzi: '面议',
+				jingli: '',
+				xinziJibieList: ["一级", "二级","三级","四级","五级",],
+				jibiexinzi:"",
+				jingyanList: Array.from({length: 51}, (_, i) => i + '年'),
 			};
 		},
 		methods: {
 			// 点击完成按钮的时候触发，
 			xinziJibieChange(e) {
 				//通过e.detail.value获取值，获取的是自定义数据的下标
-				const val = e.detail.value
-				console.log(val);
+				const index = e.detail.value
+				this.jibiexinzi = this.xinziJibieList[index]
+				console.log('jibiexinzi',this.jibiexinzi);
 			},
 			xinziJibieCancel(e) {
 				console.log("您已取消选择");
 			},
-
+			jingyanChange(e){
+				const index = e.detail.value
+				this.jingyan = this.jingyanList[index]
+			},
+			jingyanCancel(){
+				this.jingyanIndex = 0
+			},
 			getLeixing() {
 				getJiazhengLeixing({}).then(res => {
 					this.skillList = this.dataConversionObject(res.data)
@@ -121,7 +145,9 @@
 				return newList
 			},
 			selectChangeType(data) {
-				console.log('typeData', data);
+			//	console.log('typeData', data);
+				this.leixing =this.dataConversionArray(data).join(',') 
+				console.log('this.leixing',this.leixing);
 			},
 			addType(newType) {
 				this.typeList.push({
@@ -129,7 +155,8 @@
 				});
 			},
 			selectChangeSkill(data) {
-				console.log('SkillData', data);
+				this.jineng =this.dataConversionArray(data).join(',')
+				console.log('this.jineng',this.jineng);
 			},
 			addSkill(newSkill) {
 				this.skillList.push({
@@ -138,9 +165,24 @@
 			},
 			selectChangeZhuangtai(data) {
 				console.log('zhuangtaiData', data);
+				this.zhuangtai  =data[0].id
+				console.log('zhuangtai', this.zhuangtai);
+				// const index = e.detail.value
+				// this.jingyan = this.jingyanList[index]
 			},
 			
 			goNext() {
+				this.formData = {
+					leixing:this.leixing,
+					jingyan:this.jingyan,
+					jineng:this.jineng,
+					zhuangtai:this.zhuangtai,
+					jibiexinzi:this.jibiexinzi,
+					qiwangxinzi:this.qiwangxinzi,
+					jingli:this.jingli,
+					
+				}
+				console.log('this.formData',this.formData);
 				// if(!this.formData.agree){
 				// 	uni.showToast({
 				// 		title: "请勾选本人同意！",
@@ -149,7 +191,7 @@
 				// 	})
 				// 	return false
 				// }
-				this.$emit('goNext',{},0);
+				this.$emit('goNext',{},1);
 			},
 			goUp() {
 				// if(!this.formData.agree){

pages/client/Chengji/ksScoreShijuan.vue

@@ -64,6 +64,7 @@
 				<view>
 					<button type="default" size="mini" hover-class="none" class="phone-green-btn score-answer-btn" @click="handlePrev" v-if="!isFistStId">上一题</button>
 					<button type="default" size="mini" hover-class="none"class="phone-green-btn score-answer-btn" @click="handleNext" v-if="!isLastStId">下一题</button>
+					<button type="default" size="mini" hover-class="none"class="phone-green-btn score-answer-btn" @click="handleBack" v-if="isLastStId">完成</button>
 				</view>
 			</view>
 			<!-- 答题卡 -->

pages/client/Chengji/lxScoreShijuan.vue

@@ -68,6 +68,8 @@
 					@click="handlePrev" v-if="!isFistStId">上一题</button>
 				<button type="default" size="mini" hover-class="none" class="phone-green-btn score-answer-btn"
 					@click="handleNext" v-if="!isLastStId">下一题</button>
+				<button type="default" size="mini" hover-class="none" class="phone-green-btn score-answer-btn"
+						@click="handleBack" v-if="isLastStId">完成</button>
 			</view>
 		</view>
 

pages/client/Kaoshi/exam.vue

@@ -331,7 +331,7 @@
 		if (result.count) {
 			// 提示
 			answerQrRef.value.showDialog({
-				answercartsCount: result.count,
+				answercartsCount: result.total - result.count,
 				answercartsTotal: result.total,
 			})
 		} else {

pages/client/Kecheng/study.vue

@@ -199,7 +199,7 @@
 						videoId: data.url,
 						playAuth: res.data,
 						seekTime: '',
-						isPlay: true
+						isPlay: false
 					})
 
 				})

pages/client/Lianxi/exam.vue

@@ -253,7 +253,7 @@
 		if (result.count) {
 			// 提示
 			answerQrRef.value.showDialog({
-				answercartsCount: result.count,
+				answercartsCount: result.total - result.count,
 				answercartsTotal: result.total,
 			})
 		} else {