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

src/App.vue

@@ -2,25 +2,25 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 17:28:10
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-13 18:20:41
+ * @LastEditTime: 2022-12-13 18:56:24
  * @FilePath: /fe-stu/src/App.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
   <div id="container">
-<!--    <div id="nav">-->
+    <div id="nav">
-<!--      <router-link-->
+      <router-link
-<!--        v-for="item in routes"-->
+        v-for="item in routes"
-<!--        :key="item.path"-->
+        :key="item.path"
-<!--        :to="item.path"-->
+        :to="item.path"
-<!--        :class="{-->
+        :class="{
-<!--          link: true,-->
+          link: true,
-<!--          active: name === item.name,-->
+          active: name === item.name,
-<!--        }"-->
+        }"
-<!--      >-->
+      >
-<!--        {{ item.name }}-->
+        {{ item.name }}
-<!--      </router-link>-->
+      </router-link>
-<!--    </div>-->
+    </div>
     <main>
       <router-view />
     </main>

src/views/ballot/BallotPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="moreactive">
+  <div class="moreactive" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>混合制项目</div>

src/views/discuss/DiscussPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetail">
+  <div class="surveydetail" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div
       style="display: flex; align-items: center; justify-content: space-between"

src/views/discussdetail/DiscussDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetailpage">
+  <div class="surveydetailpage" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div
       style="display: flex; align-items: center; justify-content: space-between"

src/views/examination/ExamPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetail">
+  <div class="surveydetail" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div
       style="display: flex; align-items: center; justify-content: space-between"

src/views/faceteach/FaceTeach.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="faceteach">
+  <div class="faceteach" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>课程列表</div>
@@ -29,7 +29,9 @@
           <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
         </div>
       </div>
-      <div class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag">评估</div>
+      <div class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag">
+        评估
+      </div>
     </div>
     <!-- 基本信息 -->
 
@@ -90,11 +92,7 @@
                     <div class="tag3" style="margin-left: 11px">作业</div>
                   </div>
                 </div>
-                <div
+                <div class="submit" @click="toWork" v-if="data.workDto?.workId">
-                    class="submit"
-                    @click="toWork"
-                    v-if="data.workDto?.workId"
-                >
                   提交
                 </div>
               </div>
