Skip to content

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

1

parent 33947b75
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 111 deletions
src/components/viitto/dataLook.vue
View file @ dc309a0f
...@@ -224,6 +224,13 @@ ...@@ -224,6 +224,13 @@
.el-cascader-node:not(.is-disabled):focus, .el-cascader-node:not(.is-disabled):hover{ .el-cascader-node:not(.is-disabled):focus, .el-cascader-node:not(.is-disabled):hover{
background-color: #252D48 !important; background-color: #252D48 !important;
} }
.company-class{
background-color: rgb(29, 36, 61) !important;
border-color: rgb(29, 36, 61) !important;
}
.company-class .el-select-dropdown__item.hover,.company-class .el-select-dropdown__item:hover {
background-color: #252D48 !important;
}
</style> </style>
<template> <template>
<div class="dataLook" v-loading="!loding"> <div class="dataLook" v-loading="!loding">
...@@ -231,6 +238,22 @@ ...@@ -231,6 +238,22 @@
<el-row :gutter="70"> <el-row :gutter="70">
<el-col :span="18"> <el-col :span="18">
<el-row :gutter="70"> <el-row :gutter="70">
<el-col :span="8">
<div class="xilie">
<div>公司</div>
<div>
<el-select v-model="outbranchid" placeholder="请选择" @change="init" popper-class="company-class">
<el-option label="不限" :value="-1"></el-option>
<el-option
v-for="item in companyList"
:key="item.Id"
:label="item.BName"
:value="item.Id">
</el-option>
</el-select>
</div>
</div>
</el-col>
<el-col :span="8"> <el-col :span="8">
<div class="xilie"> <div class="xilie">
<div>系列</div> <div>系列</div>
...@@ -253,7 +276,7 @@ ...@@ -253,7 +276,7 @@
</el-col> </el-col>
<el-col :span="2" style="position: relative;"> <el-col :span="2" style="position: relative;">
<div class="open-btn" @click="drawer = true"> <div class="open-btn" @click="drawer = true">
<i class="iconfont icon-zhankai1" v-if="!rightShow"></i> <i class="iconfont icon-zhankai1" style="color: white" v-if="!rightShow"></i>
<i class="iconfont icon-zhankai-" v-else></i> <i class="iconfont icon-zhankai-" v-else></i>
</div> </div>
<div class="right-data"> <div class="right-data">
...@@ -268,7 +291,7 @@ ...@@ -268,7 +291,7 @@
{{(day_avg_num[0].OrderAvgCount + '').split('.')[0]}} <img src="../../assets/img/viitto/lvsedian.png" alt=""> {{(day_avg_num[0].OrderAvgCount + '').split('.')[0]}} <img src="../../assets/img/viitto/lvsedian.png" alt="">
</div> </div>
</div> </div>
<div class="item"> <!-- <div class="item">
<div>20日平均</div> <div>20日平均</div>
<div> <div>
{{(day_avg_num[2].OrderAvgCount + '').split('.')[0]}} <img src="../../assets/img/viitto/hongsedian.png" alt=""> {{(day_avg_num[2].OrderAvgCount + '').split('.')[0]}} <img src="../../assets/img/viitto/hongsedian.png" alt="">
...@@ -279,7 +302,7 @@ ...@@ -279,7 +302,7 @@
<div> <div>
{{(day_avg_num[3].OrderAvgCount + '').split('.')[0]}} <img src="../../assets/img/viitto/hongsedian.png" alt=""> {{(day_avg_num[3].OrderAvgCount + '').split('.')[0]}} <img src="../../assets/img/viitto/hongsedian.png" alt="">
</div> </div>
</div> </div> -->
</div> </div>
<!-- 线路占比 --> <!-- 线路占比 -->
<div> <div>
...@@ -292,7 +315,7 @@ ...@@ -292,7 +315,7 @@
{{day_line_statics[0].OrderPercent*100}}<span class="sub">%</span><img src="../../assets/img/viitto/lvsedian.png" alt=""> {{day_line_statics[0].OrderPercent*100}}<span class="sub">%</span><img src="../../assets/img/viitto/lvsedian.png" alt="">
</div> </div>
</div> </div>
<div class="item"> <!-- <div class="item">
<div>60日平均</div> <div>60日平均</div>
<div> <div>
{{day_line_statics[1].OrderPercent*100}}<span class="sub">%</span><img src="../../assets/img/viitto/hongsedian.png" alt=""> {{day_line_statics[1].OrderPercent*100}}<span class="sub">%</span><img src="../../assets/img/viitto/hongsedian.png" alt="">
...@@ -303,7 +326,7 @@ ...@@ -303,7 +326,7 @@
<div> <div>
{{day_line_statics[1].OrderPercent*100}}<span class="sub">%</span><img src="../../assets/img/viitto/hongsedian.png" alt=""> {{day_line_statics[1].OrderPercent*100}}<span class="sub">%</span><img src="../../assets/img/viitto/hongsedian.png" alt="">
</div> </div>
</div> </div> -->
</div> </div>
<!-- 报名单 --> <!-- 报名单 -->
...@@ -317,7 +340,7 @@ ...@@ -317,7 +340,7 @@
{{(day_order_statics[0].OrderCount + '').split('.')[0]}} {{(day_order_statics[0].OrderCount + '').split('.')[0]}}
</div> </div>
</div> </div>
<div class="item"> <!-- <div class="item">
<div>5日平均</div> <div>5日平均</div>
<div> <div>
{{(day_order_statics[1].OrderCount + '').split('.')[0]}} {{(day_order_statics[1].OrderCount + '').split('.')[0]}}
...@@ -328,7 +351,7 @@ ...@@ -328,7 +351,7 @@
<div> <div>
{{(day_order_statics[2].OrderCount + '').split('.')[0]}} {{(day_order_statics[2].OrderCount + '').split('.')[0]}}
</div> </div>
</div> </div> -->
</div> </div>
<!-- 产品点击 --> <!-- 产品点击 -->
...@@ -342,7 +365,7 @@ ...@@ -342,7 +365,7 @@
{{(day_click_statics[0].ClickCount + '').split('.')[0]}} {{(day_click_statics[0].ClickCount + '').split('.')[0]}}
</div> </div>
</div> </div>
<div class="item"> <!-- <div class="item">
<div>5日平均</div> <div>5日平均</div>
<div> <div>
{{(day_click_statics[1].ClickCount + '').split('.')[0]}} {{(day_click_statics[1].ClickCount + '').split('.')[0]}}
...@@ -353,7 +376,7 @@ ...@@ -353,7 +376,7 @@
<div> <div>
{{(day_click_statics[2].ClickCount + '').split('.')[0]}} {{(day_click_statics[2].ClickCount + '').split('.')[0]}}
</div> </div>
</div> </div> -->
</div> </div>
<!-- 历史卖价 --> <!-- 历史卖价 -->
<div> <div>
...@@ -366,7 +389,7 @@ ...@@ -366,7 +389,7 @@
{{Math.round(day_history_price[0].MaxPrice* 100) / 100}}<span class="sub"></span> {{Math.round(day_history_price[0].MaxPrice* 100) / 100}}<span class="sub"></span>
</div> </div>
</div> </div>
<div class="item"> <!-- <div class="item">
<div>最低</div> <div>最低</div>
<div> <div>
{{Math.round(day_history_price[0].MinPrice* 100) / 100}}<span class="sub"></span> {{Math.round(day_history_price[0].MinPrice* 100) / 100}}<span class="sub"></span>
...@@ -377,7 +400,7 @@ ...@@ -377,7 +400,7 @@
<div class="gree-color"> <div class="gree-color">
{{Math.round(day_history_price[0].AvgPrice* 100) / 100}}<span class="sub"></span> {{Math.round(day_history_price[0].AvgPrice* 100) / 100}}<span class="sub"></span>
</div> </div>
</div> </div> -->
</div> </div>
<!-- 成交量 --> <!-- 成交量 -->
<div> <div>
...@@ -390,7 +413,7 @@ ...@@ -390,7 +413,7 @@
{{day_history_preferprice[0].MaxPreferPrice}}<span class="sub"></span> {{day_history_preferprice[0].MaxPreferPrice}}<span class="sub"></span>
</div> </div>
</div> </div>
<div class="item"> <!-- <div class="item">
<div>最低</div> <div>最低</div>
<div> <div>
{{day_history_preferprice[0].MinPreferPrice}}<span class="sub"></span> {{day_history_preferprice[0].MinPreferPrice}}<span class="sub"></span>
...@@ -401,7 +424,7 @@ ...@@ -401,7 +424,7 @@
<div> <div>
{{day_history_preferprice[0].AvgPreferPrice}}<span class="sub"></span> {{day_history_preferprice[0].AvgPreferPrice}}<span class="sub"></span>
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
...@@ -411,7 +434,7 @@ ...@@ -411,7 +434,7 @@
:visible.sync="drawer" :visible.sync="drawer"
:direction="direction" :direction="direction"
:before-close="handleClose"> :before-close="handleClose">
<div class="right-data"> <div class="right-data">
<!-- 报名人数 --> <!-- 报名人数 -->
<div> <div>
<div class="tab pingfangR"><span>报名人数</span></div> <div class="tab pingfangR"><span>报名人数</span></div>
...@@ -579,6 +602,22 @@ export default { ...@@ -579,6 +602,22 @@ export default {
}, },
data(){ data(){
return { return {
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,
...@@ -610,6 +649,12 @@ export default { ...@@ -610,6 +649,12 @@ export default {
day_total_guestprice: {}, day_total_guestprice: {},
loding: false, loding: false,
lineChartKData: [], lineChartKData: [],
outbranchid: -1,
companyMsg:{
RB_Group_Id:'0',
Status:0,
},
companyList: [],
} }
}, },
watch: { watch: {
...@@ -636,10 +681,17 @@ export default { ...@@ -636,10 +681,17 @@ export default {
var s2 = day2.getFullYear()+"-" + (day2.getMonth()+1) + "-" + day2.getDate(); var s2 = day2.getFullYear()+"-" + (day2.getMonth()+1) + "-" + day2.getDate();
this.StartTime = s2; this.StartTime = s2;
this.init() this.init()
this.getCompany()
// setTimeout(() => { // setTimeout(() => {
// this.init() // this.init()
// }, 1000); // }, 1000);
},methods:{ },methods:{
getCompany(){ //公司
this.apipost('admin_get_BranchGetList', {}, res => {
let data = res.data.data;
this.companyList = data;
})
},
handleClose(done) { handleClose(done) {
done(); done();
}, },
...@@ -649,6 +701,7 @@ export default { ...@@ -649,6 +701,7 @@ export default {
if (regionIdArr.length == 1) { if (regionIdArr.length == 1) {
lineId = regionIdArr[0] lineId = regionIdArr[0]
} else { } else {
lineId = regionIdArr[0]
slineId = regionIdArr[1] slineId = regionIdArr[1]
} }
this.prolineId = lineId this.prolineId = lineId
...@@ -681,7 +734,8 @@ export default { ...@@ -681,7 +734,8 @@ export default {
let msg={ let msg={
startdate: this.StartTime, startdate: this.StartTime,
lineid: this.prolineId, lineid: this.prolineId,
ltid: this.slineId ltid: this.slineId,
outbranchid: this.outbranchid
} }
this.getOutherData(url, msg) this.getOutherData(url, msg)
this.getKdata(url2, msg) this.getKdata(url2, msg)
...@@ -691,7 +745,6 @@ export default { ...@@ -691,7 +745,6 @@ export default {
this.apiRequest(url,{msg:msg},r=>{ this.apiRequest(url,{msg:msg},r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
let data = r.data.data; let data = r.data.data;
console.log(data)
this.day_avg_num = data.day_avg_num this.day_avg_num = data.day_avg_num
this.day_history_price = data.day_history_price this.day_history_price = data.day_history_price
this.day_order_statics = data.day_order_statics this.day_order_statics = data.day_order_statics
...@@ -724,7 +777,6 @@ export default { ...@@ -724,7 +777,6 @@ export default {
this.apiRequest(url,{msg:msg},r=>{ this.apiRequest(url,{msg:msg},r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
let data = r.data.data.k_unitprice; let data = r.data.data.k_unitprice;
console.log(data)
this.lineChartKData = data; this.lineChartKData = data;
this.chartShow2 = true; this.chartShow2 = true;
this.$forceUpdate() this.$forceUpdate()
......
src/components/viitto/lineChart2.vue
View file @ dc309a0f
...@@ -281,8 +281,7 @@ export default { ...@@ -281,8 +281,7 @@ export default {
]) ])
} }
}, },
} },
,
{ {
name:'产品点击', name:'产品点击',
type:'line', type:'line',
......
src/components/viitto/lineChartK.vue
View file @ dc309a0f
This diff is collapsed.
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