diff --git a/src/assets/styles/adminIndex.scss b/src/assets/styles/adminIndex.scss index 762d456..bcca503 100644 --- a/src/assets/styles/adminIndex.scss +++ b/src/assets/styles/adminIndex.scss @@ -259,27 +259,6 @@ background: url(../../assets/images/t-yp.png) no-repeat #b3e8fa center; background-size: 98px 98px; } - - .item_format { - display: flex; - position: absolute; - left: 0; - bottom: 38px; - - span { - display: block; - width: 47px; - height: 18px; - // padding: 2px 5px; - margin-left: 6px; - text-align: center; - background: #3a8aeb; - color: #fff; - font-size: 12px; - line-height: 18px; - border-radius: 9px; - } - } .item_player { position: absolute; top: 50%; @@ -293,6 +272,27 @@ } } +.item_format { + display: flex; + position: absolute; + left: 0; + bottom: 38px; + + span { + display: block; + width: 47px; + height: 18px; + // padding: 2px 5px; + margin-left: 6px; + text-align: center; + background: #3a8aeb; + color: #fff; + font-size: 12px; + line-height: 18px; + border-radius: 9px; + } +} + .file_name { height: 32px; line-height: 32px; @@ -310,6 +310,7 @@ position: absolute; top: 14px; right: 26px; + z-index: 999; .el-button { padding: 8px 20px; @@ -459,6 +460,25 @@ } } } +// 主题库list +.theme_img { + display: flex; + flex-wrap: wrap; + .theme_item{ + position: relative; + width: 160px; + height: 284px; + border: 1px solid #f0f0f0; + border-radius: 4px; + overflow: hidden; + margin: 0 24px 24px 0; + } + img { + display: block; + width: 100%; + height: 100%; + } +} // 素材库/主题库选中 .checked_btn { position: absolute; @@ -477,4 +497,5 @@ background: url(~@/assets/images/selected.png) no-repeat; } } + // end diff --git a/src/router/routers.js b/src/router/routers.js index a1f5ae0..2a2015a 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -164,10 +164,19 @@ export const constantRouterMap = [ icon: 'edit' } }, + { + path: '/theme', + component: () => import('@/views/ThemeGallery/index'), + meta: { + title: '主题库', + icon: 'edit' + } + }, { path: '/release', component: () => import('@/views/immediateRelease/index') - }] + } + ] } // { // path: '/user', diff --git a/src/views/ThemeGallery/index.vue b/src/views/ThemeGallery/index.vue new file mode 100644 index 0000000..0cbee13 --- /dev/null +++ b/src/views/ThemeGallery/index.vue @@ -0,0 +1,94 @@ + + + + + 即时发布 + 定时发布 + {{ mulitText }} + + + + + + + + + + diff --git a/src/views/components/ThemeGalleryList.vue b/src/views/components/ThemeGalleryList.vue new file mode 100644 index 0000000..c6e05e3 --- /dev/null +++ b/src/views/components/ThemeGalleryList.vue @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + {{ item.type }} + 03:00 + + {{ item.name }} + + + + + + + diff --git a/src/views/dashboard/HomeThemeGallery.vue b/src/views/dashboard/HomeThemeGallery.vue new file mode 100644 index 0000000..ec5edf0 --- /dev/null +++ b/src/views/dashboard/HomeThemeGallery.vue @@ -0,0 +1,80 @@ + + + + + 即时发布 + 定时发布 + {{ mulitText }} + + + + + + + + + + diff --git a/src/views/dashboard/ThemeGallery.vue b/src/views/dashboard/ThemeGallery.vue deleted file mode 100644 index 9ead6ba..0000000 --- a/src/views/dashboard/ThemeGallery.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - 人工智能 - 党建文化 - 节日节气 - 艺术鉴赏 - 名人介绍 - 摄影 - 书法 - - - 即时发布 - 定时发布 - {{ mulitText }} - - - - - - diff --git a/src/views/home.vue b/src/views/home.vue index c810b99..f190e5b 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -15,7 +15,7 @@ - + @@ -24,14 +24,14 @@ import PublishProcess from './dashboard/PublishProcess' import DeviceData from './dashboard/DeviceData' import AgencyData from './dashboard/AgencyData' -import ThemeGallery from './dashboard/ThemeGallery' +import HomeThemeGallery from './dashboard/HomeThemeGallery' export default { name: 'Dashboard', components: { PublishProcess, DeviceData, AgencyData, - ThemeGallery + HomeThemeGallery }, data() { return { diff --git a/src/views/immediateRelease/index.vue b/src/views/immediateRelease/index.vue index 059c290..37ecccd 100644 --- a/src/views/immediateRelease/index.vue +++ b/src/views/immediateRelease/index.vue @@ -1,6 +1,7 @@ + 创建{{ publishType === 0 ? "即时发布" : "定时发布" }} @@ -107,12 +108,12 @@ + 第三步:选择设备 @@ -185,7 +187,7 @@ :close-on-click-modal="false" :show-close="false" :visible.sync="selectContVisible" - width="1000px" + width="1200px" > 素材库 @@ -205,8 +207,7 @@ @@ -215,42 +216,29 @@ 03:00 {{ item.name }} - - - - - - - - - - - - + - - + + + + - 多选 + {{ mulitText }}