feat:合并

This commit is contained in:
lixg
2022-12-14 20:56:22 +08:00
10 changed files with 71 additions and 27 deletions

11
.env Normal file
View File

@@ -0,0 +1,11 @@
VITE_BASE=/manage
VITE_BASE_API=/
VITE_PROXY_URL=http://111.231.196.214:30001/
VITE_LOGIN_URL=https://u-pre.boe.com/web
VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
VITE_BOE_API_URL=https://u-pre.boe.com

9
.env.boe Normal file
View File

@@ -0,0 +1,9 @@
VITE_BASE=/manage
VITE_BASE_API=/manageApi
VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
VITE_BOE_API_URL=https://u-pre.boe.com

8
.env.prod Normal file
View File

@@ -0,0 +1,8 @@
VITE_BASE=/fe-student-release
VITE_BASE_API=/manageApi-release
VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
VITE_BOE_API_URL=https://u.boe.com

10
.env.release Normal file
View File

@@ -0,0 +1,10 @@
VITE_BASE=/fe-student-release
VITE_BASE_API=/manageApi-release
VITE_LOGIN_URL=https://u.boe.com/web
VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
VITE_BOE_API_URL=https://u.boe.com

9
.env.test Normal file
View File

@@ -0,0 +1,9 @@
VITE_BASE=/fe-student
VITE_BASE_API=/manageApi
VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
VITE_BOE_API_URL=https://u-pre.boe.com

View File

@@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"serve": "vue-cli-service serve --mode boe",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},

View File

@@ -2,12 +2,13 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-14 18:56:46
* @LastEditTime: 2022-12-14 20:56:10
* @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import { message } from "ant-design-vue";
import axios from "axios";
import router from "@/router";
// import { getCookie } from '../api/method'
// const Qs = require("qs");
@@ -16,7 +17,7 @@ import axios from "axios";
axios.defaults.withCredentials = true;
const http = axios.create({
baseURL: "/manageApi",
baseURL: process.env.VITE_BASE_API,
timeout: 1000 * 15,
// headers: { "Content-Type": "multipart/form-data" },
headers: { "Content-Type": "application/json" },
@@ -56,8 +57,7 @@ http.interceptors.response.use(
return response;
} else {
if (code === 1000) {
// window.open("https://u-pre.boe.com/web/", '_self');
// window.open("http://111.231.196.214:12013/manage/login", '_self');
process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VITE_LOGIN_URL)
}
console.log("api %o", msg);
}

View File

@@ -23,7 +23,7 @@
</a-tree-select>
</template>
<script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
import {computed, defineEmits, defineProps} from "vue";
import {useStore} from "vuex";
const store = useStore();
@@ -33,16 +33,12 @@ const props = defineProps({
})
const emit = defineEmits({})
const options = ref([])
const options = computed(() => store.state.orgtreeList)
const id = computed(() => {
return props.value
})
onMounted(() => {
options.value = [...store.state.orgtreeList]
})
function change(key, obj) {
emit('update:name', obj[0])
emit('update:value', key)

View File

@@ -17,7 +17,7 @@ const routes = [
...routesConfig
]
const router = createRouter({
history: createWebHistory("/manage/"),
history: createWebHistory(process.env.VITE_BASE),
routes,
})

View File

@@ -6,22 +6,23 @@
* @FilePath: /fe-manage/vue.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
const { defineConfig } = require("@vue/cli-service");
const {defineConfig} = require("@vue/cli-service");
module.exports = defineConfig({
publicPath: "/manage",
// transpileDependencies: true,
devServer: {
port: 8080,
proxy: {
"/manageApi": {
target:"http://111.231.196.214:30001/",
changeOrigin: true, //表示是否改变原域名
// secure: false,
// ws: false, //表示WebSocket协议
pathRewrite: {
"^/manageApi": "",
publicPath: "/manage",
// transpileDependencies: true,
devServer: {
port: 8080,
proxy: {
"/manageApi": {
target: process.env.VITE_PROXY_URL,
changeOrigin: true, //表示是否改变原域名
// secure: false,
// ws: false, //表示WebSocket协议
pathRewrite: {
"^/manageApi": "",
},
},
},
},
},
},
});