|
@@ -415,11 +415,11 @@ export default {
|
|
|
// 将栏位值合并
|
|
|
columnMerge() {
|
|
|
var arr = ['content', 'explainText']
|
|
|
- if (this.columnList && this.columnList.length > 0) {
|
|
|
- this.columnList.forEach(item => {
|
|
|
- arr.push(item.value)
|
|
|
- })
|
|
|
- }
|
|
|
+ // if (this.columnList && this.columnList.length > 0) {
|
|
|
+ // this.columnList.forEach(item => {
|
|
|
+ // arr.push(item.value)
|
|
|
+ // })
|
|
|
+ // }
|
|
|
return arr
|
|
|
},
|
|
|
//手动修改特征
|
|
@@ -489,8 +489,8 @@ export default {
|
|
|
|
|
|
})
|
|
|
// console.log(this.tableData)
|
|
|
- this.handleSort(this.scopeRow[0].rightSort)
|
|
|
- this.typeSelect(this.showType)
|
|
|
+ // this.handleSort(this.scopeRow[0].rightSort)
|
|
|
+ // this.typeSelect(this.showType)
|
|
|
this.scopeRow = []
|
|
|
this.checkList = []
|
|
|
}
|
|
@@ -498,11 +498,11 @@ export default {
|
|
|
|
|
|
//获取最大的特征id
|
|
|
getMaxFeatureId(){
|
|
|
- var arr = this.tableData.sort((a,b)=>{
|
|
|
- return a.featureId - b.featureId
|
|
|
+ var arr = this.tableData.map(item=>item.featureId).sort((a,b)=>{
|
|
|
+ return a - b
|
|
|
})
|
|
|
if(arr && arr.length>0){
|
|
|
- return arr[arr.length-1].featureId
|
|
|
+ return arr[arr.length-1]
|
|
|
}
|
|
|
return 0
|
|
|
|
|
@@ -535,11 +535,10 @@ export default {
|
|
|
for (let i = 0; i < arr.length; i++) {
|
|
|
splitAdd[arr[i]] = ''
|
|
|
}
|
|
|
-
|
|
|
this.tableData.splice(this.scopeRow[0].$index + 1, 0, splitAdd)
|
|
|
})
|
|
|
- this.handleSort(this.scopeRow[0].rightSort)
|
|
|
- this.typeSelect(this.showType)
|
|
|
+ // this.handleSort(this.scopeRow[0].rightSort)
|
|
|
+ // this.typeSelect(this.showType)
|
|
|
this.scopeRow = []
|
|
|
this.checkList = []
|
|
|
}
|