feat:增加外部考试跳转界面及数据接入，增加投票数据接入及部分界面修改

src/api/api.js

@@ -48,6 +48,9 @@ export const COMMENT_LIST = '/comment/list'
 
 
 export const VOTE_DETAIL2 = voteId => `/vote/queryVoteAndVoteStemDetailByVoteId?voteId=${voteId} post`
+// 投票详情接口
+export const VOTE_DETAIL_SUBMIT = `/voteSubmit/queryVoteSubmitDetailListByTaskId post`
+
 export const COMMENT_ADD = '/comment post'
 export const COMMENT_PRAISE = '/comment/praise post'
 export const COMMENT_COLLECTION = '/comment/collection post'
@@ -61,4 +64,7 @@ export const ACTIVITY = '/activity'
 export const STUDY_RECORD = '/stu/task/thirdTask/submit post'
 export const PROJECT_LIST = '/stu/project/list post'
 
-export const FACETEACH_SIGNUP = `/stu/project/stuFaceTeachSignUp`
+export const FACETEACH_SIGNUP = `/stu/project/stuFaceTeachSignUp`
+
+// 外部考试详情接口
+export const EXTERNALEXAM = `/external/exam/queryExternalExam`

src/api/request.js

@@ -41,7 +41,7 @@ export function usePage(_url, param, callback) {
     };
 }
 
