admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-27 16:46:00 +08:00
parent 2d95eae39a
commit 81cb377413
9 changed files with 430 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/js/api/carManage.js
View File

@ -35,6 +35,8 @@ export const getCarPassRecordStatistics = data => post('xmgl/carPassRecord/getCa
// export const openGate = data => post('xmgl/carPassGate/openGate', data);//车辆进出闸门开闸操作
export const openGate = data => post('xmgl/carCamera/openGate', data);//车辆进出闸门开闸操作
export const selectCarStatisticsNumApi = data => post('xmgl/carInfo/countCarModuleType', data);//根据车辆统计数量
export const selectCarStatisticsRecordApi = data => get('xmgl/carPassRecord/getTodayOutInNumber', data);//根据车辆统计数据
export const selectCarStatisticsByCameraIdApi = data => post('xmgl/carCamera/selectCarStatisticsByCameraId', data);//根据车辆相机统计数据
export const selectCarPassRecordInOutCountApi = data => post('xmgl/carPassRecord/selectCarPassRecordInOutCount', data);//24小时进出时间段统计
export const getCarPassRecordListApi = data => post('xmgl/carPassRecord/getCarPassRecordList', data);//查询当日车辆通行记录列表

14
src/views/projectFront/carManage/carManage.vue
View File

@ -114,7 +114,7 @@
<!-- width="100" -->
<el-table-column
prop="carTypeName"
:label="$t('message.carManage.carType')"
label="车种类型"
align="center"
>
</el-table-column>
@ -194,7 +194,7 @@
width="150"
prop="carModuleType"
align="center"
label="固定/长期/临时车辆"
label="车辆类型"
>
<template slot-scope="scope">
<span v-if="scope.row.carModuleType === 1">固定车辆</span>
@ -494,7 +494,7 @@
</el-form-item>
<!-- 固定/长期车辆 -->
<el-form-item
:label="$t('message.carManage.carModuleType')"
label="车辆类型"
prop="carModuleType"
>
<!-- <el-radio-group v-model="addEditForm.carModuleType" @change="changeForm()"> -->
@ -690,7 +690,7 @@
</el-form-item>
<!-- 车辆类型 -->
<el-form-item :label="$t('message.carManage.carType')" prop="carType">
<el-form-item label="车种类型" prop="carType">
<el-select
v-model="addEditForm.carType"
:placeholder="$t('message.carManage.placeholder_select')"
@ -863,7 +863,7 @@
></el-table-column>
<el-table-column prop="isSuccess" label="执行结果" align="center">
<template v-slot="{ row }">{{
row.isSuccess === 1 ? "成功" : "失败"
row.isSuccess === 1 ? "成功" : row.isSuccess === 0?"失败":""
}}</template>
</el-table-column>
@ -977,7 +977,7 @@
</el-col>
<el-col :span="12">
<div class="grid-content">
<span class="label">车辆类型：</span>
<span class="label">车种类型：</span>
<span class="value">{{ entityDetail.carTypeName }}</span>
</div>
</el-col>
@ -1013,7 +1013,7 @@
</el-col>
<el-col :span="12">
<div class="grid-content">
<span class="label">固定/长期/临时车辆：</span>
<span class="label">车辆类型：</span>
<span class="value" v-if="entityDetail.carModuleType === 1"
>固定车辆</span
>

336
src/views/projectFront/carManage/carStatictis.vue
View File

@ -3,48 +3,74 @@
<div class="top">
<div class="topLeft whiteBlock">
<div class="blockInner">
<!-- 数据统计 -->
<div class="pageTitle">{{$t('message.carManage.dataStatistics')}}</div>
<!-- <div> -->
<div class="numBox">
<img src="@/assets/images/companyProject/1.png" />
<div class="dataBox">
<p class="num primaryText">{{ totalNum.innum }}</p>
<!-- 今日进场车次 -->
<p class="text">{{$t('message.carManage.todayInCarNum')}}</p>
<div class="statistics-content">
<div class="statistics-content-left">
<!-- 数据统计 -->
<div class="pageTitle">今日车辆出入记录统计</div>
<div class="left-data">
<div class="numBox">
<img src="@/assets/images/companyProject/1.png" />
<div class="dataBox">
<p class="num primaryText">{{ totalNum.innum }}</p>
<!-- 今日进场车次 -->
<p class="text">今日总进场车次</p>
</div>
</div>
<div class="numBox">
<img src="@/assets/images/companyProject/1.png" />
<div class="dataBox">
<p class="num primaryText">{{ totalNum.wlcInNum }}</p>
<!-- 今日出场车次 -->
<p class="text">外来车辆进场车次</p>
</div>
</div>
<div class="numBox">
<img src="@/assets/images/companyProject/1.png" />
<div class="dataBox">
<p class="num primaryText">{{ totalNum.gdcInNum }}</p>
<!-- 白名单车辆数 -->
<p class="text">固定车进场车次</p>
</div>
</div>
<div class="numBox">
<img src="@/assets/images/companyProject/1.png" />
<div class="dataBox">
<p class="num primaryText">{{ totalNum.outnum }}</p>
<!-- 长期车辆数 -->
<p class="text">今日总出场车次</p>
</div>
</div>
<div class="numBox">
<img src="@/assets/images/companyProject/1.png" />
<div class="dataBox">
<p class="num primaryText">{{ totalNum.cqcInNum }}</p>
<!-- 长期车辆数 -->
<p class="text">长期车进场车次</p>
</div>
</div>
<div class="numBox">
<img src="@/assets/images/companyProject/1.png" />
<div class="dataBox">
<p class="num primaryText">{{ totalNum.lscInNum }}</p>
<!-- 长期车辆数 -->
<p class="text">临时车进场车次</p>
</div>
</div>
</div>
</div>
<div class="statistics-content-right">
<div class="pageTitle">车辆数量统计</div>
<div class="chart" ref="carNumChart"></div>
</div>
</div>
<div class="numBox">
<img src="@/assets/images/companyProject/1.png" />
<div class="dataBox">
<p class="num primaryText">{{ totalNum.outnum }}</p>
<!-- 今日出场车次 -->
<p class="text">{{$t('message.carManage.todayOutCarNum')}}</p>
</div>
</div>
<div class="numBox">
<img src="@/assets/images/companyProject/1.png" />
<div class="dataBox">
<p class="num primaryText">{{ totalNum.whitenum }}</p>
<!-- 白名单车辆数 -->
<p class="text">{{$t('message.carManage.whiteCarNum')}}</p>
</div>
</div>
<div class="numBox">
<img src="@/assets/images/companyProject/1.png" />
<div class="dataBox">
<p class="num primaryText">{{ totalNum.temporarynum }}</p>
<!-- 长期车辆数 -->
<p class="text">{{$t('message.carManage.temporaryCarNum')}}</p>
</div>
</div>
<!-- </div> -->
</div>
</div>
<div class="topRight whiteBlock">
<div class="blockInner">
<!-- 车种进出次数统计 -->
<div class="pageTitle">{{$t('message.carManage.carTypeInOutNumStatistics')}}</div>
<div class="pageTitle">
{{ $t("message.carManage.carTypeInOutNumStatistics") }}
</div>
<div class="chart" ref="carTypeChart"></div>
</div>
</div>
@ -53,42 +79,92 @@
<div class="topLeft whiteBlock">
<div class="blockInner">
<!-- 长期车进出记录 -->
<div class="pageTitle">{{$t('message.carManage.temporaryCarRecord')}}</div>
<div class="pageTitle">
{{ $t("message.carManage.temporaryCarRecord") }}
</div>
<div class="blockContent">
<vue-scroll>
<!-- height="300" -->
<el-table :data="carCompareList" class="tables">
<el-table-column prop="enterpriseName" label="企业名称">
<template slot-scope="scope">
{{
scope.row.enterpriseName ? scope.row.enterpriseName : "无"
}}
</template>
</el-table-column>
<el-table-column prop="driverWorkerName" label="司机姓名">
<template slot-scope="scope">
{{
scope.row.driverWorkerName
? scope.row.driverWorkerName
: "无"
}}
</template>
</el-table-column>
<!-- 车辆类型 -->
<el-table-column
prop="carType"
:label="$t('message.carManage.carType')"
>
<template slot-scope="scope">
{{
scope.row.carType
? carDataTypeList[scope.row.carType - 1].name
? carDataTypeList[scope.row.carType - 1].name
: "外来车"
: "外来车"
}}
</template>
</el-table-column>
<!-- '车牌号' -->
<el-table-column prop="carNumber" :label="$t('message.carManage.carNumber')">
<el-table-column
prop="carNumber"
:label="$t('message.carManage.carNumber')"
>
</el-table-column>
<!-- 进出时间 -->
<el-table-column prop="passTime" :label="$t('message.carManage.inOutTime')">
<el-table-column
prop="passTime"
:label="$t('message.carManage.inOutTime')"
>
</el-table-column>
<!-- 进出标识 -->
<el-table-column prop="type" :label="$t('message.carManage.inOutCode')">
<el-table-column
prop="type"
:label="$t('message.carManage.inOutCode')"
>
<template slot-scope="scope">
<!-- "出" : "进" -->
{{ scope.row.type == 1 ? $t('message.carManage.out'):$t('message.carManage.in') }}
{{
scope.row.type == 1
? $t("message.carManage.out")
: $t("message.carManage.in")
}}
</template>
</el-table-column>
<!-- '进出位置' -->
<el-table-column prop="location" :label="$t('message.carManage.inOutAddress')">
<el-table-column
prop="location"
:label="$t('message.carManage.inOutAddress')"
>
</el-table-column>
<!-- <el-table-column prop="carColor" :label="'车牌颜色'"> </el-table-column> -->
<!-- 进出场图片 -->
<el-table-column prop="imageUrl" :label="$t('message.carManage.inOutImg')">
<el-table-column
prop="imageUrl"
:label="$t('message.carManage.inOutImg')"
>
<template slot-scope="scope">
<img
:preview="
scope.row.imageUrl
? $store.state.FILEURL +
scope.row.imageUrl
? $store.state.FILEURL + scope.row.imageUrl
: ''
"
:src="
scope.row.imageUrl
? $store.state.FILEURL +
scope.row.imageUrl
? $store.state.FILEURL + scope.row.imageUrl
: ''
"
alt=""
@ -97,19 +173,20 @@
</template>
</el-table-column>
<!-- 全景图照片 -->
<el-table-column prop="panoramaUrl" :label="$t('message.carManage.panoramaImg')">
<el-table-column
prop="panoramaUrl"
:label="$t('message.carManage.panoramaImg')"
>
<template slot-scope="scope">
<img
:preview="
scope.row.panoramaUrl
? $store.state.FILEURL +
scope.row.panoramaUrl
? $store.state.FILEURL + scope.row.panoramaUrl
: ''
"
:src="
scope.row.panoramaUrl
? $store.state.FILEURL +
scope.row.panoramaUrl
? $store.state.FILEURL + scope.row.panoramaUrl
: ''
"
alt=""
@ -137,7 +214,9 @@
<div class="topRight whiteBlock">
<div class="blockInner">
<!-- 24小时进出统计 -->
<div class="pageTitle">{{$t('message.carManage.allDayInOutStatistics')}}</div>
<div class="pageTitle">
{{ $t("message.carManage.allDayInOutStatistics") }}
</div>
<div class="chart" ref="inOut24HoursChart"></div>
</div>
</div>
@ -145,8 +224,10 @@
</div>
</template>
<script>
import echarts from 'echarts4';;
import echarts from "echarts4";
import {
selectCarStatisticsNumApi,
selectCarStatisticsRecordApi,
selectCarStatisticsByCameraIdApi,
selectCarPassRecordInOutCountApi,
getCarPassRecordListApi,
@ -154,6 +235,24 @@ import {
export default {
data() {
return {
carDataTypeList: [
{
value: 1,
name: "固定车",
},
{
value: 2,
name: "长期车",
},
{
value: 3,
name: "临时车",
},
{
value: 4,
name: "外来车",
},
],
pagInfo: {
pageNo: 1, //页数
pageSize: 10, //条数
@ -163,23 +262,46 @@ export default {
totalNum: {
innum: 0,
outnum: 0,
temporarynum: 0,
whitenum: 0,
wlcInNum: 0,
cqcInNum: 0,
gdcInNum: 0,
lscInNum: 0
},
totalCarNum: {
gdcNum: 0,
cqcNum: 0,
lscNum: 0
}
};
},
mounted() {
this.selectCarStatisticsNumFn();
this.selectCarStatisticsByCameraId();
this.selectCarStatisticsRecordFn();
this.selectCarPassRecordInOutCount();
this.getCarPassRecordList();
this.carNumCharts(this.$refs.carNumChart);
},
methods: {
selectCarStatisticsNumFn() {
selectCarStatisticsNumApi({
projectSn: this.$store.state.projectSn,
}).then((res) => {
this.totalCarNum = res.result;
});
},
selectCarStatisticsRecordFn() {
selectCarStatisticsRecordApi({
projectSn: this.$store.state.projectSn,
}).then((res) => {
this.totalNum = res.result;
});
},
selectCarStatisticsByCameraId() {
selectCarStatisticsByCameraIdApi({
projectSn: this.$store.state.projectSn,
}).then((res) => {
var carTypeList = res.result.carTypeList;
this.totalNum = res.result.totalnum;
var arr1 = [],
arr2 = [],
xData = [];
@ -189,8 +311,8 @@ export default {
arr2.push(element.outnum);
});
this.createdAgeCharts(arr1, arr2, xData, this.$refs.carTypeChart, [
this.$t('message.carManage.in'),
this.$t('message.carManage.out'),
this.$t("message.carManage.in"),
this.$t("message.carManage.out"),
]);
});
},
@ -220,8 +342,8 @@ export default {
arr2.push(element.outnum);
});
this.createdAgeCharts(arr1, arr2, xData, this.$refs.inOut24HoursChart, [
this.$t('message.carManage.in'),
this.$t('message.carManage.out'),
this.$t("message.carManage.in"),
this.$t("message.carManage.out"),
]);
});
},
@ -234,6 +356,52 @@ export default {
this.getCarCompareList();
},
getCarCompareList() {},
//车辆数量统计---图表
carNumCharts(el) {
let that = this;
let numChart = echarts.init(el);
// ageChart.clear();
let option = {
color: ["#2478F2", "#84B7F9", "#5F9CF8"],
tooltip: {
trigger: "item",
},
legend: {
bottom: "2%",
left: "center",
},
series: [
{
name: "车辆数量",
type: "pie",
radius: ["50%", "65%"],
center: ['50%', '40%'],
label: {
formatter: "{b|{b}}\n{c}",
rich: {
b: {
color: "#415058",
lineHeight: 20,
align: "left",
},
c: {
color: "#415058",
lineHeight: 20,
align: "left",
},
},
},
data: [
{ value: this.totalCarNum.gdcNum, name: "固定车总数" },
{ value: this.totalCarNum.cqcNum, name: "长期车总数" },
{ value: this.totalCarNum.lscNum, name: "临时车总数" },
],
},
],
};
numChart.setOption(option);
},
//车种进出---图表
createdAgeCharts(arr1, arr2, xData, el, legendData) {
let that = this;
@ -356,23 +524,39 @@ export default {
.tables {
min-height: auto;
}
.numBox {
display: inline-flex;
align-items: center;
width: 50%;
height: 40%;
.dataBox {
margin-left: 12px;
}
.num {
font-size: 20px;
}
// 数据统计内容样式
.statistics-content {
display: flex;
&-left {
width: 60%;
.left-data {
width: 100%;
margin-top: 60px;
.numBox {
display: inline-flex;
align-items: center;
width: 33%;
height: 40%;
margin-bottom: 80px;
.dataBox {
margin-left: 12px;
}
.text {
font-size: 14px;
// color: #7C829E;
opacity: 0.7;
.num {
font-size: 20px;
}
.text {
font-size: 14px;
// color: #7C829E;
opacity: 0.7;
}
}
}
}
&-right {
width: 40%;
}
}
</style>
</style>

217
src/views/projectFront/carManage/realTimeData.vue
View File

@ -1,7 +1,7 @@
<template>
<!-- 历史数据 -->
<div class="fullHeight">
<!-- <vue-scroll> -->
<!-- <vue-scroll> -->
<div class="searchBox whiteBlock">
<el-form
:inline="true"
@ -21,29 +21,46 @@
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('message.carManage.carNumber')">
<el-input v-model="formInline.carNumber" :placeholder="$t('message.deviceManage.placeholder')"></el-input>
<el-input
v-model="formInline.carNumber"
:placeholder="$t('message.deviceManage.placeholder')"
></el-input>
</el-form-item>
<!-- '车辆类型' -->
<el-form-item :label="$t('message.carManage.carType')">
<el-select v-model="isBlack"
:placeholder="$t('message.carManage.placeholder_select2')" clearable>
<el-option
:label="$t('message.carManage.all')"
value="">
</el-option>
<el-option
v-for="(item,index) in $t('message.carManage.carTypeList')"
:key="index"
:label="item.name"
:value="item.value">
</el-option>
</el-select>
<el-select
v-model="isBlack"
:placeholder="$t('message.carManage.placeholder_select2')"
clearable
>
<el-option :label="$t('message.carManage.all')" value="">
</el-option>
<el-option
v-for="(item, index) in carTypeList"
:key="index"
:label="item.name"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button v-permission="{key: 'clgl_query', menuPath: '/project/carManage/realTimeData'}" type="primary" plain @click="onSubmit">{{$t('message.deviceManage.query')}}</el-button>
<el-button
v-permission="{key: 'clgl_synchronizeVchicleTrafficData', menuPath: '/project/carManage/realTimeData'}"
v-permission="{
key: 'clgl_query',
menuPath: '/project/carManage/realTimeData',
}"
type="primary"
plain
@click="onSubmit"
>{{ $t("message.deviceManage.query") }}</el-button
>
<el-button
v-permission="{
key: 'clgl_synchronizeVchicleTrafficData',
menuPath: '/project/carManage/realTimeData',
}"
size="medium"
@click="updatePassData()"
type="primary"
@ -51,44 +68,107 @@
>
</el-form-item>
</el-form>
</div>
<div class="table_wrap whiteBlock">
</div>
<div class="table_wrap whiteBlock">
<el-table :data="tableData" class="tables">
<el-table-column prop="carNumber" :label="$t('message.carManage.carNumber')"> </el-table-column>
<el-table-column prop="enterpriseName" label="企业名称">
<template slot-scope="scope">
{{ scope.row.enterpriseName ? scope.row.enterpriseName : "无" }}
</template>
</el-table-column>
<el-table-column prop="driverWorkerName" label="司机姓名">
<template slot-scope="scope">
{{ scope.row.driverWorkerName ? scope.row.driverWorkerName : "无" }}
</template>
</el-table-column>
<el-table-column
prop="carNumber"
:label="$t('message.carManage.carNumber')"
>
</el-table-column>
<!-- 进出时间 -->
<el-table-column prop="passTime" :label="$t('message.carManage.inOutTime')"> </el-table-column>
<el-table-column
prop="passTime"
:label="$t('message.carManage.inOutTime')"
>
</el-table-column>
<!-- 进出标识 -->
<el-table-column prop="type" :label="$t('message.carManage.inOutCode')">
<template slot-scope="scope">
<!-- '出':'进' -->
{{scope.row.type==1?$t('message.carManage.out'):$t('message.carManage.in')}}
</template>
<el-table-column prop="type" :label="$t('message.carManage.inOutCode')">
<template slot-scope="scope">
<!-- '出':'进' -->
{{
scope.row.type == 1
? $t("message.carManage.out")
: $t("message.carManage.in")
}}
</template>
</el-table-column>
<!-- 进出位置 -->
<el-table-column prop="location" :label="$t('message.carManage.inOutAddress')"> </el-table-column>
<el-table-column
prop="location"
:label="$t('message.carManage.inOutAddress')"
>
</el-table-column>
<!-- 车辆颜色 -->
<el-table-column prop="carColor" label="车辆颜色"> </el-table-column>
<!-- 车辆类型 -->
<el-table-column prop="carType" :label="$t('message.carManage.carType')">
<template slot-scope="scope">
{{scope.row.carType ? $t('message.carManage.carTypeList')[scope.row.carType-1].name:''}}
</template>
<!-- 车辆类型 -->
<el-table-column
prop="carType"
:label="$t('message.carManage.carType')"
>
<template slot-scope="scope">
{{
scope.row.carType
? carTypeList[scope.row.carType - 1].name
? carTypeList[scope.row.carType - 1].name
: "外来车"
: "外来车"
}}
</template>
</el-table-column>
<!-- 进出场图片 -->
<el-table-column prop="imageUrl" :label="$t('message.carManage.inOutImg')">
<template slot-scope="scope">
<img :preview="scope.row.imageUrl?$store.state.FILEURL+scope.row.imageUrl:''"
:src="scope.row.imageUrl?$store.state.FILEURL+scope.row.imageUrl:''"
alt="" height="30"/>
</template>
<el-table-column
prop="imageUrl"
:label="$t('message.carManage.inOutImg')"
>
<template slot-scope="scope">
<img
:preview="
scope.row.imageUrl
? $store.state.FILEURL + scope.row.imageUrl
: ''
"
:src="
scope.row.imageUrl
? $store.state.FILEURL + scope.row.imageUrl
: ''
"
alt=""
height="30"
/>
</template>
</el-table-column>
<!-- 全景图照片 -->
<el-table-column prop="panoramaUrl" :label="$t('message.carManage.panoramaImg')">
<template slot-scope="scope">
<img :preview="scope.row.panoramaUrl?$store.state.FILEURL+scope.row.panoramaUrl:''"
:src="scope.row.panoramaUrl?$store.state.FILEURL+scope.row.panoramaUrl:''"
alt="" height="30"/>
</template>
<el-table-column
prop="panoramaUrl"
:label="$t('message.carManage.panoramaImg')"
>
<template slot-scope="scope">
<img
:preview="
scope.row.panoramaUrl
? $store.state.FILEURL + scope.row.panoramaUrl
: ''
"
:src="
scope.row.panoramaUrl
? $store.state.FILEURL + scope.row.panoramaUrl
: ''
"
alt=""
height="30"
/>
</template>
</el-table-column>
</el-table>
<el-pagination
@ -103,9 +183,9 @@
background
></el-pagination>
</div>
<!-- </vue-scroll> -->
<!-- 拉取车辆通行数据弹框 -->
<el-dialog
<!-- </vue-scroll> -->
<!-- 拉取车辆通行数据弹框 -->
<el-dialog
:modal-append-to-body="false"
:close-on-click-modal="false"
:visible.sync="dataImportDialog"
@ -114,15 +194,23 @@
<div class="title-set" slot="title">
<div class="line"></div>
<span>同步车辆通行数据</span>
<div class="question-icon" @mouseover="tipShow = true" @mouseout="tipShow = false">?</div>
<div class="tip-text" v-if="tipShow">此处可同步海康ISC平台的通行数据</div>
<div
class="question-icon"
@mouseover="tipShow = true"
@mouseout="tipShow = false"
>
?
</div>
<div class="tip-text" v-if="tipShow">
此处可同步海康ISC平台的通行数据
</div>
</div>
<div class="dialog-content">
<div class="form-content">
<el-form
label-width="230px"
size="medium"
style="width: 80%;margin: 0 auto;"
style="width: 80%; margin: 0 auto"
>
<el-form-item
prop="afternoonStartTime"
@ -174,14 +262,17 @@ export default {
timeRange: [],
isBlack: '',
carTypeList:[{
value: '1',
name: '白名单',
value: 1,
name: '固定车',
},{
value: 2,
name: '长期车',
},{
value: 3,
name: '临时车',
},{
value: '2',
name: '黑名单',
},{
value: '3',
name: '长期车',
value: 4,
name: '外来车',
}],
projectSn: "",
time: [],
@ -192,7 +283,7 @@ export default {
carNumber:''
},
tableData: [
],
pageNo: 1,
pageSize: 10,
@ -306,11 +397,11 @@ export default {
border: 2px solid #5c81ee;
margin-right: 10px;
}
>span{
> span {
margin-right: 5px;
}
.question-icon{
border: 1px solid #676C7C;
.question-icon {
border: 1px solid #676c7c;
border-radius: 50%;
width: 10px;
height: 10px;
@ -318,9 +409,9 @@ export default {
line-height: 10px;
font-size: 12px;
}
.tip-text{
.tip-text {
font-size: 14px;
margin-left: 5px;
}
}
</style>
</style>

2
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -1960,7 +1960,7 @@
></el-table-column>
<el-table-column prop="isSuccess" label="执行结果" align="center">
<template v-slot="{ row }">{{
row.isSuccess === 1 ? "成功" : "失败"
row.isSuccess === 1 ? "成功" : row.isSuccess === 0?"失败":""
}}</template>
</el-table-column>

2
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -2281,7 +2281,7 @@
></el-table-column>
<el-table-column prop="isSuccess" label="执行结果" align="center">
<template v-slot="{ row }">{{
row.isSuccess === 1 ? "成功" : "失败"
row.isSuccess === 1 ? "成功" : row.isSuccess === 0?"失败":""
}}</template>
</el-table-column>

2
src/views/projectFront/laborManage/rosterNew.vue
View File

@ -881,7 +881,7 @@
></el-table-column>
<el-table-column prop="isSuccess" label="执行结果" align="center">
<template v-slot="{ row }">{{
row.isSuccess === 1 ? "成功" : "失败"
row.isSuccess === 1 ? "成功" : row.isSuccess === 0?"失败":""
}}</template>
</el-table-column>

4
src/views/projectFront/progressManagementAg/divisionSubManage.vue
View File

@ -51,7 +51,7 @@
<p class="pageTitle">
承包商列表
</p>
<vue-scroll v-if="level1CompanyData.length > 0">
<vue-scroll style="height: calc(100% - 30px)" v-if="level1CompanyData.length > 0">
<el-tree
:data="level1CompanyData"
:props="defaultProps"
@ -1403,7 +1403,7 @@ export default {
display: flex;
flex-direction: column;
.treeBox {
flex: 1;
height: 87%;
background-color: rgba(216, 216, 216, 0.2);
padding-top: 10px;
margin-top: 20px;

4
src/views/projectFront/progressManagementAg/lcbManage.vue
View File

@ -51,7 +51,7 @@
<p class="pageTitle">
承包商列表
</p>
<vue-scroll v-if="level1CompanyData.length > 0">
<vue-scroll style="height: calc(100% - 30px)" v-if="level1CompanyData.length > 0">
<el-tree
:data="level1CompanyData"
:props="defaultProps"
@ -1119,7 +1119,7 @@ export default {
display: flex;
flex-direction: column;
.treeBox {
flex: 1;
height: 87%;
background-color: rgba(216, 216, 216, 0.2);
padding-top: 10px;
margin-top: 20px;