diff --git a/src/App.vue b/src/App.vue index 3ef20aac..d5e09424 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,11 +7,14 @@ import watermark from '@/utils/watermark.js'; const setWater = () => { const userInfo = localStorage.getItem('TWMS-userInfo'); + const WarehouseName = localStorage.getItem('WarehouseName'); if (!userInfo) { return; } - watermark.set(userInfo ? '货无忧 - ' + JSON.parse(userInfo).content.nick_name : '货无忧'); + watermark.set( + userInfo ? WarehouseName + ' - ' + JSON.parse(userInfo).content.nick_name : '货无忧' + ); }; setWater(); diff --git a/src/api/resource/oss.js b/src/api/resource/oss.js index c1262962..35d003cb 100644 --- a/src/api/resource/oss.js +++ b/src/api/resource/oss.js @@ -1,14 +1,10 @@ import request from '@/axios'; -export const getList = (current, size, params) => { +export const getList = params => { return request({ url: '/blade-resource/oss/list', method: 'get', - params: { - ...params, - current, - size, - }, + params, }); }; diff --git a/src/option/resource/oss.js b/src/option/resource/oss.js new file mode 100644 index 00000000..9dae471c --- /dev/null +++ b/src/option/resource/oss.js @@ -0,0 +1,116 @@ +export const columnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'categoryName', + label: '分类', + type: 3, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'ossCode', + label: '资源编号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'endpoint', + label: '资源地址', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'bucketName', + label: '空间名', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'accessKey', + label: 'accessKey', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'secretKey', + label: 'secretKey', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'statusName', + label: '是否启用', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + label: '备注', + prop: 'remark', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; diff --git a/src/utils/watermark.js b/src/utils/watermark.js index c69a2ee2..e12055b3 100644 --- a/src/utils/watermark.js +++ b/src/utils/watermark.js @@ -10,12 +10,12 @@ let setWatermark = str => { } let can = document.createElement('canvas'); - can.width = 800; - can.height = 800; + can.width = 400; + can.height = 400; let cans = can.getContext('2d'); cans.rotate((-15 * Math.PI) / 150); - cans.font = '50px Vedana'; + cans.font = '25px Vedana'; cans.fillStyle = 'rgba(17, 17, 17, 0.10)'; cans.textAlign = 'left'; cans.textBaseline = 'Middle'; @@ -24,13 +24,13 @@ let setWatermark = str => { let div = document.createElement('div'); div.id = id; div.style.pointerEvents = 'none'; - div.style.top = '50px'; - div.style.left = '500px'; + div.style.top = '0px'; + div.style.left = '0px'; div.style.position = 'fixed'; div.style.zIndex = '1000000'; div.style.width = document.documentElement.clientWidth + 'px'; div.style.height = document.documentElement.clientHeight + 'px'; - div.style.background = 'url(' + can.toDataURL('image/png') + ') left top no-repeat'; + div.style.background = 'url(' + can.toDataURL('image/png') + ') left top '; document.body.appendChild(div); return id; }; diff --git a/src/views/resource/oss.vue b/src/views/resource/oss.vue index e4346c31..1ad281b3 100644 --- a/src/views/resource/oss.vue +++ b/src/views/resource/oss.vue @@ -1,452 +1,739 @@ - - - - 删 除 - - - - 调试 - - 启用 - - - - {{ row.statusName }} - - - {{ row.categoryName }} - - - - - + + + + + + + + + 搜 索 + 清 空 + + + + + + + + + + 新 增 + + + + 删 除 + + + + + + + + + + + + + + + handleDelete(row)"> + 删 除 + + + + handleEdit(row)"> + 编 辑 + + + + handleDebug(row)"> 调 试 + + + handleEnable(row)"> 启 用 + + + + + + 勾选数量: {{ selectionList.length }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (details.popUpShow.add = false)"> + 关 闭 + + + + 新 增 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (details.popUpShow.debugVisted = false)" + > + 关 闭 + + + ElMessage.success(`获取到图片地址:[${details.debugForm.imgUrl}]`)" + > + 确 认 + + + + + + + + + + - -