fix: BUG修改
This commit is contained in:
kun
parent
81cb377413
commit
80ce6ee3e6
@ -83,9 +83,9 @@
|
||||
{{ $t("message.carManage.temporaryCarRecord") }}
|
||||
</div>
|
||||
<div class="blockContent">
|
||||
<vue-scroll>
|
||||
<vue-scroll style="height: 100%">
|
||||
<!-- height="300" -->
|
||||
<el-table :data="carCompareList" class="tables">
|
||||
<el-table :data="carCompareList">
|
||||
<el-table-column prop="enterpriseName" label="企业名称">
|
||||
<template slot-scope="scope">
|
||||
{{
|
||||
@ -104,14 +104,14 @@
|
||||
</el-table-column>
|
||||
<!-- 车辆类型 -->
|
||||
<el-table-column
|
||||
prop="carType"
|
||||
prop="carModuleType"
|
||||
:label="$t('message.carManage.carType')"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
{{
|
||||
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",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@ -113,14 +113,14 @@
|
||||
<el-table-column prop="carColor" label="车辆颜色"> </el-table-column>
|
||||
<!-- 车辆类型 -->
|
||||
<el-table-column
|
||||
prop="carType"
|
||||
prop="carModuleType"
|
||||
:label="$t('message.carManage.carType')"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
{{
|
||||
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;
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -95,15 +95,15 @@
|
||||
> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="header">
|
||||
<!-- 未开始 进行中 已完成 已逾期 4-29 wpf 新增注释 -->
|
||||
<!-- <div class="left-content">
|
||||
<!-- <div class="header">
|
||||
未开始 进行中 已完成 已逾期 4-29 wpf 新增注释
|
||||
<div class="left-content">
|
||||
<div class="item" v-for="(item, index) in headerList" :key="index">
|
||||
<div class="color-block" :style="{ background: item.color }"></div>
|
||||
<div class="label">{{ item.label }}</div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div> -->
|
||||
<!-- 甘特图 -->
|
||||
<div class="gantt-chart" v-if="projects.length > 0">
|
||||
<div class="table" @scroll="handleScroll">
|
||||
@ -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 {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user