diff --git a/src/api/config.js b/src/api/config.js index 90d5a99d..f545226a 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -1,3 +1,11 @@ +/* + * @Author: lixg lixg@dongwu-inc.com + * @Date: 2022-11-21 14:32:52 + * @LastEditors: lixg lixg@dongwu-inc.com + * @LastEditTime: 2022-11-21 15:13:50 + * @FilePath: /fe-manage/src/api/config.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ import axios from "axios"; // const Qs = require("qs"); @@ -7,7 +15,7 @@ import axios from "axios"; axios.defaults.withCredentials = true; const http = axios.create({ - baseURL: "/api", + baseURL: "/manageApi", timeout: 1000 * 5, // headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "application/json" }, diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index c4cb108c..93fa3e24 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -34,8 +34,8 @@ export default { console.log("new:" + n + ",old:" + o); if ( - n.indexOf("/learningpath") !== -1 || - n.indexOf("/LearningPath") !== -1 + n.indexOf("/manage/learningpath") !== -1 || + n.indexOf("/manage/LearningPath") !== -1 ) { state.list = [ { @@ -45,11 +45,14 @@ export default { }, ]; } - if (n.indexOf("/leveladd") !== -1 || n.indexOf("/LevelAdd") !== -1) { + if ( + n.indexOf("/manage/leveladd") !== -1 || + n.indexOf("/manage/LevelAdd") !== -1 + ) { state.list = [ { name: "学习路径", - href: "/learningpath", + href: "/manage/learningpath", }, { name: "管理", @@ -57,17 +60,17 @@ export default { ]; } if ( - n.indexOf("/leveladddetail") !== -1 || - n.indexOf("/LevelAddDetail") !== -1 + n.indexOf("/manage/leveladddetail") !== -1 || + n.indexOf("/manage/LevelAddDetail") !== -1 ) { state.list = [ { name: "学习路径", - href: "/learningpath", + href: "/manage/learningpath", }, { name: "管理", - href: "/leveladd", + href: "/manage/leveladd", }, { name: "创建关卡", @@ -75,17 +78,17 @@ export default { ]; } if ( - n.indexOf("/levelcheck") !== -1 || - n.indexOf("/LevelCheck") !== -1 + n.indexOf("/manage/levelcheck") !== -1 || + n.indexOf("/manage/LevelCheck") !== -1 ) { state.list = [ { name: "学习路径", - href: "/learningpath", + href: "/manage/learningpath", }, { name: "管理", - href: "/leveladd", + href: "/manage/leveladd", }, { name: "查看", @@ -93,8 +96,8 @@ export default { ]; } if ( - n.indexOf("/projectmanage") !== -1 || - n.indexOf("/ProjectManage") !== -1 + n.indexOf("/manage/projectmanage") !== -1 || + n.indexOf("/manage/ProjectManage") !== -1 ) { state.list = [ { @@ -109,20 +112,23 @@ export default { ]; } if ( - n.indexOf("/projectadd") !== -1 || - n.indexOf("/ProjectAdd") !== -1 + n.indexOf("/manage/projectadd") !== -1 || + n.indexOf("/manage/ProjectAdd") !== -1 ) { state.list = [ { name: "项目", - href: "/projectmanage", + href: "/manage/projectmanage", }, { name: "创建项目", }, ]; } - if (n.indexOf("/taskpage") !== -1 || n.indexOf("/TaskPage") !== -1) { + if ( + n.indexOf("/manage/taskpage") !== -1 || + n.indexOf("/manage/TaskPage") !== -1 + ) { state.list = [ { name: "项目", @@ -133,7 +139,10 @@ export default { }, ]; } - if (n.indexOf("/taskadd") !== -1 || n.indexOf("/TaskAdd") !== -1) { + if ( + n.indexOf("/manage/taskadd") !== -1 || + n.indexOf("/manage/TaskAdd") !== -1 + ) { state.list = [ { name: "项目", @@ -151,8 +160,8 @@ export default { ]; } if ( - n.indexOf("/templatelibrary") !== -1 || - n.indexOf("/TemplateLibrary") !== -1 + n.indexOf("/manage/templatelibrary") !== -1 || + n.indexOf("/manage/TemplateLibrary") !== -1 ) { state.list = [ { @@ -164,8 +173,8 @@ export default { ]; } if ( - n.indexOf("/libraryadd") !== -1 || - n.indexOf("/LibraryAdd") !== -1 + n.indexOf("/manage/libraryadd") !== -1 || + n.indexOf("/manage/LibraryAdd") !== -1 ) { state.list = [ { @@ -176,13 +185,13 @@ export default { }, { name: "查看", - href: "/libraryadd", + href: "/manage/libraryadd", }, ]; } if ( - n.indexOf("/coursemanage") !== -1 || - n.indexOf("/CourseManage") !== -1 + n.indexOf("/manage/coursemanage") !== -1 || + n.indexOf("/manage/CourseManage") !== -1 ) { state.list = [ { @@ -197,8 +206,8 @@ export default { ]; } if ( - n.indexOf("/coursewaremanage") !== -1 || - n.indexOf("/CoursewareManage") !== -1 + n.indexOf("/manage/coursewaremanage") !== -1 || + n.indexOf("/manage/CoursewareManage") !== -1 ) { state.list = [ { @@ -210,8 +219,8 @@ export default { ]; } if ( - n.indexOf("/researchmanage") !== -1 || - n.indexOf("/ResearchManage") !== -1 + n.indexOf("/manage/researchmanage") !== -1 || + n.indexOf("/manage/ResearchManage") !== -1 ) { state.list = [ { @@ -222,8 +231,8 @@ export default { ]; } if ( - n.indexOf("/managepage") !== -1 || - n.indexOf("/ManagePage") !== -1 + n.indexOf("/manage/managepage") !== -1 || + n.indexOf("/manage/ManagePage") !== -1 ) { state.list = [ { @@ -238,8 +247,8 @@ export default { } if ( - n.indexOf("/researchadd") !== -1 || - n.indexOf("/ResearchAdd") !== -1 + n.indexOf("/manage/researchadd") !== -1 || + n.indexOf("/manage/ResearchAdd") !== -1 ) { state.list = [ { @@ -254,8 +263,8 @@ export default { } if ( - n.indexOf("/certificatecenter") !== -1 || - n.indexOf("/CertificateCenter") !== -1 + n.indexOf("/manage/certificatecenter") !== -1 || + n.indexOf("/manage/CertificateCenter") !== -1 ) { state.list = [ { @@ -264,8 +273,8 @@ export default { ]; } if ( - n.indexOf("/systemmanage") !== -1 || - n.indexOf("/SystemManage") !== -1 + n.indexOf("/manage/systemmanage") !== -1 || + n.indexOf("/manage/SystemManage") !== -1 ) { state.list = [ { @@ -274,8 +283,8 @@ export default { ]; } if ( - n.indexOf("/coursereviewed") !== -1 || - n.indexOf("/CourseReiewed") !== -1 + n.indexOf("/manage/coursereviewed") !== -1 || + n.indexOf("/manage/CourseReiewed") !== -1 ) { state.list = [ { @@ -287,8 +296,8 @@ export default { ]; } if ( - n.indexOf("/coursereviewedn") !== -1 || - n.indexOf("/CourseReiewedN") !== -1 + n.indexOf("/manage/coursereviewedn") !== -1 || + n.indexOf("/manage/CourseReiewedN") !== -1 ) { state.list = [ { @@ -300,8 +309,8 @@ export default { ]; } if ( - n.indexOf("/projectreviewed") !== -1 || - n.indexOf("/ProjectReviewed") !== -1 + n.indexOf("/manage/projectreviewed") !== -1 || + n.indexOf("/manage/ProjectReviewed") !== -1 ) { state.list = [ { @@ -313,8 +322,8 @@ export default { ]; } if ( - n.indexOf("/projectreviewedn") !== -1 || - n.indexOf("/ProjectReviewedN") !== -1 + n.indexOf("/manage/projectreviewedn") !== -1 || + n.indexOf("/manage/ProjectReviewedN") !== -1 ) { state.list = [ { diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue index 4f7d1646..3cf72955 100644 --- a/src/components/vote/CreateVote.vue +++ b/src/components/vote/CreateVote.vue @@ -1,12 +1,20 @@ diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 29c15a0a..6902fb23 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -149,7 +149,7 @@ - +
- +
返回
@@ -321,8 +321,8 @@ - -
@@ -62,7 +62,7 @@ + } + }) + .catch((err) => { + console.log(err); + message.destroy(); + message.error("创建失败,请检查当前网络状态。"); + }); + } + }; + + return { + ...toRefs(state), + projectName, + classifyList, + classificationChange, + classificationChange1, + classificationChange2, + classificationChange3, + classificationChange4, + classificationChange5, + fileList, + fileList1, + loading, + imageUrl, + handleChange, + handleChange1, + beforeUpload, + beforeUpload1, + onRangeChange, + classifyList1, + classifyList2, + classifyList3, + classifyList4, + classifyList5, + remark, + changeChecked, + changeChecked1, + uplodaFileCount, + createProject, + removeFile, + + isEdit, + backPage, + dateFormatList, + + templateScroll, + }; + }, +}; + + + // 修改 antd upload 样式 + .ant-upload { + border-width: 0px; + } + + .content { + display: flex; + + .main { + width: 50%; + display: flex; + flex-direction: column; + align-items: center; + //justify-content: center; + float: left; + border-right: 1px solid rgba(153, 155, 163, 0.3); + + .name { + width: 78%; + // background-color: lightcoral; + display: flex; + margin-top: 20px; + align-items: center; + + //height: 40px; + // border: 1px solid black; + .namebox { + width: 120px; + display: flex; + align-items: center; + justify-content: flex-end; + flex-shrink: 0; + + .nameimg { + width: 10px; + height: 10px; + } + } + + .d { + margin-top: 8px; + font-size: 25px; + color: #ff4e4e; + } + + .box { + position: relative; + margin-left: 14px; + + .box1 { + position: absolute; + left: 50%; + top: 50%; + width: 50px; + margin-left: -25px; + margin-top: -5px; + border-top: 2px solid rgba(78, 166, 255, 1); + } + + .box2 { + position: absolute; + left: 50%; + top: 50%; + height: 50px; + //margin-left: -5px; + margin-top: -25px; + border-left: 2px solid rgba(78, 166, 255, 1); + } + } + + .inname { + color: #6f6f6f; + font-size: 14px; + margin-left: 7px; + } + + .in { + margin-left: 14px; + flex: 1; + + // .ant-radio-wrapper { + // } + .ant-input-textarea-show-count { + position: relative; + height: 88px; + } + + .ant-input-textarea-show-count::after { + position: absolute; + right: 10px; + bottom: 0px; + } + + .ant-input { + border-radius: 8px; + // height: 120%; + width: 100%; + height: 40px; + } + + .ant-input-affix-wrapper { + padding: 0 11px; + border-radius: 8px; + } + + .ant-select-selector { + border-radius: 5px; + // height: 120%; + width: 100%; + // height: 40px; + } + } + + .filebox { + margin-left: 14px; + flex: 1; + + .fileimg { + width: 15px; + height: 15px; + margin-right: 6px; + } + + .filetext { + font-size: 14px; + font-weight: 400; + color: #4ea6ff; + line-height: 36px; + } + + .support { + font-size: 14px; + font-weight: 400; + color: #999ba3; + line-height: 36px; + margin-top: 8px; + word-break: break-all; + } + } + } + + .name2 { + display: flex; + align-items: flex-start; + + .ant-input-textarea { + .ant-input { + height: 88px; + } + } + } + } + + .template { + width: 50%; + display: flex; + flex-direction: column; + align-items: center; + //justify-content: center; + float: right; + + .name { + width: 78%; + // background-color: lightcoral; + display: flex; + margin-top: 20px; + align-items: center; + height: 40px; + + // border: 1px solid black; + .d { + margin-top: 8px; + font-size: 25px; + color: #ff4e4e; + } + + .inname { + color: #6f6f6f; + font-size: 14px; + margin-left: 7px; + width: 65px; + } + + .in { + margin-left: 14px; + width: 81%; + + .ant-input { + border-radius: 5px; + // height: 120%; + width: 100%; + height: 40px; + } + + .ant-select-selector { + border-radius: 5px; + // height: 120%; + width: 100%; + height: 40px; + } + } + } + } + } + + .footer { + width: 100%; + margin-top: 31px; + margin-bottom: 14px; + padding-bottom: 20px; + + .btn { + display: flex; + justify-content: center; + + .btn1 { + display: flex; + justify-content: center; + align-items: center; + width: 100px; + height: 40px; + border-radius: 8px; + background: #409eff; + color: #ffffff; + margin-right: 14px; + } + + .btn2 { + display: flex; + justify-content: center; + align-items: center; + width: 100px; + height: 40px; + border-radius: 8px; + border: 1px solid #409eff; + background: #ffffff; + color: #409eff; + } + } + + .text { + color: rgba(153, 155, 163, 1); + font-size: 14px; + margin-left: 223px; + } + } +} + \ No newline at end of file diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index dd7aec0e..3008b51f 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -10,9 +10,9 @@ 导出信息 - + - + 返回 diff --git a/src/views/research/ResearchAdd copy.vue b/src/views/research/ResearchAdd copy.vue index b2ad3d38..a8593eed 100644 --- a/src/views/research/ResearchAdd copy.vue +++ b/src/views/research/ResearchAdd copy.vue @@ -3,9 +3,9 @@
创建评估 - + - + 返回 @@ -401,7 +401,9 @@ export default { if (state.assessmentId) { resultPost = { assessmentId: state.assessmentId, - assessmentName: state.assessmentName ? state.assessmentName : "编辑测试", + assessmentName: state.assessmentName + ? state.assessmentName + : "编辑测试", assessmentMark: state.assessmentMark, ...filterData, }; diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index 3a97ca47..d7562fb0 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -3,9 +3,9 @@
创建评估 - + - + 返回 @@ -499,7 +499,7 @@ export default { if (res.data.code === 200) { message.success("编辑成功"); router.push({ - path: "/researchmanage", + path: "/manage/researchmanage", }); } }); @@ -517,7 +517,7 @@ export default { if (res.data.code === 200) { message.success("创建成功"); router.push({ - path: "/researchmanage", + path: "/manage/researchmanage", }); } }); @@ -526,7 +526,7 @@ export default { const handleAllCancel = () => { state.allFormsData = []; router.push({ - path: "/researchmanage", + path: "/manage/researchmanage", }); }; const checkVal = (filterData) => { diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 6e56bc80..3e972ffd 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -428,7 +428,7 @@ export default {
{ - handleToManagepage(value, "/managepage"); + handleToManagepage(value, "/manage/managepage"); }} > 管理 @@ -474,7 +474,7 @@ export default {
{ - handleToResearchadd(value, "/researchadd"); + handleToResearchadd(value, "/manage/researchadd"); }} > 基础信息 diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue index 347c9d8b..187f212b 100644 --- a/src/views/system/SystemManage.vue +++ b/src/views/system/SystemManage.vue @@ -327,7 +327,7 @@ export default { }; const router = useRouter(); const golearningpath = () => { - router.push({ path: "/learningpath", params: { id: 1 } }); + router.push({ path: "/manage/learningpath", params: { id: 1 } }); }; //下载二维码图片 diff --git a/vue.config.js b/vue.config.js index dc5c008b..d7532e53 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,17 +1,25 @@ +/* + * @Author: lixg lixg@dongwu-inc.com + * @Date: 2022-11-21 14:32:52 + * @LastEditors: lixg lixg@dongwu-inc.com + * @LastEditTime: 2022-11-21 15:15:30 + * @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"); module.exports = defineConfig({ // transpileDependencies: true, devServer: { - port:8080, + port: 8080, proxy: { - "/api": { + "/manageApi": { // target:"http://192.168.100.208:30001", target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口 changeOrigin: true, //表示是否改变原域名 // secure: false, // ws: false, //表示WebSocket协议 pathRewrite: { - "^/api": "", + "^/manageApi": "", }, }, },