Skip to content

Commit

Permalink
[bug]solve warn module lang-CN error (#24)
Browse files Browse the repository at this point in the history 
* solve warn module lang-CN error
  • Loading branch information
@tangtangdady
tangtangdady committed Feb 24, 2023
1 parent 67b1a95 commit a4f003c
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 34 deletions.
2 changes: 1 addition & 1 deletion web-app/src/lang/zh.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ export default {
"phone":"电话",
"phone.placeholder":"请输入电话",
"email":"邮箱",
"email.tip":"请输入邮箱",
"email.placeholder":"请输入邮箱",
"wechatId":"企业微信号",
"wechatId.placeholder":"请输入企业微信号",
"accessToken":"钉钉号",
Expand Down
13 changes: 7 additions & 6 deletions web-app/src/views/warn/notification-rules/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<el-form ref="form" :model="form" label-width="150px" :rules="rules" :show-message="false"
style="margin-right:80px">
<el-form-item :label="$t('notificationRules.form.name')" prop="name">
<el-input v-model="form.name" :placeholder="$t('notificationRules.form.name.placeholder')"></el-input>
<el-input v-model="form.name" :placeholder="$t('notificationRules.form[\'name.placeholder\']')"></el-input>
</el-form-item>
<el-form-item :label="$t('notificationRules.form.receiverName')" prop="receiverId">
<el-select v-model="form.receiverId" :placeholder="$t('notificationRules.form.receiverName.placeholder')" @change="handleReceiverChange" style="width:100%">
<el-select v-model="form.receiverId" :placeholder="$t('notificationRules.form[\'receiverName.placeholder\']')" @change="handleReceiverChange" style="width:100%">
<el-option v-for="item in receiverOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
Expand All @@ -27,20 +27,20 @@
</el-form-item>
<el-form-item :label="$t('notificationRules.form.tags')">
<el-select v-model="form.tags" :disabled="itemDisable" filterable multiple allow-create default-first-option
:placeholder="$t('notificationRules.form.tags.tip')" style="width:100%">
:placeholder="$t('notificationRules.form[\'tags.tip\']')" style="width:100%">
<el-option v-for="item in tagsOptions" :key="item.id" :label="item.name+':'+item.value" :value="item">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('notificationRules.form.priorities')">
<el-select v-model="form.priorities" :disabled="itemDisable" multiple placeholder="$t('notificationRules.form.priorities.placeholder')"
<el-select v-model="form.priorities" :disabled="itemDisable" multiple :placeholder="$t('notificationRules.form[\'priorities.placeholder\']')"
style="width:100%">
<el-option v-for="item in warnLevel" :key="item.key" :label="item.value" :value="item.key">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('notificationRules.form.type')">
<el-select v-model="form.type" multiple :placeholder="$t('notificationRules.form.type.placeholder')" style="width:100%">
<el-select v-model="form.type" multiple :placeholder="$t('notificationRules.form[\'type.placeholder\']')" style="width:100%">
<el-option v-for="item in typeOptions" :key="item" :value="item">
<el-option v-if="item==0" label="短信" :value="0"></el-option>
<el-option v-if="item==1" label="邮件" :value="1"></el-option>
Expand Down Expand Up @@ -124,6 +124,7 @@
receiverOptions: [],
tagsOptions: [],
typeOptions: [],
selectionIds:[],
itemDisable: true,
warnLevel: WARN_LEVEL,
form: Object.assign({}, defaultForm),
Expand Down Expand Up @@ -337,7 +338,7 @@
this.selectionIds.forEach(item => {
ids.push(item.id)
})
this.$modal.confirm(this.$t('message.clearTips')).then(function () {
this.$modal.confirm(this.$t('message.deleteTips')).then(function () {
return delRules(ids);
}).then(() => {
this.getData();
Expand Down
14 changes: 7 additions & 7 deletions web-app/src/views/warn/sys-receiver/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<el-form ref="form" :model="form" label-width="150px" :rules="rules" :show-message="false"
style="margin-right:80px">
<el-form-item :label="$t('sysReceiver.form.name')" prop="name">
<el-input v-model="form.name" :placeholder="$t('sysReceiver.form.name.placeholder')"></el-input>
<el-input v-model="form.name" :placeholder="$t('sysReceiver.form[\'name.placeholder\']')"></el-input>
</el-form-item>
<el-form-item :label="$t('sysReceiver.form.type')" prop="type">
<el-select v-model="form.type" multiple :placeholder="$t('sysReceiver.form.type.placeholder')" style="width:100%">
<el-select v-model="form.type" multiple :placeholder="$t('sysReceiver.form[\'type.placeholder\']')" style="width:100%">
<el-option label="短信" :value="0"></el-option>
<el-option label="邮件" :value="1"></el-option>
<el-option label="企业微信" :value="4"></el-option>
Expand All @@ -26,19 +26,19 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('sysReceiver.form.phone')">
<el-input v-model="form.phone" :placeholder="$t('sysReceiver.form.phone.placeholder')"></el-input>
<el-input v-model="form.phone" :placeholder="$t('sysReceiver.form[\'phone.placeholder\']')"></el-input>
</el-form-item>
<el-form-item :label="$t('sysReceiver.form.email')">
<el-input v-model="form.email" :placeholder="$t('sysReceiver.form.email.placeholder')"></el-input>
<el-input v-model="form.email" :placeholder="$t('sysReceiver.form[\'email.placeholder\']')"></el-input>
</el-form-item>
<el-form-item :label="$t('sysReceiver.form.wechatId')">
<el-input v-model="form.wechatId" :placeholder="$t('sysReceiver.form.wechatId.placeholder')"></el-input>
<el-input v-model="form.wechatId" :placeholder="$t('sysReceiver.form[\'wechatId.placeholder\']')"></el-input>
</el-form-item>
<el-form-item :label="$t('sysReceiver.form.accessToken')">
<el-input v-model="form.accessToken" :placeholder="$t('sysReceiver.form.accessToken.placeholder')"></el-input>
<el-input v-model="form.accessToken" :placeholder="$t('sysReceiver.form[\'accessToken.placeholder\']')"></el-input>
</el-form-item>
<el-form-item :label="$t('sysReceiver.form.hookUrl')">
<el-input v-model="form.hookUrl" :placeholder="$t('sysReceiver.form.hookUrl.placeholder')"></el-input>
<el-input v-model="form.hookUrl" :placeholder="$t('sysReceiver.form[\'hookUrl.placeholder\']')"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">{{ $t('buttons.save') }}</el-button>
Expand Down
40 changes: 20 additions & 20 deletions web-app/src/views/warn/warn-rules/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@
</el-form-item>
<el-form-item label="">
<el-collapse value="1">
<el-collapse-item :title="$t('warnRules.form.field.collapse')" name="1">
<el-collapse-item :title="$t('warnRules.form[\'field.collapse\']')" name="1">
<div v-if="form.cascadeValues.length==3">
<code> {{"${"+form.cascadeValues[2]+"}"}} : {{ $t('warnRules.form.field.collapse.tip1') }}</code>
<code> {{"${"+form.cascadeValues[2]+"}"}} : {{ $t('warnRules.form[\'field.collapse.tip1\']') }}</code>
</div>
<div v-for="otherMetric in otherMetrics" :key="otherMetric">
<code> {{"${"+otherMetric+"}"}} : {{ $t('warnRules.form.field.collapse.tip2') }}</code>
<code> {{"${"+otherMetric+"}"}} : {{ $t('warnRules.form[\'field.collapse.tip2\']') }}</code>
</div>
<div v-if="form.cascadeValues.length!=0">
<code> {{ $t('warnRules.form.field.collapse.tip3') }}</code>
<code> {{ $t('warnRules.form[\'field.collapse.tip3\']') }}</code>
</div>
<div><code> {{ $t('warnRules.form.field.collapse.tip4') }}</code></div>
<div><code> {{ $t('warnRules.form[\'field.collapse.tip4\']') }}</code></div>
</el-collapse-item>
</el-collapse>
</el-form-item>
<el-form-item :label="$t('warnRules.form.expr')" prop="expr">
<el-input type="textarea" :rows="3" v-model="form.expr" :placeholder="$t('warnRules.form.expr.placeholder')"
<el-input type="textarea" :rows="3" v-model="form.expr" :placeholder="$t('warnRules.form[\'expr.placeholder\']')"
maxlength="100" show-word-limit></el-input>
<div style="font-size: 12px;color: #757D8F">
<i class="el-icon-info argus-mr-5" style="color: #5A98EC"></i>{{ $t('warnRules.form.expr.tip') }}
<i class="el-icon-info argus-mr-5" style="color: #5A98EC"></i>{{ $t('warnRules.form[\'expr.tip\']') }}
</div>
</el-form-item>
<el-form-item label="告警级别" prop="priority">
Expand All @@ -49,51 +49,51 @@
</el-select>
<div style="font-size: 12px;color: #757D8F">
<i class="el-icon-info argus-mr-5"
style="color: #5A98EC"></i>{{ $t('warnRules.form.priority.tip') }}
style="color: #5A98EC"></i>{{ $t('warnRules.form[\'priority.tip\']') }}
</div>
</el-form-item>
<el-form-item :label="$t('warnRules.form.times')" prop="times">
<el-input-number v-model="form.times" :min="1" :max="10000" ></el-input-number>
<div style="font-size: 12px;color: #757D8F">
<i class="el-icon-info argus-mr-5" style="color: #5A98EC"></i>{{ $t('warnRules.form.times.tip') }}
<i class="el-icon-info argus-mr-5" style="color: #5A98EC"></i>{{ $t('warnRules.form[\'times.tip\']') }}
</div>
</el-form-item>
<el-form-item label="">
<el-collapse value="1" accordion>
<el-collapse-item :title="$t('warnRules.form.times.collapse')" name="1">
<div><code> {{ $t('warnRules.form.times.collapse.tip1') }}</code></div>
<div><code>{{ $t('warnRules.form.times.collapse.tip2') }}</code></div>
<el-collapse-item :title="$t('warnRules.form[\'times.collapse\']')" name="1">
<div><code> {{ $t('warnRules.form[\'times.collapse.tip1\']') }}</code></div>
<div><code>{{ $t('warnRules.form[\'times.collapse.tip2\']') }}</code></div>
<div v-if="form.cascadeValues.length==3">
<code> {{ $t('warnRules.form.times.collapse.tip3') }}</code>
<code> {{ $t('warnRules.form[\'times.collapse.tip3') }}</code>
</div>
<div v-if="form.cascadeValues.length==3">
<code> {{"${"+form.cascadeValues[2]+"}"}} : {{ $t('warnRules.form.times.collapse.tip4') }}</code>
<code> {{"${"+form.cascadeValues[2]+"}"}} : {{ $t('warnRules.form[\'times.collapse.tip4\']') }}</code>
</div>
<div v-for="otherMetric in otherMetrics" :key="otherMetric">
<code> {{"${"+otherMetric+"}"}} : {{ $t('warnRules.form.times.collapse.tip5') }}</code>
<code> {{"${"+otherMetric+"}"}} : {{ $t('warnRules.form[\'times.collapse.tip5\']') }}</code>
</div>
<div><code> {{ $t('warnRules.form.times.collapse.tip6') }}</code></div>
<div><code> {{ $t('warnRules.form[\'times.collapse.tip6\']') }}</code></div>
</el-collapse-item>
</el-collapse>
</el-form-item>
<el-form-item :label="$t('warnRules.form.template')" prop="template">
<el-input type="textarea" :rows="3" v-model="form.template"
:placeholder="$t('warnRules.form.template.placeholder')"
:placeholder="$t('warnRules.form[\'template.placeholder\']')"
show-word-limit></el-input>
<div style="font-size: 12px;color: #757D8F">
<i class="el-icon-info argus-mr-5" style="color: #5A98EC"></i>{{ $t('warnRules.form.template.tip') }}
<i class="el-icon-info argus-mr-5" style="color: #5A98EC"></i>{{ $t('warnRules.form[\'template.tip\']') }}
</div>
</el-form-item>
<el-form-item :label="$t('warnRules.form.preset')">
<el-switch v-model="form.preset"></el-switch>
<div style="font-size: 12px;color: #757D8F">
<i class="el-icon-info argus-mr-5" style="color: #5A98EC"></i>{{ $t('warnRules.form.preset.tip') }}
<i class="el-icon-info argus-mr-5" style="color: #5A98EC"></i>{{ $t('warnRules.form[\'preset.tip\']') }}
</div>
</el-form-item>
<el-form-item :label="$t('warnRules.form.enable')">
<el-switch v-model="form.enable"></el-switch>
<div style="font-size: 12px;color: #757D8F">
<i class="el-icon-info argus-mr-5" style="color: #5A98EC"></i>{{ $t('warnRules.form.enable.tip') }}
<i class="el-icon-info argus-mr-5" style="color: #5A98EC"></i>{{ $t('warnRules.form[\'enable.tip\']') }}
</div>
</el-form-item>
<el-form-item>
Expand Down

0 comments on commit a4f003c

Please sign in to comment.