init

src/api/api.js

@@ -19,7 +19,7 @@ export const TAS_ACTIVITY_DETAIL = '/activity'
 export const TASK_ACTIVITY_SIGN = '/activitySubmit/updateActivitySignInStatus post'
 export const TASK_BROADCAST_COMMIT = '/stu/task/broadcast/commit'
 export const TASK_BROADCAST_DETAIL = '/liveBroadcast'
-export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign'
+export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign post'
 export const TASK_VOTE_COMMIT = '/stu/task/vote/commit'
 export const TASK_VOTE_DETAIL = '/stu/task/vote/detail'
 export const TASK_WORK_COMMIT = '/workSubmit/submitStudentWorkDetail post'
@@ -47,7 +47,7 @@ export const COMMENT_PRAISE = '/comment/praise post'
 export const COMMENT_COLLECTION = '/comment/collection post'
 
 export const ASSESSMENT_SUBMIT_QUERY = assessmentId => `/assessmentSubmit/queryAssessmentSubmitDetailById?assessmentSubmitId=${assessmentId} post`
-export const ASSESSMENT_QUERY = assessmentId => `/assessment/queryAssessmentDetailById?assessmentId=${assessmentId} post`
+export const ASSESSMENT_QUERY = assessmentId => `/stu/task/evaluate/get`
-export const ASSESSMENT_SUBMIT = '/assessmentSubmit/submitAssessmentDetail'
+export const ASSESSMENT_SUBMIT = '/stu/task/evaluate/commit post'
 
 export const ACTIVITY = '/activity'

src/views/liveBroadcast/LiveBroadcast.vue

@@ -46,13 +46,12 @@
         </botton>
         <botton
             class="btn"
-          style="background: rgb(57, 146, 249)"
+            :style="{background:`${data.signFlag?'#999':'rgb(57, 146, 249)'}`}"
             @click="signClick"
-          v-if="!data.signFlag"
+        >{{ data.signFlag ? '已签到' : '签到' }}
-          >签到
         </botton>
-        <botton class="btn" @click="commitClick" v-if="!data.evalFlag"
+        <botton :style="{background:`${data.isSurvery?'#999':'rgb(57, 146, 249)'}`}" class="btn" @click="commitClick"
-          >评估
+        >{{ data.isSurvery ? '已评估' : '评估' }}
         </botton>
       </div>
     </div>
@@ -74,14 +73,14 @@
             <div style="display: flex; align-items: center">
               <!--              todo #直播 没有课前预习字段-->
               <div class="content">
-                通过对各级人员的软件平台培训，使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平，最大限度发挥软件产品在企业中的作用;<br />
+                通过对各级人员的软件平台培训，使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平，最大限度发挥软件产品在企业中的作用;<br/>
                 ● 培训目标
-                <br />1.使企业不同部门人员掌握便捷、有效的系统平台操作方法;<br />
+                <br/>1.使企业不同部门人员掌握便捷、有效的系统平台操作方法;<br/>
-                2.通过系统平台的培训提高员工对企业的管理理念认识与提升。<br />
+                2.通过系统平台的培训提高员工对企业的管理理念认识与提升。<br/>
                 3.通过系统平台培训加强沟通，统一部署，协同工作，提高效率。
-                <br />
+                <br/>
-                ●培训对象<br />
+                ●培训对象<br/>
-                集团领导、各相关部门领导、总经理、车间主管、车间操作员等;<br />
+                集团领导、各相关部门领导、总经理、车间主管、车间操作员等;<br/>
               </div>
             </div>
 
@@ -98,8 +97,8 @@
               <div class="content">
                 <span style="font-weight: 600"
                 >网易有道词典现有功能结构拆解+问题分析</span
-                ><br />
+                ><br/>
-                查找资料，介绍一种国外（日本、美国、欧洲）道路（公路、铁路、城市道路、地铁）设计规范的演变过程，可以一种或几种主要技术指标为例，并说明其原因。<br />
+                查找资料，介绍一种国外（日本、美国、欧洲）道路（公路、铁路、城市道路、地铁）设计规范的演变过程，可以一种或几种主要技术指标为例，并说明其原因。<br/>
               </div>
             </div>
           </div>
@@ -131,7 +130,7 @@
               class="teacheritem"
               :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
           >
