xuhuajiao
/
canvasScreen_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

统一弹框

dev
xuhuajiao 4 years ago
parent
94d88e4df7
commit
2e980578f4
15 changed files with 84 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/assets/styles/adminIndex.scss
  2. 10
      src/views/dashboard/PublishProcess.vue
  3. 6
      src/views/dashboard/ThemeGallery.vue
  4. 2
      src/views/device/deviceConfig.vue
  5. 1
      src/views/device/index.vue
  6. 1
      src/views/home.vue
  7. 19
      src/views/immediateRelease/index.vue
  8. 22
      src/views/materialContent/materialList/index.vue
  9. 11
      src/views/publishContent/index.vue
  10. 5
      src/views/publishContent/publishList/index.vue
  11. 3
      src/views/publishContent/urgentMessage/index.vue
  12. 4
      src/views/system/dept/index.vue
  13. 10
      src/views/system/menu/index.vue
  14. 5
      src/views/system/role/index.vue
  15. 8
      src/views/system/user/index.vue

24
src/assets/styles/adminIndex.scss
View File

@ -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;

10
src/views/dashboard/PublishProcess.vue
View File

@ -7,7 +7,7 @@
</svg>
<h4>发布流程</h4>
</div>
<el-row class="publish_step">
<el-row class="publish_step" @click.native="publishHandle(0)">
<el-col :xs="24" :sm="24" :lg="8" class="step">
<img src="@/assets/images/home/s-t1.png" />
<el-button type="primary" round>设置时间</el-button>
@ -35,7 +35,13 @@ export default {
mounted() {
},
methods: {
publishHandle(index) {
this.$router.push(
{
path: '/release', query: { tag: index }
}
)
}
}
}
</script>

6
src/views/dashboard/ThemeGallery.vue
View File

@ -22,6 +22,7 @@
<div class="home_publish_btn">
<el-button round @click="publishHandle(0)">即时发布</el-button>
<el-button round type="primary" @click="publishHandle(1)">定时发布</el-button>
<el-button round class="publish_muilt_btn">多选</el-button>
</div>
</div>
</template>
@ -85,5 +86,10 @@ export default {
overflow: hidden;
}
}
.publish_muilt_btn{
padding: 6px 20px;
border: 1px solid #3a8aeb;
color: #3a8aeb;
}
}
</style>

2
src/views/device/deviceConfig.vue
View File

@ -52,7 +52,7 @@
</el-row>
<!-- 编辑设备 -->
<div class="layer device_layer">
<el-dialog title="配置" :close-on-click-modal="false" :visible.sync="addFromVisible" width="880px">
<el-dialog title="配置" :close-on-click-modal="false" :show-close="false" :visible.sync="addFromVisible" width="880px">
<el-form ref="form" :model="form">
<div class="setting_item">
<h4>开机时间</h4>

1
src/views/device/index.vue
View File

@ -91,6 +91,7 @@
<el-dialog
:title="dialogTitle"
:close-on-click-modal="false"
:show-close="false"
:visible.sync="addFromVisible"
width="576px"
>

1
src/views/home.vue
View File

@ -11,7 +11,6 @@
<el-col :xs="24" :sm="24" :lg="8">
<agency-data />
</el-col> -->
<publish-process />
<device-data />
<agency-data />

19
src/views/immediateRelease/index.vue
View File

