Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/components/img/UploadImg.vue

src/api/api.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-12-11 16:57:58
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-15 10:56:54
+ * @LastEditTime: 2022-12-17 14:59:41
  * @FilePath: /fe-stu/src/api/api.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */

src/api/request.js

@@ -108,7 +108,7 @@ export async function request(_url, params) {
         }
         return response
     }).catch(e => {
-        console.log(e)
+        console.log('eeeee', e)
         // router.push({path: '/login'})
     })
 }

src/views/faceteach/FaceTeach.vue

@@ -18,7 +18,7 @@
             src="../../assets/image/time.png"
           />
           <div style="margin-left: 8px">
-            {{ data.offcourseDto?.publishTime }}
+            {{ data.planDto?.beginTime + "至" + data.planDto?.endTime }}
           </div>
         </div>
         <div class="time" style="margin-top: 23px">
@@ -29,10 +29,43 @@
           <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
         </div>
       </div>
-      <botton :style="{background:`${data.isSurvery?'#999':'rgb(57, 146, 249)'}`}" class="btn" @click="toSurvery"
+      <div style="display: flex">
-              v-if="data.evalFlag && data.evalFlag==='1'"
+        <botton
-      >{{ data.isSurvery ? '已评估' : '评估' }}
+          v-if="!isAllowSign"
+          class="btn"
+          style="margin-right: 20px; background: #999"
+          @click="signClick"
+          >签到
         </botton>
