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

fix：解决冲突

Browse Source
This commit is contained in:
zyh
2023-10-26 14:31:53 +08:00
parent f852d179e2 9a1e338310
commit 6bf3e6bc9d
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss
View File

@@ -357,6 +357,7 @@
font-size: 14px; font-size: 14px;
color: $--color-text-primary; color: $--color-text-primary;
line-height: 20px; line-height: 20px;
white-space: pre-wrap;
} }
} }

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

@@ -762,9 +762,9 @@
<el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside"> <el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside">
<div class="columns-dispaly-pop" style="width:396px"> <div class="columns-dispaly-pop" style="width:396px">
<div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$labels.&lt;label name&gt;}}</div> <div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$labels.&lt;label name&gt;}}</div>
<div class="columns-dispaly-msg">{{$t('tip.expressionLabel')}}{{$t('tip.$labels')}}</div> <div class="columns-dispaly-msg">{{$t('tip.expressionLabel',{expr:"\{\{A.$labels.asset\}\}"})}}</div>
<div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$value}}</div> <div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$value}}</div>
<div class="columns-dispaly-msg">{{$t('tip.expressionValue')}}</div> <div class="columns-dispaly-msg">{{$t('tip.expressionValue',{expr:"\{\{A.$value\}\}"})}}</div>
</div> </div>
<span slot="reference"> <span slot="reference">
<i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i> <i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>

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

@@ -506,9 +506,9 @@
<el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside"> <el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside">
<div class="columns-dispaly-pop" style="width:396px"> <div class="columns-dispaly-pop" style="width:396px">
<div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$labels.&lt;label name&gt;}}</div> <div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$labels.&lt;label name&gt;}}</div>
<div class="columns-dispaly-msg">{{$t('tip.expressionLabel')}}{{$t('tip.$labels')}}</div> <div class="columns-dispaly-msg">{{$t('tip.expressionLabel',{expr:"\{\{System.$labels.asset\}\}"})}}</div>
<div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$value}}</div> <div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$value}}</div>
<div class="columns-dispaly-msg">{{$t('tip.expressionValue')}}</div> <div class="columns-dispaly-msg">{{$t('tip.expressionValue',{expr:"\{\{System.$value\}\}"})}}</div>
</div> </div>
<span slot="reference"> <span slot="reference">
<i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i> <i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>