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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-14 23:16:49 +08:00
parent 6cf0aacec0 12c3a1ce72
commit 8804507d97
15 changed files with 164 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.env
View File

@@ -1,11 +1,8 @@
VITE_BASE=/manage
VITE_BASE_API=/
VITE_PROXY_URL=http://111.231.196.214:30001/
VITE_LOGIN_URL=https://u-pre.boe.com/web
VUE_APP_BASE=/manage
VUE_APP_BASE_API=/manageApi
VUE_APP_PROXY_URL=http://111.231.196.214:30001/
VUE_APP_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
VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe
VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading

9
.env.boe
View File

@@ -1,9 +1,4 @@
VITE_BASE=/manage
VITE_BASE_API=/manageApi
VUE_APP_BASE=/manage
VUE_APP_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

10
.env.prod
View File

@@ -1,8 +1,2 @@
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
VUE_APP_BASE=/manage
VUE_APP_BASE_API=/manageApi

13
.env.release
View File

@@ -1,10 +1,7 @@
VITE_BASE=/fe-student-release
VITE_BASE_API=/manageApi-release
VITE_LOGIN_URL=https://u.boe.com/web
VUE_APP_BASE=/manage-release
VUE_APP_BASE_API=/manageApi-release
VUE_APP_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
VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe
VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading

9
.env.test
View File

@@ -1,9 +1,4 @@
VITE_BASE=/fe-student
VITE_BASE_API=/manageApi
VUE_APP_BASE=/manage
VUE_APP_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

135
package.json
View File

@@ -1,68 +1,71 @@
{
"name": "fe_manage",
"version": "0.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --mode boe",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"dependencies": {
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"ant-design-vue": "^3.2.12",
"axios": "^1.1.3",
"core-js": "^3.8.3",
"dayjs": "^1.11.6",
"element-plus": "^2.2.17",
"element-resize-detector": "^1.2.4",
"html2canvas": "^1.4.1",
"jquery": "^3.6.1",
"mitt": "^3.0.0",
"moment": "^2.29.4",
"qrcode.vue": "^3.3.3",
"qs": "^6.11.0",
"sortablejs": "^1.15.0",
"vue": "^3.2.13",
"vue-router": "^4.0.3",
"vuedraggable": "^4.1.0",
"vuex": "^4.0.0"
},
"devDependencies": {
"@babel/core": "^7.12.16",
"@babel/eslint-parser": "^7.12.16",
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-eslint": "~5.0.0",
"@vue/cli-plugin-router": "~5.0.0",
"@vue/cli-plugin-vuex": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^8.0.3",
"sass": "^1.32.7",
"sass-loader": "^12.0.0"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/vue3-essential",
"eslint:recommended"
],
"parserOptions": {
"parser": "@babel/eslint-parser"
},
"rules": {
"no-console": "off",
"no-debugger": "off",
"no-mixed-spaces-and-tabs": "off"
}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead",
"not ie 11"
]
"name": "fe_manage",
"version": "0.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"build:boe": "vue-cli-service build --mode boe",
"build:release": "vue-cli-service build --mode release",
"build:prod": "vue-cli-service build --mode prod",
"build:test": "vue-cli-service build --mode test"
},
"dependencies": {
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"ant-design-vue": "^3.2.12",
"axios": "^1.1.3",
"core-js": "^3.8.3",
"dayjs": "^1.11.6",
"element-plus": "^2.2.17",
"element-resize-detector": "^1.2.4",
"html2canvas": "^1.4.1",
"jquery": "^3.6.1",
"mitt": "^3.0.0",
"moment": "^2.29.4",
"qrcode.vue": "^3.3.3",
"qs": "^6.11.0",
"sortablejs": "^1.15.0",
"vue": "^3.2.13",
"vue-router": "^4.0.3",
"vuedraggable": "^4.1.0",
"vuex": "^4.0.0"
},
"devDependencies": {
"@babel/core": "^7.12.16",
"@babel/eslint-parser": "^7.12.16",
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-eslint": "~5.0.0",
"@vue/cli-plugin-router": "~5.0.0",
"@vue/cli-plugin-vuex": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^8.0.3",
"sass": "^1.32.7",
"sass-loader": "^12.0.0"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/vue3-essential",
"eslint:recommended"
],
"parserOptions": {
"parser": "@babel/eslint-parser"
},
"rules": {
"no-console": "off",
"no-debugger": "off",
"no-mixed-spaces-and-tabs": "off"
}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead",
"not ie 11"
]
}

