From 2723c626fff7c7d0beacc64c1b58a5e2515c8e0f Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Mon, 7 Mar 2022 17:24:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E5=B1=8F=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/adminIndex.scss | 56 +++++ src/router/routers.js | 8 + src/views/dashboard/ThemeGallery.vue | 17 -- src/views/device/deviceConfig.vue | 2 + src/views/materialContent/index.vue | 19 -- .../materialContent/materialList/index.vue | 1 + .../publishContent/historyList/index.vue | 108 +++++++++ src/views/publishContent/index.vue | 52 +++++ .../publishContent/publishList/index.vue | 131 +++++++++++ .../publishContent/urgentMessage/index.vue | 209 ++++++++++++++++++ 10 files changed, 567 insertions(+), 36 deletions(-) create mode 100644 src/views/publishContent/historyList/index.vue create mode 100644 src/views/publishContent/index.vue create mode 100644 src/views/publishContent/publishList/index.vue create mode 100644 src/views/publishContent/urgentMessage/index.vue diff --git a/src/assets/styles/adminIndex.scss b/src/assets/styles/adminIndex.scss index 3976481..5e70097 100644 --- a/src/assets/styles/adminIndex.scss +++ b/src/assets/styles/adminIndex.scss @@ -108,6 +108,10 @@ .delt_btn { background-color: #ee5747 !important; } + + .start_btn { + background-color: #3a8aeb !important; + } .stop_btn { background-color: #faaf45 !important; @@ -116,6 +120,14 @@ .record_btn { background: linear-gradient(to right, #fc8c6f, #fa544e) !important; } + + .top_btn{ + background-color: #2cca8c !important; + } + + .top_btn_active { + background-color: #a7acae !important; + } } .el-dialog__body { @@ -271,4 +283,48 @@ overflow: hidden; text-overflow: ellipsis; } + +.home_publish_btn { + position: absolute; + top: 14px; + right: 26px; + + .el-button { + padding: 8px 20px; + font-size: 14px; + color: #fff; + border: none; + + &:first-child { + background: linear-gradient(to right, #fc8c6f, #fa544e); + } + + &:last-child { + margin-left: 24px; + } + } +} +.content_warp { + i { + font-style: normal; + color: #999; + } + + .el-tabs__header { + padding: 0 24px; + } + + .el-tabs__item { + height: 48px; + line-height: 48px; + } + + .el-tabs__active-bar { + background-color: transparent !important; + } + + .el-tabs__nav-wrap::after { + height: 1px; + } +} // end \ No newline at end of file diff --git a/src/router/routers.js b/src/router/routers.js index 065ff95..579d6a0 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -155,6 +155,14 @@ export const constantRouterMap = [ title: '素材库', icon: 'edit' } + }, + { + path: '/publish', + component: () => import('@/views/publishContent/index'), + meta: { + title: '上屏发布', + icon: 'edit' + } }] } // { diff --git a/src/views/dashboard/ThemeGallery.vue b/src/views/dashboard/ThemeGallery.vue index 7f5162e..6b2c414 100644 --- a/src/views/dashboard/ThemeGallery.vue +++ b/src/views/dashboard/ThemeGallery.vue @@ -78,22 +78,5 @@ export default { overflow: hidden; } } - .home_publish_btn { - position: absolute; - top: 14px; - right: 26px; - .el-button { - padding: 8px 20px; - font-size: 14px; - color: #fff; - border: none; - &:first-child { - background: linear-gradient(to right, #fc8c6f, #fa544e); - } - &:last-child { - margin-left: 24px; - } - } - } } diff --git a/src/views/device/deviceConfig.vue b/src/views/device/deviceConfig.vue index 9991836..f74109c 100644 --- a/src/views/device/deviceConfig.vue +++ b/src/views/device/deviceConfig.vue @@ -291,9 +291,11 @@ export default { padding: 0 20px; } .setting_item{ + padding-top: 24px; color: #333; h4{ font-size: 16px; + margin-bottom: 10px; } .setting_cont{ display: flex; diff --git a/src/views/materialContent/index.vue b/src/views/materialContent/index.vue index 77df687..693d2f7 100644 --- a/src/views/materialContent/index.vue +++ b/src/views/materialContent/index.vue @@ -76,25 +76,6 @@ export default { .app-container { position: relative; padding: 6px 0 20px 0; - .content_warp { - i { - font-style: normal; - color: #999; - } - ::v-deep .el-tabs__header { - padding: 0 24px; - } - ::v-deep .el-tabs__item { - height: 48px; - line-height: 48px; - } - ::v-deep .el-tabs__active-bar { - background-color: transparent !important; - } - ::v-deep .el-tabs__nav-wrap::after { - height: 1px; - } - } .material_btn { position: absolute; right: 24px; diff --git a/src/views/materialContent/materialList/index.vue b/src/views/materialContent/materialList/index.vue index b866fa5..02e9a1f 100644 --- a/src/views/materialContent/materialList/index.vue +++ b/src/views/materialContent/materialList/index.vue @@ -147,6 +147,7 @@ +
即时发布 定时发布 diff --git a/src/views/publishContent/historyList/index.vue b/src/views/publishContent/historyList/index.vue new file mode 100644 index 0000000..540d214 --- /dev/null +++ b/src/views/publishContent/historyList/index.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/views/publishContent/index.vue b/src/views/publishContent/index.vue new file mode 100644 index 0000000..a2ce19b --- /dev/null +++ b/src/views/publishContent/index.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/src/views/publishContent/publishList/index.vue b/src/views/publishContent/publishList/index.vue new file mode 100644 index 0000000..5edcf0b --- /dev/null +++ b/src/views/publishContent/publishList/index.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/views/publishContent/urgentMessage/index.vue b/src/views/publishContent/urgentMessage/index.vue new file mode 100644 index 0000000..9ec9561 --- /dev/null +++ b/src/views/publishContent/urgentMessage/index.vue @@ -0,0 +1,209 @@ + + + + +