diff --git a/bs-ui/public/favicon.ico b/bs-ui/public/favicon.ico index e263760..ca5a8cf 100644 Binary files a/bs-ui/public/favicon.ico and b/bs-ui/public/favicon.ico differ diff --git a/bs-ui/src/assets/images/login-background.jpg b/bs-ui/src/assets/images/login-background.jpg index 8a89eb8..d54ccb7 100644 Binary files a/bs-ui/src/assets/images/login-background.jpg and b/bs-ui/src/assets/images/login-background.jpg differ diff --git a/bs-ui/src/assets/logo/logo.png b/bs-ui/src/assets/logo/logo.png index a58da9b..ca5a8cf 100644 Binary files a/bs-ui/src/assets/logo/logo.png and b/bs-ui/src/assets/logo/logo.png differ diff --git a/bs-ui/src/components/RuoYi/Doc/index.vue b/bs-ui/src/components/RuoYi/Doc/index.vue index 1d7795c..4dd6967 100644 --- a/bs-ui/src/components/RuoYi/Doc/index.vue +++ b/bs-ui/src/components/RuoYi/Doc/index.vue @@ -1,6 +1,6 @@ diff --git a/bs-ui/src/views/gallery-person/list/index.vue b/bs-ui/src/views/gallery-person/list/index.vue new file mode 100644 index 0000000..77b0fc9 --- /dev/null +++ b/bs-ui/src/views/gallery-person/list/index.vue @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/bs-ui/src/views/gallery-person/query/index.vue b/bs-ui/src/views/gallery-person/query/index.vue new file mode 100644 index 0000000..cb21f1c --- /dev/null +++ b/bs-ui/src/views/gallery-person/query/index.vue @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/bs-ui/src/views/gallery/backup/index.vue b/bs-ui/src/views/gallery/backup/index.vue new file mode 100644 index 0000000..ecaeb44 --- /dev/null +++ b/bs-ui/src/views/gallery/backup/index.vue @@ -0,0 +1,203 @@ + + + + diff --git a/bs-ui/src/views/gallery/label/index.vue b/bs-ui/src/views/gallery/label/index.vue new file mode 100644 index 0000000..d4d500a --- /dev/null +++ b/bs-ui/src/views/gallery/label/index.vue @@ -0,0 +1,109 @@ + + + diff --git a/bs-ui/src/views/gallery/list/components/ImageItem.vue b/bs-ui/src/views/gallery/list/components/ImageItem.vue index 3f66c4a..95e8fde 100644 --- a/bs-ui/src/views/gallery/list/components/ImageItem.vue +++ b/bs-ui/src/views/gallery/list/components/ImageItem.vue @@ -6,7 +6,7 @@
{{ item.imageTitle }}
{{ item.uploadTime }}
- 公开 + {{item.isOpen == 1 ? '公开':'私有'}} {{ item.keyWords }}
@@ -20,7 +20,7 @@ export default { item: { type: Object, default: () => ({}) - } + }, }, computed: { imageUrl() { diff --git a/bs-ui/src/views/gallery/list/index.vue b/bs-ui/src/views/gallery/list/index.vue index ff3078c..d5383ae 100644 --- a/bs-ui/src/views/gallery/list/index.vue +++ b/bs-ui/src/views/gallery/list/index.vue @@ -131,6 +131,12 @@ export default { exportUrl: '', pageListApi: pageListImages, }, + props: { + isPerson: { + type: Boolean, + default: false + } + }, data() { return { cates: [], @@ -143,7 +149,7 @@ export default { imageTitle: null, photoTime: null,// 图片拍摄时间, uploadTime: formatDateStr(), - isOpen: 1, + isOpen: this.isPerson ? 0:1, keyWords: '日常', cataId: null, }, @@ -180,9 +186,24 @@ export default { listCata().then(res => { const list = res.data || []; this.cates = list; - }) + }); + }, methods: { + MXCreated() { + this.query.isOpen = this.isPerson ? '0':''; +}, +resetQueryTable() { + this.$refs.multipleTable?.clearSort(); + this.tableSort = {}; + this.page = { + ...this.MXDefaultPage() + }; + + this.query = { ...this.MXPageInfo().defaultQuery }; + this.query.isOpen = this.isPerson ? '0':''; + this.getTableList(); + }, imageEditChange() { this.getTableList(); }, @@ -205,7 +226,7 @@ export default { imageTitle: null, photoTime: null,// 图片拍摄时间, uploadTime: formatDateStr(), - isOpen: 1, + isOpen: this.isPerson ? 0:1, keyWords: '日常', cataId: null, }; diff --git a/bs-ui/src/views/gallery/query/index.vue b/bs-ui/src/views/gallery/query/index.vue new file mode 100644 index 0000000..2dcd4a6 --- /dev/null +++ b/bs-ui/src/views/gallery/query/index.vue @@ -0,0 +1,346 @@ + + + + + \ No newline at end of file diff --git a/bs-ui/src/views/gallery/spatial/BarChart.vue b/bs-ui/src/views/gallery/spatial/BarChart.vue new file mode 100644 index 0000000..74a9977 --- /dev/null +++ b/bs-ui/src/views/gallery/spatial/BarChart.vue @@ -0,0 +1,94 @@ + + + diff --git a/bs-ui/src/views/gallery/spatial/index.vue b/bs-ui/src/views/gallery/spatial/index.vue new file mode 100644 index 0000000..d01590a --- /dev/null +++ b/bs-ui/src/views/gallery/spatial/index.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/bs-ui/src/views/login.vue b/bs-ui/src/views/login.vue index 102227d..ca0c7d2 100644 --- a/bs-ui/src/views/login.vue +++ b/bs-ui/src/views/login.vue @@ -56,7 +56,7 @@ diff --git a/bs-ui/src/views/register.vue b/bs-ui/src/views/register.vue index 2bf340a..90f2853 100644 --- a/bs-ui/src/views/register.vue +++ b/bs-ui/src/views/register.vue @@ -61,7 +61,7 @@ diff --git a/bs-ui/src/views/test/index.vue b/bs-ui/src/views/test/index.vue index 802c15a..cd9dc77 100644 --- a/bs-ui/src/views/test/index.vue +++ b/bs-ui/src/views/test/index.vue @@ -1,14 +1,14 @@