Skip to content

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

1

parent 2e2232ef
Hide whitespace changes
Inline Side-by-side
Showing with 337 additions and 79 deletions
src/components/viitto/dataLook.vue
View file @ 83d0cd9e
...@@ -606,22 +606,7 @@ export default { ...@@ -606,22 +606,7 @@ export default {
}, },
data(){ data(){
return { return {
options: [{ options: [],
value: '选项1',
label: '黄金糕'
}, {
value: '选项2',
label: '双皮奶'
}, {
value: '选项3',
label: '蚵仔煎'
}, {
value: '选项4',
label: '龙须面'
}, {
value: '选项5',
label: '北京烤鸭'
}],
drawer: false, drawer: false,
direction: 'rtl', direction: 'rtl',
rightShow: false, rightShow: false,
......
src/components/viitto/lineChart.vue
View file @ 83d0cd9e
...@@ -20,12 +20,12 @@ ...@@ -20,12 +20,12 @@
.PINGFANG{ .PINGFANG{
font-family: "PINGFANG REGULAR"; font-family: "PINGFANG REGULAR";
} }
.myecharts{ .myecharts.myecharts1{
height: 100%; height: 980px;
} }
</style> </style>
<template> <template>
<div class="myecharts" ref="myecharts" > <div class="myecharts myecharts1" ref="myecharts" >
</div> </div>
</template> </template>
...@@ -80,7 +80,8 @@ export default { ...@@ -80,7 +80,8 @@ export default {
realtime: true, realtime: true,
start: 90, start: 90,
end: 100, end: 100,
xAxisIndex: [0, 1, 2, 3], top: '650px',
xAxisIndex: [0, 1, 2],
textStyle: { textStyle: {
color: "#ffffff" color: "#ffffff"
}, },
...@@ -95,7 +96,40 @@ export default { ...@@ -95,7 +96,40 @@ export default {
realtime: true, realtime: true,
start: 90, start: 90,
end: 100, end: 100,
xAxisIndex: [0, 1, 2, 3], top: '650px',
xAxisIndex: [0, 1, 2],
textStyle: {
color: "#ffffff"
},
dataBackground: {
lineStyle: {
color: '#ffffff'
}
}
},
{
show: true,
realtime: true,
start: 90,
end: 100,
top: '900px',
xAxisIndex: 3,
textStyle: {
color: "#ffffff"
},
dataBackground: {
lineStyle: {
color: '#ffffff'
}
}
},
{
type: 'inside',
realtime: true,
start: 90,
end: 100,
top: '900px',
xAxisIndex: 3,
textStyle: { textStyle: {
color: "#ffffff" color: "#ffffff"
}, },
...@@ -110,27 +144,26 @@ export default { ...@@ -110,27 +144,26 @@ export default {
snap: true, snap: true,
link: {xAxisIndex: 'all'} link: {xAxisIndex: 'all'}
}, },
grid: [{ grid: [{
left: 40, left: 40,
right: 10, right: 10,
top: '5%', top: '40px',
height: '16%' height: '150px'
}, { }, {
left: 40, left: 40,
right: 10, right: 10,
top: '28%', top: '250px',
height: '16%' height: '150px'
}, { }, {
left: 40, left: 40,
right: 10, right: 10,
top: '51%', top: '460px',
height: '16%' height: '150px'
}, { }, {
left: 40, left: 40,
right: 10, right: 10,
top: '74%', top: '720px',
height: '16%' height: '150px'
} }
], ],
xAxis : [ xAxis : [
...@@ -156,18 +189,20 @@ export default { ...@@ -156,18 +189,20 @@ export default {
boundaryGap : false, boundaryGap : false,
data: _this.dateList, data: _this.dateList,
position: 'bottom', position: 'bottom',
"show": false,
},
{
gridIndex: 3,
type : 'category',
boundaryGap : false,
data: _this.dateList,
position: 'bottom',
"show": true, "show": true,
axisLabel: { axisLabel: {
color: '#fff', color: '#fff',
}, },
},{
gridIndex: 3,
type : 'category',
boundaryGap : false,
data: _this.dateList,
position: 'bottom',
"show": true,
axisLabel: {
color: '#fff',
},
} }
], ],
yAxis : [ yAxis : [
...@@ -233,7 +268,7 @@ export default { ...@@ -233,7 +268,7 @@ export default {
}, },
{ {
gridIndex: 3, gridIndex: 3,
name : '询价统计 '+ _this.day_total_guestprice.InquireCount, name : '其他' + _this.day_total_guestprice.ClickCount,
type : 'value', type : 'value',
inverse: false, inverse: false,
splitLine: { splitLine: {
...@@ -248,8 +283,8 @@ export default { ...@@ -248,8 +283,8 @@ export default {
fontSize: 18 fontSize: 18
}, },
axisLabel: { axisLabel: {
color: 'rgb(106, 176, 76)', color: '#EE4454',
} },
} }
], ],
series : [ series : [
...@@ -348,7 +383,38 @@ export default { ...@@ -348,7 +383,38 @@ export default {
}, },
}, },
{ {
name:'询价统计', name:'其他',
type:'line',
xAxisIndex: 3,
yAxisIndex: 3,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.clickcountList,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
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:'其他1',
type:'line', type:'line',
xAxisIndex: 3, xAxisIndex: 3,
yAxisIndex: 3, yAxisIndex: 3,
...@@ -356,24 +422,86 @@ export default { ...@@ -356,24 +422,86 @@ export default {
hoverAnimation: true, hoverAnimation: true,
smooth: true, smooth: true,
showSymbol: false, showSymbol: false,
data: _this.inquireList, data: _this.guestnumList,
itemStyle: { itemStyle: {
borderWidth: 2, borderWidth: 2,
color: "rgb(106, 176, 76)", color: '#EE4454',
shadowBlur: 5, shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)' shadowColor: 'rgba(255,250,0,1)'
}, },
lineStyle: { lineStyle: {
color: "rgb(106, 176, 76)", color: "#FFAA85",
width: 1, width: 1,
shadowBlur: 2, shadowBlur: 2,
shadowColor: "rgb(106, 176, 76)", shadowColor: "#EE4454"
}, },
areaStyle: { areaStyle: {
normal: { normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(106, 176, 76,1)" }, { offset: 0, color: "rgba(239,71,86,1)" },
{ offset: .8, color: "rgba(106, 176, 76,0)" } { offset: .8, color: "rgba(239,71,86,0)" }
])
}
},
},
{
name:'其他2',
type:'bar',
xAxisIndex: 3,
yAxisIndex: 3,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.clickcountList,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
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:'其他3',
type:'bar',
xAxisIndex: 3,
yAxisIndex: 3,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.ordercountList,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
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)" }
]) ])
} }
}, },
......
src/components/viitto/lineChart2.vue
View file @ 83d0cd9e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
font-family: "PINGFANG REGULAR"; font-family: "PINGFANG REGULAR";
} }
.myechartsS{ .myechartsS{
height: 1100px !important; height: 1160px !important;
} }
</style> </style>
<template> <template>
...@@ -80,7 +80,8 @@ export default { ...@@ -80,7 +80,8 @@ export default {
realtime: true, realtime: true,
start: 90, start: 90,
end: 100, end: 100,
xAxisIndex: [0, 1, 2, 3, 4], top: '850px',
xAxisIndex: [0, 1, 2],
textStyle: { textStyle: {
color: "#ffffff" color: "#ffffff"
}, },
...@@ -95,7 +96,40 @@ export default { ...@@ -95,7 +96,40 @@ export default {
realtime: true, realtime: true,
start: 90, start: 90,
end: 100, end: 100,
xAxisIndex: [0, 1, 2, 3, 4], top: '850px',
xAxisIndex: [0, 1, 2],
textStyle: {
color: "#ffffff"
},
dataBackground: {
lineStyle: {
color: '#ffffff'
}
}
},
{
show: true,
realtime: true,
start: 90,
end: 100,
top: '1100px',
xAxisIndex: 4,
textStyle: {
color: "#ffffff"
},
dataBackground: {
lineStyle: {
color: '#ffffff'
}
}
},
{
type: 'inside',
realtime: true,
start: 90,
end: 100,
top: '1100px',
xAxisIndex: 4,
textStyle: { textStyle: {
color: "#ffffff" color: "#ffffff"
}, },
...@@ -134,7 +168,7 @@ export default { ...@@ -134,7 +168,7 @@ export default {
}, { }, {
left: 40, left: 40,
right: 10, right: 10,
top: '880px', top: '930px',
height: '150px' height: '150px'
} }
], ],
...@@ -170,17 +204,20 @@ export default { ...@@ -170,17 +204,20 @@ export default {
data: _this.dateList, data: _this.dateList,
position: 'bottom', position: 'bottom',
"show": false, "show": false,
},
{
gridIndex: 4,
type : 'category',
boundaryGap : false,
data: _this.dateList,
position: 'bottom',
"show": true, "show": true,
axisLabel: { axisLabel: {
color: '#fff', color: '#fff',
}, },
},{
gridIndex: 4,
type : 'category',
boundaryGap : false,
data: _this.dateList,
position: 'bottom',
"show": true,
axisLabel: {
color: '#fff',
},
} }
], ],
yAxis : [ yAxis : [
...@@ -266,7 +303,7 @@ export default { ...@@ -266,7 +303,7 @@ export default {
}, },
{ {
gridIndex: 4, gridIndex: 4,
name : '询价统计 '+ _this.day_total_guestprice.InquireCount, name : '其他1' + _this.day_total_guestprice.GuestNum,
type : 'value', type : 'value',
inverse: false, inverse: false,
splitLine: { splitLine: {
...@@ -281,7 +318,7 @@ export default { ...@@ -281,7 +318,7 @@ export default {
fontSize: 18 fontSize: 18
}, },
axisLabel: { axisLabel: {
color: 'rgb(106, 176, 76)', color: '#EE4454',
} }
} }
], ],
...@@ -413,7 +450,7 @@ export default { ...@@ -413,7 +450,7 @@ export default {
}, },
}, },
{ {
name:'询价统计', name:'其他',
type:'line', type:'line',
xAxisIndex: 4, xAxisIndex: 4,
yAxisIndex: 4, yAxisIndex: 4,
...@@ -421,24 +458,117 @@ export default { ...@@ -421,24 +458,117 @@ export default {
hoverAnimation: true, hoverAnimation: true,
smooth: true, smooth: true,
showSymbol: false, showSymbol: false,
data: _this.inquireList, data: _this.clickcountList,
itemStyle: { itemStyle: {
borderWidth: 2, borderWidth: 2,
color: "rgb(106, 176, 76)", color: '#EE4454',
shadowBlur: 5, shadowBlur: 5,
shadowColor: 'rgba(255,250,0,1)' shadowColor: 'rgba(255,250,0,1)'
}, },
lineStyle: { lineStyle: {
color: "rgb(106, 176, 76)", color: "#FFAA85",
width: 1, width: 1,
shadowBlur: 2, shadowBlur: 2,
shadowColor: "rgb(106, 176, 76)", shadowColor: "#EE4454"
}, },
areaStyle: { areaStyle: {
normal: { normal: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(106, 176, 76,1)" }, { offset: 0, color: "rgba(239,71,86,1)" },
{ offset: .8, color: "rgba(106, 176, 76,0)" } { offset: .8, color: "rgba(239,71,86,0)" }
])
}
},
},
{
name:'其他1',
type:'line',
xAxisIndex: 4,
yAxisIndex: 4,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.guestnumList,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
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',
xAxisIndex: 4,
yAxisIndex: 4,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.clickcountList,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
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:'其他3',
type:'bar',
xAxisIndex: 4,
yAxisIndex: 4,
symbolSize: 2,
hoverAnimation: true,
smooth: true,
showSymbol: false,
data: _this.ordercountList,
itemStyle: {
borderWidth: 2,
color: '#EE4454',
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)" }
]) ])
} }
}, },
......
src/components/viitto/viittoData.vue
View file @ 83d0cd9e
...@@ -347,9 +347,9 @@ ul li { ...@@ -347,9 +347,9 @@ ul li {
<p class="name">印象之旅数据看板</p> <p class="name">印象之旅数据看板</p>
</div> </div>
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20" v-if="dataArea.length>0 && newArr.length>0">
<div class="map-box" style="position:relative;top:-50px;left:-140px;"> <div class="map-box" style="position:relative;top:-50px;left:-140px;">
<centerMp :dataArea="dataArea"></centerMp> <centerMp :dataArea="dataArea" :newArr="newArr"></centerMp>
</div> </div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -404,7 +404,8 @@ ul li { ...@@ -404,7 +404,8 @@ ul li {
</template> </template>
<script> <script>
import dashboard from "./dashboard"; import dashboard from "./dashboard";
import centerMp from "../sellDashboard/map/viittoMap"; // import centerMp from "../sellDashboard/map/viittoMap";
import centerMp from "../sellDashboard/map/viittoMap3";
export default { export default {
components: { components: {
dashboard, dashboard,
...@@ -418,18 +419,32 @@ export default { ...@@ -418,18 +419,32 @@ export default {
dataArea:[], dataArea:[],
num:1, num:1,
zoom: 1, zoom: 1,
newArr: []
} }
},mounted() { },mounted() {
let Height = window.innerHeight let Height = window.innerHeight
this.zoom = Math.round((Height/1080) * 100) / 100 this.zoom = Math.round((Height/1080) * 100) / 100
this.init(); this.init();
setTimeout(() => { setTimeout(() => {
this.connec(); this.connec();
}, 1000); }, 1000);
setTimeout(() => { setTimeout(() => {
this.exChangeBoard(); this.exChangeBoard();
}, 300000); }, 300000);
this.getLoginHot()
},methods:{ },methods:{
getLoginHot(){
this.apipost("financestatistics_post_GetB2BClienyThreeMonethLoginInfo", {}, r=>{
if(r.data.resultCode==1){
let data = r.data.data
let newArr = []
for(let i = 0; i < data.length; i++) {
newArr.push([data[i].Lng, data[i].Lat, data[i].Count])
}
this.newArr = newArr
}
})
},
init(){ init(){
let url='http://47.96.23.199:5000/api/user/get_b2b_data' let url='http://47.96.23.199:5000/api/user/get_b2b_data'
let msg={ let msg={
......
src/plugins/index.js
View file @ 83d0cd9e
...@@ -15,7 +15,7 @@ export default { ...@@ -15,7 +15,7 @@ export default {
// var domainUrl = "http://test_reborn.oytour.com";//主域名 // var domainUrl = "http://test_reborn.oytour.com";//主域名
//var domainUrl = "http://reborn.oytour.com"; //主域名 //var domainUrl = "http://reborn.oytour.com"; //主域名
var domainUrl = "http://reborn.oytour.com";//主域名 var domainUrl = "http://reborn.oytour.com";//主域名
var domainUrl = "http://192.168.2.16:8083";//主域名
if (this.isOnline()) { if (this.isOnline()) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
} }
......
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