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

feat：显示system的 Notification

Browse Source
This commit is contained in:
zhangyu
2020-11-21 17:56:33 +08:00
parent db2ba2c46b
commit e6a30550f0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/searchInput.vue
View File

@@ -1625,7 +1625,7 @@
background: #fff; background: #fff;
border-radius: 3px; border-radius: 3px;
box-shadow: 0 2px 4px rgba(0,0,0,0.1); box-shadow: 0 2px 4px rgba(0,0,0,0.1);
z-index: 9; z-index: 101;
overflow-y: auto; overflow-y: auto;
font-size: 12px; font-size: 12px;
} }

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

@@ -136,7 +136,7 @@
</el-form> </el-form>
</div> </div>
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane :label="$t('config.system.notification.notification')" name="notification">&lt;!&ndash;$t('config.system.reset.reset')&ndash;&gt; <el-tab-pane :label="$t('config.system.notification.notification')" name="notification"><!--$t('config.system.reset.reset')-->
<div class="linkBox" > <div class="linkBox" >
<div class="linkTitle"> <div class="linkTitle">
<span class="linkTitleHandle"></span> <span class="linkTitleHandle"></span>
@@ -144,7 +144,7 @@
<div class="linkTitleUrl">{{$t('config.system.notification.filePath')}}</div> <div class="linkTitleUrl">{{$t('config.system.notification.filePath')}}</div>
<div class="linkTitleBtn">{{$t('config.system.notification.operation')}}</div> <div class="linkTitleBtn">{{$t('config.system.notification.operation')}}</div>
</div> </div>
&lt;!&ndash;linkAdd&ndash;&gt; <!--linkAdd-->
<div class="linkContent linkAddBox"> <div class="linkContent linkAddBox">
<span class="linkTitleHandle"></span> <span class="linkTitleHandle"></span>
<el-form :inline="true" :model="notificationTemp" label-width="180px" size="small" ref="notificationTempForm" :rules="notificationRules" :validate-on-rule-change="false" class="reset-form"> <el-form :inline="true" :model="notificationTemp" label-width="180px" size="small" ref="notificationTempForm" :rules="notificationRules" :validate-on-rule-change="false" class="reset-form">
@@ -159,7 +159,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
&lt;!&ndash;notificationEdit&ndash;&gt; <!--notificationEdit-->
<div class="scrollBox" <div class="scrollBox"
v-scrollBar> v-scrollBar>
<draggable v-model="notification" <draggable v-model="notification"
@@ -188,11 +188,11 @@
<div class="linkFormContent" v-else> <div class="linkFormContent" v-else>
<div class="linkTitleName" :title="item.name">{{item.name}}</div> <div class="linkTitleName" :title="item.name">{{item.name}}</div>
<div class="linkTitleUrl"> <div class="linkTitleUrl">
&lt;!&ndash;<span class="linkTitleUrlContent" @click="openUrl(item)" @dblclick.stop="linkEdit(item)">&ndash;&gt; <!--<span class="linkTitleUrlContent" @click="openUrl(item)" @dblclick.stop="linkEdit(item)">-->
&lt;!&ndash;<el-tooltip class="item" effect="dark" :content="item.url" placement="top" popper-class="linkUrlTip">&ndash;&gt; <!--<el-tooltip class="item" effect="dark" :content="item.url" placement="top" popper-class="linkUrlTip">-->
<span>{{item.filePath}}</span> <span>{{item.filePath}}</span>
&lt;!&ndash;</el-tooltip>&ndash;&gt; <!--</el-tooltip>-->
&lt;!&ndash;</span>&ndash;&gt; <!--</span>-->
</div> </div>
<div class="linkFormBtn"> <div class="linkFormBtn">
<i class="nz-icon nz-icon-edit" @click.stop="notificationEdit(item)"></i> <i class="nz-icon nz-icon-edit" @click.stop="notificationEdit(item)"></i>
@@ -203,7 +203,7 @@
</draggable> </draggable>
</div> </div>
</div> </div>
</el-tab-pane>--> </el-tab-pane>
<el-tab-pane :label="$t('config.system.link.link')" name="link"><!--$t('config.system.reset.reset')--> <el-tab-pane :label="$t('config.system.link.link')" name="link"><!--$t('config.system.reset.reset')-->
<div class="linkBox" > <div class="linkBox" >
<div class="linkTitle"> <div class="linkTitle">