From bc65cf2aa30fa7a6b8c9c35165eead86eea7ee47 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Mon, 3 Jun 2024 14:55:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 src/api/modules/projectOverview.ts            |  27 +-
 .../commandScreen/commandCenter/rightAll.vue  | 797 +++++++++++-------
 3 files changed, 504 insertions(+), 324 deletions(-)

diff --git a/.env.development b/.env.development
index a2acb68..108c49d 100644
--- a/.env.development
+++ b/.env.development
@@ -4,8 +4,8 @@ NODE_ENV = 'development'
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
 # VITE_API_URL = 'http://192.168.34.221:19111'
-# 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: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'
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
diff --git a/src/api/modules/projectOverview.ts b/src/api/modules/projectOverview.ts
index 3c97f76..1dcb944 100644
--- a/src/api/modules/projectOverview.ts
+++ b/src/api/modules/projectOverview.ts
@@ -8,13 +8,15 @@ export const getProjectDetail = (params: {}) => {
 };
 
 // 统计企业下项目各人员统计
-export const getWorkerStatisticsCountApi = (params: {},) => {
+export const getWorkerStatisticsCountApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/workerInfo/getWorkerStatisticsCount`, params, { headers: { noLoading: true } });
 };
 
 // 安全管理
 export const getProjectInspectRecordCountApi = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/hiddenDangerInspectRecord/getProjectInspectRecordCount`, params, { headers: { noLoading: true } });
+	return http.post(BASEURL + `/xmgl/hiddenDangerInspectRecord/getProjectInspectRecordCount`, params, {
+		headers: { noLoading: true }
+	});
 };
 
 // 质量管理
@@ -52,7 +54,6 @@ export const getParentChildTaskListApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/taskProgress/getParentChildList`, params);
 };
 
-
 // 隐患统计智能分析
 export const getSelectQualityStatisticsNumApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/selectQualityStatisticsNum`, params);
@@ -86,9 +87,25 @@ export const getXzSecurityQualitylnspectionRecordSuperviseApi = (params: {}) =>
 	return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/supervise`, params);
 };
 
-
-
 // 隐患智能分析
 export const getNoticeListApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/notice/list`, params);
 };
+
+// 安全问题统计数据|列表
+export const getInspectionSelectQualityApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/selectQualityStatisticsNum`, params);
+};
+export const getInspectionSelectQualityListApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/selectQualityStatisticsNumList`, params);
+};
+
+// 风险走势图
+export const getInspectionRiskChartApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/riskChart`, params);
+};
+
+// 特殊作业
+export const getSpecialCountAllSpecialApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/xzSpecial/countAllSpecial`, params);
+};
diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue
index 526e2c5..21e78e9 100644
--- a/src/views/commandScreen/commandCenter/rightAll.vue
+++ b/src/views/commandScreen/commandCenter/rightAll.vue
@@ -4,24 +4,35 @@
 		<div class="header">
 			<div class="hLeft">隐患统计智能分析</div>
 			<div class="hRight">
-				<el-date-picker style="width: 85%" v-model="dateRange" type="daterange" range-separator="至"
-					start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" />
+				<el-date-picker
+					style="width: 85%"
+					v-model="dateRange"
+					type="daterange"
+					range-separator="至"
+					start-placeholder="开始日期"
+					end-placeholder="结束日期"
+					value-format="YYYY-MM-DD"
+				/>
 			</div>
 		</div>
 		<div class="content">
 			<div class="contentTop contentMiddle" style="height: 24%">
 				<div class="ctHead" @click="onEchartsSafeTab(1)">
 					<div>
-						重大隐患超期未整改<text>{{ overdueMajorDangerCount }}</text>个，占比<text>{{ overdueMajorDangerRate }}%</text>
+						重大隐患超期未整改<text>{{ overdueMajorDangerCount }}</text
+						>个，占比<text>{{ overdueMajorDangerRate }}%</text>
 					</div>
 				</div>
 				<div class="cmHead" @click="onEchartsSafeTab(2)">
 					<div>
-						重大隐患未销项<text>{{ majorDangerCount }}</text>个，占比<text>{{ majorDangerRate }}%</text>
+						重大隐患未销项<text>{{ majorDangerCount }}</text
+						>个，占比<text>{{ majorDangerRate }}%</text>
 					</div>
 				</div>
-				<div class="ctContent">
+				<div class="ctContent" style="position: relative">
 					<div id="echartsSafe" style="width: 100%; height: 100%"></div>
+					<div class="safetext1">状态统计（较昨日）</div>
+					<div class="safetext2">风险统计（较昨日）</div>
 					<div class="notoDta" v-if="dataList.length == 0">
 						<img src="@/assets/images/noData.png" alt="" />
 						<p>暂无数据</p>
