feat:修改项目状态判断

src/api/api.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-01-13 11:42:48
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-19 12:16:32
+ * @LastEditTime: 2023-02-19 18:05:07
  * @FilePath: /stu_h5/src/api/api.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -47,7 +47,7 @@ export const DISCUSS_LIKE = '/discussSubmit/clickDiscussLikeCountOr post'
 export const DISCUSS_LIST = '/discussSubmit/taskList'
 export const DISCUSS_DETAIL = '/discussSubmit/detail'
 export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndReview'
-export const VOTE_DETAIL2 = `/voteSubmit/queryVoteTaskDetailById post`
+export const VOTE_DETAIL2 = `/vote/queryVoteById`
 // 投票详情接口
 export const VOTE_DETAIL_SUBMIT = `/voteSubmit/vote/commit post`
 

src/views/ballotpage/BallotPage.vue

@@ -89,7 +89,7 @@
               <div class="ballotjoin">
                 <div
                   class="ballotitem"
-                  v-for="(item, index) in data?.ballotVo?.voteStemVoList"
+                  v-for="(item, index) in data?.voteStemDtoList"
                   :key="index"
                 >
                   <div class="stem">
@@ -188,11 +188,11 @@ const {
 } = useRoute();
 const userInfo = computed(() => store.state.userInfo);
 const { data } = useRequest(VOTE_DETAIL2, {
-  chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0,
+  // chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0,
-  courseId: courseId,
+  voteId: courseId,
-  studentId: userInfo.value.id,
+  // studentId: userInfo.value.id,
-  targetId: infoId,
+  // targetId: infoId,
-  type: btype,
+  // type: btype,
 });
 console.log("投票基本信息", data);
 //投票倒计时

src/views/examination/ExternalExam.vue

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-02-06 18:26:23
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-19 12:03:20
+ * @LastEditTime: 2023-02-19 18:16:49
  * @FilePath: /stu_h5/src/views/examination/ExternalExam.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -12,7 +12,9 @@
     <div class="notice">
       <div class="noticebox">
         <div class="main">
-          <div class="e_title">【考试】{{ state.datainfo?.externalName }}</div>
+          <div class="e_title">
+            【考试】{{ state.datainfo?.examinationName }}
+          </div>
           <div class="et_detail">
             数据来源：
             <div class="et_time">

src/views/faceteach/FaceTeachSignUp.vue

@@ -2,12 +2,12 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-02-18 17:48:19
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-19 10:41:00
+ * @LastEditTime: 2023-02-19 17:21:23
  * @FilePath: /stu_h5/src/views/faceteach/FaceTeachSignUp.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-  <div class="faceteach">
+  <div class="faceteachsignUp">
     <ReturnHead text="课程详情"></ReturnHead>
     <TitleHead :text="'【面授课】' + data.planDto?.name"></TitleHead>
     <div class="main">
@@ -606,7 +606,7 @@ onUnmounted(() => {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss">
-.faceteach {
+.faceteachsignUp {
   width: 100%;
   padding-bottom: 20px;
   .main {

src/views/projectdetails/projectDetails.vue

@@ -285,35 +285,35 @@ function judgeTaskIsEnd(type, endTimes, status) {
   let endTime = new Date().getTime(endTimes);
   switch (type) {
     case 1:
-      status == 3
+      status == -1
         ? (isEnd = true)
         : nowTime > endTime
         ? (isEnd = true)
         : (isEnd = false);
       break;
     case 3:
-      status == 3
+      status == -1
         ? (isEnd = true)
         : nowTime > endTime
         ? (isEnd = true)
         : (isEnd = false);
       break;
     case 5:
-      status == 3
+      status == -1
         ? (isEnd = true)
         : nowTime > endTime
         ? (isEnd = true)
         : (isEnd = false);
       break;
     case 7:
-      status == 3
+      status == -1
         ? (isEnd = true)
         : nowTime > endTime
         ? (isEnd = true)
         : (isEnd = false);
       break;
     case 10:
-      status == 3
+      status == -1
         ? (isEnd = true)
         : nowTime > endTime
         ? (isEnd = true)
@@ -324,7 +324,7 @@ function judgeTaskIsEnd(type, endTimes, status) {
 }
 
 function toFinish(d, sName, chapterOrStageId) {
-  console.log("dddddd", d, sName, chapterOrStageId);
+  console.log("dddddd", data, d, sName, chapterOrStageId);
 
   if (judgeTaskIsEnd(d.type, data.value.endTime, data.value.status)) {
     ElMessage.error("当前任务已结束");