@@ -112,7 +113,7 @@ body{
import {
Search, Upload
} from '@element-plus/icons-vue'
-import {getSelectList, getTotalFeeAndDivFee} from "@/util/api/api";
+import { getSelectList, getTotalFeeAndDivFee,getFeeBarData} from "@/util/api/api";
import everyDayData from "@/views/dev/detail/everyDayData.vue";
import hbData from "@/views/dev/detail/hbData.vue";
import echatsTotalLine from "@/views/dev/echarts/echatsTotalLine.vue";
@@ -150,6 +151,8 @@ data() {
stano: "",
totalFee: 0,
totalDiv: 0,
+ dataFee:[],
+ dataDivFee:[]
}
},
methods: {
@@ -204,6 +207,7 @@ methods: {
this.initOptionPie(data,"feePie","未拆分金额与已拆分金额","单位：万元");
}else{
getTotalFeeAndDivFeeA();
+ getBarData();
this.$refs["echatsTotalLine"].refreshData(this.begindate,this.enddate,this.subcomno,this.roadno,this.stano);
}
this.$refs["everyDayData"].refreshData(this.begindate,this.enddate,this.subcomno,this.roadno,this.stano,this.radio,this.num)
@@ -241,6 +245,7 @@ methods: {
return ;
}
getTotalFeeAndDivFeeA();
+ getBarData();
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)
@@ -319,6 +324,144 @@ methods: {
]
};
myChart.setOption(this.option);
+ },initOptionBar(divId,dataX,dataMoney,dataFeeMoney) {
+ 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:14}
+ },
+ data : dataX
+ }, dataZoom: [{
+ type: 'inside'
+ },
+ /*{
+ 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:true,
+ 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:'bar',
+ data:dataMoney,
+ label:{
+ show: true, // 显示标签
+ position: 'inside', // 标签位置
+ formatter: '{c}' // 标签格式器，{c} 代表数据值
+ },
+ yAxisIndex:0
+ },{
+ name:'拆分金额(万元)',
+ type:'bar',
+ data:dataFeeMoney,
+ label:{
+ show: true, // 显示标签
+ position: 'inside', // 标签位置
+ formatter: '{c}' // 标签格式器，{c} 代表数据值
+ },
+ yAxisIndex:0
+ }
+ ]
+ };
+ myChart.setOption(this.option);
+
}
},
components: {
@@ -352,6 +495,7 @@ mounted() {
});
this.initOptionPie(data,"feePie","未拆分金额与已拆分金额","单位：万元");
+ this.initOptionBar("feeBar",['拆分准确','计费大于拆分','计费小于拆分','无计费有拆分','有计费无拆分'],[0,0,0,0,0],[0,0,0,0,0]);
}
}
@@ -437,7 +581,37 @@ function getTotalFeeAndDivFeeA() {
}
)
}
-
+function getBarData(){
+ _this.loading=true;
+ var paramsObj={
+ "queryStartTime": _this.begindate,
+ "queryEndTime": _this.enddate,
+ "subcomno": _this.subcomno,
+ "roadno": _this.roadno,
+ "stano": _this.stano,
+ "type":_this.radio
+ }
+ _this.dataFee=[];
+ _this.dataDivFee=[];
+ getFeeBarData(paramsObj).then(
+ res=>{
+ if (res.code > 0) {
+ let _data = res.data;
+ for(var k=0;k<_data.length;k++){
+ _this.dataFee.push(_data[k].rightmoney);
+ _this.dataDivFee.push(_data[k].lessdivmoneygpa);
+ }
+ } else {
+ _this.dataFee=[0,0,0,0,0,0];
+ _this.dataDivFee=[0,0,0,0,0,0];
+ }
+ _this.loading=false;
+ _this.$nextTick(() => {
+ _this.initOptionBar("feeBar",['拆分准确','计费大于拆分','计费小于拆分','无计费有拆分','有计费无拆分'],_this.dataFee,_this.dataDivFee);
+ })
+ }
+ )
+}
function getCurrentDate(){
var myDate = new Date(); //获取今天日期
myDate.setDate(myDate.getDate() - 1);
diff --git a/src/views/dev/index_self_test.vue b/src/views/dev/index_self_test.vue
index e823d91..e39b093 100644
--- a/src/views/dev/index_self_test.vue
+++ b/src/views/dev/index_self_test.vue
@@ -140,7 +140,6 @@ export default {
},*/
addTab(path) {
//获取已经打开的tab
- console.log("path======"+path);
if(path.indexOf("undefined")>-1){
return ;
}
@@ -222,7 +221,6 @@ export default {
}
}
this.$nextTick(()=>{
- console.log("首页菜单url====="+firstMenuUrl)
if(firstMenuUrl =="") {
firstMenuUrl = '/FeeBased/feeBased__数据监测';
}
diff --git a/src/views/dev/nodivAndnofee.vue b/src/views/dev/nodivAndnofee.vue
index 8ab3fb9..ef4832c 100644
--- a/src/views/dev/nodivAndnofee.vue
+++ b/src/views/dev/nodivAndnofee.vue
@@ -4,7 +4,7 @@
-
+ />-->
+
+
+
+
+
+
+
+
+
@@ -55,15 +69,42 @@
-->
-
- 计费未拆分
- 拆分未计费
+
+ 有计费无拆分
+ 无计费有拆分
+ 计费大于拆分
+
+
+
+
+
+
+
+
+
+
+
+
查询
- 一键匹配
+ 查看稽核数据
+ 导出
+
@@ -74,6 +115,12 @@
+
+
+
+