hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-11 20:06:49 +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-26 21:07:48 +08:00
parent eb7af49150 c548b3cc18
commit 84084b2ecd
3 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,22 +27,24 @@
</div> </div>
<div class="nav"> <div class="nav">
<div class="tabs"> <div class="tabs">
<div <template v-if="selectGrowth.electiveTaskNum !== 0">
class="tabs-item" <div
:class="queryParams.type == 1 ? 'active' : ''" class="tabs-item"
@click="tabClick(1)" :class="queryParams.type == 1 ? 'active' : ''"
> @click="tabClick(1)"
<div class="tabs-text">必修</div> >
<div class="tabs-line"></div> <div class="tabs-text">必修</div>
</div> <div class="tabs-line"></div>
<div </div>
class="tabs-item" <div
:class="queryParams.type == 2 ? 'active' : ''" class="tabs-item"
@click="tabClick(2)" :class="queryParams.type == 2 ? 'active' : ''"
> @click="tabClick(2)"
<div class="tabs-text">选修</div> >
<div class="tabs-line"></div> <div class="tabs-text">选修</div>
</div> <div class="tabs-line"></div>
</div>
</template>
</div> </div>
<div style="display: flex"> <div style="display: flex">
<el-select <el-select
@@ -558,7 +560,9 @@ const getList = () => {
// 专业力必修列表 // 专业力必修列表
const growthList = ref([]); const growthList = ref([]);
// 当前浏览的专业力必修任务 // 当前浏览的专业力必修任务
const selectGrowth = ref({}); const selectGrowth = ref({
electiveTaskNum: 0,
});
// 切换专业力必修 // 切换专业力必修
const dropdownRef = ref(null); const dropdownRef = ref(null);
const select = (item) => { const select = (item) => {
@@ -1103,8 +1107,8 @@ function toOffcoursePlanPage(item) {
margin-top: 20px; margin-top: 20px;
background-image: url(../../assets/image/growth/task-type.png); background-image: url(../../assets/image/growth/task-type.png);
background-size: 100% 100%; background-size: 100% 100%;
width: 70px; width: 50px;
height: 28px; height: 22px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

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

@@ -29,22 +29,24 @@
<el-affix :offset="0"> <el-affix :offset="0">
<div class="nav"> <div class="nav">
<div class="tabs"> <div class="tabs">
<div <template v-if="selectGrowth.electiveTaskNum !== 0">
class="tabs-item" <div
:class="queryParams.type == 1 ? 'active' : ''" class="tabs-item"
@click="tabClick(1)" :class="queryParams.type == 1 ? 'active' : ''"
> @click="tabClick(1)"
<div class="tabs-text">必修</div> >
<div class="tabs-line"></div> <div class="tabs-text">必修</div>
</div> <div class="tabs-line"></div>
<div </div>
class="tabs-item" <div
:class="queryParams.type == 2 ? 'active' : ''" class="tabs-item"
@click="tabClick(2)" :class="queryParams.type == 2 ? 'active' : ''"
> @click="tabClick(2)"
<div class="tabs-text">选修</div> >
<div class="tabs-line"></div> <div class="tabs-text">选修</div>
</div> <div class="tabs-line"></div>
</div>
</template>
</div> </div>
<div style="display: flex"> <div style="display: flex">
<el-select <el-select
@@ -109,22 +111,24 @@
<template v-if="selectGrowth.template == 2"> <template v-if="selectGrowth.template == 2">
<div class="nav"> <div class="nav">
<div class="tabs"> <div class="tabs">
<div <template v-if="selectGrowth.electiveTaskNum !== 0">
class="tabs-item" <div
:class="queryParams.type == 1 ? 'active' : ''" class="tabs-item"
@click="tabClick(1)" :class="queryParams.type == 1 ? 'active' : ''"
> @click="tabClick(1)"
<div class="tabs-text">必修</div> >
<div class="tabs-line"></div> <div class="tabs-text">必修</div>
</div> <div class="tabs-line"></div>
<div </div>
class="tabs-item" <div
:class="queryParams.type == 2 ? 'active' : ''" class="tabs-item"
@click="tabClick(2)" :class="queryParams.type == 2 ? 'active' : ''"
> @click="tabClick(2)"
<div class="tabs-text">选修</div> >
<div class="tabs-line"></div> <div class="tabs-text">选修</div>
</div> <div class="tabs-line"></div>
</div>
</template>
</div> </div>
<div style="display: flex"> <div style="display: flex">
<el-select <el-select
@@ -385,7 +389,9 @@ const getList = () => {
// 专业力必修列表 // 专业力必修列表
const growthList = ref([]); const growthList = ref([]);
// 当前浏览的专业力必修任务 // 当前浏览的专业力必修任务
const selectGrowth = ref({}); const selectGrowth = ref({
electiveTaskNum: 0,
});
// 切换专业力必修 // 切换专业力必修
const dropdownRef = ref(null); const dropdownRef = ref(null);
const select = (item) => { const select = (item) => {

18
vite.config.js
View File

@@ -38,16 +38,16 @@ export default defineConfig(({ command, mode }) =>
}, },
server: { server: {
proxy: { proxy: {
"/professional": { // "/professional": {
// target: 'http://192.168.16.195:32002', // // target: 'http://192.168.16.195:32002',
// target: 'http://192.168.150.97:32002', // // target: 'http://192.168.150.97:32002',
target: 'http://192.168.31.211:32002', // target: 'http://192.168.31.211:32002',
changeOrigin: true,
},
// '/growth': {
// target: 'https://u-pre.boe.com',
// changeOrigin: true, // changeOrigin: true,
// }, // },
'/growth': {
target: 'https://u-pre.boe.com',
changeOrigin: true,
},
'/file/upload': { '/file/upload': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true, changeOrigin: true,