hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-22 01:06:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joshen
2025-02-27 16:43:01 +08:00
parent 4a695b5ea3 1ffc097329
commit 5cfc2473cc
4 changed files with 139 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/views/growth/components/roadmap2/index.vue
View File

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

112
src/views/growth/growthList.vue
View File

@@ -28,22 +28,22 @@
<div class="nav"> <div class="nav">
<div class="tabs"> <div class="tabs">
<!-- <template v-if="selectGrowth.electiveTaskNum !== 0"> --> <!-- <template v-if="selectGrowth.electiveTaskNum !== 0"> -->
<div <div
class="tabs-item" class="tabs-item"
:class="queryParams.type == 1 ? 'active' : ''" :class="queryParams.type == 1 ? 'active' : ''"
@click="tabClick(1)" @click="tabClick(1)"
> >
<div class="tabs-text">必修</div> <div class="tabs-text">必修</div>
<div class="tabs-line"></div> <div class="tabs-line"></div>
</div> </div>
<div <div
class="tabs-item" class="tabs-item"
:class="queryParams.type == 2 ? 'active' : ''" :class="queryParams.type == 2 ? 'active' : ''"
@click="tabClick(2)" @click="tabClick(2)"
> >
<div class="tabs-text">选修</div> <div class="tabs-text">选修</div>
<div class="tabs-line"></div> <div class="tabs-line"></div>
</div> </div>
<!-- </template> --> <!-- </template> -->
</div> </div>
<div style="display: flex"> <div style="display: flex">
@@ -220,9 +220,16 @@
</div> </div>
<div class="rate" v-if="lastLearned"> <div class="rate" v-if="lastLearned">
<div class="ratetext"> <a-tooltip
上次学到：{{ lastLearned.taskName }} placement="topLeft"
</div> :title="lastLearned.taskName"
arrow-point-at-center
style="width: 75%;"
>
<div class="ratetext">
上次学到：{{ lastLearned.taskName }}
</div>
</a-tooltip>
<div <div
v-if="lastLearned" v-if="lastLearned"
class="ratebtn" class="ratebtn"
@@ -283,41 +290,41 @@
</div> </div>
</div> </div>
<!-- <template v-if="selectGrowth.electiveTaskNum !== 0"> --> <!-- <template v-if="selectGrowth.electiveTaskNum !== 0"> -->
<div style="margin-top: 31px"> <div style="margin-top: 31px">
<div class="progressBox"> <div class="progressBox">
<div style="display: flex; align-items: center"> <div style="display: flex; align-items: center">
<div style="margin-right: 8px">选修进度</div> <div style="margin-right: 8px">选修进度</div>
<el-tooltip <el-tooltip
class="item" class="item"
effect="light" effect="light"
:content="`还需完成${selectGrowth.electivePoorNum}个选修任务`" :content="`还需完成${selectGrowth.electivePoorNum}个选修任务`"
placement="top-start" placement="top-start"
> >
<el-icon color="#FE9100"><QuestionFilled /></el-icon> <el-icon color="#FE9100"><QuestionFilled /></el-icon>
</el-tooltip> </el-tooltip>
</div>
<div class="progress">
<div style="flex: 1">
<el-progress
:percentage="electiveProgress"
:show-text="false"
:stroke-width="8"
color="#FE9100"
/>
</div> </div>
<div class="progress"> <div
<div style="flex: 1"> style="
<el-progress font-size: 14px;
:percentage="electiveProgress" font-weight: 500;
:show-text="false" margin-left: 10px;
:stroke-width="8" color: #677d86;
color="#FE9100" "
/> >
</div> {{ electiveProgress }}%
<div
style="
font-size: 14px;
font-weight: 500;
margin-left: 10px;
color: #677d86;
"
>
{{ electiveProgress }}%
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- </template> --> <!-- </template> -->
</div> </div>
</div> </div>
@@ -967,11 +974,14 @@ function toOffcoursePlanPage(item) {
} }
.info .rate .ratetext { .info .rate .ratetext {
// width: 259px;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: #677d86; color: #677d86;
line-height: 24px; line-height: 24px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
} }
.info .rate .ratebtn { .info .rate .ratebtn {

67
src/views/growth/growthRoadmap.vue
View File

@@ -30,22 +30,22 @@
<div class="nav"> <div class="nav">
<div class="tabs"> <div class="tabs">
<!-- <template v-if="selectGrowth.electiveTaskNum !== 0"> --> <!-- <template v-if="selectGrowth.electiveTaskNum !== 0"> -->
<div <div
class="tabs-item" class="tabs-item"
:class="queryParams.type == 1 ? 'active' : ''" :class="queryParams.type == 1 ? 'active' : ''"
@click="tabClick(1)" @click="tabClick(1)"
> >
<div class="tabs-text">必修</div> <div class="tabs-text">必修</div>
<div class="tabs-line"></div> <div class="tabs-line"></div>
</div> </div>
<div <div
class="tabs-item" class="tabs-item"
:class="queryParams.type == 2 ? 'active' : ''" :class="queryParams.type == 2 ? 'active' : ''"
@click="tabClick(2)" @click="tabClick(2)"
> >
<div class="tabs-text">选修</div> <div class="tabs-text">选修</div>
<div class="tabs-line"></div> <div class="tabs-line"></div>
</div> </div>
<!-- </template> --> <!-- </template> -->
</div> </div>
<div style="display: flex"> <div style="display: flex">
@@ -68,8 +68,7 @@
/> />
<el-button <el-button
icon="Search" icon="Search"
style="margin-left: 20px" style="margin-left: 20px; background-color: #0077ec; color: #fff"
type="primary"
@click="getList" @click="getList"
>搜索</el-button >搜索</el-button
> >
@@ -112,22 +111,22 @@
<div class="nav"> <div class="nav">
<div class="tabs"> <div class="tabs">
<!-- <template v-if="selectGrowth.electiveTaskNum !== 0"> --> <!-- <template v-if="selectGrowth.electiveTaskNum !== 0"> -->
<div <div
class="tabs-item" class="tabs-item"
:class="queryParams.type == 1 ? 'active' : ''" :class="queryParams.type == 1 ? 'active' : ''"
@click="tabClick(1)" @click="tabClick(1)"
> >
<div class="tabs-text">必修</div> <div class="tabs-text">必修</div>
<div class="tabs-line"></div> <div class="tabs-line"></div>
</div> </div>
<div <div
class="tabs-item" class="tabs-item"
:class="queryParams.type == 2 ? 'active' : ''" :class="queryParams.type == 2 ? 'active' : ''"
@click="tabClick(2)" @click="tabClick(2)"
> >
<div class="tabs-text">选修</div> <div class="tabs-text">选修</div>
<div class="tabs-line"></div> <div class="tabs-line"></div>
</div> </div>
<!-- </template> --> <!-- </template> -->
</div> </div>
<div style="display: flex"> <div style="display: flex">

1
vite.config.js
View File

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