Merge branch 'develop' into manage-release

src/api/api.js

@@ -88,7 +88,7 @@ export const QueryDiscussSubmitDetailByDiscussId = '/discussSubmit/queryDiscussS
 export const EvaluationToLearn = '/evaluation/evaluationToLearn post'
 
 // 个人/小组完成度排行
-export const CompletionList = `/stu/project/rank_list/completion_list`
+export const CompletionList = `/stu/project/rank_list/project_rank_list`
 
 // 积分排行榜
 export const PointList = `/stu/project/rank_list/point_list`

src/views/faceteach/FaceTeach.vue

@@ -445,8 +445,12 @@ const signClick = () => {
 
   data.value.signFlag = 1;
   ElMessage.warning("签到成功");
+  let taskId = courseId
+  console.log("taskId:" + taskId)
+  console.log("courseId:" + courseId)
+  console.log("请求入参：" + JSON.stringify( { courseId: courseId,taskId: taskId,type:type }))
 
-  request(TASK_OFFCOURSE_NOTASK_SIGN, { courseId: courseId });
+  request(TASK_OFFCOURSE_NOTASK_SIGN, { courseId: courseId,taskId: taskId,type:type });
 };
 
 function toSurvery() {

src/views/faceteach/FaceTeachSignUp.vue

@@ -39,7 +39,14 @@
             <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
           </div>
           <div class="time" style="margin-top: 37px">
-            <botton class="btn" style="margin-right: 20px;width: 160px;height: 46px;" v-if="data.hasTask || data.planDto.applyFlag" @click="onLineSignUp" :style="{	background: data.isSignUp ? '#999' : 'rgb(57, 146, 249)'}">{{data.isSignUp?'已报名':'立即报名'}}</botton>
+            <botton class="btn" style="margin-right: 20px;width: 160px;height: 46px;" v-if="data.hasTask || data.planDto.applyFlag" @click="onLineSignUp(false)" :style="{	background: data.isSignUp || data.isRefused ? '#999' : 'rgb(57, 146, 249)'}">
+              {{
+                data.isRefused ? '审核拒绝' : data.isSignUp? '已报名' :'立即报名'
+              }}
+            </botton>
+            <botton v-if="data.isRefused" class="btn" style="margin-right: 20px;width: 160px;height: 46px;" @click="onLineSignUp(true)">
+              重新报名
+            </botton>
           </div>
         </div>
       </div>
@@ -541,8 +548,8 @@ function submitReplayComment() {
 }
 
 // 报名
-function onLineSignUp() {
+function onLineSignUp(isAgain) {
-  if(data.value.isSignUp){
+  if(data.value.isSignUp && !isAgain){
     return;
   }
   request(FACETEACH_SIGNUP, {courseId})

src/views/project/ProjectDetails.vue

@@ -229,7 +229,7 @@
               <!-- <div style="font-size: 14px;color: rgba(51, 51, 51, 1);font-weight: 600;">完成度排行榜</div> -->
               <el-select @change="choiceStatus" v-model="stateValue" class="m-2" mode="tags" placeholder="完成度排行榜"
                 style="width: 130px;border: 0px solid red !important; box-shadow:none !important; ">
-                <el-option v-for="item in studyProgress" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="item in studyProgress" :key="item.value" :label="item.label" :value="item.value" :disabled="item.label.includes('小组') && data.groupId==null?true:false" :title="item.label.includes('小组') && data.groupId==null?'当前学员无小组':''"/>
               </el-select>
             </div>
             <!-- line -->

src/views/roadmap/PathDetails.vue

@@ -219,7 +219,7 @@
                 <div class="progress">
                   <div style="width: 291px">
                     <el-progress
-                      :percentage="parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)"
+                      :percentage="parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100))"
                       :show-text="false" :stroke-width="8" :color="
                         {
                           0: 'rgba(238, 112, 108, 1)',
@@ -231,12 +231,9 @@
                         }[parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)]
                       "/>
                   </div>
-                  <div style="
+                  <div 
-                                      font-size: 14px;
+                    style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;" 
-                                      font-weight: 500;
+                    :style="{
-                                      color: #277aff;
-                                      margin-left: 10px;
-                                    " :style="{
                         color: {
                           0: 'rgba(238, 112, 108, 1)',
                           1: 'rgba(255, 151, 38, 1)',

src/views/testscore/ExternalExamination.vue

@@ -60,7 +60,7 @@
               <!-- <div style="display: flex; align-items: center"></div> -->
               <div class="all" style="font-size:14px;color:rgba(51, 51, 48, 1);">
                 <div>
-                    {{ state.datainfo.externalExplain ? state.datainfo.externalExplain : "暂无考试说明" }}
+                    {{ state.datainfo.examinationExplain ? state.datainfo.examinationExplain : "暂无考试说明" }}
                 </div>
               </div>            
             </div>