style:调整topo图在overView的样式;

Nez-849 feat:datacenter,cabinet 增加 导入 导出按钮
This commit is contained in:
zhangyu
2021-07-20 10:55:27 +08:00
parent cd3c20cd51
commit aa693fb13a
4 changed files with 47 additions and 2744 deletions

View File

@@ -30,6 +30,21 @@
<button id="asset-create-asset" v-has="'dc_add'" class="top-tool-btn margin-r-10" @click.stop="add"> <button id="asset-create-asset" v-has="'dc_add'" class="top-tool-btn margin-r-10" @click.stop="add">
<i class="nz-icon nz-icon-create-square"></i> <i class="nz-icon nz-icon-create-square"></i>
</button> </button>
<top-tool-more-options
ref="export"
id="model"
:params="searchLabel"
:permissions="{
import: 'dc_edit',
export: 'dc_view'
}"
class="top-tool-export margin-r-10"
export-file-name="asset"
export-url="/dc/cabinet/export"
import-url="/dc/cabinet/import"
@afterImport="getTableData"
>
</top-tool-more-options>
</template> </template>
<template v-slot:pagination> <template v-slot:pagination>
<Pagination ref="Pagination" :pageObj="pageObj" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize'></Pagination> <Pagination ref="Pagination" :pageObj="pageObj" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize'></Pagination>
@@ -48,6 +63,7 @@ import dataListMixin from '@/components/common/mixin/dataList'
import subDataListMixin from '@/components/common/mixin/subDataList' import subDataListMixin from '@/components/common/mixin/subDataList'
import nzBottomDataList from '@/components/common/bottomBox/nzBottomDataList' import nzBottomDataList from '@/components/common/bottomBox/nzBottomDataList'
import cabinetTable from '@/components/common/table/settings/cabinetTable' import cabinetTable from '@/components/common/table/settings/cabinetTable'
import topToolMoreOptions from "@/components/common/popBox/topToolMoreOptions";
export default { export default {
name: 'cabinetTab', name: 'cabinetTab',
mixins: [dataListMixin, subDataListMixin], mixins: [dataListMixin, subDataListMixin],
@@ -55,7 +71,8 @@ export default {
nzBottomDataList, nzBottomDataList,
'cabinet-box': cabinetBox, 'cabinet-box': cabinetBox,
'delete-button': deleteButton, 'delete-button': deleteButton,
cabinetTable cabinetTable,
topToolMoreOptions
}, },
data () { data () {
return { return {

View File

@@ -4,7 +4,7 @@
</style> </style>
<template> <template>
<div class="project-box list-page" v-loading="topologyLoading" v-has="'topo_list'"> <div class="project-box list-page" v-loading="topologyLoading" v-has="'topo_list'">
<div class="main-list" style="height: calc(100% - 30px)"> <div class="main-list" :style="{height: fromOverView ?'100%' : 'calc(100% - 30px)'}">
<div class="main-container" :class="fromOverView?'from-overview':'from-project'"> <div class="main-container" :class="fromOverView?'from-overview':'from-project'">
<div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 20px);display: inline-block"> <div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 20px);display: inline-block">
<!--工具栏--> <!--工具栏-->
@@ -150,7 +150,9 @@
<popDataInfo :moduleId="moduleId" :projectId="projectInfo.id"></popDataInfo> <popDataInfo :moduleId="moduleId" :projectId="projectInfo.id"></popDataInfo>
</div> </div>
</div> </div>
<div :class="['page',fromOverView?'overview-page':'']" :style="`border: 1px solid ${theme.rightBoxBorderColor};`"> <div :class="['page',fromOverView?'overview-page':'']" :style="{
border: fromOverView ? 'none' :`1px solid ${theme.rightBoxBorderColor}`
}">
<!--画布部分--> <!--画布部分-->
<div :id="'topology-canvas' + topologyIndexF" :ref="'topology-canvas'+ topologyIndexF" class="full" @contextmenu="onContextMenu($event)"></div> <div :id="'topology-canvas' + topologyIndexF" :ref="'topology-canvas'+ topologyIndexF" class="full" @contextmenu="onContextMenu($event)"></div>
<!--设置属性--> <!--设置属性-->

File diff suppressed because it is too large Load Diff

View File

@@ -14,7 +14,28 @@
type="button" @click="add"> type="button" @click="add">
<i class="nz-icon-create-square nz-icon"></i> <i class="nz-icon-create-square nz-icon"></i>
</button> </button>
<delete-button id="account-list-batch-delete" v-has="'dc_delete'" :delete-objs="batchDeleteObjs" api="dc" @after="getTableData" @before="delFlag=true"></delete-button> <top-tool-more-options
ref="export"
id="model"
:params="searchLabel"
:permissions="{
import: 'dc_add',
export: 'dc_view'
}"
class="top-tool-export margin-r-10"
export-file-name="asset"
export-url="/dc/export"
import-url="/dc/import"
@afterImport="getTableData"
>
<template v-slot:before>
<div>
<el-dropdown-item>
<delete-button :type="'link'" :title="$t('overall.batchDel')" id="account-list-batch-delete" v-has="'dc_delete'" :delete-objs="batchDeleteObjs" api="dc" @after="getTableData" @before="delFlag=true"></delete-button>
</el-dropdown-item>
</div>
</template>
</top-tool-more-options>
</template> </template>
<template v-slot:default="slotProps"> <template v-slot:default="slotProps">
<dc-table <dc-table
@@ -53,6 +74,7 @@ import deleteButton from '@/components/common/deleteButton'
import nzDataList from '@/components/common/table/nzDataList' import nzDataList from '@/components/common/table/nzDataList'
import dataListMixin from '@/components/common/mixin/dataList' import dataListMixin from '@/components/common/mixin/dataList'
import dcTable from '@/components/common/table/settings/dcTable' import dcTable from '@/components/common/table/settings/dcTable'
import topToolMoreOptions from '@/components/common/popBox/topToolMoreOptions'
export default { export default {
name: 'dc', name: 'dc',
components: { components: {
@@ -61,7 +83,8 @@ export default {
deleteButton, deleteButton,
nzDataList, nzDataList,
dcTable, dcTable,
cabinetBox cabinetBox,
topToolMoreOptions
}, },
mixins: [dataListMixin], mixins: [dataListMixin],
data () { data () {