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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-13 21:05:25 +08:00
parent a521ba7309
commit fa797444d8
3 changed files with 101 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/App.vue
View File

@@ -2,25 +2,25 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 17:28:10
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-13 18:56:24
* @LastEditTime: 2022-12-13 20:37:15
* @FilePath: /fe-stu/src/App.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<div id="container">
<!-- <div id="nav">-->
<!-- <router-link-->
<!-- v-for="item in routes"-->
<!-- :key="item.path"-->
<!-- :to="item.path"-->
<!-- :class="{-->
<!-- link: true,-->
<!-- active: name === item.name,-->
<!-- }"-->
<!-- >-->
<!-- {{ item.name }}-->
<!-- </router-link>-->
<!-- </div>-->
<div id="nav">
<router-link
v-for="item in routes"
:key="item.path"
:to="item.path"
:class="{
link: true,
active: name === item.name,
}"
>
{{ item.name }}
</router-link>
</div>
<main>
<router-view />
</main>
@@ -34,7 +34,7 @@ export default defineComponent({
const router = useRouter();
const route = useRoute();
console.log("router", router.getRoutes(), route);
console.log(import.meta.env.DEV)
console.log(import.meta.env.DEV);
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});

6
src/views/ballot/BallotPage.vue
View File

@@ -122,8 +122,7 @@
<div class="right">
<div class="righttitle">
<img
width="20px"
height="20px"
style="width: 20px; height: 20px"
src="../../assets/image/yuan.png"
/>
<div class="text">投票时间</div>
@@ -154,8 +153,7 @@
</div>
<div class="righttitle">
<img
width="20px"
height="20px"
style="width: 20px; height: 20px"
src="../../assets/image/yuan.png"
/>

167
vite.config.js
View File

@@ -2,96 +2,97 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 17:28:10
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-12 16:49:27
* @LastEditTime: 2022-12-13 20:49:00
* @FilePath: /fe-stu/vite.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import {defineConfig} from 'vite'
import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue'
import legacy from '@vitejs/plugin-legacy'
import {viteMockServe} from 'vite-plugin-mock'
import { viteMockServe } from 'vite-plugin-mock'
import topLevelAwait from "vite-plugin-top-level-await";
const path = require('path')
const url = 'http://localhost:30001'
export default defineConfig(({command}) =>
({
base: '/fe-student',
plugins: [
vue(),
// legacy({
// targets: ['chrome 64', 'defaults', 'not IE 11']
// }),
topLevelAwait({
promiseExportName: '__tla',
promiseImportName: i => `__tla_${i}`
}),
// viteMockServe({
// mockPath: './src/mock/mocks',
// })
],
resolve: {
alias: [
{find: '@', replacement: path.resolve(__dirname, 'src')}
]
},
server: {
proxy: {
'/file/upload': {
target: 'http://111.231.196.214:30001',
changeOrigin: true,
},
'/stu': {
target: url,
changeOrigin: true,
},
'/queryVoteSubmitDetailById': {
target: url,
changeOrigin: true,
},
'/work': {
target: url,
changeOrigin: true,
},
'/discuss': {
target: url,
changeOrigin: true,
},
'/discussSubmit': {
target: url,
changeOrigin: true,
},
'/comment': {
target: url,
changeOrigin: true,
},
'/vote': {
target: url,
changeOrigin: true,
},
'/admin': {
target: url,
changeOrigin: true,
}, '/activity': {
target: url,
changeOrigin: true,
}, '/liveBroadcast': {
target: url,
changeOrigin: true,
}, '/examination': {
target: url,
changeOrigin: true,
}, '/assessment': {
target: url,
changeOrigin: true,
}, '/workSubmit': {
target: url,
changeOrigin: true,
}, '/userbasic': {
target: 'https://u-pre.boe.com',
changeOrigin: true,
},
}
// const url = 'http://localhost:30001'
const url = 'http://111.231.196.214:12013/manageApi'
export default defineConfig(({ command }) =>
({
base: '/fe-student',
plugins: [
vue(),
// legacy({
// targets: ['chrome 64', 'defaults', 'not IE 11']
// }),
topLevelAwait({
promiseExportName: '__tla',
promiseImportName: i => `__tla_${i}`
}),
// viteMockServe({
// mockPath: './src/mock/mocks',
// })
],
resolve: {
alias: [
{ find: '@', replacement: path.resolve(__dirname, 'src') }
]
},
server: {
proxy: {
'/file/upload': {
target: 'http://111.231.196.214:30001',
changeOrigin: true,
},
'/stu': {
target: url,
changeOrigin: true,
},
'/queryVoteSubmitDetailById': {
target: url,
changeOrigin: true,
},
'/work': {
target: url,
changeOrigin: true,
},
'/discuss': {
target: url,
changeOrigin: true,
},
'/discussSubmit': {
target: url,
changeOrigin: true,
},
'/comment': {
target: url,
changeOrigin: true,
},
'/vote': {
target: url,
changeOrigin: true,
},
'/admin': {
target: url,
changeOrigin: true,
}, '/activity': {
target: url,
changeOrigin: true,
}, '/liveBroadcast': {
target: url,
changeOrigin: true,
}, '/examination': {
target: url,
changeOrigin: true,
}, '/assessment': {
target: url,
changeOrigin: true,
}, '/workSubmit': {
target: url,
changeOrigin: true,
}, '/userbasic': {
target: 'https://u-pre.boe.com',
changeOrigin: true,
},
}
})
}
})
)