diff --git a/src/App.vue b/src/App.vue index 10b3b0a8..e75658e9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本0.9.5------------"); + console.log("版本0.9.6------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/config.js b/src/api/config.js index 573241e8..773efa21 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -56,7 +56,7 @@ http.interceptors.response.use( return response; } else { if (code === 1000) { - // window.open("https://u-pre.boe.com/web/", '_self'); + window.open("https://u-pre.boe.com/web/", '_self'); // window.open("http://111.231.196.214:12013/manage/login", '_self'); } console.log("api %o", msg); diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue index 58f2bf68..ff637f60 100644 --- a/src/components/drawers/NoticePub.vue +++ b/src/components/drawers/NoticePub.vue @@ -103,7 +103,7 @@ export default { return message.warning("请输入公告内容"); } else { let obj = { - notice: state.noticeContent1, + notice: state.noticeContent, projectId: props.projectId, title: "", }; @@ -147,7 +147,7 @@ export default { .noticeTitle { margin-left: 32px; margin-right: 32px; - // padding-top: 20px; + margin-bottom: 100px; .notitle { height: 55px; border-bottom: 1px solid #ededed; diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue index 84b6402e..0730c4da 100644 --- a/src/components/drawers/ProjPowerList.vue +++ b/src/components/drawers/ProjPowerList.vue @@ -323,7 +323,7 @@ export default { name: value.memberName ? value.memberName : "-", com: value.orgName ? value.orgName : "-", - gang: "-", + gang: value.positionMgrLevel ? value.positionMgrLevel : "-", number: value.memberNo ? value.memberNo : "-", state: value.tagName ? value.tagName : "-", }; diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index 19ffebf8..db80bbe0 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -116,7 +116,8 @@
审核意见:
- +
diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue index dcbd6c48..6b41b554 100644 --- a/src/components/project/ProjectManagerNew.vue +++ b/src/components/project/ProjectManagerNew.vue @@ -18,6 +18,7 @@ @search="searchMember" :open="isOpen" @change="change" + @blur="blur" >