diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 27be335d3..07d1a7311 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -19,7 +19,7 @@
{ let _form = {} - // console.log('formInfo', obj) + console.log('formInfo---arr', arr) if (Object.keys(obj).length > 0) { _form = { ...obj } return _form } arr.forEach(item => { + if (item.multiSelect) _form[item.columnName] = [] + else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue else _form[item.columnName] = '' // if (item.optionSourceType === 'remote') { @@ -371,7 +373,12 @@ export default { let form = initForm(this.formInfo, this.formList) let rules = initRules(this.formList) console.log('rulessss', rules) - let tempFormList = [ ...this.formList ] + let tempFormList = [ ...this.formList ].map(item => { + return { + ...item, + isChange: (item.itemType == 'radio' && item.defaultValue == '0') ? true : false + } + }) let constForm = { ...form, GRID_ID: '', diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue index 6292ddc5c..10c0c5120 100644 --- a/src/views/modules/visual/cpts/analyse.vue +++ b/src/views/modules/visual/cpts/analyse.vue @@ -83,7 +83,7 @@
-
+
@@ -275,12 +275,19 @@ export default { } return statusObj[status] }, + computedPd(list) { + if (this.sourceTab == 'group') return '60px' + if (list.length == 1) return '330px' + else if (list.length == 2) return '240px' + else return '60px' + }, handleTabs (type) { if (type === 'group') this.tempList = [...this.singleList] else if (type === 'event') this.tempList = [...this.moreList] this.sourceTab = type const _dom = document.getElementById('scroll-wr') _dom.scrollTop = 0 + this.computedPd(this.tempList) }, handleProject (item) { this.$emit('project', item)