@@ -164,7 +162,9 @@ const {
 
 const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
 
-const {avatar: userAvatar} = useUserInfo(computed(() => data.value?.planDto?.teacherId))
+const { avatar: userAvatar } = useUserInfo(
+  computed(() => data.value?.planDto?.teacherId)
+);
 
 const state = reactive({
   activeName: "first",
@@ -179,14 +179,21 @@ const download = (url) => {
 };
 
 function toSurvery() {
-  router.push({path: "/surveydetail", query: {courseId: data.value.planDto.evaluateId}})
+  router.push({
+    path: "/surveydetail",
+    query: { courseId: data.value.planDto.evaluateId },
+  });
 }
 
 function toWork() {
   router.push({
     path: "/homeworkpage",
-    query: {courseId: data.value.workDto.workId, id: data.value.offcourseDto.categoryId, type}
+    query: {
-  })
+      courseId: data.value.workDto.workId,
+      id: data.value.offcourseDto.categoryId,
+      type,
+    },
+  });
 }
 
 function toExamItem(obj) {

src/views/homework/HomeworkPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="homework">
+  <div class="homework" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>混合制项目</div>

src/views/liveBroadcast/LiveBroadcast.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="moreactive">
+  <div class="moreactive" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>混合制项目</div>
@@ -43,20 +43,17 @@
           style="background: rgb(59, 191, 252)"
           @click="showClick"
           >观看
-        </botton
+        </botton>
-        >
         <botton
           class="btn"
           style="background: rgb(57, 146, 249)"
           @click="signClick"
           v-if="!data.signFlag"
           >签到
-        </botton
+        </botton>
-        >
         <botton class="btn" @click="commitClick" v-if="!data.evalFlag"
           >评估
-        </botton
+        </botton>
-        >
       </div>
     </div>
     <!-- 基本信息 -->
@@ -154,10 +151,7 @@
 import { computed, reactive, toRefs } from "vue";
 import img from "@/assets/image/uploadimg.png";
 import { request, useRequest } from "@/api/request";
-import {
+import { TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN } from "@/api/api";
-  TASK_BROADCAST_DETAIL,
-  TASK_BROADCAST_SIGN,
-} from "@/api/api";
 import { useRoute } from "vue-router/dist/vue-router";
 import { useRouter } from "vue-router";
 import { useUserInfo } from "@/api/utils";
@@ -165,12 +159,13 @@ import {useUserInfo} from "@/api/utils";
 const {
   query: { courseId: liveId },
 } = useRoute();
-const router = useRouter()
+const router = useRouter();
 
 const { data } = useRequest(TASK_BROADCAST_DETAIL, { liveId });
 
-const {avatar: userAvatar} = useUserInfo(computed(() => data.value.userInfoBo?.userId))
+const { avatar: userAvatar } = useUserInfo(
-
+  computed(() => data.value.userInfoBo?.userId)
+);
 
 const state = reactive({
   activeName: "first",
@@ -184,19 +179,21 @@ const state = reactive({
     },
   ],
 });
-const {activeName, teacher} = toRefs(state)
+const { activeName, teacher } = toRefs(state);
 const signClick = () => {
-  data.value.signFlag = 1
+  data.value.signFlag = 1;
-  request(TASK_BROADCAST_SIGN, {courseId: liveId})
+  request(TASK_BROADCAST_SIGN, { courseId: liveId });
 };
 const commitClick = () => {
-  router.push({path: '/surveydetail', query: {courseId: data.value.assessmentId}})
+  router.push({
+    path: "/surveydetail",
+    query: { courseId: data.value.assessmentId },
+  });
 };
 
 function showClick() {
-  window.open(data.value.liveLink)
+  window.open(data.value.liveLink);
 }
-
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/views/moreActive/MoreActive.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="moreactive">
+  <div class="moreactive" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>混合制项目</div>
@@ -129,7 +129,9 @@
 import { TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN, ACTIVITY } from "@/api/api";
 import { request, useRequest } from "@/api/request";
 import { useRoute } from "vue-router/dist/vue-router";
-const {query: {courseId: activityId}} = useRoute()
+const {
+  query: { courseId: activityId },
+} = useRoute();
 
 const { data } = useRequest(ACTIVITY, { activityId });
 console.log("data", data);

src/views/project/ProjectDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="pathdetails">
+  <div class="pathdetails" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>产品经理学习路径图</div>
@@ -14,10 +14,7 @@
         <div v-for="(i, k) in data.stageProcessList" :key="k">
           <div class="title">
             <div class="titleL">{{ i.stageName }}</div>
-            <div
+            <div class="titleR" :style="{ display: 'flex' }">
-                class="titleR"
-                :style="{ display: 'flex' }"
-            >
               <img src="../../assets/image/pathdetails/circle.png" />
               <div class="titleRT">进行中</div>
             </div>
@@ -39,10 +36,11 @@
             <div>
               <div class="coursename">{{ value.name }}</div>
               <div class="coursetag">
-                <div class="tag1" style="margin-right: 11px; margin-top: 16px">必修</div>
+                <div class="tag1" style="margin-right: 11px; margin-top: 16px">
-                <div class="tag3" style="margin-right: 11px; margin-top: 16px">{{
+                  必修
-                    types.typeName[value.type] || ''
+                </div>
-                  }}
+                <div class="tag3" style="margin-right: 11px; margin-top: 16px">
+                  {{ types.typeName[value.type] || "" }}
                 </div>
 
                 <!--                                <div-->
@@ -72,7 +70,7 @@
                           2: 'rgba(39, 122, 255, 1)',
                           3: 'rgba(59, 94, 251, 1)',
                           4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                          5: 'rgba(57, 219, 183, 1)',
                         }[parseInt(value.currentRatio / 20)]
                       "
                     />
@@ -85,15 +83,14 @@
                       margin-left: 10px;
                     "
                     :style="{
-                      color:
+                      color: {
-                        {
                         0: 'rgba(238, 112, 108, 1)',
                         1: 'rgba(255, 151, 38, 1)',
                         2: 'rgba(39, 122, 255, 1)',
                         3: 'rgba(59, 94, 251, 1)',
                         4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                        5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(value.currentRatio/20)]
+                      }[parseInt(value.currentRatio / 20)],
                     }"
                   >
                     {{ value.currentRatio }}%
