From 30c490673b85720bd5447a0b577f3e989ba50ac4 Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期二, 22 九月 2026 11:02:59 +0800
Subject: [PATCH] feat(数据查看): 拆分表空列不显示、口径上移为筛选(接口加 periodType)、12 类表表头补齐单位
---
traffic-audit-web/src/views/DataView.vue | 26 +++++-
traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java | 168 +++++++++++++++++++++--------------------
2 files changed, 107 insertions(+), 87 deletions(-)
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java b/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java
index 72961b3..f769ca6 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java
@@ -105,6 +105,7 @@
public Result<Map<String, Object>> list(@RequestParam("type") String type,
@RequestParam(value = "period", required = false) String period,
@RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "periodType", required = false) String periodType,
@RequestParam(value = "page", defaultValue = "1") long page,
@RequestParam(value = "size", defaultValue = "20") long size) {
String kw = keyword == null ? "" : keyword.trim();
@@ -154,6 +155,7 @@
case "scaleSplit": {
LambdaQueryWrapper<ScaleSplitTransport> w = new LambdaQueryWrapper<ScaleSplitTransport>()
.eq(notEmpty(period), ScaleSplitTransport::getReportPeriod, period)
+ .eq(notEmpty(periodType), ScaleSplitTransport::getPeriodType, periodType)
.like(!kw.isEmpty(), ScaleSplitTransport::getRegionName, kw)
.orderByDesc(ScaleSplitTransport::getId);
Page<ScaleSplitTransport> p = new Page<>(safePage, safeSize);
@@ -540,26 +542,26 @@
H2032_COLUMNS.add(col("enterpriseName", "浼佷笟鍚嶇О", 220));
H2032_COLUMNS.add(col("unifiedCreditCode", "缁熶竴绀句細淇＄敤浠ｇ爜", 180));
H2032_COLUMNS.add(col("reportUnit", "濉姤鍗曚綅", 160));
- H2032_COLUMNS.add(col("vehicleTotal", "杞﹁締鏁板悎璁�", 110));
+ H2032_COLUMNS.add(col("vehicleTotal", "杞﹁締鏁板悎璁�(杈�)", 130));
H2032_COLUMNS.add(col("tonsTotal", "鏍囪鍚ㄤ綅鏁板悎璁�(鍚�)", 150));
- H2032_COLUMNS.add(col("vehicleTractor", "鐗靛紩杞�", 90));
- H2032_COLUMNS.add(col("vehicleTrailer", "鎸傝溅", 90));
- H2032_COLUMNS.add(col("tonsTrailer", "鍚ㄤ綅-鎸傝溅", 110));
- H2032_COLUMNS.add(col("vehicleContainer", "闆嗚绠辫溅", 110));
- H2032_COLUMNS.add(col("tonsContainer", "鍚ㄤ綅-闆嗚绠�", 120));
- H2032_COLUMNS.add(col("vehicleWhole", "鏁磋溅", 90));
- H2032_COLUMNS.add(col("tonsWhole", "鍚ㄤ綅-鏁磋溅", 110));
+ H2032_COLUMNS.add(col("vehicleTractor", "鐗靛紩杞�(杈�)", 110));
+ H2032_COLUMNS.add(col("vehicleTrailer", "鎸傝溅(杈�)", 110));
+ H2032_COLUMNS.add(col("tonsTrailer", "鍚ㄤ綅-鎸傝溅(鍚�)", 130));
+ H2032_COLUMNS.add(col("vehicleContainer", "闆嗚绠辫溅(杈�)", 120));
+ H2032_COLUMNS.add(col("tonsContainer", "鍚ㄤ綅-闆嗚绠�(鍚�)", 140));
+ H2032_COLUMNS.add(col("vehicleWhole", "鏁磋溅(杈�)", 110));
+ H2032_COLUMNS.add(col("tonsWhole", "鍚ㄤ綅-鏁磋溅(鍚�)", 130));
H2032_COLUMNS.add(col("freightTotal", "璐ц繍閲忓悎璁�(鍚�)", 130));
H2032_COLUMNS.add(col("turnoverTotal", "鍛ㄨ浆閲忓悎璁�(鍚ㄥ叕閲�)", 150));
- H2032_COLUMNS.add(col("freightContainer", "璐ц繍閲�-闆嗚绠�", 130));
- H2032_COLUMNS.add(col("freightCoal", "璐ц繍閲�-鐓ょ偔", 120));
- H2032_COLUMNS.add(col("freightOilGas", "璐ц繍閲�-娌规皵", 120));
- H2032_COLUMNS.add(col("freightCrudeOil", "璐ц繍閲�-鍘熸补", 120));
- H2032_COLUMNS.add(col("freightMetalOre", "璐ц繍閲�-閲戝睘鐭跨煶", 140));
- H2032_COLUMNS.add(col("freightIronOre", "璐ц繍閲�-閾佺熆鐭�", 130));
- H2032_COLUMNS.add(col("freightBuilding", "璐ц繍閲�-寤烘潗", 120));
- H2032_COLUMNS.add(col("freightGrain", "璐ц繍閲�-绮", 120));
- H2032_COLUMNS.add(col("avgTonnage", "骞冲潎鍚ㄤ綅", 100));
+ H2032_COLUMNS.add(col("freightContainer", "璐ц繍閲�-闆嗚绠�(鍚�)", 140));
+ H2032_COLUMNS.add(col("freightCoal", "璐ц繍閲�-鐓ょ偔(鍚�)", 140));
+ H2032_COLUMNS.add(col("freightOilGas", "璐ц繍閲�-娌规皵(鍚�)", 140));
+ H2032_COLUMNS.add(col("freightCrudeOil", "璐ц繍閲�-鍘熸补(鍚�)", 140));
+ H2032_COLUMNS.add(col("freightMetalOre", "璐ц繍閲�-閲戝睘鐭跨煶(鍚�)", 140));
+ H2032_COLUMNS.add(col("freightIronOre", "璐ц繍閲�-閾佺熆鐭�(鍚�)", 140));
+ H2032_COLUMNS.add(col("freightBuilding", "璐ц繍閲�-寤烘潗(鍚�)", 140));
+ H2032_COLUMNS.add(col("freightGrain", "璐ц繍閲�-绮(鍚�)", 140));
+ H2032_COLUMNS.add(col("avgTonnage", "骞冲潎鍚ㄤ綅(鍚�)", 120));
H2032_COLUMNS.add(col("avgDistance", "骞冲潎杩愯窛(鍏噷)", 120));
H2032_COLUMNS.add(col("unitLeader", "鍗曚綅璐熻矗浜�", 110));
H2032_COLUMNS.add(col("statsLeader", "缁熻璐熻矗浜�", 110));
@@ -571,46 +573,46 @@
AUTH_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
AUTH_COLUMNS.add(col("enterpriseName", "浼佷笟鍚嶇О", 240));
- AUTH_COLUMNS.add(col("tractorCount", "鐗靛紩杞︽暟", 100));
- AUTH_COLUMNS.add(col("trailerCount", "鎸傝溅鏁�", 100));
- AUTH_COLUMNS.add(col("otherCount", "鍏朵粬杞︽暟", 100));
- AUTH_COLUMNS.add(col("trailerTons", "鎸傝溅鍚ㄤ綅", 110));
- AUTH_COLUMNS.add(col("otherTons", "鍏朵粬鍚ㄤ綅", 110));
+ AUTH_COLUMNS.add(col("tractorCount", "鐗靛紩杞︽暟(杈�)", 110));
+ AUTH_COLUMNS.add(col("trailerCount", "鎸傝溅鏁�(杈�)", 110));
+ AUTH_COLUMNS.add(col("otherCount", "鍏朵粬杞︽暟(杈�)", 110));
+ AUTH_COLUMNS.add(col("trailerTons", "鎸傝溅鍚ㄤ綅(鍚�)", 120));
+ AUTH_COLUMNS.add(col("otherTons", "鍏朵粬鍚ㄤ綅(鍚�)", 120));
TRACK_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
TRACK_COLUMNS.add(col("enterpriseName", "浼佷笟鍚嶇О", 240));
- TRACK_COLUMNS.add(col("monthlyMileage", "鏈堝害閲岀▼", 120));
- TRACK_COLUMNS.add(col("trackedVehicles", "杞ㄨ抗杞﹁締鏁�", 120));
+ TRACK_COLUMNS.add(col("monthlyMileage", "鏈堝害閲岀▼(鍏噷)", 130));
+ TRACK_COLUMNS.add(col("trackedVehicles", "杞ㄨ抗杞﹁締鏁�(杈�)", 130));
SPLIT_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
SPLIT_COLUMNS.add(col("periodType", "鍙ｅ緞", 90));
SPLIT_COLUMNS.add(col("regionName", "甯傚窞", 130));
- SPLIT_COLUMNS.add(col("aboveScaleFreight", "瑙勪笂璐ц繍閲�(鏉ユ簮鏂囦欢鏈彁渚涜鍒�)", 220));
+ SPLIT_COLUMNS.add(col("aboveScaleFreight", "瑙勪笂璐ц繍閲�(涓囧惃)", 140));
SPLIT_COLUMNS.add(col("aboveScaleTurnover", "瑙勪笂鍛ㄨ浆閲�(涓囧惃鍏噷)", 170));
- SPLIT_COLUMNS.add(col("aboveScaleRank", "瑙勪笂鎺掑悕", 100));
- SPLIT_COLUMNS.add(col("aboveScaleYoy", "瑙勪笂鍚屾瘮", 100));
- SPLIT_COLUMNS.add(col("belowScaleFreight", "瑙勪笅璐ц繍閲�(鏉ユ簮鏂囦欢鏈彁渚涜鍒�)", 220));
+ SPLIT_COLUMNS.add(col("aboveScaleRank", "瑙勪笂鎺掑悕(鍚�)", 110));
+ SPLIT_COLUMNS.add(col("aboveScaleYoy", "瑙勪笂鍚屾瘮(%)", 110));
+ SPLIT_COLUMNS.add(col("belowScaleFreight", "瑙勪笅璐ц繍閲�(涓囧惃)", 140));
SPLIT_COLUMNS.add(col("belowScaleTurnover", "瑙勪笅鍛ㄨ浆閲�(涓囧惃鍏噷)", 170));
- SPLIT_COLUMNS.add(col("belowScaleRank", "瑙勪笅鎺掑悕", 100));
- SPLIT_COLUMNS.add(col("belowScaleYoy", "瑙勪笅鍚屾瘮", 100));
- SPLIT_COLUMNS.add(col("totalFreight", "鍚堣璐ц繍閲�(鏉ユ簮鏂囦欢鏈彁渚涜鍒�)", 220));
+ SPLIT_COLUMNS.add(col("belowScaleRank", "瑙勪笅鎺掑悕(鍚�)", 110));
+ SPLIT_COLUMNS.add(col("belowScaleYoy", "瑙勪笅鍚屾瘮(%)", 110));
+ SPLIT_COLUMNS.add(col("totalFreight", "鍚堣璐ц繍閲�(涓囧惃)", 140));
SPLIT_COLUMNS.add(col("totalTurnover", "鍚堣鍛ㄨ浆閲�(涓囧惃鍏噷)", 170));
- SPLIT_COLUMNS.add(col("totalRank", "鍚堣鎺掑悕", 100));
- SPLIT_COLUMNS.add(col("totalYoy", "鍚堣鍚屾瘮", 100));
+ SPLIT_COLUMNS.add(col("totalRank", "鍚堣鎺掑悕(鍚�)", 110));
+ SPLIT_COLUMNS.add(col("totalYoy", "鍚堣鍚屾瘮(%)", 110));
FREIGHT_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
FREIGHT_COLUMNS.add(col("regionName", "甯傚窞", 130));
for (int m = 1; m <= 12; m++) {
- FREIGHT_COLUMNS.add(col(String.format("freightM%02d", m), "璐ц繍閲�" + m + "鏈�", 110));
+ FREIGHT_COLUMNS.add(col(String.format("freightM%02d", m), "璐ц繍閲�" + m + "鏈�(涓囧惃)", 140));
}
for (int m = 1; m <= 12; m++) {
- FREIGHT_COLUMNS.add(col(String.format("lastFreightM%02d", m), "鍘诲勾璐ц繍閲�" + m + "鏈�", 130));
+ FREIGHT_COLUMNS.add(col(String.format("lastFreightM%02d", m), "鍘诲勾璐ц繍閲�" + m + "鏈�(涓囧惃)", 160));
}
for (int m = 1; m <= 12; m++) {
- FREIGHT_COLUMNS.add(col(String.format("turnoverM%02d", m), "鍛ㄨ浆閲�" + m + "鏈�", 120));
+ FREIGHT_COLUMNS.add(col(String.format("turnoverM%02d", m), "鍛ㄨ浆閲�" + m + "鏈�(涓囧惃鍏噷)", 160));
}
for (int m = 1; m <= 12; m++) {
- FREIGHT_COLUMNS.add(col(String.format("lastTurnoverM%02d", m), "鍘诲勾鍛ㄨ浆閲�" + m + "鏈�", 140));
+ FREIGHT_COLUMNS.add(col(String.format("lastTurnoverM%02d", m), "鍘诲勾鍛ㄨ浆閲�" + m + "鏈�(涓囧惃鍏噷)", 180));
}
H2031_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
@@ -620,37 +622,37 @@
H2031_COLUMNS.add(col("enterpriseName", "浼佷笟鍚嶇О", 220));
H2031_COLUMNS.add(col("unifiedCreditCode", "缁熶竴绀句細淇＄敤浠ｇ爜", 180));
H2031_COLUMNS.add(col("reportUnit", "濉姤鍗曚綅", 160));
- H2031_COLUMNS.add(col("vehicleTotal", "瀹㈣繍杞﹁締鍚堣", 110));
- H2031_COLUMNS.add(col("seatTotal", "鏍稿畾杞藉浣嶅悎璁�", 130));
- H2031_COLUMNS.add(col("vehicleSchedule", "鐝嚎杞﹁締鏁�", 110));
- H2031_COLUMNS.add(col("seatSchedule", "鐝嚎杞藉浣�", 110));
- H2031_COLUMNS.add(col("vehicleCharter", "鍖呰溅杞﹁締鏁�", 110));
- H2031_COLUMNS.add(col("seatCharter", "鍖呰溅杞藉浣�", 110));
+ H2031_COLUMNS.add(col("vehicleTotal", "瀹㈣繍杞﹁締鍚堣(杈�)", 130));
+ H2031_COLUMNS.add(col("seatTotal", "鏍稿畾杞藉浣嶅悎璁�(搴�)", 150));
+ H2031_COLUMNS.add(col("vehicleSchedule", "鐝嚎杞﹁締鏁�(杈�)", 130));
+ H2031_COLUMNS.add(col("seatSchedule", "鐝嚎杞藉浣�(搴�)", 130));
+ H2031_COLUMNS.add(col("vehicleCharter", "鍖呰溅杞﹁締鏁�(杈�)", 130));
+ H2031_COLUMNS.add(col("seatCharter", "鍖呰溅杞藉浣�(搴�)", 130));
H2031_COLUMNS.add(col("passengerTotal", "瀹㈣繍閲忓悎璁�(浜�)", 130));
- H2031_COLUMNS.add(col("turnoverTotal", "鍛ㄨ浆閲忓悎璁�", 110));
- H2031_COLUMNS.add(col("passengerClass1", "瀹㈣繍閲忎竴绫�", 110));
- H2031_COLUMNS.add(col("passengerClass2", "瀹㈣繍閲忎簩绫�", 110));
- H2031_COLUMNS.add(col("passengerClass3", "瀹㈣繍閲忎笁绫�", 110));
- H2031_COLUMNS.add(col("passengerClass4", "瀹㈣繍閲忓洓绫�", 110));
- H2031_COLUMNS.add(col("passengerCharter", "瀹㈣繍閲忓寘杞�", 110));
- H2031_COLUMNS.add(col("turnoverClass1", "鍛ㄨ浆閲忎竴绫�", 110));
- H2031_COLUMNS.add(col("turnoverClass2", "鍛ㄨ浆閲忎簩绫�", 110));
- H2031_COLUMNS.add(col("turnoverClass3", "鍛ㄨ浆閲忎笁绫�", 110));
- H2031_COLUMNS.add(col("turnoverClass4", "鍛ㄨ浆閲忓洓绫�", 110));
- H2031_COLUMNS.add(col("turnoverCharter", "鍛ㄨ浆閲忓寘杞�", 110));
- H2031_COLUMNS.add(col("avgDistanceTotal", "骞冲潎杩愯窛鍚堣", 120));
- H2031_COLUMNS.add(col("avgDistanceClass1", "涓�绫诲钩鍧囪繍璺�", 120));
- H2031_COLUMNS.add(col("avgDistanceClass2", "浜岀被骞冲潎杩愯窛", 120));
- H2031_COLUMNS.add(col("avgDistanceClass3", "涓夌被骞冲潎杩愯窛", 120));
- H2031_COLUMNS.add(col("avgDistanceClass4", "鍥涚被骞冲潎杩愯窛", 120));
- H2031_COLUMNS.add(col("avgDistanceCharter", "鍖呰溅骞冲潎杩愯窛", 120));
+ H2031_COLUMNS.add(col("turnoverTotal", "鍛ㄨ浆閲忓悎璁�(浜哄叕閲�)", 140));
+ H2031_COLUMNS.add(col("passengerClass1", "瀹㈣繍閲忎竴绫�(浜�)", 120));
+ H2031_COLUMNS.add(col("passengerClass2", "瀹㈣繍閲忎簩绫�(浜�)", 120));
+ H2031_COLUMNS.add(col("passengerClass3", "瀹㈣繍閲忎笁绫�(浜�)", 120));
+ H2031_COLUMNS.add(col("passengerClass4", "瀹㈣繍閲忓洓绫�(浜�)", 120));
+ H2031_COLUMNS.add(col("passengerCharter", "瀹㈣繍閲忓寘杞�(浜�)", 130));
+ H2031_COLUMNS.add(col("turnoverClass1", "鍛ㄨ浆閲忎竴绫�(浜哄叕閲�)", 140));
+ H2031_COLUMNS.add(col("turnoverClass2", "鍛ㄨ浆閲忎簩绫�(浜哄叕閲�)", 140));
+ H2031_COLUMNS.add(col("turnoverClass3", "鍛ㄨ浆閲忎笁绫�(浜哄叕閲�)", 140));
+ H2031_COLUMNS.add(col("turnoverClass4", "鍛ㄨ浆閲忓洓绫�(浜哄叕閲�)", 140));
+ H2031_COLUMNS.add(col("turnoverCharter", "鍛ㄨ浆閲忓寘杞�(浜哄叕閲�)", 150));
+ H2031_COLUMNS.add(col("avgDistanceTotal", "骞冲潎杩愯窛鍚堣(鍏噷)", 140));
+ H2031_COLUMNS.add(col("avgDistanceClass1", "涓�绫诲钩鍧囪繍璺�(鍏噷)", 140));
+ H2031_COLUMNS.add(col("avgDistanceClass2", "浜岀被骞冲潎杩愯窛(鍏噷)", 140));
+ H2031_COLUMNS.add(col("avgDistanceClass3", "涓夌被骞冲潎杩愯窛(鍏噷)", 140));
+ H2031_COLUMNS.add(col("avgDistanceClass4", "鍥涚被骞冲潎杩愯窛(鍏噷)", 140));
+ H2031_COLUMNS.add(col("avgDistanceCharter", "鍖呰溅骞冲潎杩愯窛(鍏噷)", 140));
BUS_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
BUS_COLUMNS.add(col("regionCode", "鎵�灞炲湴鍖�", 100));
BUS_COLUMNS.add(col("city", "甯傚窞", 110));
BUS_COLUMNS.add(col("enterpriseName", "浼佷笟鍚嶇О", 220));
- BUS_COLUMNS.add(col("opVehicles", "杩愯惀杞︽暟", 100));
- BUS_COLUMNS.add(col("stopTotal", "绔欑偣鎬讳釜鏁�", 110));
- BUS_COLUMNS.add(col("stopCity", "鍩庡競鍐呯珯鐐�", 110));
+ BUS_COLUMNS.add(col("opVehicles", "杩愯惀杞︽暟(杈�)", 120));
+ BUS_COLUMNS.add(col("stopTotal", "绔欑偣鎬讳釜鏁�(涓�)", 130));
+ BUS_COLUMNS.add(col("stopCity", "鍩庡競鍐呯珯鐐�(涓�)", 130));
BUS_COLUMNS.add(col("passengerVolume", "瀹㈣繍閲�(涓囦汉娆�)", 120));
BUS_COLUMNS.add(col("passengerCity", "鍩庡競鍐呭杩愰噺(涓囦汉娆�)", 150));
BUS_COLUMNS.add(col("turnover", "鏃呭鍛ㄨ浆閲�(涓囦汉鍏噷)", 170));
@@ -672,16 +674,16 @@
TAXI_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
TAXI_COLUMNS.add(col("regionCode", "鎵�灞炲湴鍖�", 100));
TAXI_COLUMNS.add(col("city", "甯傚窞", 110));
- TAXI_COLUMNS.add(col("tripTotal", "杞藉杞︽鎬绘暟", 120));
- TAXI_COLUMNS.add(col("tripCity", "杞藉杞︽_鍩庡競鍐�", 130));
+ TAXI_COLUMNS.add(col("tripTotal", "杞藉杞︽鎬绘暟(杞︽)", 150));
+ TAXI_COLUMNS.add(col("tripCity", "杞藉杞︽_鍩庡競鍐�(杞︽)", 160));
TAXI_COLUMNS.add(col("passengerVolume", "瀹㈣繍閲�(涓囦汉娆�)", 120));
TAXI_COLUMNS.add(col("passengerCity", "鍩庡競鍐呭杩愰噺(涓囦汉娆�)", 150));
TAXI_COLUMNS.add(col("turnover", "鏃呭鍛ㄨ浆閲�(涓囦汉鍏噷)", 170));
TAXI_COLUMNS.add(col("turnoverCity", "鍩庡競鍐呭懆杞噺(涓囦汉鍏噷)", 180));
- TAXI_COLUMNS.add(col("opVehicles", "杩愯惀杞﹁締鏁�", 110));
+ TAXI_COLUMNS.add(col("opVehicles", "杩愯惀杞﹁締鏁�(杈�)", 130));
TAXI_COLUMNS.add(col("avgDistance", "骞冲潎杩愯窛(鍏噷)", 120));
TAXI_COLUMNS.add(col("avgDistanceCity", "鍩庡競鍐呭钩鍧囪繍璺�(鍏噷)", 150));
- TAXI_COLUMNS.add(col("passengersPerTrip", "鍗曡溅娆¤浇瀹汉鏁�", 130));
+ TAXI_COLUMNS.add(col("passengersPerTrip", "鍗曡溅娆¤浇瀹汉鏁�(浜�/杞︽)", 170));
TAXI_COLUMNS.add(col("rateTripMom", "杞藉杞︽鐜瘮", 110));
TAXI_COLUMNS.add(col("rateTripYoy", "杞藉杞︽鍚屾瘮", 110));
TAXI_COLUMNS.add(col("ratePassengerMom", "瀹㈣繍閲忕幆姣�", 100));
@@ -704,8 +706,8 @@
PAUTH_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
PAUTH_COLUMNS.add(col("enterpriseCode", "浼佷笟浠ｇ爜", 130));
PAUTH_COLUMNS.add(col("enterpriseName", "浼佷笟鍚嶇О", 240));
- PAUTH_COLUMNS.add(col("vehicleCount", "杞﹁締鏁�", 100));
- PAUTH_COLUMNS.add(col("seatCount", "杞藉浣嶆暟", 100));
+ PAUTH_COLUMNS.add(col("vehicleCount", "杞﹁締鏁�(杈�)", 110));
+ PAUTH_COLUMNS.add(col("seatCount", "杞藉浣嶆暟(搴�)", 120));
INVEST_MONTHLY_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
INVEST_MONTHLY_COLUMNS.add(col("projectId", "椤圭洰ID", 80));
INVEST_MONTHLY_COLUMNS.add(col("projectName", "椤圭洰鍚嶇О", 280));
@@ -716,7 +718,7 @@
INVEST_MONTHLY_COLUMNS.add(col("startCum", "鑷紑濮嬪缓璁剧疮璁″畬鎴�(涓囧厓)", 180));
INVEST_MONTHLY_COLUMNS.add(col("progressStage", "寤鸿闃舵", 120));
INVEST_MONTHLY_COLUMNS.add(col("progressDesc", "褰㈣薄杩涘害", 320));
- INVEST_MONTHLY_COLUMNS.add(col("buildingArea", "寤虹瓚闈㈢Н", 110));
+ INVEST_MONTHLY_COLUMNS.add(col("buildingArea", "寤虹瓚闈㈢Н(骞虫柟绫�)", 140));
INVEST_PROJECT_COLUMNS.add(col("projectName", "椤圭洰鍚嶇О", 260));
INVEST_PROJECT_COLUMNS.add(col("category", "绫诲埆", 100));
INVEST_PROJECT_COLUMNS.add(col("city", "甯傚窞", 90));
@@ -726,7 +728,7 @@
INVEST_PROJECT_COLUMNS.add(col("startTime", "寮�宸ュ勾", 90));
INVEST_PROJECT_COLUMNS.add(col("endTime", "瀹屽伐骞�", 90));
INVEST_PROJECT_COLUMNS.add(col("totalInvestment", "鎬绘姇璧�(涓囧厓)", 130));
- INVEST_PROJECT_COLUMNS.add(col("buildingArea", "寤虹瓚闈㈢Н", 110));
+ INVEST_PROJECT_COLUMNS.add(col("buildingArea", "寤虹瓚闈㈢Н(骞虫柟绫�)", 140));
INVEST_PROJECT_COLUMNS.add(col("approvalGk", "宸ュ彲鎴栨牳鍑嗘壒澶嶆枃鍙�", 200));
INVEST_PROJECT_COLUMNS.add(col("approvalCs", "鍒濊鎴栨柦宸ュ浘鎵瑰鏂囧彿", 200));
INVEST_PROJECT_COLUMNS.add(col("source", "鏉ユ簮", 100));
@@ -745,34 +747,34 @@
ENERGY_VEHICLE_COLUMNS.add(col("vehicleType", "杞﹁締绫诲瀷", 130));
ENERGY_VEHICLE_COLUMNS.add(col("fuelType", "鐕冩枡绫诲瀷", 110));
ENERGY_VEHICLE_COLUMNS.add(col("manufactureYear", "鍑哄巶骞翠唤", 100));
- ENERGY_VEHICLE_COLUMNS.add(col("markedTonnage", "鏍囪鍚ㄤ綅", 100));
+ ENERGY_VEHICLE_COLUMNS.add(col("markedTonnage", "鏍囪鍚ㄤ綅(鍚�)", 120));
ENERGY_VEHICLE_COLUMNS.add(col("totalMileage", "鎬昏椹堕噷绋�(鍏噷)", 150));
ENERGY_VEHICLE_COLUMNS.add(col("loadedMileage", "閲嶈浇閲岀▼(鍏噷)", 140));
ENERGY_VEHICLE_COLUMNS.add(col("emptyMileage", "绌鸿浇閲岀▼(鍏噷)", 140));
ENERGY_VEHICLE_COLUMNS.add(col("freight", "璐ц繍閲�(鍚�)", 120));
ENERGY_VEHICLE_COLUMNS.add(col("turnover", "鍛ㄨ浆閲�(鍚ㄥ叕閲�)", 140));
- ENERGY_VEHICLE_COLUMNS.add(col("tripCount", "杞︽", 90));
+ ENERGY_VEHICLE_COLUMNS.add(col("tripCount", "杞︽(娆�)", 100));
ENERGY_VEHICLE_COLUMNS.add(col("fuelUnit", "鐕冩枡鍗曚綅", 100));
- ENERGY_VEHICLE_COLUMNS.add(col("fuelConsumption", "鐕冩枡娑堣�楅噺", 120));
- ENERGY_VEHICLE_COLUMNS.add(col("avgDistance", "骞冲潎杩愯窛", 110));
- ENERGY_VEHICLE_COLUMNS.add(col("avgLoadedTonnage", "骞冲潎杞介噸鍚ㄤ綅", 130));
- ENERGY_VEHICLE_COLUMNS.add(col("avgTripMileage", "骞冲潎杞︽閲岀▼", 130));
- ENERGY_VEHICLE_COLUMNS.add(col("fuelPer100km", "鐧惧叕閲屾补鑰�", 120));
- ENERGY_VEHICLE_COLUMNS.add(col("turnoverFuel", "鍛ㄨ浆閲忔补鑰�", 120));
+ ENERGY_VEHICLE_COLUMNS.add(col("fuelConsumption", "鐕冩枡娑堣�楅噺(鎸夌噧鏂欏崟浣�)", 170));
+ ENERGY_VEHICLE_COLUMNS.add(col("avgDistance", "骞冲潎杩愯窛(鍏噷)", 130));
+ ENERGY_VEHICLE_COLUMNS.add(col("avgLoadedTonnage", "骞冲潎杞介噸鍚ㄤ綅(鍚�)", 150));
+ ENERGY_VEHICLE_COLUMNS.add(col("avgTripMileage", "骞冲潎杞︽閲岀▼(鍏噷)", 150));
+ ENERGY_VEHICLE_COLUMNS.add(col("fuelPer100km", "鐧惧叕閲屾补鑰�(鎸夌噧鏂欏崟浣�)", 170));
+ ENERGY_VEHICLE_COLUMNS.add(col("turnoverFuel", "鍛ㄨ浆閲忔补鑰�(鎸夌噧鏂欏崟浣�)", 170));
ENERGY_AUTH_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
ENERGY_AUTH_COLUMNS.add(col("plateNo", "杞︾墝鍙�", 110));
ENERGY_AUTH_COLUMNS.add(col("vehicleType", "杞﹁締绫诲瀷", 130));
ENERGY_AUTH_COLUMNS.add(col("fuelType", "鐕冩枡绫诲瀷", 110));
- ENERGY_AUTH_COLUMNS.add(col("markedTonnage", "鏍囪鍚ㄤ綅", 100));
- ENERGY_AUTH_COLUMNS.add(col("tractionQuality", "鐗靛紩璐ㄩ噺", 110));
+ ENERGY_AUTH_COLUMNS.add(col("markedTonnage", "鏍囪鍚ㄤ綅(鍚�)", 120));
+ ENERGY_AUTH_COLUMNS.add(col("tractionQuality", "鐗靛紩璐ㄩ噺(鍚�)", 130));
PAX_INDIVIDUAL_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
PAX_INDIVIDUAL_COLUMNS.add(col("regionCode", "鎵�灞炲湴鍖�", 110));
PAX_INDIVIDUAL_COLUMNS.add(col("city", "甯傚窞", 110));
PAX_INDIVIDUAL_COLUMNS.add(col("enterpriseCode", "浼佷笟浠ｇ爜", 130));
PAX_INDIVIDUAL_COLUMNS.add(col("enterpriseName", "浼佷笟鍚嶇О", 220));
- PAX_INDIVIDUAL_COLUMNS.add(col("passengerCount", "涓綋瀹㈣繍閲�", 130));
- PAX_INDIVIDUAL_COLUMNS.add(col("turnover", "涓綋鏃呭鍛ㄨ浆閲�", 150));
+ PAX_INDIVIDUAL_COLUMNS.add(col("passengerCount", "涓綋瀹㈣繍閲�(浜�)", 140));
+ PAX_INDIVIDUAL_COLUMNS.add(col("turnover", "涓綋鏃呭鍛ㄨ浆閲�(浜哄叕閲�)", 180));
WYC_TOTAL_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
WYC_TOTAL_COLUMNS.add(col("pinK", "鍏ㄧ渷缃戠害杞﹀杩愰噺(涓囦汉娆�)", 210));
diff --git a/traffic-audit-web/src/views/DataView.vue b/traffic-audit-web/src/views/DataView.vue
index 33df725..cdf1f2f 100644
--- a/traffic-audit-web/src/views/DataView.vue
+++ b/traffic-audit-web/src/views/DataView.vue
@@ -27,6 +27,14 @@
<el-option v-for="t in g.types" :key="t.value" :label="t.label" :value="t.value"></el-option>
</el-option-group>
</el-select>
+ <template v-if="hasPeriodType">
+ <span class="toolbar-label">鍙ｅ緞</span>
+ <el-select v-model="periodType" size="small" style="width:110px" @change="doQuery">
+ <el-option label="鍏ㄩ儴" value=""></el-option>
+ <el-option label="褰撴湀" value="MONTH"></el-option>
+ <el-option label="绱" value="CUMULATIVE"></el-option>
+ </el-select>
+ </template>
<el-input v-model="keyword" placeholder="浼佷笟/甯傚窞鍚嶇О" clearable style="width:180px" @keyup.enter.native="doQuery"></el-input>
<el-button type="primary" size="small" @click="doQuery">鏌ヨ</el-button>
<el-button size="small" icon="el-icon-full-screen" @click="toggleFullscreen">鍏ㄥ睆鏌ョ湅</el-button>
@@ -99,6 +107,7 @@
activeModule: 'freight',
type: 'h2032',
period: '',
+ periodType: '',
keyword: '',
page: 1,
size: 50,
@@ -110,6 +119,10 @@
}
},
computed: {
+ // 瑙勪笂瑙勪笅鎷嗗垎绛夎〃鏈�"鍙ｅ緞"鍒楋紙褰撴湀/绱锛夛紝鎶婂畠鍋氭垚涓婃柟绛涢�夎�屼笉鏄〃鏍煎垪
+ hasPeriodType() {
+ return (this.columns || []).some(c => c.prop === 'periodType')
+ },
currentTypeLabel() {
for (const g of this.modules) {
const t = g.types.find(x => x.value === this.type)
@@ -140,8 +153,10 @@
// 鏁版嵁鏌ョ湅缁熶竴鍒楄繃婊わ細鍐呴儴鏍囪瘑鍒椾笉灞曠ず锛涙姤琛ㄦ湡锛堢敱绛涢�夋潯浠朵綋鐜帮級涓庢墍灞炲湴鍖猴紙鍖哄垝浠ｇ爜锛屽凡琚競宸炲垪鏇夸唬锛変笉灞曠ず
keepColumn(c) {
if (!c) return false
- const hiddenProps = ['enterpriseCode', 'unifiedCreditCode', 'reportUnit', 'projectId', 'regionCode', 'reportPeriod']
- const hiddenLabels = ['浼佷笟浠ｇ爜', '缁熶竴绀句細淇＄敤浠ｇ爜', '濉姤鍗曚綅', '椤圭洰ID', '鎵�灞炲湴鍖�', '鎶ヨ〃鏈�']
+ // 鍙ｅ緞鍒椾笂绉讳负绛涢�夛紱鎷嗗垎琛ㄨ揣杩愰噺涓夊垪婧愭枃浠舵湭鎻愪緵锛堝叏绌猴級鏁呬笉灞曠ず
+ const hiddenProps = ['enterpriseCode', 'unifiedCreditCode', 'reportUnit', 'projectId', 'regionCode', 'reportPeriod',
+ 'periodType', 'aboveScaleFreight', 'belowScaleFreight', 'totalFreight']
+ const hiddenLabels = ['浼佷笟浠ｇ爜', '缁熶竴绀句細淇＄敤浠ｇ爜', '濉姤鍗曚綅', '椤圭洰ID', '鎵�灞炲湴鍖�', '鎶ヨ〃鏈�', '鍙ｅ緞']
if (hiddenProps.indexOf(c.prop) >= 0 || hiddenLabels.indexOf(c.label) >= 0) return false
return true
},
@@ -156,6 +171,7 @@
onTypeSelect() {
const g = this.modules.find(x => x.types.some(t => t.value === this.type))
if (g) this.activeModule = g.key
+ this.periodType = ''
this.doQuery()
},
doQuery() {
@@ -171,13 +187,14 @@
type: this.type,
period: this.period || undefined,
keyword: this.keyword || undefined,
+ periodType: this.periodType || undefined,
page: this.page,
size: this.size
}
}).then(res => {
const d = res.data || {}
this.records = d.records || []
- this.columns = (d.columns || []).filter(c => ['enterpriseCode', 'unifiedCreditCode', 'reportUnit'].indexOf(c.prop) < 0 && ['浼佷笟浠ｇ爜', '缁熶竴绀句細淇＄敤浠ｇ爜', '濉姤鍗曚綅'].indexOf(c.label) < 0)
+ this.columns = d.columns || []
this.total = d.total || 0
if (this.page > 1 && this.records.length === 0) {
this.page = 1
@@ -213,6 +230,7 @@
type: this.type,
period: this.period || undefined,
keyword: this.keyword || undefined,
+ periodType: this.periodType || undefined,
page: nextPage,
size: this.size
}
@@ -226,7 +244,7 @@
this.records = this.records.concat(addRows)
this.page = nextPage
if (d.total != null) this.total = d.total
- if (d.columns && d.columns.length) this.columns = d.columns.filter(c => ['enterpriseCode', 'unifiedCreditCode', 'reportUnit'].indexOf(c.prop) < 0 && ['浼佷笟浠ｇ爜', '缁熶竴绀句細淇＄敤浠ｇ爜', '濉姤鍗曚綅'].indexOf(c.label) < 0)
+ if (d.columns && d.columns.length) this.columns = d.columns
}).catch(e => {
if (e && e._toast) return
this.$message.error('鍔犺浇鏇村澶辫触')
--
Gitblit v1.9.1