考试

api/modules/growth.js

@@ -8,3 +8,7 @@ export const getAllPosition = () => ajax.get(`/manageApi/stu/grow/getPositionOfP
 export const getAllBandInfo = () => ajax.get(`/manageApi/admin/thirdApi/getAllBandInfo`)
 //全岗位路径
 export const getFullJobPath = (params) => ajax.get(`/manageApi/stu/grow/getFullJobPath?positionIdList=${params.positionIdList}&bandCodeList=${params.bandCodeList}`);
+//外部考试
+export const queryExternalExam = (params) => ajax.get(`/manageApi/external/exam/queryExternalExam?externalId=${params.externalId}&type=14`);
+//外部考试点击调用
+export const submitExternalExam = (params) => ajax.postJson(`/manageApi/stu/externalExam/submitExternalExam`,params);

pages/learnPath/examScore.vue

@@ -0,0 +1,133 @@
+<template>
+	<view class="externalexam">
+		<view class="title">
+			<view class="text">考试详情</view>
+			<img @click="$router.back(-1);" class="img" src="../../static/images/learnpath/return.png" alt="">
+		</view>
+	    <view class="notice">
+	      <view class="noticebox">
+	        <view class="main">
+	          <view class="e_title">
+	            【考试】{{ datainfo.examinationName }}
+	          </view>
+	          <view class="et_detail">
+	            数据来源：
+	            <view class="et_time">
+	              {{ datainfo.source ? datainfo.source : "-" }}
+	            </view>
+	          </view>
+	        </view>
+	      </view>
+	
+	      <view class="noticebox">
+	        <view class="btnbox">考试说明</view>
+	        <view class="e_form">
+	          {{
+	            datainfo.examinationExplain
+	              ? datainfo.examinationExplain
+	              : "暂无考试说明"
+	          }}
+	        </view>
+	      </view>
+	    </view>
+	  </view>
+</template>
+
+<script>
+	import { queryExternalExam } from "@/api/modules/growth.js"
+	export default {
+		data() {
+			return {
+				datainfo: {},
+			}
+		},
+		onLoad() {
+			queryExternalExam({
+				externalId: this.$route.query.courseId
+			  }).then(res=>{
+				console.log(res,'res')
+				this.datainfo = res.data
+			  })
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+.externalexam {
+  width: 100%;
+  background-color: #f2f5f7;
+  .title{
+	  display: flex;
+	  height: 88rpx;
+	  justify-content: center;
+	  align-items: center;
+	  background: #fff;
+	  position: relative;
+	  .text{
+		  font-size: 18px;
+		  font-weight: 600;
+		  color: #323233;
+	  }
+	  .img{
+		  position: absolute;
+		  left: 2.5%;
+		  width: 20rpx;
+	  }
+  }
+  .notice {
+    width: 100%;
+    margin-top: 10px;
+    font-size: 14px;
+  }
+  .noticebox {
+    width: 100%;
+    background: #fff;
+    margin-bottom: 11.5px;
+    .main {
+      width: 90%;
+      margin: 0 auto;
+      padding-top: 18px;
+      padding-bottom: 18px;
+    }
+  }
+  .e_title {
+    margin-bottom: 14.5px;
+    font-weight: 600;
+  }
+  .et_detail {
+    display: flex;
+    margin-bottom: 11.5px;
+    align-items: center;
+    .et_time {
+      color: #6e7b84;
+    }
+  }
+
+  .btnbox {
+    width: 90%;
+    height: 50px;
+    border-bottom: 1px solid #f1f2f3;
+    display: flex;
+    align-items: center;
+    font-size: 16px;
+    font-weight: bold;
+    color: #0d233a;
+    line-height: 24px;
+    padding-left: 5%;
+  }
+  .e_form {
+    width: 90%;
+    min-height: 40px;
+    display: flex;
+    flex-direction: column;
+    font-size: 12px;
+    color: #6e7b84;
+    margin-left: 5%;
+    line-height: 30px;
+    margin-top: 20px;
+  }
+}
+</style>

pages/learnPath/learnPath.vue

@@ -72,7 +72,7 @@
 						<view class="text">{{currentItem.currentRatio || 0}}%</view>
 					</view>
 				</view>
-				<view class="tea_text">
+				<view v-if="currentItem.type==1" class="tea_text">
 					<view>课程讲师: {{currentItem.teacherName?currentItem.teacherName.split(',').length > 3
                                   ? currentItem.teacherName.split(',').slice(0, 3).join(',') + '...'
                                   : currentItem.teacherName:''}}</view>
@@ -88,7 +88,7 @@
 </template>
 
 <script>
-	import { taskList } from "@/api/modules/growth.js"
+	import { taskList,submitExternalExam } from "@/api/modules/growth.js"
 	export default {
 		onLoad(options) {
 			this.growId = options.growId
@@ -319,6 +319,28 @@
 					console.log(item,'在线')
 					uni.navigateTo({url:"/pages/study/courseStudy?id=" + item.targetId});
 				  }else if (item.type == 5) {
+					  if(item.examType != 1){
+						submitExternalExam({
+						  "type": 14,
+						  "externalId": item.courseId,
+						  "externalName": item.title,
+						  "targetId": this.$route.query.growId,
+						  "studentNo": item.studentNo
+						}).then(res=>{
+						  console.log(res,'res')
+						})
+						this.$router.push({
+						  path: '/pages/learnPath/ExamScore',
+						  query: {
+							id: item.id,
+							type: 14,
+							pName: item.title,
+							courseId: item.courseId,
+							studentNo: item.studentNo
+						  }
+						})
+						return
+					  }
 					console.log(item,'考试')
 					uni.navigateTo({url:"/pages/exam/exam?id=" + item.targetId});
 				  }else{

pages/learnPath/pathSearch.vue

@@ -9,12 +9,15 @@
 				</view>
 			</view>
 			<view class="check">
-				<view :style="{marginRight:index/2!=0||index==0?'12rpx':''}" :class="indexs.includes(index)?'items':'item'" @click="searchItem(item,index)" v-for="(item,index) in posiLists" :key="index" class="item">
-					{{item.positionName}}
-				</view>
-				<view v-if="startList.length > 9 && isTrue" class="item" @click="allList">
-					<text class="text">查看更多</text>
-					<image class="img" src="../../static/images/learnpath/uotdown.png" mode=""></image>
+				<view style="display: flex;flex-wrap: wrap;">
+					<view :style="{marginRight:index/2!=0||index==0?'12rpx':''}" :class="indexs.includes(index)?'items':'item'" @click="searchItem(item,index)" v-for="(item,index) in posiLists" :key="index" class="item">
+						{{item.positionName}}
+					</view>
+					<view v-if="startList.length > 9 && isTrue" class="item" @click="allList">
+						<text class="text">查看更多</text>
+						<image class="img" src="../../static/images/learnpath/uotdown.png" mode=""></image>
+					</view>
+					
 				</view>
 			</view>
 		</view>
@@ -114,6 +117,10 @@
 						});
 						this.posiData = matchedItemsWithIndexes.map(item=> item.matchedItem)
 						this.indexs = matchedItemsWithIndexes.map(item=> item.indexInPosiLists)
+						if(this.$route.query.positionId == ''){
+							this.posiData.push(this.posiLists[0])
+							this.indexs.push(0)
+						}
 						if(this.posiLists.length > 9){
 							this.posiLists = this.posiLists.slice(0, 9)
 						}

pages/study/index.vue

@@ -147,7 +147,7 @@
 					<view class="name">{{detailData.growName || ''}}</view>
 					<view class="job">
 						<view class="text_name">{{detailData.organizationName || ''}}</view>
-						<text> 学习状态：<text :style="{color: ['#FF8336','#31AF0D','#FFFFFF '][detailData.studyStatus]}">{{detailData.studyStatus==0?'未开始':detailData.studyStatus==1?'已完成':'进行中'}}</text></text>
+						<text> 学习状态：<text :style="{color: ['#FFD500','#9FFF84','#FFFFFF '][detailData.studyStatus]}">{{detailData.studyStatus==0?'未开始':detailData.studyStatus==1?'已完成':'进行中'}}</text></text>
 					</view>
 					<!-- <view class="plan_item">
 						<image class="image" src="../../static/images/learnpath/file.png" mode=""></image>