@@ -102,9 +99,7 @@
               </div>
             </div>
             <div class="goclass" @click="toFinish(value)">
-              {{
+              {{ types.toName[value.type] || "" }}
-                types.toName[value.type] || ''
-              }}
             </div>
             <!--            <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
             <!--              <div-->
@@ -184,7 +179,9 @@
               <img class="peopleimg" :src="data.userInfoBo?.peopleimg" />
               <div style="margin-left: 17px">
                 <div class="teacherName">
-                  <div style="margin-right: 5px">{{ data.userInfoBo?.userName }}</div>
+                  <div style="margin-right: 5px">
+                    {{ data.userInfoBo?.userName }}
+                  </div>
                   <div v-for="(item, key) in data.userInfoBo?.medal" :key="key">
                     <img class="teacherMedal" :src="item" />
                   </div>
@@ -222,17 +219,13 @@
                           2: 'rgba(39, 122, 255, 1)',
                           3: 'rgba(59, 94, 251, 1)',
                           4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                          5: 'rgba(57, 219, 183, 1)',
                         }[parseInt(data.totalChapterCnt / 20)]
                       "
                     />
                   </div>
                   <div
-                      style="
+                    style="font-size: 14px; font-weight: 500; margin-left: 10px"
-                      font-size: 14px;
-                      font-weight: 500;
-                      margin-left: 10px;
-                    "
                     :style="{
                       color: {
                         0: 'rgba(238, 112, 108, 1)',
@@ -240,8 +233,8 @@
                         2: 'rgba(39, 122, 255, 1)',
                         3: 'rgba(59, 94, 251, 1)',
                         4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                        5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.totalChapterCnt/20)]
+                      }[parseInt(data.totalChapterCnt / 20)],
                     }"
                   >
                     {{ data.totalChapterCnt }}%
@@ -265,7 +258,7 @@
                           2: 'rgba(39, 122, 255, 1)',
                           3: 'rgba(59, 94, 251, 1)',
                           4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                          5: 'rgba(57, 219, 183, 1)',
                         }[parseInt(data.currentChapterCnt / 20)]
                       "
                     />
@@ -278,15 +271,14 @@
                       margin-left: 10px;
                     "
                     :style="{
-                      color:
+                      color: {
-                        {
                         0: 'rgba(238, 112, 108, 1)',
                         1: 'rgba(255, 151, 38, 1)',
                         2: 'rgba(39, 122, 255, 1)',
                         3: 'rgba(59, 94, 251, 1)',
                         4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                        5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.currentChapterCnt/20)]
+                      }[parseInt(data.currentChapterCnt / 20)],
                     }"
                   >
                     {{ data.currentChapterCnt }}%
@@ -305,23 +297,24 @@
 
 <script setup>
 import { reactive, ref } from "vue";
-import word from '@/assets/image/file/word.png'
+import word from "@/assets/image/file/word.png";
-import ppt from '@/assets/image/file/ppt.png'
+import ppt from "@/assets/image/file/ppt.png";
-import pdf from '@/assets/image/file/pdf.png'
+import pdf from "@/assets/image/file/pdf.png";
-import zip from '@/assets/image/file/zip.png'
+import zip from "@/assets/image/file/zip.png";
-import md from '@/assets/image/file/md.png'
+import md from "@/assets/image/file/md.png";
-import medal1 from '@/assets/image/medal/medal1.png'
+import medal1 from "@/assets/image/medal/medal1.png";
-import medal2 from '@/assets/image/medal/medal2.png'
+import medal2 from "@/assets/image/medal/medal2.png";
-import medal3 from '@/assets/image/medal/medal3.png'
+import medal3 from "@/assets/image/medal/medal3.png";
-import img from '@/assets/image/uploadimg.png'
+import img from "@/assets/image/uploadimg.png";
 import { useRequest } from "@/api/request";
 import { PROJECT_PROCESS, ROUTER_PROCESS } from "@/api/api";
 import { useRoute, useRouter } from "vue-router";
 
