-
+
-
@@ -109,11 +95,11 @@ body{
width: 100% !important;
}
.contain-div{
- height: 90%;
+ height: 89%;
width: 100%;
}
.top_div{
- height: 10%;
+ height: 11%;
width: 100%;
border-bottom: #c9c6c6 solid;
top: 0;
@@ -126,7 +112,7 @@ body{
import {
Search, Upload
} from '@element-plus/icons-vue'
-import {getSelectList, getRankList, getHzData, exportDivPassidAllData} from "@/util/api/api";
+import {getSelectList, getTotalFeeAndDivFee} 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";
@@ -143,6 +129,7 @@ data() {
showHZ:true,
showHZMF:false,
loading:false,
+ showDiv:true,
rpTime:"",
num:90,
searchButton:Search,
@@ -167,12 +154,20 @@ data() {
},
methods: {
changeRadio(value){
+ 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);
+ }
if(value===3){
this.showExportButton=false;
this.hbShow=true;
this.showHZ=false;
this.showHZMF=false;
this.showClass=false;
+ this.showDiv=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);
@@ -184,6 +179,7 @@ methods: {
this.showHZ=false;
this.showHZMF=false;
this.showClass=true;
+ this.showDiv=false;
this.$refs["everyDayDataJM"].refreshData(this.begindate,this.enddate,this.subcomno,this.roadno,this.stano,this.radio)
}else if(value===6 ){
if(!this.num){
@@ -191,9 +187,25 @@ methods: {
}
this.showExportButton=true;
this.hbShow=false;
+ this.showDiv=true;
this.showHZ=true;
this.showHZMF=false;
this.showClass=false;
+ if(!this.begindate){
+ var data=[];
+ data.push({
+ value: 0,
+ name: "未拆分"
+ });
+ data.push({
+ value: 0,
+ name: "已拆分"
+ });
+ this.initOptionPie(data,"feePie","未拆分金额与已拆分金额","单位：万元");
+ }else{
+ getTotalFeeAndDivFeeA();
+ 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)
}
@@ -201,7 +213,7 @@ methods: {
if(!this.num){
this.num=90;
}
- if(value===6 ){
+ if(this.radio===6 ){
this.hbShow=false;
this.showHZ=true;
this.showHZMF=false;
@@ -218,7 +230,6 @@ methods: {
}
},
search() {//查询
- console.log(this.rpTime)
if(this.rpTime){
this.begindate=this.rpTime[0];
this.enddate=this.rpTime[1];
@@ -229,14 +240,14 @@ methods: {
alert("请选择日期");
return ;
}
-
+ getTotalFeeAndDivFeeA();
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)
+ this.$refs["everyDayData"].refreshData(this.begindate,this.enddate,this.subcomno,this.roadno,this.stano,this.radio,this.num)
}
}, changesubcomnoValue() {
this.stano="";
@@ -248,8 +259,15 @@ methods: {
this.stano="";
getStalist();
},exportExcle(){
+ 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);
+ }
this.$refs["everyDayData"].exportExcle(this.begindate,this.enddate,this.subcomno,this.roadno,this.stano,this.radio)
- },initOption(data,echartsId,title,subtext) {
+ },initOptionPie(data,echartsId,title,subtext) {
let myChart = this.$echarts.init(document.getElementById(echartsId))
// 绘制图表
this.option = {
@@ -263,8 +281,10 @@ methods: {
left:'left'
},
legend: {
- orient: 'horizontal', // vertical 水平
- top: 'bottom',
+ orient: 'vertical', // vertical 垂直 horizontal 水平
+ //orient: 'vertical', // vertical 垂直
+ left: '80%',
+ top:'30%',
fontSize:'5px'
},
series: [
@@ -273,7 +293,7 @@ methods: {
avoidLabelOverlap: true, // 是否启用防止标签重叠策略
radius: '55%',//饼图大小，55 最大,不要加中括号，否则 label不生效
//radius: ['50%','70%'],//饼图大小，55 最大,不要加中括号，否则 label不生效
- center: ['50%', '50%'],//饼图 X Y 坐标
+ center: ['50%', '60%'],//饼图 X Y 坐标
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
@@ -326,7 +346,11 @@ mounted() {
value: 0,
name: "未拆分"
});
- this.initOption(data,"feePie","未拆分金额与已拆分金额","单位：万元");
+ data.push({
+ value: 0,
+ name: "已拆分"
+ });
+ this.initOptionPie(data,"feePie","未拆分金额与已拆分金额","单位：万元");
}
}
@@ -381,7 +405,7 @@ function getStalist() {
}
)
}
-function getTotalFeeAndDivFee() {
+function getTotalFeeAndDivFeeA() {
let staParams = {
"queryStartTime": _this.begindate,
"queryEndTime": _this.enddate,
@@ -389,6 +413,7 @@ function getTotalFeeAndDivFee() {
"roadno": _this.roadno,
"stano": _this.stano
}
+ _this.loading=true;
var data = [];
getTotalFeeAndDivFee(staParams).then(
res => {
@@ -408,7 +433,7 @@ function getTotalFeeAndDivFee() {
_this.totalFee = 0
_this.totaldivfee = 0
}
- tool.initOption(data,"feePie","未拆分金额与已拆分金额","单位：万元")
+ _this.initOptionPie(data,"feePie","未拆分金额与已拆分金额","单位：万元")
}
)
}
diff --git a/src/views/dev/nodivAndnofee.vue b/src/views/dev/nodivAndnofee.vue
index 45d6891..8ab3fb9 100644
--- a/src/views/dev/nodivAndnofee.vue
+++ b/src/views/dev/nodivAndnofee.vue
@@ -44,7 +44,7 @@
-
+
计费未拆分
@@ -63,14 +63,17 @@
查询
+ 一键匹配