fix: 合并代码以及冲突解决

2024-06-18 18:28:49 +08:00 · 2024-06-18 18:28:49 +08:00 · 619f551237
commit 619f551237
parent 86020fcf89 25dc5c976d
14 changed files with 506 additions and 217 deletions
--- a/.env.development
+++ b/.env.development
@ -4,7 +4,7 @@ NODE_ENV = 'development'
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
 # VITE_API_URL = 'http://192.168.34.155:19111'
-# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
+VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
 # VITE_API_URL = 'http://182.90.224.237:51234'  #雄哥远程
 # VITE_API_URL = 'http://192.168.34.221:28889'
 # VITE_API_URL = 'http://121.196.214.246/api'
--- a/src/api/modules/agjtOverviewApi.ts
+++ b/src/api/modules/agjtOverviewApi.ts
@ -20,7 +20,21 @@ export const videoFullCountFullApi = (params: {}, showLoading: boolean) => {
 export const getStatByStateApi = (params: {}, showLoading: boolean) => {
 	return http.get(BASEURL + `/xmgl/xzFlow/getStatByState`, params, { headers: { noLoading: showLoading } });
 };
-
+// 审批数据汇总详情
 export const getStatDetailByStateApi = (params: {}, showLoading: boolean) => {
 	return http.get(BASEURL + `/xmgl/xzFlow/getStatDetailByState`, params, { headers: { noLoading: showLoading } });
 };
+
+// 获取企业数据统计
+export const getEnterpriseInfoListApi = (params: {}, showLoading: boolean) => {
+	return http.post(BASEURL + `/xmgl/enterpriseInfo/list`, params, { headers: { noLoading: showLoading } });
+};
+// 获取数据统计总数
+export const getStatsEnterpriseWeekApi = (params: {}, showLoading: boolean) => {
+	return http.post(BASEURL + `/xmgl/enterpriseInfo/statsEnterpriseWeek`, params, { headers: { noLoading: showLoading } });
+};
+
+// 区域人员数量分析
+export const getCountWorkerNumByRegionApi = (params: {}, showLoading: boolean) => {
+	return http.post(BASEURL + `/xmgl/safetyHatData/countWorkerNumByRegion`, params, { headers: { noLoading: showLoading } });
+};
--- a/src/routers/modules/staticRouter.ts
+++ b/src/routers/modules/staticRouter.ts
@ -24,9 +24,9 @@ export const staticRouter: RouteRecordRaw[] = [
 	{
 		path: "/large",
 		name: "大屏",
-		component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
+		// component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
 		// component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
-		// component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
+		component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
 		// component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏
 		// component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏
 		// component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页)
--- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerBottom.vue
+++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerBottom.vue
@ -9,23 +9,23 @@
 				<div class="member-top-data">
 					<div class="top-data-item">
 						<span>未履职人员</span>
-						<span>{{performanceAnalysisObj.notPerformNum || 0}}/{{performanceAnalysisObj.inServiceNum || 0}}</span>
+						<span>{{ performanceAnalysisObj.notPerformNum || 0 }}/{{ performanceAnalysisObj.inServiceNum || 0 }}</span>
 					</div>
 					<div class="top-data-item">
 						<span>项目经理</span>
-						<span>{{performanceAnalysisObj.xmjlNotPerformNum || 0}}/{{performanceAnalysisObj.xmjlInServiceNum || 0}}</span>
+						<span>{{ performanceAnalysisObj.xmjlNotPerformNum || 0 }}/{{ performanceAnalysisObj.xmjlInServiceNum || 0 }}</span>
 					</div>
 					<div class="top-data-item">
 						<span>安全员</span>
-						<span>{{performanceAnalysisObj.aqyNotPerformNum || 0}}/{{performanceAnalysisObj.aqyInServiceNum || 0}}</span>
+						<span>{{ performanceAnalysisObj.aqyNotPerformNum || 0 }}/{{ performanceAnalysisObj.aqyInServiceNum || 0 }}</span>
 					</div>
 					<div class="top-data-item">
 						<span>质量员</span>
-						<span>{{performanceAnalysisObj.zlyNotPerformNum || 0}}/{{performanceAnalysisObj.zlyInServiceNum || 0}}</span>
+						<span>{{ performanceAnalysisObj.zlyNotPerformNum || 0 }}/{{ performanceAnalysisObj.zlyInServiceNum || 0 }}</span>
 					</div>
 					<div class="top-data-item">
 						<span>监理</span>
-						<span>{{performanceAnalysisObj.jlNotPerformNum || 0}}/{{performanceAnalysisObj.jlInServiceNum || 0}}</span>
+						<span>{{ performanceAnalysisObj.jlNotPerformNum || 0 }}/{{ performanceAnalysisObj.jlInServiceNum || 0 }}</span>
 					</div>
 				</div>
 				<div class="member-bottom-table">
@ -42,11 +42,11 @@
 							<div v-for="(item, index) in performanceAnalysisList" class="listStyle" :key="item.id">
 								<!-- <div style="width: 5%">{{ index + 1 }}</div> -->
 								<div>{{ item.enterpriseName || "" }}</div>
-								<div>{{item.notPerformNum || 0}}/{{item.inServiceNum || 0}}</div>
-								<div>{{item.xmjlNotPerformNum || 0}}/{{item.xmjlInServiceNum || 0}}</div>
-								<div>{{item.aqyNotPerformNum || 0}}/{{item.aqyInServiceNum || 0}}</div>
-								<div>{{item.zlyNotPerformNum || 0}}/{{item.zlyInServiceNum || 0}}</div>
-								<div>{{item.jlNotPerformNum || 0}}/{{item.jlInServiceNum || 0}}</div>
+								<div>{{ item.notPerformNum || 0 }}/{{ item.inServiceNum || 0 }}</div>
+								<div>{{ item.xmjlNotPerformNum || 0 }}/{{ item.xmjlInServiceNum || 0 }}</div>
+								<div>{{ item.aqyNotPerformNum || 0 }}/{{ item.aqyInServiceNum || 0 }}</div>
+								<div>{{ item.zlyNotPerformNum || 0 }}/{{ item.zlyInServiceNum || 0 }}</div>
+								<div>{{ item.jlNotPerformNum || 0 }}/{{ item.jlInServiceNum || 0 }}</div>
 							</div>
 						</el-scrollbar>
 					</div>
@ -60,15 +60,15 @@
 				<div class="remark-top-data">
 					<div class="top-data-item">
 						<span>低风险</span>
-						<span>{{statsEnterpriseRiskObj.lowRiskNum}}</span>
+						<span>{{ statsEnterpriseRiskObj.lowRiskNum }}</span>
 					</div>
 					<div class="top-data-item">
 						<span>中风险</span>
-						<span>{{statsEnterpriseRiskObj.mediumRiskNum}}</span>
+						<span>{{ statsEnterpriseRiskObj.mediumRiskNum }}</span>
 					</div>
 					<div class="top-data-item">
 						<span>高风险</span>
-						<span>{{statsEnterpriseRiskObj.highRiskNum}}</span>
+						<span>{{ statsEnterpriseRiskObj.highRiskNum }}</span>
 					</div>
 				</div>
 				<div class="remark-bottom-table">
@ -107,34 +107,34 @@ import { performanceAnalysisApi, statsEnterpriseRiskApi } from "@/api/modules/ag
 const store = GlobalStore();
 const activeTab = ref(0);
 const performanceAnalysisObj = ref({
-	aqyInServiceNum:0,
-	aqyNotPerformNum:0,
-	enterpriseName:0,
-	inServiceNum:0,
-	jlInServiceNum:0,
-	jlNotPerformNum:0,
-	notPerformNum:0,
-	xmjlInServiceNum:0,
-	xmjlNotPerformNum:0,
-	zlyInServiceNum:0,
-	zlyNotPerformNum:0
-})
-const performanceAnalysisList = ref([] as any)
+	aqyInServiceNum: 0,
+	aqyNotPerformNum: 0,
+	enterpriseName: 0,
+	inServiceNum: 0,
+	jlInServiceNum: 0,
+	jlNotPerformNum: 0,
+	notPerformNum: 0,
+	xmjlInServiceNum: 0,
+	xmjlNotPerformNum: 0,
+	zlyInServiceNum: 0,
+	zlyNotPerformNum: 0
+});
+const performanceAnalysisList = ref([] as any);
 const statsEnterpriseRiskObj = ref({
 	lowRiskNum: 0,
 	mediumRiskNum: 0,
 	highRiskNum: 0
-})
-const statsEnterpriseRiskList = ref([] as any)
+});
+const statsEnterpriseRiskList = ref([] as any);
 // tab切换
