gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 暂时回滚asset侧滑框

Browse Source
This commit is contained in:
陈劲松
2020-02-20 10:47:37 +08:00
parent 38d4587966
commit 55d2a38283
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/common/header.vue
View File

@@ -114,8 +114,8 @@
<panel-box :panel="editPanel" @reload="panelListReload" @reloadForDel="" ref="panelBox"></panel-box> <panel-box :panel="editPanel" @reload="panelListReload" @reloadForDel="" ref="panelBox"></panel-box>
<project-box :project="editProject" ref="projectBox"></project-box> <project-box :project="editProject" ref="projectBox"></project-box>
<module-box :currentProject="currentProject" :module="editModule" @reload="" ref="moduleBox"></module-box> <module-box :currentProject="currentProject" :module="editModule" @reload="" ref="moduleBox"></module-box>
<asset-box :currentProject="currentProject" :currentModule="currentModule" @reload="" <!--<asset-box :currentProject="currentProject" :currentModule="currentModule" @reload=""
ref="addEndpointBox"></asset-box> ref="addEndpointBox"></asset-box>-->
<asset-add-unit :add-unit-show='addUnitShow' @refreshData="refreshAsset" ref="assetAddUnit" <asset-add-unit :add-unit-show='addUnitShow' @refreshData="refreshAsset" ref="assetAddUnit"
@sendStateData="closeAsset"></asset-add-unit> @sendStateData="closeAsset"></asset-add-unit>
<alert-config-box :parentAlertRule="alertRule" @reload="" ref="alertConfigBox"></alert-config-box> <alert-config-box :parentAlertRule="alertRule" @reload="" ref="alertConfigBox"></alert-config-box>

16
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -167,10 +167,12 @@
<Pagination :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination> <Pagination :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
</div> </div>
<!--<asset-add-unit :add-unit-show='addUnitShow' @refreshData="flushData" ref="assetAddUnit" <asset-add-unit :add-unit-show='addUnitShow' @refreshData="flushData" ref="assetAddUnit"
@sendStateData="tabControl"></asset-add-unit>--> @sendStateData="tabControl"></asset-add-unit>
<asset-box :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl" <asset-edit-unit :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl"
ref="assetEditUnit"></asset-box> ref="assetEditUnit"></asset-edit-unit>
<!--<asset-box :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl"
ref="assetEditUnit"></asset-box>-->
<element-set <element-set
v-clickoutside="elementsetHide" v-clickoutside="elementsetHide"
:drop-col="dropCol" :drop-col="dropCol"
@@ -600,9 +602,9 @@
}, },
tagShow(data, id, type) { tagShow(data, id, type) {
if (data === 'showAdd') { if (data === 'showAdd') {
//this.addUnitShow = true; this.addUnitShow = true;
this.editUnitShow = true; /*this.editUnitShow = true;
this.$refs['assetEditUnit'].getAssetData(''); this.$refs['assetEditUnit'].getAssetData('');*/
} }
if (data === 'showEdit') { if (data === 'showEdit') {
this.editUnitShow = true; this.editUnitShow = true;