Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop

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/components/img/UploadImg.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-11 16:57:58
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-17 14:51:44
+ * @FilePath: /fe-stu/src/components/img/UploadImg.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <el-upload
     :file-list="files"
@@ -19,48 +27,52 @@ import {FILE_UPLOAD} from "@/api/api";
 import { defineProps, ref } from "vue";
 
 const { modelValue = [] } = defineProps({
-  modelValue: []
-})
+  modelValue: [],
+});
 
-const emit = defineEmits()
+const emit = defineEmits();
 
-const files = ref(modelValue)
-const imageRef = ref()
+const files = ref(modelValue);
+const imageRef = ref();
 
 function handleChange(e) {
-  console.log(e)
+  console.log("上传", e);
   if (e.response && e.response.code === 200) {
-    e.url = e.response.data
+    e.url = e.response.data;
   }
 
-  const index = files.value.findIndex(f => f.uid === e.uid)
+  const index = files.value.findIndex((f) => f.uid === e.uid);
   if (index === -1) {
-    files.value.unshift(e)
+    files.value.unshift(e);
   } else {
-    files.value[index] = e
+    files.value[index] = e;
   }
-  emit('update:modelValue', files)
+  emit("update:modelValue", files);
 }
 
 function remove(i) {
-  files.value.splice(i, 1)
+  files.value.splice(i, 1);
 }
 
 function reUpload(i) {
-  if (files.value[i].status === 'ready' || files.value[i].status === 'uploading') {
-    imageRef.value.abort(files.value[i].raw)
-    files.value[i].status = 'abort';
-  } else if (files.value[i].status === 'fail'||files.value[i].status === 'abort') {
-    imageRef.value.handleStart(files.value[i].raw)
-    imageRef.value.submit()
+  if (
+    files.value[i].status === "ready" ||
+    files.value[i].status === "uploading"
+  ) {
+    imageRef.value.abort(files.value[i].raw);
+    files.value[i].status = "abort";
+  } else if (
+    files.value[i].status === "fail" ||
+    files.value[i].status === "abort"
+  ) {
+    imageRef.value.handleStart(files.value[i].raw);
+    imageRef.value.submit();
   }
 }
 
 function abort(i) {
-  imageRef.value.abort(files.value[i].raw)
+  imageRef.value.abort(files.value[i].raw);
 }
 
-
-defineExpose({reUpload, remove})
-
+defineExpose({ reUpload, remove });
 </script>

src/views/faceteach/FaceTeach.vue

@@ -39,6 +39,25 @@
           <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
         </div>
       </div>
+      <div style="display: flex">
+        <botton
+          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"
@@ -57,6 +76,7 @@
           >{{ data.isSurvery ? "已评估" : "评估" }}
         </botton>
       </div>
+    </div>
     <!-- 基本信息 -->
 
     <!-- 详细信息 -->
@@ -228,7 +248,7 @@ const returnclick = () => {
   router.back();
 };
 const {
-  query: { courseId, type },
+  query: { courseId, type, id: taskId },
 } = useRoute();
 
 const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
@@ -240,26 +260,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;
   }
   if (data.value.planDto.evalFlag == 0) {
-    alert("此课程无评估");
+    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,
+    },
   });
 }
 
@@ -270,6 +367,8 @@ function toWork() {
       courseId: data.value.workDto.workId,
       id: data.value.offcourseDto.categoryId,
       type,
+      pName: "面授课",
+      sName: data.value.planDto.name,
     },
   });
 }

src/views/homework/HomeworkPage.vue

@@ -288,6 +288,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

@@ -220,13 +220,17 @@ const commitClick = () => {
     return;
   }
   if (data.value.isEvaluate == 0) {
-    alert("此直播无评估");
+    ElMessage.info("此直播无评估");
     return;
   }
 
   router.push({
     path: "/surveydetail",
-    query: { courseId: data.value.assessmentId },
+    query: {
+      courseId: data.value.assessmentId,
+      pName: "直播",
+      sName: data.value.liveName,
+    },
   });
 };
 

src/views/survey/SurveyDetail.vue

@@ -10,6 +10,7 @@
         <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 +31,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 +77,7 @@
                 @click="
                   () => {
                     if (data.isSubmit) {
-                      return
+                      return;
                     }
                     value.selectAnswer = item;
                   }
@@ -90,18 +92,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 +131,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 +147,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 +182,22 @@
             <div class="words">{{ item.content?.length || 0 }}/200</div>
           </div>
         </div>
-        <div style="display: flex; justify-content: center"
-             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
+          style="display: flex; justify-content: center"
+          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>
@@ -193,17 +223,25 @@ const returnclick = () => {
 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
-  request(ASSESSMENT_SUBMIT, {assessmentId: courseId, taskId, type, result: JSON.stringify(data.value)})
+  data.value.isSubmit = !data.value.isSubmit;
+  request(ASSESSMENT_SUBMIT, {
+    assessmentId: courseId,
+    taskId,
+    type,
+    result: JSON.stringify(data.value),
+  });
   ElMessage.info("提交成功");
-  router.back()
+  router.back();
 }
 </script>
 <style lang="scss">