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

Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.5

Browse Source
This commit is contained in:
zyh
2022-09-02 16:21:10 +08:00
parent 9f139ae227 43cd10f23b
commit 80ccd815de
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss Normal file
View File

@@ -0,0 +1,9 @@
.right-box-asset-meta{
.datetime-header{
display: inline-block;
width: 80px;
margin-right: 10px;
text-align: right;
color: $--color-text-regular;
}
}

1
nezha-fronted/src/assets/css/components/index.scss
View File

@@ -48,6 +48,7 @@
@import './common/rightBox/batchModifyEndpoint.scss';
@import './common/rightBox/editEndpointBoxNew.scss';
@import './common/rightBox/locationCascader.scss';
@import './common/rightBox/assetMetaBox.scss';
@import './common/rightBox/menuBox.scss';
@import './common/rightBox/moduleBox.scss';
@import './common/rightBox/ipam.scss';

4
nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
View File

@@ -163,7 +163,9 @@
}
.cm-line{
color: $--color-text-regular,
}
.ͼ2 .cm-content{
caret-color:$--color-text-regular;
}
.el-col .el-col-24 .metric-selector-input-box{

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

@@ -490,10 +490,4 @@ export default {
.meta-option-box{
}
.datetime-header{
display: inline-block;
width: 80px;
margin-right: 10px;
text-align: right;
}
</style>

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

@@ -52,7 +52,7 @@
</el-form-item>
<!--state-->
<el-form-item :label="$t('overall.state')" prop="state">
<el-select v-model="editIssue.state" placeholder='' clearable size="small" value-key="state" class="type-select">
<el-select v-model="editIssue.state" placeholder='' size="small" value-key="state" class="type-select">
<el-option v-for="item in stateData" :key="item.id" :label="item.value" :value="item.id">
{{item.value}}
</el-option>

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

@@ -25,7 +25,7 @@
</el-form-item>
<!--type-->
<el-form-item :label="$t('overall.type')" prop="type" >
<el-select v-model="editRecordRule.type" class="right-box__select" clearable placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
<el-select v-model="editRecordRule.type" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
<el-option :label="$t('overall.metrics')" value="1">{{$t('overall.metrics')}}</el-option>
<el-option :label="$t('overall.logs')" value="2">{{$t('overall.logs')}}</el-option>
</el-select>
@@ -73,7 +73,7 @@
</el-form-item>
<!--state-->
<el-form-item :label="$t('overall.state')" prop="state" >
<el-select v-model="editRecordRule.state" class="right-box__select" clearable placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
<el-select v-model="editRecordRule.state" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
<el-option :label="$t('overall.disabled')" value="0">{{$t('overall.disabled')}}</el-option>
<el-option :label="$t('overall.enabled')" value="1">{{$t('overall.enabled')}}</el-option>
</el-select>