From 7e73e709c3b02147767d47622b2e9a165611678e Mon Sep 17 00:00:00 2001 From: wanglei Date: Mon, 13 May 2024 13:52:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dangan-ui/public/index.html | 2 +- dangan-ui/src/api/system/user.js | 9 ++ dangan-ui/src/utils/watermark.js | 4 +- .../src/views/dangan/collection/index.vue | 129 ++++++++++++++++++ 4 files changed, 141 insertions(+), 3 deletions(-) create mode 100644 dangan-ui/src/views/dangan/collection/index.vue diff --git a/dangan-ui/public/index.html b/dangan-ui/public/index.html index c45933b..925455c 100644 --- a/dangan-ui/public/index.html +++ b/dangan-ui/public/index.html @@ -195,7 +195,7 @@ } - +
diff --git a/dangan-ui/src/api/system/user.js b/dangan-ui/src/api/system/user.js index 91d77c0..6909081 100644 --- a/dangan-ui/src/api/system/user.js +++ b/dangan-ui/src/api/system/user.js @@ -142,6 +142,15 @@ export function userMenuTreeselect(userId) { }) } +// 获取目录下拉树列表 +export function catalogTreeselect(query) { + return request({ + url: '/dangan/catalog/treeselect', + method: 'get', + params: query + }) +} + // 修改用户目录权限 export function userMuRelation(data) { return request({ diff --git a/dangan-ui/src/utils/watermark.js b/dangan-ui/src/utils/watermark.js index 2de9783..810f272 100644 --- a/dangan-ui/src/utils/watermark.js +++ b/dangan-ui/src/utils/watermark.js @@ -33,8 +33,8 @@ let setWatermark = (str,date) => { div.style.left = '0px' div.style.position = 'absolute' div.style.zIndex = '100' - div.style.width = document.documentElement.clientWidth + 'px' - div.style.height = document.documentElement.clientHeight + 'px' + div.style.width = (document.documentElement.clientWidth-30) + 'px' + div.style.height = (document.documentElement.clientHeight-30) + 'px' div.style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' // document.body.appendChild(div) div.style.opacity = '0.6' // 水印的透明度 diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue new file mode 100644 index 0000000..15412d8 --- /dev/null +++ b/dangan-ui/src/views/dangan/collection/index.vue @@ -0,0 +1,129 @@ + + +