@@ -29,7 +40,7 @@
 				</div>
 			</div>
 
-		<!-- <div class="contentMiddle">
+			<!-- <div class="contentMiddle">
 				<div class="cmHead">
 					<div>
 						重大隐患未销项<text>{{ majorDangerCount }}</text
@@ -43,11 +54,11 @@
 						<p>暂无数据</p>
 					</div>
 				</div>
-					</div> -->
-			<div class="contentTop contentMiddle" style="height: 23%">
+						</div> -->
+			<div class="contentTop contentMiddle" style="height: 23%; margin-top: 4px">
 				<leftBottom @openDialog="openDialogData"></leftBottom>
 			</div>
-			<div class="contentTop contentBottom" style="height: 20.5%">
+			<div class="contentTop contentBottom" style="height: 20.5%; margin-top: 10px">
 				<div class="cbHeader">
 					<div class="cbHeaderInfo">
 						<div class="cubeIcon"></div>
@@ -58,7 +69,7 @@
 					</div>
 					<div class="cbHeaderLine"></div>
 				</div>
-				<div class="ctContent" style="margin-top: 1%">
+				<div class="ctContent cbContent" style="margin-top: 1%; height: 78%">
 					<div id="eacherRisk" style="width: 100%; height: 100%"></div>
 					<div class="notoDta" v-if="dataList.length == 0">
 						<img src="@/assets/images/noData.png" alt="" />
@@ -66,7 +77,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="contentTop contentBottom">
+			<div class="contentTop contentBottom" style="margin-top: 4px">
 				<div class="cbHeader">
 					<div class="cbHeaderInfo">
 						<div class="cubeIcon"></div>
@@ -77,7 +88,7 @@
 					</div>
 					<div class="cbHeaderLine"></div>
 				</div>
-				<div class="ctContent" style="margin-top: 1%">
+				<div class="ctContent" style="margin-top: 1%; height: 73%">
 					<div id="eacherSpecial" style="width: 100%; height: 100%"></div>
 					<div class="notoDta" v-if="dataList.length == 0">
 						<img src="@/assets/images/noData.png" alt="" />
@@ -85,7 +96,7 @@
 					</div>
 				</div>
 			</div>
-		<!-- <div class="contentBottom">
+			<!-- <div class="contentBottom">
 			<div class="cbHeader">
 					<div class="cbHeaderInfo">
 						<div class="cubeIcon"></div>
@@ -145,26 +156,30 @@
 						</vue3-seamless-scroll>
 					</div>
 				</div>
-					</div> -->
+						</div> -->
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
-import { Vue3SeamlessScroll } from "vue3-seamless-scroll";
-import Card from "@/components/card.vue";
+// import { Vue3SeamlessScroll } from "vue3-seamless-scroll";
+// import Card from "@/components/card.vue";
 import { onMounted, ref, watch } from "vue";
 import { GlobalStore } from "@/stores";
 import leftBottom from "@/views/commandScreen/components/leftBottom.vue";
-const store = GlobalStore();
 import {
-	getProjectInspectRecordCountApi,
+	// getProjectInspectRecordCountApi,
+	// selectQualityStatisticsApi
 	getSelectQualityStatisticsNumApi,
 	getCountDangerLevelApi,
-	getNoticeListApi
+	getNoticeListApi,
+	getInspectionSelectQualityApi,
+	getInspectionRiskChartApi,
+	getSpecialCountAllSpecialApi
 } from "@/api/modules/projectOverview";
-import { selectQualityStatisticsApi } from "@/api/modules/projectOverview";
+
 import * as echarts from "echarts";
+const store = GlobalStore();
 const echartsTest = ref();
 let questionTotal = ref(0 as any);
 
@@ -203,6 +218,10 @@ let dataList = ref([
 		value: 30,
 		show: true,
 		name: "重大隐患",
+		greatFaultLevelNumJzrRate: "",
+		rectificationNum: "",
+		rectificationNumJzrRate: "",
+		rectificationName: "",
 		itemStyle: {
 			normal: {
 				color: "#EC6266",
@@ -215,6 +234,10 @@ let dataList = ref([
 		value: 70,
 		show: true,
 		name: "一般隐患",
+		greatFaultLevelNumJzrRate: "",
+		rectificationNum: "",
+		rectificationNumJzrRate: "",
+		rectificationName: "",
 		itemStyle: {
 			normal: {
 				color: "#6375C7",
@@ -291,7 +314,7 @@ function drawEchart() {
 		},
 		title: {
 			text: questionTotal.value,
-			subtext: "超期未整改数",
+			subtext: "累计隐患总数",
 			x: "17%",
 			y: "center",
 			textAlign: "center",
@@ -319,7 +342,7 @@ function drawEchart() {
 				right: "0%",
 				top: "20%",
 				align: "left",
-				itemGap: 20,
+				itemGap: 14,
 				itemWidth: 8, // 设置宽度
 				itemHeight: 7, // 设置高度
 				symbolKeepAspect: false,
@@ -336,11 +359,26 @@ function drawEchart() {
 							align: "left",
 							fontSize: 14,
 							color: "#FFFFFF"
+						},
+						color1: {
+							align: "left",
+							fontSize: 14,
+							color: "#0063C4"
+						},
+						color2: {
+							align: "left",
+							fontSize: 14,
+							color: "#D81E06"
+						},
+						value1: {
+							align: "left",
+							fontSize: 12,
+							color: "#FFFFFF"
 						}
 					}
 				},
-				data: dataList.value.map(item => {
-					if (item.show) {
+				data: dataList.value.map((item, index) => {
+					if (item.show && index != 4) {
 						return item.name;
 					}
 				}),
@@ -348,9 +386,12 @@ function drawEchart() {
 					if (dataList.value && dataList.value.length) {
 						for (let i = 0; i < dataList.value.length; i++) {
 							if (data === dataList.value[i].name) {
+								if (data == "无") return;
 								let value = dataList.value[i].value;
-								let percentage = value + "%";
-								return "{name| " + data + "}  {gap|       }" + "{value|" + value + " " + "}";
+								let percentage = dataList.value[i].greatFaultLevelNumJzrRate + "%";
+								const greatFaultLevelNumJzrRate = Number(dataList.value[i].greatFaultLevelNumJzrRate);
+								const templateString = greatFaultLevelNumJzrRate > 0 ? `color1|↑` : "color2|↓";
+								return "{name| " + data + "}  {gap|    }" + `{value|${value}} {${templateString}} {value1|${percentage}}`;
 							}
 						}
 					}
@@ -362,10 +403,10 @@ function drawEchart() {
 				icon: "none",
 				type: "plain",
 				orient: "vertical",
-				left: "33%",
+				left: "31%",
 				top: "20%",
 				align: "left",
-				itemGap: 20,
+				itemGap: 12,
 				itemWidth: 8, // 设置宽度
 				itemHeight: 7, // 设置高度
 				symbolKeepAspect: false,
@@ -409,11 +450,15 @@ function drawEchart() {
 					if (dataList.value && dataList.value.length) {
 						for (let i = 0; i < dataList.value.length; i++) {
 							if (data === dataList.value[i].name) {
-								let value = dataList.value[i].value;
-								let percentage = value + "%";
-								const templateString = `↑`;
+								let value = dataList.value[i].rectificationNum;
+								let rectificationName = dataList.value[i].rectificationName;
+								const rectificationNumJzrRate = Number(dataList.value[i].rectificationNumJzrRate);
+								let percentage = rectificationNumJzrRate.toFixed(2) + "%";
+								const templateString = rectificationNumJzrRate > 0 ? `color1|↑` : "color2|↓";
 								// ↓
-								return "{name| " + data + "}  {gap|       }" + `{value|${value}} {color1|${templateString}} {value1|${value}}`;
+								return (
+									"{name| " + rectificationName + "}  {gap|    }" + `{value|${value}} {${templateString}} {value1|${percentage}}`
+								);
 							}
 						}
 					}
@@ -589,6 +634,7 @@ function drawEchart() {
 	// });
 }
 
+const riskList = ref([]);
 // 风险走势图
 function getRiskEchart() {
 	console.log("我是风险走势图11");
@@ -608,16 +654,16 @@ function getRiskEchart() {
 		},
 		color: ["#FF3232", "#FF9901", "#FFE500", "#3A3AE7"],
 		grid: {
-			left: "3%",
+			left: "6%",
 			right: "6%",
+			top: "19%",
 			bottom: "0%",
-			top: "18%",
 			containLabel: true
 		},
 		xAxis: {
 			type: "category",
 			boundaryGap: false,
-			data: ["2024-01", "2024-02", "2024-03", "2024-04", "2024-05", "2024-06"],
+			data: riskList.value.map((item: any) => item.yearMonth),
 			axisLabel: {
 				color: "#fff"
 			},
@@ -655,6 +701,31 @@ function getRiskEchart() {
 			}
 			// type: 'value'
 		},
+		dataZoom: [
+			{
+				id: "dataZoomX",
+				type: "inside",
+				xAxisIndex: [0],
+				brushSelect: false,
+				zoomOnMouseWheel: false,
+				moveOnMouseWheel: true, // 开启滚轮平移
+				moveOnMouseMove: true, // 鼠标移动能触发数据窗口平移
+				preventDefaultMouseMove: false,
+				// start:100,
+				startValue: riskList.value.length - 1,
+				endValue: riskList.value.length - 6,
+				// 滚动条高度
+				width: 8,
+				// 滚动条显示位置
+				// height: "80%",
+				// 距离右边
+				right: 3,
+				// 控制手柄的尺寸
+				handleSize: 0,
+				filterMode: "empty"
+				// top: "top",
+			}
+		],
 		series: [
 			{
 				name: "重大风险",
@@ -662,7 +733,7 @@ function getRiskEchart() {
 				stack: "Total",
 				smooth: true,
 				symbol: "none",
-				data: [120, 132, 101, 134, 90, 230, 210]
+				data: riskList.value.map((item: any) => item.greatFaultLevelNum)
 			},
 			{
 				name: "较大风险",
@@ -670,7 +741,7 @@ function getRiskEchart() {
 				stack: "Total",
 				smooth: true,
 				symbol: "none",
-				data: [220, 182, 191, 234, 290, 330, 310]
+				data: riskList.value.map((item: any) => item.largerRiskNum)
 			},
 			{
 				name: "一般风险",
@@ -678,7 +749,7 @@ function getRiskEchart() {
 				stack: "Total",
 				smooth: true,
 				symbol: "none",
-				data: [150, 232, 201, 154, 190, 330, 410]
+				data: riskList.value.map((item: any) => item.generalRiskNum)
 			},
 			{
 				name: "低风险",
@@ -686,7 +757,7 @@ function getRiskEchart() {
 				stack: "Total",
 				smooth: true,
 				symbol: "none",
-				data: [320, 332, 301, 334, 390, 330, 320]
+				data: riskList.value.map((item: any) => item.lowRiskNum)
 			}
 		]
 	};
@@ -717,36 +788,23 @@ function getRiskEchart() {
 	// 	});
 	// });
 }
-
+const specialList = ref([]);
 // 特殊作业统计图
 function getSpecialEchart() {
 	console.log("我是特殊作业统计图11");
 	const echartsTest = echarts.init(document.getElementById("eacherSpecial"));
-	const safeList = [
-		{
-			x: "2024-01",
-			y: 2
-		},
-		{
-			x: "2024-02",
-			y: 2
-		},
-		{
-			x: "2024-03",
-			y: 2
-		},
-		{
-			x: "2024-04",
-			y: 2
-		},
-		{
-			x: "2024-05",
-			y: 2
-		}
-	];
+	// const maxCount: any = specialList.value.sort((a: any, b: any) => b.totalNum - a.totalNum);
+	const safeList = specialList.value.map((item: any) => {
+		return {
+			...item,
+			x: item.date,
+			y: item.totalNum
+		};
+	});
 	let option = {
 		tooltip: {
-			trigger: "axis",
+			trigger: "item",
+			position: "inside",
 			axisPointer: {
 				// 坐标轴指示器，鼠标放上时变阴影，而不是线
 				type: "shadow" // 默认为直线，可选为：'line' | 'shadow'
@@ -755,17 +813,20 @@ function getSpecialEchart() {
 				color: "#000000"
 			},
 			backgroundColor: "#F3F3F3",
-			extraCssText: "width:60px;white-space:pre-wrap;box-shadow: 0px 4px 4px 0px rgba(0,0,0,0.25);",
+			extraCssText: "width:120px;white-space:pre-wrap;box-shadow: 0px 4px 4px 0px rgba(0,0,0,0.25);",
 			formatter: function (params: any) {
+				console.log(params);
+				const obj = safeList[params.dataIndex];
+				console.log(obj, safeList, params, params.dataIndex);
 				// 当鼠标悬停在柱子上时，显示实际数值和百分比
-				return `动火作业\n特殊作业`;
+				return `动火安全作业：${obj.xzSpecialOperationFireSafetyNum}\n盲板抽堵作业：${obj.xzBlindPlatePlugSafeNum}\n动土安全作业：${obj.xzGroundSafetNum}\n高处作业作业：${obj.xzHighJobSafeNum}\n吊装安全作业：${obj.xzHoistSafetyWorkNum}\n受限空间作业：${obj.xzLimitSpaceSafeNum}\n断路安全作业：${obj.xzOpenCircuitSafeNum}\n用电安全作业：${obj.xzTemporaryElectricitySafeNum}`;
 			}
 		},
 		grid: {
 			left: "3%",
 			right: "6%",
 			bottom: "0%",
-			top: "10%",
+			top: "3%",
 			containLabel: true
 		},
 		xAxis: {
@@ -873,18 +934,24 @@ const getSafeInfo = async () => {
 	// safeData.value = res.result;
 	// dataList.value[0].value = res.result.rectificationNum;
 	// dataList.value[1].value = res.result.totalNum - res.result.rectificationNum;
-
-	const res: any = await getCountDangerLevelApi({
+	const result: any = await getInspectionSelectQualityApi({
 		projectSn: store.sn,
-		isOverdueRectification: 1,
 		inspectStartTime: dateRange.value[0],
 		inspectEndTime: dateRange.value[1]
 	});
-	dataList.value = res.result.data.map((item: any, index: number) => {
-		return {
-			...item,
-			value: item.count,
+
+	console.log("安全统计数据", result);
+	dataList.value = [];
+	for (let index = 0; index < 5; index++) {
+		let obj = {
+			enumType: "",
+			value: 30,
 			show: true,
+			name: "重大隐患",
+			greatFaultLevelNumJzrRate: "",
+			rectificationNum: "",
+			rectificationNumJzrRate: "",
+			rectificationName: "",
 			itemStyle: {
 				normal: {
 					color: classColorList.value[index],
@@ -892,14 +959,77 @@ const getSafeInfo = async () => {
 				}
 			}
 		};
-	});
-	questionTotal.value = res.result.count;
-	console.log("饼图", res);
+		if (index == 0) {
+			obj.value = result.result.greatFaultLevelNum;
+			obj.greatFaultLevelNumJzrRate = result.result.greatFaultLevelNumJzrRate;
+			obj.rectificationNum = result.result.rectificationNum;
+			obj.rectificationNumJzrRate = result.result.rectificationNumYesterday;
+			obj.rectificationName = "未整改";
+		} else if (index == 1) {
+			obj.name = "较大隐患";
+			obj.value = result.result.largerRiskNum;
+			obj.greatFaultLevelNumJzrRate = result.result.largerRiskNumJzrRate;
+			obj.rectificationNum = result.result.reviewNum;
+			obj.rectificationNumJzrRate = result.result.reviewNumYesterday;
+			obj.rectificationName = "未复查";
+		} else if (index == 2) {
+			obj.name = "一般隐患";
+			obj.value = result.result.generalRiskNum;
+			obj.greatFaultLevelNumJzrRate = result.result.generalRiskNumJzrRate;
+			obj.rectificationNum = result.result.verificationNum;
+			obj.rectificationNumJzrRate = result.result.verificationNumJzrRate;
+			obj.rectificationName = "未核验";
+		} else if (index == 3) {
+			obj.name = "低隐患";
+			obj.value = result.result.lowRiskNum;
+			obj.greatFaultLevelNumJzrRate = result.result.lowRiskNumJzrRate;
+			obj.rectificationNum = result.result.closeNum;
+			obj.rectificationNumJzrRate = result.result.closeNumJzrRate;
+			obj.rectificationName = "合格";
+		} else if (index == 4) {
+			obj.name = "无";
+			obj.value = result.result.lowRiskNum;
+			obj.greatFaultLevelNumJzrRate = result.result.lowRiskNumJzrRate;
+			obj.rectificationNum = result.result.overdueNotCloseNum;
+			obj.rectificationNumJzrRate = result.result.overdueNotCloseNumYesterday;
+			obj.rectificationName = "超期未关闭";
+		}
 
-	const filterResult = res.result.data.find((item: any) => item.enumType == 1);
+		dataList.value.push(obj);
+	}
+	questionTotal.value = result.result.dangerNum;
+	overdueMajorDangerCount.value = result.result.overdueRectificationNum;
+	overdueMajorDangerRate.value = result.result.overdueRectificationNumRatio;
+	majorDangerCount.value = result.result.notCloseNum;
+	// majorDangerRate.value = result.result.percent;
+	console.log("1111111111111", dataList.value);
 
-	overdueMajorDangerCount.value = filterResult.count;
-	overdueMajorDangerRate.value = filterResult.percent;
+	// const res: any = await getCountDangerLevelApi({
+	// 	projectSn: store.sn,
+	// 	isOverdueRectification: 1,
+	// 	inspectStartTime: dateRange.value[0],
+	// 	inspectEndTime: dateRange.value[1]
+	// });
+	// dataList.value = res.result.data.map((item: any, index: number) => {
+	// 	return {
+	// 		...item,
+	// 		value: item.count,
+	// 		show: true,
+	// 		itemStyle: {
+	// 			normal: {
+	// 				color: classColorList.value[index],
+	// 				borderWidth: 20
+	// 			}
+	// 		}
+	// 	};
+	// });
+	// questionTotal.value = res.result.count;
+	// console.log("饼图", res);
+
+	// const filterResult = res.result.data.find((item: any) => item.enumType == 1);
+
+	// overdueMajorDangerCount.value = filterResult.count;
+	// overdueMajorDangerRate.value = filterResult.percent;
 
 	drawEchart();
 };
@@ -930,245 +1060,245 @@ let dataList2 = ref([
 	}
 ]);
 
-function drawEchart2() {
-	let echartsTest = echarts.init(document.getElementById("echarts2"));
-	let option = {
-		tooltip: {
-			trigger: "item"
-		},
-		title: {
-			text: questionTotal.value,
-			// text: '100%',
-			subtext: "隐患未销项",
-			x: "24%",
-			y: "center",
-			textAlign: "center",
-			textStyle: {
-				color: "#fff",
-				fontSize: 26,
-				fontWeight: "normal",
-				// align: "center",
-				// width: "200px",
-				fontFamily: "sadigitalNumber"
-			},
-			subtextStyle: {
-				color: "#ccc",
-				fontSize: 12,
-				fontWeight: "normal"
-				// align: "center",
-			}
-		},
-		legend: {
-			selectedMode: true, // 取消图例上的点击事件
-			icon: "rect",
-			type: "plain",
-			orient: "vertical",
-			left: "55%",
-			top: "20%",
-			align: "left",
-			itemGap: 20,
-			itemWidth: 8, // 设置宽度
-			itemHeight: 7, // 设置高度
-			symbolKeepAspect: false,
-			textStyle: {
-				color: "#000",
-				rich: {
-					name: {
-						verticalAlign: "right",
-						align: "left",
-						fontSize: 14,
-						color: "#FFFFFF"
-					},
-					value: {
-						align: "left",
-						fontSize: 14,
-						color: "#FFFFFF"
-					}
-				}
-			},
-			data: dataList2.value.map(item => {
-				if (item.show) {
-					return item.name;
-				}
-			}),
-			formatter: function (data: any) {
-				if (dataList2.value && dataList2.value.length) {
-					for (var i = 0; i < dataList2.value.length; i++) {
-						if (data === dataList2.value[i].name) {
-							var value = dataList2.value[i].value;
-							var percentage = value + "%";
-							return "{name| " + data + "}  {gap|       }" + "{value|" + value + " " + "}";
-						}
-					}
-				}
-			}
-		},
-		series: [
-			// 外侧光线
-			{
-				name: "",
-				type: "gauge",
-				center: ["25%", "55%"],
-				radius: "90%",
-				startAngle: 235,
-				endAngle: -50,
-				min: 0,
-				max: 100,
-				axisLine: {
-					show: true,
-					lineStyle: {
-						width: 2,
-						color: [
-							[
-								100 / 100,
-								new echarts.graphic.LinearGradient(0, 0, 1, 0, [
-									{
-										offset: 0,
-										color: "#526277"
-									},
-									{
-										offset: 0.25,
-										color: "rgba(4, 14, 54,0.4)"
-									},
-									{
-										offset: 0.7,
-										color: "rgba(4, 14, 54,0.4)"
-									},
-									{
-										offset: 1,
-										color: "#526277"
-									}
-								])
-							],
-							[1, "rgba(255,255,255,0)"]
-						]
-					}
-				},
+// function drawEchart2() {
+// 	let echartsTest = echarts.init(document.getElementById("echarts2"));
+// 	let option = {
+// 		tooltip: {
+// 			trigger: "item"
+// 		},
+// 		title: {
+// 			text: questionTotal.value,
+// 			// text: '100%',
+// 			subtext: "隐患未销项",
+// 			x: "24%",
+// 			y: "center",
+// 			textAlign: "center",
+// 			textStyle: {
+// 				color: "#fff",
+// 				fontSize: 26,
+// 				fontWeight: "normal",
+// 				// align: "center",
+// 				// width: "200px",
+// 				fontFamily: "sadigitalNumber"
+// 			},
+// 			subtextStyle: {
+// 				color: "#ccc",
+// 				fontSize: 12,
+// 				fontWeight: "normal"
+// 				// align: "center",
+// 			}
+// 		},
+// 		legend: {
+// 			selectedMode: true, // 取消图例上的点击事件
+// 			icon: "rect",
+// 			type: "plain",
+// 			orient: "vertical",
+// 			left: "55%",
+// 			top: "20%",
+// 			align: "left",
+// 			itemGap: 20,
+// 			itemWidth: 8, // 设置宽度
+// 			itemHeight: 7, // 设置高度
+// 			symbolKeepAspect: false,
+// 			textStyle: {
+// 				color: "#000",
+// 				rich: {
+// 					name: {
+// 						verticalAlign: "right",
+// 						align: "left",
+// 						fontSize: 14,
+// 						color: "#FFFFFF"
+// 					},
+// 					value: {
+// 						align: "left",
+// 						fontSize: 14,
+// 						color: "#FFFFFF"
+// 					}
+// 				}
+// 			},
+// 			data: dataList2.value.map(item => {
+// 				if (item.show) {
+// 					return item.name;
+// 				}
+// 			}),
+// 			formatter: function (data: any) {
+// 				if (dataList2.value && dataList2.value.length) {
+// 					for (var i = 0; i < dataList2.value.length; i++) {
+// 						if (data === dataList2.value[i].name) {
+// 							var value = dataList2.value[i].value;
+// 							var percentage = value + "%";
+// 							return "{name| " + data + "}  {gap|       }" + "{value|" + value + " " + "}";
+// 						}
+// 					}
+// 				}
+// 			}
+// 		},
+// 		series: [
+// 			// 外侧光线
+// 			{
+// 				name: "",
+// 				type: "gauge",
+// 				center: ["25%", "55%"],
+// 				radius: "90%",
+// 				startAngle: 235,
+// 				endAngle: -50,
+// 				min: 0,
+// 				max: 100,
+// 				axisLine: {
+// 					show: true,
+// 					lineStyle: {
+// 						width: 2,
+// 						color: [
+// 							[
+// 								100 / 100,
+// 								new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+// 									{
+// 										offset: 0,
+// 										color: "#526277"
+// 									},
+// 									{
+// 										offset: 0.25,
+// 										color: "rgba(4, 14, 54,0.4)"
+// 									},
+// 									{
+// 										offset: 0.7,
+// 										color: "rgba(4, 14, 54,0.4)"
+// 									},
+// 									{
+// 										offset: 1,
+// 										color: "#526277"
+// 									}
+// 								])
+// 							],
+// 							[1, "rgba(255,255,255,0)"]
+// 						]
+// 					}
+// 				},
 
-				axisTick: {
-					show: 0
-				},
-				splitLine: {
-					show: 0
-				},
-				axisLabel: {
-					show: 0
-				},
-				pointer: {
-					show: 0
-				},
-				detail: {
-					show: 0
-				}
-			},
-			{
-				name: "",
-				type: "gauge",
-				center: ["25%", "55%"],
-				radius: "80%",
-				startAngle: 245,
-				endAngle: -115,
-				min: 0,
-				max: 100,
-				axisLine: {
-					show: true,
-					lineStyle: {
-						width: 2,
-						color: [
-							[
-								200 / 100,
-								new echarts.graphic.LinearGradient(0, 0, 1, 0, [
-									{
-										offset: 0.8,
-										color: "#52bef0"
-									},
-									{
-										offset: 0.5,
-										color: "#13356b"
-									}
-								])
-							],
-							[1, "rgba(255,255,255,0)"]
-						]
-					}
-				},
+// 				axisTick: {
+// 					show: 0
+// 				},
+// 				splitLine: {
+// 					show: 0
+// 				},
+// 				axisLabel: {
+// 					show: 0
+// 				},
+// 				pointer: {
+// 					show: 0
+// 				},
+// 				detail: {
+// 					show: 0
+// 				}
+// 			},
+// 			{
+// 				name: "",
+// 				type: "gauge",
+// 				center: ["25%", "55%"],
+// 				radius: "80%",
+// 				startAngle: 245,
+// 				endAngle: -115,
+// 				min: 0,
+// 				max: 100,
+// 				axisLine: {
+// 					show: true,
+// 					lineStyle: {
+// 						width: 2,
+// 						color: [
+// 							[
+// 								200 / 100,
+// 								new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+// 									{
+// 										offset: 0.8,
+// 										color: "#52bef0"
+// 									},
+// 									{
+// 										offset: 0.5,
+// 										color: "#13356b"
+// 									}
+// 								])
+// 							],
+// 							[1, "rgba(255,255,255,0)"]
+// 						]
+// 					}
+// 				},
 
-				axisTick: {
-					show: 0
-				},
-				splitLine: {
-					show: 0
-				},
-				axisLabel: {
-					show: 0
-				},
-				pointer: {
-					show: 0
-				},
-				detail: {
-					show: 0
-				}
-			},
-			{
-				name: "",
-				type: "pie",
-				radius: [65, 75],
-				center: ["25%", "55%"],
-				hoverAnimation: true,
-				itemStyle: {
-					borderRadius: 10,
-					borderWidth: 10
-				},
-				label: {
-					show: false,
-					position: "center"
-				},
-				emphasis: {
-					label: {
-						show: false
-					}
-				},
-				labelLine: {
-					show: false
-				},
-				data: dataList2.value
-			},
-			{
-				type: "pie",
-				radius: ["57", "60"],
-				center: ["25%", "55%"],
-				label: {
-					show: false
-				},
+// 				axisTick: {
+// 					show: 0
+// 				},
+// 				splitLine: {
+// 					show: 0
+// 				},
+// 				axisLabel: {
+// 					show: 0
+// 				},
+// 				pointer: {
+// 					show: 0
+// 				},
+// 				detail: {
+// 					show: 0
+// 				}
+// 			},
+// 			{
+// 				name: "",
+// 				type: "pie",
+// 				radius: [65, 75],
+// 				center: ["25%", "55%"],
+// 				hoverAnimation: true,
+// 				itemStyle: {
+// 					borderRadius: 10,
+// 					borderWidth: 10
+// 				},
+// 				label: {
+// 					show: false,
+// 					position: "center"
+// 				},
+// 				emphasis: {
+// 					label: {
+// 						show: false
+// 					}
+// 				},
+// 				labelLine: {
+// 					show: false
+// 				},
+// 				data: dataList2.value
+// 			},
+// 			{
+// 				type: "pie",
+// 				radius: ["57", "60"],
+// 				center: ["25%", "55%"],
+// 				label: {
+// 					show: false
+// 				},
 
-				data: Pie()
-			}
-		]
-	};
-	echartsTest.setOption(option, true);
-	window.addEventListener("resize", () => {
-		echartsTest.resize();
-	});
-	//图例点击事件
-	echartsTest.on("legendselectchanged", (params: any) => {
-		console.log(emits);
-		echartsTest.setOption({
-			legend: { selected: { [params.name]: true } }
-		});
+// 				data: Pie()
+// 			}
+// 		]
+// 	};
+// 	echartsTest.setOption(option, true);
+// 	window.addEventListener("resize", () => {
+// 		echartsTest.resize();
+// 	});
+// 	//图例点击事件
+// 	echartsTest.on("legendselectchanged", (params: any) => {
+// 		console.log(emits);
+// 		echartsTest.setOption({
+// 			legend: { selected: { [params.name]: true } }
+// 		});
 
-		emits("openDialog", {
-			index: 7,
-			title: params.name + "未消项目",
-			majorInfo: {
-				isOverdueRectification: 0,
-				isNotQualified: 1,
-				enumType: dataList2.value.find(item => item.name == params.name)?.enumType,
-				inspectStartTime: dateRange.value[0],
-				inspectEndTime: dateRange.value[1]
-			}
-		});
-	});
-}
+// 		emits("openDialog", {
+// 			index: 7,
+// 			title: params.name + "未消项目",
+// 			majorInfo: {
+// 				isOverdueRectification: 0,
+// 				isNotQualified: 1,
+// 				enumType: dataList2.value.find(item => item.name == params.name)?.enumType,
+// 				inspectStartTime: dateRange.value[0],
+// 				inspectEndTime: dateRange.value[1]
+// 			}
+// 		});
+// 	});
+// }
 
 const qualityInfo = async () => {
 	// const res: any = await selectQualityStatisticsApi({ projectSn: store.sn });
@@ -1245,9 +1375,29 @@ watch(
 	{ deep: true }
 );
 
+const getInspectionRiskChart = async () => {
+	const res: any = await getInspectionRiskChartApi({
+		projectSn: store.sn,
+		type: 1
+	});
+	console.log("风险走势图", res);
+	riskList.value = res.result;
+	getRiskEchart();
+};
+
+const getCountAllSpecial = async () => {
+	const res: any = await getSpecialCountAllSpecialApi({
+		projectSn: store.sn,
+		type: 1
+	});
+	console.log("特殊作业图", res);
+	specialList.value = res.result;
+	getSpecialEchart();
+};
+
 onMounted(async () => {
-	await getRiskEchart();
-	await getSpecialEchart();
+	getInspectionRiskChart();
+	getCountAllSpecial();
 	await getSafeInfo();
 	await qualityInfo();
 	await getSelectQualityStatisticsNum();
@@ -1256,6 +1406,19 @@ onMounted(async () => {
 </script>
 
 <style lang="scss" scoped>
+.safetext1 {
+	position: absolute;
+	top: 6%;
+	color: white;
+	left: 40%;
+}
+.safetext2 {
+	position: absolute;
+	top: 6%;
+	color: white;
+	right: 3%;
+}
+
 .title-tabs {
 	width: initial !important;
 	display: flex;
@@ -1267,7 +1430,7 @@ onMounted(async () => {
 	> div {
 		padding: 2px 0;
 		font-size: 16px;
-		width: 200px;
+		width: 170px;
 		text-align: center;
 		background-color: #315296;
 		cursor: pointer;