From edd651177d66f0b99511dc6ea90b1995c080d22d Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sat, 17 Dec 2022 19:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue    | 25 +++++++++++++++--
 src/views/homework/HomeworkPage.vue  |  8 ++++--
 src/views/moreActive/MoreActive.vue  | 41 ++++++++++++++++------------
 src/views/project/ProjectDetails.vue |  2 +-
 src/views/roadmap/LearnPath.vue      |  7 +----
 src/views/survey/SurveyDetail.vue    |  8 ++++--
 6 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 754e9f9..1a8da7a 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -5,6 +5,16 @@
       <div>课程列表</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700">课程详情</div>
+      <div v-if="pName !=''" 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>
+      </div>
     </div>
     <!-- 面包屑导航 -->
 
@@ -138,7 +148,7 @@
                   </div>
                 </div>
                 <div class="submit" @click="toWork" v-if="data.workDto?.workId">
-                  去作业
+                  交作业
                 </div>
               </div>
             </el-tab-pane>
@@ -185,7 +195,7 @@
             style="width: 21px; height: 23px"
             src="../../assets/image/livelecturer.png"
           />
-          <div class="text">直播讲师</div>
+          <div class="text">面授课讲师</div>
           <div class="box"></div>
         </div>
         <!--        todo #面授课接口 讲师缺少img和介绍-->
@@ -324,7 +334,16 @@ function toExamItem(obj) {
       align-items: center;
     }
   }
-
+  .return {
+    position: absolute;
+    right: 10%;
+    .text {
+      text-align: center;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
+  }
   .detailinfo {
     width: 100%;
     margin-top: 20px;
diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue
index 30f5346..b985167 100644
--- a/src/views/homework/HomeworkPage.vue
+++ b/src/views/homework/HomeworkPage.vue
@@ -28,7 +28,7 @@
     </div>
     <!-- 面包屑导航 -->
     <div class="debateTitle" style="color: #fff">
-      【作业】管理者进阶腾飞班 - 中级管理者作业
+      【作业】{{ data?.workName }}
     </div>
     <!-- 详细信息 -->
     <div class="detailinfo">
@@ -150,7 +150,10 @@
                 type="textarea"
               />
             </div>
-            <div style="display: flex; justify-content: center">
+            <div v-if="submitList && submitList.length>0" style="display: flex; justify-content: center">
+              <button class="tijiao" @click="handleClick">再次提交</button>
+            </div>
+            <div v-else style="display: flex; justify-content: center">
               <button class="tijiao" @click="handleClick">提交</button>
             </div>
 
@@ -301,6 +304,7 @@ const handleClick = () => {
     taskId,
   }).then((res) => {
     submitList.value.unshift(res.data);
+    message.des
   });
   sbValue.value.content = "";
 };
diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue
index 2f67f23..38e3848 100644
--- a/src/views/moreActive/MoreActive.vue
+++ b/src/views/moreActive/MoreActive.vue
@@ -75,49 +75,52 @@
             </div>
             <div class="activedetail">
               <div>
-                <div>活动时长：</div>
-                <div class="content">
+                <span>活动时长：</span>
+                <span class="content">
                   {{
                     data?.activityDuration
                       ? data?.activityDuration + "分钟"
                       : "-"
                   }}
-                </div>
+                </span>
               </div>
               <div>
-                <div>活动地点：</div>
-                <div class="content">
+                <span>活动地点：</span>
+                <span class="content">
                   {{ data?.activityAddress ? data?.activityAddress : "-" }}
-                </div>
+                </span>
               </div>
               <div>
-                <div>活动考勤：</div>
-                <div class="content">
+                <span>活动考勤：</span>
+                <span class="content">
                   {{
                     data?.beforeSignIn
-                      ? "开始前" + data?.beforeSignIn + "分钟开始签到"
+                      ? "活动开始前" + data?.beforeSignIn + "分钟开始签到"
                       : "-"
                   }}
-                </div>
-                <div class="content">
+                </span>
+                <span class="content">
                   {{
                     data?.afterSignIn
-                      ? "开始后" + data?.afterSignIn + "分钟结束签到"
+                      ? "活动开始后" + data?.afterSignIn + "分钟结束签到"
                       : "-"
                   }}
-                </div>
+                </span>
               </div>
+              <!--
               <div>
                 <div>活动完成标准：</div>
                 <div class="content">
                   {{ data?.standardSettings ? "仅签到" : "-" }}
                 </div>
               </div>
+              -->
+
               <div>
-                <div>活动说明：</div>
-                <div class="content">
+                <span>活动说明：</span>
+                <span class="content">
                   {{ data?.activityExplain ? data?.activityExplain : "-" }}
-                </div>
+                </span>
               </div>
             </div>
           </div>
@@ -145,9 +148,13 @@
 <script setup>
 import { TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN, ACTIVITY } from "@/api/api";
 import { request, useRequest } from "@/api/request";
+import { useRouter } from "vue-router";
 import { useRoute } from "vue-router/dist/vue-router";
 import { ElMessage } from "element-plus";
-
+const router = useRouter();
+const returnclick = () => {
+  router.back();
+};
 const {
   query: { courseId: activityId, id: taskId, type, pName, sName },
 } = useRoute();
diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index b65e4b7..8683815 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -131,7 +131,7 @@
         <div class="detailRT">
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="课程公告" name="first">
-              <div class="notice">
+              <div class="notice">{{data}}
                 {{ data.remark || '暂无公告' }}
               </div>
             </el-tab-pane>
diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue
index 26fb41f..b4addd5 100644
--- a/src/views/roadmap/LearnPath.vue
+++ b/src/views/roadmap/LearnPath.vue
@@ -193,13 +193,8 @@ async function gofun({ routerId, name: routerName }) {
         path: "/pathdetails",
         query: { routerId, routerName },
       })
-    : window.open(
-        `http://localhost:5173/fe-student/pathdetails&params=${encodeURIComponent(
-          `routerId=${routerId}&routerName=${routerName}`
-        )}`
-      );
+    :window.open(`http://u-pre.boe.com/pc/forward?to=/fe-student/pathdetails&params=${encodeURIComponent(`routerId=${routerId}&routerName=${routerName}`)}`)
 }
-
 function toUnTask() {}
 </script>
 <style lang="scss">
diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue
index 770f6c4..e4375f9 100644
--- a/src/views/survey/SurveyDetail.vue
+++ b/src/views/survey/SurveyDetail.vue
@@ -9,7 +9,7 @@
         <div style="margin-left: 6px; margin-right: 6px">/</div>
         <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">
@@ -179,13 +179,17 @@
 import checkbox from "@/assets/image/checkbox.png";
 import checkbox2 from "@/assets/image/checkbox2.png";
 import {useRoute} from "vue-router/dist/vue-router";
+import { useRouter } from "vue-router";
 import {request, usePage, useRequest} from "@/api/request";
 import {
   ASSESSMENT_QUERY,
   ASSESSMENT_SUBMIT,
 } from "@/api/api";
 import {ElMessage} from "element-plus";
-
+const router = useRouter();
+const returnclick = () => {
+  router.back();
+};
 const {
   query: {courseId, id: taskId, type, pName, sName},
 } = useRoute();