From 2e980578f45b5a2593086b25e339d9c172c900a2 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Fri, 11 Mar 2022 16:38:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/adminIndex.scss | 24 +++++++++---------- src/views/dashboard/PublishProcess.vue | 10 ++++++-- src/views/dashboard/ThemeGallery.vue | 6 +++++ src/views/device/deviceConfig.vue | 2 +- src/views/device/index.vue | 1 + src/views/home.vue | 1 - src/views/immediateRelease/index.vue | 19 ++++++++++----- .../materialContent/materialList/index.vue | 22 ++++++++++++----- src/views/publishContent/index.vue | 11 +++++++-- .../publishContent/publishList/index.vue | 5 ++-- .../publishContent/urgentMessage/index.vue | 3 ++- src/views/system/dept/index.vue | 4 ++-- src/views/system/menu/index.vue | 10 ++++---- src/views/system/role/index.vue | 5 ++-- src/views/system/user/index.vue | 8 +++---- 15 files changed, 84 insertions(+), 47 deletions(-) diff --git a/src/assets/styles/adminIndex.scss b/src/assets/styles/adminIndex.scss index d35f2a0..edeef0c 100644 --- a/src/assets/styles/adminIndex.scss +++ b/src/assets/styles/adminIndex.scss @@ -293,7 +293,7 @@ overflow: hidden; text-overflow: ellipsis; } - +// 首页-主题库-按钮 .home_publish_btn { position: absolute; top: 14px; @@ -301,6 +301,7 @@ .el-button { padding: 8px 20px; + margin-left: 20px; font-size: 14px; color: #fff; border: none; @@ -308,10 +309,9 @@ &:first-child { background: linear-gradient(to right, #fc8c6f, #fa544e); } - - &:last-child { - margin-left: 24px; - } + // &:last-child { + // margin-left: 24px; + // } } } .content_warp { @@ -425,13 +425,13 @@ // 弹框右上角多按钮且关闭X出框 .upload_layer { - .el-dialog__headerbtn { - right: -60px; - .el-dialog__close { - color: #fff; - font-size: 26px; - } - } + // .el-dialog__headerbtn { + // right: -60px; + // .el-dialog__close { + // color: #fff; + // font-size: 26px; + // } + // } .upload_list_right { position: absolute; right: 24px; diff --git a/src/views/dashboard/PublishProcess.vue b/src/views/dashboard/PublishProcess.vue index 29fcae4..7411ecd 100644 --- a/src/views/dashboard/PublishProcess.vue +++ b/src/views/dashboard/PublishProcess.vue @@ -7,7 +7,7 @@

发布流程

