|
@@ -96,6 +96,7 @@
|
|
<button type="button" class="layui-btn layui-btn-sm" onclick="addTemplate()">添加指标模板</button>
|
|
<button type="button" class="layui-btn layui-btn-sm" onclick="addTemplate()">添加指标模板</button>
|
|
<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="deleteTemplate()">删除指标模板</button>
|
|
<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="deleteTemplate()">删除指标模板</button>
|
|
<div id="allArea"></div>
|
|
<div id="allArea"></div>
|
|
|
|
+ <div id="allMetrics"></div>
|
|
<div id="indicatorTemplate"></div>
|
|
<div id="indicatorTemplate"></div>
|
|
<div id="add-template" style="display: none;">
|
|
<div id="add-template" style="display: none;">
|
|
<form class="layui-form" action="">
|
|
<form class="layui-form" action="">
|
|
@@ -253,7 +254,19 @@
|
|
showCheckbox: true,
|
|
showCheckbox: true,
|
|
accordion: true,
|
|
accordion: true,
|
|
id: 'Id3',
|
|
id: 'Id3',
|
|
- data: r?.data
|
|
|
|
|
|
+ data: r?.data,
|
|
|
|
+ oncheck: function(obj){
|
|
|
|
+ // console.log(obj);
|
|
|
|
+ if(obj.checked) {
|
|
|
|
+ // console.log('tree.getChecked("Id4"): ', tree.getChecked('Id4'));
|
|
|
|
+ tree.getChecked('Id4').length = 0
|
|
|
|
+ tree.setChecked('Id4', [])
|
|
|
|
+ tree.reload('Id4', {
|
|
|
|
+ //新的参数
|
|
|
|
+ });
|
|
|
|
+ // console.log(' ----++++ ', tree.getChecked('Id4'));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
});
|
|
});
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -273,7 +286,26 @@
|
|
showCheckbox: true,
|
|
showCheckbox: true,
|
|
accordion: true,
|
|
accordion: true,
|
|
id: 'Id2',
|
|
id: 'Id2',
|
|
- data: r?.data
|
|
|
|
|
|
+ data: r?.data,
|
|
|
|
+ });
|
|
|
|
+ treeIn = tree.render({
|
|
|
|
+ elem: '#allMetrics',
|
|
|
|
+ showCheckbox: true,
|
|
|
|
+ accordion: true,
|
|
|
|
+ id: 'Id4',
|
|
|
|
+ data: r?.data,
|
|
|
|
+ oncheck: function(obj){
|
|
|
|
+ // console.log(obj);
|
|
|
|
+ if(obj.checked) {
|
|
|
|
+ // console.log('tree.getChecked("Id3"): ', tree.getChecked('Id3'));
|
|
|
|
+ tree.getChecked('Id3').length = 0
|
|
|
|
+ tree.setChecked('Id3', [])
|
|
|
|
+ tree.reload('Id3', {
|
|
|
|
+ //新的参数
|
|
|
|
+ });
|
|
|
|
+ // console.log(' ---- ', tree.getChecked('Id3'));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
});
|
|
});
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -345,7 +377,7 @@
|
|
alert('填选择时间')
|
|
alert('填选择时间')
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if (tree.getChecked('Id3').length === 0) {
|
|
|
|
|
|
+ if (tree.getChecked('Id3').length === 0 && tree.getChecked('Id4').length === 0) {
|
|
alert('请选择指标')
|
|
alert('请选择指标')
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -370,7 +402,17 @@
|
|
})
|
|
})
|
|
});
|
|
});
|
|
}
|
|
}
|
|
- let checkData2 = tree.getChecked('Id3')[0].children;
|
|
|
|
|
|
+ // console.log('0000000', tree.getChecked('Id4')[0]);
|
|
|
|
+
|
|
|
|
+ let checkData2 ;
|
|
|
|
+ console.log('3333 ', tree.getChecked('Id3')[0]?.children);
|
|
|
|
+ console.log('4444 ', tree.getChecked('Id4')[0]?.children);
|
|
|
|
+ if(tree.getChecked('Id3')[0]?.children){
|
|
|
|
+ checkData2= tree.getChecked('Id3')[0].children ;
|
|
|
|
+ }
|
|
|
|
+ if(tree.getChecked('Id4')[0]?.children){
|
|
|
|
+ checkData2= tree.getChecked('Id4')[0].children ;
|
|
|
|
+ }
|
|
const indicators = new Set();
|
|
const indicators = new Set();
|
|
checkData2.forEach(eee => {
|
|
checkData2.forEach(eee => {
|
|
eee.children.forEach(ee => {
|
|
eee.children.forEach(ee => {
|