From c65093d484278445af1ab31946b8a74758068234 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Sun, 28 Apr 2024 16:48:53 +0800
Subject: [PATCH] =?UTF-8?q?dev:=E6=8C=87=E6=8C=A5=E9=83=A8=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commandCenter/leftBottom.vue              | 10 ++--
 .../commandScreen/commandCenter/leftTop.vue   | 60 ++++++-------------
 .../commandScreen/commandCenter/rightAll.vue  |  2 +-
 3 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue
index 2d5da7a..4249ffb 100644
--- a/src/views/commandScreen/commandCenter/leftBottom.vue
+++ b/src/views/commandScreen/commandCenter/leftBottom.vue
@@ -58,7 +58,7 @@ let listData = ref([
 let questionTotal = ref(0 as any);
 let dataList2 = ref([
 	{
-		value: 30,
+		value: 0,
 		show: true,
 		name: "未教育人员",
 		itemStyle: {
@@ -69,7 +69,7 @@ let dataList2 = ref([
 		}
 	},
 	{
-		value: 70,
+		value: 765,
 		show: true,
 		name: "完成人员",
 		itemStyle: {
@@ -80,7 +80,7 @@ let dataList2 = ref([
 		}
 	},
 	{
-		value: 70,
+		value: 765,
 		show: true,
 		name: "现场人员",
 		itemStyle: {
@@ -349,8 +349,8 @@ function drawEchart2() {
 // const safeData = ref(null as any);
 const qualityInfo = async () => {
 	const res: any = await selectQualityStatisticsApi({ projectSn: store.sn });
-	dataList2.value[0].value = res.result.total.rectificationNum;
-	dataList2.value[1].value = res.result.total.totalNum - res.result.total.rectificationNum;
+	// dataList2.value[0].value = res.result.total.rectificationNum;
+	// dataList2.value[1].value = res.result.total.totalNum - res.result.total.rectificationNum;
 	questionTotal.value = res.result.total.totalNum;
 	drawEchart2();
 };
diff --git a/src/views/commandScreen/commandCenter/leftTop.vue b/src/views/commandScreen/commandCenter/leftTop.vue
index ff2990e..1e1588d 100644
--- a/src/views/commandScreen/commandCenter/leftTop.vue
+++ b/src/views/commandScreen/commandCenter/leftTop.vue
@@ -23,7 +23,7 @@
 			<div class="tabList">
 				<div>排名</div>
 				<div v-if="activeIndex === '0' || activeIndex === '1'">姓名</div>
-				<div v-if="activeIndex === '2'">分组单位</div>
+				<div v-if="activeIndex === '2'">分包单位</div>
 				<div v-if="activeIndex === '0' || activeIndex === '2'">整改数量</div>
 				<div v-if="activeIndex === '1'">发起隐患处</div>
 				<div>整改率</div>
@@ -33,10 +33,12 @@
 				<el-scrollbar height="150">
 					<div v-for="(item, index) in tabList" :key="index" class="listStyle">
 						<div>{{ item.sortLine }}</div>
-						<div>{{ item.name }}</div>
-						<div>{{ item.count }}</div>
-						<div>{{ item.rate }}</div>
-						<div>{{ item.immediateRate }}</div>
+						<div v-if="activeIndex === '0' || activeIndex === '1'">{{ item.name }}</div>
+						<div v-if="activeIndex === '2'">{{item.company}}</div>
+						<div v-if="activeIndex === '0' || activeIndex === '2'">{{item.count}}</div>
+						<div v-if="activeIndex === '1'">{{item.count}}</div>
+						<div>{{item.immediateRate}}</div>
+						<div>{{item.immediateRate}}</div>
 					</div>
 				</el-scrollbar>
 				<div class="notoDta" v-if="tabList.length == 0">
@@ -61,7 +63,7 @@
 						<div>{{ item.name }}</div>
 						<div>{{ item.count }}</div>
 						<div>{{ item.count }}</div>
-						<div>{{ item.sortLine }}</div>
+						<div>{{ 0 }}</div>
 						<div>{{ item.rate }}</div>
 						<div>{{ item.immediateRate }}</div>
 					</div>
@@ -93,41 +95,17 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
 	console.log("activeIndex", activeIndex.value);
 };
 const tabList = [
-	{ sortLine: "1", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "2", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "3", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "4", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
-	{ sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" },
+	{ sortLine: "1", name: "谢明泉", count: "2", rate: "100%", immediateRate: "100%",company:'分包单位' },
+	{ sortLine: "2", name: "王福明", count: "2", rate: "100%", immediateRate: "100%",company:'分包单位' },
+	{ sortLine: "3", name: "张启程", count: "2", rate: "100%", immediateRate: "100%",company:'分包单位' },
+	{ sortLine: "4", name: "李渊海", count: "2", rate: "100%", immediateRate: "100%",company:'分包单位' },
+	{ sortLine: "5", name: "黄明昌", count: "1", rate: "100%", immediateRate: "100%",company:'分包单位' },
+	{ sortLine: "6", name: "叶文远", count: "2", rate: "100%", immediateRate: "100%",company:'分包单位' },
+	{ sortLine: "7", name: "丁明昌", count: "1", rate: "100%", immediateRate: "100%",company:'分包单位' },
+	{ sortLine: "8", name: "黄石明", count: "1", rate: "100%", immediateRate: "100%",company:'分包单位' },
+	{ sortLine: "9", name: "肖明远", count: "1", rate: "100%", immediateRate: "100%",company:'分包单位' },
+	{ sortLine: "10", name: "张冠名", count: "1", rate: "100%", immediateRate: "100%",company:'分包单位' },
+	{ sortLine: "11", name: "石慧生", count: "1", rate: "100%", immediateRate: "100%",company:'分包单位' },
 ];
 onMounted(async () => {});
 </script>
diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue
index 320beb9..a3eb560 100644
--- a/src/views/commandScreen/commandCenter/rightAll.vue
+++ b/src/views/commandScreen/commandCenter/rightAll.vue
@@ -410,7 +410,7 @@ function drawEchart2() {
 		title: {
 			text: questionTotal.value,
 			// text: '100%',
-			subtext: "入场三级教育\n完成率",
+			subtext: "超期未整改数",
 			x: "24%",
 			y: "center",
 			textAlign: "center",