fix: 解决冲突
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
</el-input>
|
||||
</div>
|
||||
<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>
|
||||
</button>
|
||||
<top-tool-more-options
|
||||
@@ -48,7 +48,7 @@
|
||||
</el-input>
|
||||
</div>
|
||||
<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>
|
||||
</button>
|
||||
<top-tool-more-options
|
||||
|
||||
@@ -71,7 +71,7 @@ const cn = {
|
||||
createProject: '新增系统',
|
||||
createEndpoint: '新增 Endpoint',
|
||||
batchEndpoint: '批量修改Endpoint',
|
||||
createAsset: '新增图表',
|
||||
createAsset: '新增资产',
|
||||
createAlertRule: '新增告警规则',
|
||||
createUser: '新增用户',
|
||||
createRole: '新增角色',
|
||||
|
||||
@@ -77,7 +77,7 @@ const en = {
|
||||
createProject: 'New project',
|
||||
createEndpoint: 'New endpoint',
|
||||
batchEndpoint: 'Batch modify endpoint',
|
||||
createAsset: 'New chart',
|
||||
createAsset: 'New asset',
|
||||
createAlertRule: 'New alert rule',
|
||||
createUser: 'New user',
|
||||
createRole: 'New role',
|
||||
|
||||
Reference in New Issue
Block a user