+        <botton
+          v-if="isAllowSign"
+          class="btn"
+          style="margin-right: 20px"
+          :style="{
+            background:
+              data.signFlag || !isAllowSign ? '#999' : 'rgb(57, 146, 249)',
+          }"
+          @click="signClick"
+          >{{ data.signFlag ? "已签到" : "签到" }}
+        </botton>
+        <botton
+          style="background: #999"
+          class="btn"
+          @click="toSurvery"
+          v-if="data.planDto?.evalFlag == 0"
+        >
+          评估
+        </botton>
+        <botton
+          :style="{
+            background: `${data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+          }"
+          class="btn"
+          @click="toSurvery"
+          v-if="data.planDto?.evalFlag && data.planDto?.evalFlag == 1"
+          >{{ data.isSurvery ? "已评估" : "评估" }}
+        </botton>
+      </div>
     </div>
     <!-- 基本信息 -->
 
@@ -57,6 +90,19 @@
         <div class="detailB">
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="课程附件" name="first">
+              <div
+                v-if="data.planDto?.attach === '[]'"
+                style="
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 24px;
+                  cursor: pointer;
+                  margin-left: 40px;
+                  margin-top: 20px;
+                "
+              >
+                此课程无附件
+              </div>
               <div
                 v-for="(el, index) in JSON.parse(data.planDto?.attach)"
                 :key="index"
@@ -80,11 +126,29 @@
                     style="width: 16px; height: 15px"
                     src="../../assets/image/download.png"
                   />
-                  <div style="margin-left: 5px" @click="download(el.response.data)">下载</div>
+                  <div
+                    style="margin-left: 5px"
+                    @click="download(el.response.data)"
+                  >
+                    下载
+                  </div>
                 </div>
               </div>
             </el-tab-pane>
             <el-tab-pane label="课程作业" name="second">
+              <div
+                v-if="data.planDto?.attach === '[]'"
+                style="
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 24px;
+                  cursor: pointer;
+                  margin-left: 40px;
+                  margin-top: 20px;
+                "
+              >
+                此课程无作业
+              </div>
               <div class="work" v-if="data.workDto?.workName">
                 <div>
                   <div class="question">{{ data.workDto?.workName }}</div>
@@ -94,11 +158,24 @@
                   </div>
                 </div>
                 <div class="submit" @click="toWork" v-if="data.workDto?.workId">
-                  提交
+                  去作业
                 </div>
               </div>
             </el-tab-pane>
             <el-tab-pane label="课程考试" name="third">
+              <div
+                v-if="data.planDto?.attach === '[]'"
+                style="
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 24px;
+                  cursor: pointer;
+                  margin-left: 40px;
+                  margin-top: 20px;
+                "
+              >
+                此课程无考试
+              </div>
               <div class="work" v-if="data.examinationDto?.examinationTestName">
                 <div>
                   <div class="question">
@@ -114,9 +191,9 @@
                     <div class="tag3" style="margin-left: 11px">考试</div>
                   </div>
                 </div>
-                <!--                <div class="submit" @click="toExamItem(data.examinationDto)">-->
+                <div class="submit" @click="toExamItem(data.examinationDto)">
-                <!--                  去考试-->
+                  去考试
-                <!--                </div>-->
+                </div>
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -161,11 +238,11 @@ const returnclick = () => {
   router.back();
 };
 const {
-  query: {courseId, type},
+  query: { courseId, type, id: taskId },
 } = useRoute();
 
 const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
-
+console.log("datadatadatadatadatadatadata", data);
 const { avatar: userAvatar } = useUserInfo(
   computed(() => data.value?.planDto?.teacherId)
 );
@@ -173,22 +250,103 @@ const {avatar: userAvatar} = useUserInfo(
 const state = reactive({
   activeName: "first",
   enclosure: "",
+  isAllowSign: false,
 });
-const {activeName, enclosure} = toRefs(state);
+const { activeName, enclosure, isAllowSign } = toRefs(state);
 const handleClick = (tab, event) => {
   console.log(tab, event);
 };
 const download = (url) => {
   window.open(url);
 };
+let timer = null;
+//判断能否签到
+function isSignClick() {
+  timer = setInterval(() => {
+    if (data.value.planDto.beforeStart && data.value.planDto.afterStart) {
+      //有开始前有开始后
+      let beginTime =
+        new Date(data.value.planDto.beginTime).getTime() -
+        data.value.planDto.beforeStart * 60 * 1000;
+      let endTime =
+        new Date(data.value.planDto.beginTime).getTime() +
+        data.value.planDto.afterStart * 60 * 1000;
+      let nowTime = new Date().getTime();
+      if (nowTime < endTime && nowTime > beginTime) {
+        state.isAllowSign = true;
+      } else {
+        state.isAllowSign = false;
+      }
+    } else if (
+      !data.value.planDto.beforeStart &&
+      !data.value.planDto.afterStart
+    ) {
+      //开始前开始后都没有
+      state.isAllowSign = true;
+    } else if (
+      data.value.planDto.beforeStart &&
+      !data.value.planDto.afterStart
+    ) {
+      //只有开始前无开始后
+      let beginTime =
+        new Date(data.value.planDto.beginTime).getTime() -
+        data.value.planDto.beforeStart * 60 * 1000;
+      let nowTime = new Date().getTime();
+      if (nowTime > beginTime) {
+        state.isAllowSign = true;
+      } else {
+        state.isAllowSign = false;
+      }
+    } else if (
+      !data.value.planDto.beforeStart &&
+      data.value.planDto.afterStart
+    ) {
+      //无开始前有开始后
+      let endTime =
+        new Date(data.value.planDto.beginTime).getTime() +
+        data.value.planDto.afterStart * 60 * 1000;
+      let nowTime = new Date().getTime();
+      if (nowTime < endTime) {
+        state.isAllowSign = true;
+      } else {
+        state.isAllowSign = false;
+      }
+    }
+    console.log("isAllowSign", state.isAllowSign);
+  }, 1000);
+}
+isSignClick();
+
+//签到
+const signClick = () => {
+  if (data.value.signFlag) {
+    return;
+  }
+  console.log("data.signFlag", data.value.signFlag);
+  if (!isAllowSign) {
+    ElMessage.info("未在签到范围内");
+    return;
+  }
+  data.value.signFlag = 1;
+  ElMessage.info("签到成功");
+  request(TASK_BROADCAST_SIGN, { courseId: courseId, taskId, type });
+};
 
 function toSurvery() {
   if (data.value.isSurvery) {
-    return
+    return;
+  }
+  if (data.value.planDto.evalFlag == 0) {
+    ElMessage.info("此课程无评估");
+    return;
   }
   router.push({
     path: "/surveydetail",
-    query: {courseId: data.value.planDto.evaluateId},
+    query: {
+      courseId: data.value.planDto.evaluateId,
+      pName: "面授课",
+      sName: data.value.planDto.name,
+    },
   });
 }
 
@@ -199,12 +357,16 @@ function toWork() {
       courseId: data.value.workDto.workId,
       id: data.value.offcourseDto.categoryId,
       type,
+      pName: "面授课",
+      sName: data.value.planDto.name,
     },
   });
 }
 
 function toExamItem(obj) {
-  router.push({path: "/starttest", query: {id: obj.courseId}});
+  console.log("obj", obj.examinationTestId);
+  window.open(import.meta.env.VITE_BOE_EXAM_DETAIL_URL + obj.examinationTestId); //测评
+  // router.push({ path: import.meta.env.VITE_BOE_EXAM_DETAIL_URL+ obj.examinationTestId });
 }
 </script>
 

src/views/homework/HomeworkPage.vue

@@ -26,10 +26,9 @@
         </div>
       </div>
     </div>
-    <div @click="returnclick">返回</div>
     <!-- 面包屑导航 -->
     <div class="debateTitle" style="color: #fff">
-      【作业】管理者进阶腾飞班 - 中级管理者作业
+      【作业】 {{ data?.workName }}
     </div>
     <!-- 详细信息 -->
     <div class="detailinfo">
@@ -284,6 +283,7 @@ const {
 } = useRoute();
 
 const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId });
+console.log("data", data);
 const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, {
   workerId: workId,
 });

src/views/liveBroadcast/LiveBroadcast.vue

@@ -18,7 +18,8 @@
       <div class="return">
         <div style="display: flex" @click="returnclick">
           <img
-                    class="img2" style="margin-right:22px;"
+            class="img2"
+            style="margin-right: 22px"
             src="../../assets/image/return.png"
           />
           <div class="text">返回</div>
@@ -37,7 +38,7 @@
             src="../../assets/image/time.png"
           />
           <div style="margin-left: 8px">
-            {{ data?.liveStartTime + "-" + data?.liveEndTime }}
+            {{ data?.liveStartTime + "至" + data?.liveEndTime }}
           </div>
         </div>
         <!--          todo #直播详情 没有位置字段-->
@@ -65,13 +66,22 @@
           @click="signClick"
           >{{ data.signFlag ? "已签到" : "签到" }}
         </botton>
+        <botton
+          style="background: #999"
+          class="btn"
+          @click="commitClick"
+          v-if="data.isEvaluate == 0"
+        >
+          评估
+        </botton>
+
         <botton
           :style="{
             background: `${data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
           }"
           class="btn"
           @click="commitClick"
-            v-if="data.isEvaluate && data.isEvaluate==='1'"
+          v-if="data.isEvaluate && data.isEvaluate == 1"
           >{{ data.isSurvery ? "已评估" : "评估" }}
         </botton>
       </div>
@@ -209,9 +219,18 @@ const commitClick = () => {
   if (data.value.isSurvery) {
     return;
   }
+  if (data.value.isEvaluate == 0) {
+    ElMessage.info("此直播无评估");
+    return;
+  }
+
   router.push({
     path: "/surveydetail",
-    query: {courseId: data.value.assessmentId},
+    query: {
+      courseId: data.value.assessmentId,
+      pName: "直播",
+      sName: data.value.liveName,
+    },
   });
 };
 
@@ -285,7 +304,6 @@ function showClick() {
     .threeBtn {
       display: flex;
       width: 490px;
-      justify-content: space-between;
       margin-right: 87px;
 
       .btn {
@@ -302,7 +320,7 @@ function showClick() {
         font-weight: 800;
         line-height: 24px;
         cursor: pointer;
-        // margin-right: 96px;
+        margin-left: 20px;
       }
     }
 

src/views/moreActive/MoreActive.vue

@@ -17,7 +17,8 @@
       <div class="return">
         <div style="display: flex" @click="returnclick">
           <img
-                    class="img2" style="margin-right:22px;"
+            class="img2"
+            style="margin-right: 22px"
             src="../../assets/image/return.png"
           />
           <div class="text">返回</div>
@@ -37,7 +38,7 @@
             src="../../assets/image/time.png"
           />
           <div style="margin-left: 8px">
-            {{ data?.activityStartTime + "-" + data?.activityEndTime }}
+            {{ data?.activityStartTime + "至" + data?.activityEndTime }}
           </div>
         </div>
         <div class="time" style="margin-top: 23px">
@@ -50,9 +51,11 @@
       </div>
       <botton
         class="btn"
-          :style="{background:`${data.signFlag?'#999':'rgb(57, 146, 249)'}`}"
+        :style="{
+          background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
+        }"
         @click="signClick"
-      >{{ data.signFlag ? '已签到' : '签到' }}
+        >{{ data.signFlag ? "已签到" : "签到" }}
       </botton>
     </div>
     <!-- 基本信息 -->
@@ -154,13 +157,13 @@ const signClick = (tab, event) => {
   if (data.value.signFlag) {
     return;
   }
-  data.value.signFlag = true
+  data.value.signFlag = true;
   ElMessage.info("签到成功");
   request(TASK_ACTIVITY_SIGN, {
     courseId: activityId,
-    taskId, type
+    taskId,
-  })
+    type,
-
+  });
 };
 </script>
 

src/views/project/ProjectDetails.vue

