diff --git a/src/views/device/deviceSystem.vue b/src/views/device/deviceSystem.vue index af50aa1..8401303 100644 --- a/src/views/device/deviceSystem.vue +++ b/src/views/device/deviceSystem.vue @@ -628,32 +628,52 @@ export default { changeContent(val) { let arr = val.split(';') + arr = arr.filter(item => item != '') + console.log('arr===========>',arr) if (this.tableData.length != 0) { console.log('tableData------------------>',this.tableData) console.log('addForm------------------>',this.addForm.cycle) + let arr1 = JSON.parse(JSON.stringify(this.tableData)) if (val == '' && this.addForm.requirement == '') { arr1 = [] } else { - arr.map((item, index) => { - // if(item != ''){ - arr1[index] = { - ...arr1[index], - checkContent: item, - craft: arr1[index] ? item === arr1[index].checkContent ? arr1[index].craft : '' : '', - period: arr1[index] ? arr1[index].period : this.addForm.cycle, - startTime: arr1[index] ? arr1[index].startTime : this.addForm.startTime - } - // } - }) + if(arr.length == arr1.length){ + arr.map((item, index) => { + // if(item != ''){ + arr1[index] = { + ...arr1[index], + checkContent: item, + craft: arr1[index] ? item === arr1[index].checkContent ? arr1[index].craft : '' : '', + period: arr1[index] ? arr1[index].period : this.addForm.cycle, + startTime: arr1[index] ? arr1[index].startTime : this.addForm.startTime + } + // } + }) + }else{ + let arr2 = [] + arr.map((item,index) =>{ + arr2.push({ + checkContent: item, + craft: arr1[index] ? item === arr1[index].checkContent ? arr1[index].craft : '' : '', + period: arr1[index] ? arr1[index].period : this.addForm.cycle, + startTime: arr1[index] ? arr1[index].startTime : this.addForm.startTime + }) + }) + arr1 = arr2 + } } + console.log('arr1-------------------->',arr1) this.tableData = arr1 } else { let arr1 = [] arr.map(item => { if (item != '') { arr1.push({ - checkContent: item + checkContent: item, + craft: '', + period: '', + startTime: '' }) } }) @@ -683,7 +703,7 @@ export default { arr.map(item => { if (item != '') { arr1.push({ - craft: item + craft: item, }) } }) @@ -693,10 +713,13 @@ export default { }, // 巡检周期修改 changeCycle(val) { + let arr = [] if (this.tableData.length != 0) { this.tableData.map(item => { item.period = val }) + console.log('this.$forceUpdate()--------------->',this.tableData) + this.$forceUpdate() } }, // 巡检开始时间改变