- + 设置时间 @@ -35,7 +35,13 @@ export default { mounted() { }, methods: { - + publishHandle(index) { + this.$router.push( + { + path: '/release', query: { tag: index } + } + ) + } } } diff --git a/src/views/dashboard/ThemeGallery.vue b/src/views/dashboard/ThemeGallery.vue index c256eee..577d61a 100644 --- a/src/views/dashboard/ThemeGallery.vue +++ b/src/views/dashboard/ThemeGallery.vue @@ -22,6 +22,7 @@
即时发布 定时发布 + 多选
@@ -85,5 +86,10 @@ export default { overflow: hidden; } } + .publish_muilt_btn{ + padding: 6px 20px; + border: 1px solid #3a8aeb; + color: #3a8aeb; + } } diff --git a/src/views/device/deviceConfig.vue b/src/views/device/deviceConfig.vue index 34aba5d..1ad6891 100644 --- a/src/views/device/deviceConfig.vue +++ b/src/views/device/deviceConfig.vue @@ -52,7 +52,7 @@
- +

开机时间

diff --git a/src/views/device/index.vue b/src/views/device/index.vue index 3c1f284..bdea0eb 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -91,6 +91,7 @@ diff --git a/src/views/home.vue b/src/views/home.vue index cf43abf..5132dca 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -11,7 +11,6 @@ --> - diff --git a/src/views/immediateRelease/index.vue b/src/views/immediateRelease/index.vue index bf9ced4..eb0a916 100644 --- a/src/views/immediateRelease/index.vue +++ b/src/views/immediateRelease/index.vue @@ -24,6 +24,7 @@ 关闭 + 第一步：设置时间 @@ -95,6 +96,7 @@ + 第二步：选择内容 @@ -177,10 +179,11 @@ - +
@@ -246,6 +249,10 @@ />
+
+ 确 定 + 取 消 +
@@ -293,9 +300,9 @@
内容时长：{{ item.time }}
-
-
保存
-
取消
+
+ 保 存 + 取 消
@@ -764,12 +771,12 @@ export default { margin-right: 8px; } } - .el-input__inner{ + ::v-deep .el-input__inner{ text-align: center; height: 26px; line-height: 26px; } - .el-input__icon{ + ::v-deep .el-input__icon{ line-height: 26px; } } diff --git a/src/views/materialContent/materialList/index.vue b/src/views/materialContent/materialList/index.vue index dd0a818..556b37e 100644 --- a/src/views/materialContent/materialList/index.vue +++ b/src/views/materialContent/materialList/index.vue @@ -34,6 +34,7 @@
- 保存 - 关闭 + 保 存 + 取 消
@@ -96,6 +97,7 @@ @@ -142,15 +144,15 @@ >
点击上传
-
返回
+
返回
- 即时发布 - 定时发布 + 即时发布 + 定时发布
确定 - 取消 + 取消
@@ -296,6 +299,13 @@ export default { this.start() }, methods: { + publishHandle(index) { + this.$router.push( + { + path: '/release', query: { tag: index } + } + ) + }, handleMkdir() { this.mkdirVisible = true }, diff --git a/src/views/publishContent/index.vue b/src/views/publishContent/index.vue index a2ce19b..9394ed7 100644 --- a/src/views/publishContent/index.vue +++ b/src/views/publishContent/index.vue @@ -14,8 +14,8 @@
- 即时发布 - 定时发布 + 即时发布 + 定时发布
紧急发布 @@ -39,6 +39,13 @@ export default { methods: { handleClick(tab, event) { console.log(tab, event) + }, + publishHandle(index) { + this.$router.push( + { + path: '/release', query: { tag: index } + } + ) } } } diff --git a/src/views/publishContent/publishList/index.vue b/src/views/publishContent/publishList/index.vue index 0a5c770..5e11de5 100644 --- a/src/views/publishContent/publishList/index.vue +++ b/src/views/publishContent/publishList/index.vue @@ -82,11 +82,12 @@ - +
保存 - 关闭 + 关闭
diff --git a/src/views/publishContent/urgentMessage/index.vue b/src/views/publishContent/urgentMessage/index.vue index 5269c68..634acdd 100644 --- a/src/views/publishContent/urgentMessage/index.vue +++ b/src/views/publishContent/urgentMessage/index.vue @@ -43,6 +43,7 @@ @@ -149,7 +150,7 @@
保存 - 关闭 + 关闭
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index a973e40..998d57d 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -40,6 +40,7 @@
新增 - 关闭 + 关闭
添加 - 关闭 + 关闭
@@ -121,7 +121,7 @@ export default { name: 'Menu', components: { rrOperation, DateRangePicker }, cruds() { - return CRUD({ title: '菜单', url: 'api/menus', crudMethod: { ...crudMenu } }) + return CRUD({ title: '菜单', url: 'api/menus', crudMethod: { ...crudMenu }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { @@ -206,7 +206,7 @@ export default { }, getSupDepts(id) { crudMenu.getMenuSuperior(id).then(res => { - const children = res.map(function (obj) { + const children = res.map(function(obj) { if (!obj.leaf && !obj.children) { obj.children = null } @@ -218,7 +218,7 @@ export default { loadMenus({ action, parentNode, callback }) { if (action === LOAD_CHILDREN_OPTIONS) { crudMenu.getMenusTree(parentNode.id).then(res => { - parentNode.children = res.map(function (obj) { + parentNode.children = res.map(function(obj) { if (!obj.leaf) { obj.children = null } diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 08a46cd..54e31c1 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -28,7 +28,7 @@
新增 - 关闭 + 关闭
保存 - 关闭 + 关闭
保存 - 关闭 + 关闭