From b545e2f6f1f9eef8cd92f4d8ae936282aba6870c Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Fri, 1 Apr 2022 20:37:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98-=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/theme/theme.js | 9 + src/assets/styles/adminIndex.scss | 12 +- src/views/ThemeGallery/index.vue | 34 +- src/views/components/ThemeGalleryList.vue | 350 ++++------------ src/views/components/materialFolder.vue | 390 ++++++++++++++++++ src/views/dashboard/HomeThemeGallery.vue | 16 +- src/views/immediateRelease/index.vue | 37 +- .../materialContent/materialList/index.vue | 12 +- 8 files changed, 549 insertions(+), 311 deletions(-) create mode 100644 src/views/components/materialFolder.vue diff --git a/src/api/theme/theme.js b/src/api/theme/theme.js index a54669b..81fe1ef 100644 --- a/src/api/theme/theme.js +++ b/src/api/theme/theme.js @@ -19,6 +19,15 @@ export function FetchThemeClassList(parameter) { }) } +// 根据类别id查询类别详情 +export function FetchFindThemeClassDetails(parameter) { + return request({ + url: 'api/themeclass/findThemeClassDetails', + method: 'get', + params: parameter + }) +} + // 新增| 编辑 主题库分类菜单 export function FetchAddOrEdit(parameter) { return request({ diff --git a/src/assets/styles/adminIndex.scss b/src/assets/styles/adminIndex.scss index 9780159..5217c01 100644 --- a/src/assets/styles/adminIndex.scss +++ b/src/assets/styles/adminIndex.scss @@ -401,11 +401,11 @@ border-radius: 4px; overflow: hidden; margin: 0 24px 24px 0; - } - img { - display: block; - width: 100%; - height: 100%; + img { + display: block; + width: 100%; + height: 100%; + } } } @@ -561,7 +561,7 @@ bottom: 60px; left: 50%; // width: 1100px; - padding: 25px 150px; + padding: 25px 140px; background: rgba(0, 0, 0, 0.5); border-radius: 4px; transform: translateX(-40%); diff --git a/src/views/ThemeGallery/index.vue b/src/views/ThemeGallery/index.vue index a9fc42b..e763f77 100644 --- a/src/views/ThemeGallery/index.vue +++ b/src/views/ThemeGallery/index.vue @@ -162,7 +162,7 @@ + + diff --git a/src/views/dashboard/HomeThemeGallery.vue b/src/views/dashboard/HomeThemeGallery.vue index ae5bc5c..688d519 100644 --- a/src/views/dashboard/HomeThemeGallery.vue +++ b/src/views/dashboard/HomeThemeGallery.vue @@ -26,7 +26,8 @@ export default { data() { return { mulitText: '多选', - isMultiSelected: false + isMultiSelected: false, + selectedMaterial: [] } }, mounted() { @@ -44,6 +45,19 @@ export default { publishHandle(index) { localStorage.removeItem('selectedMaterial') localStorage.removeItem('releaseId') + this.selectedMaterial = this.$refs.ThemeGalleryList.selectedMaterial + localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial)) + // 判断是否选择了多个音频文件 + const resultAudio = [] + this.selectedMaterial.map(item => { + if (item.material_type == 2) { + resultAudio.push(item) + } + }) + if (resultAudio.length > 1) { + this.$message.error('音频类型的文件只可选择1个') + return + } this.$router.push( { path: '/release', query: { tag: index } diff --git a/src/views/immediateRelease/index.vue b/src/views/immediateRelease/index.vue index 0be720f..ebe28a3 100644 --- a/src/views/immediateRelease/index.vue +++ b/src/views/immediateRelease/index.vue @@ -283,6 +283,7 @@ export default { }, data() { return { + isThemeOrMaterial: false, orga_id: '133221333123111', selectedMaterial: [], // 从其他页面选择带过来的素材 publishType: 0, // 判断是定时发布还是即时发布页面 @@ -818,14 +819,28 @@ export default { this.isMultiSelected = !this.isMultiSelected if (this.isMultiSelected) { this.mulitText = '取消' - this.$refs.MaterialList.selectedListId = [] - this.$refs.MaterialList.selectedMaterial = [] - // 已选择的内容中-list是否包含，包含即选中状态 - if (this.selectedMaterial) { - this.selectedMaterial.forEach(item => { - this.$refs.MaterialList.selectedListId.push(item.material_id) - this.$refs.MaterialList.selectedMaterial.push(item) - }) + console.log(this.activeItemIndex) + if (this.activeIndex == 0) { + this.$refs.MaterialList.selectedListId = [] + this.$refs.MaterialList.selectedMaterial = [] + // 已选择的内容中-list是否包含，包含即选中状态 + if (this.selectedMaterial) { + this.selectedMaterial.forEach(item => { + this.$refs.MaterialList.selectedListId.push(item.material_id) + this.$refs.MaterialList.selectedMaterial.push(item) + }) + } + } else { + this.$refs.ThemeGalleryList.selectedListId = [] + this.$refs.ThemeGalleryList.selectedMaterial = [] + // 已选择的内容中-list是否包含，包含即选中状态 + if (this.selectedMaterial) { + this.selectedMaterial.forEach(item => { + this.$refs.ThemeGalleryList.selectedListId.push(item.material_id) + this.$refs.ThemeGalleryList.selectedMaterial.push(item) + }) + } + // this.selectedMaterial = this.$refs.ThemeGalleryList.selectedMaterial } } else { if (type == 'audio') { @@ -840,7 +855,11 @@ export default { uploadSelected() { this.selectContVisible = false this.selectedMaterial = [] - this.selectedMaterial = this.$refs.MaterialList.selectedMaterial + if (this.activeIndex == 0) { + this.selectedMaterial = this.$refs.MaterialList.selectedMaterial + } else { + this.selectedMaterial = this.$refs.ThemeGalleryList.selectedMaterial + } if (this.release_id) { // 编辑情况下 - 上传选择素材时，取消某一项选中状态-即删除该素材 const editMaterialId = [] diff --git a/src/views/materialContent/materialList/index.vue b/src/views/materialContent/materialList/index.vue index 9531476..cea2da4 100644 --- a/src/views/materialContent/materialList/index.vue +++ b/src/views/materialContent/materialList/index.vue @@ -9,7 +9,7 @@
- + 创建文件夹 返回
@@ -80,7 +80,6 @@
-
@@ -123,6 +122,7 @@ export default { }, data() { return { + isTheme: false, orga_id: '133221333123111', // 机构ID rootFolderId: null, // 根目录文件夹ID thisFoldId: null, // 当前父文件夹ID @@ -148,7 +148,7 @@ export default { uploadFileUrl: null, // 素材保存路径 selectedMaterial: [], // 素材选中 selectedListId: [], // 素材选中的material_id - selectinFolderid: [], // 素材选中的和文件关联表id -- in_folder_id + selectInFolderid: [], // 素材选中的和文件关联表id -- in_folder_id layerTitle: '创建文件夹', // 文件夹/素材编辑框title labelTxt: '文件夹名称', isToFolder: false, // 是否进入文件夹 @@ -462,12 +462,12 @@ export default { const index = arr.indexOf(id) if (index > -1) { arr.splice(index, 1) - this.selectinFolderid.splice(index, 1) + this.selectInFolderid.splice(index, 1) this.selectedMaterial.splice(index, 1) } } else { this.selectedListId.push(id) - this.selectinFolderid.push(inFolderId) + this.selectInFolderid.push(inFolderId) this.selectedMaterial.push(item) this.formatType = type } @@ -536,7 +536,7 @@ export default { } const params = { 'folder_id': this.thisFoldId, - 'ids': this.selectinFolderid, + 'ids': this.selectInFolderid, 'material_ids': this.selectedListId } moveMyMaterial(params).then(res => {