|
|
@@ -495,8 +495,9 @@ export default {
|
|
|
var str2=''
|
|
|
var str3 = ''
|
|
|
for (let i = 0; i < this.row.length - 1; i++){
|
|
|
- if (this.row[i].pSort!=this.row[i+1].pSort) {
|
|
|
- this.$alert("不能跨权要合并特征","提示", {
|
|
|
+ if (this.row[i].rightId!=this.row[i+1].rightId) {
|
|
|
+ this.$alert("不能跨权要合并特征", "提示", {
|
|
|
+ type:'warning',
|
|
|
confirmButtonText: '确定',
|
|
|
})
|
|
|
return false
|
|
|
@@ -506,7 +507,8 @@ export default {
|
|
|
})
|
|
|
// console.log(this.Index_row,Index_rowArr);
|
|
|
if (Index_rowArr[i+1].$index-Index_rowArr[i].$index!=1) {
|
|
|
- this.$alert("非相邻不能合并特征","提示", {
|
|
|
+ this.$alert("非相邻不能合并特征", "提示", {
|
|
|
+ type:'warning',
|
|
|
confirmButtonText: '确定',
|
|
|
})
|
|
|
return false
|
|
|
@@ -551,7 +553,8 @@ export default {
|
|
|
//不能同时拆分
|
|
|
if (this.row.length>0) {
|
|
|
if (this.row.length>1) {
|
|
|
- this.$alert("不能同时拆分多个特征","提示", {
|
|
|
+ this.$alert("不能同时拆分多个特征", "提示", {
|
|
|
+ type:'warning',
|
|
|
confirmButtonText: '确定',
|
|
|
})
|
|
|
return false
|
zhuhao