-            <img class="peopleimg" :src="userAvatar" />
+            <img class="peopleimg" :src="userAvatar"/>
             <div style="margin-left: 17px; width: 190px">
               <div class="teacherName" style="margin-right: 5px">
                 {{ data.userInfoBo?.userName }}
@@ -148,22 +147,23 @@
 </template>
 
 <script setup>
-import { computed, reactive, toRefs } from "vue";
+import {computed, reactive, toRefs} from "vue";
 import img from "@/assets/image/uploadimg.png";
-import { request, useRequest } from "@/api/request";
+import {request, useRequest} from "@/api/request";
-import { TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN } from "@/api/api";
+import {TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN} from "@/api/api";
-import { useRoute } from "vue-router/dist/vue-router";
+import {useRoute} from "vue-router/dist/vue-router";
-import { useRouter } from "vue-router";
+import {useRouter} from "vue-router";
-import { useUserInfo } from "@/api/utils";
+import {useUserInfo} from "@/api/utils";
+import {ElMessage} from "element-plus";
 
 const {
-  query: { courseId: liveId },
+  query: {courseId: liveId},
 } = useRoute();
 const router = useRouter();
 
-const { data } = useRequest(TASK_BROADCAST_DETAIL, { liveId });
+const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId});
 
-const { avatar: userAvatar } = useUserInfo(
+const {avatar: userAvatar} = useUserInfo(
     computed(() => data.value.userInfoBo?.userId)
 );
 
@@ -179,15 +179,22 @@ const state = reactive({
     },
   ],
 });
-const { activeName, teacher } = toRefs(state);
+const {activeName, teacher} = toRefs(state);
 const signClick = () => {
+  if (data.value.signFlag) {
+    return
+  }
   data.value.signFlag = 1;
-  request(TASK_BROADCAST_SIGN, { courseId: liveId });
+  ElMessage.info("签到成功");
+  request(TASK_BROADCAST_SIGN, {courseId: liveId});
 };
 const commitClick = () => {
+  if (data.value.isSurvery) {
+    return
+  }
   router.push({
     path: "/surveydetail",
-    query: { courseId: data.value.assessmentId },
+    query: {courseId: data.value.assessmentId},
   });
 };
 

src/views/survey/SurveyDetail.vue

@@ -78,21 +78,18 @@
         <div
             class="question"
             style="margin-top: 41px"
-          v-for="(item, i) in data.singleStemVoList"
+            v-for="(item, i) in data.assessmentSingleChoiceDtoList"
             :key="i"
         >
           <div class="text">{{ item.singleStemName }}</div>
           <div
-            v-for="(value, index) in item.assessmentSingleChoiceVoList"
+              v-for="(value, index) in item.assessmentSingleChoiceDtoList"
               :key="index"
               style="display: flex; align-items: center"
-            :style="{
+              :style="{'margin-top': index === 0 ? '29px' : '22px',cursor: 'pointer'}"
-              'margin-top': index === 0 ? '29px' : '22px',
-              cursor: 'pointer',
-            }"
               @click="
               () => {
-                item.assessmentSingleChoiceVoList.forEach((e) => {
+                item.assessmentSingleChoiceDtoList.forEach((e) => {
                   e.select = false;
                 });
                 value.select = true;
@@ -149,7 +146,8 @@
             <div class="words">{{ item.content?.length || 0 }}/200</div>
           </div>
         </div>
-        <div style="display: flex; justify-content: center">
+        <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">提交</div>
         </div>
       </div>
@@ -161,25 +159,24 @@
 <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} from "vue-router/dist/vue-router";
-import { request, usePage, useRequest } from "@/api/request";
+import {request, usePage, useRequest} from "@/api/request";
 import {
   ASSESSMENT_QUERY,
   ASSESSMENT_SUBMIT,
-  COMMENT_LIST,
-  DISCUSS_DETAIL,
 } from "@/api/api";
+import {ElMessage} from "element-plus";
 
 const {
-  query: { courseId },
+  query: {courseId},
 } = useRoute();
 
-const { data } = useRequest(ASSESSMENT_QUERY(courseId), {});
+const {data} = useRequest(ASSESSMENT_QUERY(courseId), {id:courseId});
 
 function submit() {
-  request(ASSESSMENT_SUBMIT, data).then(() => {
+  request(ASSESSMENT_SUBMIT, {assessmentId: courseId, result: JSON.stringify(data.value)})
-    console.log("提交成功");
+  ElMessage.info("提交成功");
-  });
+  router.back()
 }
 </script>
 <style lang="scss">