@ -24,6 +24,7 @@
<el-button round type="primary">关闭</el-button>
</el-col>
</el-row>
<!-- 第一步：设置时间 -->
<el-row class="in_release_item">
<el-col class="step_1">第一步：设置时间</el-col>
<el-col class="step_form">
@ -95,6 +96,7 @@
</el-form-item>
</el-col>
</el-row>
<!-- 第二步：选择内容 -->
<el-row class="in_release_item">
<el-col class="step_1">第二步：选择内容</el-col>
<el-col class="step_form">
@ -177,10 +179,11 @@
</el-col>
</el-row>
</el-form>
<!-- 选择素材 -->
<!-- 第二步：选择内容 - 选择素材 -->
<div class="release_layer">
<el-dialog
:close-on-click-modal="false"
:show-close="false"
:visible.sync="selectContVisible"
width="1000px"
>
@ -246,6 +249,10 @@
/>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" round @click="submitForm('form')">确 定</el-button>
<el-button round @click="selectContVisible = false">取 消</el-button>
</div>
</el-dialog>
</div>
<!-- 编辑播放内容 -->
@ -293,9 +300,9 @@
<div v-else class="edit_cont_other">内容时长：{{ item.time }}</div>
</div>
</div>
<div class="upload_list_right">
<div class="save_btn">保存</div>
<div class="upload_return">取消</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" round @click="submitForm('form')">保 存</el-button>
<el-button round @click="listEditVisible = false">取 消</el-button>
</div>
</el-dialog>
</div>
@ -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;
}
}

22
src/views/materialContent/materialList/index.vue
View File

@ -34,6 +34,7 @@
<el-dialog
:title="layerTitle"
:close-on-click-modal="false"
:show-close="false"
:visible.sync="mkdirVisible"
width="616px"
height="384px"
@ -84,8 +85,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="crud.status.cu === 2" type="primary" round @click="crud.submitCU">保存</el-button>
<el-button round @click="crud.cancelCU">关闭</el-button>
<el-button :loading="crud.status.cu === 2" type="primary" round @click="crud.submitCU">保 存</el-button>
<el-button round @click="mkdirVisible=false">取 消</el-button>
</div>
</el-dialog>
</div>
@ -96,6 +97,7 @@
<el-dialog
title="上传列表"
:close-on-click-modal="false"
:show-close="false"
:visible.sync="uploadListVisible"
height="384px"
>
@ -142,15 +144,15 @@
>
<div class="right_upload">点击上传</div>
</el-upload>
<div class="upload_return">返回</div>
<div class="upload_return" @click="uploadListVisible=false">返回</div>
</div>
</el-dialog>
</div>
<!-- 多选操作 -->
<div v-if="contentIds.length !== 0" class="multi_handle">
<el-button type="button" class="mulit_btn">即时发布</el-button>
<el-button type="button" class="mulit_btn">定时发布</el-button>
<el-button type="button" class="mulit_btn" @click="publishHandle(0)">即时发布</el-button>
<el-button type="button" class="mulit_btn" @click="publishHandle(1)">定时发布</el-button>
<el-button
type="button"
class="mulit_btn"
@ -168,6 +170,7 @@
<el-dialog
title="移动至"
:close-on-click-modal="false"
:show-close="false"
:visible.sync="movingVisible"
width="576px"
height="384px"
@ -187,7 +190,7 @@
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" round>确定</el-button>
<el-button round @click="crud.cancelCU">取消</el-button>
<el-button round @click="movingVisible=false">取消</el-button>
</div>
</el-dialog>
</div>
@ -296,6 +299,13 @@ export default {
this.start()
},
methods: {
publishHandle(index) {
this.$router.push(
{
path: '/release', query: { tag: index }
}
)
},
handleMkdir() {
this.mkdirVisible = true
},

11
src/views/publishContent/index.vue
View File

@ -14,8 +14,8 @@
</el-tabs>
</div>
<div v-if="activeName !== 'third'" class="home_publish_btn">
<el-button round>即时发布</el-button>
<el-button round type="primary">定时发布</el-button>
<el-button round @click="publishHandle(0)">即时发布</el-button>
<el-button round type="primary" @click="publishHandle(1)">定时发布</el-button>
</div>
<div v-else class="home_publish_btn">
<el-button round>紧急发布</el-button>
@ -39,6 +39,13 @@ export default {
methods: {
handleClick(tab, event) {
console.log(tab, event)
},
publishHandle(index) {
this.$router.push(
{
path: '/release', query: { tag: index }
}
)
}
}
}

5
src/views/publishContent/publishList/index.vue
View File

@ -82,11 +82,12 @@
<pagination />
</el-col>
</el-row>
<!-- 编辑 -->
<div class="publish_layer">
<el-dialog
title="编辑"
:close-on-click-modal="false"
:show-close="false"
:visible.sync="publishVisible"
width="872px"
height="384px"
@ -220,7 +221,7 @@
round
@click="crud.submitCU"
>保存</el-button>
<el-button round @click="crud.cancelCU">关闭</el-button>
<el-button round @click="publishVisible=false">关闭</el-button>
</div>
</el-dialog>
</div>

3
src/views/publishContent/urgentMessage/index.vue
View File

@ -43,6 +43,7 @@
<el-dialog
title="紧急发布"
:close-on-click-modal="false"
:show-close="false"
:visible.sync="messageVisible"
width="872px"
>
@ -149,7 +150,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="crud.status.cu === 2" type="primary" round @click="crud.submitCU">保存</el-button>
<el-button round @click="crud.cancelCU">关闭</el-button>
<el-button round @click="messageVisible=false">关闭</el-button>
</div>
</el-dialog>
</div>

4
src/views/system/dept/index.vue
View File

@ -40,6 +40,7 @@
<el-dialog
append-to-body
:close-on-click-modal="false"
:show-close="false"
:before-close="crud.cancelCU"
:visible.sync="addDialogVisible"
title="新增"
@ -73,14 +74,13 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="crud.status.cu === 2" type="primary" round @click="crud.submitCU">新增</el-button>
<el-button round @click="crud.cancelCU">关闭</el-button>
<el-button round @click="addDialogVisible=false">关闭</el-button>
</div>
</el-dialog>
<!-- 记录 -->
<el-dialog
append-to-body
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="recordVisible"
title="记录"
class="record_layer"

10
src/views/system/menu/index.vue
View File

@ -32,7 +32,7 @@
<el-dialog
append-to-body
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:show-close="false"
:visible.sync="addDialogVisible"
title="新增菜单"
width="580px"
@ -69,7 +69,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="crud.status.cu === 2" type="primary" round @click="crud.submitCU">添加</el-button>
<el-button round @click="crud.cancelCU">关闭</el-button>
<el-button round @click="addDialogVisible=false">关闭</el-button>
</div>
</el-dialog>
<!-- table -->
@ -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
}

