+
@@ -66,7 +66,8 @@ export default {
"queryEndTime":endDate,
"subcomno":subcomno,
"roadno":roadno,
- "stano":stano
+ "stano":stano,
+ "isNoContainJm":"Y" //默认不包含减免的费用
}
getDivDataList(paramsObj).then(
res=>{
@@ -84,9 +85,11 @@ export default {
var dataNoFeeFlow = [];
var dataLessDiv = [];
+ var dataLessDivFee = [];
var dataLessDivFlow = [];
var dataMoreDiv = [];
+ var dataMoreDivFee = [];
var dataMoreDivFlow = [];
if(_data !==undefined ){
@@ -104,10 +107,12 @@ export default {
}
if(divData.status ==="2"){//计费大于拆分
dataLessDiv.push(tool.NumRound(divData.fee));
+ dataLessDivFee.push(tool.NumRound(divData.divfee));
dataLessDivFlow.push(divData.carcount);
}
if(divData.status ==="3"){//计费小于拆分
dataMoreDiv.push(tool.NumRound(divData.fee));
+ dataMoreDivFee.push(tool.NumRound(divData.divfee));
dataMoreDivFlow.push(divData.carcount);
}
if(divData.status ==="4"){//未计费
@@ -124,8 +129,8 @@ export default {
this.initOptionLine('divRightLine', dataX, dataRight, dataRightFlow);
this.initOptionLine('noDivLine', dataX, dataNoDiv, dataNoDivFlow);
this.initOptionLine('noFeeLine', dataX, dataNoFee, dataNoFeeFlow);
- this.initOptionLine('lessDivLine', dataX, dataLessDiv, dataLessDivFlow);
- this.initOptionLine('moreDivLine', dataX, dataMoreDiv, dataMoreDivFlow);
+ this.initOptionLineMoreLess('lessDivLine', dataX, dataLessDiv,dataLessDivFee, dataLessDivFlow);
+ this.initOptionLineMoreLess('moreDivLine', dataX, dataMoreDiv,dataMoreDivFee, dataMoreDivFlow);
})
}
}
@@ -293,7 +298,152 @@ export default {
// 控制台打印数据的名称
_this.$emit("changeGantryCount",params.name);
});*/
- }
+ },initOptionLineMoreLess(divId,dataX,dataMoney,dataFeeMoney,dataFlow) {
+ let myChart = this.$echarts.init(document.getElementById(divId))
+ // 绘制图表
+ this.option = {
+ title : {
+ text: '',
+ subtext: ''
+ },
+ tooltip : {
+ trigger: 'axis',
+ //position:['20px','20px']
+ },
+ legend: {
+ data:["流量(辆)","计费金额(元)","拆分金额(元)"]
+ },
+ toolbox: {
+ show : true,
+ orient: 'vertical',
+ title : {
+ line : '折线图',
+ bar : '柱形图'
+
+ },
+ feature : {
+ mark : {show: true},
+ //垂直显示
+ //dataView : {show: true, readOnly: false},
+ magicType : {show: true,
+ title : {
+ line : '折线图',
+ bar : '柱形图'
+
+ },
+ type: ['line', 'bar']},
+ }
+ },
+ calculable : true,
+ xAxis :
+ {
+ type : 'category',
+ name:'日期',
+ nameTextStyle:{
+ lineHeight:30,
+ verticalAlign:'top'
+ },
+ boundaryGap : true,
+ axisTick: {
+ show: true,
+ alignWithLabel:true
+
+ },
+ axisLabel: { //设置x轴的文字
+ show:true,
+ interval:0,//使x轴横坐标全部显示
+ //rotate:45,
+ textStyle:{fontSize:10}
+ },
+ data : dataX
+ }, dataZoom: [{
+ type: 'slider',
+ show: true, //flase直接隐藏图形
+ xAxisIndex: [0],
+ backgroundColor:'rgb(233,236,238)',
+ handleColor:'rgba(147,145,145,0.81)',
+ fillerColor:'rgb(184,186,187)',
+ handleSize:30,//控制手柄大小
+ height:30,
+ left: '9%', //滚动条靠左侧的百分比
+ bottom: -5,
+ start: 0,//滚动条的起始位置
+ end: 110 //滚动条的截止位置（按比例分割你的柱状图x轴长度）
+ }],
+ yAxis :[
+ {
+ type : 'value',
+ axisLabel : {
+ formatter: '{value}'
+ },
+ show:false,
+ splitLine:{
+ show:true
+ },
+ lineStyle:{
+ color:'black',
+ type:'solid',
+ width:2
+ },
+ sync: true,
+ splitNumber:10,
+ position:'left'
+ },{
+ type : 'value',
+ axisLabel : {
+ formatter: '{value}'
+ },
+ show:false,
+ splitLine:{
+ show:true
+ },
+ lineStyle:{
+ color:'black',
+ type:'solid',
+ width:2
+ },
+ sync: true,
+ splitNumber:100,
+ position:'right'
+ }
+ ],
+ series : [
+ {
+ name:'流量(辆)',
+ type:'line',
+ data:dataFlow,
+ label:{
+ show: true, // 显示标签
+ position: 'top', // 标签位置
+ formatter: '{c}' // 标签格式器，{c} 代表数据值
+ },
+ yAxisIndex:0
+ },{
+ name:'计费金额(元)',
+ type:'bar',
+ data:dataMoney,
+ label:{
+ show: true, // 显示标签
+ position: 'inside', // 标签位置
+ formatter: '{c}' // 标签格式器，{c} 代表数据值
+ },
+ yAxisIndex:1
+ },{
+ name:'拆分金额(元)',
+ type:'bar',
+ data:dataFeeMoney,
+ label:{
+ show: true, // 显示标签
+ position: 'inside', // 标签位置
+ formatter: '{c}' // 标签格式器，{c} 代表数据值
+ },
+ yAxisIndex:1
+ }
+ ]
+ };
+ myChart.setOption(this.option);
+
+ }
},mounted() {
_this=this;
/*
diff --git a/src/views/dev/echarts/echatsTotalLineShow.vue b/src/views/dev/echarts/echatsTotalLineShow.vue
new file mode 100644
index 0000000..b3e53f1
--- /dev/null
+++ b/src/views/dev/echarts/echatsTotalLineShow.vue
@@ -0,0 +1,534 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/dev/gsCheckMain.vue b/src/views/dev/gsCheckMain.vue
index a13fa23..a33c73a 100644
--- a/src/views/dev/gsCheckMain.vue
+++ b/src/views/dev/gsCheckMain.vue
@@ -1,56 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 集团汇总
+ 减免汇总
+ 环比数据
+
+
+
+
+ 查询
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
+
-
+
@@ -154,13 +173,15 @@ body{
width: 100% !important;
}
.contain-div{
- height: 100%;
+ height: 90%;
width: 100%;
}
.top_div{
height: 5%;
width: 100%;
border-bottom: #c9c6c6 solid;
+ top: 0;
+ /*z-index: 1000; /* 确保它在其他内容之上 */
}
.middle-div{
height: 95%;
@@ -195,12 +216,21 @@ import {watch,ref} from 'vue'
import { getSelectList,getRankList,getHzData} from "@/util/api/api";
import mapvue from '@/views/dev/detail/map.vue'
import feeStatDetail from '@/views/dev/detail/feeStatDetail.vue'
+import everyDayData from "@/views/dev/detail/everyDayData.vue";
+import hbData from "@/views/dev/detail/hbData.vue";
import echatsTotalLine from "@/views/dev/echarts/echatsTotalLine.vue";
+import everyDayDataJM from "@/views/dev/detail/everyDayDataJM.vue";
+import tool from "@/util/tool";
var _this;
export default {
name: "checkEcharts",
data() {
return {
+ hbShow:false,
+ showClass:false,
+ radio:6,
+ showHZ:true,
+ showHZMF:false,
tableloading:false,
rpTime:"",
searchButton:Search,
@@ -218,6 +248,10 @@ data() {
typedivfeeTotal:"0",
begindate:"",
enddate:"",
+ diffDate:1,//日期差值，用来计算环比
+ firstChooseDate:"",
+ hbStartTimeQuery:"",
+ hbEndTimeQuery:"",
rankdata:[],
rankNum:10,
vehicleclassText:"KC",
@@ -233,17 +267,60 @@ data() {
}
},
methods: {
+ changeRadio(value){
+ if(value===3){
+ this.hbShow=true;
+ this.showHZ=false;
+ this.showHZMF=false;
+ this.showClass=false;
+ if(this.begindate && this.enddate && this.enddate!==""){
+ this.hbStartTimeQuery=tool.DayDec(this.begindate,0- this.diffDate);
+ this.hbEndTimeQuery=tool.DayDec(this.enddate,0- this.diffDate);
+ this.$refs["hbData"].refreshDataHb(this.begindate,this.enddate,this.hbStartTimeQuery,this.hbEndTimeQuery)
+ }
+ }else if(value===9){
+ this.hbShow=false;
+ this.showHZ=false;
+ this.showHZMF=false;
+ this.showClass=true;
+ this.$refs["everyDayDataJM"].refreshData(this.begindate,this.enddate,this.subcomno,this.roadno,this.stano,this.radio)
+ }else if(value===6 ){
+ this.hbShow=false;
+ this.showHZ=true;
+ this.showHZMF=false;
+ this.showClass=false;
+ this.$refs["everyDayData"].refreshData(this.begindate,this.enddate,this.subcomno,this.roadno,this.stano,this.radio)
+ }
+
+ },calendarChange (val) {
+ this.firstChooseDate = val[0].getTime() //点击第一次选中日期
+ if (val[1]) {
+ const timeRange = 1 * 24 * 60 * 60 * 1000;
+ let diffDay=(val[1].getTime() -val[0].getTime())/timeRange ;
+ this.diffDate = (diffDay==0?1:diffDay+1)//天数差值
+ this.firstChooseDate = "" // 选中后必须清空
+ }
+ },
search() {//查询
console.log(this.rpTime)
if(this.rpTime){
this.begindate=this.rpTime[0];
this.enddate=this.rpTime[1];
this.tableloading=true;
+ this.hbStartTimeQuery=tool.DayDec(this.begindate,0- this.diffDate);
+ this.hbEndTimeQuery=tool.DayDec(this.enddate,0- this.diffDate);
}else{
alert("请选择日期");
return ;
}
- this.$refs["echatsTotalLine"].refreshData(this.begindate,this.enddate,this.subcomno,this.roadno,this.stano);
+ this.$refs["echatsTotalLine"].refreshData(this.begindate,this.enddate,this.subcomno,this.roadno,this.stano);
+ if(this.radio ===3){
+ this.$refs["hbData"].refreshDataHb(this.begindate,this.enddate,this.hbStartTimeQuery,this.hbEndTimeQuery)
+ }else if(this.radio ===9){
+ this.$refs["everyDayDataJM"].refreshData(this.begindate,this.enddate,this.subcomno,this.roadno,this.stano,this.radio)
+ }else{
+ this.$refs["everyDayData"].refreshData(this.begindate,this.enddate,this.subcomno,this.roadno,this.stano,this.radio)
+ }
var params={
"pageNum":1,
"pageSize":10,
@@ -347,9 +424,11 @@ methods: {
},
components: {
echatsTotalLine,
- Search,
+ everyDayDataJM,
mapvue,
- feeStatDetail
+ feeStatDetail,
+ everyDayData,
+ hbData
},
mounted() {
_this=this;