From 87698ed89ce34e6e266800a7d2f4dd1c1c84e1dc Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 13 May 2024 00:53:00 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/commandScreen/commandCenter/leftBottom.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue
index 5ec62e1..223542c 100644
--- a/src/views/commandScreen/commandCenter/leftBottom.vue
+++ b/src/views/commandScreen/commandCenter/leftBottom.vue
@@ -166,7 +166,7 @@ const getMemberJobStatusFn = async () => {
 		pageSize: 5,
 		pageNo: 1
 	};
-	if (dateRange.value.length > 0) {
+	if (dateRange.value && dateRange.value.length > 0) {
 		requestData.inspectTime_begin = dateRange.value[0];
 		requestData.inspectTime_end = dateRange.value[1];
 	}
@@ -185,7 +185,7 @@ const getInspectManStatusFn = async () => {
 		pageSize: 5,
 		pageNo: 1
 	};
-	if (dateRange.value.length > 0) {
+	if (dateRange.value && dateRange.value.length > 0) {
 		requestData.inspectTime_begin = dateRange.value[0];
 		requestData.inspectTime_end = dateRange.value[1];
 	}
@@ -204,7 +204,7 @@ const getEnterpriseStatusFn = async () => {
 		pageSize: 5,
 		pageNo: 1
 	};
-	if (dateRange.value.length > 0) {
+	if (dateRange.value && dateRange.value.length > 0) {
 		requestData.inspectTime_begin = dateRange.value[0];
 		requestData.inspectTime_end = dateRange.value[1];
 	}

From 012ac4048fc5a7f861bb524bede8721f53e0ac9b Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Mon, 13 May 2024 02:00:37 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commandCenter/centerBottom.vue            | 194 +++++++++++++---
 .../commandScreen/commandCenter/centerTop.vue |  12 +-
 .../commandScreen/commandCenter/rightAll.vue  | 215 ++++++++++++++----
 3 files changed, 338 insertions(+), 83 deletions(-)

diff --git a/src/views/commandScreen/commandCenter/centerBottom.vue b/src/views/commandScreen/commandCenter/centerBottom.vue
index 573e3a3..4ca03c6 100644
--- a/src/views/commandScreen/commandCenter/centerBottom.vue
+++ b/src/views/commandScreen/commandCenter/centerBottom.vue
@@ -8,14 +8,23 @@
 			<div class="cbHeaderLine"></div>
 		</div>
 		<div class="cbContent">
-			<vue3-seamless-scroll :speed="1" :list="listData" :step="0.3" :hover="true" class="scroll">
+			<div v-if="listData.length < 10 && listData.length !== 0">
 				<div class="item" v-for="(item, index) in listData" :key="index">
 					<div class="itemHead">
-						<div class="itemHeadInner" v-if="item.type === 1">{{ item.header }}</div>
-						<div class="itemHeadInner2" v-if="item.type === 3">{{ item.header }}</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>
+							<div class="itemHeadInner3" v-if="JSON.parse(item.payload).level === 3">一般风险</div>
+							<div class="itemHeadInner4" v-if="JSON.parse(item.payload).level === 4">低风险</div>
+						</div>
+						<div v-else>
+							<!-- <div class="itemHeadInner" v-if="JSON.parse(item.payload).isSuperDanger !== undefined && JSON.parse(item.payload).isSuperDanger === true">超危工程</div> -->
+							<div class="itemHeadInner5" v-if="JSON.parse(item.payload).isSuperDanger === true">超危工程</div>
+							<div class="itemHeadInner6" v-if="JSON.parse(item.payload).isSuperDanger === false">危大工程</div>
+						</div>
 						<div class="itemContent">
-							<el-tooltip class="box-item" effect="dark" :content="item.content" placement="top-start">
-								<text style="margin-left:10px">{{ item.content }}</text>
+							<el-tooltip class="box-item" effect="dark" :content="item.msg" placement="top-start">
+								<text style="margin-left:10px">{{ item.msg }}</text>
 							</el-tooltip>
 						</div>
 					</div>
@@ -25,15 +34,55 @@
 						</el-tooltip>
 					</div> -->
 					<div class="itemTime">
-						<text class="timeInfo">{{ item.startTime + '-' + item.endTime }}</text>
+						<text class="timeInfo">{{ JSON.parse(item.payload).time }}</text>
+					</div>
+				</div>
+			</div>
+			<div v-else>
+
+			<vue3-seamless-scroll v-if="listData.length>0" :speed="1" :list="listData" :limitScrollNum="10" :step="0.3" :hover="true" class="scroll">
+				<div class="item" v-for="(item, index) in listData" :key="index">
+					<div class="itemHead">
+						<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>
+							<div class="itemHeadInner3" v-if="JSON.parse(item.payload).level === 3">一般风险</div>
+							<div class="itemHeadInner4" v-if="JSON.parse(item.payload).level === 4">低风险</div>
+						</div>
+						<div v-else>
+							<!-- <div class="itemHeadInner" v-if="JSON.parse(item.payload).isSuperDanger !== undefined && JSON.parse(item.payload).isSuperDanger === true">超危工程</div> -->
+							<div class="itemHeadInner5" v-if="JSON.parse(item.payload).isSuperDanger === true">超危工程</div>
+							<div class="itemHeadInner6" v-if="JSON.parse(item.payload).isSuperDanger === false">危大工程</div>
+						</div>
+						<div class="itemContent">
+							<el-tooltip class="box-item" effect="dark" :content="item.msg" placement="top-start">
+								<text style="margin-left:10px">{{ item.msg }}</text>
+							</el-tooltip>
+						</div>
+					</div>
+					<!-- <div class="itemContent">
+						<el-tooltip class="box-item" effect="dark" :content="item.content" placement="top-start">
+							{{item.content}}
+						</el-tooltip>
+					</div> -->
+					<div class="itemTime">
+						<text class="timeInfo">{{ JSON.parse(item.payload).time }}</text>
 					</div>
 				</div>
 			</vue3-seamless-scroll>
+			</div>
+			<div class="notoDta" v-if="listData.length == 0">
+				<img src="@/assets/images/noData.png" alt="" />
+				<p>暂无数据</p>
+			</div> 
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
+import { 
+	getNoticeListApi 
+} from "@/api/modules/projectOverview";
 import { Vue3SeamlessScroll } from "vue3-seamless-scroll";
 import Card from "@/components/card.vue";
 import { ref, watch, onMounted } from "vue";
@@ -42,32 +91,74 @@ import { GlobalStore } from "@/stores";
 const store = GlobalStore();
 
 let listData = ref([
-	{ header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
-	{ header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: '重大风险', type: 1, content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
+	// { header: 'AI报警', type: 3, content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...', startTime: '2024-04-01', endTime: "2024-04-20" },
 ])
 
-onMounted(async () => {
+const getNoticeList = async () => {
+	// const res: any = await getNoticeListApi({ projectSn: store.sn, type: 10, pageNo: 1, pageSize: 99999, });
+	const res: any = await getNoticeListApi({ isBigScreen: 1 ,type:32});
+	console.log('隐患智能分析', res);
+	listData.value = res.result.records;
+	
+		// listData.value.push({
+		// 	accountId:"1779721457571291137",
+		// 	id:"1789601398432559107",
+		// 	imageUrl:null,
+		// 	isRead:0,
+		// 	msg:"区域1检查到一条四川成润智慧科技的雨落管安全隐患问题，请注意监督整改！",
+		// 	payload:"{\"level\":4,\"time\":\"2024-05-12 18:19:40\"}",
+		// 	sendTime: "2024-05-12 18:19:57",
+		// 	title: "大屏通知",
+		// 	type: "31",
+		// })
 
+	console.log("================center================",listData.value)
+}
+
+onMounted(async () => {
+	await getNoticeList();
 });
 </script>
 
 <style lang="scss" scoped>
+.notoDta {
+    top: 30%;
+    width: 50%;
+    // left: 40%;
+    position: absolute;
+    text-align: center;
+    left:50%;
+    transform: translateX(-50%);
+
+    img {
+        width: 30%;
+        margin: 5% 22%;
+    }
+
+    p {
+        color: #fff;
+        font-size: calc(100vw * 14 / 1920);
+        margin: -6% 30%;
+    }
+}
 .scroll {
 	height: 100%;
+	width: 100%;
 	overflow: hidden;
 }
 
@@ -130,7 +221,7 @@ onMounted(async () => {
 		// background: #fff;
 		.item {
 			width: 100%;
-			line-height: 130%;
+			line-height: 110%;
 			display: flex;
 			align-items: center;
 			// justify-content: flex-start;
@@ -146,21 +237,60 @@ onMounted(async () => {
 				font-size: 16px;
 				width: 75%;
 
-				.itemHeadInner {
-					border: 1px solid #f77c7d;
-					box-shadow: 0 0 0 1px #f77c7d;
-					background: rgba(247, 124, 125, 0.4);
+				.itemHeadInner1 {
+					border: 1px solid #e02020;
+					box-shadow: 0 0 0 1px #e02020;
+					background: rgba(224,32,32, 0.4);
 					border-radius: 3px;
 					padding: 0 15px;
 					margin: 9px 0;
 					margin-left: 2px;
 				}
-
 				.itemHeadInner2 {
 					font-size: 16px;
-					border: 1px solid #0db027;
-					box-shadow: 0 0 0 1px #0db027;
-					background: rgba(13, 176, 39, 0.4);
+					border: 1px solid #f46649;
+					box-shadow: 0 0 0 1px #f46649;
+					background: rgba(244,102,73, 0.4);
+					border-radius: 3px;
+					padding: 0 15px;
+					margin: 9px 0;
+					margin-left: 2px;
+				}
+				.itemHeadInner3 {
+					font-size: 16px;
+					border: 1px solid #ecbe45;
+					box-shadow: 0 0 0 1px #ecbe45;
+					background: rgba(236,190,69, 0.4);
+					border-radius: 3px;
+					padding: 0 15px;
+					margin: 9px 0;
+					margin-left: 2px;
+				}
+				.itemHeadInner4 {
+					font-size: 16px;
+					border: 1px solid #5394f7;
+					box-shadow: 0 0 0 1px #5394f7;
+					background: rgba(83,148,247, 0.4);
+					border-radius: 3px;
+					padding: 0 15px;
+					margin: 9px 0;
+					margin-left: 2px;
+				}
+				.itemHeadInner5 {
+					font-size: 16px;
+					border: 1px solid #9400D3;
+					box-shadow: 0 0 0 1px #9400D3;
+					background: rgba(148,0,211, 0.4);
+					border-radius: 3px;
+					padding: 0 15px;
+					margin: 9px 0;
+					margin-left: 2px;
+				}
+				.itemHeadInner6 {
+					font-size: 16px;
+					border: 1px solid #00CED1;
+					box-shadow: 0 0 0 1px #00CED1;
+					background: rgba(	0,206,209, 0.4);
 					border-radius: 3px;
 					padding: 0 15px;
 					margin: 9px 0;
diff --git a/src/views/commandScreen/commandCenter/centerTop.vue b/src/views/commandScreen/commandCenter/centerTop.vue
index e5db1d7..7740c6b 100644
--- a/src/views/commandScreen/commandCenter/centerTop.vue
+++ b/src/views/commandScreen/commandCenter/centerTop.vue
@@ -52,22 +52,22 @@
 			</div>
 			<div class="classify-div">
 				<div class="classify-div-item" @click="openDialogData({index: 1, title: '危大工程'})">
-					<span>危大工程&nbsp;&nbsp;{{statsDirectorateBigScreen.dangerousEngineeringRecordNum}}</span>
+					<span style="font-size: 12px;">危大工程&nbsp;&nbsp;{{statsDirectorateBigScreen.dangerousEngineeringRecordNum}}</span>
 				</div>
 				<div class="classify-div-item" @click="openDialogData({index: 2, title: '安全教育'})">
-					<span>安全教育&nbsp;&nbsp;{{statsDirectorateBigScreen.workerInfoAuditRecordNum}}</span>
+					<span style="font-size: 12px;">安全教育&nbsp;&nbsp;{{statsDirectorateBigScreen.workerInfoAuditRecordNum}}</span>
 				</div>
 				<div class="classify-div-item" @click="openDialogData({index: 3, title: '影响进度的因素'})">
-					<span>极端恶劣天气&nbsp;&nbsp;{{statsDirectorateBigScreen.taskProgressContentNum}}</span>
+					<span style="font-size: 12px;">极端恶劣天气&nbsp;&nbsp;{{statsDirectorateBigScreen.taskProgressContentNum}}</span>
 				</div>
 				<div class="classify-div-item" @click="openDialogData({index: 4, title: '风险统计'})">
-					<span>风险统计&nbsp;&nbsp;{{statsDirectorateBigScreen.securityQualityInspectionRecordNum}}</span>
+					<span style="font-size: 12px;">风险统计&nbsp;&nbsp;{{statsDirectorateBigScreen.securityQualityInspectionRecordNum}}</span>
 				</div>
 				<div class="classify-div-item" @click="openDialogData({index: 5, title: '安全隐患'})">
-					<span>安全隐患&nbsp;&nbsp;{{statsDirectorateBigScreen.securityQualityInspectionRecordNum}}</span>
+					<span style="font-size: 12px;">安全隐患&nbsp;&nbsp;{{statsDirectorateBigScreen.securityQualityInspectionRecordNum}}</span>
 				</div>
 				<div class="classify-div-item" @click="openDialogData({index: 6, title: 'AI警报'})">
-					<span>AI警报&nbsp;&nbsp;{{statsDirectorateBigScreen.aiAnalyseHardWareAlarmRecordNum}}</span>
+					<span style="font-size: 12px;">AI警报&nbsp;&nbsp;{{statsDirectorateBigScreen.aiAnalyseHardWareAlarmRecordNum}}</span>
 				</div>
 			</div>
 			<div class="background-title">
diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue
index 719bc8d..0b62e78 100644
--- a/src/views/commandScreen/commandCenter/rightAll.vue
+++ b/src/views/commandScreen/commandCenter/rightAll.vue
@@ -39,24 +39,49 @@
 					<div class="cbHeaderLine"></div>
 				</div>
 				<div class="cbContent">
-					<vue3-seamless-scroll v-show="listData.length>0" :list="listData" :step="1" :limitScrollNum="10" :hover="true" class="scroll">
-						<div class="item" v-for="(item, index) in listData" :key="index">
+					<div v-if="listData2.length < 10 && listData2.length !== 0">
+						<div class="item" v-for="(item, index) in listData2" :key="index">
 							<div class="itemHead">
-								<div class="itemHeadInner" v-if="item.type === 1">{{ item.title }}</div>
-								<div class="itemHeadInner2" v-if="item.type === 2">{{ item.title }}</div>
-								<div class="itemHeadInner3" v-if="item.type == 10">{{ item.title }}</div>
+								<div class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div>
+								<div class="itemHeadInner2" v-if="JSON.parse(item.payload).level === 2">较大风险</div>
+								<div class="itemHeadInner3" v-if="JSON.parse(item.payload).level === 3">一般风险</div>
+								<div class="itemHeadInner4" v-if="JSON.parse(item.payload).level === 4">低风险</div>
+								<div class="itemContent">
+									<el-tooltip class="box-item" effect="dark" :content="item.msg" placement="top-start">
+										<text style="margin-left:10px">{{ item.msg }}</text>
+									</el-tooltip>
+								</div>
 							</div>
-							<div class="itemContent">
-								<el-tooltip class="box-item" effect="dark" :content="item.msg" placement="top-start">
-									{{ item.msg }}
-								</el-tooltip>
+							<div class="itemTime">
+								<text class="timeInfo">{{ JSON.parse(item.payload).time }}</text>
+							</div>
+						</div>
+					</div>
+					<div class="notoDta" v-else-if="listData2.length == 0">
+						<img src="@/assets/images/noData.png" alt="" />
+						<p>暂无数据</p>
+					</div> 
+					<div v-else>
+
+					<vue3-seamless-scroll v-if="listData2.length > 0" :speed="1" :list="listData2" :step="0.3" :limitScrollNum="10" :hover="true" class="scroll">
+						<div class="item" v-for="(item, index) in listData2" :key="index">
+							<div class="itemHead">
+								<div class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div>
+								<div class="itemHeadInner2" v-if="JSON.parse(item.payload).level === 2">较大风险</div>
+								<div class="itemHeadInner3" v-if="JSON.parse(item.payload).level === 3">一般风险</div>
+								<div class="itemHeadInner4" v-if="JSON.parse(item.payload).level === 4">低风险</div>
+								<div class="itemContent">
+									<el-tooltip class="box-item" effect="dark" :content="item.msg" placement="top-start">
+										<text style="margin-left:10px">{{ item.msg }}</text>
+									</el-tooltip>
+								</div>
+							</div>
+							<div class="itemTime">
+								<text class="timeInfo">{{ JSON.parse(item.payload).time }}</text>
 							</div>
 						</div>
 					</vue3-seamless-scroll>
-					<div class="notoDta" v-if="listData.length == 0">
-                    <img src="@/assets/images/noData.png" alt="" />
-                    <p>暂无数据</p>
-                </div>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -89,7 +114,7 @@ let majorDangerRate = ref(50 as any);
 let overdueMajorDangerCount = ref(20 as any);
 let overdueMajorDangerRate = ref(50 as any);
 
-let listData = ref([
+let listData2 = ref([
 	// { title: '隐患分类', type: 1, msg: '经过智能分析统计，近一个月脚手架类安全隐患最多达...' },
 	// { title: '重大隐患', type: 2, msg: '组织专业人员对隐患进行彻底排查和评估，明确隐患的性质、范围和...' },
 	// { title: '隐患分类', type: 1, msg: '经过智能分析统计，近一个月脚手架类安全隐患最多达...' },
@@ -749,9 +774,22 @@ const getSelectQualityStatisticsNum = async () => {
 }
 
 const getNoticeList = async () => {
-	const res: any = await getNoticeListApi({ projectSn: store.sn, type: 10, pageNo: 1, pageSize: 99999, });
+	// const res: any = await getNoticeListApi({ projectSn: store.sn, type: 10, pageNo: 1, pageSize: 99999, });
+	const res: any = await getNoticeListApi({ isBigScreen: 1 ,type:31});
 	console.log('隐患智能分析', res);
-	listData.value = res.result.records;
+	listData2.value = res.result.records;
+		// listData2.value.push({
+		// 	accountId:"1779721457571291137",
+		// 	id:"1789601398432559107",
+		// 	imageUrl:null,
+		// 	isRead:0,
+		// 	msg:"区域1检查到一条四川成润智慧科技的雨落管安全隐患问题，请注意监督整改！",
+		// 	payload:"{\"level\":4,\"time\":\"2024-05-12 18:19:40\"}",
+		// 	sendTime: "2024-05-12 18:19:57",
+		// 	title: "大屏通知",
+		// 	type: "31",
+		// })
+	console.log("================================",listData2.value)
 }
 
 watch(dateRange,async () => {
@@ -896,7 +934,7 @@ onMounted(async () => {
 			// background-color: #fff;
 			// padding: 0 20px;
 			position: relative;
-
+			overflow: hidden;
 			.cbHeader {
 				width: 100%;
 				height: 40px;
@@ -937,29 +975,34 @@ onMounted(async () => {
 					background-size: 100% 100%;
 				}
 			}
-
 			.cbContent {
 				width: 100%;
-				height: calc(100% - 60px);
+				height: calc(100% - 55px);
+				// height: 100%;
 
 				// background: #fff;
 				.item {
-					// width: 100%;
-					line-height: 130%;
+					width: 100%;
+					line-height: 110%;
 					display: flex;
 					align-items: center;
-					justify-content: flex-start;
+					// justify-content: flex-start;
+					justify-content: space-between;
 					// background-color: green;
 					color: #fff;
 
 					.itemHead {
 						white-space: nowrap;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						font-size: 16px;
+						width: 65%;
 
-						.itemHeadInner {
-							font-size: 16px;
-							border: 1px solid #f77c7d;
-							box-shadow: 0 0 0 1px #f77c7d;
-							background: rgba(247, 124, 125, 0.4);
+						.itemHeadInner1 {
+							border: 1px solid #e02020;
+							box-shadow: 0 0 0 1px #e02020;
+							background: rgba(224,32,32, 0.4);
 							border-radius: 3px;
 							padding: 0 15px;
 							margin: 9px 0;
@@ -968,37 +1011,119 @@ onMounted(async () => {
 
 						.itemHeadInner2 {
 							font-size: 16px;
-							border: 1px solid #56a8f8;
-							box-shadow: 0 0 0 1px #56a8f8;
-							background: rgba(86, 168, 248, 0.4);
+							border: 1px solid #f46649;
+							box-shadow: 0 0 0 1px #f46649;
+							background: rgba(244,102,73, 0.4);
+							border-radius: 3px;
+							padding: 0 15px;
+							margin: 9px 0;
+							margin-left: 2px;
+						}
+						.itemHeadInner3 {
+							font-size: 16px;
+							border: 1px solid #ecbe45;
+							box-shadow: 0 0 0 1px #ecbe45;
+							background: rgba(236,190,69, 0.4);
+							border-radius: 3px;
+							padding: 0 15px;
+							margin: 9px 0;
+							margin-left: 2px;
+						}
+						.itemHeadInner4 {
+							font-size: 16px;
+							border: 1px solid #5394f7;
+							box-shadow: 0 0 0 1px #5394f7;
+							background: rgba(83,148,247, 0.4);
 							border-radius: 3px;
 							padding: 0 15px;
 							margin: 9px 0;
 							margin-left: 2px;
 						}
 
-						.itemHeadInner3 {
-							font-size: 16px;
-							border: 1px solid #0db027;
-							box-shadow: 0 0 0 1px #0db027;
-							background: rgba(13, 176, 39, 0.4);
-							border-radius: 3px;
-							padding: 0 15px;
-							margin: 9px 0;
-							margin-left: 2px;
+						.itemContent {
+							margin-left: 10px;
+							font-size: 15px;
+							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							width: 100%;
 						}
 					}
 
-					.itemContent {
-						margin-left: 10px;
-						font-size: 15px;
-						white-space: nowrap;
-						overflow: hidden;
-						text-overflow: ellipsis;
+					.itemTime {
+						// background-color: #fff;
+						width: 35%;
+						font-size: 16px;
 
+						.timeInfo {
+							display: flex;
+							justify-content: flex-end;
+							margin-right: 10px;
+						}
 					}
 				}
 			}
+			// .cbContent {
+			// 	width: 100%;
+			// 	height: calc(100% - 60px);
+
+			// 	// background: #fff;
+			// 	.item {
+			// 		// width: 100%;
+			// 		line-height: 130%;
+			// 		display: flex;
+			// 		align-items: center;
+			// 		justify-content: flex-start;
+			// 		// background-color: green;
+			// 		color: #fff;
+
+			// 		.itemHead {
+			// 			white-space: nowrap;
+
+			// 			.itemHeadInner {
+			// 				font-size: 16px;
+			// 				border: 1px solid #f77c7d;
+			// 				box-shadow: 0 0 0 1px #f77c7d;
+			// 				background: rgba(247, 124, 125, 0.4);
+			// 				border-radius: 3px;
+			// 				padding: 0 15px;
+			// 				margin: 9px 0;
+			// 				margin-left: 2px;
+			// 			}
+
+			// 			.itemHeadInner2 {
+			// 				font-size: 16px;
+			// 				border: 1px solid #56a8f8;
+			// 				box-shadow: 0 0 0 1px #56a8f8;
+			// 				background: rgba(86, 168, 248, 0.4);
+			// 				border-radius: 3px;
+			// 				padding: 0 15px;
+			// 				margin: 9px 0;
+			// 				margin-left: 2px;
+			// 			}
+
+			// 			.itemHeadInner3 {
+			// 				font-size: 16px;
+			// 				border: 1px solid #0db027;
+			// 				box-shadow: 0 0 0 1px #0db027;
+			// 				background: rgba(13, 176, 39, 0.4);
+			// 				border-radius: 3px;
+			// 				padding: 0 15px;
+			// 				margin: 9px 0;
+			// 				margin-left: 2px;
+			// 			}
+			// 		}
+
+			// 		.itemContent {
+			// 			margin-left: 10px;
+			// 			font-size: 15px;
+			// 			white-space: nowrap;
+			// 			overflow: hidden;
+			// 			text-overflow: ellipsis;
+
+			// 		}
+			// 	}
+			// }
 		}
 	}
 }

From fd376320cd1f359ef388bdcf1651ca6371a38fef Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 13 May 2024 11:44:23 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 postcss.config.js                             |  2 +-
 .../dialogCompnnents/ai-alarm.vue             |  2 +-
 .../dialogCompnnents/month-safe-score.vue     | 47 ++++++++++++++-----
 .../dialogCompnnents/risk-count.vue           |  2 +-
 .../dialogCompnnents/safe-hidden.vue          |  2 +-
 .../dialogCompnnents/safe-info.vue            |  2 +-
 .../dialogCompnnents/weather-info.vue         |  2 +-
 7 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/postcss.config.js b/postcss.config.js
index d300a69..955ce2f 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -9,7 +9,7 @@ module.exports = {
 				"ie >= 8",
 				"last 10 versions" // 所有主流浏览器最近10版本用
 			],
-			grid: true
+			grid: false
 		},
 		"postcss-pxtorem": {
 			rootValue: 192, // 设计稿宽度的1/ 10
diff --git a/src/views/commandScreen/dialogCompnnents/ai-alarm.vue b/src/views/commandScreen/dialogCompnnents/ai-alarm.vue
index 16d6115..3cc0be7 100644
--- a/src/views/commandScreen/dialogCompnnents/ai-alarm.vue
+++ b/src/views/commandScreen/dialogCompnnents/ai-alarm.vue
@@ -372,8 +372,8 @@ onMounted(async () => {
 		.top-statistics{
 			width: 90%;
 			display: grid;
-			grid-gap: 20px;
 			grid-template-columns: repeat(4, 1fr);
+			grid-gap: 20px;
 			color: white;
 			margin: 0 auto;
 			.statistics-item{
diff --git a/src/views/commandScreen/dialogCompnnents/month-safe-score.vue b/src/views/commandScreen/dialogCompnnents/month-safe-score.vue
index 9b2cc04..1990da7 100644
--- a/src/views/commandScreen/dialogCompnnents/month-safe-score.vue
+++ b/src/views/commandScreen/dialogCompnnents/month-safe-score.vue
@@ -50,23 +50,48 @@
 								<span v-else-if="key2 == '安全教育'">25</span>
 							</div>
 						</div>
-						<div class="table-head-nine-part2">
-							<div class="category-title" style="width: 14.6%">
+						<div class="table-head-nine-part1">
+							<div class="category-title">
 								<span>AI报警</span>
 							</div>
-							<div class="category-title" style="width: 22%">
-								<span>AI违章抓拍</span>
+							<div class="category-content" style="width:80%">
+								<div>
+									<div>
+										<span>AI违章抓拍</span>
+									</div>
+									<div style="width:50%">告警数量月度环比对比</div>
+									<div style="width:20%">
+										<span>100%</span>
+									</div>
+								</div>
 							</div>
-							<div class="category-title" style="width:48%">
-								<span>告警数量月度环比对比</span>
+							<div class="category-other" style="width: 10%">
+								<span>20%</span>
 							</div>
-							<div class="category-title" style="width:5%">
-								<span>100%</span>
-							</div>
-							<div class="category-title" style="width: 10.4%;margin:0 0 0 0">
-								<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ countData.aiScore || 0 }}</span>
+							<div class="category-other" style="width: 10%">
+								<span>{{ countData.aiScore || 0 }}</span>
 							</div>
 						</div>
+						<!-- <div class="table-head-nine-part2">
+							<div class="category-title">
+								<span>AI报警</span>
+							</div>
+							<div class="category-title">
+								<span>AI违章抓拍</span>
+							</div>
+							<div class="category-title">
+								<span>告警数量月度环比对比</span>
+							</div>
+							<div class="category-title">
+								<span>100%</span>
+							</div>
+							<div class="category-title">
+								<span>20%</span>
+							</div>
+							<div class="category-title">
+								<span>{{ countData.aiScore || 0 }}</span>
+							</div>
+						</div> -->
 						<div class="table-head-nine-part3">
 							<div style="width: 14.5%"><span>综合得分</span></div>
 							<div style="width: 85.5%">
diff --git a/src/views/commandScreen/dialogCompnnents/risk-count.vue b/src/views/commandScreen/dialogCompnnents/risk-count.vue
index 1539779..7e6d30a 100644
--- a/src/views/commandScreen/dialogCompnnents/risk-count.vue
+++ b/src/views/commandScreen/dialogCompnnents/risk-count.vue
@@ -245,8 +245,8 @@ onMounted(async () => {
 				width: 95%;
 				height: 50%;
 				display: grid;
-				grid-gap: 20px;
 				grid-template-columns: repeat(4, 1fr);
+				grid-gap: 20px;
 				color: white;
 				margin: 0 auto;
 				margin-top: 3%;
diff --git a/src/views/commandScreen/dialogCompnnents/safe-hidden.vue b/src/views/commandScreen/dialogCompnnents/safe-hidden.vue
index 4cc36d2..3e5322a 100644
--- a/src/views/commandScreen/dialogCompnnents/safe-hidden.vue
+++ b/src/views/commandScreen/dialogCompnnents/safe-hidden.vue
@@ -323,8 +323,8 @@ onMounted(async () => {
 		.top-statistics{
 			width: 60%;
 			display: grid;
-			grid-gap: 20px;
 			grid-template-columns: repeat(2, 1fr);
+			grid-gap: 20px;
 			color: white;
 			margin: 0 auto;
 			.statistics-item{
diff --git a/src/views/commandScreen/dialogCompnnents/safe-info.vue b/src/views/commandScreen/dialogCompnnents/safe-info.vue
index 55fb0ee..69ea272 100644
--- a/src/views/commandScreen/dialogCompnnents/safe-info.vue
+++ b/src/views/commandScreen/dialogCompnnents/safe-info.vue
@@ -188,8 +188,8 @@ onMounted(async () => {
 		padding: 20px 15px;
 		.top-statistics {
 			display: grid;
-			grid-gap: 20px;
 			grid-template-columns: repeat(3, 1fr);
+			grid-gap: 20px;
 			color: white;
 			margin: 0 5%;
 			.statistics-item {
diff --git a/src/views/commandScreen/dialogCompnnents/weather-info.vue b/src/views/commandScreen/dialogCompnnents/weather-info.vue
index 333ecb1..4002c55 100644
--- a/src/views/commandScreen/dialogCompnnents/weather-info.vue
+++ b/src/views/commandScreen/dialogCompnnents/weather-info.vue
@@ -182,8 +182,8 @@ onMounted(async () => {
 		padding: 20px 15px;
 		.top-statistics {
 			display: grid;
-			grid-gap: 20px;
 			grid-template-columns: repeat(3, 1fr);
+			grid-gap: 20px;
 			color: white;
 			margin: 0 5%;
 			.statistics-item {

From 23b099a17b385a2ddd2a5a228572268f78106328 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Mon, 13 May 2024 11:58:16 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E6=8C=A5?=
 =?UTF-8?q?=E9=83=A8=E5=A4=A7=E5=B1=8F=E5=AE=89=E5=85=A8=E6=95=99=E8=82=B2?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=88=86=E6=9E=90=E6=9C=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BD=86=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commandScreen/commandCenter/leftBottom.vue  | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue
index 223542c..2fcfd96 100644
--- a/src/views/commandScreen/commandCenter/leftBottom.vue
+++ b/src/views/commandScreen/commandCenter/leftBottom.vue
@@ -91,7 +91,6 @@ let listData = ref([
 	{ header: "特种作业人员教育", type: 2, content: "1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止" }
 ]);
 
-let questionTotal = ref(0 as any);
 let dataList2 = ref([
 	{
 		value: 0,
@@ -157,6 +156,7 @@ const getPersonList = async () => {
 		dataList2.value[1].value = res.result.personType.toaltPerson.totalPerson;
 		dataList2.value[2].value = res.result.personType.toaltPerson.totalPerson;
 		console.log("安全教育智能分析666", res);
+		drawEchart2();
 	}
 };
 // 获取人员履职情况分析数据--整改人
@@ -267,7 +267,6 @@ function drawEchart2() {
 			trigger: "item"
 		},
 		title: {
-			// text: questionTotal.value,
 			text: "100%",
 			subtext: "入场三级教育\n完成率",
 			x: "24%",
@@ -505,21 +504,7 @@ function drawEchart2() {
 	// 	echartsTest.resize();
 	// })
 }
-//获取质量管理
-// 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;
-	questionTotal.value = res.result.total.totalNum;
-	drawEchart2();
-};
-//将方法暴露给父组件
-defineExpose({
-	qualityInfo
-});
 onMounted(async () => {
-	qualityInfo();
 	getMemberJobStatusFn();
 	getPersonList();
 });