5
src/views/system/role/index.vue
View File

@ -28,7 +28,7 @@
<el-dialog
append-to-body
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:show-close="false"
:visible.sync="roleFormVisible"
:title="crud.status.title"
width="960px"
@ -73,14 +73,13 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="crud.status.cu === 2" type="primary" round @click="crud.submitCU">新增</el-button>
<el-button round @click="crud.cancelCU">关闭</el-button>
<el-button round @click="roleFormVisible=false">关闭</el-button>
</div>
</el-dialog>
<!-- 记录 -->
<el-dialog
append-to-body
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="recordVisible"
title="记录"
class="record_layer"

8
src/views/system/user/index.vue
View File

@ -40,7 +40,7 @@
<el-dialog
append-to-body
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:show-close="false"
:visible.sync="addDialogVisible"
title="新增"
width="576px"
@ -92,14 +92,14 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="crud.status.cu === 2" type="primary" round @click="crud.submitCU">保存</el-button>
<el-button round @click="crud.cancelCU">关闭</el-button>
<el-button round @click="addDialogVisible=false">关闭</el-button>
</div>
</el-dialog>
<!-- 编辑用户 -->
<el-dialog
append-to-body
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:show-close="false"
:visible.sync="editDialogVisible"
title="编辑"
width="576px"
@ -136,7 +136,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="crud.status.cu === 2" type="primary" round @click="crud.submitCU">保存</el-button>
<el-button round @click="crud.cancelCU">关闭</el-button>
<el-button round @click="editDialogVisible=false">关闭</el-button>
</div>
</el-dialog>
<!--表格渲染-->

Write Preview
Loading…
Cancel
Save