-export function useRequest(_url, params = {}) {
+export function useRequest(_url, params = {}, callback) {
 
     const state = reactive({
         data: {},
@@ -58,6 +58,7 @@ export function useRequest(_url, params = {}) {
         request(_url, params).then(r => {
             state.data = r.data
             state.loading = false
+            callback(r)
         })
     }
 

src/views/ballot/BallotPage.vue

@@ -96,16 +96,16 @@
                       style="
                       width: 140px;
                       margin-right: 114px;
-                      margin-bottom: 25px;
+                      margin-bottom: 25px;">
-                    "
+                    <!-- <img
-                  >
-                    <img
                         style="width: 140px; height: 140px; border-radius: 8px"
                         :src="value.optionPictureAddress"
-                    />
+                    /> -->
                     <div class="radio">
-                      <label>
+                      <label @click="choiceQuestion(key,value.optionId,dataInfo,index)">
-                        <input type="radio" name="one" value="right"/>
+                        <!-- <input type="radio" name="one" value="right"/> -->
+                        <div v-if="value.isAnswer" style="width:10px;height:10px;background:#4a9cf8;position:relative;left:15px;border-radius:10px;"></div>
+                        <div v-else style="width:10px;height:10px;background:#fff;position:relative;left:15px;border-radius:10px;"></div>
                         <div class="option"></div>
                         <div class="opt-text">{{ value.optionName }}</div>
                       </label>
@@ -119,10 +119,8 @@
                 width: 100%;
                 display: flex;
                 justify-content: center;
-                margin-top: 30px;
+                margin-top: 30px;">
-              "
+              <button class="submitbtn btn01" :style="{background:dataInfo.isSubmit?'#ccc':''}" @click="submitVote(dataInfo)">{{dataInfo.isSubmit?'已提交':'提交'}}</button>
-            >
-              <button class="submitbtn btn01" @click="submitVote">提交</button>
             </div>
           </div>
           <div class="right">
@@ -186,9 +184,11 @@
 import {useRequest} from "@/api/request";
 import {
   VOTE_DETAIL2,
+  VOTE_DETAIL_SUBMIT
 } from "@/api/api";
 import dayjs from "dayjs";
-import {useRoute} from "vue-router/dist/vue-router";
+import { ElMessage } from "element-plus";
+import {useRoute,useRouter} from "vue-router/dist/vue-router";
 import {watch, reactive, toRefs} from "vue";
 // const { data } = useRequest(TASK_VOTE_DETAIL, {});
 // console.log("datadatadata", data);
@@ -197,12 +197,75 @@ import {watch, reactive, toRefs} from "vue";
 // });
 // let { votedetail } = toRefs(state);
 const {
-  query: {courseId, pName, sName},
+  query: {courseId, pName, sName, chapterOrStageId, infoId, id},
 } = useRoute();
+
+const router = useRouter();
+const returnclick = () => {
+	router.back();
+};
 //获取基本信息
 const {data: dataInfo} = useRequest(VOTE_DETAIL2(courseId));
 
+console.log('我是获取的投票基本信息', dataInfo)
+
+// 答题时间
+const answerTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
+
+// 选择题目
+const choiceQuestion = (order, id, dates, torder) => {
+  console.log('当前选择题目的id及序号', order, id, dates,torder)
+  for(let i=0;i<dates.ballotVo.voteStemVoList[torder].optionDetailList.length;i++){
+    dates.ballotVo.voteStemVoList[torder].optionDetailList[i].isAnswer = false;
+  }
+  dates.ballotVo.voteStemVoList[torder].optionDetailList[order].isAnswer = true;
+  console.log(dataInfo)
+}
+
+// 提交投票
 const submitVote = () => {
+  // 当已经提交过时候 不让提交即可
+  if(dataInfo.value.isSubmit){
+    return
+  }
+  let isSubmit = true;
+  let isSubArr = []
+  for(let i=0;i<dataInfo.value.ballotVo.voteStemVoList.length;i++){
+    for(let j=0; j<dataInfo.value.ballotVo.voteStemVoList[i].optionDetailList.length;j++){
+      if(dataInfo.value.ballotVo.voteStemVoList[i].optionDetailList[j].isAnswer){
+        isSubArr[i] = dataInfo.value.ballotVo.voteStemVoList[i].optionDetailList[j].isAnswer
+        break
+      }else{
+        isSubArr[i] = false
+      }
+    }
+  }
+  for(let i=0; i<isSubArr.length;i++){
+    if(isSubArr[i]==false){
+      isSubmit = false
+    }
+  }
+  
+  if(isSubmit==false){
+    ElMessage.error("请选择投票问题后进行提交")
+    return
+  } 
+
+  let obj = {
+    "beginTime": answerTime,
+    "chapterOrStageId": chapterOrStageId ? chapterOrStageId : 0,
+    "result": JSON.stringify(dataInfo.value),
+    "targetId": infoId, // 项目 路径图 id
+    "taskId": id,
+    "type": 1, // 1 项目  2 路径图
+    "voteId": dataInfo.value.voteId
+  }
+  
+  console.log('我是投票提交的信息', obj)
+
+  useRequest(VOTE_DETAIL_SUBMIT,obj,(e)=>{
+    console.log(e)
+  })
 };
 </script>
 

src/views/project/ProjectDetails.vue

@@ -458,6 +458,23 @@ function toFinish(d, sName, chapterOrStageId) {
 			dialogVisible.value = true;
 			return
 		}
+		// 此处判断外部考试跳转
+		if(d.startTime==null || d.endTime==null){
+			router.push({
+				path: '/externalexamination',
+				query: {
+					id: d.projectTaskId,
+					type: PROJECT,
+					infoId: data.value.projectId,
+					courseId: d.courseId,
+					pName: data.value.name,
+					sName,
+					chapterOrStageId,
+					exname: d.name, // 考试名称
+				},
+			});
+			return
+		}
 	}
 	// 评估 停用
 	if (d.type == 11) {

src/views/roadmap/PathDetails.vue

@@ -404,6 +404,23 @@ function toFinish(d) {
 			dialogVisible.value = true;
 			return
 		}
+		// 此处判断外部考试跳转
+		if(d.startTime==null || d.endTime==null){
+			router.push({
+				path: '/externalexamination',
+				query: {
+					id: d.routerTaskId,
+					type: ROUTER,
+					infoId: routerId,
+					courseId: d.courseId,
+					pName: data.value.name,
+					sName: data.value.currentStageName,
+					chapterOrStageId: data.value.currentStageId,
+					exname: d.name, // 考试名称
+				},
+			});
+			return
+		}
 	}
 	// 评估 停用
 	if (d.type == 11) {

src/views/testscore/ExternalExamination.vue

@@ -0,0 +1,574 @@
+<template>
+    <div class="moreactive" style="padding: 30px">
+      <!-- 面包屑导航 -->
+      <div class="crumb">
+        <div>{{ pName }}</div>
+        <div style="margin-left: 6px; margin-right: 6px">/</div>
+        <div>{{ sName }}</div>
+        <div style="margin-left: 6px; margin-right: 6px">/</div>
+        <div style="font-weight: 700; font-size: 16px">考试详情</div>
+   <!--
+        <div class="preNext">
+          <button class="btn btn01"></button>
+          <span class="content" style="margin-left: 6px">上一个</span>
+          <span class="content" style="margin-left: 31px">下一个</span>
+          <button class="btn btn02" style="margin-left: 6px"></button>
+        </div>
+  -->
+  <div class="return">
+                  <div style="display: flex" @click="returnclick">
+            <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
+                  </div>
+              </div>
+      </div>
+      <!-- 面包屑导航 -->
+      <!-- <div class="debateTitle">【考试】{{ dataInfo?.voteName }}</div> -->
+      <!-- 详细信息 -->
+      <div class="detailinfo">
+        <div class="detail">
+          <div class="detailT">
+            <div class="left">
+              <div class="debateTitle" style="color:rgba(51, 51, 51, 1);font-size:20px;margin-top:46px;">【考试】{{ exname }}</div>
+              <div class="title">
+                <img
+                    style="width: 20px; height: 20px"
+                    src="../../assets/image/yuan.png"
+                />
+                <div class="text">数据来源</div>
+                <div class="box"></div>
+              </div>
+              <!-- <div style="display: flex; align-items: center"></div> -->
+              <div class="all" style="font-size:14px;color:rgba(51, 51, 48, 1);">
+                {{  state.datainfo.source ? state.datainfo.source : "-"  }}
+              </div>            
+            </div>
+          </div>
+
+          <div class="detailT" style="margin-top:20px;height:671px;">
+            <div class="left">
+              <div class="title">
+                <img
+                    style="width: 20px; height: 20px"
+                    src="../../assets/image/yuan.png"
+                />
+                <div class="text">考试说明</div>
+                <div class="box"></div>
+              </div>
+              <!-- <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 : "暂无考试说明" }}
+                </div>
+              </div>            
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 详细信息 -->
+    </div>
+</template>
+  
+  <script setup>
+  import {useRequest, request} from "@/api/request";
+  import {
+    VOTE_DETAIL2,
+    EXTERNALEXAM
+  } from "@/api/api";
+  import {reactive} from "vue";
+  import {useRoute,useRouter} from "vue-router/dist/vue-router";
+
+  const {
+    query: {courseId, pName, sName, chapterOrStageId, infoId, id, exname},
+  } = useRoute();
+  
+  const router = useRouter();
+  const returnclick = () => {
+      router.back();
+  };
+
+  const state = reactive({
+        datainfo: {}
+  })
+
+  //获取基本信息
+  request(EXTERNALEXAM, {externalId:courseId}).then(res=>{
+    console.log(res)
+    state.datainfo = res.data
+  }).catch(err=>{
+    console.log(err)
+  });
+  
+  console.log('我是获取的考试基本信息', state.dataInfo)
+  
+ 
+  </script>
+  
+  <!-- Add "scoped" attribute to limit CSS to this component only -->
+  <style scoped lang="scss">
+  .clearfix:before,
+  .clearfix:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+  
+  .moreactive {
+    .crumb {
+      color: #fff;
+      display: flex;
+      font-size: 14px;
+      line-height: 24px;
+      position: relative;
+    }
+    .return{
+      position: absolute;
+      right: 10%;
+      .text{
+        text-align: center;
+       display: flex;
+       flex-direction: row;
+       align-items: center;
+      }
+    }
+    .preNext {
+      position: absolute;
+      right: 0px;
+  
+      .content {
+        font-size: 14px;
+        color: #fff;
+        width: 43px;
+        height: 14px;
+        display: inline-block;
+        position: relative;
+        top: -6px;
+        cursor: pointer;
+      }
+  
+      .btn {
+        width: 23px;
+        height: 23px;
+        border-radius: 50%;
+        border: 0;
+        cursor: pointer;
+      }
+  
+      .btn01 {
+        background-image: url("../../assets/image/prev.png");
+      }
+  
+      .btn02 {
+        background-image: url("../../assets/image/next.png");
+      }
+    }
+  
+    .debateTitle {
+      margin-top: 15px;
+      font-size: 20px;
+      line-height: 24px;
+      height: 24px;
+      font-weight: 600;
+      color: #fff;
+      margin-left: -10px;
+    }
+  
+    .detailinfo {
+      width: 100%;
+      margin-top: 20px;
+      display: flex;
+  
+      .detail {
+        flex: 1;
+        // margin-right: 20px;
+        .detailT {
+          min-height: 95px;
+          background: #ffffff;
+          border-radius: 8px;
+          color: rgba(51, 51, 51, 1);
+          display: flex;
+          padding-bottom: 20px;
+  
+          .left {
+            margin-left: 48px;
+            flex: 1;
+          }
+  
+          .right {
+            width: 417px;
+            margin-right: 48px;
+  
+            .righttitle {
+              display: flex;
+              padding-top: 39px;
+              position: relative;
+  
+              .text {
+                margin-left: 8px;
+                font-size: 16px;
+                color: rgba(51, 51, 51, 1);
+                font-weight: 800;
+              }
+  
+              .box {
+                width: 75px;
+                height: 10px;
+                background-color: rgba(36, 120, 255, 0.15);
+                position: absolute;
+                left: 23px;
+                top: 53px;
+              }
+            }
+  
+            .timebox {
+              width: 417px;
+              height: 149px;
+              background: linear-gradient(90deg, #b6c6e1 0%, #89aed6 100%);
+              border-radius: 4px;
+              margin-top: 42px;
+            }
+  
+            .innertime {
+              margin-top: 17px;
+              margin-left: 55px;
+              font-size: 14px;
+              font-weight: 500;
+              color: #ffffff;
+              line-height: 24px;
+            }
+  
+            .endtime {
+              margin-left: 10px;
+              margin-top: 16px;
+              width: 397px;
+              height: 81px;
+              background: #f2f5f7;
+              border-radius: 0px 8px 0px 8px;
+  
+              .endtimetext {
+                margin-top: 25px;
+                margin-left: 46px;
+  
+                .te {
+                  font-size: 28px;
+                  font-weight: 800;
+                  color: #4a9cf8;
+                  line-height: 24px;
+                }
+              }
+            }
+  
+            .explain {
+              margin-top: 30px;
+              width: 416px;
+              padding-bottom: 50px;
+              background: #f2f5f7;
+              border-radius: 8px;
+            }
+  
+            .explaincontent {
+              width: 368px;
+              font-size: 16px;
+              font-weight: 500;
+              color: #333330;
+              line-height: 24px;
+              margin-left: 24px;
+              margin-top: 47px;
+            }
+          }
+  
+          .title {
+            display: flex;
+            align-items: center;
+            padding-top: 39px;
+            position: relative;
+          }
+  
+          .title .text {
+            margin-left: 8px;
+            font-size: 16px;
+            color: rgba(51, 51, 51, 1);
+            font-weight: 800;
+          }
+  
+          .title .box {
+            width: 75px;
+            height: 10px;
+            background-color: rgba(36, 120, 255, 0.15);
+            position: absolute;
+            left: 23px;
+            top: 53px;
+          }
+  
+          .all {
+            display: flex;
+            justify-content: space-between;
+            // width: 1280px;
+            margin-right: 48px;
+            margin-top: 43px;
+  
+            .allbox1 {
+              margin-right: 22px;
+              background: linear-gradient(
+                      0deg,
+                      rgba(160, 193, 230, 0) 0%,
+                      rgba(161, 195, 231, 0.2) 100%
+              );
+            }
+  
+            .allbox2 {
+              margin-right: 22px;
+              background: linear-gradient(
+                      0deg,
+                      rgba(177, 219, 229, 0) 0%,
+                      rgba(172, 216, 227, 0.2) 100%
+              );
+            }
+  
+            .allbox3 {
+              background: linear-gradient(
+                      0deg,
+                      rgba(195, 209, 234, 0) 0%,
+                      rgba(191, 206, 231, 0.2) 100%
+              );
+            }
+  
+            .item {
+              // width: 410px;
+              width: calc(100% - 44px);
+              height: 149px;
+              text-align: center;
+              border-radius: 4px;
+  
+              .item1 {
+                color: #089dff;
+                font-size: 24px;
+                font-weight: bold;
+                margin-top: 36px;
+              }
+  
+              .item2 {
+                color: #333330;
+                font-size: 14px;
+                margin-top: 29px;
+              }
+            }
+          }
+  
+          .join {
+            // width: 1280px;
+            margin-right: 48px;
+            // min-height: 408px;
+            // background: #f5f6f7;
+            // border-radius: 8px;
+            margin-top: 32px;
+            margin-left: 21px;
+            flex: 1;
+  
+            .stem {
+              display: flex;
+              font-size: 16px;
+              font-weight: 500;
+              color: #333330;
+              line-height: 38px;
+            }
+  
+            .options {
+              display: flex;
+              align-items: center;
+              flex-wrap: wrap;
+            }
+  
+            .radio {
+              margin-top: 14px;
+              margin-left: -16px;
+              position: relative;
+            }
+  
+            .radio label {
+              line-height: 20px;
+              position: relative;
+              display: flex;
+              align-items: center;
+              font-weight: normal;
+  
+              .opt-text {
+                font-size: 14px;
+                font-weight: bold;
+                color: #333330;
+                line-height: 18px;
+                margin-left: 10px;
+              }
+            }
+  
+            .radio .option {
+              width: 19px;
+              height: 18px;
+              // position: absolute;
+              // top: 1px;
+              // // top: 32px;
+              // left: 0px;
+              background-size: cover;
+              background: url(../../assets/image/noselect.png) no-repeat;
+              background-size: cover;
+            }
+  
+            .radio input[type="radio"] {
+              display: inline-block;
+              margin-right: -3px;
+              opacity: 0;
+            }
+  
+            .radio input[type="radio"]:checked + div {
+              background: url(../../assets/image/select.png) no-repeat;
+              background-size: cover;
+            }
+  
+            .imgcontent {
+              display: flex;
+  
+              .imgone {
+                width: 140px;
+                height: 140px;
+                border-radius: 8px;
+                background-image: url(../../assets/image/px.png);
+                background-size: 100% 100%;
+                background-position: center;
+              }
+            }
+  
+            .ontitle {
+              margin-top: 27px;
+              font-size: 14px;
+              color: #333330;
+            }
+          }
+        }
+  
+        .detailB {
+          min-height: 363px;
+          background: #ffffff;
+          border-radius: 8px;
+          margin-top: 20px;
+  
+          .el-tabs__item {
+            height: 69px;
+            padding: 25px 7px 0px 52px;
+            font-size: 14px;
+            font-weight: 500;
+          }
+  
+          .el-tabs__nav-wrap::after {
+            background-color: rgba(56, 125, 247, 0.2);
+          }
+  
+          .enclosure {
+            height: 89px;
+            margin-left: 51px;
+            margin-right: 40px;
+            // border-bottom: 1px solid rgba(56, 125, 247, 0.2);
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+  
+            .enclosureL {
+              display: flex;
+              align-items: center;
+              font-size: 14px;
+              font-weight: 400;
+              color: #677d86;
+              line-height: 24px;
+            }
+  
+            .download {
+              display: flex;
+              align-items: center;
+              font-size: 16px;
+              font-weight: 400;
+              color: #2478ff;
+              line-height: 24px;
+              cursor: pointer;
+            }
+          }
+  
+          .work {
+            margin-left: 51px;
+            margin-right: 40px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-top: 37px;
+          }
+  
+          .work .question {
+            font-size: 14px;
+            font-weight: 500;
+            color: #333330;
+            line-height: 18px;
+          }
+  
+          .work .active {
+            width: 82px;
+            height: 28px;
+            background: linear-gradient(90deg, #a5d4e0 0%, #b4dce6 100%);
+            border-radius: 4px;
+            font-size: 14px;
+            font-weight: 500;
+            color: #ffffff;
+            line-height: 24px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            cursor: pointer;
+            margin-right: 11px;
+          }
+  
+          .work .unactive {
+            width: 80px;
+            height: 26px;
+            border: 1px solid #a5d4e0;
+            border-radius: 4px;
+            font-size: 14px;
+            font-weight: 500;
+            color: #a5d4e0;
+            line-height: 24px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 11px;
+            cursor: pointer;
+          }
+  
+          .work .btncolor {
+            background: linear-gradient(90deg, #84aad2 0%, #a4c5e9 100%);
+          }
+  
+          .work .bordercolor {
+            border: 1px solid #85aad2;
+          }
+  
+          .work .fontcolor {
+            color: rgba(133, 170, 210, 1);
+          }
+  
+          .work .submit {
+            width: 126px;
+            height: 46px;
+            background: #2478ff;
+            box-shadow: 0px 1px 8px 0px rgba(56, 125, 247, 0.7);
+            border-radius: 4px;
+            font-size: 16px;
+            font-weight: 800;
+            color: #ffffff;
+            line-height: 24px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            cursor: pointer;
+          }
+        }
+      }
+    }
+  }
+  </style>
+  
+  

vite.config.js

@@ -92,10 +92,13 @@ export default defineConfig(({ command, mode }) =>
 				changeOrigin: true,
 			}, '/link': {
 				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-				changeOrigin: true,
+				changeOrigin: true, 
 			}, '/onlineClasses/queryOnlineClassesStudyDetail': {
 				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
 				changeOrigin: true,
+			},'/external/exam/queryExternalExam': {
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+				changeOrigin: true,
 			},
 		}
 	}