-
+const {
-const {query: {projectId}} = useRoute()
+  query: { projectId },
-const router = useRouter()
+} = useRoute();
-const {data} = useRequest(PROJECT_PROCESS, {projectId})
+const router = useRouter();
+const { data } = useRequest(PROJECT_PROCESS, { projectId });
 const state = reactive({
   course: [
     {
@@ -497,75 +490,73 @@ const state = reactive({
       name: "王星天（显示事业）",
       introduce: "教师是学生的镜子,学生是老师的影子。",
       peopleimg: img,
-      medal: [
+      medal: [medal1, medal2, medal3],
-        medal1,
-        medal2,
-        medal3,
-      ],
     },
   ],
 });
-const activeName = ref('first')
+const activeName = ref("first");
-const totalprogress = ref(30)
+const totalprogress = ref(30);
-const compulsoryprogress = ref(10)
+const compulsoryprogress = ref(10);
 
 const handleClick = (tab, event) => {
   console.log(tab, event);
 };
-const path = {1: 'path'}
+const path = { 1: "path" };
 
 const types = ref({
   typeName: {
-    1: '在线',
+    1: "在线",
-    2: '面授',
+    2: "面授",
-    3: '案例',
+    3: "案例",
-    4: '作业',
+    4: "作业",
-    5: '考试',
+    5: "考试",
-    6: '直播',
+    6: "直播",
-    7: '外链',
+    7: "外链",
-    8: '讨论',
+    8: "讨论",
-    9: '活动',
+    9: "活动",
-    10: '测评',
+    10: "测评",
-    11: '评估',
+    11: "评估",
-    12: '投票',
+    12: "投票",
-    13: '项目',
+    13: "项目",
   },
   toName: {
-    1: '去上课',
+    1: "去上课",
-    2: '去上课',
+    2: "去上课",
-    3: '案例',
+    3: "案例",
-    4: '去完成',
+    4: "去完成",
-    5: '去完成',
+    5: "去完成",
-    6: '去签到',
+    6: "去签到",
-    7: '外链',
+    7: "外链",
-    8: '去讨论',
+    8: "去讨论",
-    9: '去完成',
+    9: "去完成",
-    10: '去完成',
+    10: "去完成",
-    11: '去完成',
+    11: "去完成",
-    12: '去投票',
+    12: "去投票",
-    13: '去完成',
+    13: "去完成",
   },
   path: {
-    1: '去上课',
+    1: "去上课",
-    2: '/faceteach',
+    2: "/faceteach",
-    3: '案例',
+    3: "案例",
-    4: '/homeworkpage',
+    4: "/homeworkpage",
-    5: '去完成',
+    5: "去完成",
-    6: '/livebroadcast',
+    6: "/livebroadcast",
-    7: '外链',
+    7: "外链",
-    8: '/discusspage',
+    8: "/discusspage",
-    9: '/moreactive',
+    9: "/moreactive",
-    10: '/starttest',
+    10: "/starttest",
-    11: '/surveydetail',
+    11: "/surveydetail",
-    12: '/ballotpage',
+    12: "/ballotpage",
-    13: '去完成'
+    13: "去完成",
-  }
+  },
-})
+});
 
 function toFinish(d) {
-  router.push({path: types.value.path[d.type], query: {id: d.projectTaskId, type: 2, courseId: d.courseId}})
+  router.push({
+    path: types.value.path[d.type],
+    query: { id: d.projectTaskId, type: 2, courseId: d.courseId },
+  });
 }
-
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/views/starttest/StartTest.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetail">
+  <div class="surveydetail" style="padding: 30px">
     <!-- 标题 -->
     <div class="title">考试模式</div>
     <!-- 标题 -->

src/views/survey/SurveyDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetail">
+  <div class="surveydetail" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div
       style="display: flex; align-items: center; justify-content: space-between"

src/views/testscore/TestScore.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetail">
+  <div class="surveydetail" style="padding: 30px">
     <!-- 标题 -->
     <div class="title">考试模式</div>
     <!-- 标题 -->