fix: 解决冲突

pages/personLocation/exam/beginexam/beginexam.vue

@@ -36,16 +36,10 @@
 			}
 		},
 		mounted() {
-			var tab = document.querySelector('.uni-progress-inner-bar');
+			this.getDataFn();
-			console.log(tab);
-			var p = document.createElement('p');
-			p.className = "uni-progress-info"
-			p.innerText = ((this.stIndex + 1) * 100).toFixed(0) + '%'
-			tab.appendChild(p);
 		},
 		onLoad(options) {
 			this.pageData = JSON.parse(options.transportData)
-			this.getDataFn();
 		},
 		methods: {
 			getDataFn() {
@@ -61,6 +55,11 @@
 						console.log('试题信息', res)
 						if (res.result) {
 							that.stList = res.result;
+							var tab = document.querySelector('.uni-progress-inner-bar');
+							var p = document.createElement('p');
+							p.className = "uni-progress-info"
+							p.innerText = (((that.stIndex + 1) * 100) / that.stList.length).toFixed(0) + '%'
+							tab.appendChild(p);
 							that.stList.map(item => {
 								item.trainRecordId = that.pageData.trainRecordId
 							})
@@ -70,8 +69,6 @@
 			},
 			radioChange(evt) {
 				console.log(evt)
-				var progressTip = document.querySelector('.uni-progress-info');
-				progressTip.innerText = ((this.stIndex + 1) * 100).toFixed(0) + '%'
 				this.stList[this.stIndex].answer = evt.detail.value
 				let that = this;
 				// 当到达最后一题时
@@ -81,6 +78,8 @@
 				uni.showLoading()
 				setTimeout(function() {
 					that.stIndex++;
+					var progressTip = document.querySelector('.uni-progress-info');
+					progressTip.innerText = (((that.stIndex + 1) * 100) / that.stList.length).toFixed(0) + '%'
 					uni.hideLoading()
 				}, 500)
 			},

pages/personLocation/exam/studydetails/studydetails.vue

@@ -20,7 +20,7 @@
 				<text>{{responseData.courseName}}</text>
 			</view>
 		</view>
-		<button type="primary" :disabled="isStartExam" class="btn" @click="goHiidden" v-if="pageData.examPaperId">开始考试</button>
+		<button type="primary"  class="btn" @click="goHiidden" v-if="pageData.examPaperId">开始考试</button>
 	</view>
 </template>
 

pages/projectEnd/trainPlan/addPlan.vue

@@ -31,7 +31,7 @@
 					@input='supplementTextarea' :value="form.title" placeholder="请输入"></textarea>
 			</view>
 			<view class="type flex" v-if="typeCheck == 'type1'">
-				<view class="name"><text class="star">*</text>培训课件：</view>
+				<view class="name">培训课件：</view>
 				<picker @change="(e)=>bindPickerChange(e,2)" :value="trainKjIndex" class="picker"
 					:range="trainKjList" range-key="courseName">
 					<view class="uni-input uni-select cl" v-if="form.courseId==''">
@@ -45,7 +45,7 @@
 			</view>
 
 			<view class="type flex" v-if="typeCheck == 'type1'">
-				<view class="name"><text class="star">*</text>考试试卷：</view>
+				<view class="name">考试试卷：</view>
 				<picker @change="(e)=>bindPickerChange(e,3)" :value="examSjIndex" class="picker"
 					:range="examSjList" range-key="name">
 					<view class="uni-input uni-select cl" v-if="form.examPaperId==''">
@@ -340,16 +340,9 @@
 					})
 					return
 				}
-				if(!this.form.courseId){
+				if(!this.form.courseId && !this.form.examPaperId){
 					uni.showToast({
-						title: '请选择培训课件',
+						title: '请选择至少选择培训课件或考试试卷一种',
-						icon: 'none'
-					})
-					return
-				}
-				if(!this.form.examPaperId){
-					uni.showToast({
-						title: '请选择考试试卷',
 						icon: 'none'
 					})
 					return