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

feat: asset侧滑切回重构后的

Browse Source
This commit is contained in:
陈劲松
2020-02-26 16:51:32 +08:00
parent 3e27b9a659
commit 54bfb5266f
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,12 +121,12 @@
<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=""
ref="addEndpointBox"></asset-box>-->
<add-endpoint-box :currentProject="currentProject" :currentModule="currentModule" @reload="" <add-endpoint-box :currentProject="currentProject" :currentModule="currentModule" @reload=""
ref="addEndpointBox"></add-endpoint-box> ref="addEndpointBox"></add-endpoint-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>-->
<asset-box :edit-unit-show='addUnitShow' @refreshData="refreshAsset" @sendStateData="closeAsset"
ref="assetAddUnit"></asset-box>
<alert-config-box :parentAlertRule="alertRule" @reload="" ref="alertConfigBox"></alert-config-box> <alert-config-box :parentAlertRule="alertRule" @reload="" ref="alertConfigBox"></alert-config-box>
<change-password :cur-user="username" :show-dialog="showChangePwd" @click="showPwdDialog" @dialogClosed="dialogClosed"></change-password> <change-password :cur-user="username" :show-dialog="showChangePwd" @click="showPwdDialog" @dialogClosed="dialogClosed"></change-password>
</div> </div>

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

@@ -176,12 +176,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-edit-unit :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl" <asset-edit-unit :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl"
ref="assetEditUnit"></asset-edit-unit> ref="assetEditUnit"></asset-edit-unit>-->
<!--<asset-box :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl" <asset-box :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl"
ref="assetEditUnit"></asset-box>--> ref="assetEditUnit"></asset-box>
<element-set <element-set
v-clickoutside="elementsetHide" v-clickoutside="elementsetHide"
:drop-col="dropCol" :drop-col="dropCol"
@@ -632,9 +632,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;

4
nezha-fronted/src/main.js
View File

@@ -65,7 +65,7 @@ Vue.use(ElementUI);
Vue.use(Vuex); Vue.use(Vuex);
Vue.use(VueResource); Vue.use(VueResource);
const exceptClassName = []; const exceptClassName = []; //clickoutside排除的class
const clickoutside = { const clickoutside = {
// 初始化指令 // 初始化指令
bind(el, binding, vnode) { bind(el, binding, vnode) {
@@ -77,7 +77,7 @@ const clickoutside = {
let attrs = e.target.attributes; let attrs = e.target.attributes;
for (let i = 0; i < attrs.length; i++) { for (let i = 0; i < attrs.length; i++) {
if (attrs[i].name == 'class') { if (attrs[i].name == 'class') {
console.info(attrs[i].value)
if ((attrs[i].value + '').indexOf("el-select-dropdown") != -1) { if ((attrs[i].value + '').indexOf("el-select-dropdown") != -1) {
flag = false; flag = false;
break; break;