-const activeChange = (index:any) => {
+const activeChange = (index: any) => {
 	activeTab.value = index;
-	if(index == 0){
-		performanceAnalysisFn(true)
+	if (index == 0) {
+		performanceAnalysisFn(true);
 	} else {
-		statsEnterpriseRiskFn(true)
+		statsEnterpriseRiskFn(true);
 	}
-}
+};
 // 人员情况
 const performanceAnalysisFn = async (showLoading: boolean) => {
 	const res: any = await performanceAnalysisApi(
@ -165,13 +165,13 @@ const statsEnterpriseRiskFn = async (showLoading: boolean) => {
 			lowRiskNum: 0,
 			mediumRiskNum: 0,
 			highRiskNum: 0
-		}
-		statsEnterpriseRiskList.value.map((item:any) => {
-			dealData.lowRiskNum += item.lowRiskNum
-			dealData.mediumRiskNum += item.mediumRiskNum
-			dealData.highRiskNum += item.highRiskNum
-		})
-		statsEnterpriseRiskObj.value = dealData
+		};
+		statsEnterpriseRiskList.value.map((item: any) => {
+			dealData.lowRiskNum += item.lowRiskNum;
+			dealData.mediumRiskNum += item.mediumRiskNum;
+			dealData.highRiskNum += item.highRiskNum;
+		});
+		statsEnterpriseRiskObj.value = dealData;
 	}
 };
 onMounted(async () => {
--- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerTop.vue
+++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerTop.vue
@ -88,13 +88,16 @@ const configWeekVideoListFn = async (showLoading: boolean) => {
 		// 星期参数
 		const today = moment().format("d");
 		const weekParamsKey = ["sun", "mon", "tues", "wed", "thur", "fri", "sat"];
-		projectData.value.videoUrl = res.result[0][weekParamsKey[+today]];
+		projectData.value.videoUrl = res.result.length > 0 && res.result[0][weekParamsKey[+today]];
 	}
 };
 const getVideoList = async () => {
-	let res: any = await selectLiveVideoListApi({
-		projectSn: store.sn
-	});
+	let res: any = await selectLiveVideoListApi(
+		{
+			projectSn: store.sn
+		},
+		false
+	);
 	console.log(res, "445566");
 	if (res.result && res.result.extend1) {
 		videoList.value = JSON.parse(res.result.extend1).result.videoList;
@ -116,7 +119,7 @@ const getVideoList = async () => {
 onMounted(async () => {
 	if (COMPANY !== "agjt") showVideo.value = 2;
 	await getVideoList();
-	await configWeekVideoListFn(true);
+	configWeekVideoListFn(true);
 });
 </script>

--- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/index.vue
+++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/index.vue
@ -10,10 +10,11 @@
 			<centerBottom :projectData="projectData" class="centerBottom" ref="centerBottomRef"></centerBottom>
 		</div>
 		<div class="right">
-			<rightTop class="rightTop" ref="rightTopRef"></rightTop>
+			<rightTop class="rightTop" ref="rightTopRef" @openDialog="openPeopleCountDialog"></rightTop>
 			<rightCenter class="rightCenter" ref="rightCenterRef"></rightCenter>
 			<rightBottom class="rightBottom" ref="rightBottomRef"></rightBottom>
 		</div>
+		<dataDialog ref="partyBuildRef"></dataDialog>
 	</div>
 </template>

@ -26,16 +27,23 @@ import centerBottom from "./centerBottom.vue";
 import rightTop from "./rightTop.vue";
 import rightCenter from "./rightCenter.vue";
 import rightBottom from "./rightBottom.vue";
+import dataDialog from "@/views/commandScreen/dialogCompnnents/data-dialog.vue";
 import { GlobalStore } from "@/stores";
-const store = GlobalStore();
 import { getWorkerStatisticsCountApi, getProjectDetail } from "@/api/modules/projectOverview";
-import { ref, onMounted, onBeforeUnmount,nextTick } from "vue";
+import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
+const store = GlobalStore();
 const statisticsCount = ref(null as any);
-
+// 弹窗
+const partyBuildRef = ref();
+const openPeopleCountDialog = (index: any) => {
+	console.log("~~~~~~~~~~~~~~", index);
+	partyBuildRef.value.openDialog(index);
+	// console.log(partyBuildRef.value);
+};
 const projectData = ref(null as any);
 //获取项目信息
 const getProjectInfo = async () => {
-	const res = await getProjectDetail({ projectSn: store.sn });
+	const res = await getProjectDetail({ projectSn: store.sn }, false);
 	// console.log("获取项目信息", res);
 	// console.log("获取工程类别", projectTypeEnum);
 	projectData.value = res.result;
@ -54,39 +62,39 @@ const rightTopRef = ref();
 const rightCenterRef = ref();
 const rightBottomRef = ref();
 const callChildFn = async () => {
-	nextTick( async ()=>{
-		leftTopRef.value.projectTypeEnum()
-		centerTopRef.value.getQueryBySnData()
-		centerBottomRef.value.getProgressOption()
-		rightTopRef.value.getSafeInfo()
-		rightCenterRef.value.qualityInfo()
-		rightBottomRef.value.getList()
-	})
-}
+	nextTick(async () => {
+		leftTopRef.value.projectTypeEnum();
+		centerTopRef.value.getQueryBySnData();
+		centerBottomRef.value.getProgressOption();
+		rightTopRef.value.getSafeInfo();
+		rightCenterRef.value.qualityInfo();
+		rightBottomRef.value.getList();
+	});
+};
 //定时器
 const interval = ref(null as any);
 //定时调用
 const startInterval = async () => {
-	interval.value= setInterval(() => {
+	interval.value = setInterval(() => {
 		getPersonDetail();
 		getProjectInfo();
 		callChildFn();
 	}, 30 * 1000);
-}
+};
 // 在组件销毁时清除 interval
 const destroyInterval = () => {
 	if (interval.value) {
 		clearInterval(interval.value);
-  }
-}
+	}
+};
 // 在组件销毁时调用 destroyInterval 方法清除 interval
 onBeforeUnmount(() => {
 	destroyInterval();
-})
-window.onbeforeunload = (e) => {
+});
+window.onbeforeunload = () => {
 	destroyInterval();
-}
-onMounted( async () => {
+};
+onMounted(async () => {
 	getPersonDetail();
 	getProjectInfo();
 	// startInterval();
@ -97,19 +105,24 @@ onMounted( async () => {
 	width: 100%;
 	height: 100%;
 	display: flex;
+
 	.left {
 		width: 26%;
+
 		.leftTop {
 			height: 32%;
 		}
+
 		.leftCenter {
 			height: 33%;
 			margin: 3% 0 3% 0;
 		}
+
 		.leftBottom {
 			height: 32%;
 		}
 	}
+
 	.center {
 		width: 46%;
 		margin: 0 1%;
@ -118,20 +131,24 @@ onMounted( async () => {
 			height: 66%;
 			margin-bottom: 2.1%;
 		}
+
 		.centerBottom {
 			height: 32%;
 		}
 	}
+
 	.right {
 		width: 26%;

 		.rightTop {
 			height: 32%;
 		}
+
 		.rightCenter {
 			height: 33%;
 			margin: 3% 0 3% 0;
 		}
+
 		.rightBottom {
 			height: 32%;
 		}
--- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue
+++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue
@ -234,7 +234,7 @@ const drawTwoEchart = () => {
 				top: "20%",
 				// bottom: "12%",
 				align: "left",
-				itemGap: 10,
+				itemGap: 12,
 				itemWidth: 30, // 设置宽度
 				itemHeight: 9, // 设置高度
 				symbolKeepAspect: false,
--- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightBottom.vue
+++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightBottom.vue
@ -3,7 +3,7 @@
 		<Card title="安全质量隐患报告">
 			<div class="box-content">
 				<el-scrollbar class="list-box" ref="refScrollbar">
-					<div v-for="(item, index) in list" class="listStyle" :key="item.id">
+					<div v-for="item in list" class="listStyle" :key="item.id">
 						<div>{{ item.dangerItemContent }}</div>
 						<div>
 							<span>整改结果：</span>
@ -23,7 +23,7 @@
 							</div>
 							<div>
 								<span>检查日期：</span>
-								<span>{{item.inspectTime || ""}}</span>
+								<span>{{ item.inspectTime || "" }}</span>
 							</div>
 						</div>
 					</div>
@ -62,7 +62,8 @@ const getXzSecurityQualitylnspectionRecordlist = async (tip: any) => {
 	const res: any = await getXzSecurityQualitylnspectionRecordlistApi({
 		pageNo: tip == "search" ? 1 : pageNo.value,
 		pageSize: 10,
-		projectSn: store.sn
+		projectSn: store.sn,
+		status: 60
 	});
 	if (tip == "more") {
 		const newResult = res.result.page.records.map((item: any) => {
--- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue
+++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue
@ -1,42 +1,44 @@
 <template>
 	<div class="leftTop">
 		<Card title="各企业本周数据统计">
-			<el-carousel style="width: 100%;height: 100%;">
-				<el-carousel-item v-for="item in 4" :key="item" style="width: 100%; height: 100%">
+			<el-carousel @change="onChange" style="width: 100%; height: 100%">
+				<el-carousel-item v-for="item in enterpriseInfo.dataList" :key="item.enterpriseId" style="width: 100%; height: 100%">
 					<div class="box-content">
 						<div class="top-content">
-							<div class="top-content-left">辽宁五寰科技有限公司{{ item }}</div>
+							<div class="top-content-left">{{ item.enterpriseName }}</div>
 							<div class="top-content-right" style="text-align: right">
-								事故报警总数
-								<span v-if="!projectData?.totalProjectDay" class="dayImg">0</span>
-								<span v-else class="dayImg" v-for="item in projectData?.totalProjectDay" :key="item">{{ item }}</span>
-								<!-- <span style="margin-left: 4%">天</span> -->
+								<div class="line1" style="display: flex; justify-content: flex-end">
+									<span style="margin-left: 15px">事故报警总数</span>
+									<div class="numberCard" v-for="(ele, i) in `${enterpriseInfo.dataInfo.emergencyNum}`" :key="i">
+										{{ ele }}
+									</div>
+								</div>
 							</div>
 						</div>
 						<div class="bottom-content">
 							<div class="top-data-item">
-								<span>入场人员总数</span>
-								<span>12/2500</span>
+								<span>在场人员总数</span>
+								<span>{{ enterpriseInfo.dataInfo.highWorkerNumThisWeek }}/{{ enterpriseInfo.dataInfo.inServiceNum }}</span>
 							</div>
 							<div class="top-data-item">
 								<span>企业安全分</span>
-								<span>85</span>
+								<span>{{ enterpriseInfo.dataInfo.safeScore }}</span>
 							</div>
 							<div class="top-data-item">
 								<span>安全隐患总数</span>
-								<span>12</span>
+								<span>{{ enterpriseInfo.dataInfo.securityNum }}</span>
 							</div>
 							<div class="top-data-item">
 								<span>质量隐患总数</span>
-								<span>12</span>
+								<span>{{ enterpriseInfo.dataInfo.qualityNum }}</span>
 							</div>
 							<div class="top-data-item">
 								<span>特种作业数量</span>
-								<span>60</span>
+								<span>{{ enterpriseInfo.dataInfo.specialNum }}</span>
 							</div>
 							<div class="top-data-item">
 								<span>培训未通过率</span>
-								<span>30%</span>
+								<span>{{ enterpriseInfo.dataInfo.trainNotPassRadio }}%</span>
 							</div>
 						</div>
 					</div>
@ -48,19 +50,66 @@

 <script setup lang="ts">
 import Card from "@/components/card.vue";
-import { onMounted, ref } from "vue";
+import { getEnterpriseInfoListApi, getStatsEnterpriseWeekApi } from "@/api/modules/agjtOverviewApi";
+import { onMounted, ref, reactive } from "vue";
 import { GlobalStore } from "@/stores";
 const store = GlobalStore();
 const projectData = ref({
 	totalProjectDay: "180"
 });
-onMounted(() => {});
+const enterpriseInfo = reactive({
+	dataList: [] as any[],
+	dataInfo: {
+		emergencyNum: 0
+	} as any
+});
+
+const onChange = (event: any) => {
+	const enterpriseId = enterpriseInfo.dataList[event].enterpriseId;
+	getStatsEnterpriseWeek(true, enterpriseId);
+};
+// 获取企业数据统计
+const getEnterpriseInfoList = async (showLoading: boolean) => {
+	const res: any = await getEnterpriseInfoListApi(
+		{
+			projectSn: store.sn,
+			enterpriseName: "",
+			enterpriseTypeId: "",
+			userEnterpriseId: ""
+		},
+		showLoading
+	);
+	enterpriseInfo.dataList = res.result;
+	const enterpriseId = res.result.length > 0 && res.result[0].enterpriseId;
+	getStatsEnterpriseWeek(false, enterpriseId);
+};
+const getStatsEnterpriseWeek = async (showLoading: boolean, enterpriseId: string) => {
+	const res: any = await getStatsEnterpriseWeekApi(
+		{
+			projectSn: store.sn,
+			enterpriseId: enterpriseId
+		},
+		showLoading
+	);
+	enterpriseInfo.dataInfo = res.result;
+};
+const setIntervalFn = (showLoading: boolean) => {
+	getEnterpriseInfoList(showLoading);
+};
+
+onMounted(async () => {
+	setIntervalFn(false);
+	// setInterval(() => {
+	// 	setIntervalFn(true);
+	// }, 30000);
+});
 </script>

 <style lang="scss" scoped>
 .leftTop {
 	width: 100%;
 	height: 100%;
+
 	.box-content {
 		.top-content {
 			display: flex;
@ -68,11 +117,13 @@ onMounted(() => {});
 			justify-content: space-between;
 			margin: 0 4%;
 			padding-top: 3%;
+
 			> div {
 				width: 45%;
 				line-height: 32px;
 				font-size: 14px;
 				color: #fff;
+
 				.dayImg {
 					margin-left: 2%;
 					font-size: 26px;
@ -86,6 +137,7 @@ onMounted(() => {});
 					color: #4ac0f3;
 				}
 			}
+
 			&-left {
 				font-family: ABeeZee, ABeeZee;
 				font-weight: 400;
@ -96,12 +148,14 @@ onMounted(() => {});
 				text-transform: none;
 			}
 		}
+
 		.bottom-content {
 			display: grid;
 			grid-template-columns: repeat(3, 1fr);
 			grid-gap: 10px;
 			margin: 0 6%;
 			margin-top: 3%;
+
 			.top-data-item {
 				width: 125px;
 				height: 51px;
@ -112,12 +166,14 @@ onMounted(() => {});
 				padding: 2% 0;
 				padding-left: 8%;
 				margin-bottom: 8%;
+
 				span:nth-child(1) {
 					font-size: 13px;
 					color: #fff;
 					font-family: ABeeZee-Regular;
 					margin-bottom: 1%;
 				}
+
 				span:nth-child(2) {
 					font-size: 24px;
 					color: #65d7f9;
@ -127,28 +183,53 @@ onMounted(() => {});
 		}
 	}
 }
+
+.line1 {
+	color: #fff;
+	padding-top: 5px;
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+	line-height: 30px;
+	height: 30px;
+	font-size: 16px;
+
+	.numberCard {
+		font-size: 26px;
+		padding: 0 8px;
+		margin-left: 3px;
+		font-weight: bold;
+		color: #47bcec;
+		background: url("@/assets/images/commandScreen/number-bg.png") no-repeat;
+		background-size: 100% 100%;
+	}
+}
+
 ::v-deep .h-card .content {
 	height: 80%;
 }
+
 ::v-deep .el-carousel__container {
 	height: 100%;
 }
-:deep(){
+
+:deep() {
 	.el-carousel__indicator--horizontal .el-carousel__button {
-        width: 10px;
-        height: 10px;
-        background: #A8C3DD;
-        border: 1px solid #A8C3DD;
-        border-radius: 50%;
-        opacity: 0.3;
-    }
-    .el-carousel__indicator--horizontal.is-active .el-carousel__button{
-        width: 10px;
-        height: 10px;
-        background: #4AC0F3;
-        border: 1px solid #4AC0F3;
-        border-radius: 50%;
-        opacity: 1;
-    }
+		width: 10px;
+		height: 10px;
+		background: #a8c3dd;
+		border: 1px solid #a8c3dd;
+		border-radius: 50%;
+		opacity: 0.3;
+	}
+
+	.el-carousel__indicator--horizontal.is-active .el-carousel__button {
+		width: 10px;
+		height: 10px;
+		background: #4ac0f3;
+		border: 1px solid #4ac0f3;
+		border-radius: 50%;
+		opacity: 1;
+	}
 }
 </style>
--- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightTop.vue
+++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightTop.vue
@ -2,32 +2,32 @@
 	<div class="leftTop">
 		<Card title="隐患智能统计分析">
 			<div class="hRight">
-					<el-date-picker
-						style="width: 90%"
-						v-model="dateRange"
-						type="daterange"
-						range-separator="至"
-						start-placeholder="开始日期"
-						end-placeholder="结束日期"
-						value-format="YYYY-MM-DD"
-					/>
-				</div>
+				<el-date-picker
+					style="width: 90%"
+					v-model="dateRange"
+					type="daterange"
+					range-separator="至"
+					start-placeholder="开始日期"
+					end-placeholder="结束日期"
+					value-format="YYYY-MM-DD"
+				/>
+			</div>
 			<div class="box-content">
 				<div class="contentTop contentMiddle">
-					<div class="ctHead">
+					<div class="ctHead" @click="onEchartsSafeTab(1)">
 						<div>
 							质量重大隐患超期未整改<text>{{ overdueMajorDangerCount }}</text
 							>个，占比<text>{{ overdueMajorDangerRate }}%</text>
 						</div>
 					</div>
-					<div class="cmHead">
+					<div class="cmHead" @click="onEchartsSafeTab(2)">
 						<div>
 							安全重大隐患未销项<text>{{ majorDangerCount }}</text
 							>个，占比<text>{{ majorDangerRate }}%</text>
 						</div>
 					</div>
 					<div class="ctContent" style="position: relative">
-						<div id="echartsSafe" style="width: 100%; height: 100%;"></div>
+						<div id="echartsSafe" style="width: 100%; height: 100%"></div>
 						<div class="safetext1" v-if="dataList.length != 0">状态统计（较昨日）</div>
 						<div class="safetext2" v-if="dataList.length != 0">风险统计（较昨日）</div>
 						<div class="notoDta" v-if="dataList.length == 0">
@ -46,10 +46,7 @@ import Card from "@/components/card.vue";
 import { onMounted, ref, watch } from "vue";
 import { GlobalStore } from "@/stores";
 import * as echarts from "echarts";
-import {
-	getCountDangerLevelApi,
-	getInspectionSelectQualityApi
-} from "@/api/modules/projectOverview";
+import { getCountDangerLevelApi, getInspectionSelectQualityApi } from "@/api/modules/projectOverview";
 const store = GlobalStore();
 const dateRange = ref([] as any);
 const echartsTest = ref();
@ -59,6 +56,30 @@ const overdueMajorDangerCount = ref(0 as any);
 const overdueMajorDangerRate = ref(0 as any);
 const questionTotal = ref(0 as any);
 const classColorList = ref(["#EC6266", "#6375C7", "#038cf5", "#01d6f4"]);
+const emits = defineEmits(["openDialog"]);
+const onEchartsSafeTab = (type: number) => {
+	const resultInfo = {
+		index: 7,
+		title: "超期未整改",
+		majorInfo: {
+			isOverdueRectification: 1,
+			isNotQualified: 0,
+			inspectStartTime: dateRange.value[0],
+			inspectEndTime: dateRange.value[1]
+		}
+	};
+	if (type == 1) {
+		resultInfo.title = "超期未整改";
+		resultInfo.majorInfo.isOverdueRectification = 1;
+		resultInfo.majorInfo.isNotQualified = 0;
+		emits("openDialog", resultInfo);
+	} else if (type == 2) {
+		resultInfo.title = "未销项";
+		resultInfo.majorInfo.isOverdueRectification = 0;
+		resultInfo.majorInfo.isNotQualified = 1;
+		emits("openDialog", resultInfo);
+	}
+};
 let dataList = ref([
 	{
 		enumType: "",
@ -266,13 +287,13 @@ const Pie = () => {
 		}
 	}
 	return dataArr;
-}
+};
 const drawEchart = () => {
 	echartsTest.value = echarts.init(document.getElementById("echartsSafe"));
 	let option = {
 		animation: false, // 取消动画
 		tooltip: {
-			trigger: "item",
+			trigger: "item"
 			// position: ['50%','50%']
 		},
 		title: {
@ -599,7 +620,7 @@ const drawEchart = () => {
 	// 		}
 	// 	});
 	// });
-}
+};
 watch(
 	dateRange,
 	() => {
@ -728,11 +749,11 @@ onMounted(async () => {
 	position: relative;
 }
 :deep() {
-	.el-input__wrapper{
+	.el-input__wrapper {
 		width: 80%;
 		height: 0%;
 		background: #0d2956;
-		box-shadow: 0 0 0 1px #007AFF inset;
+		box-shadow: 0 0 0 1px #007aff inset;
 	}
 	.el-range-separator {
 		color: #ccc;
--- a/src/views/overviewScreen/commandCenter/centerTop.vue
+++ b/src/views/overviewScreen/commandCenter/centerTop.vue
@ -65,7 +65,7 @@ const configWeekVideoListFn = async (showLoading: boolean) => {
 		// 星期参数
 		const today = moment().format("d");
 		const weekParamsKey = ["sun", "mon", "tues", "wed", "thur", "fri", "sat"];
-		projectData.value.videoUrl = res.result[0][weekParamsKey[+today]];
+		projectData.value.videoUrl = res.result.length > 0 && res.result[0][weekParamsKey[+today]];
 	}
 };

--- a/src/views/overviewScreen/commandCenter/index.vue
+++ b/src/views/overviewScreen/commandCenter/index.vue
@ -2,11 +2,17 @@
 <template>
 	<div class="projectContent">
 		<div class="left">
-			<div class="line1" style="display: flex">
+			<div class="finish-restTime">
+				距离完工还有
+				<span v-if="!projectSurplusDayNum" class="dayImg">0</span>
+				<span v-else class="dayImg" v-for="item in projectSurplusDayNum" :key="item">{{ item }}</span>
+				<span style="margin-left: 4%">天</span>
+			</div>
+			<!-- <div class="line1" style="display: flex">
 				<span style="margin-left: 15px">距离完工还有</span>
 				<div class="numberCard" v-for="(item, i) in projectSurplusDayNum" :key="i">{{ item }}</div>
 				<span style="margin-left: 5px">天</span>
-			</div>
+			</div> -->
 			<!-- @openDialog="openPeopleCountDialog" -->
 			<leftTop class="leftTop"></leftTop>
 			<leftBottom class="leftBottom"></leftBottom>
@ -180,6 +186,27 @@ onMounted(() => {
 });
 </script>
 <style lang="scss" scoped>
+.finish-restTime {
+	width: 100%;
+	position: absolute;
+	left: 0.8%;
+	top: -6.4%;
+	color: #fff;
+	line-height: 32px;
+	font-size: 16px;
+	.dayImg {
+		margin-left: 2%;
+		font-size: 26px;
+		display: inline-block;
+		width: 29px;
+		height: 32px;
+		font-family: sadigitalNumber;
+		background: url("@/assets/images/comprehensiveManage/project1.png") no-repeat;
+		background-size: 100% 100%;
+		text-align: center;
+		color: #4ac0f3;
+	}
+}
 .line1 {
 	color: #fff;
 	padding-top: 5px;
--- a/src/views/overviewScreen/commandCenter/leftBottom.vue
+++ b/src/views/overviewScreen/commandCenter/leftBottom.vue
@ -5,7 +5,8 @@ s
 			<div class="hLeft"><span></span></div>
 		</div> -->
 		<div class="content">
-			<Card title="审批数据汇总(近七日)">
+			<Card title="审批数据汇总">
+				<div class="diy-title">（近七日）</div>
 				<div class="barContent" v-if="!drawInfo.isFlag">
 					<div id="bar" style="width: 100%; height: 100%" ref="bar"></div>
 				</div>
@ -368,7 +369,7 @@ function drawBar2() {
 				top: "20%",
 				// bottom: "12%",
 				align: "left",
-				itemGap: 10,
+				itemGap: 12,
 				itemWidth: 30, // 设置宽度
 				itemHeight: 9, // 设置高度
 				symbolKeepAspect: false,
@ -771,6 +772,15 @@ onMounted(async () => {
 	margin-top: 1%;
 	overflow: hidden;
 }
+.diy-title {
+		position: absolute;
+		top: 3.5%;
+		left: 34%;
+		font-family: OPPOSansH;
+		font-size: 14px;
+		color: #6b7b99;
+		letter-spacing: 2px; /* 设置文字间距为2像素 */
+	}
 .leftBottom {
 	// background: url("@/assets/images/commandScreen/card-left-bottom.png") no-repeat;
 	// background-size: 100% 100%;
--- a/src/views/overviewScreen/commandCenter/rightAll.vue
+++ b/src/views/overviewScreen/commandCenter/rightAll.vue
@ -41,39 +41,41 @@
 		</div>
 		<div class="enterprise-box">
 			<Card title="各企业本周数据统计">
-				<el-carousel style="width: 100%; height: 100%">
-					<el-carousel-item v-for="item in 4" :key="item" style="width: 100%; height: 100%">
+				<el-carousel @change="onChange" style="width: 100%; height: 100%">
+					<el-carousel-item v-for="item in enterpriseInfo.dataList" :key="item.enterpriseId" style="width: 100%; height: 100%">
 						<div class="enterprise-info">
-							<div>辽宁五寰科技有限公司{{ item }}</div>
+							<div>{{ item.enterpriseName }}</div>
 							<div class="line1" style="display: flex">
 								<span style="margin-left: 15px">事故报警总数</span>
-								<div class="numberCard" v-for="(ele, i) in '204'" :key="i">{{ ele }}</div>
+								<div class="numberCard" v-for="(ele, i) in `${enterpriseInfo.dataInfo.emergencyNum}`" :key="i">
+									{{ ele }}
+								</div>
 							</div>
 						</div>
 						<div class="enterprise-list">
 							<div class="enterprise-title">
-								<div>入场人员总数</div>
-								<div>55</div>
+								<div>在场人员总数</div>
+								<div>{{ enterpriseInfo.dataInfo.highWorkerNumThisWeek }}/{{ enterpriseInfo.dataInfo.inServiceNum }}</div>
 							</div>
 							<div class="enterprise-title">
 								<div>企业安全分</div>
-								<div>55</div>
+								<div>{{ enterpriseInfo.dataInfo.safeScore }}</div>
 							</div>
 							<div class="enterprise-title">
 								<div>安全隐患总数</div>
-								<div>55</div>
+								<div>{{ enterpriseInfo.dataInfo.securityNum }}</div>
 							</div>
 							<div class="enterprise-title">
 								<div>质量隐患总数</div>
-								<div>55</div>
+								<div>{{ enterpriseInfo.dataInfo.qualityNum }}</div>
 							</div>
 							<div class="enterprise-title">
 								<div>特殊作业数量</div>
-								<div>55</div>
+								<div>{{ enterpriseInfo.dataInfo.specialNum }}</div>
 							</div>
 							<div class="enterprise-title">
 								<div>培训未通过率</div>
-								<div>56%</div>
+								<div>{{ enterpriseInfo.dataInfo.trainNotPassRadio }}%</div>
 							</div>
 						</div>
 					</el-carousel-item>
@ -91,9 +93,10 @@
 <script setup lang="ts">
 // import { Vue3SeamlessScroll } from "vue3-seamless-scroll";
 import Card from "@/components/card.vue";
-import { onMounted, ref, watch } from "vue";
+import { onMounted, ref, watch, reactive } from "vue";
 import { GlobalStore } from "@/stores";
 import { getCountDangerLevelApi, getInspectionSelectQualityApi } from "@/api/modules/projectOverview";
+import { getEnterpriseInfoListApi, getStatsEnterpriseWeekApi, getCountWorkerNumByRegionApi } from "@/api/modules/agjtOverviewApi";

 import * as echarts from "echarts";
 const store = GlobalStore();
@ -637,7 +640,10 @@ const qualityInfo = async (showLoading: boolean) => {

 	// drawEchart2();
 };
-
+const workerRegionInfo = reactive({
+	workerRegionList: [] as any[],
+	dateList: []
+});
 function getManAnalysisEchart() {
 	const echartsTest = echarts.init(document.getElementById("eacherManAnalysis") as any);
 	let option = {
@ -656,7 +662,7 @@ function getManAnalysisEchart() {
 			itemWidth: 10,
 			itemHeight: 10,
 			icon: "roundRect",
-			data: ["一号区域", "二号区域", "三号区域", "四号区域"]
+			data: workerRegionInfo.workerRegionList.map((item: any) => item.regionName)
 		},
 		// color: ["#2BA5FF", "#F97766", "#1EF1FF", "#1EF1FF"],
 		grid: {
@ -669,7 +675,7 @@ function getManAnalysisEchart() {
 		xAxis: {
 			type: "category",
 			boundaryGap: false,
-			data: ["1", "5", "10", "15", "20", "25"],
+			data: workerRegionInfo.dateList.map((item: any) => item.date),
 			axisLabel: {
 				color: "#fff"
 			},
@ -732,86 +738,111 @@ function getManAnalysisEchart() {
 		// 		// top: "top",
 		// 	}
 		// ],
-		series: [
-			{
-				name: "一号区域",
+		series: workerRegionInfo.workerRegionList.map((item: any) => {
+			const color1 = Math.floor(Math.random() * 256);
+			const color2 = Math.floor(Math.random() * 256);
+			const color3 = Math.floor(Math.random() * 256);
+			return {
+				name: item.regionName,
 				type: "line",
 				// stack: "Total",
 				lineStyle: {
-					color: "rgba(43, 165, 255, 1) ",
+					color: `rgba(${color1}, ${color2}, ${color3}, 1)`,
 					shadowBlur: 12,
-					shadowColor: "rgba(43, 165, 255, 0.9)",
+					shadowColor: `rgba(${color1}, ${color2}, ${color3}, 0.9)`,
 					shadowOffsetX: 1,
 					shadowOffsetY: 1
 				},
 				itemStyle: {
-					color: "rgba(43, 165, 255, 1) ",
+					color: `rgba(${color1}, ${color2}, ${color3}, 1)`,
 					borderWidth: 1,
 					borderColor: "#FFF"
 				},
 				smooth: true,
 				symbol: "none",
-				data: [12, 8, 15, 20, 32, 20]
-			},
-			{
-				name: "二号区域",
-				type: "line",
-				lineStyle: {
-					color: "rgba(249, 119, 102, 1) ",
-					shadowBlur: 12,
-					shadowColor: "rgba(249, 119, 102, 0.9)",
-					shadowOffsetX: 1,
-					shadowOffsetY: 1
-				},
-				itemStyle: {
-					color: "rgba(249, 119, 102, 1) ",
-					borderWidth: 1,
-					borderColor: "#FFF"
-				},
-				smooth: true,
-				symbol: "none",
-				data: [12, 3, 4, 5, 6, 10]
-			},
-			{
-				name: "三号区域",
-				type: "line",
-				lineStyle: {
-					color: "rgba(30, 241, 255, 1) ",
-					shadowBlur: 12,
-					shadowColor: "rgba(30, 241, 255, 0.9)",
-					shadowOffsetX: 1,
-					shadowOffsetY: 1
-				},
-				itemStyle: {
-					color: "rgba(30, 241, 255, 1) ",
-					borderWidth: 1,
-					borderColor: "#FFF"
-				},
-				smooth: true,
-				symbol: "none",
-				data: [20, 30, 14, 15, 26, 1]
-			},
-			{
-				name: "四号区域",
-				type: "line",
-				// stack: "Total",
-				lineStyle: {
-					color: "rgba(255, 181, 179, 1)",
-					shadowBlur: 12,
-					shadowColor: "rgba(255, 181, 179, 0.9)",
-					shadowOffsetX: 1,
-					shadowOffsetY: 1
-				},
-				itemStyle: {
-					color: "rgba(255, 181, 179, 1) ",
-					borderWidth: 1,
-					borderColor: "#FFF"
-				},
-				smooth: true,
-				symbol: "none",
-				data: [10, 82, 52, 10, 42, 20]
-			}
-		]
+				data: item.list
+			};
+		})
+		// [
+		// 	{
+		// 		name: "一号区域",
+		// 		type: "line",
+		// 		// stack: "Total",
+		// 		lineStyle: {
+		// 			color: "rgba(43, 165, 255, 1) ",
+		// 			shadowBlur: 12,
+		// 			shadowColor: "rgba(43, 165, 255, 0.9)",
+		// 			shadowOffsetX: 1,
+		// 			shadowOffsetY: 1
+		// 		},
+		// 		itemStyle: {
+		// 			color: "rgba(43, 165, 255, 1) ",
+		// 			borderWidth: 1,
+		// 			borderColor: "#FFF"
+		// 		},
+		// 		smooth: true,
+		// 		symbol: "none",
+		// 		data: [12, 8, 15, 20, 32, 20]
+		// 	},
+		// 	{
+		// 		name: "二号区域",
+		// 		type: "line",
+		// 		lineStyle: {
+		// 			color: "rgba(249, 119, 102, 1) ",
+		// 			shadowBlur: 12,
+		// 			shadowColor: "rgba(249, 119, 102, 0.9)",
+		// 			shadowOffsetX: 1,
+		// 			shadowOffsetY: 1
+		// 		},
+		// 		itemStyle: {
+		// 			color: "rgba(249, 119, 102, 1) ",
+		// 			borderWidth: 1,
+		// 			borderColor: "#FFF"
+		// 		},
+		// 		smooth: true,
+		// 		symbol: "none",
+		// 		data: [12, 3, 4, 5, 6, 10]
+		// 	},
+		// 	{
+		// 		name: "三号区域",
+		// 		type: "line",
+		// 		lineStyle: {
+		// 			color: "rgba(30, 241, 255, 1) ",
+		// 			shadowBlur: 12,
+		// 			shadowColor: "rgba(30, 241, 255, 0.9)",
+		// 			shadowOffsetX: 1,
+		// 			shadowOffsetY: 1
+		// 		},
+		// 		itemStyle: {
+		// 			color: "rgba(30, 241, 255, 1) ",
+		// 			borderWidth: 1,
+		// 			borderColor: "#FFF"
+		// 		},
+		// 		smooth: true,
+		// 		symbol: "none",
+		// 		data: [20, 30, 14, 15, 26, 1]
+		// 	},
+		// 	{
+		// 		name: "四号区域",
+		// 		type: "line",
+		// 		// stack: "Total",
+		// 		lineStyle: {
+		// 			color: "rgba(255, 181, 179, 1)",
+		// 			shadowBlur: 12,
+		// 			shadowColor: "rgba(255, 181, 179, 0.9)",
+		// 			shadowOffsetX: 1,
+		// 			shadowOffsetY: 1
+		// 		},
+		// 		itemStyle: {
+		// 			color: "rgba(255, 181, 179, 1) ",
+		// 			borderWidth: 1,
+		// 			borderColor: "#FFF"
+		// 		},
+		// 		smooth: true,
+		// 		symbol: "none",
+		// 		data: [10, 82, 52, 10, 42, 20]
+		// 	}
+		// ]
 	};
 	echartsTest.setOption(option, true);
 	window.addEventListener("resize", () => {
@ -835,10 +866,74 @@ watch(
 	{ deep: true }
 );

+const enterpriseInfo = reactive({
+	dataList: [] as any[],
+	dataInfo: {
+		emergencyNum: 0
+	} as any
+});
+
+const onChange = (event: any) => {
+	const enterpriseId = enterpriseInfo.dataList[event].enterpriseId;
+	getStatsEnterpriseWeek(true, enterpriseId);
+};
+// 获取企业数据统计
+const getEnterpriseInfoList = async (showLoading: boolean) => {
+	const res: any = await getEnterpriseInfoListApi(
+		{
+			projectSn: store.sn,
+			enterpriseName: "",
+			enterpriseTypeId: "",
+			userEnterpriseId: ""
+		},
+		showLoading
+	);
+	enterpriseInfo.dataList = res.result;
+	const enterpriseId = res.result.length > 0 && res.result[0].enterpriseId;
+	getStatsEnterpriseWeek(false, enterpriseId);
+};
+const getStatsEnterpriseWeek = async (showLoading: boolean, enterpriseId: string) => {
+	const res: any = await getStatsEnterpriseWeekApi(
+		{
+			projectSn: store.sn,
+			enterpriseId: enterpriseId
+		},
+		showLoading
+	);
+	enterpriseInfo.dataInfo = res.result;
+};
+const getCountWorkerNumByRegion = async (showLoading: boolean) => {
+	const res: any = await getCountWorkerNumByRegionApi(
+		{
+			projectSn: store.sn
+		},
+		showLoading
+	);
+	workerRegionInfo.dateList = res.result;
+	workerRegionInfo.workerRegionList = res.result.reduce((prev: any[], item: any) => {
+		item.list.forEach((option: any) => {
+			const findIndex = prev.findIndex((ele: any) => ele.regionName == option.regionName);
+			if (findIndex > -1) {
+				prev[findIndex].list.push(option.workerNum);
+			} else {
+				prev.push({
+					regionName: option.regionName,
+					list: [option.workerNum]
+				});
+			}
+		});
+
+		return prev;
+	}, []);
+	console.log(111111111, res.result, workerRegionInfo.workerRegionList);
+	getManAnalysisEchart();
+};
+
 const setIntervalFn = (showLoading: boolean) => {
 	getSafeInfo(showLoading);
 	qualityInfo(showLoading);
-	getManAnalysisEchart();
+	getEnterpriseInfoList(showLoading);
+	getCountWorkerNumByRegion(showLoading);
 };

 onMounted(async () => {
@ -854,41 +949,50 @@ onMounted(async () => {
 	height: 32%;
 	margin-top: 1%;
 }
+
 .enterprise-box {
 	height: 28%;
 	margin-top: 1%;
+
 	:deep(.h-card .content) {
 		padding: 6px 10px;
 		height: 78%;
 		margin-top: 1%;
 	}
+
 	.enterprise-info {
 		display: flex;
 		margin: 0 18px;
 		justify-content: space-between;
 		align-items: center;
+
 		> div:first-child {
 			font-size: 16px;
 			color: #ffffff;
 		}
 	}
+
 	.enterprise-list {
 		display: grid;
 		grid-template-columns: 33% 33% 33%;
 		margin: 4px 8px 10px 8px;
+
 		.enterprise-title {
 			margin-left: 10px;
 			margin-top: 10px;
 		}
+
 		.enterprise-title {
 			height: 50.95px;
 			background: url("@/assets/images/overviewScreen/card-icon.png") no-repeat;
 			background-size: 100% 100%;
 			padding: 4px 16px;
+
 			> div:first-child {
 				font-size: 16px;
 				color: #ffffff;
 			}
+
 			> div:last-child {
 				font-size: 24px;
 				color: #65d7f9;
@ -899,12 +1003,14 @@ onMounted(async () => {

 .card-content {
 	height: 40%;
+
 	.hRight {
 		width: 50%;
 		position: absolute;
 		top: 1%;
 		right: 0;
 	}
+
 	.contentTop {
 		width: 100%;
 		height: 100% !important;
@ -981,29 +1087,35 @@ onMounted(async () => {
 		background-size: 100% 100%;
 	}
 }
+
 :deep(.h-card .content) {
 	margin-top: 1%;
 }
+
 .safetext1 {
 	position: absolute;
 	top: 8%;
 	color: white;
 	left: 42%;
 }
+
 .safetext2 {
 	position: absolute;
 	top: 8%;
 	color: white;
 	right: 3%;
 }
+
 :deep(.el-carousel__container) {
 	height: 100%;
 }
+
 :deep() {
 	.el-carousel__indicators li {
 		padding-top: 6px;
 		padding-bottom: 2px;
 	}
+
 	.el-carousel__indicator--horizontal .el-carousel__button {
 		width: 10px;
 		height: 10px;
@ -1012,6 +1124,7 @@ onMounted(async () => {
 		border-radius: 50%;
 		opacity: 0.3;
 	}
+
 	.el-carousel__indicator--horizontal.is-active .el-carousel__button {
 		width: 10px;
 		height: 10px;
@ -1034,6 +1147,7 @@ onMounted(async () => {
 	width: 100%;
 	height: 100%;
 }
+
 .notoDta {
 	top: 25%;
 	width: 50%;
@ -1054,6 +1168,7 @@ onMounted(async () => {
 		margin: -6% 30%;
 	}
 }
+
 :deep(.el-input__inner) {
 	color: #fff;
 }