|
@@ -160,9 +160,7 @@
|
|
tree = layui.tree;
|
|
tree = layui.tree;
|
|
layer = layui.layer;
|
|
layer = layui.layer;
|
|
table = layui.table;
|
|
table = layui.table;
|
|
- var form = layui.form,
|
|
|
|
-
|
|
|
|
- laydate = layui.laydate;
|
|
|
|
|
|
+ var form = layui.form, laydate = layui.laydate;
|
|
// layer.msg('Hello Zhou')
|
|
// layer.msg('Hello Zhou')
|
|
table.render({
|
|
table.render({
|
|
elem: '#demo',
|
|
elem: '#demo',
|
|
@@ -184,7 +182,6 @@
|
|
],
|
|
],
|
|
data: []
|
|
data: []
|
|
});
|
|
});
|
|
-
|
|
|
|
//工具条事件
|
|
//工具条事件
|
|
table.on('toolbar(test)', function (obj) { //注:tool 是工具条事件名,test 是 table 原始容器的属性 lay-filter="对应的值"
|
|
table.on('toolbar(test)', function (obj) { //注:tool 是工具条事件名,test 是 table 原始容器的属性 lay-filter="对应的值"
|
|
var data = obj.data; //获得当前行数据
|
|
var data = obj.data; //获得当前行数据
|
|
@@ -202,7 +199,6 @@
|
|
type: 'datetime',
|
|
type: 'datetime',
|
|
range: true,
|
|
range: true,
|
|
});
|
|
});
|
|
-
|
|
|
|
initTreeCity(tree)
|
|
initTreeCity(tree)
|
|
initTreeIndicator(tree)
|
|
initTreeIndicator(tree)
|
|
initTreeIndicatorTemplate(tree)
|
|
initTreeIndicatorTemplate(tree)
|
|
@@ -225,7 +221,6 @@
|
|
if (!o) {
|
|
if (!o) {
|
|
r = JSON.parse(r)
|
|
r = JSON.parse(r)
|
|
}
|
|
}
|
|
-
|
|
|
|
treeCity = tree.render({
|
|
treeCity = tree.render({
|
|
elem: '#allArea',
|
|
elem: '#allArea',
|
|
showCheckbox: true,
|
|
showCheckbox: true,
|
|
@@ -233,14 +228,9 @@
|
|
id: 'Id1',
|
|
id: 'Id1',
|
|
data: r
|
|
data: r
|
|
});
|
|
});
|
|
-
|
|
|
|
-
|
|
|
|
return false;
|
|
return false;
|
|
-
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
});
|
|
});
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
var treeIn;
|
|
var treeIn;
|
|
@@ -258,7 +248,6 @@
|
|
if (!o) {
|
|
if (!o) {
|
|
r = JSON.parse(r)
|
|
r = JSON.parse(r)
|
|
}
|
|
}
|
|
-
|
|
|
|
treeIn = tree.render({
|
|
treeIn = tree.render({
|
|
elem: '#indicatorTemplate',
|
|
elem: '#indicatorTemplate',
|
|
showCheckbox: true,
|
|
showCheckbox: true,
|
|
@@ -280,13 +269,11 @@
|
|
"spread": false
|
|
"spread": false
|
|
},
|
|
},
|
|
success: function (r) {
|
|
success: function (r) {
|
|
-
|
|
|
|
// console.log(r)
|
|
// console.log(r)
|
|
let o = r instanceof Object
|
|
let o = r instanceof Object
|
|
if (!o) {
|
|
if (!o) {
|
|
r = JSON.parse(r)
|
|
r = JSON.parse(r)
|
|
}
|
|
}
|
|
-
|
|
|
|
treeIn = tree.render({
|
|
treeIn = tree.render({
|
|
elem: '#allIndicator',
|
|
elem: '#allIndicator',
|
|
showCheckbox: true,
|
|
showCheckbox: true,
|
|
@@ -294,19 +281,13 @@
|
|
id: 'Id2',
|
|
id: 'Id2',
|
|
data: r
|
|
data: r
|
|
});
|
|
});
|
|
-
|
|
|
|
-
|
|
|
|
return false;
|
|
return false;
|
|
-
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
});
|
|
});
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
function renderTable(table, citys, quxians, indicators, ttype, sdate) {
|
|
function renderTable(table, citys, quxians, indicators, ttype, sdate) {
|
|
console.log('renderTable')
|
|
console.log('renderTable')
|
|
-
|
|
|
|
$.ajax({
|
|
$.ajax({
|
|
type: "POST",
|
|
type: "POST",
|
|
url: './renderTable',
|
|
url: './renderTable',
|
|
@@ -325,12 +306,10 @@
|
|
alert(r.msg);
|
|
alert(r.msg);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
-
|
|
|
|
let o = r instanceof Object
|
|
let o = r instanceof Object
|
|
if (!o) {
|
|
if (!o) {
|
|
r = JSON.parse(r)
|
|
r = JSON.parse(r)
|
|
}
|
|
}
|
|
-
|
|
|
|
table.render({
|
|
table.render({
|
|
elem: '#demo',
|
|
elem: '#demo',
|
|
height: 320,
|
|
height: 320,
|
|
@@ -351,19 +330,13 @@
|
|
],
|
|
],
|
|
data: r.datas
|
|
data: r.datas
|
|
});
|
|
});
|
|
-
|
|
|
|
-
|
|
|
|
return false;
|
|
return false;
|
|
-
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
});
|
|
});
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
function conditionRenderTable(table, condition, searchType, indicators, ttype, sdate) {
|
|
function conditionRenderTable(table, condition, searchType, indicators, ttype, sdate) {
|
|
console.log('conditionRenderTable')
|
|
console.log('conditionRenderTable')
|
|
-
|
|
|
|
$.ajax({
|
|
$.ajax({
|
|
type: "POST",
|
|
type: "POST",
|
|
url: './conditionRenderTable',
|
|
url: './conditionRenderTable',
|
|
@@ -382,7 +355,6 @@
|
|
if (!o) {
|
|
if (!o) {
|
|
r = JSON.parse(r)
|
|
r = JSON.parse(r)
|
|
}
|
|
}
|
|
-
|
|
|
|
table.render({
|
|
table.render({
|
|
elem: '#demo',
|
|
elem: '#demo',
|
|
height: 320,
|
|
height: 320,
|
|
@@ -403,31 +375,25 @@
|
|
],
|
|
],
|
|
data: r.datas
|
|
data: r.datas
|
|
});
|
|
});
|
|
-
|
|
|
|
-
|
|
|
|
return false;
|
|
return false;
|
|
-
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
});
|
|
});
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
function search() {
|
|
function search() {
|
|
// form.on('submit(formDemo)', function (data) {
|
|
// form.on('submit(formDemo)', function (data) {
|
|
- if ($('#time1').val() == 0) {
|
|
|
|
|
|
+ if ($('#time1').val() === 0) {
|
|
alert('填选择时间')
|
|
alert('填选择时间')
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if (tree.getChecked('Id1').length == 0) {
|
|
|
|
|
|
+ if (tree.getChecked('Id1').length === 0) {
|
|
alert('请选择地市')
|
|
alert('请选择地市')
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if (tree.getChecked('Id3').length == 0) {
|
|
|
|
|
|
+ if (tree.getChecked('Id3').length === 0) {
|
|
alert('请选择指标')
|
|
alert('请选择指标')
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
-
|
|
|
|
alert('开始查询')
|
|
alert('开始查询')
|
|
// layer.msg(JSON.stringify(data.field));
|
|
// layer.msg(JSON.stringify(data.field));
|
|
console.log(JSON.stringify(tree.getChecked('Id1')))
|
|
console.log(JSON.stringify(tree.getChecked('Id1')))
|
|
@@ -435,7 +401,6 @@
|
|
let checkData2 = tree.getChecked('Id3')[0].children;
|
|
let checkData2 = tree.getChecked('Id3')[0].children;
|
|
console.log(checkData1)
|
|
console.log(checkData1)
|
|
console.log(checkData2)
|
|
console.log(checkData2)
|
|
-
|
|
|
|
const quxianA = new Set();
|
|
const quxianA = new Set();
|
|
var citysA = [];
|
|
var citysA = [];
|
|
checkData1.forEach(eee => {
|
|
checkData1.forEach(eee => {
|
|
@@ -444,33 +409,30 @@
|
|
quxianA.add("'" + ee.title + "'")
|
|
quxianA.add("'" + ee.title + "'")
|
|
})
|
|
})
|
|
});
|
|
});
|
|
-
|
|
|
|
const quxians = Array.from(quxianA).join(',')
|
|
const quxians = Array.from(quxianA).join(',')
|
|
citys = citysA.join(',')
|
|
citys = citysA.join(',')
|
|
console.log(`citys: ${citys}`)
|
|
console.log(`citys: ${citys}`)
|
|
console.log(`quxians: ${quxians}`)
|
|
console.log(`quxians: ${quxians}`)
|
|
- var indicatorsA = new Set();
|
|
|
|
|
|
+ const indicatorsA = new Set();
|
|
checkData2.forEach(eee => {
|
|
checkData2.forEach(eee => {
|
|
eee.children.forEach(ee => {
|
|
eee.children.forEach(ee => {
|
|
indicatorsA.add(ee.id)
|
|
indicatorsA.add(ee.id)
|
|
})
|
|
})
|
|
});
|
|
});
|
|
|
|
+ indicatorsA.add('eci')
|
|
const indicators = Array.from(indicatorsA).join(',')
|
|
const indicators = Array.from(indicatorsA).join(',')
|
|
console.log(`indicators: ${JSON.stringify(indicators)}`)
|
|
console.log(`indicators: ${JSON.stringify(indicators)}`)
|
|
let ttype = $('#timeType').val()
|
|
let ttype = $('#timeType').val()
|
|
let sdate = $('#time1').val()
|
|
let sdate = $('#time1').val()
|
|
console.log(`sdate: ${sdate}`)
|
|
console.log(`sdate: ${sdate}`)
|
|
renderTable(table, citys, quxians,indicators, ttype, sdate)
|
|
renderTable(table, citys, quxians,indicators, ttype, sdate)
|
|
-
|
|
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
function conditionSearch() {
|
|
function conditionSearch() {
|
|
let sdate = $('#time1').val()
|
|
let sdate = $('#time1').val()
|
|
- if (sdate.length == 0) {
|
|
|
|
- alert('填选择时间')
|
|
|
|
|
|
+ if (sdate.length === 0) {
|
|
|
|
+ alert('请选择时间')
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -478,35 +440,29 @@
|
|
alert('请选择指标')
|
|
alert('请选择指标')
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
-
|
|
|
|
let condition = $('#condition').val();
|
|
let condition = $('#condition').val();
|
|
let ttype = $('#timeType').val()
|
|
let ttype = $('#timeType').val()
|
|
let searchType = $('#searchType').find('input:checked').val()
|
|
let searchType = $('#searchType').find('input:checked').val()
|
|
- if (searchType === 'eci' && $('#condition').val().length == 0) {
|
|
|
|
- alert('填写查询条件')
|
|
|
|
|
|
+ if (searchType === 'eci' && $('#condition').val().length === 0) {
|
|
|
|
+ alert('请填写查询条件')
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
-
|
|
|
|
console.log(`searchType: ${searchType}`)
|
|
console.log(`searchType: ${searchType}`)
|
|
console.log(`condition: ${condition}`)
|
|
console.log(`condition: ${condition}`)
|
|
// layer.msg(JSON.stringify(data.field));
|
|
// layer.msg(JSON.stringify(data.field));
|
|
// let checkData1 = tree.getChecked('Id1')[0].children;
|
|
// let checkData1 = tree.getChecked('Id1')[0].children;
|
|
-
|
|
|
|
let checkData2 = tree.getChecked('Id3')[0].children;
|
|
let checkData2 = tree.getChecked('Id3')[0].children;
|
|
-
|
|
|
|
-
|
|
|
|
- var indicatorsA = new Array();
|
|
|
|
|
|
+ const indicatorsA = new Set();
|
|
checkData2.forEach(eee => {
|
|
checkData2.forEach(eee => {
|
|
eee.children.forEach(ee => {
|
|
eee.children.forEach(ee => {
|
|
-
|
|
|
|
- indicatorsA.push(ee.id)
|
|
|
|
-
|
|
|
|
|
|
+ indicatorsA.add(ee.id)
|
|
})
|
|
})
|
|
});
|
|
});
|
|
- indicators = indicatorsA.join(',')
|
|
|
|
- // console.log(indicators)
|
|
|
|
|
|
+ indicatorsA.add('eci')
|
|
|
|
+ const indicatorsB = [...indicatorsA]
|
|
|
|
+ const indicators = indicatorsB.join(',')
|
|
|
|
+ console.log(`indicators: ${indicators}`)
|
|
conditionRenderTable(table, condition, searchType, indicators, ttype, sdate)
|
|
conditionRenderTable(table, condition, searchType, indicators, ttype, sdate)
|
|
-
|
|
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -525,13 +481,11 @@
|
|
alert('请输入模板名称!')
|
|
alert('请输入模板名称!')
|
|
return
|
|
return
|
|
}
|
|
}
|
|
-
|
|
|
|
const checkedData = tree?.getChecked('Id2')?.[0]?.children
|
|
const checkedData = tree?.getChecked('Id2')?.[0]?.children
|
|
if (!checkedData || checkedData.length <= 0) {
|
|
if (!checkedData || checkedData.length <= 0) {
|
|
alert('请选择指标!')
|
|
alert('请选择指标!')
|
|
return
|
|
return
|
|
}
|
|
}
|
|
-
|
|
|
|
console.log(`templateName: ${templateName}`)
|
|
console.log(`templateName: ${templateName}`)
|
|
console.log(`checkedData: ${JSON.stringify(checkedData)}`)
|
|
console.log(`checkedData: ${JSON.stringify(checkedData)}`)
|
|
const indicatorsA = []
|
|
const indicatorsA = []
|
|
@@ -573,12 +527,10 @@
|
|
checkedData.forEach(t => {
|
|
checkedData.forEach(t => {
|
|
idArray.push(t.id)
|
|
idArray.push(t.id)
|
|
});
|
|
});
|
|
-
|
|
|
|
if (!checkedData || checkedData.length <= 0) {
|
|
if (!checkedData || checkedData.length <= 0) {
|
|
alert('请选择要删除的指标模板!')
|
|
alert('请选择要删除的指标模板!')
|
|
return
|
|
return
|
|
}
|
|
}
|
|
-
|
|
|
|
layer.confirm('确认删除?', {icon: 3, title:'删除模板'}, function(index){
|
|
layer.confirm('确认删除?', {icon: 3, title:'删除模板'}, function(index){
|
|
const ids = idArray.join(',')
|
|
const ids = idArray.join(',')
|
|
console.log(`deleteTemplate: ${JSON.stringify(idArray)}`)
|
|
console.log(`deleteTemplate: ${JSON.stringify(idArray)}`)
|