4
src/api/config.js
View File

@@ -17,7 +17,7 @@ import router from "@/router";
axios.defaults.withCredentials = true;
const http = axios.create({
baseURL: process.env.VITE_BASE_API,
baseURL: process.env.VUE_APP_BASE_API,
timeout: 1000 * 15,
// headers: { "Content-Type": "multipart/form-data" },
headers: { "Content-Type": "application/json" },
@@ -57,7 +57,7 @@ http.interceptors.response.use(
return response;
} else {
if (code === 1000) {
process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VITE_LOGIN_URL)
process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
}
console.log("api %o", msg);
}

4
src/api/method.js
View File

@@ -276,9 +276,9 @@ const commonData = {
const organizationalTree = []
//嵌套页面
const iframeUrl = "https://u-pre.boe.com/pc/iframe"
const iframeUrl = process.env.VUE_APP_IFRAME_URL
//学员端路由
const studentUrl = 'https://u-pre.boe.com/pc/loading'
const studentUrl = process.env.VUE_APP_IFRAME_STUDENT_URL
//二维码
const codeUrl = "https://u-pre.boe.com"

2
src/router/index.js
View File

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

56
src/views/courselibrary/CoursewareManage.vue
View File

@@ -75,7 +75,7 @@
<a-range-picker
v-model:value="projectTime"
style="width: 420px"
valueFormat="X"
format="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
@@ -2958,26 +2958,26 @@ const columns1 = [
return text ? text : "-";
},
},
{
title: "学习人数",
width: 130,
dataIndex: "stunum",
key: "4",
align: "center",
customRender: ({ text }) => {
return text ? text : "0";
},
},
{
title: "评分",
width: 130,
dataIndex: "grade",
key: "5",
align: "center",
customRender: ({ text }) => {
return text ? text : "0";
},
},
// {
// title: "学习人数",
// width: 130,
// dataIndex: "stunum",
// key: "4",
// align: "center",
// customRender: ({ text }) => {
// // return text ? text : "0";
// },
// },
// {
// title: "评分",
// width: 130,
// dataIndex: "grade",
// key: "5",
// align: "center",
// customRender: ({ text }) => {
// return text ? text : "0";
// },
// },
{
title: "状态",
width: 130,
@@ -3632,7 +3632,7 @@ export default defineComponent({
imageUrl: "",
imgList: [],
validate: false,
validate:true,
pageSize2: 10,
currentPage2: 0,
@@ -3984,8 +3984,16 @@ export default defineComponent({
let startTime = "";
let endTime = "";
if (state.projectTime) {
startTime = state.projectTime[0];
endTime = state.projectTime[1];
startTime = toDate(
new Date(state.projectTime[0].$d).getTime() / 1000,
"Y-M-D"
);
endTime = toDate(
new Date(state.projectTime[1].$d).getTime() / 1000,
"Y-M-D"
);
}
let res = await list({
pageNo: state.currentPage1,

16
src/views/learningpath/LevelAdd.vue
View File

@@ -1499,14 +1499,14 @@ export default {
align: "center",
className: "h",
},
// {
// title: "进度",
// dataIndex: "jin",
// key: "jin",
// width: 110,
// align: "center",
// className: "h",
// },
{
title: "进度",
dataIndex: "jin",
key: "jin",
width: 110,
align: "center",
className: "h",
},
{
title: "开始时间",
dataIndex: "time",

16
src/views/learningpath/LevelAddDetail.vue
View File

@@ -1547,14 +1547,14 @@ export default {
align: "center",
className: "h",
},
// {
// title: "进度",
// dataIndex: "jin",
// key: "jin",
// width: 110,
// align: "center",
// className: "h",
// },
{
title: "进度",
dataIndex: "jin",
key: "jin",
width: 110,
align: "center",
className: "h",
},
{
title: "开始时间",
dataIndex: "time",

16
src/views/projectcenter/ProjectManage.vue
View File

@@ -47,12 +47,7 @@
<div class="addTime">创建时间：</div>
<a-range-picker
v-model:value="searchParam.valueDate"
:show-time="{
defaultValue: [
moment('00:00:00', 'HH:mm:ss'),
moment('23:59:59', 'HH:mm:ss'),
],
}"
format="YYYY-MM-DD"
style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']"
valueFormat="X"
@@ -832,6 +827,7 @@ import * as moment from "moment";
import { changeOwnership } from "@/api/method";
import NameInput from "@/components/project/NameInput";
import { validateName } from "@/api/index1";
import { toDate } from "../../api/method";
export default {
name: "projectManage",
@@ -1701,12 +1697,16 @@ export default {
beginTime:
state.searchParam.valueDate &&
state.searchParam.valueDate.length === 2
? state.searchParam.valueDate[0]
? toDate(
new Date(state.searchParam.valueDate[0].$d).getTime() / 1000,
"Y-M-D")
: "",
endTime:
state.searchParam.valueDate &&
state.searchParam.valueDate.length === 2
? state.searchParam.valueDate[1]
? toDate(
new Date(state.searchParam.valueDate[1].$d).getTime() / 1000,
"Y-M-D")
: "",
})
.then((res) => {

29
src/views/projectcenter/TaskPage.vue
View File

@@ -3108,7 +3108,7 @@ export default {
title: "姓名",
dataIndex: "name",
key: "name",
// width: 30,
width:"20%",
align: "left",
className: "h",
// scopedSlots: { customRender: "action" }, //引入的插槽
@@ -3145,9 +3145,10 @@ export default {
title: "部门",
dataIndex: "bum",
key: "bum",
// width: 50,
width:"10%",
align: "center",
className: "h",
ellipsis: true,
},
// {
// title: "岗位",
@@ -3165,14 +3166,15 @@ export default {
// align: "center",
// className: "h",
// },
// {
// title: "进度",
// dataIndex: "progress",
// key: "progress",
// width: 30,
// align: "center",
// className: "h",
// },
{
title: "进度",
dataIndex: "progress",
key: "progress",
width:"10%",
align: "center",
className: "h",
ellipsis: true,
},
// {
// title: "证书",
// dataIndex: "diploma",
@@ -3185,7 +3187,7 @@ export default {
title: "最近学习时间",
dataIndex: "stutime",
key: "stutime",
// width: 50,
width:"20%",
align: "center",
className: "h",
// sorter: {
@@ -3197,15 +3199,16 @@ export default {
title: "加入方式",
dataIndex: "putin",
key: "putin",
// width: 40,
width:"10%",
align: "center",
className: "h",
ellipsis: true,
},
{
title: "操作",
dataIndex: "operation",
key: "operation",
// width: 60,
width:"20%",
align: "center",
className: "h",
scopedSlots: { customRender: "action" }, //引入的插槽

2
vue.config.js
View File

@@ -15,7 +15,7 @@ module.exports = defineConfig({
port: 8080,
proxy: {
"/manageApi": {
target: process.env.VITE_PROXY_URL,
target: process.env.VUE_APP_PROXY_URL,
changeOrigin: true, //表示是否改变原域名
// secure: false,
// ws: false, //表示WebSocket协议