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

对接隐患检查推送接口以及修改bug

Browse Source
This commit is contained in:
Vce 2024-06-03 17:50:55 +08:00
parent 335b6642a2
commit bdf80f3b83
2 changed files with 70 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/commandScreen/commandCenter/centerBottom.vue
View File

@ -37,9 +37,16 @@
<div class="cbHeaderLine"></div> <div class="cbHeaderLine"></div>
</div> </div>
<div class="cbContent"> <div class="cbContent">
<div v-if="listData.length < 10 && listData.length !== 0"> <div v-if="listData.length < 5 && listData.length !== 0">
<div class="item" v-for="(item, index) in listData" :key="index"> <div class="item" v-for="(item, index) in listData" :key="index">
<div class="itemHead"> <div class="itemHead">
<div>
<div class="itemHeadInner1" style="margin-right:10px" v-if="JSON.parse(item.payload).status === 2">未整改</div>
<div class="itemHeadInner4" style="margin-right:10px" v-if="JSON.parse(item.payload).status === 3">未复查</div>
<div class="itemHeadInner5" style="margin-right:10px" v-if="JSON.parse(item.payload).status === 4">未核验</div>
<div class="itemHeadInner6" style="margin-right:10px" v-if="JSON.parse(item.payload).status === 5">合格</div>
<div class="itemHeadInner3" style="margin-right:10px" v-if="JSON.parse(item.payload).status === 6">已撤回</div>
</div>
<div v-if="JSON.parse(item.payload).level"> <div v-if="JSON.parse(item.payload).level">
<div class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div> <div class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div>
<div class="itemHeadInner2" v-if="JSON.parse(item.payload).level === 2">较大风险</div> <div class="itemHeadInner2" v-if="JSON.parse(item.payload).level === 2">较大风险</div>
@ -72,13 +79,20 @@
v-if="listData.length > 0" v-if="listData.length > 0"
:speed="1" :speed="1"
:list="listData" :list="listData"
:limitScrollNum="10" :limitScrollNum="5"
:step="0.3" :step="0.3"
:hover="true" :hover="true"
class="scroll" class="scroll"
> >
<div class="item" v-for="(item, index) in listData" :key="index"> <div class="item" v-for="(item, index) in listData" :key="index">
<div class="itemHead"> <div class="itemHead">
<div>
<div class="itemHeadInner1" style="margin-right:10px" v-if="JSON.parse(item.payload).status === 2">未整改</div>
<div class="itemHeadInner4" style="margin-right:10px" v-if="JSON.parse(item.payload).status === 3">未复查</div>
<div class="itemHeadInner5" style="margin-right:10px" v-if="JSON.parse(item.payload).status === 4">未核验</div>
<div class="itemHeadInner6" style="margin-right:10px" v-if="JSON.parse(item.payload).status === 5">合格</div>
<div class="itemHeadInner3" style="margin-right:10px" v-if="JSON.parse(item.payload).status === 6">已撤回</div>
</div>
<div v-if="JSON.parse(item.payload).level"> <div v-if="JSON.parse(item.payload).level">
<div class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div> <div class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div>
<div class="itemHeadInner2" v-if="JSON.parse(item.payload).level === 2">较大风险</div> <div class="itemHeadInner2" v-if="JSON.parse(item.payload).level === 2">较大风险</div>
@ -729,7 +743,7 @@ onMounted(async () => {
.cbContent { .cbContent {
width: 100%; width: 100%;
height: calc(45% - 40px); height: calc(45% - 55px);
overflow: hidden; overflow: hidden;
position: relative; position: relative;
@ -750,7 +764,7 @@ onMounted(async () => {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 16px; font-size: 16px;
width: 75%; width: 80%;
.itemHeadInner1 { .itemHeadInner1 {
border: 1px solid #e02020; border: 1px solid #e02020;
@ -825,13 +839,13 @@ onMounted(async () => {
.itemTime { .itemTime {
// background-color: #fff; // background-color: #fff;
width: 25%; width: 20%;
font-size: 16px; font-size: 16px;
.timeInfo { .timeInfo {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-end;
margin-right: 10px; // margin-right: 10px;
} }
} }
} }

53
src/views/commandScreen/commandCenter/leftBottom.vue
View File

@ -21,7 +21,7 @@
<div class="dayRadio">{{totalPersonRhbRatio}}%</div> <div class="dayRadio">{{totalPersonRhbRatio}}%</div>
</div> </div>
<div style="display:flex" v-if="totalPersonRhbRatio < 0"> <div style="display:flex" v-if="totalPersonRhbRatio < 0">
<div class="dayRadio">{{totalPersonRhbRatio}}%</div> <div class="dayRadio">{{Math.abs(totalPersonRhbRatio)}}%</div>
<div class="iconCenter"><el-icon size="20" color="#8B0000"><Bottom/></el-icon></div> <div class="iconCenter"><el-icon size="20" color="#8B0000"><Bottom/></el-icon></div>
</div> </div>
</div> </div>
@ -76,6 +76,12 @@
</div> </div>
</vue3-seamless-scroll> </vue3-seamless-scroll>
</div> </div>
<!-- <div class="cbProcess" v-else-if="processList.length === 0">
<div class="notoDta" v-if="dataList.length == 0">
<img src="@/assets/images/noData.png" alt="" />
<p>暂无数据</p>
</div>
</div> -->
<div class="cbProcess" v-else> <div class="cbProcess" v-else>
<!-- v-if="listData.length>0" :list="listData" --> <!-- v-if="listData.length>0" :list="listData" -->
<!-- <vue3-seamless-scroll <!-- <vue3-seamless-scroll
@ -224,7 +230,7 @@ function drawBar() {
dataZoom: [{ dataZoom: [{
type: 'slider', type: 'slider',
start: 0, start: 0,
end: 30, end: 40,
width:"100%", width:"100%",
height:5, height:5,
left:"center", left:"center",
@ -241,7 +247,7 @@ function drawBar() {
// data: [120, 200, 150, 80, 70, 110, 130], // data: [120, 200, 150, 80, 70, 110, 130],
data: yData.value, data: yData.value,
type: 'bar', type: 'bar',
barWidth: 50, barWidth: 20,
itemStyle: { itemStyle: {
color: '#3398DB' // 设置柱状图颜色为蓝色 color: '#3398DB' // 设置柱状图颜色为蓝色
}, },
@ -258,12 +264,29 @@ function drawBar() {
backgroundColor: 'rgba(50,50,50, 0.5)', backgroundColor: 'rgba(50,50,50, 0.5)',
textStyle: { color: '#fff',fontSize:'15'}, textStyle: { color: '#fff',fontSize:'15'},
formatter: function(params) { formatter: function(params) {
// 出勤率
let attendanceRate = projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonRate
if(!attendanceRate){
attendanceRate = "--"
}else{
attendanceRate = attendanceRate + "%"
}
// 出勤率日环比
let attendanceRhbRate = projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonRhbRate
if(!attendanceRhbRate){
attendanceRhbRate = "--"
}else{
attendanceRhbRate = attendanceRhbRate + "%"
}
console.log(params) console.log(params)
console.log(123123,projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonRate)
return '<div style="font-weight:bold">'+params.name+'</div>' + return '<div style="font-weight:bold">'+params.name+'</div>' +
'<div style="line-height:23px"><span style="font-size:16px;margin-right:5px;color:#1E90FF">●</span>在册人员：'+projectCompanyWorkTotalList.value[params.dataIndex].totalPersonNum+'</div>' + '<div style="line-height:23px"><span style="font-size:16px;margin-right:5px;color:#1E90FF">●</span>在册人员：'+projectCompanyWorkTotalList.value[params.dataIndex].totalPersonNum+'</div>' +
'<div style="line-height:23px"><span style="font-size:16px;margin-right:5px;color:#4682B4">●</span>出勤人员总数：'+projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonNum+'</div>' + '<div style="line-height:23px"><span style="font-size:16px;margin-right:5px;color:#4682B4">●</span>出勤人员总数：'+projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonNum+'</div>' +
'<div style="line-height:23px"><span style="font-size:16px;margin-right:5px;color:#87CEFA">●</span>出勤率：'+projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonRate+'%</div>' + '<div style="line-height:23px"><span style="font-size:16px;margin-right:5px;color:#87CEFA">●</span>出勤率：'+attendanceRate+'</div>' +
'<div style="line-height:23px"><span style="font-size:16px;margin-right:5px;color:#00BFFF">●</span>出勤率日环比：'+projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonRhbRate+'%</div>'; '<div style="line-height:23px"><span style="font-size:16px;margin-right:5px;color:#00BFFF">●</span>出勤率日环比：'+attendanceRhbRate+'</div>';
// '<div style="line-height:23px"><span style="font-size:16px;margin-right:5px;color:#87CEFA">●</span>出勤率：'+projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonRate+'%</div>' +
} }
} }
}; };
@ -545,6 +568,26 @@ onMounted(async () => {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
} }
.notoDta {
top: 35%;
width: 50%;
// left: 40%;
position: absolute;
text-align: center;
left: 50%;
transform: translateX(-50%);
img {
width: 40%;
margin: 5% 30%;
}
p {
color: #fff;
font-size: calc(100vw * 14 / 1920);
margin: -6% 30%;
}
}
.plBgc1{ .plBgc1{
background: rgb(139,0,0); background: rgb(139,0,0);
background: linear-gradient(90deg, rgba(139,0,0,1) 35%, rgba(0,0,0,0.5) 100%); background: linear-gradient(90deg, rgba(139,0,0,1) 35%, rgba(0,0,0,0.5) 100%);