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:
@changcode
2021-07-13 10:39:13 +08:00
parent 7a23f62af3
commit 06df56e547
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
View File

@@ -17,7 +17,7 @@
</el-input> </el-input>
</div> </div>
<pick-time ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :use-chart-unit="false"></pick-time> <pick-time ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :use-chart-unit="false"></pick-time>
<button id="asset-create-asset" v-has="'panel_chart_add'" :title="$t('overall.createAsset')" class="top-tool-btn margin-r-10" @click.stop="addChart"> <button id="asset-create-asset" v-has="'panel_chart_add'" :title="$t('overall.createChart')" class="top-tool-btn margin-r-10" @click.stop="addChart">
<i class="nz-icon nz-icon-create-square"></i> <i class="nz-icon nz-icon-create-square"></i>
</button> </button>
<top-tool-more-options <top-tool-more-options
@@ -48,7 +48,7 @@
</el-input> </el-input>
</div> </div>
<pick-time ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :use-chart-unit="false"></pick-time> <pick-time ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :use-chart-unit="false"></pick-time>
<button id="endpoint-create-chart" v-has="'panel_chart_add'" :title="$t('overall.createAsset')" class="top-tool-btn margin-r-10" @click.stop="addChart"> <button id="endpoint-create-chart" v-has="'panel_chart_add'" :title="$t('overall.createChart')" class="top-tool-btn margin-r-10" @click.stop="addChart">
<i class="nz-icon nz-icon-create-square"></i> <i class="nz-icon nz-icon-create-square"></i>
</button> </button>
<top-tool-more-options <top-tool-more-options

2
nezha-fronted/src/components/common/language/cn.js
View File

@@ -71,7 +71,7 @@ const cn = {
createProject: '新增系统', createProject: '新增系统',
createEndpoint: '新增 Endpoint', createEndpoint: '新增 Endpoint',
batchEndpoint: '批量修改Endpoint', batchEndpoint: '批量修改Endpoint',
createAsset: '新增图表', createAsset: '新增资产',
createAlertRule: '新增告警规则', createAlertRule: '新增告警规则',
createUser: '新增用户', createUser: '新增用户',
createRole: '新增角色', createRole: '新增角色',

2
nezha-fronted/src/components/common/language/en.js
View File

@@ -77,7 +77,7 @@ const en = {
createProject: 'New project', createProject: 'New project',
createEndpoint: 'New endpoint', createEndpoint: 'New endpoint',
batchEndpoint: 'Batch modify endpoint', batchEndpoint: 'Batch modify endpoint',
createAsset: 'New chart', createAsset: 'New asset',
createAlertRule: 'New alert rule', createAlertRule: 'New alert rule',
createUser: 'New user', createUser: 'New user',
createRole: 'New role', createRole: 'New role',