diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 9f8cb6ce..7ef1a0db 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -1693,7 +1693,7 @@ const videoShowMsg = (index) => { message.warning(msg) } -// 获取用户信息 todo +// 获取用户信息 const userInfo = ref(null) const handleUser = () => { getUser().then(res => { @@ -1706,7 +1706,6 @@ const handleUser = () => { userInfo.value.realNameShow = '西海岸能力超市' + (userInfo.value.deptName || '') + (userInfo.value.realName || ''); }).catch(err => { message.warning(err) - console.log('err----获取用户信息-------->', err); }) } @@ -2160,8 +2159,39 @@ video::-webkit-media-controls { font-weight: bold; opacity: 0.4; transform: rotate(-25deg); + width: 470px } + +// 左上 +.waterMark-left-top { + left: 50px; + top: 100px; + text-align: left; +} + +// 右上 +.waterMark-right-top { + right: 50px; + top: 100px; + text-align: right; +} + +// 左下 +.waterMark-left-bottom { + left: 50px; + bottom: 100px; + text-align: left; +} + +// 右下 +.waterMark-right-bottom { + right: 50px; + bottom: 100px; + text-align: right; +} + +// 批量 .batch-waterMark { position: absolute; z-index: 99999999; @@ -2169,55 +2199,35 @@ video::-webkit-media-controls { font-size: 14px; opacity: 0.4; transform: rotate(-25deg); + width: 200px; } -// 左上 -.waterMark-left-top { - left: 100px; - top: 100px; -} - -// 右上 -.waterMark-right-top { - right: 100px; - top: 100px; -} - -// 左下 -.waterMark-left-bottom { - left: 100px; - bottom: 100px; -} - -// 右下 -.waterMark-right-bottom { - right: 100px; - bottom: 100px; -} - - -// 批量 // 左上 .batch-waterMark-left-top { left: 30px; top: 50px; + text-align: left; + } // 右上 .batch-waterMark-right-top { + text-align: right; right: 30px; - top: 50px; + top: 80px; } // 左下 .batch-waterMark-left-bottom { left: 30px; bottom: 50px; + text-align: left; } // 右下 .batch-waterMark-right-bottom { - right: 30px; - bottom: 50px; + right: 20px; + bottom: 30px; + text-align: right; } diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue index 3a75af0e..1b91b1d9 100644 --- a/front/src/views/personalCenter/components/AbilityApplication.vue +++ b/front/src/views/personalCenter/components/AbilityApplication.vue @@ -52,30 +52,18 @@ {{ item.name }} -