Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

2020-07-17 14:09:08 +08:00 · 2020-07-17 14:09:08 +08:00 · 7449689d2c
commit 7449689d2c
parent 1e91cb616d 3aa8807e63
2 changed files with 705 additions and 450 deletions
--- a/src/components/QueryListPage/DataForm.vue
+++ b/src/components/QueryListPage/DataForm.vue
@ -57,6 +57,7 @@
            v-if="item.precisionFlag"
            v-model="formModel[item.prop]"
            :placeholder="item.placeholder"
+            :size="item.size"
            :disabled="item.disabled"
            :min="isNaN(item.min) ? -Infinity : item.min"
            :max="isNaN(item.max)? Infinity : item.max"
--- a/src/views/system/deviceManage/editConfigIbp.vue
+++ b/src/views/system/deviceManage/editConfigIbp.vue