Skip to content

C
confucius
Commit 019458bc authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

parents 3b4381e6 524c765d
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 40 deletions
src/components/work/index.vue
View file @ 019458bc
<template>
<div class="work-box row">
<div class="lft-box">
<div class="lft-box" style="display:none;">
<div class="relative-position">
<q-input
standout
......@@ -121,9 +121,9 @@
</q-list>
</div>
<div class="col q-pt-md q-pr-md">
<div class="row">
<div class="row work_Top">
<div class="text-h6 col">工作台</div>
<q-btn-group outline style="display:none;">
<q-btn-group outline>
<q-btn
dense
:outline="viewMode != 1"
......@@ -211,6 +211,10 @@ export default {
</script>
<style>
.work_Top{
padding:20px;
background-color:#fff;
}
.work-box {
height: 100%;
width: 100%;
......
src/components/work/todayData.vue
View file @ 019458bc
......@@ -3,7 +3,6 @@
background-color: #F7F7F7;
height: 100%;
padding: 0 20px 20px 20px;
margin-top: 20px;
}
.todayTop {
......@@ -55,13 +54,20 @@
.Data_List {
box-sizing: border-box;
flex: 0 0 22%;
flex: 0 0 18.5%;
padding: 32px;
background-color: #fff;
margin: 0 24px 24px 0;
font-size: 14px;
}
.Data_List2{
box-sizing: border-box;
flex: 0 0 18.5%;
padding: 32px;
background-color: #fff;
margin: 0 19px 24px 0;
font-size: 14px;
}
.Data_Inner {
height: 136px;
}
......@@ -156,7 +162,7 @@
</el-select>
</div>
</div>
<div class="Check_Content">
<div class="Check_Content" v-if="(IsQueryAuth||CurrentUserInfo.IsMarket==1)||(IsQueryAuth||CurrentUserInfo.IsCourseConsultant==1)">
<div class="Check_ListContent">
<div class="Check_Item" v-if="IsQueryAuth||CurrentUserInfo.IsMarket==1" @click="comType=1,searchData() "
:class="{'ckedClass':comType==1}">市场部数据统计</div>
......@@ -314,7 +320,7 @@
</div>
</div>
</div>
<div class="Data_List">
<div class="Data_List" style="margin-right:0">
<div class="Data_Inner">
<div class="Data_Title">销售额（签约量）</div>
<div class="Data_Time">{{yesData.DayStr}} {{yesData.WeekStr}}</div>
......@@ -356,7 +362,7 @@
<div class="Check_Map">
<div class="check_Title">今日实时数据</div>
<div class="Data_ListContent">
<div class="Data_List">
<div class="Data_List2">
<div class="Data_Inner">
<div class="Data_Title">试听邀约</div>
<div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
......@@ -391,7 +397,7 @@
</div>
</div>
</div>
<div class="Data_List">
<div class="Data_List2">
<div class="Data_Inner">
<div class="Data_Title">到访累计</div>
<div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
......@@ -426,7 +432,7 @@
</div>
</div>
</div>
<div class="Data_List">
<div class="Data_List2">
<div class="Data_Inner">
<div class="Data_Title">转化率</div>
<div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
......@@ -458,7 +464,7 @@
</div>
</div>
</div>
<div class="Data_List">
<div class="Data_List2">
<div class="Data_Inner">
<div class="Data_Title">有效回访总量</div>
<div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
......@@ -493,7 +499,7 @@
</div>
</div>
</div>
<div class="Data_List">
<div class="Data_List2">
<div class="Data_Inner">
<div class="Data_Title">单资源回访平均数</div>
<div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
......@@ -525,7 +531,7 @@
</div>
</div>
</div>
<div class="Data_List">
<div class="Data_List2">
<div class="Data_Inner">
<div class="Data_Title">本周新签数</div>
<div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
......@@ -545,7 +551,7 @@
</div>
</div>
</div>
<div class="Data_List">
<div class="Data_List2">
<div class="Data_Inner">
<div class="Data_Title">本周签约金额</div>
<div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
......@@ -565,7 +571,7 @@
</div>
</div>
</div>
<div class="Data_List">
<div class="Data_List2">
<div class="Data_Inner">
<div class="Data_Title">新签数累计</div>
<div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
......@@ -585,7 +591,7 @@
</div>
</div>
</div>
<div class="Data_List">
<div class="Data_List2">
<div class="Data_Inner">
<div class="Data_Title">签约金额累计</div>
<div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
......@@ -605,7 +611,7 @@
</div>
</div>
</div>
<div class="Data_List">
<div class="Data_List2">
<div class="Data_Inner">
<div class="Data_Title">当月效能目标</div>
<div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
......@@ -671,11 +677,15 @@
chart: {
height: 350,
type: 'line',
background: '#fff'
},
background: '#fff',
zoom: {
enabled: false
},
toolbar: {
show: false,
autoSelected: 'pan'
},
},
dataLabels: {
enabled: false
},
......@@ -699,14 +709,9 @@
sizeOffset: 6
}
},
// xaxis: {
// type: 'datetime', //设置X轴的类型 三种可选：category、datetime、numeric
// labels: {
// format: "MM-dd" //设置X轴时间格式
// }
// },
//设置X轴的时间
// labels: [],
xaxis: {
categories: []
},
tooltip: {
y: [{
title: {
......@@ -769,6 +774,21 @@
}
},
mounted() {
var now = new Date();
var strLink = "-";
var year = now.getFullYear();
var month = now.getMonth() + 1;
var day = now.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (day >= 1 && day <= 9) {
day = "0" + day;
}
this.msg.startTime = year + strLink + month + strLink + '01';
this.msg.endTime = year + strLink + month + strLink + day;
this.dateList.push(year + strLink + month + strLink + '01');
this.dateList.push(year + strLink + month + strLink + day);
this.searchData();
},
methods: {
......@@ -836,7 +856,7 @@
if (this.dateList && this.dateList.length > 0) {
this.msg.startTime = this.dateList[0];
this.msg.endTime = this.dateList[1];
} else {
}else{
this.msg.startTime = "";
this.msg.endTime = "";
}
......@@ -847,23 +867,26 @@
this.series[0].data = [];
this.series[1].data = [];
this.series[2].data = [];
this.xArray = [];
let xArray = [];
tempData.forEach(x => {
this.series[0].data.push(x.ClueCount);
this.series[1].data.push(x.VisitCount);
this.series[2].data.push(x.TrialLessonCount);
this.xArray.push(x.DayStr);
xArray.push(x.DayStr);
// this.chartOptions.xaxis.categories.push(x.DayStr);
})
if (this.xArray && this.xArray.length > 0) {
this.chartOptions = {
xaxis: {
categories: this.xArray
}
}
if (xArray && xArray.length > 0) {
// this.chartOptions = {
// xaxis: {
// categories: this.xArray
// }
// }
this.chartOptions.xaxis.categories = xArray;
}
setTimeout(() => {
this.$refs.apex.updateSeries(this.series)
}, 100)
}, 200)
}
});
},
......
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