From fd9c4c31c6ce40643ad2ac4c910bd167a40a2cb6 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 9 Feb 2023 15:45:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=8A=95=E7=A5=A8?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ballotpage/BallotPage.vue         | 26 +++++++++++++++------
 src/views/pathmap/PathmapPage.vue           | 15 ++++++------
 src/views/projectdetails/ProjectPath.vue    | 14 +++++------
 src/views/projectdetails/projectDetails.vue | 14 ++++++-----
 4 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/src/views/ballotpage/BallotPage.vue b/src/views/ballotpage/BallotPage.vue
index b75fbf9..ff338d8 100644
--- a/src/views/ballotpage/BallotPage.vue
+++ b/src/views/ballotpage/BallotPage.vue
@@ -101,11 +101,23 @@
                     :key="key"
                   >
                     <div class="left">
+                      <div style="display: flex; align-items: center">
+                        <img
+                          class="leftimg"
+                          src="../../assets/image/ballotpage/left.png"
+                        />
+                        <div class="leftcontent">{{ elem.optionName }}</div>
+                      </div>
                       <img
-                        class="leftimg"
-                        src="../../assets/image/ballotpage/left.png"
+                        v-if="elem.optionPictureAddress"
+                        :src="elem.optionPictureAddress"
+                        style="
+                          width: 70px;
+                          height: 70px;
+                          margin-left: 20px;
+                          margin-top: 10px;
+                        "
                       />
-                      <div class="leftcontent">{{ elem.optionName }}</div>
                     </div>
                     <button
                       class="btn"
@@ -469,21 +481,21 @@ const submitVote = () => {
                   align-items: center;
                   justify-content: space-between;
                   border-bottom: 1px solid rgba(241, 242, 243, 1);
-                  height: 50px;
-
+                  padding-bottom: 13px;
                   .left {
                     display: flex;
+                    flex-direction: column;
                     .leftimg {
                       width: 4.5px;
                       height: 14.5px;
-                      margin-top: 1px;
+                      // margin-top: 1px;
                     }
                     .leftcontent {
                       margin-left: 9px;
                       color: #6e7b84;
                       font-size: 13px;
                       line-height: 30px;
-                      margin-top: -5px;
+                      // margin-top: -5px;
                     }
                   }
                   .btn {
diff --git a/src/views/pathmap/PathmapPage.vue b/src/views/pathmap/PathmapPage.vue
index 3338b50..47e0cef 100644
--- a/src/views/pathmap/PathmapPage.vue
+++ b/src/views/pathmap/PathmapPage.vue
@@ -68,29 +68,26 @@
               v-for="(el, index) in data?.taskBoList"
               :key="index"
             >
-              <div>
+              <div style="width: calc(100% - 80px)">
                 <div class="issue">
                   {{ el.name }}
                 </div>
                 <div class="coursetag">
                   <div
                     class="tag1"
-                    style="margin-right: 11px; margin-top: 16px"
+                    style="margin-right: 11px; margin-top: 3px"
                     v-if="el.flag"
                   >
                     必修
                   </div>
                   <div
                     class="tag2"
-                    style="margin-right: 11px; margin-top: 16px"
+                    style="margin-right: 11px; margin-top: 3px"
                     v-if="!el.flag"
                   >
                     选修
                   </div>
-                  <div
-                    class="tag3"
-                    style="margin-right: 11px; margin-top: 16px"
-                  >
+                  <div class="tag3" style="margin-right: 11px; margin-top: 3px">
                     {{ types.typeName[el.type] || "" }}
                   </div>
                 </div>
@@ -702,10 +699,12 @@ function toFinish(d) {
 
             .issue {
               width: 100%;
-              display: flex;
               font-size: 13px;
               line-height: 30.29px;
               color: rgba(110, 123, 132, 1);
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
             }
             .coursetag {
               display: flex;
diff --git a/src/views/projectdetails/ProjectPath.vue b/src/views/projectdetails/ProjectPath.vue
index 395ac4a..49af03c 100644
--- a/src/views/projectdetails/ProjectPath.vue
+++ b/src/views/projectdetails/ProjectPath.vue
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-01-19 11:28:11
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-08 09:57:37
+ * @LastEditTime: 2023-02-09 10:20:19
  * @FilePath: /stu_h5/src/views/projectdetails/ProjectPath.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -179,14 +179,14 @@ const handleClick = (tab, event) => {
   console.log("selectTab", selectTab.value);
 };
 const goDetails = () => {
-  // router.push({
-  //   path: "/pathmappage",
-  //   query: { routerId: 290 },
-  // });
   router.push({
-    path: "/projectdetails",
-    query: { projectId: 485 },
+    path: "/pathmappage",
+    query: { routerId: 290 },
   });
+  // router.push({
+  //   path: "/projectdetails",
+  //   query: { projectId: 485 },
+  // });
 };
 </script>
 
diff --git a/src/views/projectdetails/projectDetails.vue b/src/views/projectdetails/projectDetails.vue
index 1c7823a..96450de 100644
--- a/src/views/projectdetails/projectDetails.vue
+++ b/src/views/projectdetails/projectDetails.vue
@@ -86,28 +86,28 @@
                 v-for="(el, index) in item.taskProcessList"
                 :key="index"
               >
-                <div>
+                <div style="width: calc(100% - 80px)">
                   <div class="issue">
                     {{ el.name }}
                   </div>
                   <div class="coursetag">
                     <div
                       class="tag1"
-                      style="margin-right: 11px; margin-top: 16px"
+                      style="margin-right: 11px; margin-top: 3px"
                       v-if="el.flag"
                     >
                       必修
                     </div>
                     <div
                       class="tag2"
-                      style="margin-right: 11px; margin-top: 16px"
+                      style="margin-right: 11px; margin-top: 3px"
                       v-if="!el.flag"
                     >
                       选修
                     </div>
                     <div
                       class="tag3"
-                      style="margin-right: 11px; margin-top: 16px"
+                      style="margin-right: 11px; margin-top: 3px"
                     >
                       {{ types.typeName[el.type] || "" }}
                     </div>
@@ -396,7 +396,7 @@ function toFinish(d, sName, chapterOrStageId) {
     ElMessage.error("暂时未开放");
     return;
   }
-  if (d.type == 3 || d.type == 7) {
+  if (d.type == 3) {
     d.status !== 1 &&
       request(STUDY_RECORD, {
         studentId: data.value.userInfoBo.userId,
@@ -809,10 +809,12 @@ const queryAllStatus = (data) => {
 
             .issue {
               width: 100%;
-              display: flex;
               font-size: 13px;
               line-height: 30.29px;
               color: rgba(110, 123, 132, 1);
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
             }
             .coursetag {
               display: flex;