|
@ -70,12 +70,18 @@ new Vue({
|
|
var linkageFilter1 = this.linkageFilter1
|
|
var linkageFilter1 = this.linkageFilter1
|
|
// console.log(linkageFilter1)
|
|
// console.log(linkageFilter1)
|
|
if(vm.cityVal!="0") {
|
|
if(vm.cityVal!="0") {
|
|
linkageFilter1 += "town=" + vm.cityVal + ";";
|
|
|
|
|
|
linkageFilter1 += "town=" + vm.cityVal[0] + ";";
|
|
|
|
if(vm.cityVal[1]){
|
|
|
|
linkageFilter1 += "org=" + vm.cityVal[1] + ";";
|
|
|
|
}
|
|
}
|
|
}
|
|
// 半年
|
|
// 半年
|
|
var linkageFilter2 = this.linkageFilter2
|
|
var linkageFilter2 = this.linkageFilter2
|
|
if(vm.cityVal!="0") {
|
|
if(vm.cityVal!="0") {
|
|
linkageFilter2 += "town=" + vm.cityVal + ";";
|
|
|
|
|
|
linkageFilter2 += "town=" + vm.cityVal[0] + ";";
|
|
|
|
if(vm.cityVal[1]){
|
|
|
|
linkageFilter2 += "org=" + vm.cityVal[1] + ";";
|
|
|
|
}
|
|
}
|
|
}
|
|
// console.log(linkageFilter2)
|
|
// console.log(linkageFilter2)
|
|
// 本月,没有地区条件
|
|
// 本月,没有地区条件
|
|
@ -302,15 +308,15 @@ new Vue({
|
|
areaChange:function(data){
|
|
areaChange:function(data){
|
|
console.log(data)
|
|
console.log(data)
|
|
console.log(this.town)
|
|
console.log(this.town)
|
|
var cityValue = null,city=null;
|
|
|
|
|
|
var cityValue = [],city=null;
|
|
this.town.map(function(item,index){
|
|
this.town.map(function(item,index){
|
|
if(item.value == data[0]){
|
|
if(item.value == data[0]){
|
|
cityValue = item.value;
|
|
|
|
|
|
cityValue.push(item.value);
|
|
city = item.label
|
|
city = item.label
|
|
if(data[1]){
|
|
if(data[1]){
|
|
item.children.map(function(t){
|
|
item.children.map(function(t){
|
|
if(t.value == data[1]){
|
|
if(t.value == data[1]){
|
|
cityValue = t.value
|
|
|
|
|
|
cityValue.push(t.value)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
@ -333,6 +339,7 @@ new Vue({
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
cityVal: function(value) {
|
|
cityVal: function(value) {
|
|
|
|
// console.log(value)
|
|
var that = this;
|
|
var that = this;
|
|
that.lineHeightIndex = this.city;
|
|
that.lineHeightIndex = this.city;
|
|
// this.selectTown = value;
|
|
// this.selectTown = value;
|