From 891540f501a074774738cf2644afffd41fe22cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E7=BE=8E=E5=B9=B3?= <1102247926@qq.com> Date: Thu, 3 Jul 2025 17:30:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=BD=E6=A0=B8=E6=95=B0=E6=8D=AE=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=A4=84=E7=90=86=E7=BB=93=E6=9E=9C=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/util/api/api.js | 1 + src/util/axios/axios.js | 4 +- src/util/router/router.js | 4 + src/views/dev/detail/everyDayData.vue | 4 +- .../detail/nodivandnofee/DivMatchNoFee.vue | 4 +- .../detail/nodivandnofee/FeeMatchNoDiv.vue | 4 +- .../dev/detail/nodivandnofee/feeAndNodiv.vue | 2 +- .../detail/nodivandnofee/querySolveData.vue | 51 ++- .../nodivandnofee/querySolveDataFee.vue | 1 - .../detail/nodivandnofee/updateSolveData.vue | 374 ++++++++++++++++++ src/views/dev/echarts/echatsTotalLine.vue | 118 +----- src/views/dev/echarts/echatsTotalLineShow.vue | 4 +- src/views/dev/gsCheckMain.vue | 6 +- src/views/dev/nodivAndnofee.vue | 4 +- 14 files changed, 443 insertions(+), 138 deletions(-) create mode 100644 src/views/dev/detail/nodivandnofee/updateSolveData.vue diff --git a/src/util/api/api.js b/src/util/api/api.js index cfa0a53..a0acc01 100644 --- a/src/util/api/api.js +++ b/src/util/api/api.js @@ -53,6 +53,7 @@ export const getDivListByFeeId = data => post("/devProjectJt/divPassidAll/getDiv export const getFeeListByDivFeeId = data => post("/devProjectJt/divPassidAll/getFeeListByDivFeeId", data,"") //数据匹配 export const matchData = data => post("/devProjectJt/noFeeOrDivfee/matchData", data,"") +export const updateMatchData = data => post("/devProjectJt/divPassidAllMatch/updateMatchData", data,"") //20250513 export const getFeeunitListByPage = data => post("/devProjectJt/feeunit/getListByPage", data,"") diff --git a/src/util/axios/axios.js b/src/util/axios/axios.js index 8d2a8aa..06aa0b9 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 + ':9004' //测试 +//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 c3ca3e6..42ec6f6 100644 --- a/src/util/router/router.js +++ b/src/util/router/router.js @@ -6,6 +6,7 @@ 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'; +import updateSolveData from '@/views/dev/detail/nodivandnofee/updateSolveData.vue'; @@ -32,6 +33,9 @@ const routes = [ }, { path: '/devProjectJt/feeStatDetail', component: feeStatDetail,// + }, { + path: '/devProjectJt/updateSolveData', + component: updateSolveData,// } ] diff --git a/src/views/dev/detail/everyDayData.vue b/src/views/dev/detail/everyDayData.vue index 86bbb43..e1ce7d4 100644 --- a/src/views/dev/detail/everyDayData.vue +++ b/src/views/dev/detail/everyDayData.vue @@ -21,11 +21,11 @@ - + - + diff --git a/src/views/dev/detail/nodivandnofee/DivMatchNoFee.vue b/src/views/dev/detail/nodivandnofee/DivMatchNoFee.vue index 0c94faa..3e321b5 100644 --- a/src/views/dev/detail/nodivandnofee/DivMatchNoFee.vue +++ b/src/views/dev/detail/nodivandnofee/DivMatchNoFee.vue @@ -122,8 +122,8 @@ export default { searchButton: Search, doubleclikIndex: -1,//双击选中的行号 params:{}, - nofeeTitle:"有计费无拆分", - feeTitle:"无计费有拆分", + nofeeTitle:"", + feeTitle:"未计费(有拆分数据", statusCheckDivMaatch:'10' ,//需追缴 statusCheckListDivMaatch:[{"VALUE":"10","LABEL":"需处理"},{"VALUE":"12","LABEL":"作废"},{"VALUE":"11","LABEL":"其它"}] diff --git a/src/views/dev/detail/nodivandnofee/FeeMatchNoDiv.vue b/src/views/dev/detail/nodivandnofee/FeeMatchNoDiv.vue index e7b09e2..82d1b87 100644 --- a/src/views/dev/detail/nodivandnofee/FeeMatchNoDiv.vue +++ b/src/views/dev/detail/nodivandnofee/FeeMatchNoDiv.vue @@ -130,8 +130,8 @@ export default { doubleclikIndex: -1,//双击选中的行号 params:{}, tooltipContent:'这是第一行
这是第二行', - nofeeTitle:"无计费有拆分", - feeTitle:"有计费无拆分", + nofeeTitle:"", + feeTitle:"未拆分(有计费数据)", div_full_loading:false, paramsData:{}, statusCheck:'10' ,//需追缴 diff --git a/src/views/dev/detail/nodivandnofee/feeAndNodiv.vue b/src/views/dev/detail/nodivandnofee/feeAndNodiv.vue index 73f05da..4cde41c 100644 --- a/src/views/dev/detail/nodivandnofee/feeAndNodiv.vue +++ b/src/views/dev/detail/nodivandnofee/feeAndNodiv.vue @@ -303,7 +303,7 @@ function exportFeeData(paramsData) { if (res.data != "") { //fileName:下载的文件名 - var fileName = '有计费无拆分_' + tool.getCurrentDateHour(); //decodeURIComponent(res.headers["Content-Disposition"].split("=")[1]) + var fileName = '未拆分(有计费数据)_' + tool.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) { diff --git a/src/views/dev/detail/nodivandnofee/querySolveData.vue b/src/views/dev/detail/nodivandnofee/querySolveData.vue index 6efa0e3..3f7c02b 100644 --- a/src/views/dev/detail/nodivandnofee/querySolveData.vue +++ b/src/views/dev/detail/nodivandnofee/querySolveData.vue @@ -19,13 +19,16 @@ - - - - + + + + + + + - + @@ -90,7 +93,7 @@ \ No newline at end of file diff --git a/src/views/dev/detail/nodivandnofee/querySolveDataFee.vue b/src/views/dev/detail/nodivandnofee/querySolveDataFee.vue index 54dd3bd..87bdb93 100644 --- a/src/views/dev/detail/nodivandnofee/querySolveDataFee.vue +++ b/src/views/dev/detail/nodivandnofee/querySolveDataFee.vue @@ -84,7 +84,6 @@ export default { //props: ['params'], methods: { refreshDataMatchFee(paramAll){ - console.log("进来了啦"); this.params=paramAll; getTableDataLists(); },getSumData(param){ diff --git a/src/views/dev/detail/nodivandnofee/updateSolveData.vue b/src/views/dev/detail/nodivandnofee/updateSolveData.vue new file mode 100644 index 0000000..51e87b7 --- /dev/null +++ b/src/views/dev/detail/nodivandnofee/updateSolveData.vue @@ -0,0 +1,374 @@ + + + + + + \ No newline at end of file diff --git a/src/views/dev/echarts/echatsTotalLine.vue b/src/views/dev/echarts/echatsTotalLine.vue index b7de1c1..b0efa3f 100644 --- a/src/views/dev/echarts/echatsTotalLine.vue +++ b/src/views/dev/echarts/echatsTotalLine.vue @@ -1,7 +1,7 @@