From c7619152dfb1e07242323cba195832eb9b3a509e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 24 十二月 2023 14:09:09 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue b/src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue
index c03b3c7..73e9c7c 100644
--- a/src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue
+++ b/src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue
@@ -36,13 +36,13 @@
<a-col :span="12">
<a-form-model-item prop="maxThreshold" label="闃堝�间笂闄�">
- <a-input v-model="model.maxThreshold" placeholder="璇疯緭鍏ラ槇鍊间笂闄�"></a-input>
+ <a-input-number v-model="model.maxThreshold" placeholder="璇疯緭鍏ラ槇鍊间笂闄�" style="width: 100%"></a-input-number>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item prop="minThreshold" label="闃堝�间笅闄�">
- <a-input v-model="model.minThreshold" placeholder="璇疯緭鍏ラ槇鍊间笅闄�"></a-input>
+ <a-input-number v-model="model.minThreshold" placeholder="璇疯緭鍏ラ槇鍊间笅闄�" style="width: 100%"></a-input-number>
</a-form-model-item>
</a-col>
@@ -139,12 +139,13 @@
add() {
this.visible = true
this.model = {
- controlSystemType: '',
+ controlSystemType: this.driveTypeList[0],
chineseName: '',
minThreshold: '',
maxThreshold: ''
}
- this.paramList = []
+ console.log('driveType',this.driveTypeList)
+ this.handleDriveTypeChange(this.driveTypeList[0])
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model, 'controlSystemType', 'chineseName', 'minThreshold', 'maxThreshold'))
})
@@ -229,7 +230,7 @@
.then(res => {
if (res.success) {
this.paramList = res.result
- this.model.chineseName = res.result.length ? res.result[0].value : ''
+ this.model.chineseName = res.result.length ? res.result[0].value : undefined
if (this.model.chineseName) this.$refs.form.clearValidate('chineseName')
}
})
--
Gitblit v1.9.3