@@ -135,8 +135,9 @@
                 {{ data.remark || '暂无公告' }}
               </div>
             </el-tab-pane>
+              <!--  
             <el-tab-pane label="共享文档" name="second">
-              <!--              <div style="padding: 19px 30px 17px 28px">-->
+                        <div style="padding: 19px 30px 17px 28px">-->
               <!--                <div-->
               <!--                  v-for="(value, index) in sharedoc"-->
               <!--                  :key="index"-->
@@ -156,8 +157,8 @@
               <!--                    <div style="margin-left: 7px">下载</div>-->
               <!--                  </div>-->
               <!--                </div>-->
-              <!--              </div>-->
+              <!--              </div>
-            </el-tab-pane>
+            </el-tab-pane>-->
           </el-tabs>
         </div>
         <!-- 课程公告及共享文档 -->
@@ -200,10 +201,13 @@
               <div class="text" style="margin-left: 9px">学习进度</div>
               <div class="box"></div>
             </div>
+            <!--
             <div class="rate">
               <div class="ratetext">上次学到：启航班-领导寄语</div>
               <div class="ratebtn">继续学习</div>
-            </div>
+            </div>-->
+
+
             <div style="margin-top: 16px">
               <div class="progressBox">
                 <div>总进度</div>

src/views/roadmap/PathDetails.vue

@@ -35,8 +35,8 @@
             )"
             :key="index"
           >
-            <div>
+            <div style="width: 70%">
-              <div class="coursename">{{ value.name }}</div>
+              <div class="coursename" :title="value.name">{{ value.name }}</div>
               <div class="coursetag">
                 <div
                   class="tag1"
@@ -220,10 +220,11 @@
               <div class="text" style="margin-left: 9px">学习进度</div>
               <div class="box"></div>
             </div>
+            <!--
             <div class="rate">
               <div class="ratetext">上次学到：{{ data.lastLearned }}</div>
               <div class="ratebtn">继续学习</div>
-            </div>
+            </div>-->
             <div style="margin-top: 16px">
               <div class="progressBox">
                 <div>总进度</div>
@@ -338,7 +339,9 @@ const {
   query: { routerId, routerName },
 } = useRoute();
 const router = useRouter();
-
+const returnclick = () => {
+  router.back();
+};
 const { data } = useRequest(ROUTER_PROCESS, { routerId });
 
 const userInfo = computed(() => store.state.userInfo);
@@ -394,9 +397,9 @@ const types = ref({
       ), //外联
     8: "/discusspage",
     9: "/moreactive",
-    10: ({ evaTyp, targetId }) =>
+    10: ({ evaType, targetId }) =>
       window.open(
-        (evaTyp === 1
+        (evaType == 0
           ? import.meta.env.VITE_BOE_TEST_DETAIL_URL
           : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
       ), //测评
@@ -429,7 +432,9 @@ function toFinish(d, sName) {
         },
       });
   } else if (typeof types.value.path[d.type] === "function") {
+    console.log("ddddddd", d);
     types.value.path[d.type](d);
+    // console.log("types.value.path[d.type](d)", d);
   }
 }
 
