diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index eba4e5b68..352dbd8bf 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -80,6 +80,7 @@ }, watch: { $route: function(val) { + console.log(val) this.$nextTick(() => { this.$watermark.set(this.userInfo().username + ' ' + this.userInfo().realname) }) diff --git a/jero-web/src/assets/watermark.js b/jero-web/src/assets/watermark.js index c35e34285..71f151fd7 100644 --- a/jero-web/src/assets/watermark.js +++ b/jero-web/src/assets/watermark.js @@ -1,6 +1,7 @@ let watermark = {} let setWatermark = (str) => { - let id = '1.23452384164.123412415' + console.log(str) + let id = Date.parse(new Date()) if (document.getElementById(id) !== null) { document.body.removeChild(document.getElementById(id)) } @@ -19,6 +20,7 @@ let setWatermark = (str) => { document.getElementsByClassName('detail-content')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' } + console.log(id) return id } @@ -26,8 +28,9 @@ let setWatermark = (str) => { watermark.set = (str) => { let id = setWatermark(str) setInterval(() => { + let value = JSON.parse(localStorage.getItem('pro__Login_Userinfo')) if (document.getElementById(id) === null) { - id = setWatermark(str) + id = setWatermark(value.value.username + ' ' + value.value.realname) } }, 2000) window.onresize = () => { diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index b638bd6f3..89dcbbc36 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -188,7 +188,7 @@ // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题 changeTitle(title) { - let projectTitle = 'Jero-Boot 企业级快速开发平台' + let projectTitle = '蔚来全球法规平台' // 首页特殊处理 if (this.$route.path === indexKey) { document.title = projectTitle @@ -464,7 +464,8 @@ .ant-table-placeholder { background: transparent !important; } - .ant-input-number{ + + .ant-input-number { background: transparent !important; }