Skip to content

M
Muse
Commit f79bf45f authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

1

parent 83d0cd9e
Show whitespace changes
Inline Side-by-side
Showing with 283 additions and 145 deletions
src/components/viitto/dataLook.vue
View file @ f79bf45f
......@@ -586,9 +586,9 @@
</el-col>
</el-row>
<el-row>
<lineChart v-if="chartShow && RB_Branch_id !== 0" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList"/>
<lineChart2 v-if="chartShow && RB_Branch_id === 0" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList"/>
<!-- <lineChart2 v-if="chartShow" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList"/> -->
<lineChart v-if="chartShow && RB_Branch_id !== 0 && ChunData" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList" :ChunData="ChunData"/>
<lineChart2 v-if="chartShow && RB_Branch_id === 0 && ChunData" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList" :ChunData="ChunData"/>
<lineChart2 v-if="chartShow && ChunData" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList" :ChunData="ChunData"/>
</el-row>
</div>
......@@ -645,7 +645,8 @@ export default {
Status:0,
},
companyList: [],
RB_Branch_id: null
RB_Branch_id: null,
ChunData: [],
}
},
watch: {
......@@ -726,6 +727,7 @@ export default {
this.chartShow2 = false;
let url='http://47.96.23.199:5001/api/order/get_single_data'
let url2 = "http://47.96.23.199:5001/api/order/get_single_data_v2"
let url3 = "http://47.96.23.199:5001/api/order/future_day"
let msg={
startdate: this.StartTime,
lineid: this.prolineId,
......@@ -734,7 +736,14 @@ export default {
}
this.getOutherData(url, msg)
this.getKdata(url2, msg)
this.getChunData(url3, msg)
},
getChunData: function (url, msg){
this.apiRequest(url,{msg:msg},r=>{
if(r.data.resultCode==1){
this.ChunData = r.data.data.k_unitprice
}
})
},
getOutherData: function (url, msg){
this.apiRequest(url,{msg:msg},r=>{
......
src/components/viitto/lineChart.vue
View file @ f79bf45f
......@@ -40,16 +40,50 @@ export default {
'day_total_guestprice',
'dateList',
'inquireList',
'ChunData',
'zoom'
],
data(){
return {
dateList2: [],
InquireCount: [],
DownCount: [],
LookCount: [],
Salelookordercount: [],
TcidCount: [],
B2BMemberPrice: [],
}
},watch:{
// ChunData(old, newV){
// if (newV) {
// this.initChun()
// }
// }
},created(){
},mounted() {
var dates = [], InquireCount = [], DownCount = [], LookCount = [], Salelookordercount = [], TcidCount = [], B2BMemberPrice = [];
this.ChunData.map(function (item) {
dates.push(item.StartDate);
InquireCount.push(item.InquireCount);
DownCount.push(item.DownCount);
LookCount.push(item.LookCount);
Salelookordercount.push(item.Salelookordercount);
TcidCount.push(item.TcidCount);
B2BMemberPrice.push(item.B2BMemberPrice);
});
this.dateList2 = dates
this.InquireCount = InquireCount
this.DownCount = DownCount
this.LookCount = LookCount
this.Salelookordercount = Salelookordercount
this.TcidCount = TcidCount
this.B2BMemberPrice = B2BMemberPrice
this.init()
},methods:{
initChun(){
},
init() {
let myChart = this.$echarts.init(this.$refs.myecharts);
var dataAxis = [];
......@@ -58,6 +92,15 @@ export default {
textStyle: {
fontFamily: 'PINGFANG REGULAR',
},
legend: {
data: ['询价', '行程下载', '行程浏览', '当天发团数', '销售查看报名', 'B2B均价' ],
textStyle: {
color: '#fff'
},
left: 180,
top: '690px',
},
tooltip: {
trigger: 'axis',
axisPointer: {
......@@ -112,7 +155,7 @@ export default {
realtime: true,
start: 90,
end: 100,
top: '900px',
top: '930px',
xAxisIndex: 3,
textStyle: {
color: "#ffffff"
......@@ -128,7 +171,7 @@ export default {
realtime: true,
start: 90,
end: 100,
top: '900px',
top: '930px',
xAxisIndex: 3,
textStyle: {
color: "#ffffff"
......@@ -161,8 +204,8 @@ export default {
height: '150px'
}, {
left: 40,
right: 10,
top: '720px',
right: 40,
top: '750px',
height: '150px'
}
],
......@@ -196,8 +239,8 @@ export default {
},{
gridIndex: 3,
type : 'category',
boundaryGap : false,
data: _this.dateList,
boundaryGap: true,
data: _this.dateList2,
position: 'bottom',
"show": true,
axisLabel: {
......@@ -268,7 +311,7 @@ export default {
},
{
gridIndex: 3,
name : '其他' + _this.day_total_guestprice.ClickCount,
name : 'B2B均价',
type : 'value',
inverse: false,
splitLine: {
......@@ -285,6 +328,26 @@ export default {
axisLabel: {
color: '#EE4454',
},
},
{
gridIndex: 3,
name : '询价',
type : 'value',
inverse: false,
splitLine: {
lineStyle: {
color: '#30374E',
type: 'dashed'
}
},
nameTextStyle: {
color: '#ffffff',
padding: [10, 110, 0, 0],
fontSize: 18
},
axisLabel: {
color: '#EE4454',
},
}
],
series : [
......@@ -383,100 +446,112 @@ export default {
},
},
{
name:'其他',
name:'询价',
type:'line',
xAxisIndex: 3,
yAxisIndex: 3,
yAxisIndex: 4,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.clickcountList,
data: _this.InquireCount,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
color: '#9345F8',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#FFAA85",
color: "#9345F8",
width: 1,
shadowBlur: 2,
shadowColor: "#EE4454"
},
areaStyle: {
normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(239,71,86,1)" },
{ offset: .8, color: "rgba(239,71,86,0)" }
])
}
},
{
name:'行程下载',
type:'line',
xAxisIndex: 3,
yAxisIndex: 4,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.DownCount,
itemStyle: {
borderWidth: 2,
color: '#32ff7e',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#32ff7e",
width: 1,
}
},
{
name:'其他1',
name:'行程浏览',
type:'line',
xAxisIndex: 3,
yAxisIndex: 3,
yAxisIndex: 4,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.guestnumList,
data: _this.LookCount,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
color: '#FFAA85',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#FFAA85",
width: 1,
shadowBlur: 2,
shadowColor: "#EE4454"
},
areaStyle: {
normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(239,71,86,1)" },
{ offset: .8, color: "rgba(239,71,86,0)" }
])
}
},
},
{
name:'其他2',
type:'bar',
name:'当天发团数',
type:'line',
xAxisIndex: 3,
yAxisIndex: 3,
yAxisIndex: 4,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.clickcountList,
data: _this.TcidCount,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
color: '#596275',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#FFAA85",
color: "#596275",
width: 1,
shadowBlur: 2,
shadowColor: "#EE4454"
},
areaStyle: {
normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(239,71,86,1)" },
{ offset: .8, color: "rgba(239,71,86,0)" }
])
}
},
{
name:'销售查看报名',
type:'line',
xAxisIndex: 3,
yAxisIndex: 4,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.Salelookordercount,
itemStyle: {
borderWidth: 2,
color: '#ffb8b8',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#ffb8b8",
width: 1,
},
},
{
name:'其他3',
name:'B2B均价',
type:'bar',
xAxisIndex: 3,
yAxisIndex: 3,
......@@ -484,26 +559,16 @@ export default {
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.ordercountList,
data: _this.B2BMemberPrice,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
color: '#e66767',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#FFAA85",
color: "#e66767",
width: 1,
shadowBlur: 2,
shadowColor: "#EE4454"
},
areaStyle: {
normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(239,71,86,1)" },
{ offset: .8, color: "rgba(239,71,86,0)" }
])
}
},
}
]
......
src/components/viitto/lineChart2.vue
View file @ f79bf45f
......@@ -40,16 +40,50 @@ export default {
'day_total_guestprice',
'dateList',
'inquireList',
'ChunData',
'zoom'
],
data(){
return {
}
dateList2: [],
InquireCount: [],
DownCount: [],
LookCount: [],
Salelookordercount: [],
TcidCount: [],
B2BMemberPrice: [],
}
},watch:{
// ChunData(old, newV){
// if (newV) {
// this.initChun()
// }
// }
},created(){
},mounted() {
var dates = [], InquireCount = [], DownCount = [], LookCount = [], Salelookordercount = [], TcidCount = [], B2BMemberPrice = [];
this.ChunData.map(function (item) {
dates.push(item.StartDate);
InquireCount.push(item.InquireCount);
DownCount.push(item.DownCount);
LookCount.push(item.LookCount);
Salelookordercount.push(item.Salelookordercount);
TcidCount.push(item.TcidCount);
B2BMemberPrice.push(item.B2BMemberPrice);
});
this.dateList2 = dates
this.InquireCount = InquireCount
this.DownCount = DownCount
this.LookCount = LookCount
this.Salelookordercount = Salelookordercount
this.TcidCount = TcidCount
this.B2BMemberPrice = B2BMemberPrice
this.init()
},methods:{
initChun(){
},
init() {
let myChart = this.$echarts.init(this.$refs.myecharts);
var dataAxis = [];
......@@ -58,6 +92,14 @@ export default {
textStyle: {
fontFamily: 'PINGFANG REGULAR',
},
legend: {
data: ['询价', '行程下载', '行程浏览', '当天发团数', '销售查看报名', 'B2B均价' ],
textStyle: {
color: '#fff'
},
left: 180,
top: '920px',
},
tooltip: {
trigger: 'axis',
axisPointer: {
......@@ -81,7 +123,7 @@ export default {
start: 90,
end: 100,
top: '850px',
xAxisIndex: [0, 1, 2],
xAxisIndex: [0, 1, 2, 3],
textStyle: {
color: "#ffffff"
},
......@@ -97,7 +139,7 @@ export default {
start: 90,
end: 100,
top: '850px',
xAxisIndex: [0, 1, 2],
xAxisIndex: [0, 1, 2, 3],
textStyle: {
color: "#ffffff"
},
......@@ -112,7 +154,7 @@ export default {
realtime: true,
start: 90,
end: 100,
top: '1100px',
top: '1130px',
xAxisIndex: 4,
textStyle: {
color: "#ffffff"
......@@ -128,7 +170,7 @@ export default {
realtime: true,
start: 90,
end: 100,
top: '1100px',
top: '1130px',
xAxisIndex: 4,
textStyle: {
color: "#ffffff"
......@@ -167,8 +209,8 @@ export default {
height: '150px'
}, {
left: 40,
right: 10,
top: '930px',
right: 40,
top: '960px',
height: '150px'
}
],
......@@ -211,8 +253,8 @@ export default {
},{
gridIndex: 4,
type : 'category',
boundaryGap : false,
data: _this.dateList,
boundaryGap : true,
data: _this.dateList2,
position: 'bottom',
"show": true,
axisLabel: {
......@@ -303,7 +345,7 @@ export default {
},
{
gridIndex: 4,
name : '其他1' + _this.day_total_guestprice.GuestNum,
name : 'B2B均价',
type : 'value',
inverse: false,
splitLine: {
......@@ -319,7 +361,27 @@ export default {
},
axisLabel: {
color: '#EE4454',
},
},
{
gridIndex: 4,
name : '询价',
type : 'value',
inverse: false,
splitLine: {
lineStyle: {
color: '#30374E',
type: 'dashed'
}
},
nameTextStyle: {
color: '#ffffff',
padding: [10, 110, 0, 0],
fontSize: 18
},
axisLabel: {
color: '#EE4454',
},
}
],
series : [
......@@ -450,100 +512,112 @@ export default {
},
},
{
name:'其他',
name:'询价',
type:'line',
xAxisIndex: 4,
yAxisIndex: 4,
yAxisIndex: 5,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.clickcountList,
data: _this.InquireCount,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
color: '#9345F8',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#FFAA85",
color: "#9345F8",
width: 1,
shadowBlur: 2,
shadowColor: "#EE4454"
},
areaStyle: {
normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(239,71,86,1)" },
{ offset: .8, color: "rgba(239,71,86,0)" }
])
}
},
{
name:'行程下载',
type:'line',
xAxisIndex: 4,
yAxisIndex: 5,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.DownCount,
itemStyle: {
borderWidth: 2,
color: '#32ff7e',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#32ff7e",
width: 1,
}
},
{
name:'其他1',
name:'行程浏览',
type:'line',
xAxisIndex: 4,
yAxisIndex: 4,
yAxisIndex: 5,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.guestnumList,
data: _this.LookCount,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
color: '#FFAA85',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#FFAA85",
width: 1,
shadowBlur: 2,
shadowColor: "#EE4454"
},
areaStyle: {
normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(239,71,86,1)" },
{ offset: .8, color: "rgba(239,71,86,0)" }
])
}
},
},
{
name:'其他2',
type:'bar',
name:'当天发团数',
type:'line',
xAxisIndex: 4,
yAxisIndex: 4,
yAxisIndex: 5,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.clickcountList,
data: _this.TcidCount,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
color: '#596275',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#FFAA85",
color: "#596275",
width: 1,
shadowBlur: 2,
shadowColor: "#EE4454"
},
areaStyle: {
normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(239,71,86,1)" },
{ offset: .8, color: "rgba(239,71,86,0)" }
])
}
},
{
name:'销售查看报名',
type:'line',
xAxisIndex: 4,
yAxisIndex: 5,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.Salelookordercount,
itemStyle: {
borderWidth: 2,
color: '#ffb8b8',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#ffb8b8",
width: 1,
},
},
{
name:'其他3',
name:'B2B均价',
type:'bar',
xAxisIndex: 4,
yAxisIndex: 4,
......@@ -551,26 +625,16 @@ export default {
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.ordercountList,
data: _this.B2BMemberPrice,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
color: '#e66767',
shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)'
},
lineStyle: {
color: "#FFAA85",
color: "#e66767",
width: 1,
shadowBlur: 2,
shadowColor: "#EE4454"
},
areaStyle: {
normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(239,71,86,1)" },
{ offset: .8, color: "rgba(239,71,86,0)" }
])
}
},
}
]
......
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