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

2025-12-09 10:56:48 +08:00 · 2022-12-17 19:22:00 +08:00
parent edd651177d 3c2bf0116b
commit 1c8fab250d
7 changed files with 294 additions and 140 deletions
--- a/src/api/api.js
+++ b/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
 */
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,7 +1,7 @@
 import router from "@/router";
-import {reactive, ref, toRefs, watch} from "vue";
+import { reactive, ref, toRefs, watch } from "vue";
 import axios from 'axios';
-import {getCookie} from "@/api/utils";
+import { getCookie } from "@/api/utils";

 export function usePage(_url, param) {

@@ -11,11 +11,11 @@ export function usePage(_url, param) {
        total: 0,
        size: 10,
        current: 1,
-        params: {pageNo: 1, pageSize: 10, ...param}
+        params: { pageNo: 1, pageSize: 10, ...param }
    })

    watch(param, () => {
-        state.params = {...state.params, ...param}
+        state.params = { ...state.params, ...param }
        fetchData()
    })

@@ -86,14 +86,14 @@ export async function request(_url, params) {
        method,
        headers: {
            'token': getCookie('token'),
-            ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
+            ...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
        },
        baseURL: import.meta.env.VITE_BASE_API,
-        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
+        ...method !== 'get' ? { data: JSON.stringify(body) } : {}
    }).then(resp => resp.data).then(response => {
        if (response.code !== 200 && response.code !== 0) {
            if (response.code === 1000) {
-                import.meta.env.MODE === 'development' ? router.push({path: '/login'}) : window.open(import.meta.env.VITE_BASE_LOGIN_URL)
+                import.meta.env.MODE === 'development' ? router.push({ path: '/login' }) : window.open(import.meta.env.VITE_BASE_LOGIN_URL)
            }
            // if (import.meta.env.DEV && response.code === 1000) {
            //     router.push({path: '/login'})
@@ -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'})
    })
 }
@@ -135,10 +135,10 @@ export async function boeRequest(_url, params) {
        method,
        headers: {
            token: getCookie('token'),
-            ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
+            ...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
        },
        baseURL: '',
-        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
+        ...method !== 'get' ? { data: JSON.stringify(body) } : {}
    }).then(resp => resp.data).then(response => {
        return response
    }).catch(e => {
--- a/src/components/img/UploadImg.vue
+++ b/src/components/img/UploadImg.vue
@@ -1,11 +1,19 @@
+<!--
+ * @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"
-      :action="FILE_UPLOAD"
-      method="POST"
-      :show-file-list="false"
-      :on-change="handleChange"
-      ref="imageRef"
+    :file-list="files"
+    :action="FILE_UPLOAD"
+    method="POST"
+    :show-file-list="false"
+    :on-change="handleChange"
+    ref="imageRef"
  >
    <template #trigger>
      <div>
@@ -15,52 +23,56 @@
  </el-upload>
 </template>
 <script setup>
-import {FILE_UPLOAD} from "@/api/api";
-import {defineProps, ref} from "vue";
+import { FILE_UPLOAD } from "@/api/api";
+import { defineProps, ref } from "vue";

-const {modelValue = []} = defineProps({
-  modelValue: []
-})
+const { modelValue = [] } = defineProps({
+  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>
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -39,23 +39,43 @@
          <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
        </div>
      </div>
-      <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 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"
+          @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>
    <!-- 基本信息 -->

@@ -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,
    },
  });
 }
--- a/src/views/homework/HomeworkPage.vue
+++ b/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,
 });
--- a/src/views/liveBroadcast/LiveBroadcast.vue
+++ b/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,
+    },
  });
 };

--- a/src/views/survey/SurveyDetail.vue
+++ b/src/views/survey/SurveyDetail.vue
@@ -2,7 +2,7 @@
  <div class="surveydetail" style="padding: 30px">
    <!-- 面包屑导航 -->
    <div
-        style="display: flex; align-items: center; justify-content: space-between"
+      style="display: flex; align-items: center; justify-content: space-between"
    >
      <div class="crumb">
        <div>{{ pName }}</div>
@@ -10,8 +10,9 @@
        <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">
        <div class="prev">
          <img
@@ -28,40 +29,41 @@
          />
        </div>-->
      <div class="return">
-      <div style="display: flex" @click="returnclick">
-                  <img
-                    class="img2" style="margin-right:22px;"
-                    src="../../assets/image/return.png"
-                  />
-                  <div class="text">返回</div>
+        <div style="display: flex" @click="returnclick">
+          <img
+            class="img2"
+            style="margin-right: 22px"
+            src="../../assets/image/return.png"
+          />
+          <div class="text" style="color: #fff">返回</div>
        </div>
      </div>
    </div>
    <!-- 面包屑导航 -->
    <!-- 标题 -->
-    <div class="title">【调研】管理者进阶腾飞班 - 培训阶段性调研</div>
+    <div class="title">【评估】管理者进阶腾飞班 - 培训阶段性调研</div>
    <!-- 标题 -->
    <!-- 基本信息 -->
    <div class="bascinfo">
      <div>
        <div
-            class="question"
-            v-for="(value, index) in data.assessmentScoringQuestionDtoList"
-            :key="index"
-            :style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
+          class="question"
+          v-for="(value, index) in data.assessmentScoringQuestionDtoList"
+          :key="index"
+          :style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
        >
          <div class="text">{{ value.assessmentScTitle }}</div>
          <div class="answer">
            <div class="answerL">完全没用</div>
            <div class="answerC">
              <div
-                  class="answerCitem"
-                  v-for="(item, key) in Array.from(
+                class="answerCitem"
+                v-for="(item, key) in Array.from(
                  { length: value.assessmentMaxScore },
                  (k, i) => i
                )"
-                  :key="key"
-                  :style="{
+                :key="key"
+                :style="{
                  'margin-left': key === 0 ? '15px' : '10px',
                  background:
                    value.selectAnswer === item
@@ -72,10 +74,10 @@
                      ? '#fff'
                      : 'rgba(86, 163, 249, 1)',
                }"
-                  @click="
+                @click="
                  () => {
-                    if(data.isSubmit){
-                      return
+                    if (data.isSubmit) {
+                      return;
                    }
                    value.selectAnswer = item;
                  }
@@ -88,21 +90,29 @@
          </div>
        </div>
        <div
-            class="question"
-            style="margin-top: 41px"
-            v-if="data.assessmentSingleChoiceDtoList && data.assessmentSingleChoiceDtoList.length"
+          class="question"
+          style="margin-top: 41px"
+          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'}"
-              @click="
+            v-for="(value, index) in data.assessmentSingleChoiceDtoList"
+            :key="index"
+            style="display: flex; align-items: center"
+            :style="{
+              'margin-top': index === 0 ? '29px' : '22px',
+              cursor: 'pointer',
+            }"
+            @click="
              () => {
-                if(data.isSubmit){
-                      return
-                    }
+                if (data.isSubmit) {
+                  return;
+                }
                data.assessmentSingleChoiceDtoList.forEach((e) => {
                  e.select = false;
                });
@@ -111,63 +121,83 @@
            "
          >
            <img
-                style="width: 19px; height: 18px; cursor: pointer"
-                :src="value.select ? checkbox : checkbox2"
+              style="width: 19px; height: 18px; cursor: pointer"
+              :src="value.select ? checkbox : checkbox2"
            />
            <div class="people">{{ value.singleOptionName }}</div>
          </div>
        </div>

        <div
-            class="question"
-            style="margin-top: 41px"
-            v-if="data.assessmentMultipleChoiceDtoList && data.assessmentMultipleChoiceDtoList.length"
+          class="question"
+          style="margin-top: 41px"
+          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"
-              style="display: flex; align-items: center"
-              :style="{
+            v-for="(value, index) in data.assessmentMultipleChoiceDtoList"
+            :key="index"
+            style="display: flex; align-items: center"
+            :style="{
              'margin-top': index === 0 ? '29px' : '22px',
              cursor: 'pointer',
            }"
-              @click="() => {
-                if(data.isSubmit){
-                      return
+            @click="
+              () => {
+                if (data.isSubmit) {
+                  return;
                }
-              value.select = !value.select
-              }"
+                value.select = !value.select;
+              }
+            "
          >
            <img
-                style="width: 19px; height: 18px; cursor: pointer"
-                :src="value.select ? checkbox : checkbox2"
+              style="width: 19px; height: 18px; cursor: pointer"
+              :src="value.select ? checkbox : checkbox2"
            />
            <div class="people">{{ value.multipleOptionName }}</div>
          </div>
        </div>
        <div
-            class="question"
-            style="margin-top: 41px"
-            v-for="(item, i) in data.assessmentEssayQuestionDtoList"
-            :key="i"
+          class="question"
+          style="margin-top: 41px"
+          v-for="(item, i) in data.assessmentEssayQuestionDtoList"
+          :key="i"
        >
          <div class="text">{{ item.assessmentQaTitle }}</div>
          <div style="width: 713px; margin-top: 31px; position: relative">
            <el-input
-                v-model="item.content"
-                :autosize="{ minRows: 5, maxRows: 5 }"
-                resize="none"
-                maxlength="200"
-                type="textarea"
-                :readonly="!!data.isSubmit"
+              v-model="item.content"
+              :autosize="{ minRows: 5, maxRows: 5 }"
+              resize="none"
+              maxlength="200"
+              type="textarea"
+              :readonly="!!data.isSubmit"
            />
            <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>
@@ -191,19 +221,27 @@ const returnclick = () => {
  router.back();
 };
 const {
-  query: {courseId, id: taskId, type, pName, sName},
+  query: { courseId, id: taskId, type, pName, sName },
 } = useRoute();
-
-const {data} = useRequest(ASSESSMENT_QUERY(courseId), {id: courseId});
-
+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">
@@ -214,14 +252,14 @@ function submit() {
    font-size: 14px;
    line-height: 24px;
  }
-  .return{
+  .return {
    position: absolute;
    right: 10%;
-    .text{
+    .text {
      text-align: center;
-     display: flex;
-     flex-direction: row;
-     align-items: center;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
    }
  }
  .prevnext {