Merge remote-tracking branch 'nyx/250207-growth-prod-master-zp' into dev0731

src/views/growth/components/roadmap2/index.vue

@@ -116,28 +116,28 @@ const position = (index) => {
   let num2 = index % 35;
 
   return {
-    top: `${multiple * (5613 + 400) + Number(point[num2].top)}px`,
+    top: `${multiple * (5282 + 610) + Number(point[num2].top)}px`,
     right: `${point[num2].right}px`,
-    topNum: `${multiple * (5613 + 400) + Number(point[num2].top)}`,
+    topNum: `${multiple * (5282 + 610) + Number(point[num2].top)}`,
   };
 };
 
 const point = [
   {
-    top: "-57",
+    top: "-67",
     right: "55",
   },
   {
-    top: "-1",
+    top: "9",
     right: "709",
   },
   {
-    top: "108",
+    top: "118",
     right: "1034",
   },
   {
     top: "241",
-    right: "1021",
+    right: "952",
   },
   {
     top: "281",
@@ -148,7 +148,7 @@ const point = [
     right: "176",
   },
   {
-    top: "561",
+    top: "546",
     right: "435",
   },
   {
@@ -160,114 +160,111 @@ const point = [
     right: "1452",
   },
   {
-    top: "902",
+    top: "877",
     right: "1040",
   },
   {
     top: "1102",
-    right: "540",
+    right: "522",
   },
   {
-    top: "1227",
+    top: "1209",
     right: "1140",
   },
   {
-    top: "1500",
+    top: '1463',
-    right: "1640",
+    right: '1600',
   },
   {
-    top: "1644",
+    top: "1603",
     right: "1200",
   },
   {
-    top: "1760",
+    top: "1720",
     right: "653",
   },
   {
-    top: "1872",
+    top: "1830",
     right: "202",
   },
   {
-    top: "2072",
+    top: "2030",
     right: "585",
   },
   {
-    top: "2131",
+    top: "2091",
     right: "1106",
   },
   {
     top: "2340",
-    right: "1533",
+    right: "1471",
   },
   {
-    top: "2545",
+    top: "2487",
     right: "1033",
   },
   {
-    top: "2627",
+    top: "2568",
     right: "597",
   },
   {
-    top: "2767",
+    top: "2735",
     right: "67",
   },
   {
-    top: "2946",
+    top: "2888",
     right: "767",
   },
   {
     top: "3161",
-    right: "1184",
+    right: "1077",
   },
   {
-    top: "3406",
+    top: "3329",
     right: "484",
   },
   {
-    top: "3679",
+    top: "3602",
-    right: "-11",
+    right: "-6",
   },
   {
-    top: "3830",
+    top: "3751",
     right: "322",
   },
 
   {
-    top: "3882",
+    top: "3805",
     right: "950",
   },
   {
-    top: "4049",
+    top: "4021",
-    right: "1383",
+    right: "1270",
   },
   {
-    top: "4249",
+    top: "4156",
     right: "492",
   },
   {
     top: "4423",
-    right: "151",
+    right: "209",
   },
   {
-    top: "4744",
+    top: "4648",
     right: "501",
   },
   {
-    top: "4834",
+    top: "4738",
     right: "1101",
   },
   {
     top: "5066",
-    right: "1490",
+    right: "1363",
   },
   {
-    top: "5400",
+    top: "5282",
     right: "790",
   },
-  {
+  
-    top: "5613",
-    right: "50",
-  },
 ];
 const toFinish = (item) => {
   emit("toFinish", item);
@@ -292,14 +289,14 @@ const stateData = computed(() => {
       return {
         text: "已完成",
         color: "#0077EC",
-        bgColor: "rgba(0, 119, 236, 0.2)",
+        bgColor: "#cadff7",
         progressColor: "#0077EC",
       };
     } else if (item.completionStatus === "2") {
       return {
         text: "进行中",
         color: "#F2903D",
-        bgColor: "rgba(242, 144, 61, 0.2)",
+        bgColor: "#ecdacf",
         progressColor: "#F2903D",
       };
     } else if (item.completionStatus === "3") {
@@ -326,10 +323,12 @@ const stateData = computed(() => {
 }
 .path-container {
   position: relative;
-  width: 100%;
+  // width: 100%;
   min-height: 200px;
-  margin-top: 150px;
+  // margin-top: 150px;
-  margin-bottom: 100px;
+  // margin-bottom: 100px;
+  margin: 150px 20px 100px 20px;
+  box-sizing: border-box;
   background-image: url(@/assets/image/growth/path2.png);
   background-size: 100%;
   .path-item {

src/views/growth/growthList.vue

@@ -220,9 +220,16 @@
                 </div>
 
                 <div class="rate" v-if="lastLearned">
+                  <a-tooltip
+                    placement="topLeft"
+                    :title="lastLearned.taskName"
+                    arrow-point-at-center
+                    style="width: 75%;"
+                  >
                     <div class="ratetext">
                       上次学到：{{ lastLearned.taskName }}
                     </div>
+                  </a-tooltip>
                   <div
                     v-if="lastLearned"
                     class="ratebtn"
@@ -967,11 +974,14 @@ function toOffcoursePlanPage(item) {
       }
 
       .info .rate .ratetext {
-        // width: 259px;
         font-size: 14px;
         font-weight: 500;
         color: #677d86;
         line-height: 24px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        cursor: pointer;
       }
 
       .info .rate .ratebtn {

src/views/growth/growthRoadmap.vue

@@ -68,8 +68,7 @@
             />
             <el-button
               icon="Search"
-              style="margin-left: 20px"
+              style="margin-left: 20px; background-color: #0077ec; color: #fff"
-              type="primary"
               @click="getList"
               >搜索</el-button
             >

vite.config.js

@@ -37,6 +37,7 @@ export default defineConfig(({ command, mode }) =>
 		]
 	},
 	server: {
+		// host: "0.0.0.0",
 		proxy: {
 			// "/professional": {
 			// 	// target: 'http://192.168.16.195:32002',