@@ -512,6 +517,9 @@ function whiteTypes(type) {
           font-weight: 500;
           color: #333330;
           line-height: 24px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
 
         .coursetag {

src/views/survey/SurveyDetail.vue

@@ -9,7 +9,7 @@
         <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 style="font-weight: 700; font-size: 16px">评估详情</div>
       </div>
       <!-- 
       <div class="prevnext">
@@ -30,16 +30,17 @@
       <div class="return">
         <div style="display: flex" @click="returnclick">
           <img
-                    class="img2" style="margin-right:22px;"
+            class="img2"
+            style="margin-right: 22px"
             src="../../assets/image/return.png"
           />
-                  <div class="text">返回</div>
+          <div class="text" style="color: #fff">返回</div>
         </div>
       </div>
     </div>
     <!-- 面包屑导航 -->
     <!-- 标题 -->
-    <div class="title">【调研】管理者进阶腾飞班 - 培训阶段性调研</div>
+    <div class="title">【评估】管理者进阶腾飞班 - 培训阶段性调研</div>
     <!-- 标题 -->
     <!-- 基本信息 -->
     <div class="bascinfo">
@@ -75,7 +76,7 @@
                 @click="
                   () => {
                     if (data.isSubmit) {
-                      return
+                      return;
                     }
                     value.selectAnswer = item;
                   }
@@ -90,18 +91,26 @@
         <div
           class="question"
           style="margin-top: 41px"
-            v-if="data.assessmentSingleChoiceDtoList && data.assessmentSingleChoiceDtoList.length"
+          v-if="
+            data.assessmentSingleChoiceDtoList &&
+            data.assessmentSingleChoiceDtoList.length
+          "
         >
-          <div class="text">{{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}</div>
+          <div class="text">
+            {{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
+          </div>
           <div
             v-for="(value, index) in data.assessmentSingleChoiceDtoList"
             :key="index"
             style="display: flex; align-items: center"
-              :style="{'margin-top': index === 0 ? '29px' : '22px',cursor: 'pointer'}"
+            :style="{
+              'margin-top': index === 0 ? '29px' : '22px',
+              cursor: 'pointer',
+            }"
             @click="
               () => {
                 if (data.isSubmit) {
-                      return
+                  return;
                 }
                 data.assessmentSingleChoiceDtoList.forEach((e) => {
                   e.select = false;
@@ -121,9 +130,14 @@
         <div
           class="question"
           style="margin-top: 41px"
-            v-if="data.assessmentMultipleChoiceDtoList && data.assessmentMultipleChoiceDtoList.length"
+          v-if="
+            data.assessmentMultipleChoiceDtoList &&
+            data.assessmentMultipleChoiceDtoList.length
+          "
         >
-          <div class="text">{{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}</div>
+          <div class="text">
+            {{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
+          </div>
           <div
             v-for="(value, index) in data.assessmentMultipleChoiceDtoList"
             :key="index"
@@ -132,12 +146,14 @@
               'margin-top': index === 0 ? '29px' : '22px',
               cursor: 'pointer',
             }"
-              @click="() => {
+            @click="
+              () => {
                 if (data.isSubmit) {
-                      return
+                  return;
                 }
-              value.select = !value.select
+                value.select = !value.select;
-              }"
+              }
+            "
           >
             <img
               style="width: 19px; height: 18px; cursor: pointer"
@@ -165,9 +181,22 @@
             <div class="words">{{ item.content?.length || 0 }}/200</div>
           </div>
         </div>
-        <div style="display: flex; justify-content: center"
+        <div
-             v-if="data.assessmentEssayQuestionDtoList?.length || data.assessmentMultipleChoiceDtoList?.length || data.assessmentSingleChoiceDtoList?.length || data.assessmentScoringQuestionDtoList?.length">
+          style="display: flex; justify-content: center"
-          <div class="submit" @click="submit" :style="{background: data.isSubmit?'#999':'#2478ff'}">提交</div>
+          v-if="
+            data.assessmentEssayQuestionDtoList?.length ||
+            data.assessmentMultipleChoiceDtoList?.length ||
+            data.assessmentSingleChoiceDtoList?.length ||
+            data.assessmentScoringQuestionDtoList?.length
+          "
+        >
+          <div
+            class="submit"
+            @click="submit"
+            :style="{ background: data.isSubmit ? '#999' : '#2478ff' }"
+          >
+            提交
+          </div>
         </div>
       </div>
     </div>
@@ -178,28 +207,33 @@
 <script setup>
 import checkbox from "@/assets/image/checkbox.png";
 import checkbox2 from "@/assets/image/checkbox2.png";
-import {useRoute} from "vue-router/dist/vue-router";
+import { useRoute, useRouter } from "vue-router/dist/vue-router";
 import { request, usePage, useRequest } from "@/api/request";
-import {
+import { ASSESSMENT_QUERY, ASSESSMENT_SUBMIT } from "@/api/api";
-  ASSESSMENT_QUERY,
-  ASSESSMENT_SUBMIT,
-} from "@/api/api";
 import { ElMessage } from "element-plus";
 
 const {
   query: { courseId, id: taskId, type, pName, sName },
 } = useRoute();
-
+const router = useRouter();
+const returnclick = () => {
+  router.back();
+};
 const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId });
-
+console.log("data", data);
 function submit() {
   if (data.value.isSubmit) {
-    return
+    return;
   }
-  data.value.isSubmit = !data.value.isSubmit
+  data.value.isSubmit = !data.value.isSubmit;
-  request(ASSESSMENT_SUBMIT, {assessmentId: courseId, taskId, type, result: JSON.stringify(data.value)})
+  request(ASSESSMENT_SUBMIT, {
+    assessmentId: courseId,
+    taskId,
+    type,
+    result: JSON.stringify(data.value),
+  });
   ElMessage.info("提交成功");
-  router.back()
+  router.back();
 }
 </script>
 <style lang="scss">