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

Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck

Browse Source
This commit is contained in:
zhangyu
2020-12-16 18:00:07 +08:00
parent 6c0f26f170 f3e53608a4
commit 1561e3d7c0
6 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/components/common/login.vue
View File

@@ -230,11 +230,13 @@ export default {
} }
.login-foot-buildOn{ .login-foot-buildOn{
position: absolute; position: absolute;
bottom: 30px; bottom: 20px;
z-index: 100; z-index: 100;
left: calc(50% - 90px); left: calc(50% - 90px);
a{ a{
color: white; font-size: 14px;
color: #eee;
text-shadow: 1px 1px 3px #333;
text-decoration: none; text-decoration: none;
} }
} }

3
nezha-fronted/src/components/common/pickTime.vue
View File

@@ -157,4 +157,7 @@
.interval-refresh-popover{ .interval-refresh-popover{
min-width: unset !important; min-width: unset !important;
} }
.sub-top-tools .interval-refresh {
margin-top: -1px;
}
</style> </style>

25
nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
View File

@@ -16,8 +16,8 @@
:highlight-first-item="true" :highlight-first-item="true"
@input="hostInputChange" @input="hostInputChange"
@blur="validateHostEmpty" @blur="validateHostEmpty"
></el-autocomplete> ></el-autocomplete><el-popover
<el-popover trigger="click" placement="bottom" @show="popShow" @hide="popHide" popper-class="no-style-class"> @hide="popHide" @show="popShow" placement="bottom" popper-class="no-style-class" trigger="click">
<div class="mib-browser-ad-search"> <div class="mib-browser-ad-search">
<el-row class="mib-browser-ad-search-item" style="font-weight: bold">{{$t('config.dc.traffic.snmpSetting')}}</el-row> <el-row class="mib-browser-ad-search-item" style="font-weight: bold">{{$t('config.dc.traffic.snmpSetting')}}</el-row>
<el-row class="mib-browser-ad-search-item"> <el-row class="mib-browser-ad-search-item">
@@ -112,7 +112,14 @@
<i class="el-icon-more"></i> <i class="el-icon-more"></i>
</button> </button>
</el-popover> </el-popover>
<span class="right-box-form-minus-box" @click="delSelf" style="vertical-align: middle"><i class="nz-icon nz-icon-minus"></i></span> <span @click="delSelf" class="right-box-form-minus-box"
style="vertical-align: middle;right: 0;
position: absolute;
line-height: 21px;
height: 21px;
top: 50%;
transform: translateY(-50%);"
><i class="nz-icon nz-icon-minus"></i></span>
<div> <div>
<span style="color:#F56C6C;font-size: 12px;" v-if="hostRepeat">{{$t('validate.repeat')}}</span> <span style="color:#F56C6C;font-size: 12px;" v-if="hostRepeat">{{$t('validate.repeat')}}</span>
<span style="color:#F56C6C;font-size: 12px;" v-if="hostInvalid">{{$t('validate.host')}}</span> <span style="color:#F56C6C;font-size: 12px;" v-if="hostInvalid">{{$t('validate.host')}}</span>
@@ -623,8 +630,8 @@
border-top-left-radius: 0px; border-top-left-radius: 0px;
border-bottom-left-radius: 0px; border-bottom-left-radius: 0px;
height: 30px; height: 30px;
position: relative; top: 1px;
left: -3px; left: -1px;
} }
.asset-config-tab .right-box-row-with-btn{ .asset-config-tab .right-box-row-with-btn{
width: calc(100% - 69px); width: calc(100% - 69px);
@@ -650,14 +657,15 @@
margin-bottom: 5px; margin-bottom: 5px;
height: 20px; height: 20px;
line-height: 18px; line-height: 18px;
justify-content: flex-end; justify-content: center;
} }
.tab-tags-item .tag-item-key{ .tab-tags-item .tag-item-key{
border:1px solid #409eff;; border:1px solid #409eff;;
border-top-left-radius: 3px; border-top-left-radius: 3px;
border-bottom-left-radius: 3px; border-bottom-left-radius: 3px;
background-color: #409eff; background-color: #409eff;
width: 52px; min-width: 40px;
padding: 0 8px;
color: white; color: white;
} }
.tab-tags-item .tag-item-value{ .tab-tags-item .tag-item-value{
@@ -665,7 +673,8 @@
border-top-right-radius: 3px; border-top-right-radius: 3px;
border-bottom-right-radius: 3px; border-bottom-right-radius: 3px;
background-color: #FFF; background-color: #FFF;
width: 52px; min-width: 40px;
padding: 0 8px;
} }
.tab-tags-item .tag-item-text{ .tab-tags-item .tag-item-text{
background-color: #FFF; background-color: #FFF;

2
nezha-fronted/src/components/page/alert/config.vue
View File

@@ -48,7 +48,7 @@
</button> </button>
</template> </template>
</export-excel> </export-excel>
<delete-button :delete-objs="batchDeleteObjs" api="alert/rule" @after="getTableData"></delete-button> <delete-button :delete-objs="batchDeleteObjs" @after="getTableData" api="alert/rule" v-has="'rule_delete'"></delete-button>
</div> </div>
<div class="pagination-top pagination-top-hide display-none"></div> <div class="pagination-top pagination-top-hide display-none"></div>
</div> </div>

2
nezha-fronted/src/components/page/config/model.vue
View File

@@ -15,7 +15,7 @@
<button :title="$t('overall.createModel')" @click="add" class="nz-btn nz-btn-size-normal nz-btn-style-light margin-l-20" id="model-add" v-has="'model_toAdd'"> <button :title="$t('overall.createModel')" @click="add" class="nz-btn nz-btn-size-normal nz-btn-style-light margin-l-20" id="model-add" v-has="'model_toAdd'">
<i class="nz-icon-create-square nz-icon"></i> <i class="nz-icon-create-square nz-icon"></i>
</button> </button>
<delete-button :delete-objs="batchDeleteObjs" api="model" @after="getTableData"></delete-button> <delete-button :delete-objs="batchDeleteObjs" @after="getTableData" api="model" v-has="'model_delete'"></delete-button>
</div> </div>
<div class="pagination-top pagination-top-hide display-none"></div> <div class="pagination-top pagination-top-hide display-none"></div>
</div> </div>

2
nezha-fronted/src/components/page/dashboard/chartBox.vue
View File

@@ -64,7 +64,7 @@
height: 100vh; height: 100vh;
top: 0; top: 0;
left: 0; left: 0;
z-index: 410; z-index: 2100;
} }
/deep/ .el-color-picker{ /deep/ .el-color-picker{
position: absolute; position: absolute;