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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+ OCR识别
+
+
+
+
+
+
+
+
+
+
+
+
+
+