diff --git a/src/App.vue b/src/App.vue index 01712ba0..85df1c49 100644 --- a/src/App.vue +++ b/src/App.vue @@ -52,7 +52,6 @@ function beforeunloadHandler() { function init() { getUserInfo(); - getMemberInfo(); getUserPermission(); initDict("content_type"); //内容分类 initDict("project_level"); //项目级别 @@ -70,19 +69,6 @@ function unloadHandler() { } } -async function getMemberInfo() { - const list = localStorage.getItem("memberInitInfo"); - if (list) { - store.commit("SET_MEMBER_INFO", JSON.parse(list)); - return; - } - const memberInitInfo = await api1 - .getMemberInfo({keyWord: "", pageNo: 1, pageSize: 10}) - .then((res) => res.data.data.rows); - store.commit("SET_MEMBER_INFO", memberInitInfo); - localStorage.setItem("memberInitInfo", JSON.stringify(memberInitInfo)); -} - async function getUserInfo() { const userInfo = await api2.userInfo(); store.commit("SET_USER", userInfo.data.data); diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue index 543e1b9c..a3949640 100644 --- a/src/components/project/ProjectManager.vue +++ b/src/components/project/ProjectManager.vue @@ -1,172 +1,172 @@ - - + + + + + + + + + diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 6d5bab9d..6bb0113f 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -3975,28 +3975,13 @@ export default { const getTaskInfo = () => { getTask({ projectId: state.projectId, - useTask: "N", }).then((res) => { - console.log("get task", res.data.data); - if (res.data.code === 200) { - // 判断当前审核是否通过 if ( res.data.data.projectAuditLogDtoList && res.data.data.projectAuditLogDtoList.length ) { - console.log("审核信息是什么", res.data.data.projectAuditLogDtoList); let dataset = res.data.data.projectAuditLogDtoList; state.passInfo = dataset[dataset.length - 1].description; - - /** - for (let i = 0; i < dataset.length; i++) { - if (dataset[i].status == -5) { - state.isPass = true; - state.passInfo = dataset[i].description; - } - // isPass passInfo - } - */ } state.stage = res.data.data.stageList.map((e) => ({ id: e.stageId, @@ -4004,9 +3989,7 @@ export default { })); let info = res.data.data.projectInfo; state.permissions = info.permissions; - // let start = toDate(info.beginTime / 1000, "Y-M-D h:m"); let start = info.beginTime; - // let end = toDate(info.endTime / 1000, "Y-M-D h:m"); let end = info.endTime; state.tstartTime = info.beginTime; state.tendTime = info.endTime; @@ -4022,9 +4005,9 @@ export default { state.tlevel = info.level; state.systemId = info.systemId; state.tsystemId = info.systemId; - state.checkedSty = info.courseSyncFlag == 1 ? true : false; + state.checkedSty = info.courseSyncFlag == 1; state.courseSyncFlag = info.courseSyncFlag; - state.checkedBOEU = info.boeFlag == 1 ? true : false; + state.checkedBOEU = info.boeFlag == 1; state.boeFlag = info.boeFlag; state.picUrl = info.picUrl; state.managerId = info.managerId; @@ -4033,34 +4016,16 @@ export default { state.type = info.type; state.category = info.category; state.noticeFlag = info.noticeFlag; - state.switchopen = info.attachSwitch == 1 ? true : false; - state.docChecked = info.attachSwitch == 1 ? true : false; + state.switchopen = info.attachSwitch == 1; + state.docChecked = info.attachSwitch === 1; state.hasTask = !!res.data.data?.stageList.some( ({ taskList }) => taskList.length ); // state.attach = info.attach; // state.templateId = info.templateId; - state.sourceBelong = - (info.sourceBelongFullName || "") + info.sourceBelongName; + state.sourceBelong = (info.sourceBelongFullName || "") + info.sourceBelongName; // state.fileList=info.attach.split(",") - let d = info.attach.indexOf(","); - // console.log(info.attach, "xgo", info.attach.length); - if (info.attach.length == 0) { - return; - } else if (info.attach.length !== 0 && d == -1) { - return; - } else { - // console.log(info.attach, "xgo"); - // let str = JSON.parse(info.attach) - // console.log("赚回来",str) - // let luj = info.attach.split(",") - let luj = info.attach; - // console.log("lulj", luj); - console.log("赚回来", JSON.parse(luj)); - state.fileList = JSON.parse(luj); - // state.fileList = luj - } - } + state.fileList = info.attach?JSON.parse(info.attach):[]; }); }; //获取小组列表 diff --git a/vue.config.js b/vue.config.js index 57d570bc..8f2f14d7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -24,6 +24,14 @@ module.exports = defineConfig({ target: process.env.VUE_APP_BOE_API_URL, changeOrigin: true, //表示是否改变原域名 }, + "/systemapi": { + target: 'https:' + process.env.VUE_APP_BOE_API_URL, + changeOrigin: true, //表示是否改变原域名 + }, + "/api": { + target: 'https:' + process.env.VUE_APP_BOE_API_URL, + changeOrigin: true, //表示是否改变原域名 + }, }, }, });