diff --git a/data-room-ui/packages/BigScreenDesign/CloseDialog/index.vue b/data-room-ui/packages/BigScreenDesign/CloseDialog/index.vue deleted file mode 100644 index 2b74df41..00000000 --- a/data-room-ui/packages/BigScreenDesign/CloseDialog/index.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - diff --git a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue index 6a68a8ba..0e0319dd 100644 --- a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue +++ b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue @@ -10,16 +10,21 @@ {{ pageInfo.name }}
- 缩放比例 + 缩放 + + 自适应 + -
@@ -127,7 +127,6 @@ import cloneDeep from 'lodash/cloneDeep' import uniqBy from 'lodash/uniqBy' import { stringifyObjectFunctions } from 'data-room-ui/js/utils/evalFunctions' import AssignDialog from 'data-room-ui/BigScreenDesign/AssignDialog/index.vue' -import CloseDialog from 'data-room-ui/BigScreenDesign/CloseDialog/index.vue' import HistoryList from 'data-room-ui/BigScreenDesign/HistoryList/index.vue' import CusBtn from './BtnLoading' import icons from 'data-room-ui/assets/images/alignIcon/export' @@ -146,7 +145,6 @@ export default { AssignDialog, CusBtn, HistoryList, - CloseDialog }, props: { code: { @@ -340,11 +338,21 @@ export default { } }, goBackManage () { - this.$refs.CloseDialog.init() - }, - async backSave () { - await this.save() - this.backManagement() + this.$confirm('确定返回主页面吗?未保存的配置将会丢失。', '提示', { + distinguishCancelAndClose: true, + confirmButtonText: '保存后离开页面', + cancelButtonText: '离开页面', + cancelButtonClass: 'cancel-btn', + type: 'warning', + customClass: 'bs-el-message-box' + }).then( async() => { + await this.save() + await this.backManagement() + }).catch((action) => { + if (action === 'cancel') { + this.backManagement() + } + }) }, backManagement () { this.$router.push({ path: this.pageInfo.type === 'component' ? (window.BS_CONFIG?.routers?.componentUrl || '/big-screen-components') : (window.BS_CONFIG?.routers?.pageManagementUrl || '/home') }) @@ -648,5 +656,9 @@ export default { background: var(--bs-el-background-1); color: var(--bs-el-text); border: 0 !important; + width: 100px; } +// .bs-el-input-number{ + +// }