Merge branch '0617-project' into dev0731

src/api/api.js

@@ -55,7 +55,7 @@ export const VOTE_DETAIL2 = `/voteSubmit/queryVoteTaskDetailById post`
 export const VOTE_DETAIL3 = voteId => `/vote/queryVoteById?voteId=${voteId}`
 // 投票详情接口
 export const VOTE_DETAIL_SUBMIT = `/voteSubmit/vote/commit post`
-
+export const NO_COMMIT = `/voteSubmit/vote/nocommit post`
 export const COMMENT_ADD = '/comment/add post'
 export const COMMENT_PRAISE = '/comment/praise'
 export const COMMENT_COLLECTION = '/comment/collection post'
@@ -63,7 +63,7 @@ export const COMMENT_COLLECTION = '/comment/collection post'
 export const ASSESSMENT_SUBMIT_QUERY = assessmentId => `/assessmentSubmit/queryAssessmentSubmitDetailById?assessmentSubmitId=${assessmentId} post`
 export const ASSESSMENT_QUERY = assessmentId => `/stu/task/queryAssessmentDetailById`
 export const ASSESSMENT_SUBMIT = '/stu/task/evaluate/commit post'
-
+export const TASK_NO_COMMIT = `/stu/task/evaluate/nocommit post`
 export const ACTIVITY = '/activity'
 
 export const STUDY_RECORD = '/stu/task/thirdTask/submit post'

src/views/ballot/BallotPage.vue

@@ -187,7 +187,7 @@
 </template>
 <script setup>
 import {useRequest} from "@/api/request";
-import {VOTE_DETAIL3, VOTE_DETAIL_SUBMIT, EditVoteInvolvedAndBrowse} from "@/api/api";
+import {VOTE_DETAIL3, VOTE_DETAIL_SUBMIT, EditVoteInvolvedAndBrowse,NO_COMMIT} from "@/api/api";
 import dayjs from "dayjs";
 import store from "@/store";
 import {ElMessage} from "element-plus";
@@ -268,6 +268,22 @@ const submitVote = () => {
   // 增加参与数目
   useRequest(EditVoteInvolvedAndBrowse, {operationType:'1', voteId:dataInfo.value.id });
 };
+const noCommit = () => {
+let noCommitParams = {
+  beginTime: answerTime,
+    chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0,
+    result: JSON.stringify(dataInfo.value),
+    targetId: infoId, // 项目 路径图 id
+    taskId: id,
+    type: btype, // 1 项目  2 路径图
+    voteId: dataInfo.value.id,
+    voteName: dataInfo.value.voteName,
+    studentId: userInfo.value.userId,
+    studentName: userInfo.value.realName,
+}
+  useRequest(NO_COMMIT, noCommitParams);
+}
+noCommit()
 </script>
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped lang="scss">

src/views/project/ProjectDetails.vue

@@ -126,7 +126,7 @@
             </div>
             <!--            todo #路径详情 个人信息缺少img和介绍-->
             <div class="teacheritem" :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }">
-              <img class="peopleimg" :src="userInfo?.avatar?fielPath+userInfo?.avatar:''" />
+              <img class="peopleimg" :src="userInfo?.avatar?'/upload'+userInfo?.avatar:''" />
               <div style="margin-left: 17px">
                 <div class="teacherName">
                   <div style="margin-right: 5px">
@@ -371,7 +371,6 @@ const {
   query: { courseId, projectId },
 } = useRoute();
 const router = useRouter();
-const fielPath = ref(import.meta.env.VITE_FILE_PATH);
 const { commit, dispatch, state } = useStore()
 const store = useStore()
 const userInfo = computed(() => state.userInfo)

src/views/survey/SurveyDetail.vue

@@ -239,7 +239,7 @@ import checkbox from "@/assets/image/checkbox.png";
 import checkbox2 from "@/assets/image/checkbox2.png";
 import {useRoute, useRouter} from "vue-router/dist/vue-router";
 import {request, usePage, useRequest} from "@/api/request";
-import {ASSESSMENT_QUERY, ASSESSMENT_SUBMIT} from "@/api/api";
+import {ASSESSMENT_QUERY, ASSESSMENT_SUBMIT,TASK_NO_COMMIT} from "@/api/api";
 import {ElMessage} from "element-plus";
 import {ref, watch,onMounted,nextTick } from "vue";
 import dayjs from "dayjs";
@@ -361,6 +361,18 @@ function submit() {
   });
 
 }
+const noCommit = () => {
+  useRequest(TASK_NO_COMMIT, {
+    targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
+    chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, //  关卡或者阶段Id  关卡Id不允许为空
+    assessmentId: courseId,
+    taskId: taskId ? taskId : 0,
+    type,
+    result: JSON.stringify(data.value),
+    beginTime: answerTime
+  })
+}
+noCommit()
 </script>
 <style lang="scss">
 .selectonlineface{