diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue index c5c6fd32..b55957a4 100644 --- a/packages/bigscreen/designer/components/Layout.vue +++ b/packages/bigscreen/designer/components/Layout.vue @@ -60,30 +60,30 @@ height: bigscreenHeight + 'px' }"> + style="height: 100%" + :title="$route.query.name" + :theme="dashboard.theme" + :background="dashboard.theme == 1 ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj_bg.png' : (dashboard.backgroundImage.length ? dashboard.backgroundImage[0].url : '')">
+ :w="item.width" + :h="item.height" + :x="item.left" + :y="item.top" + :scale="heightScale" + :z="item.zIndex || 0" + :parent="true" + :resizable="item.type !== 'display' || item.display === 'summary2' || item.display === 'summary3'" + class-name-active="drag-active" + :class="[activeIndex === index ? 'drag-active' : '']" + class="draggable" + @contextmenu.native.stop="e => onContextmenu(e, index)" + @dragstop="(x, y) => onDrag(x, y,item)" + @resizestop="(x, y, w, h) => onResizing(x, y, w, h, item)" + @activated="onActivated(index)" + @click.native.stop="activeIndex = index" + v-for="(item, index) in componentList" + :key="index">
@@ -225,6 +225,7 @@ import VueDraggableResizable from 'vue-draggable-resizable' import 'vue-draggable-resizable/dist/VueDraggableResizable.css' import DataConfig from './form/DataConfig.vue' import ComponentConfig from "./form/componentConfig"; +import {mapActions} from "vuex" export default { name: "designDashboard", @@ -310,6 +311,7 @@ export default { }, methods: { + ...mapActions(['closePage']), copy(link) { let oInput = document.createElement('input') oInput.value = link @@ -373,6 +375,7 @@ export default { } else { this.$router.back() } + this.closePage() }, save() { const {did: id} = this.$route.query, {dashboard} = this @@ -482,7 +485,7 @@ export default { color: #fff; background: #1d1e1f; - :deep( .dv-scroll-board ){ + :deep( .dv-scroll-board ) { height: calc(100%) !important; .header-item { @@ -566,17 +569,17 @@ export default { opacity: 0.8; } - :deep( .el-upload-list--picture-card), :deep(.el-upload-list__item-thumbnail), :deep( .uploader ){ + :deep( .el-upload-list--picture-card), :deep(.el-upload-list__item-thumbnail), :deep( .uploader ) { width: 232px; height: 120px; } - :deep( .el-upload-list--picture-card .el-upload-list__item ){ + :deep( .el-upload-list--picture-card .el-upload-list__item ) { width: 232px; height: 120px; } - :deep( .el-upload--picture-card ){ + :deep( .el-upload--picture-card ) { background-color: transparent; } @@ -603,7 +606,7 @@ export default { } } - :deep( #dv-full-screen-container ){ + :deep( #dv-full-screen-container ) { width: 100% !important; height: 100% !important; } @@ -871,11 +874,11 @@ export default { width: 100%; padding: 18px 0 0 18px; - :deep( .vue-ruler-ref-line-v), :deep( .vue-ruler-ref-line-h ){ + :deep( .vue-ruler-ref-line-v), :deep( .vue-ruler-ref-line-h ) { display: none; } - :deep( .vue-ruler-v ){ + :deep( .vue-ruler-v ) { .n { transform: rotate(180deg); } @@ -895,7 +898,7 @@ export default { } } - :deep( .handle ){ + :deep( .handle ) { border-radius: 100%; border: none; background-color: #09f; @@ -944,7 +947,7 @@ export default { border-left: 1px solid #000000; background: #1D2127; - :deep(.el-input-number ){ + :deep(.el-input-number ) { width: 106px; margin-right: 20px; @@ -966,7 +969,7 @@ export default { } } - :deep(.layout-right__content ){ + :deep(.layout-right__content ) { height: calc(100% - 40px); overflow-y: overlay; overflow-x: hidden;