diff --git a/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue b/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue index d1ca8ee..243332b 100644 --- a/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue +++ b/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue @@ -174,6 +174,7 @@ export default { onDbChange(val) { this.name = val this.dbName = undefined + this.dataSource = [] this.getDbNameList() }, ondbNameChange(val) { diff --git a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue index 2e3ba90..7687c6a 100644 --- a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue +++ b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue @@ -83,7 +83,7 @@ v-decorator="[ 'name', { - rules: [{ required: nameRequired, message: 'Please input name!' }], + rules: [{ required: true, message: 'Please input name!' }], initialVale: this.formVal.name, }, ]" @@ -237,7 +237,6 @@ export default { }, data() { return { - nameRequired: false, loading: false, isAdd: true, visible: false, @@ -444,8 +443,7 @@ export default { this.currentId = '' }, onTest() { - this.nameRequired = false - this.form.validateFields((err, values) => { + this.form.validateFields(['dbType', 'dbDriver', 'dbUrl', 'dbUsername', 'dbPassword'], (err, values) => { if (!err) { let loading = this.$message.loading('连接中……', 0) postAction('/online/cgreport/api/testConnection', values) @@ -462,10 +460,6 @@ export default { }) }, onSave() { - this.nameRequired = true - this.$nextTick(() => { - this.form.validateFields(['name'], { force: true }) - }) this.form.validateFields((err, values) => { if (!err) { if (this.isAdd) { diff --git a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue index bf9cf12..dd1685a 100644 --- a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue @@ -1,7 +1,7 @@