From e21c4a03ab90111dae211ce9a0800f790e7e4d5b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 16 Feb 2023 19:26:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?--fix=20=E9=A1=B9=E7=9B=AE=E8=8D=89?=
=?UTF-8?q?=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 14 -
src/components/project/ProjectManager.vue | 320 +++++++++++-----------
src/views/projectcenter/TaskPage.vue | 47 +---
3 files changed, 166 insertions(+), 215 deletions(-)
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 2a48672d..052610fe 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3974,28 +3974,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,
@@ -4003,9 +3988,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;
@@ -4021,9 +4004,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;
@@ -4032,34 +4015,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):[];
});
};
//获取小组列表
From 36b6e820c3b631cb8d460ca8ffeead2a021244e5 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 16 Feb 2023 19:45:38 +0800
Subject: [PATCH 2/2] --fix bug
---
vue.config.js | 8 ++++++++
1 file changed, 8 insertions(+)
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, //表示是否改变原域名
+ },
},
},
});