From 5c6abd7b8b593ffb64cc1446bb62fd39e451468b Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 20:56:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 135 ++++++++++++++++++++++++++------------------------- 1 file changed, 69 insertions(+), 66 deletions(-) diff --git a/package.json b/package.json index 026679be..85cb3cf5 100644 --- a/package.json +++ b/package.json @@ -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 --mode boe", + "boe": "vue-cli-service build --mode boe", + "release": "vue-cli-service build --mode release", + "prod": "vue-cli-service build --mode prod", + "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" + ] } From d8c63030f8db90bc57e39b6803f5cef734df7433 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 20:57:25 +0800 Subject: [PATCH 2/8] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 85cb3cf5..be5848db 100644 --- a/package.json +++ b/package.json @@ -5,10 +5,10 @@ "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build --mode boe", - "boe": "vue-cli-service build --mode boe", - "release": "vue-cli-service build --mode release", - "prod": "vue-cli-service build --mode prod", - "test": "vue-cli-service build --mode test" + "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", From 635cf2040ff6f6d7bb157054254d407bc7947a24 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 20:57:40 +0800 Subject: [PATCH 3/8] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index be5848db..f694a453 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "serve": "vue-cli-service serve", - "build": "vue-cli-service build --mode boe", + "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", From 2264a83499eef6bb9712c7c761606180fddc97ca Mon Sep 17 00:00:00 2001 From: zhangyc Date: Wed, 14 Dec 2022 21:00:49 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 56 +++++++++++--------- src/views/learningpath/LevelAdd.vue | 16 +++--- src/views/learningpath/LevelAddDetail.vue | 16 +++--- src/views/projectcenter/ProjectManage.vue | 16 +++--- src/views/projectcenter/TaskPage.vue | 29 +++++----- 5 files changed, 72 insertions(+), 61 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 5692e525..7fe0a2fb 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -75,7 +75,7 @@ @@ -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, diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 644ef532..f5ee9805 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -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", diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 91f232bd..5092963e 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -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", diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 1a45eade..71da6cc4 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -47,12 +47,7 @@
创建时间：
{ diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index bafc50b7..dc01134e 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -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" }, //引入的插槽 From dbe1a9b0cd000b8a25c095342046742ad5bf4546 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 21:08:37 +0800 Subject: [PATCH 5/8] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 06a891d8..1cc53141 100644 --- a/.env +++ b/.env @@ -4,8 +4,5 @@ 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 \ No newline at end of file +VITE_IFRAME_URL=https://u.boe.com/pc-release/iframe +VITE_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading From a542608dfecde337490c765e95b7b45a36a57c4a Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 21:11:15 +0800 Subject: [PATCH 6/8] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 ++-- .env.boe | 5 ----- .env.prod | 5 ----- .env.release | 7 ++----- .env.test | 5 ----- src/api/method.js | 4 ++-- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/.env b/.env index 1cc53141..36b945cf 100644 --- a/.env +++ b/.env @@ -4,5 +4,5 @@ VITE_PROXY_URL=http://111.231.196.214:30001/ VITE_LOGIN_URL=https://u-pre.boe.com/web -VITE_IFRAME_URL=https://u.boe.com/pc-release/iframe -VITE_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading +VITE_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe +VITE_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading diff --git a/.env.boe b/.env.boe index ef2ad7d6..bb43a342 100644 --- a/.env.boe +++ b/.env.boe @@ -2,8 +2,3 @@ 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 \ No newline at end of file diff --git a/.env.prod b/.env.prod index 6671831e..9408d62f 100644 --- a/.env.prod +++ b/.env.prod @@ -1,8 +1,3 @@ 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 \ No newline at end of file diff --git a/.env.release b/.env.release index 05c6e5c4..232a2d91 100644 --- a/.env.release +++ b/.env.release @@ -3,8 +3,5 @@ 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 \ No newline at end of file +VITE_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe +VITE_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading \ No newline at end of file diff --git a/.env.test b/.env.test index 6f9f2122..f0cece9d 100644 --- a/.env.test +++ b/.env.test @@ -2,8 +2,3 @@ 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 \ No newline at end of file diff --git a/src/api/method.js b/src/api/method.js index 401b7d1d..f0731ba7 100644 --- a/src/api/method.js +++ b/src/api/method.js @@ -276,9 +276,9 @@ const commonData = { const organizationalTree = [] //嵌套页面 -const iframeUrl = "https://u-pre.boe.com/pc/iframe" +const iframeUrl = process.env.VITE_IFRAME_URL //学员端路由 -const studentUrl = 'https://u-pre.boe.com/pc/loading' +const studentUrl = process.env.VITE_IFRAME_STUDENT_URL //二维码 const codeUrl = "https://u-pre.boe.com" From 62253c8be90391e32620fbb61bb67cfe5f4a0abd Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 21:12:15 +0800 Subject: [PATCH 7/8] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 5 ++--- .env.release | 2 +- .env.test | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.env.prod b/.env.prod index 9408d62f..e299d053 100644 --- a/.env.prod +++ b/.env.prod @@ -1,3 +1,2 @@ -VITE_BASE=/fe-student-release -VITE_BASE_API=/manageApi-release - +VITE_BASE=/manage +VITE_BASE_API=/manageApi \ No newline at end of file diff --git a/.env.release b/.env.release index 232a2d91..baa9e606 100644 --- a/.env.release +++ b/.env.release @@ -1,4 +1,4 @@ -VITE_BASE=/fe-student-release +VITE_BASE=/manage-release VITE_BASE_API=/manageApi-release VITE_LOGIN_URL=https://u.boe.com/web diff --git a/.env.test b/.env.test index f0cece9d..bb43a342 100644 --- a/.env.test +++ b/.env.test @@ -1,4 +1,4 @@ -VITE_BASE=/fe-student +VITE_BASE=/manage VITE_BASE_API=/manageApi From 12c3a1ce72b236458afced80ea6f70421bdb70c8 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 21:21:58 +0800 Subject: [PATCH 8/8] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 12 ++++++------ .env.boe | 4 ++-- .env.prod | 4 ++-- .env.release | 10 +++++----- .env.test | 4 ++-- src/api/config.js | 4 ++-- src/api/method.js | 4 ++-- src/router/index.js | 2 +- vue.config.js | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.env b/.env index 36b945cf..75716181 100644 --- a/.env +++ b/.env @@ -1,8 +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_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe -VITE_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading +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 diff --git a/.env.boe b/.env.boe index bb43a342..6991e05f 100644 --- a/.env.boe +++ b/.env.boe @@ -1,4 +1,4 @@ -VITE_BASE=/manage -VITE_BASE_API=/manageApi +VUE_APP_BASE=/manage +VUE_APP_BASE_API=/manageApi diff --git a/.env.prod b/.env.prod index e299d053..2e9213ab 100644 --- a/.env.prod +++ b/.env.prod @@ -1,2 +1,2 @@ -VITE_BASE=/manage -VITE_BASE_API=/manageApi \ No newline at end of file +VUE_APP_BASE=/manage +VUE_APP_BASE_API=/manageApi \ No newline at end of file diff --git a/.env.release b/.env.release index baa9e606..4cd4f868 100644 --- a/.env.release +++ b/.env.release @@ -1,7 +1,7 @@ -VITE_BASE=/manage-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_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe -VITE_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading \ No newline at end of file +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 \ No newline at end of file diff --git a/.env.test b/.env.test index bb43a342..6991e05f 100644 --- a/.env.test +++ b/.env.test @@ -1,4 +1,4 @@ -VITE_BASE=/manage -VITE_BASE_API=/manageApi +VUE_APP_BASE=/manage +VUE_APP_BASE_API=/manageApi diff --git a/src/api/config.js b/src/api/config.js index 87b1987b..31bdeadc 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -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); } diff --git a/src/api/method.js b/src/api/method.js index f0731ba7..98913705 100644 --- a/src/api/method.js +++ b/src/api/method.js @@ -276,9 +276,9 @@ const commonData = { const organizationalTree = [] //嵌套页面 -const iframeUrl = process.env.VITE_IFRAME_URL +const iframeUrl = process.env.VUE_APP_IFRAME_URL //学员端路由 -const studentUrl = process.env.VITE_IFRAME_STUDENT_URL +const studentUrl = process.env.VUE_APP_IFRAME_STUDENT_URL //二维码 const codeUrl = "https://u-pre.boe.com" diff --git a/src/router/index.js b/src/router/index.js index 18acace6..f376229f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -17,7 +17,7 @@ const routes = [ ...routesConfig ] const router = createRouter({ - history: createWebHistory(process.env.VITE_BASE), + history: createWebHistory(process.env.VUE_APP_BASE), routes, }) diff --git a/vue.config.js b/vue.config.js index 55ec18eb..369c1aa0 100644 --- a/vue.config.js +++ b/vue.config.js @@ -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协议