NEZ-611 fix: 修复agent编辑页无法回显的问题

This commit is contained in:
wangwenrui
2021-05-11 11:02:03 +08:00
parent 82977548f2
commit 551f9b65ae
5 changed files with 23 additions and 17 deletions

View File

@@ -55,7 +55,7 @@ const cn = {
createUser: '新增用户', createUser: '新增用户',
createRole: '新增角色', createRole: '新增角色',
createTemplate: '新增模板', createTemplate: '新增模板',
createPrometheusServer: '新增prometheus服务', createPrometheusServer: '新增Agent',
createDatacenter: '新增数据中心', createDatacenter: '新增数据中心',
active: '活跃', active: '活跃',
type: '类别', type: '类别',
@@ -133,7 +133,10 @@ const cn = {
}, },
system: { system: {
configTitle: '系统配置', configTitle: '系统配置',
configTip: '请输入管理员的用户名和密码并设置Nezha WEB模块的安装信息如IP:port' configTip: '请输入管理员的用户名和密码并设置Nezha WEB模块的安装信息如IP:port',
federation:'联邦',
federationEnable:'可用',
federationDisable:'不可用',
}, },
name: '数据库名称', name: '数据库名称',
username: '用户名', username: '用户名',
@@ -666,7 +669,7 @@ const cn = {
promServerList: 'Prometheus服务', promServerList: 'Prometheus服务',
promId: 'Prometheus服务ID', promId: 'Prometheus服务ID',
createProm: '新增Prometheus服务', createProm: '新增Prometheus服务',
editProm: '修改Prometheus服务', editProm: '修改Agent',
type: '类别', type: '类别',
checkTime: '检查时间', checkTime: '检查时间',
dataCenter: '数据中心', dataCenter: '数据中心',

View File

@@ -60,7 +60,7 @@ const en = {
createAlertRule: 'New alert rule', createAlertRule: 'New alert rule',
createUser: 'New user', createUser: 'New user',
createRole: 'New role', createRole: 'New role',
createPrometheusServer: 'New prometheus server', createPrometheusServer: 'New agent',
createDatacenter: 'New Data center', createDatacenter: 'New Data center',
createCabinet: 'New cabinet', createCabinet: 'New cabinet',
createModel: 'New model', createModel: 'New model',
@@ -141,7 +141,11 @@ const en = {
}, },
system: { system: {
configTitle: 'System configuration', configTitle: 'System configuration',
configTip: 'Please enter username and password for administrator ,and set the Nezha WEB module install information,like IP:port' configTip: 'Please enter username and password for administrator ,and set the Nezha WEB module install information,like IP:port',
federation:'Federation',
federationEnable:'Enable',
federationDisable:'Disable',
}, },
name: 'Database name', name: 'Database name',
username: 'Username', username: 'Username',
@@ -672,9 +676,9 @@ const en = {
}, },
agent: { agent: {
// 侧滑框 // 侧滑框
promId: 'Prometheus server ID', // "Prometheus Server ID" promId: 'Agent ID', // "Prometheus Server ID"
createProm: 'New prometheus server', // "新增Prometheus Server" createProm: 'New agent', // "新增Prometheus Server"
editProm: 'Edit prometheus server', // "修改Prometheus Server" editProm: 'Edit agent', // "修改Prometheus Server"
type: 'Type', // "类别" type: 'Type', // "类别"
checkTime: 'Check time', checkTime: 'Check time',
dataCenter: 'Data center', dataCenter: 'Data center',

View File

@@ -1444,7 +1444,7 @@ export default {
this.getAssetStateData() this.getAssetStateData()
} }
if (this.$route.path === '/agent') { if (this.$route.path === '/agent') {
this.getDcData() // this.getDcData()
} }
if (this.$route.path === '/model') { if (this.$route.path === '/model') {
this.getBrandData() this.getBrandData()

View File

@@ -40,7 +40,7 @@
</template> </template>
</nz-data-list> </nz-data-list>
<transition name="right-box"> <transition name="right-box">
<agent-box v-if="rightBox.show" :prom-server="object" @close="closeRightBox"></agent-box> <agent-box v-if="rightBox.show" :agent="object" @close="closeRightBox"></agent-box>
</transition> </transition>
<el-dialog :title="$t('config.agent.agent.title')" :visible.sync="showAgentDownload" append-to-body class="nz-dialog agent-dialog" width="800px" @close="closeDialog"> <el-dialog :title="$t('config.agent.agent.title')" :visible.sync="showAgentDownload" append-to-body class="nz-dialog agent-dialog" width="800px" @close="closeDialog">
<div v-if="showAgentDownload" class="agent-box"> <div v-if="showAgentDownload" class="agent-box">

View File

@@ -150,10 +150,10 @@
<el-form-item :label="$t('setup.alertPath')" prop="alertPath" key="sysalertPath" > <el-form-item :label="$t('setup.alertPath')" prop="alertPath" key="sysalertPath" >
<el-input v-model="system.alertPath"></el-input> <el-input v-model="system.alertPath"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('setup.promentheusFederationEnabled')" prop="prometheusFederationEnabled" key="sysprometheusFederationEnabled" > <el-form-item :label="$t('setup.system.federation')" prop="prometheusFederationEnabled" key="sysprometheusFederationEnabled" >
<el-select v-model="system.prometheusFederationEnabled" style="width: 100%" placeholder="Enable"> <el-select v-model="system.prometheusFederationEnabled" style="width: 100%" >
<el-option label="Enable" value="1"></el-option> <el-option :label="$t('setup.system.federationEnable')" :value="1"></el-option>
<el-option label="Close" value="0"></el-option> <el-option :label="$t('setup.system.federationDisable')" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('setup.alertPrefix')" prop="alertPrefix" key="sysalertPrefix"> <!-- <el-form-item :label="$t('setup.alertPrefix')" prop="alertPrefix" key="sysalertPrefix">
@@ -251,14 +251,13 @@ export default {
alertPrefix: '', alertPrefix: '',
haMode: 1, haMode: 1,
haVip: '', haVip: '',
prometheusFederationEnabled:'', prometheusFederationEnabled:1,
}, },
sysRules: { sysRules: {
username: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }], username: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
pin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }], pin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
alertPath: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }], alertPath: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
haVip: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }], haVip: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
prometheusFederationEnabled: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
}, },
reloadTime: 5000, reloadTime: 5000,
reloadTimeout: null, reloadTimeout: null,