diff --git a/src/components/Common/CommonNewBill.js b/src/components/Common/CommonNewBill.js index b2f4156..f247141 100644 --- a/src/components/Common/CommonNewBill.js +++ b/src/components/Common/CommonNewBill.js @@ -2349,9 +2349,10 @@ const BillComponent = Form.create({ } /* 悬浮Tip */ - const mainContentChinese = commonUtils.isNotEmptyArr(masterConfig?.gdsconfigformslave?.filter(item => item.sControlName === "MainContent")) + let mainContentChinese = commonUtils.isNotEmptyArr(masterConfig?.gdsconfigformslave?.filter(item => item.sControlName === "MainContent")) ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === "MainContent")[0].sChinese : commonFunc.showChineseMessage(app.commonConst, "MainContent"); /* 从表信息 */ + mainContentChinese = commonUtils.isNotEmptyObject(mainContentChinese)? mainContentChinese : '主体内容'; const materialsInfoChinese = commonUtils.isNotEmptyArr(masterConfig?.gdsconfigformslave?.filter(item => item.sControlName === "zMaterials")) ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === "zMaterials")[0].sChinese : commonFunc.showChineseMessage(app.commonConst, "zMaterials"); /* 表一 */ diff --git a/src/components/Common/PersonCenter/PersonCenter.js b/src/components/Common/PersonCenter/PersonCenter.js index 6f84ad2..3d6d16b 100644 --- a/src/components/Common/PersonCenter/PersonCenter.js +++ b/src/components/Common/PersonCenter/PersonCenter.js @@ -111,7 +111,7 @@ class PersonCenter extends Component { target = e.target; } - console.log('target', target); + if (!target) return null; if (target.title) { @@ -120,7 +120,7 @@ class PersonCenter extends Component { const content = target.children.length ? target.children[0].innerText : target.innerText; const tip = target.children.length ? target.children[0].getAttribute('data-tip') : target.getAttribute('data-tip'); - console.log(2222, tip); + this.showTooltipAtMouse(e, content, tip); } catch (error) { // eslint-disable-next-line no-empty @@ -327,7 +327,7 @@ class PersonCenter extends Component { const shownNotices = localStorage.getItem('shownNotices') || ''; - console.log('shownNotices', shownNotices, noticeKey); + // 如果已经显示过,直接返回,不调用接口 if (shownNotices.includes(noticeKey)) { @@ -349,7 +349,7 @@ class PersonCenter extends Component { // 3. 再次确认是否已显示(防止并发请求) const currentShownNotices = localStorage.getItem('shownNotices') || ''; - console.log('currentShownNotices11', currentShownNotices); + if (!currentShownNotices.includes(noticeKey)) { this.setState({ noticeVisible: true, @@ -384,7 +384,7 @@ class PersonCenter extends Component { // 在用户确认阅读后,才将公告记录存储到shownNotices中 const noticeKey = `${sMsgId}_${sMsgSlaveId}`; const currentShownNotices = localStorage.getItem('shownNotices') || ''; - console.log('noticeKe11111y', noticeKey); + localStorage.setItem('shownNotices', JSON.stringify(noticeKey)); } else { message.error(configReturn?.msg);