Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain

2024-06-03 17:53:25 +08:00 · 2024-06-03 17:53:25 +08:00 · ffdbcaea6c
commit ffdbcaea6c
parent 01cc615d49 bdf80f3b83
2 changed files with 70 additions and 13 deletions
--- a/src/views/commandScreen/commandCenter/centerBottom.vue
+++ b/src/views/commandScreen/commandCenter/centerBottom.vue
@ -38,9 +38,16 @@
 			<div class="cbHeaderLine"></div>
 		</div>
 		<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="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 class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div>
 							<div class="itemHeadInner2" v-if="JSON.parse(item.payload).level === 2">较大风险</div>
@ -73,13 +80,20 @@
 					v-if="listData.length > 0"
 					:speed="1"
 					:list="listData"
-					:limitScrollNum="10"
+					:limitScrollNum="5"
 					:step="0.3"
 					:hover="true"
 					class="scroll"
 				>
 					<div class="item" v-for="(item, index) in listData" :key="index">
 						<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 class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div>
 								<div class="itemHeadInner2" v-if="JSON.parse(item.payload).level === 2">较大风险</div>
@ -152,7 +166,7 @@ const getNoticeList = async () => {

 	console.log("隐患智能分析", res);
 	listData.value = res.result.records;
-
+	
 	// listData.value.push({
 	// 	accountId:"1779721457571291137",
 	// 	id:"1789601398432559107",
@ -855,7 +869,7 @@ onMounted(async () => {

 	.cbContent {
 		width: 100%;
-		height: calc(45% - 40px);
+		height: calc(45% - 55px);
 		overflow: hidden;
 		position: relative;

@ -876,7 +890,7 @@ onMounted(async () => {
 				justify-content: center;
 				align-items: center;
 				font-size: 16px;
-				width: 75%;
+				width: 80%;

 				.itemHeadInner1 {
 					border: 1px solid #e02020;
@ -956,13 +970,13 @@ onMounted(async () => {

 			.itemTime {
 				// background-color: #fff;
-				width: 25%;
+				width: 20%;
 				font-size: 16px;

 				.timeInfo {
 					display: flex;
-					justify-content: flex-start;
-					margin-right: 10px;
+					justify-content: flex-end;
+					// margin-right: 10px;
 				}
 			}
 		}
--- a/src/views/commandScreen/commandCenter/leftBottom.vue
+++ b/src/views/commandScreen/commandCenter/leftBottom.vue
@ -21,7 +21,7 @@
 						<div class="dayRadio">{{totalPersonRhbRatio}}%</div>
 					</div>
 					<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>
 				</div>
@ -76,6 +76,12 @@
 								</div>
 							</vue3-seamless-scroll>
 						</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>
 							<!-- v-if="listData.length>0" :list="listData"  -->
 							<!-- <vue3-seamless-scroll 
@ -224,7 +230,7 @@ function drawBar() {
 		dataZoom: [{
 			type: 'slider',
 			start: 0,
-			end: 30,
+			end: 40,
 			width:"100%",
 			height:5,
 			left:"center",
@ -241,7 +247,7 @@ function drawBar() {
 			// data: [120, 200, 150, 80, 70, 110, 130],
 			data: yData.value,
 			type: 'bar',
-			barWidth: 50,
+			barWidth: 20,
 			itemStyle: {
 				color: '#3398DB' // 设置柱状图颜色为蓝色
 			},
@ -258,12 +264,29 @@ function drawBar() {
 			backgroundColor: 'rgba(50,50,50, 0.5)', 
 			textStyle: { color: '#fff',fontSize:'15'},
 			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(123123,projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonRate)
 				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:#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:#00BFFF">●</span>出勤率日环比：'+projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonRhbRate+'%</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>出勤率日环比：'+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%;
 	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{
 	background: rgb(139,0,0);
 	background: linear-gradient(90deg, rgba(139,0,0,1) 35%, rgba(0,0,0,0.5) 100%);