Commit 5d735343 authored by zhengke's avatar zhengke

修改

parent 2af55f37
...@@ -81,9 +81,9 @@ ...@@ -81,9 +81,9 @@
font-size:15px; font-size:15px;
background-color: #2B314E; background-color: #2B314E;
} }
.salesTable tr:nth-child(even){ /* .salesTable tr:nth-child(even){
background-color: #252B48; background-color: #252B48;
} } */
.salesTable tbody tr:hover{ .salesTable tbody tr:hover{
background-color: #2B314E!important; background-color: #2B314E!important;
box-shadow: 0px 0px 10px rgba(81,84,99,0.8)!important;/*设置阴影,可以自定义参数*/ box-shadow: 0px 0px 10px rgba(81,84,99,0.8)!important;/*设置阴影,可以自定义参数*/
...@@ -180,7 +180,7 @@ export default { ...@@ -180,7 +180,7 @@ export default {
dataList:[], dataList:[],
msg:{ msg:{
yearstr:0, yearstr:0,
monthstr:0, monthstr: 0,
outbranchid:-1 outbranchid:-1
}, },
companyList:[], companyList:[],
...@@ -193,6 +193,13 @@ export default { ...@@ -193,6 +193,13 @@ export default {
},mounted() { },mounted() {
this.msg.yearstr=this.$route.query.year; this.msg.yearstr=this.$route.query.year;
this.msg.monthstr=this.$route.query.month; this.msg.monthstr=this.$route.query.month;
if(this.msg.yearstr==undefined){
var myDate = new Date();
this.msg.yearstr = myDate.getFullYear();
}
if(this.msg.monthstr==undefined){
this.msg.monthstr=0;
}
this.getList(); this.getList();
},methods:{ },methods:{
getList(){ getList(){
...@@ -233,7 +240,6 @@ export default { ...@@ -233,7 +240,6 @@ export default {
} }
} }
}) })
console.log(this.dataList,'datalistt');
} }
}) })
}, },
...@@ -250,7 +256,11 @@ export default { ...@@ -250,7 +256,11 @@ export default {
}, },
//点击跳转 //点击跳转
goSalesMap(){ goSalesMap(){
window.location="http://192.168.0.117:8080/#/salesGuestList" this.$router.push({
name: "salesGuestList",
query: {}
});
//window.location="http://data.oytour.com/#/salesGuestList"
} }
} }
} }
......
...@@ -444,7 +444,18 @@ export default { ...@@ -444,7 +444,18 @@ export default {
crossStyle: { crossStyle: {
color: "#999" color: "#999"
} }
},
formatter:function(params){
var res=params[0].name;
for(var i=0;i<params.length;i++){
if(params[i].componentSubType=='bar'){
res+='<br/>'+params[i].marker+params[i].seriesName+'(销售额)'+':'+params[i].data
}else{
res+='<br/>'+params[i].marker+params[i].seriesName+'(人数)'+':'+params[i].data
}
} }
return res;
},
}, },
xAxis: { xAxis: {
type: "category", type: "category",
...@@ -541,7 +552,7 @@ export default { ...@@ -541,7 +552,7 @@ export default {
"#84F3D3", "#84F3D3",
"#009D62", "#009D62",
"#66E62C", "#66E62C",
"#FACA57", "#EFFF42",
"#FACA57", "#FACA57",
"#FF7437", "#FF7437",
"#E70000" "#E70000"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment