1

src/views/commandScreen/commandCenter/centerBottom.vue

@@ -20,7 +20,7 @@
 						<p>暂无数据</p>
 					</div>
 				</div>
-				<div style="width: 50%">
+				<div style="width: 50%; position: relative">
 					<div id="eacherMessCount" style="width: 100%; height: 100%"></div>
 					<div class="notoDta" v-if="messCountType.data.length == 0">
 						<img src="@/assets/images/noData.png" alt="" />
@@ -499,12 +499,19 @@ function getMessCountEchart() {
 			}),
 			formatter: function (params: any) {
 				console.log("333333", messCountType.value.data);
-				let val = "";
+				// let val = "";
-				if (params.length > 4) {
+				// if (params.length > 4) {
-					val = params.substr(0, 5) + "...";
+				// 	val = params.substr(0, 5) + "...";
-					return val;
+				// 	return val;
-				} else {
+				// } else {
-					return params;
+				// 	return params;
+				// }
+				if (messCountType.value.data && messCountType.value.data.length) {
+					for (let i = 0; i < messCountType.value.data.length; i++) {
+						if (params === messCountType.value.data[i].name) {
+							return messCountType.value.data[i].name + "\t" + messCountType.value.data[i].count;
+						}
+					}
 				}
 			}
 		},

src/views/commandScreen/commandCenter/rightAll.vue

@@ -641,9 +641,12 @@ function getRiskEchart() {
 	const echartsTest = echarts.init(document.getElementById("eacherRisk"));
 	let option = {
 		tooltip: {
-			trigger: "axis"
+			trigger: "axis",
+			confine: true
 		},
 		legend: {
+			trigger: "item",
+			position: "inside",
 			x: "right",
 			textStyle: {
 				color: "#fff"
@@ -1448,7 +1451,7 @@ onMounted(async () => {
 }
 
 .notoDta {
-	top: 35%;
+	top: 25%;
 	width: 50%;
 	// left: 40%;
 	position: absolute;

src/views/commandScreen/dialogCompnnents/month-safe-score.vue

@@ -38,10 +38,10 @@
 								</div>
 							</div>
 							<div class="category-other" style="width: 10%">
-								<span v-if="key2 == '隐患治理排查'">25%</span>
+								<span v-if="key2 == '隐患治理排查'">35%</span>
 								<span v-else-if="key2 == '危大工程'">15%</span>
-								<span v-else-if="key2 == '风险管理'">15%</span>
+								<span v-else-if="key2 == '风险管理'">0%</span>
-								<span v-else-if="key2 == '安全教育'">25%</span>
+								<span v-else-if="key2 == '安全教育'">30%</span>
 							</div>
 							<div class="category-other" style="width: 10%">
 								<span v-if="key2 == '隐患治理排查'">{{ countData.hiddenDangerScore || 0 }}</span>
@@ -131,25 +131,28 @@ let moreScroll = ref(true as any);
 const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
 const partyMemberList = ref({} as any);
 const value = ref({
-	"隐患治理排查": {
+	隐患治理排查: {
-		"隐患整改率": {name: "隐患整改率=已整改（除了待整改和已撤回）/隐患总数（不包含排查记录）/隐患总数x100%",value: "30%"},
+		隐患整改率: { name: "隐患整改率=已整改（除了待整改和已撤回）/隐患总数（不包含排查记录）/隐患总数x100%", value: "40%" },
-		"隐患及时整改率": {name: "及时整改率=状态是已整改（除了待整改和已撤回）的未超期整改的隐患记录数/状态是已整改（除了待整改和已撤回）的隐患总数x100%",value: "30%"},
+		隐患及时整改率: {
-		"隐患闭合率": {name: "隐患闭合率=状态是合格的隐患记录/隐患总数x100%",value: "20%"},
+			name: "及时整改率=状态是已整改（除了待整改和已撤回）的未超期整改的隐患记录数/状态是已整改（除了待整改和已撤回）的隐患总数x100%",
-		"隐患自检数量": {name: "每周完成项目自检次数",value: "20%"},
+			value: "30%"
 		},
-	"危大工程": {
+		隐患闭合率: { name: "隐患闭合率=状态是合格的隐患记录/隐患总数x100%", value: "30%" },
-		"危大工程排查覆盖率": {name: "危大工程排查覆盖率=实际排查天数/应排查天数x100%(在施危大工程应每天排查)",value: "60%"},
+		隐患自检数量: { name: "每周完成项目自检次数", value: "0%" }
-		"旁站记录更新": {name: "每周至少针对在施危大工程完成旁站记录次数",value: "40%"},
 	},
-	"风险管理": {
+	危大工程: {
-		"风险排查执行率": {name: "有排查记录的风险/生成待办任务的风险x100%",value: "99%"},
+		危大工程排查覆盖率: { name: "危大工程排查覆盖率=实际排查天数/应排查天数x100%(在施危大工程应每天排查)", value: "60%" },
-		"风险辨识数量": {name: "至少识别3个风险",value: "1%"},
+		旁站记录更新: { name: "每周至少针对在施危大工程完成旁站记录次数", value: "40%" }
 	},
-	"安全教育": {
+	风险管理: {
-		"三级入场教育完成率": {name: "三级入场教育完成率=三级教育完成人数/所有在岗人数",value: "100%"}
+		风险排查执行率: { name: "有排查记录的风险/生成待办任务的风险x100%", value: "99%" },
+		风险辨识数量: { name: "至少识别3个风险", value: "1%" }
+	},
+	安全教育: {
+		三级入场教育完成率: { name: "三级入场教育完成率=三级教育完成人数/所有在岗人数", value: "100%" }
 	}
 });
-const countData = ref({} as any)
+const countData = ref({} as any);
 const projectData = ref({} as any);
 //获取项目信息
 const getProjectInfo = async () => {
@@ -194,7 +197,7 @@ const getMemberCountList = async (tip: any) => {
 };
 
 onMounted(async () => {
-	currentDate.value = moment(new Date()).format("YYYY-MM-DD")
+	currentDate.value = moment(new Date()).format("YYYY-MM-DD");
 	await getProjectInfo();
 	await getMemberCountList("search");
 	await getStatScoreFn();
@@ -337,12 +340,12 @@ onMounted(async () => {
 						align-items: center;
 						flex-direction: column;
 						justify-content: center;
-						background-color: #041E51;
+						background-color: #041e51;
 					}
 					.category-content {
 						width: 49%;
 						> div:nth-child(2n - 1) {
-							background-color: #041E51;
+							background-color: #041e51;
 						}
 						> div:nth-child(2n) {
 							background-color: #102959;
@@ -384,7 +387,7 @@ onMounted(async () => {
 						background-color: #102959;
 					}
 					> div:not(:first-child) {
-						background-color: #041E51;
+						background-color: #041e51;
 					}
 					> div:nth-child(2) {
 						width: 17%;
@@ -436,7 +439,7 @@ onMounted(async () => {
 						display: flex;
 						flex-direction: column;
 						white-space: nowrap;
-						background-color: #041E51;
+						background-color: #041e51;
 					}
 				}
 			}