diff --git a/src/util/api/api.js b/src/util/api/api.js index 801e19b..21439e4 100644 --- a/src/util/api/api.js +++ b/src/util/api/api.js @@ -16,6 +16,7 @@ export const getTotal = data => post("/devProjectJt/divFeeDetail/getTotal", data //查询汇总中各拆分状态 +export const getTotalFeeAndDivFee = data => post("/devProjectJt/divFeeStat/getTotalFeeAndDivFee", data,"") export const getDivDataList = data => post("/devProjectJt/divFeeStat/getDivDataList", data,"") export const getFeeTotal = data => post("/devProjectJt/divFeeStat/getFeeTotal", data,"") export const getHbData = data => post("/devProjectJt/divFeeStat/getHbData", data,"") @@ -32,8 +33,17 @@ export const getEveryClassFee = data => post("/devProjectJt/divFeeStat/getEveryC //导出明细数据 export const exportDivPassidAllData = data => download("/devProjectJt/exportData/exportList", data,null) - //20250417 数据核验数据展示 export const getFeeShowTotal = data => post("/devProjectJt/divFeeStat/getFeeShowTotal", data,"") export const getStatusToal = data => post("/devProjectJt/divFeeStat/getStatusToal", data,"") export const getVehicleClassToal = data => post("/devProjectJt/divFeeStat/getVehicleClassToal", data,"") + +//20250507 未计费 未拆分数据核验 +export const getFeeListByPage = data => post("/devProjectJt/divPassidAll/getFeeListByPage", data,"") +export const getDivListByPage = data => post("/devProjectJt/divPassidAll/getDivListByPage", data,"") +//20250513 + +export const getFeeunitListByPage = data => post("/devProjectJt/feeunit/getListByPage", data,"") + +//导出汇总数据 +export const exportEveryData = data => download("/devProjectJt/exportData/exportEveryList", data,null) diff --git a/src/util/axios/axios.js b/src/util/axios/axios.js index c9e386e..f5ab85d 100644 --- a/src/util/axios/axios.js +++ b/src/util/axios/axios.js @@ -4,8 +4,8 @@ import {ElMessage} from "element-plus"; // axios.defaults.staticBaseURL = '../' -axios.defaults.baseURL = 'http://' + window.location.host //正式 -//axios.defaults.baseURL = 'http://' + window.location.hostname + ':9002' //测试 +//axios.defaults.baseURL = 'http://' + window.location.host //正式 +axios.defaults.baseURL = 'http://' + window.location.hostname + ':9004' //测试 //post请求头 //axios.defaults.headers.post["Content-Type"] = "application/x-www-form-urlencoded;charset=UTF-8"; diff --git a/src/util/router/router.js b/src/util/router/router.js index 6e07af6..334408c 100644 --- a/src/util/router/router.js +++ b/src/util/router/router.js @@ -1,22 +1,37 @@ import * as vueRouter from "vue-router"; import gsCheckMain from '@/views/dev/gsCheckMain.vue'; +import nodivAndnofee from '@/views/dev/nodivAndnofee.vue'; import divfeeShowStat from '@/views/dev/divfeeShowStat.vue'; import mapfee from '@/views/dev/detail/map.vue'; +import rankAndtollintervalid from '@/views/dev/rankAndtollintervalid.vue'; +import feeStatDetail from '@/views/dev/detail/feeStatDetail.vue'; const routes = [ { + path: '/', + component: nodivAndnofee,// + },{ path: '/devProjectJt/divfeeShowStat', component: divfeeShowStat,// }, { path: '/devProjectJt/index', component: gsCheckMain,// + }, { + path: '/devProjectJt/nodivAndnofee', + component: nodivAndnofee,// }, { path: '/devProjectJt/mapfee', component: mapfee,// + }, { + path: '/devProjectJt/rankAndtollintervalid', + component: rankAndtollintervalid,// + }, { + path: '/devProjectJt/feeStatDetail', + component: feeStatDetail,// } ] diff --git a/src/util/tool.js b/src/util/tool.js index 326169b..4d57a70 100644 --- a/src/util/tool.js +++ b/src/util/tool.js @@ -165,6 +165,56 @@ let pro = { return 0 } return value + },initOptionPublic(data,echartsId,title,subtext) { + let myChart = this.$echarts.init(document.getElementById(echartsId)) + // 绘制图表 + this.option = { + title: { + text: title, + subtext: subtext, + left: 'center' + }, + tooltip: { + trigger: 'item', + left:'left' + }, + legend: { + orient: 'horizontal', // vertical 水平 + top: 'bottom', + fontSize:'5px' + }, + series: [ + { + type: 'pie', + avoidLabelOverlap: true, // 是否启用防止标签重叠策略 + radius: '50%',//饼图大小，55 最大,不要加中括号，否则 label不生效 + //radius: ['50%','70%'],//饼图大小，55 最大,不要加中括号，否则 label不生效 + center: ['50%', '50%'],//饼图 X Y 坐标 + itemStyle: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + }, + label: { + show: true, + formatter: echartsId==='vehicleclassRate'?'{b}:{c}%':'{b}:{c}' + }, + labelline:{ + show: true + }, + //鼠标移动上去后饼图区域的样式改变 + emphasis: { + itemStyle: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + }, + data: data + } + ] + }; + myChart.setOption(this.option); }, deepLocate: (function () { 'use strict' diff --git a/src/views/dev/detail/everyDayData.vue b/src/views/dev/detail/everyDayData.vue index 74ee084..a4561b0 100644 --- a/src/views/dev/detail/everyDayData.vue +++ b/src/views/dev/detail/everyDayData.vue @@ -10,43 +10,51 @@ style="width: 100%;height: 100%"> - - + + + + + - - - + + + - - - + + + - - + + @@ -54,25 +62,25 @@ @@ -168,19 +176,19 @@ export default{ columnShow:true, dataType:"JT", beginDate:"", - endDate:"" + endDate:"", + num:90 }}, methods:{ - refreshData(beginDate,endDate,subcomno,roadno,stanno,dataType){ + refreshData(beginDate,endDate,subcomno,roadno,stanno,dataType,num){ this.beginDate=beginDate ; this.endDate=endDate ; + this.num=num ; getTableData(beginDate,endDate,subcomno,roadno,stanno,dataType); - }, - handleSizeChange(val) { + },handleSizeChange(val) { this.pageSize = val; this.isLoding=true; - }, - handleCurrentChange(val) { + },handleCurrentChange(val) { this.currentPage = val; this.isLoading=true; }, dateFormatter(row, column, cellValue){ @@ -219,6 +227,24 @@ export default{ this.isShowDetailVehType=false; this.isShowDetail=true; this.updateDetail= this.updateDetail+1; + },getStatusColor(status) { // 根据状态返回颜色值 + if(status >= this.num){ + return '#67C23A'; // 成功：绿色 + }else{ + return '#F56C6C'; // 错误：红色 + } + /* switch (status) { + case 'success': + return '#67C23A'; // 成功：绿色 + case 'warning': + return '#E6A23C'; // 警告：橙色 + case 'error': + return '#F56C6C'; // 错误：红色 + default: + return '#909399'; // 默认：灰色 + }*/ + },exportExcle(beginDate,endDate,subcomno,roadno,stanno,dataType,num){ + exportData(beginDate,endDate,subcomno,roadno,stanno,dataType,num); } },components:{ /* detailTab, @@ -297,4 +323,39 @@ function formatDate(dateString,format) { } return ""; } + +function exportData(beginDate,endDate,subcomno,roadno,stanno,dataType) { + var paramsData={ + "queryStartTime":beginDate, + "queryEndTime":endDate, + "subcomno":subcomno, + "roadno":roadno, + "stano":stanno, + "type":dataType + } + exportEveryData({paramsData: JSON.stringify(paramsData)}).then(res => { + if (res.data != "") { + //fileName:下载的文件名 + + var fileName = '集团汇总_' + getCurrentDateHour(); //decodeURIComponent(res.headers["Content-Disposition"].split("=")[1]) + let blob = new Blob([res.data], {type: 'application/vnd.ms-excel;charset=utf-8'}); + // 针对ie浏览器 + if (window.navigator && window.navigator.msSaveOrOpenBlob) { + window.navigator.msSaveOrOpenBlob(blob, fileName); + } else { + //非ie浏览器 + var downloadElement = document.createElement("a"); + var href = window.URL.createObjectURL(blob); //下载的url + downloadElement.href = href; + downloadElement.download = fileName; //下载后文件名 + document.body.appendChild(downloadElement); + downloadElement.click(); //点击下载 + document.body.removeChild(downloadElement); //下载完成移除元素 + window.URL.revokeObjectURL(href); //释放blob对象 + } + } + //设置加载状态为false + _this.tableLoading = false; + }); +} \ No newline at end of file diff --git a/src/views/dev/detail/feeStatDetail.vue b/src/views/dev/detail/feeStatDetail.vue index 099f43d..a8c789c 100644 --- a/src/views/dev/detail/feeStatDetail.vue +++ b/src/views/dev/detail/feeStatDetail.vue @@ -90,6 +90,12 @@ + + + 包含 + 不包含 + +
@@ -170,7 +176,7 @@ export default { rowStyle: "", tableDataDetail: [], fullscreenLoading: false, - loading: true, + loading: false, tableDisable:false, clickDialog:false, feeDetail:false, @@ -198,7 +204,8 @@ export default { SPASSID:"", SEXITFEETYPE:"", totalfee:'0', - totaldivfee:'0' + totaldivfee:'0', + isHoliday:1//是否包含节假日 }; }, methods: { @@ -224,7 +231,8 @@ export default { "SVECHETYPE":this.SVECHETYPE, "status":(this.divStatus !==null && this.divStatus !=="" && this.divStatus !==undefined)?this.divStatus:this.status, "SPASSID":this.SPASSID, - "SEXITFEETYPE":this.SEXITFEETYPE + "SEXITFEETYPE":this.SEXITFEETYPE, + "isHoliday":this.isHoliday } if(this.classdate !=="" && this.classdate !==undefined){ params.queryStartTime=""; @@ -363,7 +371,8 @@ function exportData(){ "SVECHETYPE":_this.SVECHETYPE, "status":_this.status, "SPASSID":_this.SPASSID, - "SEXITFEETYPE":_this.SEXITFEETYPE + "SEXITFEETYPE":_this.SEXITFEETYPE, + "isHoliday":_this.isHoliday } exportDivPassidAllData({paramsData:JSON.stringify(paramsData)}).then(res => { if (res.data != "") { diff --git a/src/views/dev/detail/map-01.vue b/src/views/dev/detail/map-01.vue deleted file mode 100644 index 0ab3a49..0000000 --- a/src/views/dev/detail/map-01.vue +++ /dev/null @@ -1,396 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/dev/detail/map-fee.vue b/src/views/dev/detail/map-fee.vue deleted file mode 100644 index f30fad8..0000000 --- a/src/views/dev/detail/map-fee.vue +++ /dev/null @@ -1,223 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/dev/detail/map_250319.vue b/src/views/dev/detail/map_250319.vue deleted file mode 100644 index 56f26e0..0000000 --- a/src/views/dev/detail/map_250319.vue +++ /dev/null @@ -1,531 +0,0 @@ - - - - - diff --git a/src/views/dev/detail/map_normal.vue b/src/views/dev/detail/map_normal.vue deleted file mode 100644 index 9317e50..0000000 --- a/src/views/dev/detail/map_normal.vue +++ /dev/null @@ -1,301 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/dev/detail/nodivandnofee/divAndNofee.vue b/src/views/dev/detail/nodivandnofee/divAndNofee.vue new file mode 100644 index 0000000..d166048 --- /dev/null +++ b/src/views/dev/detail/nodivandnofee/divAndNofee.vue @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/src/views/dev/detail/nodivandnofee/feeAndNodiv.vue b/src/views/dev/detail/nodivandnofee/feeAndNodiv.vue new file mode 100644 index 0000000..2b86fca --- /dev/null +++ b/src/views/dev/detail/nodivandnofee/feeAndNodiv.vue @@ -0,0 +1,263 @@ + + + + + + \ No newline at end of file diff --git a/src/views/dev/detail/tableDataB.vue b/src/views/dev/detail/tableDataB.vue deleted file mode 100644 index 9ff8163..0000000 --- a/src/views/dev/detail/tableDataB.vue +++ /dev/null @@ -1,759 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/dev/echarts/echatsTotalLine.vue b/src/views/dev/echarts/echatsTotalLine.vue index 448f75b..1aae94b 100644 --- a/src/views/dev/echarts/echatsTotalLine.vue +++ b/src/views/dev/echarts/echatsTotalLine.vue @@ -12,11 +12,11 @@
-
未拆分
+
有计费无拆分
-
未计费
+
无计费有拆分
diff --git a/src/views/dev/echarts/echatsTotalLineShow.vue b/src/views/dev/echarts/echatsTotalLineShow.vue index b3e53f1..98a3fed 100644 --- a/src/views/dev/echarts/echatsTotalLineShow.vue +++ b/src/views/dev/echarts/echatsTotalLineShow.vue @@ -10,11 +10,11 @@
-
未拆分
+
有计费无拆分
-
未计费
+
无计费有拆分
diff --git a/src/views/dev/gsCheckMain.vue b/src/views/dev/gsCheckMain.vue index a33c73a..e8c0c0e 100644 --- a/src/views/dev/gsCheckMain.vue +++ b/src/views/dev/gsCheckMain.vue @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/src/views/dev/rankAndtollintervalid.vue b/src/views/dev/rankAndtollintervalid.vue new file mode 100644 index 0000000..1521165 --- /dev/null +++ b/src/views/dev/rankAndtollintervalid.vue @@ -0,0 +1,499 @@ + + + + \ No newline at end of file