From 80ce6ee3e6532b8c766bdb587338f97e3eb83b70 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 27 May 2024 21:49:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../projectFront/carManage/carStatictis.vue | 41 +++++++++++--------
.../projectFront/carManage/realTimeData.vue | 10 ++---
.../progressManagementAg/ganttChart.vue | 5 ++-
.../projectganttChart.vue | 15 ++++---
4 files changed, 42 insertions(+), 29 deletions(-)
diff --git a/src/views/projectFront/carManage/carStatictis.vue b/src/views/projectFront/carManage/carStatictis.vue
index 3f978c5d..f928521e 100644
--- a/src/views/projectFront/carManage/carStatictis.vue
+++ b/src/views/projectFront/carManage/carStatictis.vue
@@ -83,9 +83,9 @@
{{ $t("message.carManage.temporaryCarRecord") }}
-
+
-
+
{{
@@ -104,14 +104,14 @@
{{
- scope.row.carType
- ? carDataTypeList[scope.row.carType - 1].name
- ? carDataTypeList[scope.row.carType - 1].name
+ scope.row.carModuleType
+ ? carDataTypeList[scope.row.carModuleType - 1].name
+ ? carDataTypeList[scope.row.carModuleType - 1].name
: "外来车"
: "外来车"
}}
@@ -265,13 +265,13 @@ export default {
wlcInNum: 0,
cqcInNum: 0,
gdcInNum: 0,
- lscInNum: 0
+ lscInNum: 0,
},
totalCarNum: {
gdcNum: 0,
cqcNum: 0,
- lscNum: 0
- }
+ lscNum: 0,
+ },
};
},
mounted() {
@@ -280,14 +280,15 @@ export default {
this.selectCarStatisticsRecordFn();
this.selectCarPassRecordInOutCount();
this.getCarPassRecordList();
- this.carNumCharts(this.$refs.carNumChart);
},
methods: {
selectCarStatisticsNumFn() {
+ let that = this;
selectCarStatisticsNumApi({
projectSn: this.$store.state.projectSn,
}).then((res) => {
- this.totalCarNum = res.result;
+ that.totalCarNum = { ...res.result };
+ that.carNumCharts(that.$refs.carNumChart);
});
},
selectCarStatisticsRecordFn() {
@@ -319,7 +320,7 @@ export default {
getCarPassRecordList() {
getCarPassRecordListApi({
projectSn: this.$store.state.projectSn,
- type: 1,
+ carModuleType: 2,
}).then((res) => {
this.carCompareList = res.result;
setTimeout(() => {
@@ -358,6 +359,7 @@ export default {
getCarCompareList() {},
//车辆数量统计---图表
carNumCharts(el) {
+ console.log(this.totalCarNum, 888999);
let that = this;
let numChart = echarts.init(el);
// ageChart.clear();
@@ -375,19 +377,26 @@ export default {
name: "车辆数量",
type: "pie",
radius: ["50%", "65%"],
- center: ['50%', '40%'],
+ center: ["52%", "40%"],
+ minAngle: 75, //最小角度
+ startAngle: 360, //起始角度
+ labelLine: {
+ normal: {
+ length: 5,
+ },
+ },
label: {
- formatter: "{b|{b}}\n{c}",
+ formatter: "{b|{b}}\n{c|{c}}",
rich: {
b: {
+ // width: 200,
color: "#415058",
lineHeight: 20,
- align: "left",
},
c: {
color: "#415058",
lineHeight: 20,
- align: "left",
+ // align: "right",
},
},
},
diff --git a/src/views/projectFront/carManage/realTimeData.vue b/src/views/projectFront/carManage/realTimeData.vue
index 243dd16d..7b466fba 100644
--- a/src/views/projectFront/carManage/realTimeData.vue
+++ b/src/views/projectFront/carManage/realTimeData.vue
@@ -113,14 +113,14 @@
{{
- scope.row.carType
- ? carTypeList[scope.row.carType - 1].name
- ? carTypeList[scope.row.carType - 1].name
+ scope.row.carModuleType
+ ? carTypeList[scope.row.carModuleType - 1].name
+ ? carTypeList[scope.row.carModuleType - 1].name
: "外来车"
: "外来车"
}}
@@ -358,7 +358,7 @@ export default {
this.formInline.startTime = "";
}
let data = this.formInline;
- data.carType = this.isBlack
+ data.carModuleType = this.isBlack
data.projectSn = this.projectSn;
data.pageNo = this.pageNo;
data.pageSize = this.pageSize;
diff --git a/src/views/projectFront/progressManagementAg/ganttChart.vue b/src/views/projectFront/progressManagementAg/ganttChart.vue
index eb5388f3..2c16fbfa 100644
--- a/src/views/projectFront/progressManagementAg/ganttChart.vue
+++ b/src/views/projectFront/progressManagementAg/ganttChart.vue
@@ -1544,7 +1544,8 @@ export default {
}
.gantt-box {
box-sizing: border-box;
- flex: 1;
+ // flex: 1;
+ width: calc(100% - 350px);
height: 100%;
padding: 18px;
background: #ffffff;
@@ -1594,7 +1595,7 @@ export default {
}
.gantt-chart {
- height: calc(100% - 60px);
+ height: calc(100% - 94px);
overflow: hidden;
.table {
diff --git a/src/views/projectFront/progressManagementAg/projectganttChart.vue b/src/views/projectFront/progressManagementAg/projectganttChart.vue
index 0398f7fa..2246feae 100644
--- a/src/views/projectFront/progressManagementAg/projectganttChart.vue
+++ b/src/views/projectFront/progressManagementAg/projectganttChart.vue
@@ -95,15 +95,15 @@
> -->
-
+
+ -->
@@ -1745,7 +1745,8 @@ export default {
}
.gantt-box {
box-sizing: border-box;
- flex: 1;
+ // flex: 1;
+ width: 100%;
height: 100%;
padding: 18px;
background: #ffffff;
@@ -1795,7 +1796,9 @@ export default {
}
.gantt-chart {
+ width: 100%;
height: calc(100% - 60px);
+ margin-top: 20px;
overflow: hidden;
.table {