From 541758b452ec73f21fea8313877754a6a3f7ee1a Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Sat, 3 Feb 2024 17:56:28 +0800
Subject: [PATCH 1/3] =?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

---
 .env.development                              |   5 +-
 src/api/modules/concreteMonitor.ts            |  40 ++
 src/api/modules/gantryCrane.ts                |  44 +-
 src/api/modules/greenConstruct.ts             |   3 +
 src/api/modules/largeMachinery.ts             |  25 +-
 src/api/modules/roadPaving.ts                 |  20 +
 src/api/modules/securityManagement.ts         |  42 ++
 src/config/config.ts                          |   4 +-
 .../aIEarlyWarning/bottomLeft.vue             |   2 +-
 .../aIEarlyWarning/topLeft.vue                |   2 +-
 .../loadometerManage/bottomLeft.vue           |   2 +-
 .../loadometerManage/bottomRight.vue          |   2 +-
 .../loadometerManage/topLeft.vue              |   8 +-
 .../distributionMonitoring/bottomLeft.vue     |   2 +-
 .../electricityMonitor/bottomLeft.vue         |   2 +-
 .../electricityMonitor/bottomRight.vue        |   2 +-
 .../greenConstruct/sewageMonitor/leftTop.vue  |  65 ++-
 .../greenConstruct/sewageMonitor/rightTop.vue |  10 +-
 .../waterMonitor/blueLineEchart.vue           |   5 -
 .../waterMonitor/bottomLeft.vue               |   2 +-
 .../waterMonitor/bottomRight.vue              |   2 +-
 .../headNoise/centerBottom.vue                |  16 +-
 .../sevenLargeScreen/headNoise/leftBottom.vue |   2 +-
 .../laborManagement/circularGraph.vue         |   6 +-
 .../laborManagement/horizontaL.vue            |   2 +-
 .../asphaltMixer/bottomCenter.vue             |   5 +-
 .../asphaltMixer/bottomRight.vue              |   2 +-
 .../largeMachinery/asphaltMixer/topLeft.vue   |  28 +-
 .../compressionIntegrate/bottomRight.vue      |  43 +-
 .../compressionIntegrate/curve-line.vue       |  63 ++-
 .../dev-detail-dialog.vue                     | 140 +++--
 .../concreteMixingPlant/bottomCenter.vue      |   9 +-
 .../concreteMixingPlant/bottomRight.vue       |   2 +-
 .../concreteMixingPlant/topLeft.vue           |  32 +-
 .../erectCrane/bottomCenter.vue               | 166 +++++-
 .../largeMachinery/erectCrane/bottomLeft.vue  | 141 +++---
 .../largeMachinery/erectCrane/bottomRight.vue |  30 +-
 .../erectCrane/gantry-video.vue               | 310 ++++++++++++
 .../largeMachinery/erectCrane/topCenter.vue   | 252 ++++++---
 .../largeMachinery/erectCrane/topLeft.vue     |  40 +-
 .../largeMachinery/erectCrane/topRight.vue    |  68 ++-
 .../gantryCrane/bottomCenter.vue              |   2 +-
 .../largeMachinery/gantryCrane/bottomLeft.vue |   2 +-
 .../gantryCrane/bottomRight.vue               |   2 +-
 .../gantryCrane/gantry-video.vue              |   2 +-
 .../largeMachinery/gantryCrane/topCenter.vue  |   2 +-
 .../largeMachinery/gantryCrane/topLeft.vue    |   2 +-
 .../largeMachinery/gantryCrane/topRight.vue   |   2 +-
 .../largeMachinery/hangBasket/hangLeft.vue    |  99 +++-
 .../largeMachinery/hangBasket/rightBottom.vue | 236 +++------
 .../largeMachinery/hangBasket/topLeft.vue     |  86 +++-
 .../largeMachinery/hangBasket/topRight.vue    | 123 ++++-
 .../intelligentGrout/bottomLeft.vue           |   2 +-
 .../intelligentGrout/bottomRight.vue          |  10 +-
 .../intelligentGrout/topCenter.vue            |   4 +-
 .../intelligentTension/bottomRight.vue        |   4 +-
 .../pressureTestMachine/bottomRight.vue       |  42 +-
 .../pressureTestMachine/curve-line.vue        |  53 +-
 .../pressureTestMachine/dev-detail-dialog.vue | 131 +++--
 .../roadCompaction/indexPaving.vue            | 242 +++------
 .../largeMachinery/roadPaving/indexPaving.vue | 211 ++------
 .../dev-detail-dialog.vue                     | 222 +++++---
 .../universalTestMachine/line-first.vue       |  74 ++-
 .../universalTestMachine/line-second.vue      |  73 ++-
 .../unloadPlatform/bottomLeft.vue             |  16 +-
 .../unloadPlatform/load-ratio-circle.vue      |   2 +-
 .../waterStabilizedMixer/bottomCenter.vue     |  10 +-
 .../waterStabilizedMixer/topCenter.vue        |   4 +-
 .../waterStabilizedMixer/topLeft.vue          |  28 +-
 .../concreteMonitor/leftBottom.vue            | 209 +++++---
 .../concreteMonitor/leftTop.vue               | 134 +++--
 .../concreteMonitor/rightBottom.vue           | 212 ++++----
 .../concreteMonitor/rightTop.vue              |  26 +-
 .../foundationPitMonitor/leftBottom.vue       | 478 +++++++++++-------
 .../foundationPitMonitor/leftBottom_old.vue   | 399 +++++++++++++++
 .../foundationPitMonitor/rightFirst.vue       | 130 +++--
 .../foundationPitMonitor/rightSecond.vue      | 144 ++++--
 .../foundationPitMonitor/rightThird.vue       | 136 +++--
 .../foundationPitMonitor/topLeft.vue          | 153 ++++--
 .../foundationPitMonitor/topRight.vue         |  81 ++-
 .../smokeSensor/smoke-bottom.vue              |   6 +-
 .../towerCraneMonitoring/right.vue            |   2 +-
 82 files changed, 3766 insertions(+), 1676 deletions(-)
 create mode 100644 src/api/modules/concreteMonitor.ts
 create mode 100644 src/api/modules/roadPaving.ts
 create mode 100644 src/views/sevenLargeScreen/largeMachinery/erectCrane/gantry-video.vue
 create mode 100644 src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom_old.vue

diff --git a/.env.development b/.env.development
index 61fe55b..ed07633 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,8 @@
 NODE_ENV = 'development'
 
 # 本地环境接口地址(/api/index.ts文件中使用)
-# VITE_API_URL = 'http://192.168.34.221:9111'
+# 后端本地
+VITE_API_URL = 'http://192.168.34.221:9111'
 # VITE_API_URL = 'http://192.168.34.221:28888'
 # VITE_API_URL = 'http://121.196.214.246/api'
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
@@ -14,7 +15,7 @@ NODE_ENV = 'development'
 # 演示平台
 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
 # 百色七参数线上地址
-VITE_API_URL = 'http://101.43.164.214:11111'
+# VITE_API_URL = 'http://101.43.164.214:11111'
 
 # 上传
 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
diff --git a/src/api/modules/concreteMonitor.ts b/src/api/modules/concreteMonitor.ts
new file mode 100644
index 0000000..cae12c2
--- /dev/null
+++ b/src/api/modules/concreteMonitor.ts
@@ -0,0 +1,40 @@
+import http from "@/api";
+const BASEURL = import.meta.env.VITE_API_URL;
+
+// 查设备列表
+export const selectConcreteMonitorDevList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/concreteMonitorDev/selectConcreteMonitorDevList`, params);
+};
+// 查设备下的点位
+export const selectPointPositionList = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/concreteMonitorDevPointPosition/list`, params);
+};
+
+// 查设备下的图
+export const concreteMonitorPlaneFigureList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/concreteMonitorPlaneFigure/selectList`, params);
+};
+// 查图下的点
+export const concreteMonitorDevToPlaneFigureList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/concreteMonitorDevToPlaneFigure/selectList`, params);
+};
+
+// 查监测曲线
+export const countTrend = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/concreteMonitorCurrentData/countTrend`, params);
+};
+
+// 混凝土统计
+export const countConcreteMonitorDevPointPosition = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/concreteMonitorDevPointPosition/countConcreteMonitorDevPointPosition`, params);
+};
+
+// 实时告警
+// 上面数字
+// 下面列表
+export const countConcreteMonitorAlarm = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/concreteMonitorDevPointPosition/countConcreteMonitorDevPointPosition`, params);
+};
+export const concreteMonitorAlarmList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/concreteMonitorAlarm/list`, params);
+};
diff --git a/src/api/modules/gantryCrane.ts b/src/api/modules/gantryCrane.ts
index 07e6696..3e46c9c 100644
--- a/src/api/modules/gantryCrane.ts
+++ b/src/api/modules/gantryCrane.ts
@@ -6,33 +6,65 @@ const BASEURL = import.meta.env.VITE_API_URL;
 export const getGantryWorkTotal = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/gantryCraneWorkCycle/countGantryCraneWorkCycle`, params);
 };
-
 // 获取龙门吊列表 (下拉框)
 export const getGantryDevList = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/gantryCrane/list`, params);
 };
-
 // 获取龙门吊 实时数据
 export const getGantryCraneCurrentData = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/gantryCraneCurrentData/getNewestGantryCraneCurrentData`, params);
 };
-
 // 获取龙门吊 报警数据
 export const getGantryCraneAlarm = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/gantryCraneAlarm/getNewestOne`, params);
 };
-
 // 获取工作时长分析
 export const getWorkTimeAnalysis = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/gantryCraneWorkCycle/workTimeAnalysis`, params);
 };
-
 // 获取 统计风速报警次数
 export const getAlarmWindSpeed = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/gantryCraneAlarm/countGantryCraneAlarmWindSpeed`, params);
 };
-
 // 获取 龙门吊设备视频地址
 export const getGantryVideoList = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/gantryCrane/selectGantryCraneBySn`, params);
 };
+
+// 架桥机
+// 实时数据
+export const getGantryCraneCurrentData2 = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/bridgeErectMachineData/selectNewestData`, params);
+};
+// 报警数据
+// export const getGantryCraneAlarm = (params: {}) => {
+// 	return http.post(BASEURL + `/xmgl/gantryCraneAlarm/getNewestOne`, params);
+// };
+// 列表查询架桥机设备信息
+export const bridgeErectMachineDevList = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/bridgeErectMachineDev/list`, params);
+};
+// 查询作业统计 (左上)
+export const getGantryWorkTotal2 = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/bridgeErectMachineData/countToday`, params);
+};
+// 工作时长分析
+export const getWorkTimeAnalysis2 = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/bridgeErectMachineData/countBridgeErectMachineData`, params);
+};
+// 环境风速（右下）
+export const countWindSpeed = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/bridgeErectMachineData/countWindSpeed`, params);
+};
+// 获取视频
+export const videoItemById = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/videoItem/queryById`, params);
+};
+// 获取司机
+export const selectWorkerInfoList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/workerInfo/selectWorkerInfoList`, params);
+};
+// 获取报警
+export const bridgeErectMachineAlarmList = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/bridgeErectMachineAlarm/page`, params);
+};
diff --git a/src/api/modules/greenConstruct.ts b/src/api/modules/greenConstruct.ts
index 499da0c..9ab6168 100644
--- a/src/api/modules/greenConstruct.ts
+++ b/src/api/modules/greenConstruct.ts
@@ -68,3 +68,6 @@ export const countSewageAlarm = (params: {}) => {
 export const sewageAlarmPage = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/sewageAlarm/page`, params);
 };
+export const getSewageTypeEnum = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/sewageData/getSewageTypeEnum`, params);
+};
diff --git a/src/api/modules/largeMachinery.ts b/src/api/modules/largeMachinery.ts
index 5a0690d..436f515 100644
--- a/src/api/modules/largeMachinery.ts
+++ b/src/api/modules/largeMachinery.ts
@@ -123,7 +123,7 @@ export const concreteMixStationPage3 = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/stableWaterMixStationData/page`, params);
 };
 export const concreteMaterialDataList3 = (params: {}) => {
-	return http.get(BASEURL + `/xmgl/stableWaterMixStationRawMaterialData/list`, params);
+	return http.get(BASEURL + `/xmgl/stableWaterMixStationSetData/list`, params);
 };
 // 生产质量统计
 export const countUseStatus3 = (params: {}) => {
@@ -182,7 +182,7 @@ export const pressureBlockDataList2 = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/antiPressureFoldManageBlockData/list`, params);
 };
 
-// 抗压抗折一体机
+// 万能
 // 万能机设备统计
 export const countUniversalTestDev = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/universalTestDev/countUniversalTestDev`, params);
@@ -211,3 +211,24 @@ export const pressureBlockNumberList3 = (params: {}) => {
 export const pressureBlockDataList3 = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/universalTestManageBlockData/list`, params);
 };
+
+
+// 挂篮监测
+export const hangBasketDevList = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/hangBasketDev/list`, params);
+};
+
+// 监测数据
+export const hangNewestData = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/hangBasketDetectData/newestData`, params);
+};
+
+// 告警列表
+export const hangBasketAlarmDataPage = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/hangBasketAlarmData/page`, params);
+};
+
+// 分页列表查询挂篮检测数据信息
+export const hangBasketDetectDataPage = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/hangBasketDetectData/page`, params);
+};
\ No newline at end of file
diff --git a/src/api/modules/roadPaving.ts b/src/api/modules/roadPaving.ts
new file mode 100644
index 0000000..9155b03
--- /dev/null
+++ b/src/api/modules/roadPaving.ts
@@ -0,0 +1,20 @@
+import http from "@/api";
+const BASEURL = import.meta.env.VITE_API_URL;
+
+// 查下面列表
+export const paveDevList = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/paveDev/list`, params);
+};
+// 查上面数字
+export const countPaveDev = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/paveDev/countPaveDev`, params);
+};
+
+// 查下面列表
+export const paveDevList2 = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/paveCompactionDev/list`, params);
+};
+// 查上面数字
+export const countPaveDev2 = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/paveCompactionDev/countPaveCompactionDev`, params);
+};
diff --git a/src/api/modules/securityManagement.ts b/src/api/modules/securityManagement.ts
index 90bc455..65df5f7 100644
--- a/src/api/modules/securityManagement.ts
+++ b/src/api/modules/securityManagement.ts
@@ -59,3 +59,45 @@ export const getEdgeAlarmPage = (params: {}) => {
 export const getEdgeAlarmTypeEnum = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/frontierProtectionDevAlarm/getFrontierProtectionAlarmTypeEnum`, params);
 };
+
+
+// -------------- 基坑监测 --------------
+export const selectDeepExcavationList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/deepExcavationEngineering/selectDeepExcavationList`, params);
+};
+
+export const selectDeepPicList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/deepExcavationPlaneFigure/selectList`, params);
+};
+
+export const selectDeepPointList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/deepExcavationPlaneFigureCoordinate/list`, params);
+};
+
+
+
+// {
+// 	"measurePointNumber": "测点编号",
+// 	"relaId": "65",
+// 	"sensorSn": "1",
+// 	"projectSn": "B717CB992D054A878FDAFB4A5C169947",
+// 	"pageNo": 1,
+// 	"pageSize": 10
+// }
+export const selectMonitorTypeAlarmCountList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/deepExcavationMonitorType/selectMonitorTypeAlarmCountList`, params);
+};
+
+// 查测点列表：xmgl/deepExcavationMeasurePoint/selectDeepExcavationAllMeasurePointList
+export const selectDeepExcavationAllMeasurePointList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/deepExcavationMeasurePoint/selectDeepExcavationAllMeasurePointList`, params);
+};
+// 查传感器列表
+export const getSensorListByMeasurePointNumber = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/deepExcavationSensor/getSensorListByMeasurePointNumber`, params);
+};
+
+// 曲线
+export const selectDeepExcavationCurrentDataList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/deepExcavationCurrentData/selectDeepExcavationCurrentDataList`, params);
+};
diff --git a/src/config/config.ts b/src/config/config.ts
index 863a299..60d8287 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -23,10 +23,10 @@ export const BAIDU_MAP_KEY: string = "";
 export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
 
 // 项目环境标识配置 部署时需更改对应的项目
-// export const COMPANY: string = ""; //标准版
+export const COMPANY: string = ""; //标准版
 // export const COMPANY: string = "jsyc"; // 江苏盐城项目
 // export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页)
 // export const COMPANY: string = "jxwjj"; //嘉兴王江泾公用码头项目 (需要去src\routers\modules\staticRouter.ts更换首页)
 // export const COMPANY: string = "phmw"; //鄱湖美湾医疗、医美产业集群项目 (需要去src\routers\modules\staticRouter.ts更换首页)
 // export const COMPANY: string = "xjnb"; // 新建宁波项目
-export const COMPANY: string = "ahsa"; // 安徽水安项目
+// export const COMPANY: string = "ahsa"; // 安徽水安项目
diff --git a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomLeft.vue b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomLeft.vue
index 9697426..534f23d 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomLeft.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomLeft.vue
@@ -267,7 +267,7 @@ onMounted(async () => {
 	getMemberCareList();
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("devSn");
 });
diff --git a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/topLeft.vue b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/topLeft.vue
index 3479ced..2397c5c 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/topLeft.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/topLeft.vue
@@ -232,7 +232,7 @@ onMounted(async () => {
 	// drawChart();
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("devSn");
 });
diff --git a/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/bottomLeft.vue b/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/bottomLeft.vue
index ba83205..296e336 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/bottomLeft.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/bottomLeft.vue
@@ -255,7 +255,7 @@ onMounted(async () => {
 	getMemberCareList();
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("devSn");
 });
diff --git a/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/bottomRight.vue b/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/bottomRight.vue
index 3658d65..4dfd56c 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/bottomRight.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/bottomRight.vue
@@ -253,7 +253,7 @@ onMounted(async () => {
 	getMemberCareList();
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("devSn");
 });
diff --git a/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/topLeft.vue b/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/topLeft.vue
index 565e3e4..a230de9 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/topLeft.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/loadometerManage/topLeft.vue
@@ -33,10 +33,10 @@ let filledArray = ref([]) as any;
 function initOption() {
 	option.value = {
 		grid: {
-			left: "0%",
-			right: "0%",
-			bottom: "0%",
-			top: "2%",
+			left: "5%",
+			right: "5%",
+			bottom: "5%",
+			top: "5%",
 			containLabel: true
 		},
 		// backgroundColor: '#101129',
diff --git a/src/views/sevenLargeScreen/distributionMonitoring/bottomLeft.vue b/src/views/sevenLargeScreen/distributionMonitoring/bottomLeft.vue
index 9bba6fc..941fd77 100644
--- a/src/views/sevenLargeScreen/distributionMonitoring/bottomLeft.vue
+++ b/src/views/sevenLargeScreen/distributionMonitoring/bottomLeft.vue
@@ -309,7 +309,7 @@ onMounted(async () => {
 	getSelectDataList();
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("devSn");
 });
diff --git a/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomLeft.vue b/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomLeft.vue
index 2907089..a21b8bf 100644
--- a/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomLeft.vue
+++ b/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomLeft.vue
@@ -62,7 +62,7 @@ onMounted(async () => {
 	// getMeterTotal();
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("electricId");
 });
diff --git a/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomRight.vue b/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomRight.vue
index efd45aa..ef35a4d 100644
--- a/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomRight.vue
+++ b/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomRight.vue
@@ -61,7 +61,7 @@ onMounted(async () => {
 	// getMeterTotal();
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("electricId");
 });
diff --git a/src/views/sevenLargeScreen/greenConstruct/sewageMonitor/leftTop.vue b/src/views/sevenLargeScreen/greenConstruct/sewageMonitor/leftTop.vue
index bba6b4e..1c73047 100644
--- a/src/views/sevenLargeScreen/greenConstruct/sewageMonitor/leftTop.vue
+++ b/src/views/sevenLargeScreen/greenConstruct/sewageMonitor/leftTop.vue
@@ -6,26 +6,30 @@
 					<el-option v-for="(item, index) in dayList" :key="index" :label="item.devName" :value="item.devSn" />
 				</el-select>
 			</div>
-			<div class="real-bottom">
+			<div class="real-bottom" v-if="realTimeData">
 				<div class="warn-box">
 					<div class="warn-icon">
 						<img src="@/assets/images/sewageMonitor/leftIcon3.png" alt="" />
 					</div>
 					<div class="warn-detail">
 						<div class="warn-text">PH值</div>
-						<div class="warn-num">{{ realTimeData.phValue || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.phValueStatus == 0">{{ realTimeData.phValue || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.phValueStatus === 1" style="color: #eea959">{{ realTimeData.phValue || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.phValueStatus === 2" style="color: #ec6266">{{ realTimeData.phValue || 0 }}</div>
 					</div>
 				</div>
 				<div class="warn-box">
-					<div class="text-icon" style="color: #ec6266">
+					<!-- <div class="text-icon" style="color: #ec6266">
 						<el-icon><Warning /></el-icon>
-					</div>
+					</div> -->
 					<div class="warn-icon">
 						<img src="@/assets/images/sewageMonitor/leftIcon4.png" alt="" />
 					</div>
 					<div class="warn-detail">
 						<div class="warn-text">浊度值(NTU)</div>
-						<div class="warn-num" style="color: #ec6266">{{ realTimeData.turbidityValue || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.turbidityValueStatus == 0">{{ realTimeData.turbidityValue || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.turbidityValueStatus === 1" style="color: #eea959">{{ realTimeData.turbidityValue || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.turbidityValueStatus === 2" style="color: #ec6266">{{ realTimeData.turbidityValue || 0 }}</div>
 					</div>
 				</div>
 				<div class="warn-box">
@@ -34,19 +38,23 @@
 					</div>
 					<div class="warn-detail">
 						<div class="warn-text">电导率(μs/cm)</div>
-						<div class="warn-num">{{ realTimeData.conductivityRate || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.conductivityStatus == 0">{{ realTimeData.conductivity || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.conductivityStatus === 1" style="color: #eea959">{{ realTimeData.conductivity || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.conductivityStatus === 2" style="color: #ec6266">{{ realTimeData.conductivity || 0 }}</div>
 					</div>
 				</div>
 				<div class="warn-box">
-					<div class="text-icon" style="color: #eea959">
+					<!-- <div class="text-icon" style="color: #eea959">
 						<el-icon><Warning /></el-icon>
-					</div>
+					</div> -->
 					<div class="warn-icon">
 						<img src="@/assets/images/sewageMonitor/leftIcon6.png" alt="" />
 					</div>
 					<div class="warn-detail">
 						<div class="warn-text">溶解氧(mg/L)</div>
-						<div class="warn-num" style="color: #eea959">{{ realTimeData.dissolvedOxygen || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.dissolvedOxygenStatus == 0">{{ realTimeData.dissolvedOxygen || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.dissolvedOxygenStatus === 1" style="color: #eea959">{{ realTimeData.dissolvedOxygen || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.dissolvedOxygenStatus === 2" style="color: #ec6266">{{ realTimeData.dissolvedOxygen || 0 }}</div>
 					</div>
 				</div>
 				<div class="warn-box">
@@ -55,29 +63,35 @@
 					</div>
 					<div class="warn-detail">
 						<div class="warn-text">水温(°C)</div>
-						<div class="warn-num" style="margin-top: 35%">{{ realTimeData.dissolvedOxygen || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.waterTemperatureStatus == 0" style="margin-top: 35%">{{ realTimeData.waterTemperature || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.waterTemperatureStatus === 1" style="color: #eea959; margin-top: 35%">{{ realTimeData.waterTemperature || 0 }}</div>
+						<div class="warn-num" v-if="realTimeData.waterTemperatureStatus === 2" style="color: #ec6266; margin-top: 35%">{{ realTimeData.waterTemperature || 0 }}</div>
 					</div>
 				</div>
 			</div>
-			<div class="water-box">
+			<div class="water-box" v-if="realTimeData">
 				<div class="warn-icon">
 					<img src="@/assets/images/sewageMonitor/leftIcon1.png" alt="" />
 				</div>
 				<div class="warn-detail">
 					<div class="warn-text">水位(m)</div>
-					<div class="warn-num">{{ realTimeData.waterLevel || 0 }}</div>
+					<div class="warn-num" v-if="realTimeData.waterLevelStatus == 0">{{ realTimeData.waterLevel || 0 }}</div>
+					<div class="warn-num" v-if="realTimeData.waterLevelStatus === 1" style="color: #eea959">{{ realTimeData.waterLevel || 0 }}</div>
+					<div class="warn-num" v-if="realTimeData.waterLevelStatus === 2" style="color: #ec6266">{{ realTimeData.waterLevel || 0 }}</div>
 				</div>
 			</div>
-			<div class="speed-box">
+			<div class="speed-box" v-if="realTimeData">
 				<div class="warn-icon">
 					<img src="@/assets/images/sewageMonitor/leftIcon2.png" alt="" />
 				</div>
 				<div class="warn-detail">
 					<div class="warn-text">流速(m/s)</div>
-					<div class="warn-num">{{ realTimeData.flowVelocity || 0 }}</div>
+					<div class="warn-num" v-if="realTimeData.flowVelocityStatus == 0">{{ realTimeData.flowVelocity || 0 }}</div>
+					<div class="warn-num" v-if="realTimeData.flowVelocityStatus === 1" style="color: #eea959">{{ realTimeData.flowVelocity || 0 }}</div>
+					<div class="warn-num" v-if="realTimeData.flowVelocityStatus === 2" style="color: #ec6266">{{ realTimeData.flowVelocity || 0 }}</div>
 				</div>
 			</div>
-			<div class="emit-state" v-if="realTimeData.isWarning">
+			<div class="emit-state" v-if="realTimeData && realTimeData.isWarning">
 				<div class="text">未达排放标准</div>
 			</div>
 		</div>
@@ -87,7 +101,7 @@
 <script setup lang="ts">
 import Card from "@/components/card.vue";
 import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
-import { getSewageDevList, getSewageNewestData } from "@/api/modules/greenConstruct";
+import { getSewageDevList, getSewageNewestData, getSewageTypeEnum } from "@/api/modules/greenConstruct";
 import { GlobalStore } from "@/stores";
 const store = GlobalStore();
 import mitts from "@/utils/bus"; //兄弟组件传值
@@ -115,6 +129,14 @@ const getMeterTotal = async () => {
 	console.log("获取设备列表", res);
 };
 
+// let alarmData1 = ref({}) as any;
+// let alarmData2 = ref({}) as any;
+// let alarmData3 = ref({}) as any;
+// let alarmData4 = ref({}) as any;
+// let alarmData5 = ref({}) as any;
+// let alarmData6 = ref({}) as any;
+// let alarmData7 = ref({}) as any;
+
 let realTimeData = ref({} as any);
 const getRealTimeData = async () => {
 	const res: any = await getSewageNewestData({ projectSn: store.sn, devSn: selectDay.value});
@@ -124,10 +146,19 @@ const getRealTimeData = async () => {
 	console.log("获取实时监测", res);
 };
 
+// const getAlarmName = async () => {
+// 	const res: any = await getSewageTypeEnum({ projectSn: store.sn});
+// 	// if (res.result) {
+// 	// 	realTimeData.value = res.result;
+// 	// }
+// 	console.log("获取污水类型信息", res);
+// };
+
 onMounted(async () => {
 	getMeterTotal();
+	// getAlarmName();
 });
-// 
+//
 // onBeforeUnmount(async () => {
 // 	mitts.off("unloadPlatId");
 // });
diff --git a/src/views/sevenLargeScreen/greenConstruct/sewageMonitor/rightTop.vue b/src/views/sevenLargeScreen/greenConstruct/sewageMonitor/rightTop.vue
index 51fd001..29e3c77 100644
--- a/src/views/sevenLargeScreen/greenConstruct/sewageMonitor/rightTop.vue
+++ b/src/views/sevenLargeScreen/greenConstruct/sewageMonitor/rightTop.vue
@@ -32,12 +32,12 @@
 				<div class="detail-left">
 					<div class="title">
 						<span>实时值</span>
-						<span v-if="meterRead.waterTemperature > 0" class="trend" style="color: #81f279">{{ meterRead.waterTemperature || 0 }}% ↑</span>
-						<span v-if="meterRead.waterTemperature < 0" class="trend">{{ meterRead.waterTemperature || 0 }}% ↓</span>
+						<span v-if="meterRead.waterTemperatureRate > 0" class="trend" style="color: #81f279">{{ meterRead.waterTemperatureRate || 0 }}% ↑</span>
+						<span v-if="meterRead.waterTemperatureRate < 0" class="trend">{{ meterRead.waterTemperatureRate || 0 }}% ↓</span>
 						<!-- <span v-if="meterRead.waterTemperature == 0" class="trend" style="color: #81f279">{{ meterRead.waterTemperature || 0 }}%</span> -->
 					</div>
 					<div class="num">
-						<div class="text">{{ meterRead.waterTemperatureRate || 0 }}</div>
+						<div class="text">{{ meterRead.waterTemperature || 0 }}</div>
 						<div class="unit" style="margin-top: 12%">°C</div>
 					</div>
 				</div>
@@ -80,7 +80,7 @@ const sewageWarnThreshold = async () => {
 	const res: any = await sewageWarnThresholdList({ projectSn: store.sn, devSn: meterId.value });
 	console.log("告警数据对比", res);
 	if (res.result) {
-		thresholdData.value = res.result;
+		thresholdData.value = res.result[0];
 	} else {
 		thresholdData.value = {};
 	}
@@ -186,6 +186,8 @@ onBeforeUnmount(async () => {
 			}
 		}
 		.detail-right {
+			width: 200px;
+			margin-left: 50px;
 			.title {
 				font-size: 24px;
 				font-family: OPPOSans-Regular, OPPOSans;
diff --git a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/blueLineEchart.vue b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/blueLineEchart.vue
index b9e38d2..2843389 100644
--- a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/blueLineEchart.vue
+++ b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/blueLineEchart.vue
@@ -212,11 +212,6 @@ function drawChart() {
 onMounted(async () => {
 	drawChart();
 });
-
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
-onBeforeUnmount(async () => {
-	mitts.off("devSn");
-});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomLeft.vue b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomLeft.vue
index b146334..58a7d54 100644
--- a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomLeft.vue
+++ b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomLeft.vue
@@ -62,7 +62,7 @@ onMounted(async () => {
 	// getShortTrend();
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("waterId");
 });
diff --git a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomRight.vue b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomRight.vue
index d4ce79b..935d682 100644
--- a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomRight.vue
+++ b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomRight.vue
@@ -61,7 +61,7 @@ onMounted(async () => {
 	// getLongTrend();
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("waterId");
 });
diff --git a/src/views/sevenLargeScreen/headNoise/centerBottom.vue b/src/views/sevenLargeScreen/headNoise/centerBottom.vue
index 20dfb14..f79900b 100644
--- a/src/views/sevenLargeScreen/headNoise/centerBottom.vue
+++ b/src/views/sevenLargeScreen/headNoise/centerBottom.vue
@@ -23,10 +23,14 @@
 import Card from "@/components/card.vue";
 import { reactive, onMounted, ref } from "vue";
 import { getWeatherDataApi } from "@/api/modules/headNoise";
+import { getTaskTimeDetail } from "@/api/modules/schedulePlan";
+import { GlobalStore } from "@/stores";
+const store = GlobalStore();
+
 const weatherList = ref([]);
 //获取天气
 const loadWeather = async () => {
-	const res = await getWeatherDataApi({ cityid: "" });
+	const res = await getWeatherDataApi({ cityid: "", areaId: projectTimeInfo.value.areaCode});
 	let json = JSON.parse(res.result);
 	let list = json;
 	console.log("获取天气", res.result);
@@ -40,8 +44,16 @@ const loadWeather = async () => {
 		weatherList.value.push(element);
 	});
 };
-onMounted(() => {
+//获取项目信息
+const projectTimeInfo = ref({} as any);
+const getProjectInfo = async () => {
+	const res: any = await getTaskTimeDetail({ projectSn: store.sn });
+	console.log("获取项目信息", res);
+	projectTimeInfo.value = res.result;
 	loadWeather();
+};
+onMounted(() => {
+	getProjectInfo();
 });
 const weatherIcon = ref([
 	{
diff --git a/src/views/sevenLargeScreen/headNoise/leftBottom.vue b/src/views/sevenLargeScreen/headNoise/leftBottom.vue
index d73f812..75e06bf 100644
--- a/src/views/sevenLargeScreen/headNoise/leftBottom.vue
+++ b/src/views/sevenLargeScreen/headNoise/leftBottom.vue
@@ -342,7 +342,7 @@ onMounted(async () => {
 	});
 	
 });
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("currentDevDetail");
 	echarts.dispose;
diff --git a/src/views/sevenLargeScreen/laborManagement/circularGraph.vue b/src/views/sevenLargeScreen/laborManagement/circularGraph.vue
index b129cce..ac80734 100644
--- a/src/views/sevenLargeScreen/laborManagement/circularGraph.vue
+++ b/src/views/sevenLargeScreen/laborManagement/circularGraph.vue
@@ -342,7 +342,7 @@ const option = reactive({
 	color: color,
 	title: {
 		text: "出勤总人数",
-		top: "125",
+		top: "55%",
 		textAlign: "center",
 		left: "50%",
 		textStyle: {
@@ -495,13 +495,13 @@ onBeforeUnmount(() => {
 	position: relative;
 }
 .num {
-	width: 2%;
+	width: 50px;
 	font-family: sadigitalNumber;
 	font-size: calc(100vw * 24 / 1920);
 	color: #fff;
 	position: absolute;
 	top: 35%;
-	left: 47%;
+	left: 45%;
 	z-index: 9;
 	text-align: center;
 }
diff --git a/src/views/sevenLargeScreen/laborManagement/horizontaL.vue b/src/views/sevenLargeScreen/laborManagement/horizontaL.vue
index e9c1fbe..2fea0b0 100644
--- a/src/views/sevenLargeScreen/laborManagement/horizontaL.vue
+++ b/src/views/sevenLargeScreen/laborManagement/horizontaL.vue
@@ -236,7 +236,7 @@ onMounted(async () => {
 		getList(e);
 	});
 });
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("enterpriseId");
 });
diff --git a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomCenter.vue b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomCenter.vue
index 65c8695..9cd5e2f 100644
--- a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomCenter.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomCenter.vue
@@ -28,6 +28,7 @@
 							<span v-if="item.useStatus === 1">{{ stateOptions[item.useStatus - 1].label  }}</span>
 							<span v-if="item.useStatus === 2 || item.useStatus === 3" style="color: #edc55a;">{{ stateOptions[item.useStatus - 1].label  }}</span>
 							<span v-if="item.useStatus === 4" style="color: #ec6266;">{{ stateOptions[item.useStatus - 1].label  }}</span>
+							<span v-if="item.useStatus === 5" style="color: #ec6266;">{{ stateOptions[item.useStatus - 1].label  }}</span>
 						</div>
 					</div>
 					<div class="not-data" v-if="list.length == 0">
@@ -47,7 +48,7 @@
 					<div>任务单号<span>{{ detailData.taskNumber || " " }}</span></div>
 					<div>施工地点<span>{{ detailData.constructionSite || " " }}</span></div>
 					<div>设备名称<span>{{ detailData.devName || " " }}</span></div>
-					<div>操作员<span style="margin-left: 24%">{{ detailData.operator || " " }}</span></div>
+					<div>试验员<span style="margin-left: 24%">{{ detailData.operator || " " }}</span></div>
 					<div>工程名称<span>{{ detailData.projectName || " " }}</span></div>
 					<div>配比名称<span>{{ detailData.proportionName || " " }}</span></div>
 				</div>
@@ -63,6 +64,8 @@
 					<div v-if="detailData.useStatus && detailData.useStatus === 3">状态<span style="margin-left: 28%; color: yellow">{{ stateOptions[detailData.useStatus - 1].label }}</span></div>
 					<div v-if="detailData.useStatus && detailData.useStatus === 1">状态<span style="margin-left: 28%;">{{ stateOptions[detailData.useStatus - 1].label }}</span></div>
 					<div v-if="detailData.useStatus && detailData.useStatus === 4">状态<span style="margin-left: 28%; color: #ec6266">{{ stateOptions[detailData.useStatus - 1].label }}</span></div>
+					<div v-if="detailData.useStatus && detailData.useStatus === 5">状态<span style="margin-left: 28%; color: #ec6266">{{ stateOptions[detailData.useStatus - 1].label }}</span></div>
+
 				</div>
 			</div>
 			<div class="dataList">
diff --git a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomRight.vue b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomRight.vue
index 96df707..b7f4976 100644
--- a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomRight.vue
@@ -94,7 +94,7 @@ function drawEchart() {
 		},
 		title: {
 			text: max,
-			subtext: "材料总数",
+			subtext: "总盘数",
 			x: "27%",
 			y: "42%",
 			textAlign: "center",
diff --git a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topLeft.vue b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topLeft.vue
index 1b5598d..b913e0a 100644
--- a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topLeft.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topLeft.vue
@@ -85,20 +85,20 @@ function getMonthData(type: any) {
 function initOption() {
 	option.value = {
 		// backgroundColor: '#071c3a',
-		legend: {
-			align: "left",
-			top: "5%",
-			left: "2%",
-			textStyle: {
-				color: "#FFFFFF",
-				fontSize: 14,
-				padding: [0, 0, 0, 10]
-			},
-			icon: "rect",
-			itemGap: 25,
-			itemWidth: 10,
-			itemHeight: 10
-		},
+		// legend: {
+		// 	align: "left",
+		// 	top: "5%",
+		// 	left: "2%",
+		// 	textStyle: {
+		// 		color: "#FFFFFF",
+		// 		fontSize: 14,
+		// 		padding: [0, 0, 0, 10]
+		// 	},
+		// 	icon: "rect",
+		// 	itemGap: 25,
+		// 	itemWidth: 10,
+		// 	itemHeight: 10
+		// },
 		// dataZoom: [
 		// 	{
 		// 		// orient: "vertical", //水平显示
diff --git a/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/bottomRight.vue b/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/bottomRight.vue
index 889faa8..3cbd544 100644
--- a/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/bottomRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/bottomRight.vue
@@ -13,6 +13,7 @@
 					<div>设计强度</div>
 					<div>强度代表值(Mpa)</div>
 					<div>试验时间</div>
+					<div>状态</div>
 					<div>操作</div>
 				</div>
 				<el-scrollbar class="list-box" ref="refScrollbar">
@@ -31,9 +32,13 @@
 						<div class="single-text" :title="item.designStrength">{{ item.designStrength }}</div>
 						<div class="single-text" :title="item.intensityRepresentativeValue">{{ item.intensityRepresentativeValue }}</div>
 						<div class="single-text" :title="item.testTime">{{ item.testTime }}</div>
+						<div class="single-text" :title="nameOptions[item.status - 1].label" v-if="item.status > 0 && item.status < 3">
+							{{ nameOptions[item.status - 1].label }}
+						</div>
+						<div v-else>-</div>
 						<div>
 							<span class="listNumber" @click="openDetailDialog(item)">详情</span>
-							<span class="listNumber" style="margin-left: 20px">报告</span>
+							<span class="listNumber" style="margin-left: 20px" v-if="item.uploadAttachment" @click="downloadFn(item)">报告</span>
 						</div>
 					</div>
 					<div class="not-data" v-if="list.length == 0">
@@ -66,6 +71,21 @@ const openDetailDialog = (item: any) => {
 	// console.log(devDetailRef.value);
 };
 
+const nameOptions = ref([
+	{
+		label: "合格",
+		value: 1
+	},
+	{
+		label: "不合格",
+		value: 2
+	},
+	{
+		label: "未判定",
+		value: 3
+	}
+]);
+
 const warnType = ref([
 	{
 		label: "混凝土试件抗压强度试验",
@@ -269,6 +289,27 @@ const list = ref([
 	}
 ]);
 
+const BASEURL = import.meta.env.VITE_API_URL;
+function downloadFn(item: any) {
+	console.log(item);
+	let imageUrl = JSON.parse(item.uploadAttachment)[0].url;
+	console.log("url", imageUrl);
+	let x = new XMLHttpRequest();
+	console.log(BASEURL + "/image/" + imageUrl);
+	x.open("GET", BASEURL + "/image/" + imageUrl, true);
+	x.responseType = "blob";
+	x.onload = function (e) {
+		let url = window.URL.createObjectURL(x.response);
+		let a = document.createElement("a");
+		console.log(url);
+		a.href = url;
+		a.download = item.testNumber;
+		a.click();
+		document.removeChild(a);
+	};
+	x.send();
+}
+
 const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
 const ScrollbarTop = ref(0);
 
diff --git a/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/curve-line.vue b/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/curve-line.vue
index 91e1d09..3884dce 100644
--- a/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/curve-line.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/curve-line.vue
@@ -3,7 +3,7 @@
 		<div class="load-content">
 			<div id="curveLine" ref="curveLine" style="width: 1000px; height: 350px"></div>
 		</div>
-		<div class="not-data" v-if="lineConfig.length == 0">
+		<div class="not-data" v-if="props.lineConfig.length == 0">
 			<img src="@/assets/images/noData.png" alt="" />
 			<p>暂无数据</p>
 		</div>
@@ -14,13 +14,35 @@
 import Card from "@/components/card.vue";
 // import symbolIcon2 from "@/assets/images/toxicGasMonitor/lineIcon2.png";
 
-import { onMounted, ref, onBeforeUnmount } from "vue";
+import { onMounted, ref, onBeforeUnmount, watch } from "vue";
 import * as echarts from "echarts";
 // import { getSelectDataListApi } from "@/api/modules/distribution";
 // import Card from "@/components/card.vue";
 import { GlobalStore } from "@/stores";
 import mitts from "@/utils/bus"; //兄弟组件传值
 const store = GlobalStore();
+
+// ts
+type Props = {
+	lineConfig?: any; // 传入x轴对应的数据
+};
+// withDefaults 定义默认值(传入的数据类型同默认值)
+const props = withDefaults(defineProps<Props>(), {
+	lineConfig: [],
+	// num: () => [12, 13, 14] // 复杂数据类型使用函数方式
+});
+
+watch(
+	() => props.lineConfig,
+	newVal => {
+		console.log(newVal, "newVal");
+		if (newVal) {
+			// props.xData = newVal;
+			drawChart();
+		}
+	}
+);
+
 // x轴
 // let twenty_four_time = ref([] as any);
 // Y轴单位
@@ -37,8 +59,8 @@ let unit = ref("力值/kN" as any);
 
 // 图表数据项
 let option = ref(null as any);
-// 选中
-let lineConfig = ref([]) as any;
+// // 选中
+// let lineConfig = ref([]) as any;
 
 let typeList = ref([
 	{
@@ -239,7 +261,7 @@ function initOption() {
 				}
 			}
 		],
-		series: lineConfig.value
+		series: props.lineConfig
 		// [
 		// 	// {
 		// 	// 	showAllSymbol: false,
@@ -282,7 +304,7 @@ function initOption() {
 
 function drawChart() {
 	initOption();
-	// console.log("绘制前数据", option.value);
+	console.log("绘制前数据", option.value);
 	let chartDom = document.getElementById("curveLine");
 	if (chartDom) {
 		chartDom.removeAttribute("_echarts_instance_");
@@ -294,26 +316,27 @@ function drawChart() {
 let startDraw = ref(false) as any;
 
 onMounted(async () => {
-	mitts.on("pressureLine", e => {
-		lineConfig.value = e;
-		console.log("接收试验曲线数值", e);
-	});
-	mitts.on("pressureLineDraw", e => {
-		if (lineConfig.value.length == 0) {
-			return;
-		}
-		startDraw.value = e;
+	// mitts.on("comPressureLine", e => {
+	// 	props.lineConfig = e;
+	// 	console.log("接收试验曲线数值", e);
+	// });
+	// mitts.on("comPressureLineDraw", e => {
+	// 	if (props.lineConfig.length == 0) {
+	// 		return;
+	// 	}
+	// 	startDraw.value = e;
+	// 	console.log("图线绘制", e);
+	// });
+	if (props.lineConfig.length > 0) {
 		drawChart();
-		console.log("图线绘制", e);
-	});
-
+	}
 	// getMeterTotal();
 });
 
 onBeforeUnmount(async () => {
 	startDraw.value = false;
-	mitts.off("pressureLine");
-	mitts.off("pressureLineDraw");
+	mitts.off("comPressureLine");
+	mitts.off("comPressureLineDraw");
 });
 </script>
 
diff --git a/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/dev-detail-dialog.vue b/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/dev-detail-dialog.vue
index d544a98..a69af4e 100644
--- a/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/dev-detail-dialog.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/compressionIntegrate/dev-detail-dialog.vue
@@ -13,37 +13,38 @@
 					<div class="base-left">
 						<div class="base-text">
 							<div>施工部位</div>
-							<div>{{ detailData.constructionPart || '' }}</div>
+							<div>{{ detailData.constructionPart || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>试验类型</div>
-							<div>{{ detailData.testType || '' }}</div>
+							<div v-if="detailData.testType > 0 && detailData.testType < 17">{{ warnType[detailData.testType - 1].label }}</div>
+							<div v-else>-</div>
 						</div>
 						<div class="base-text">
 							<div>试验编号</div>
-							<div>{{ detailData.testNumber || '' }}</div>
+							<div>{{ detailData.testNumber || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>设备名称</div>
-							<div>{{ detailData.deviceName || '' }}</div>
+							<div>{{ detailData.deviceName || "" }}</div>
 						</div>
 					</div>
 					<div class="base-right">
 						<div class="base-text">
 							<div>设备编号</div>
-							<div>{{ detailData.devSn || '' }}</div>
+							<div>{{ detailData.devSn || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>制件时间</div>
-							<div>{{ detailData.productionTime || '' }}</div>
+							<div>{{ detailData.productionTime || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>试验开始时间</div>
-							<div>{{ detailData.testTime || '' }}</div>
+							<div>{{ detailData.testTime || "" }}</div>
 						</div>
 						<div class="base-text">
-							<div>操作员</div>
-							<div>{{ detailData.operator || '' }}</div>
+							<div>试验员</div>
+							<div>{{ detailData.operator || "" }}</div>
 						</div>
 					</div>
 				</div>
@@ -56,21 +57,21 @@
 				<table>
 					<tr>
 						<td>设备强度</td>
-						<td>{{ detailData.equipmentStrength || '' }}</td>
+						<td>{{ detailData.equipmentStrength || "" }}</td>
 						<td>强度代表值(Mpa)</td>
-						<td>{{ detailData.intensityRepresentativeValue || '' }}</td>
+						<td>{{ detailData.intensityRepresentativeValue || "" }}</td>
 					</tr>
 					<tr>
 						<td>试件尺寸</td>
-						<td>{{ detailData.specimenSize || '' }}</td>
+						<td>{{ detailData.specimenSize || "" }}</td>
 						<td>试件龄期</td>
-						<td>{{ detailData.specimenAge || '' }}</td>
+						<td>{{ detailData.specimenAge || "" }}</td>
 					</tr>
 					<tr>
 						<td>试件面积</td>
-						<td>{{ detailData.specimenArea || '' }}</td>
+						<td>{{ detailData.specimenArea || "" }}</td>
 						<td>公称直径(mm)</td>
-						<td>{{ detailData.nominalDiameter || '' }}</td>
+						<td>{{ detailData.nominalDiameter || "" }}</td>
 					</tr>
 				</table>
 				<div class="base-title" style="margin-bottom: 3%">试块测试值</div>
@@ -99,8 +100,8 @@
 					</el-scrollbar>
 				</div>
 			</div>
-			<div class="curve-line" v-show="checked === 2">
-				<curve-line></curve-line>
+			<div class="curve-line" v-if="checked === 2">
+				<curve-line :lineConfig="steelLineList"></curve-line>
 			</div>
 			<div class="close-icon" @click="closeDialog">
 				<el-icon><Close /></el-icon>
@@ -112,9 +113,9 @@
 <script lang="ts" setup>
 import { reactive, ref, onMounted } from "vue";
 import { GlobalStore } from "@/stores";
-import curveLine from "@/views/sevenLargeScreen/largeMachinery/pressureTestMachine/curve-line.vue";
+import curveLine from "@/views/sevenLargeScreen/largeMachinery/compressionIntegrate/curve-line.vue";
 import mitts from "@/utils/bus"; //兄弟组件传值
-import { pressureBlockNumberList, pressureBlockDataList } from "@/api/modules/largeMachinery";
+import { pressureBlockNumberList2, pressureBlockDataList2 } from "@/api/modules/largeMachinery";
 
 const store = GlobalStore();
 let showDialog = ref(false as any);
@@ -130,6 +131,7 @@ function closeDialog() {
 	showDialog.value = false;
 	checked.value = 1;
 	finishLine.value = false;
+	steelLineList.value = [];
 }
 
 // 选中
@@ -140,8 +142,10 @@ function getdayData(type: any) {
 }
 
 function getWeekData(type: any) {
+	// console.log("发送", steelLineList.value);
+	// mitts.emit("comPressureLine", steelLineList.value);
 	checked.value = type;
-	mitts.emit("pressureLineDraw", true);
+	mitts.emit("comPressureLineDraw", true);
 }
 let detailData = ref({} as any);
 // let dialogIndex = ref(null as any);
@@ -152,32 +156,34 @@ function openDialog(item: any) {
 	// dialogIndex.value = type;
 	dialogTitle.value = "设备详情";
 	getDetailList(item.id);
+	setTimeout(() => {
+		showDialog.value = true;
+	}, 1000);
 }
 
 let steelBeamList = ref([] as any);
 let steelLineList = ref([] as any);
 let finishLine = ref(false as any);
 const getDetailList = async (detailId: any) => {
-	const res: any = await pressureBlockNumberList({ projectSn: store.sn, pressureTestMachineManageId: detailId });
+	const res: any = await pressureBlockNumberList2({ projectSn: store.sn, antiPressureFoldManageId: detailId });
 	if (res.result.length > 0) {
-		// console.log("试块列表", res.result);
+		console.log("抗压抗折试块列表", res.result);
 		steelBeamList.value = res.result;
 		for (let index = 0; index < res.result.length; index++) {
-			const element = res.result[index];
-			getLineList(element);
 			if (index === res.result.length - 1) {
 				console.log("最后一次循环");
 				finishLine.value = true;
 			}
+			const element = res.result[index];
+			getLineList(element);
+			console.log("循环第", index);
 		}
 		// dialogShow = true
-	} else {
-		showDialog.value = true;
 	}
 };
 
 const getLineList = async (item: any) => {
-	const res: any = await pressureBlockDataList({ projectSn: store.sn, pressureTestMachineManageBlockNumberId: item.id });
+	const res: any = await pressureBlockDataList2({ projectSn: store.sn, antiPressureFoldManageBlockNumberId: item.id });
 	if (res.result.length > 0) {
 		// x y轴
 		const arr1 = res.result.map(item => item.code);
@@ -193,18 +199,80 @@ const getLineList = async (item: any) => {
 			type: "line",
 			smooth: true
 		};
-		steelLineList.value.push(currentData);
-	}
-	if (finishLine.value) {
-		setTimeout(() => {
-			showDialog.value = true;
-			// console.log("发送pressureLine", steelLineList.value);
-			mitts.emit("pressureLine", steelLineList.value);
-		}, 1000);
-		// console.log("曲线数据", steelLineList.value, "试块列表", steelBeamList.value);
+		// steelLineList.value.push(currentData);
+		if (combinedArray.length > 0) {
+			steelLineList.value.push(currentData);
+		}
 	}
 };
 
+const warnType = ref([
+	{
+		label: "混凝土试件抗压强度试验",
+		value: 1
+	},
+	{
+		label: "钢筋试验",
+		value: 2
+	},
+	{
+		label: "钢筋焊接接头试验",
+		value: 3
+	},
+	{
+		label: "钢筋机械连接接头试验",
+		value: 4
+	},
+	{
+		label: "水泥砂浆立方体抗压强度试验",
+		value: 5
+	},
+	{
+		label: "水泥砂浆立方体抗压强度试验(建筑)",
+		value: 6
+	},
+	{
+		label: "水泥净浆物理性能试验",
+		value: 7
+	},
+	{
+		label: "水泥胶砂强度试验",
+		value: 8
+	},
+	{
+		label: "水泥胶砂抗折试验",
+		value: 9
+	},
+	{
+		label: "水泥净浆抗折试验",
+		value: 10
+	},
+	{
+		label: "水泥混凝土圆柱体轴心抗压强度试验",
+		value: 11
+	},
+	{
+		label: "后张预应力孔道压浆抗压强度试验",
+		value: 12
+	},
+	{
+		label: "后张预应力孔道压浆抗折强度试验",
+		value: 13
+	},
+	{
+		label: "无机结合料稳定材料无侧限抗压强度试验",
+		value: 14
+	},
+	{
+		label: "复检钢筋焊接接头试验",
+		value: 15
+	},
+	{
+		label: "复检钢筋机械连接接头试验",
+		value: 16
+	}
+]);
+
 // 暴露给父组件的参数和方法(外部需要什么，都可以从这里暴露出去)
 defineExpose({
 	openDialog
diff --git a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomCenter.vue b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomCenter.vue
index 193116d..e22fc06 100644
--- a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomCenter.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomCenter.vue
@@ -18,14 +18,14 @@
 						<div>{{ index + 1 }}</div>
 						<div>{{ item.powerLevel }}</div>
 						<div>{{ item.devName }}</div>
-						<div>{{ item.actualQuantity }}</div>
 						<div>{{ item.pouringPart }}</div>
-						<div>{{ item.water_binderRatio }}</div>
+						<div>{{ item.actualQuantity }}</div>
+						<div>{{ item.waterBinderRatio }}</div>
 						<div>{{ item.dischargeTime }}</div>
 						<div style="margin-left: 35px;text-align: center" v-if="item.useStatus">
 							<span v-if="item.useStatus === 1">{{ stateOptions[item.useStatus - 1].label  }}</span>
 							<span v-if="item.useStatus === 2 || item.useStatus === 3" style="color: #edc55a;">{{ stateOptions[item.useStatus - 1].label  }}</span>
-							<span v-if="item.useStatus === 4" style="color: #ec6266;">{{ stateOptions[item.useStatus - 1].label  }}</span>
+							<span v-if="item.useStatus === 4 || item.useStatus === 5" style="color: #ec6266;">{{ stateOptions[item.useStatus - 1].label  }}</span>
 						</div>
 					</div>
 					<div class="not-data" v-if="list.length == 0">
@@ -45,7 +45,7 @@
 					<div>任务单号<span>{{ detailData.taskNumber || " " }}</span></div>
 					<div>施工地点<span>{{ detailData.constructionSite || " " }}</span></div>
 					<div>设备名称<span>{{ detailData.devName || " " }}</span></div>
-					<div>操作员<span style="margin-left: 24%">{{ detailData.operator || " " }}</span></div>
+					<div>试验员<span style="margin-left: 24%">{{ detailData.operator || " " }}</span></div>
 					<div>强度等级<span>{{ detailData.powerLevel || " " }}</span></div>
 					<div>实际方量（m³）<span style="margin-left: 8%">{{ detailData.actualQuantity || 0 }}</span></div>
 				</div>
@@ -60,6 +60,7 @@
 					<div v-if="detailData.useStatus && detailData.useStatus === 3">状态<span style="margin-left: 28%; color: yellow">{{ stateOptions[detailData.useStatus - 1].label }}</span></div>
 					<div v-if="detailData.useStatus && detailData.useStatus === 1">状态<span style="margin-left: 28%;">{{ stateOptions[detailData.useStatus - 1].label }}</span></div>
 					<div v-if="detailData.useStatus && detailData.useStatus === 4">状态<span style="margin-left: 28%; color: #ec6266">{{ stateOptions[detailData.useStatus - 1].label }}</span></div>
+					<div v-if="detailData.useStatus && detailData.useStatus === 5">状态<span style="margin-left: 28%; color: #ec6266">{{ stateOptions[detailData.useStatus - 1].label }}</span></div>
 				</div>
 			</div>
 			<div class="dataList">
diff --git a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomRight.vue b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomRight.vue
index ed552dd..5500d67 100644
--- a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomRight.vue
@@ -94,7 +94,7 @@ function drawEchart() {
 		},
 		title: {
 			text: max,
-			subtext: "材料总数",
+			subtext: "总盘数",
 			x: "27%",
 			y: "42%",
 			textAlign: "center",
diff --git a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topLeft.vue b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topLeft.vue
index e1dcb02..c1d6e11 100644
--- a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topLeft.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topLeft.vue
@@ -85,20 +85,22 @@ function getMonthData(type: any) {
 function initOption() {
 	option.value = {
 		// backgroundColor: '#071c3a',
-		legend: {
-			align: "left",
-			top: "5%",
-			left: "2%",
-			textStyle: {
-				color: "#FFFFFF",
-				fontSize: 14,
-				padding: [0, 0, 0, 10]
-			},
-			icon: "rect",
-			itemGap: 25,
-			itemWidth: 10,
-			itemHeight: 10
-		},
+		// legend: {
+		// 	type: "scroll",
+		// 	scrollDataIndex: 1, // 设置滚动的起始位置
+		// 	orient: "vertical",
+		// 	top: "5%",
+		// 	left: "2%",
+		// 	textStyle: {
+		// 		color: "#FFFFFF",
+		// 		fontSize: 14,
+		// 		padding: [0, 0, 0, 10]
+		// 	},
+		// 	icon: "rect",
+		// 	itemGap: 25,
+		// 	itemWidth: 10,
+		// 	itemHeight: 10
+		// },
 		// dataZoom: [
 		// 	{
 		// 		// orient: "vertical", //水平显示
@@ -324,7 +326,7 @@ onMounted(async () => {
 	// });
 	getMeterTotal();
 });
-// 
+//
 // onBeforeUnmount(async () => {
 // 	mitts.off("unloadPlatId");
 // });
diff --git a/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomCenter.vue b/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomCenter.vue
index d2e4b85..7b4868b 100644
--- a/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomCenter.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomCenter.vue
@@ -7,62 +7,126 @@
 						<div class="contain-title">大车</div>
 						<div class="contain-row">
 							<div class="text">行程</div>
-							<div class="num">99.93m</div>
-							<div class="state">正常</div>
+							<div class="num">{{ currentData.bigCarTrip || 0 }} m</div>
+							<div
+								class="state"
+								v-if="alarmData && alarmData.largeCarRangePreAlarm != null"
+								:style="{
+									background: tripTypeEnum[alarmData.largeCarRangePreAlarm].color
+								}"
+							>
+								{{ tripTypeEnum[alarmData.largeCarRangePreAlarm].tripType }}
+							</div>
 						</div>
 						<div class="contain-row">
 							<div class="text">速度</div>
-							<div class="num">3m/min</div>
+							<div class="num">{{ currentData.bigCartSpeed || 0 }} m/min</div>
 						</div>
 					</div>
 					<div class="right-contain">
-						<div class="contain-title">主钩1</div>
+						<div class="contain-title">主钩</div>
 						<div class="contain-row">
 							<div class="text">重量</div>
-							<div class="num">30.84t</div>
-							<div class="state" style="background: #eea959">中级预警</div>
+							<div class="num">{{ currentData.mainHookLiftingWeight || 0 }} t</div>
+							<div
+								class="state"
+								v-if="alarmData && alarmData.masterHookWeightAlarm != null"
+								:style="{
+									background: tripTypeEnum[alarmData.masterHookWeightAlarm].color
+								}"
+							>
+								{{ tripTypeEnum[alarmData.masterHookWeightAlarm].tripType }}
+							</div>
 						</div>
 						<div class="contain-row">
 							<div class="text">高度</div>
-							<div class="num">9.18m</div>
-							<div class="state">正常</div>
+							<div class="num">{{ currentData.mainHookHeight || 0 }} m</div>
+							<!-- <div
+								class="state"
+								v-if="alarmData && alarmData.secondSubHookWeightAlarm != null"
+								:style="{
+									background: tripTypeEnum[alarmData.secondSubHookWeightAlarm].color
+								}"
+							>
+								{{ tripTypeEnum[alarmData.secondSubHookWeightAlarm].tripType }}
+							</div> -->
 						</div>
 						<div class="contain-row">
 							<div class="text">速度</div>
-							<div class="num">3m/s</div>
-							<div class="state">正常</div>
+							<div class="num">{{ currentData.mainHookSpeed || 0 }} m/s</div>
+							<!-- <div
+								class="state"
+								v-if="alarmData && alarmData.secondSubHookWeightAlarm != null"
+								:style="{
+									background: tripTypeEnum[alarmData.secondSubHookWeightAlarm].color
+								}"
+							>
+								{{ tripTypeEnum[alarmData.secondSubHookWeightAlarm].tripType }}
+							</div> -->
 						</div>
 					</div>
 				</div>
 				<div class="work-data-item">
 					<div class="left-contain">
-						<div class="contain-title">大车</div>
+						<div class="contain-title">小车</div>
 						<div class="contain-row">
 							<div class="text">行程</div>
-							<div class="num">99.93m</div>
-							<div class="state">正常</div>
+							<div class="num">{{ currentData.carTrip || 0 }} m</div>
+							<div
+								class="state"
+								v-if="alarmData && alarmData.smallCarRangePreAlarm != null"
+								:style="{
+									background: tripTypeEnum[alarmData.smallCarRangePreAlarm].color
+								}"
+							>
+								{{ tripTypeEnum[alarmData.smallCarRangePreAlarm].tripType }}
+							</div>
 						</div>
 						<div class="contain-row">
 							<div class="text">速度</div>
-							<div class="num">3m/min</div>
+							<div class="num">{{ currentData.carSpeed || 0 }} m/min</div>
 						</div>
 					</div>
 					<div class="right-contain">
-						<div class="contain-title">副钩1</div>
+						<div class="contain-title">副钩</div>
 						<div class="contain-row">
 							<div class="text">重量</div>
-							<div class="num">30.84t</div>
-							<div class="state" style="background: #eea959">中级预警</div>
+							<div class="num">{{ currentData.auxiliaryHookLiftingWeight || 0 }} t</div>
+							<div
+								class="state"
+								v-if="alarmData && alarmData.subHookWeightAlarm != null"
+								:style="{
+									background: tripTypeEnum[alarmData.subHookWeightAlarm].color
+								}"
+							>
+								{{ tripTypeEnum[alarmData.subHookWeightAlarm].tripType }}
+							</div>
 						</div>
 						<div class="contain-row">
 							<div class="text">高度</div>
-							<div class="num">9.18m</div>
-							<div class="state">正常</div>
+							<div class="num">{{ currentData.auxiliaryHookHeight || 0 }} m</div>
+							<!-- <div
+								class="state"
+								v-if="alarmData && alarmData.subHookWeightAlarm != null"
+								:style="{
+									background: tripTypeEnum[alarmData.subHookWeightAlarm].color
+								}"
+							>
+								{{ tripTypeEnum[alarmData.subHookWeightAlarm].tripType }}
+							</div> -->
 						</div>
 						<div class="contain-row">
 							<div class="text">速度</div>
-							<div class="num">3m/s</div>
-							<div class="state">正常</div>
+							<div class="num">{{ currentData.auxiliaryHookSpeed || 0 }} m/s</div>
+							<!-- <div
+								class="state"
+								v-if="alarmData && alarmData.secondSubHookWeightAlarm != null"
+								:style="{
+									background: tripTypeEnum[alarmData.secondSubHookWeightAlarm].color
+								}"
+							>
+								{{ tripTypeEnum[alarmData.secondSubHookWeightAlarm].tripType }}
+							</div> -->
 						</div>
 					</div>
 				</div>
@@ -73,8 +137,64 @@
 
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
-import { reactive, ref, onMounted } from "vue";
-onMounted(async () => {});
+import { getGantryCraneCurrentData2, bridgeErectMachineAlarmList } from "@/api/modules/gantryCrane";
+import { reactive, ref, onMounted, onBeforeUnmount } from "vue";
+import mitts from "@/utils/bus"; //兄弟组件传值
+import { GlobalStore } from "@/stores";
+const store = GlobalStore();
+
+let currentData = ref({});
+// 实时数据
+const getGantryCurrentData = async () => {
+	const res: any = await getGantryCraneCurrentData2({ projectSn: store.sn, devSn: gantryCraneDevSn.value });
+	if (res.result) {
+		currentData.value = res.result;
+	}
+	console.log("实时数据", res);
+};
+// 报警数据
+let alarmData = ref({}) as any;
+const getGantryAlarmData = async () => {
+	const res: any = await bridgeErectMachineAlarmList({ projectSn: store.sn, devSn: gantryCraneDevSn.value });
+	if (res.result) {
+		alarmData.value = res.result.records[0];
+	} else {
+		alarmData.value = {};
+	}
+	console.log("报警数据", alarmData.value);
+};
+
+// 报警状态 0: 正常1: 报警
+let tripTypeEnum = ref([
+	{
+		value: 0,
+		tripType: "正常",
+		color: "#48da39"
+	},
+	{
+		value: 1,
+		tripType: "报警",
+		color: "#ec6266"
+	}
+]);
+
+let gantryCraneDevSn = ref("") as any;
+onMounted(async () => {
+	mitts.on("gantryCraneDevSn", e => {
+		console.log("作业数据接收值", e);
+		gantryCraneDevSn.value = e;
+		getGantryCurrentData();
+		getGantryAlarmData();
+		// gerUserVideo();
+		// setTimeout(() => {
+		// 	gerUserVideo();
+		// }, 500);
+	});
+});
+//  
+onBeforeUnmount(async () => {
+	mitts.off("gantryCraneDevSn");
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomLeft.vue b/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomLeft.vue
index 36cc7d8..12803ae 100644
--- a/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomLeft.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomLeft.vue
@@ -4,8 +4,8 @@
 			<div class="history-content">
 				<div>
 					<div class="select-right">
-						<div class="week selected" @click="getWeekData(1)" :class="checked == 1 ? 'active' : ''">近7日</div>
-						<div class="month selected" @click="getMonthData(2)" :class="checked == 2 ? 'active' : ''">本月</div>
+						<div class="week selected" @click="getWeekData(2)" :class="checked == 2 ? 'active' : ''">近7日</div>
+						<div class="month selected" @click="getMonthData(3)" :class="checked == 3 ? 'active' : ''">本月</div>
 					</div>
 				</div>
 				<!-- <div id="waterShortTerm" ref="waterShortTerm" style="width: 100%; height: 100%"></div>
@@ -24,6 +24,7 @@
 </template>
 
 <script lang="ts" setup>
+import { getWorkTimeAnalysis2 } from "@/api/modules/gantryCrane";
 import Card from "@/components/card.vue";
 import symbolIcon from "@/assets/images/lineSymbol.png";
 import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
@@ -48,78 +49,96 @@ let lineGrid = ref({
 });
 
 // 选中
-let checked = ref(1);
+let checked = ref(2);
 function getWeekData(type: any) {
 	checked.value = type;
-	let currentWeek = getRecentSevenDays();
-	// console.log(currentWeek, "近七天");
-	// 模拟数据改变
-	xData.value = currentWeek;
-	yData.value = [20, 15, 25, 15, 25, 35, 12];
+	getWorkData();
+	// let currentWeek = getRecentSevenDays();
+	// // console.log(currentWeek, "近七天");
+	// // 模拟数据改变
+	// xData.value = currentWeek;
+	// yData.value = [20, 15, 25, 15, 25, 35, 12];
 }
 function getMonthData(type: any) {
 	checked.value = type;
-	let currentWeek = getPassedDaysOfMonth();
-	// console.log(currentWeek.length, "本月");
-	let testyData: any = [];
-	for (let i = 0; i < currentWeek.length; i++) {
-		testyData.push((i % 2) + 10);
-	}
-	xData.value = currentWeek;
-	yData.value = testyData;
+	getWorkData();
+	// let currentWeek = getPassedDaysOfMonth();
+	// // console.log(currentWeek.length, "本月");
+	// let testyData: any = [];
+	// for (let i = 0; i < currentWeek.length; i++) {
+	// 	testyData.push((i % 2) + 10);
+	// }
+	// xData.value = currentWeek;
+	// yData.value = testyData;
 }
 
-//获取近七天的日期
-function getRecentSevenDays() {
-	const dates: any = [];
-	const millisecondsPerDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
-	const today = new Date(); // 当前日期
+// //获取近七天的日期
+// function getRecentSevenDays() {
+// 	const dates: any = [];
+// 	const millisecondsPerDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
+// 	const today = new Date(); // 当前日期
 
-	for (let i = 0; i < 7; i++) {
-		const date = new Date(today.getTime() - i * millisecondsPerDay);
-		// 获取年
-		const year = today.getFullYear();
-		const month = ("0" + (date.getMonth() + 1)).slice(-2);
-		const day = ("0" + date.getDate()).slice(-2);
-		dates.unshift(`${year}-${month}-${day}`);
+// 	for (let i = 0; i < 7; i++) {
+// 		const date = new Date(today.getTime() - i * millisecondsPerDay);
+// 		// 获取年
+// 		const year = today.getFullYear();
+// 		const month = ("0" + (date.getMonth() + 1)).slice(-2);
+// 		const day = ("0" + date.getDate()).slice(-2);
+// 		dates.unshift(`${year}-${month}-${day}`);
+// 	}
+// 	return dates;
+// }
+
+// // 获取本月到今天的日期
+// function getPassedDaysOfMonth() {
+// 	// 存放数据的数组
+// 	const dates: any = [];
+// 	// 获取当前时间的时间戳
+// 	const today = new Date();
+// 	// 获取年
+// 	const year = today.getFullYear();
+// 	// 获取月
+// 	const month = today.getMonth();
+// 	// 获取当前月份第一天的时间戳
+// 	const startDate = new Date(year, month, 1); // 月份从 0 开始，所以 8 表示 9 月
+
+// 	let currentDate = startDate;
+// 	// 遍历从这个月第一天到现在的日期数
+// 	while (currentDate <= today) {
+// 		const month = currentDate.getMonth() + 1;
+// 		const day = currentDate.getDate();
+// 		dates.push(`${year}-${("0" + month).slice(-2)}-${("0" + day).slice(-2)}`);
+
+// 		currentDate.setDate(currentDate.getDate() + 1);
+// 	}
+
+// 	return dates;
+// }
+
+const getWorkData = async () => {
+	const res: any = await getWorkTimeAnalysis2({ projectSn: store.sn, type: checked.value});
+	console.log("工作时长分析(h)", res);
+	if (res.result.length > 0) {
+		const data = res.result;
+		xData.value = data.map((item: any) => item.x);
+		yData.value = data.map((item: any) => item.y);
 	}
-	return dates;
-}
-
-// 获取本月到今天的日期
-function getPassedDaysOfMonth() {
-	// 存放数据的数组
-	const dates: any = [];
-	// 获取当前时间的时间戳
-	const today = new Date();
-	// 获取年
-	const year = today.getFullYear();
-	// 获取月
-	const month = today.getMonth();
-	// 获取当前月份第一天的时间戳
-	const startDate = new Date(year, month, 1); // 月份从 0 开始，所以 8 表示 9 月
-
-	let currentDate = startDate;
-	// 遍历从这个月第一天到现在的日期数
-	while (currentDate <= today) {
-		const month = currentDate.getMonth() + 1;
-		const day = currentDate.getDate();
-		dates.push(`${year}-${("0" + month).slice(-2)}-${("0" + day).slice(-2)}`);
-
-		currentDate.setDate(currentDate.getDate() + 1);
-	}
-
-	return dates;
-}
+};
 
+let gantryCraneDevSn = ref("") as any;
 onMounted(async () => {
-	getWeekData(1);
+	// mitts.on("gantryCraneDevSn", e => {
+	// 	console.log("作业数据接收值", e);
+	// 	gantryCraneDevSn.value = e;
+	// 	getWorkData();
+	// });
+	getWorkData();
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
-onBeforeUnmount(async () => {
-	mitts.off("devSn");
-});
+// //  
+// onBeforeUnmount(async () => {
+// 	mitts.off("gantryCraneDevSn");
+// });
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomRight.vue b/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomRight.vue
index c09f07d..2e355fe 100644
--- a/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/erectCrane/bottomRight.vue
@@ -1,5 +1,5 @@
 <template>
-	<Card title="环境风速(m/s)">
+	<Card title="近七天最高风速统计">
 		<div class="gantry-bottom-left">
 			<div class="history-content">
 				<!-- <div>
@@ -24,6 +24,7 @@
 </template>
 
 <script lang="ts" setup>
+import { countWindSpeed } from "@/api/modules/gantryCrane";
 import Card from "@/components/card.vue";
 import symbolIcon from "@/assets/images/lineSymbol.png";
 import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
@@ -109,13 +110,30 @@ let lineGrid = ref({
 
 // 	return dates;
 // }
+const getWorkData = async () => {
+	const res: any = await countWindSpeed({ projectSn: store.sn, type: 1, devSn: gantryCraneDevSn.value });
+	console.log("统计风速报警次数", res);
+	if (res.result.length > 0) {
+		const data = res.result;
+		xData.value = data.map((item: any) => item.x);
+		yData.value = data.map((item: any) => item.y);
+	}
+};
 
-onMounted(async () => {});
-
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
-onBeforeUnmount(async () => {
-	// mitts.off("devSn");
+let gantryCraneDevSn = ref("") as any;
+onMounted(async () => {
+	// mitts.on("gantryCraneDevSn", e => {
+	// 	console.log("作业数据接收值", e);
+	// 	gantryCraneDevSn.value = e;
+	// 	getWorkData();
+	// });
+	getWorkData();
 });
+
+// //  
+// onBeforeUnmount(async () => {
+// 	mitts.off("gantryCraneDevSn");
+// });
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sevenLargeScreen/largeMachinery/erectCrane/gantry-video.vue b/src/views/sevenLargeScreen/largeMachinery/erectCrane/gantry-video.vue
new file mode 100644
index 0000000..e492ae3
--- /dev/null
+++ b/src/views/sevenLargeScreen/largeMachinery/erectCrane/gantry-video.vue
@@ -0,0 +1,310 @@
+<template>
+	<div ref="playWndBox" style="width: 100%; height: 100%; margin: 0 5% 2% 5%" v-if="showYsy">
+		<ysyPlayAndPlayback :ref="'ysy'" :ysyParams="ysyParams"></ysyPlayAndPlayback>
+	</div>
+	<div ref="playWndBox" class="main">
+		<div
+			id="playWnd"
+			class="playWnd"
+			:style="{
+				height: playWndHeight + 'px',
+				width: playWndWidth + 'px'
+			}"
+		></div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import ysyPlayAndPlayback from "@/components/ysyPlayAndPlayback.vue";
+import { ref, onMounted, onBeforeUnmount, getCurrentInstance, nextTick, Ref } from "vue";
+import { ElMessage } from "element-plus";
+import { GlobalStore } from "@/stores";
+import { getQueryByIdApi, getUseProjectVideoConfigApi } from "@/api/modules/tower";
+import mitts from "@/utils/bus"; //兄弟组件传值
+let videoType = ref("") as any;
+let ysyParams = ref({} as any);
+
+let shipinList = ref([] as any);
+const store = GlobalStore();
+const playWndBox = ref(null);
+let playWndHeight = ref("");
+let playWndWidth = ref("");
+let pubKey = ref("");
+let initCount = ref(0);
+let oWebControl = ref(null) as any;
+let cameraIndexCode = ref<Array<string>>([]);
+
+let objData = ref({
+	appkey: "24017757", //海康提供的appkey
+	ip: "182.101.141.23", //海康提供的ip
+	secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret
+	port: 18443,
+	playMode: 0, // 0 预览 1回放
+	layout: "1x1" //页面展示的模块数【16】
+});
+
+let detailId = ref("1680765579331624962" as any);
+let showYsy = ref(false) as any;
+onMounted(async () => {
+	// setTimeout(() => {
+	// 	gerUserVideo();
+	// }, 2000);
+	mitts.on("gantryCraneVideo", (val: any) => {
+		console.log("收到龙门吊播放参数", val);
+		if (val.videoType === 1) {
+			oWebControl.JS_HideWnd();
+			// 销毁当前播放的视频
+			oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
+			// 断开与插件服务连接
+			oWebControl.JS_Disconnect();
+			showYsy.value = true;
+			ysyParams.value = val;
+		} else {
+			setTimeout(() => {
+				previewVideo(val.serialNumber);
+			}, 1500);
+		}
+
+		// serialNumberValue.value = val;
+	});
+	mitts.on("selectId", e => {
+		detailId.value = e;
+		console.log("收到设备ID", e);
+		// gerUserVideo();
+		// setTimeout(() => {
+		// 	gerUserVideo();
+		// }, 500);
+	});
+	// 获取页面的实例对象 ee
+	const pageInstance = getCurrentInstance();
+	// 获取dom节点对象
+	const tagDomObj = pageInstance?.refs.playWndBox;
+	playWndHeight.value = tagDomObj?.clientHeight;
+	playWndWidth.value = tagDomObj?.clientWidth;
+
+	// 监听scroll事件，使插件窗口尺寸跟随DIV窗口变化
+	window.addEventListener("scroll", () => {
+		if (oWebControl.value == undefined) {
+			oWebControl.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight);
+		}
+	});
+
+	// 监听resize事件，使插件窗口尺寸跟随DIV窗口变化
+	window.addEventListener("resize", e => {
+		if (oWebControl.value == undefined) {
+			// console.log("wwwww", e);
+
+			oWebControl.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight);
+			// oWebControl.JS_Resize(playWndHeight.value, playWndWidth.value);
+			// setWndCover();
+		}
+	});
+
+	// 初始化播放器插件
+	nextTick(async () => {
+		await initPlugin();
+	});
+});
+
+onBeforeUnmount(() => {
+	if (oWebControl.value === undefined) {
+		// 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
+		oWebControl.JS_HideWnd();
+		// 销毁当前播放的视频
+		oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
+		// 断开与插件服务连接
+		oWebControl.JS_Disconnect();
+	}
+});
+
+const initPlugin = () => {
+	oWebControl = new WebControl({
+		szPluginContainer: "playWnd", // 指定容器id
+		iServicePortStart: 15900, // 指定起止端口号，建议使用该值
+		iServicePortEnd: 15900,
+		szClassId: "23BF3B0A-2C56-4D97-9C03-0CB103AA8F11", // 用于IE10使用ActiveX的clsid
+		cbConnectSuccess: () => {
+			// 创建WebControl实例成功
+			oWebControl
+				.JS_StartService("window", {
+					// WebControl实例创建成功后需要启动服务
+					// 值"./VideoPluginConnect.dll"写死
+					dllPath: "./VideoPluginConnect.dll"
+				})
+				.then(
+					function () {
+						// 设置消息回调
+						oWebControl.JS_SetWindowControlCallback({
+							// cbIntegrationCallBack: cbIntegrationCallBack,
+						});
+						//JS_CreateWnd创建视频播放窗口，宽高可设定
+						oWebControl
+							.JS_CreateWnd("playWnd", 1000, 600, { bEmbed: true }) //这一部分很重要，两个参数为你盒子的宽高，这样是写死是防止组件加载之前出现白屏；bEmbed: true 防止窗口闪烁
+							.then(function () {
+								// 创建播放实例成功后初始化
+								init();
+							});
+					},
+					function () {
+						// 启动插件服务失败
+					}
+				);
+		},
+		// 创建WebControl实例失败
+		cbConnectError: function () {
+			// 这里写创建WebControl实例失败时的处理步骤,下面的代码仅做参看，具体实现步骤根据个人需求进行编写！！！！！！！！
+			// console.log(0);
+			// oWebControl.value = null;
+			console.log(oWebControl.value);
+			// 程序未启动时执行error函数，采用wakeup来启动程序
+			window.WebControl.JS_WakeUp("VideoWebPlugin://");
+			initCount.value++;
+			if (initCount.value < 3) {
+				setTimeout(function () {
+					initPlugin();
+				}, 3000);
+			}
+			// else {
+			// 	setTimeout(function () {
+			// 		setTimeout(function () {
+			// 			router.push("/home");
+			// 		}, 4000);
+			// 	}, 4000);
+			// }
+			if (initCount.value < 2) {
+				oWebControl.value = null;
+				ElMessage.warning("插件未启动，正在尝试启动，请稍候...");
+				// 程序未启动时执行error函数，采用wakeup来启动程序
+				window.WebControl.JS_WakeUp("VideoWebPlugin://");
+				setTimeout(() => {
+					initPlugin();
+				}, 3000);
+				initCount.value++;
+			}
+			//  else {
+			// 	window.location.href = this.videoWebPluginUrl;
+			// }
+			// console.log(oWebControl.value);
+		},
+		cbConnectClose: () => {
+			// 异常断开：bNormalClose = false
+			// JS_Disconnect正常断开：bNormalClose = true
+			// console.log("cbConnectClose");
+			oWebControl.value = null;
+		}
+	});
+	// oWebControl.JS_CuttingPartWindow(500, 500, 500, 500);
+};
+
+// 初始化
+const init = (callback: (() => void) | undefined) => {
+	getPubKey(() => {
+		let appkey = objData.value.appkey; //综合安防管理平台提供的appkey，必填
+		let secret = setEncrypt(objData.value.secret); //综合安防管理平台提供的secret，必填
+		let ip = objData.value.ip; //综合安防管理平台IP地址，必填
+		let playMode = objData.value.playMode; //初始播放模式：0-预览，1-回放
+		let port = objData.value.port; //综合安防管理平台端口，若启用HTTPS协议，默认443
+		let snapDir = "D:\\SnapDir"; //抓图存储路径
+		let videoDir = "D:\\VideoDir"; //紧急录像或录像剪辑存储路径
+		let layout = objData.value.layout; //playMode指定模式的布局
+		let enableHTTPS = 1; //是否启用HTTPS协议与综合安防管理平台交互，这里总是填1
+		let encryptedFields = "secret"; //加密字段，默认加密领域为secret
+		let showToolbar = 1; //是否显示工具栏，0-不显示，非0-显示
+		let showSmart = 0; //是否显示移动框线框，0-不显示，非0-显示
+		let buttonIDs = "0,16,256,257,258,259,260,512,513,514,515,516,517,768,769"; //自定义工具条按钮
+		// var toolBarButtonIDs = "2049,2304" // 工具栏上自定义按钮
+		oWebControl
+			?.JS_RequestInterface({
+				funcName: "init",
+				argument: JSON.stringify({
+					appkey: appkey, //API网关提供的appkey
+					secret: secret, //API网关提供的secret
+					// ip: ip + ":" + port, //API网关IP地址
+					ip: ip, //API网关IP地址
+					playMode: playMode, //播放模式（决定显示预览还是回放界面）
+					port: port, //端口
+					snapDir: snapDir, //抓图存储路径
+					videoDir: videoDir, //紧急录像或录像剪辑存储路径
+					layout: layout, //布局
+					enableHTTPS: enableHTTPS, //是否启用HTTPS协议
+					encryptedFields: encryptedFields, //加密字段
+					showToolbar: showToolbar, //是否显示工具栏
+					showSmart: showSmart, //是否显示智能信息
+					buttonIDs //自定义工具条按钮
+				})
+			})
+			.then(function (oData: any) {
+				oWebControl.JS_Resize(playWndWidth.value, playWndHeight.value); // 初始化后resize一次，规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
+
+				if (callback) {
+					callback();
+				}
+				// 隐藏
+				// oWebControl.JS_HideWnd()
+			});
+	});
+};
+
+// RSA 加密
+let setEncrypt = (value: string) => {
+	let encrypt = new window.JSEncrypt();
+	encrypt.setPublicKey(pubKey);
+	return encrypt.encrypt(value);
+};
+// 获取公钥
+const getPubKey = (callback: { (): void; (): void }) => {
+	oWebControl
+		.JS_RequestInterface({
+			funcName: "getRSAPubKey",
+			argument: JSON.stringify({
+				keyLength: 1024
+			})
+		})
+		.then(function (oData: { responseMsg: { data: Ref<string> } }) {
+			if (oData.responseMsg.data) {
+				pubKey = oData.responseMsg.data;
+				callback();
+			}
+		});
+};
+
+// 调用这个函数可进行视频播放
+// 视频预览功能
+const previewVideo = (data: string | null) => {
+	console.log("监控点编号值", data);
+
+	let cameraIndexCode = data; // 获取输入的监控点编号值，必填
+	let streamMode = 0; // 主子码流标识：0-主码流，1-子码流
+	let transMode = 1; // 传输协议：0-UDP，1-TCP
+	let gpuMode = 0; // 是否启用GPU硬解，0-不启用，1-启用
+	let wndId = -1; // 播放窗口序号（在2x2以上布局下可指定播放窗口）
+
+	oWebControl
+		.JS_RequestInterface({
+			funcName: "startPreview",
+			argument: JSON.stringify({
+				cameraIndexCode: cameraIndexCode, // 监控点编号
+				streamMode: streamMode, // 主子码流标识
+				transMode: transMode, // 传输协议
+				gpuMode: gpuMode, // 是否开启GPU硬解
+				wndId: wndId // 可指定播放窗口
+			})
+		})
+		.then(function () {
+			oWebControl.JS_SetWindowControlCallback({});
+		});
+};
+//  
+onBeforeUnmount(async () => {
+	mitts.off("gantryCraneVideo");
+});
+</script>
+
+<style lang="scss" scoped>
+.main {
+	border-radius: 8px;
+	flex: 1;
+	height: 300px;
+	width: 400px;
+}
+</style>
diff --git a/src/views/sevenLargeScreen/largeMachinery/erectCrane/topCenter.vue b/src/views/sevenLargeScreen/largeMachinery/erectCrane/topCenter.vue
index dae3161..1bac708 100644
--- a/src/views/sevenLargeScreen/largeMachinery/erectCrane/topCenter.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/erectCrane/topCenter.vue
@@ -1,48 +1,71 @@
 <template>
 	<Card title="实时监测">
 		<div class="gantry-list">
+			<div class="select-right">
+				<el-select v-model="selectDay" style="width: 85%" size="small" @change="selectChange">
+					<el-option v-for="(item, index) in devList" :key="index" :label="item.devName" :value="item.devSn" />
+				</el-select>
+			</div>
 			<div class="people-message" @click="showDialog = !showDialog">人 员 信 息</div>
 			<div class="gantry-icon"></div>
 			<div class="gantry-data">
 				<div class="box-contain">
 					<div class="first">
 						<div>风速</div>
-						<div style="color: #65d7f9">1.96m/s</div>
+						<div style="color: #65d7f9">{{ currentData.windSpeed || 0 }}m/s</div>
 					</div>
 					<div class="second">
 						<div>风速等级</div>
-						<div style="color: #65d7f9">2级</div>
+						<div style="color: #65d7f9">{{ currentData.windSpeedLevel || 0 }}</div>
 					</div>
 					<div class="third">
 						<div>状态</div>
-						<!-- <div class="state-style">正常</div> -->
-						<div class="state-style" style="background: #ec6266">高级预警</div>
+						<div class="state-style" style="background: #ec6266" v-if="alarmData.windSpeedAlarm == 1">
+							{{
+								alarmData.windSpeedAlarm == 0
+									? "正常"
+									: alarmData.windSpeedAlarm == 1
+									? "报警"
+									: "正常"
+							}}
+						</div>
+						<div class="state-style" v-else>
+							{{
+								alarmData.windSpeedAlarm == 0
+									? "正常"
+									: alarmData.windSpeedAlarm == 1
+									? "报警"
+									: "正常"
+							}}
+						</div>
 					</div>
 				</div>
-				<div class="box-contain">
-					<div class="single-line">
-						<div class="title">前支角度</div>
-						<div class="number">23°</div>
-					</div>
-				</div>
-				<div class="box-contain">
-					<div class="single-line">
-						<div class="title">中支角度</div>
-						<div class="number">23°</div>
-					</div>
-				</div>
-				<div class="box-contain">
-					<div class="single-line">
-						<div class="title">后支角度</div>
-						<div class="number">23°</div>
-					</div>
-				</div>
-				<div class="box-contain">
-					<div class="single-line">
-						<div class="title">主梁角度</div>
-						<div class="number">23°</div>
+				<div class="box-contain" style="margin-top: 12%">
+					<!-- <div class="first">
+						<div class="title">门机跨度</div>
+						<div class="number">{{ currentData.windSpeed || 0 }}<span>m</span></div>
+					</div> -->
+					<div class="first">
+						<div class="title">设备型号</div>
+						<div class="number">{{ devCurrentData.devModel || "" }}<span></span></div>
+					</div>
+					<div class="first">
+						<div class="title">厂家名称</div>
+						<div class="number">{{ devCurrentData.manufacturerName || "" }}<span></span></div>
+					</div>
+					<div class="first">
+						<div class="title">架桥机厂家</div>
+						<div class="number">{{ devCurrentData.manufacturerName || "" }}<span></span></div>
+					</div>
+					<div class="first">
+						<div class="title">进场时间</div>
+						<div class="number">{{ devCurrentData.createDate || "" }}<span></span></div>
 					</div>
 				</div>
+				<!-- <div class="box-contain">
+					<div class="title">吊装高度</div>
+					<div class="number">34<span>m</span></div>
+				</div> -->
 			</div>
 			<div class="list-detail" v-if="showDialog" @click="handleClick">
 				<div class="dialog-content">
@@ -50,30 +73,41 @@
 					<div class="dialog-detail">
 						<div class="detail-top">
 							<div class="top-left">
-								<img src="@/assets/images/comprehensiveManage/project3.png" />
+								<!-- <img src="@/assets/images/comprehensiveManage/project3.png" /> -->
+								<img :src="BASEURL + '/image/' + drierInfo.fieldAcquisitionUrl" />
 							</div>
 							<div class="top-right">
-								<div style="margin-top: 2%"><span style="font-size: 20px; color: #65d7f9; margin-right: 5%">陈建 </span> 男</div>
-								<div style="margin-top: 18%">佳信捷软件_451班组</div>
-								<div style="margin-top: 18%">13324904501</div>
+								<div style="margin-top: 2%">
+									<span style="font-size: 20px; color: #65d7f9; margin-right: 5%">{{ drierInfo.workerName || "-" }} </span>
+									{{
+								drierInfo.sex == 1
+									? "男"
+									: drierInfo.sex == 2
+									? "女"
+									: "-"
+							}}
+								</div>
+								<div style="margin-top: 18%">{{ drierInfo.teamName || "" }}</div>
+								<div style="margin-top: 18%">{{ drierInfo.phoneNumber || "" }}</div>
+								<!-- <div style="margin-top: 18%">{{ drierInfo.windSpeed || "" }}</div> -->
 							</div>
 						</div>
 						<div class="detail-text">
 							<div class="text-box">
 								<div class="type">身份证</div>
-								<div class="text">******************</div>
+								<div class="text">{{ drierInfo.attendanceNumber || "" }}</div>
 							</div>
 							<div class="text-box" style="margin-top: 5%">
 								<div class="type">班组</div>
-								<div class="text">佳信捷软件_451班组</div>
+								<div class="text">{{ drierInfo.teamName || "" }}</div>
 							</div>
 							<div class="text-box" style="margin-top: 5%">
 								<div class="type">工种</div>
-								<div class="text">窑炉修筑工</div>
+								<div class="text">{{ drierInfo.typeName || "" }}</div>
 							</div>
 							<div class="text-box" style="margin-top: 5%">
 								<div class="type">参见单位</div>
-								<div class="text">中建四局</div>
+								<div class="text">{{ drierInfo.enterpriseName || "" }}</div>
 							</div>
 						</div>
 					</div>
@@ -82,31 +116,23 @@
 					</div>
 				</div>
 			</div>
-			<!-- {{ baseURL }} -->
-			<div class="select-right">
-				<el-select v-model="devValue" class="m-2" placeholder="请选择" size="small" @change="selectChange">
-					<el-option v-for="item in noiseList" :key="item.value" :label="item.label" :value="item.value" />
-				</el-select>
-			</div>
 		</div>
 	</Card>
 </template>
 
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
-import { reactive, ref, onMounted } from "vue";
-// const baseURL = import.meta.env.VITE_API_URL as string;
-let devValue = ref(1 as any);
-let noiseList = ref([
-	{
-		value: 1,
-		label: "架桥机001"
-	},
-	{
-		value: 10051,
-		label: "架桥机002"
-	}
-]);
+import { bridgeErectMachineDevList, getGantryCraneCurrentData2, selectWorkerInfoList, bridgeErectMachineAlarmList } from "@/api/modules/gantryCrane";
+import { reactive, ref, onMounted, onBeforeUnmount } from "vue";
+import mitts from "@/utils/bus"; //兄弟组件传值
+import { GlobalStore } from "@/stores";
+const store = GlobalStore();
+const BASEURL = import.meta.env.VITE_API_URL;
+
+// 当前对应的种类
+let selectDay = ref("");
+let devList = ref([]);
+
 let showDialog = ref(false as any);
 function handleClick(event: any) {
 	console.log("点击", event.target.className);
@@ -114,8 +140,88 @@ function handleClick(event: any) {
 		showDialog.value = false;
 	}
 }
+const getDevOption = async () => {
+	const res: any = await bridgeErectMachineDevList({ projectSn: store.sn });
+	console.log("设备列表", res);
+	if (res.result.length > 0) {
+		devList.value = res.result;
+		selectDay.value = res.result[0].devSn;
+		devCurrentData.value = res.result[0];
+		mitts.emit("gantryCraneDevSn", selectDay.value);
+		if (res.result[0].selectVideo) {
+			// 切割字符串，以逗号为分隔符
+			const valuesArray = res.result[0].selectVideo.split(",");
+			// 移除每个值周围的空格
+			const trimmedValues = valuesArray.map(value => value.trim());
+			mitts.emit("erectCraneVideo", trimmedValues[0]);
+		}
+		if (res.result[0].selectDriver) {
+			getDriverInfo(res.result[0].selectDriver);
+		}
 
-onMounted(async () => {});
+		getGantryCurrentData();
+	}
+};
+
+let devCurrentData = ref({} as any);
+function selectChange(e: any) {
+	let currentData: any = devList.value.find((item: any) => item.devSn === e);
+	devCurrentData.value = currentData;
+	console.log("选择", e);
+	selectDay.value = e;
+	mitts.emit("gantryCraneDevSn", e);
+	// if (currentData.selectVideo) {
+		// 切割字符串，以逗号为分隔符
+		const valuesArray = currentData.selectVideo.split(",");
+		// 移除每个值周围的空格
+		const trimmedValues = valuesArray.map(value => value.trim());
+		mitts.emit("erectCraneVideo", trimmedValues[0]);
+	// }
+	if (currentData.selectDriver) {
+		getDriverInfo(currentData.selectDriver);
+	}
+	getGantryCurrentData();
+	getGantryAlarmData();
+}
+
+let currentData = ref({});
+// 实时数据
+const getGantryCurrentData = async () => {
+	const res: any = await getGantryCraneCurrentData2({ projectSn: store.sn, devSn: selectDay.value });
+	console.log("实时数据", res);
+	if (res.result) {
+		currentData.value = res.result;
+	}
+};
+
+// 报警数据
+let alarmData = ref({}) as any;
+const getGantryAlarmData = async () => {
+	const res: any = await bridgeErectMachineAlarmList({ projectSn: store.sn, devSn: selectDay.value });
+	if (res.result) {
+		alarmData.value = res.result.records[0];
+	} else {
+		alarmData.value = {};
+	}
+	console.log("报警数据", alarmData.value);
+};
+
+let drierInfo = ref({}) as any;
+// 司机
+const getDriverInfo = async (driverId: any) => {
+	const res: any = await selectWorkerInfoList({ projectSn: store.sn, workerInfos: driverId });
+	drierInfo.value = res.result.records[0];
+	console.log("司机数据", drierInfo.value);
+};
+
+onMounted(async () => {
+	getDevOption();
+});
+
+//  
+onBeforeUnmount(async () => {
+	mitts.off("gantryCraneDevSn");
+});
 </script>
 
 <style lang="scss" scoped>
@@ -146,7 +252,7 @@ onMounted(async () => {});
 		background-size: 100% 100%;
 	}
 	.gantry-data {
-		width: 25%;
+		width: 27%;
 		height: 100%;
 		position: absolute;
 		right: 3%;
@@ -158,9 +264,10 @@ onMounted(async () => {});
 			background-size: 100% 100%;
 			font-size: 16px;
 			color: #fff;
-			margin-top: 6%;
+			margin-top: 10%;
 			.first {
 				display: flex;
+				align-items: center;
 				justify-content: space-between;
 			}
 			.second {
@@ -181,20 +288,17 @@ onMounted(async () => {});
 					border-radius: 2px 2px 2px 2px;
 				}
 			}
-			.single-line {
-				display: flex;
-				justify-content: space-between;
-				.title {
-				}
-				.number {
-					// margin-top: 5%;
-					// font-size: 24px;
-					color: #65d7f9;
-					span {
-						margin-left: 3%;
-						font-size: 14px;
-						font-family: Source Han Sans CN-Regular;
-					}
+			.title {
+				margin-top: 5%;
+			}
+			.number {
+				margin-top: 5%;
+				font-size: 12px;
+				color: #65d7f9;
+				span {
+					margin-left: 3%;
+					font-size: 14px;
+					font-family: Source Han Sans CN-Regular;
 				}
 			}
 		}
@@ -243,13 +347,13 @@ onMounted(async () => {});
 			top: 3%;
 			cursor: pointer;
 			color: #ffffff;
-			font-size: 18px;
+			font-size: calc(100vw * 18 / 1920);
 		}
 		.dialog-title {
 			color: #ffffff;
 			font-weight: bold;
 			margin-left: 3%;
-			font-size: 18px;
+			font-size: calc(100vw * 18 / 1920);
 			font-family: "OPPOSans-Bold";
 		}
 		.dialog-detail {
@@ -300,7 +404,7 @@ onMounted(async () => {});
 		.pic-title {
 			color: #ffffff;
 			font-weight: bold;
-			font-size: 18px;
+			font-size: calc(100vw * 18 / 1920);
 			font-family: "OPPOSans-Bold";
 			margin-top: 5%;
 			margin-left: 8%;
@@ -319,7 +423,7 @@ onMounted(async () => {});
 .select-right {
 	position: absolute;
 	right: 1%;
-	width: 12%;
+	width: 15%;
 	top: -13%;
 	z-index: 9;
 }
diff --git a/src/views/sevenLargeScreen/largeMachinery/erectCrane/topLeft.vue b/src/views/sevenLargeScreen/largeMachinery/erectCrane/topLeft.vue
index 35e22f5..76c98f5 100644
--- a/src/views/sevenLargeScreen/largeMachinery/erectCrane/topLeft.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/erectCrane/topLeft.vue
@@ -1,5 +1,5 @@
 <template>
-	<Card title="今日数据">
+	<Card title="作业统计">
 		<div class="gantry-top-left">
 			<div class="select-right">
 				<div class="today selected" @click="tabChange(1)" :class="checked == 1 ? 'active' : ''">今日</div>
@@ -8,23 +8,23 @@
 			<div class="right-box">
 				<div class="yesterday-use">
 					<div class="text">工作时长(小时)</div>
-					<div class="num">4.6</div>
+					<div class="num">{{ workTotal.workingHour || 0 }}</div>
 				</div>
 				<div class="yesterday-chain">
 					<div class="text">吊钩载重(吨)</div>
 					<div class="num">
-						40
+						{{ workTotal.hookLoad || 0 }}
 						<!-- <span style="font-family: Source Han Sans CN-Medium, Source Han Sans CN"></span> -->
 					</div>
 				</div>
 				<div class="month-use">
 					<div class="text">主钩循环(次)</div>
-					<div class="num">6</div>
+					<div class="num">{{ workTotal.mainHookCycle || 0 }}</div>
 				</div>
 				<div class="month-chain">
 					<div class="text">副钩循环(次)</div>
 					<div class="num">
-						16
+						{{ workTotal.subjunCycle || 0 }}
 						<!-- <span style="font-family: Source Han Sans CN-Medium, Source Han Sans CN">%</span> -->
 					</div>
 				</div>
@@ -35,14 +35,40 @@
 
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
-import { reactive, ref, onMounted } from "vue";
+import { getGantryWorkTotal2 } from "@/api/modules/gantryCrane";
+import { reactive, ref, onMounted, onBeforeUnmount } from "vue";
+import mitts from "@/utils/bus"; //兄弟组件传值
+
+import { GlobalStore } from "@/stores";
+const store = GlobalStore();
+
 // 选中
 let checked = ref(1);
 function tabChange(type: any) {
 	checked.value = type;
+	getWorkTotal();
 }
 
-onMounted(async () => {});
+let workTotal = ref({}) as any;
+const getWorkTotal = async () => {
+	const res: any = await getGantryWorkTotal2({ projectSn: store.sn, type: checked.value });
+	workTotal.value = res.result;
+	console.log("作业统计", res);
+};
+
+let gantryCraneDevSn = ref("") as any;
+onMounted(async () => {
+	// mitts.on("gantryCraneDevSn", e => {
+	// 	console.log("作业统计接收值", e);
+	// 	gantryCraneDevSn.value = e;
+		
+	// });
+	getWorkTotal();
+});
+// //  
+// onBeforeUnmount(async () => {
+// 	mitts.off("gantryCraneDevSn");
+// });
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sevenLargeScreen/largeMachinery/erectCrane/topRight.vue b/src/views/sevenLargeScreen/largeMachinery/erectCrane/topRight.vue
index 6a8fdad..df91884 100644
--- a/src/views/sevenLargeScreen/largeMachinery/erectCrane/topRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/erectCrane/topRight.vue
@@ -2,37 +2,63 @@
 	<div class="gantry-top-right">
 		<Card title="操作画面">
 			<div class="videoBox">
-				<video src="" class="videos" autoplay controls loop></video>
-				<div class="bottom-text">非265支持回放</div>
+				<gantryVideo></gantryVideo>
 			</div>
 		</Card>
-		<div class="select-right">
-			<el-select v-model="devValue" class="m-2" placeholder="请选择" size="small" @change="selectChange">
-				<el-option v-for="item in noiseList" :key="item.value" :label="item.label" :value="item.value" />
+		<!-- <div class="select-right">
+			<el-select :disabled="true" v-model="devValue" class="m-2" placeholder="请选择" size="small" @change="selectChange">
+				<el-option v-for="item in noiseList" :key="item.id" :label="item.videoName" :value="item.itemId" />
 			</el-select>
-		</div>
+		</div> -->
 	</div>
 </template>
 
 <script setup lang="ts">
+import gantryVideo from "@/views/sevenLargeScreen/largeMachinery/gantryCrane/gantry-video.vue";
+import { videoItemById } from "@/api/modules/gantryCrane";
+
 import Card from "@/components/card.vue";
 import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
 import mitts from "@/utils/bus"; //兄弟组件传值
 import { GlobalStore } from "@/stores";
-let devValue = ref(1 as any);
-let noiseList = ref([
-	{
-		value: 1,
-		label: "监控001"
-	},
-	{
-		value: 10051,
-		label: "监控002"
+const store = GlobalStore();
+
+let devValue = ref("" as any);
+let noiseList = ref([]);
+// function selectChange(e: any) {
+// 	console.log(e, "选择");
+// }
+
+let gantryCraneDevSn = ref("") as any;
+const getGantryCraneVideo = async () => {
+	const res: any = await videoItemById({ projectSn: store.sn, id: gantryCraneDevSn.value });
+	console.log("视频数据", res);
+	// if (res.result.videoList.length > 0) {
+	// 	noiseList.value = res.result.videoList;
+	// 	devValue.value = res.result.videoList[0].itemId;
+	// 	mitts.emit("gantryCraneVideo", res.result.videoList[0]);
+	// } else {
+	// 	noiseList.value = [];
+	// 	devValue.value = "";
+	// }
+	if (res.result) {
+		mitts.emit("gantryCraneVideo", res.result);
 	}
-]);
-function selectChange(e: any) {
-	console.log(e, "选择");
-}
+};
+
+onMounted(async () => {
+	mitts.on("erectCraneVideo", e => {
+		if (e) {
+			console.log("操作画面接收", e);
+			gantryCraneDevSn.value = e;
+			getGantryCraneVideo();
+		}
+	});
+});
+//  
+onBeforeUnmount(async () => {
+	mitts.off("erectCraneVideo");
+});
 </script>
 
 <style lang="scss" scoped>
@@ -41,7 +67,7 @@ function selectChange(e: any) {
 	height: 100%;
 	position: relative;
 	.videoBox {
-		width: 100%;
+		width: 90%;
 		height: 100%;
 		position: relative;
 		.bottom-text {
@@ -67,7 +93,7 @@ function selectChange(e: any) {
 		position: absolute;
 		right: 6%;
 		width: 20%;
-		top: 18%;
+		top: 2%;
 		z-index: 9;
 	}
 }
diff --git a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomCenter.vue b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomCenter.vue
index 70ababe..ce251b4 100644
--- a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomCenter.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomCenter.vue
@@ -209,7 +209,7 @@ onMounted(async () => {
 		// }, 500);
 	});
 });
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("gantryCraneDevSn");
 });
diff --git a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomLeft.vue b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomLeft.vue
index bd1ba10..5f20efe 100644
--- a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomLeft.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomLeft.vue
@@ -134,7 +134,7 @@ onMounted(async () => {
 	});
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("gantryCraneDevSn");
 });
diff --git a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomRight.vue b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomRight.vue
index c0548a0..77e34d3 100644
--- a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/bottomRight.vue
@@ -129,7 +129,7 @@ onMounted(async () => {
 	});
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("gantryCraneDevSn");
 });
diff --git a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/gantry-video.vue b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/gantry-video.vue
index 13b95f5..e492ae3 100644
--- a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/gantry-video.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/gantry-video.vue
@@ -294,7 +294,7 @@ const previewVideo = (data: string | null) => {
 			oWebControl.JS_SetWindowControlCallback({});
 		});
 };
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("gantryCraneVideo");
 });
diff --git a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topCenter.vue b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topCenter.vue
index 8e9620a..27f44e0 100644
--- a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topCenter.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topCenter.vue
@@ -156,7 +156,7 @@ onMounted(async () => {
 	getDevOption();
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("gantryCraneDevSn");
 });
diff --git a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topLeft.vue b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topLeft.vue
index 05da797..6259ce5 100644
--- a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topLeft.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topLeft.vue
@@ -64,7 +64,7 @@ onMounted(async () => {
 		getWorkTotal();
 	});
 });
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("gantryCraneDevSn");
 });
diff --git a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topRight.vue b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topRight.vue
index 4ac9652..b5f4fcb 100644
--- a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topRight.vue
@@ -50,7 +50,7 @@ onMounted(async () => {
 		getGantryCraneVideo();
 	});
 });
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("gantryCraneDevSn");
 });
diff --git a/src/views/sevenLargeScreen/largeMachinery/hangBasket/hangLeft.vue b/src/views/sevenLargeScreen/largeMachinery/hangBasket/hangLeft.vue
index 6c266b0..e27c241 100644
--- a/src/views/sevenLargeScreen/largeMachinery/hangBasket/hangLeft.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/hangBasket/hangLeft.vue
@@ -2,52 +2,54 @@
 	<Card title="监测数据">
 		<div class="hang-basket-content">
 			<div class="select-right">
-				<el-select v-model="devValue" class="m-2" placeholder="请选择" size="small" @change="selectChange">
-					<el-option v-for="item in noiseList" :key="item.value" :label="item.label" :value="item.value" />
+				<el-select v-model="selectDay" class="m-2" placeholder="请选择" size="small" @change="selectChange">
+					<el-option v-for="item in devList" :label="item.devName" :value="item.devSn" :key="item.id" />
 				</el-select>
 			</div>
-			<div class="deadline-time">数据截至: 2023-06-29 15:23:59</div>
+			<div class="deadline-time">数据截至: {{ currentData.createDate || "-" }}</div>
 			<div class="monitor-data">
 				<div class="monitor-content">
 					<div class="text">挂篮是否有人</div>
-					<div class="number">24</div>
+					<div class="number" v-if="currentData.hangingBasketSomeone == 1 || currentData.hangingBasketSomeone == 2">
+						{{ warnType[currentData.hangingBasketSomeone].name }}
+					</div>
 				</div>
 				<div class="monitor-content">
 					<div class="text">倾角</div>
-					<div class="number">30°</div>
+					<div class="number">{{ currentData.inclination || 0 }}°</div>
 				</div>
 				<div class="monitor-content">
 					<div class="text">风速</div>
-					<div class="number">10m/s</div>
+					<div class="number">{{ currentData.windSpeed || 0 }}m/s</div>
 				</div>
 				<div class="monitor-content">
 					<div class="text">菱形架位移</div>
-					<div class="number">1024m</div>
+					<div class="number">{{ currentData.diamondFrameDisplacement || 0 }}m</div>
 				</div>
 				<div class="monitor-content">
 					<div class="text">菱形架速度</div>
-					<div class="number">24m/s</div>
+					<div class="number">{{ currentData.diamondFrameSpeed || 0 }}m/s</div>
 				</div>
 			</div>
 			<div class="monitor-bg">
 				<div class="height-left" style="top: 43%; left: 25%">
-					<div class="number">12mm</div>
+					<div class="number">{{ currentData.bottomFilmHeightLeft || 0 }}mm</div>
 					<div class="text">底膜高度左</div>
 				</div>
 				<div class="height-left" style="top: 7%; left: 50%">
-					<div class="number">12KN</div>
+					<div class="number">{{ currentData.leftRearBeamAnchor || 0 }}KN</div>
 					<div class="text">左后梁锚杆</div>
 				</div>
 				<div class="height-left" style="top: 7%; left: 65%">
-					<div class="number" style="color: #65d7f9">12KN</div>
+					<div class="number" style="color: #65d7f9">{{ currentData.rightRearBeamAnchor || 0 }}KN</div>
 					<div class="text">右后梁锚杆</div>
 				</div>
 				<div class="height-left" style="top: 43%; right: 1%">
-					<div class="number" style="color: #65d7f9">12mm</div>
+					<div class="number" style="color: #65d7f9">{{ currentData.bottomFilmHeightRight || 0 }}mm</div>
 					<div class="text">底膜高度右</div>
 				</div>
 				<div class="height-left" style="top: 63%; left: 54%">
-					<div class="number" style="color: #fff">--mm</div>
+					<div class="number" style="color: #fff">{{ currentData.bottomFilmHeightDifference }}mm</div>
 					<div class="text" style="color: #fff">底膜高度差</div>
 				</div>
 			</div>
@@ -57,27 +59,70 @@
 
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
-import { reactive, ref, onMounted } from "vue";
-// 选中
-let checked = ref(1);
-function selectChange(type: any) {
-	// console.log(type, "选中");
-	checked.value = type;
-}
+import { hangBasketDevList, hangNewestData } from "@/api/modules/largeMachinery";
+import { reactive, ref, onMounted, onBeforeUnmount } from "vue";
+import mitts from "@/utils/bus"; //兄弟组件传值
+import { GlobalStore } from "@/stores";
+const store = GlobalStore();
+// const BASEURL = import.meta.env.VITE_API_URL;
 
-let devValue = ref(1 as any);
-let noiseList = ref([
+const warnType = ref([
 	{
-		value: 1,
-		label: "挂篮监测001"
+		id: 1,
+		name: "未知",
+		color: "#EC6266"
 	},
 	{
-		value: 10051,
-		label: "挂篮监测002"
+		id: 2,
+		name: "有人",
+		color: "#65D7F9"
+	},
+	{
+		id: 3,
+		name: "无人",
+		color: "#FFFFFF"
 	}
 ]);
 
-onMounted(async () => {});
+// 当前对应的种类
+let selectDay = ref("");
+let devList = ref([]);
+
+const getDevOption = async () => {
+	const res: any = await hangBasketDevList({ projectSn: store.sn });
+	console.log("设备列表", res);
+	if (res.result.length > 0) {
+		devList.value = res.result;
+		selectDay.value = res.result[0].devSn;
+		// mitts.emit("gantryCraneDevSn", selectDay.value);
+		getGantryCurrentData();
+	}
+};
+
+function selectChange(e: any) {
+	console.log("选择", e);
+	selectDay.value = e;
+	// mitts.emit("gantryCraneDevSn", e);
+	getGantryCurrentData();
+}
+
+let currentData = ref({});
+// 实时数据
+const getGantryCurrentData = async () => {
+	const res: any = await hangNewestData({ projectSn: store.sn, devSn: selectDay.value });
+	if (res.result) {
+		console.log("实时数据", res);
+	currentData.value = res.result;
+	} else {
+		currentData.value = {}
+	}
+	mitts.emit("hangCurrentData", currentData.value);
+	
+};
+
+onMounted(async () => {
+	getDevOption();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sevenLargeScreen/largeMachinery/hangBasket/rightBottom.vue b/src/views/sevenLargeScreen/largeMachinery/hangBasket/rightBottom.vue
index 38143cf..6dfdbd3 100644
--- a/src/views/sevenLargeScreen/largeMachinery/hangBasket/rightBottom.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/hangBasket/rightBottom.vue
@@ -1,5 +1,5 @@
 <template>
-	<Card title="监测数据">
+	<Card title="检测数据">
 		<div class="hang-basket-content">
 			<div class="list-content">
 				<div class="tab-list">
@@ -12,24 +12,25 @@
 					<div style="width: 18%">后梁锚杆(KN)</div>
 					<div>监测时间</div>
 				</div>
-				<el-scrollbar class="list-box">
+				<el-scrollbar class="list-box" ref="refScrollbar">
 					<div v-for="(item, index) in list" class="list-style" :key="item.id">
 						<div style="width: 5%">{{ index + 1 }}</div>
-						<div :style="{ color: warnType[item.hangType - 1].color }">
-							{{ warnType[item.hangType - 1].name }}
+						<div v-if="item.hangingBasketSomeone < 3" :style="{ color: warnType[item.hangingBasketSomeone].color }">
+							{{ warnType[item.hangingBasketSomeone].name }}
 						</div>
+						<div v-else>-</div>
 						<div>{{ item.windSpeed }}</div>
-						<div style="width: 10%">{{ item.dipAngle }}</div>
+						<div style="width: 10%">{{ item.inclination }}</div>
 						<div style="width: 15%">
-							左 <span class="listNumber">{{ item.bottomHeightLeft }}</span> 右
-							<span class="listNumber">{{ item.bottomHeightRight }}</span>
+							左 <span class="listNumber">{{ item.bottomFilmHeightLeft }}</span> 右
+							<span class="listNumber">{{ item.bottomFilmHeightRight }}</span>
 						</div>
-						<div>{{ item.heightDiff }}</div>
+						<div>{{ item.bottomFilmHeightDifference }}</div>
 						<div style="width: 18%">
-							左 <span class="listNumber">{{ item.backBoltLeft }}</span> 右
-							<span class="listNumber">{{ item.backBoltRight }}</span>
+							左 <span class="listNumber">{{ item.leftRearBeamAnchor }}</span> 右
+							<span class="listNumber">{{ item.rightRearBeamAnchor }}</span>
 						</div>
-						<div>{{ item.monitorTime }}</div>
+						<div>{{ item.createDate }}</div>
 					</div>
 					<div class="not-data" v-if="list.length == 0">
 						<img src="@/assets/images/noData.png" alt="" />
@@ -45,14 +46,12 @@
 import Card from "@/components/card.vue";
 import { reactive, ref, onMounted } from "vue";
 import { GlobalStore } from "@/stores";
-const store = GlobalStore();
-let showDialog = ref(false as any);
-let rangeTime = ref("" as any);
+import { hangBasketDetectDataPage } from "@/api/modules/largeMachinery";
 
 const warnType = ref([
 	{
 		id: 1,
-		name: "报警",
+		name: "未知",
 		color: "#EC6266"
 	},
 	{
@@ -67,155 +66,63 @@ const warnType = ref([
 	}
 ]);
 
-const list = reactive([
-	{
-		id: 1,
-		hangType: 1,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
-	},
-	{
-		id: 2,
-		hangType: 2,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
-	},
-	{
-		id: 3,
-		hangType: 2,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
-	},
-	{
-		id: 4,
-		hangType: 3,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
-	},
-	{
-		id: 5,
-		hangType: 1,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
-	},
-	{
-		id: 6,
-		hangType: 1,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
-	},
-	{
-		id: 7,
-		hangType: 2,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
-	},
+const store = GlobalStore();
+let showDialog = ref(false as any);
+let rangeTime = ref("" as any);
+const list = ref([]);
+const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
+const ScrollbarTop = ref(0);
 
-	{
-		id: 8,
-		hangType: 1,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
-	},
-	{
-		id: 9,
-		hangType: 1,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
-	},
-	{
-		id: 10,
-		hangType: 1,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
-	},
-	{
-		id: 11,
-		hangType: 1,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
-	},
-	{
-		id: 12,
-		hangType: 1,
-		windSpeed: "16.56",
-		dipAngle: "0.1",
-		bottomHeightLeft: "265",
-		bottomHeightRight: "352.6",
-		heightDiff: 10,
-		backBoltLeft: "265",
-		backBoltRight: "352.6",
-		monitorTime: "2023-01-01 12:00:00"
+let moreScroll = ref(true as any);
+
+let pageNo = ref(1 as any);
+let pageSize = ref(20 as any);
+
+// 检测数据
+const getAlarmList = async () => {
+	const res: any = await hangBasketDetectDataPage({ projectSn: store.sn, pageNo: 1, pageSize: pageSize.value });
+	console.log("检测数据", res);
+	list.value = res.result.records;
+	if (res.result.pages == pageNo.value) {
+		moreScroll.value = false;
+	} else {
+		pageNo.value = pageNo.value + 1;
 	}
-]);
+	// console.log("当前页数", pageNo.value);
+};
 
-onMounted(async () => {});
+// 下拉加载
+const getMoreSmokeRecordList = async () => {
+	const res: any = await hangBasketDetectDataPage({ projectSn: store.sn, pageNo: pageNo.value, pageSize: pageSize.value });
+	// console.log("下拉加载检测数据", res);
+	list.value = list.value.concat(res.result.records);
+	if (res.result.pages == pageNo.value) {
+		moreScroll.value = false;
+	} else {
+		pageNo.value = pageNo.value + 1;
+	}
+	// console.log("当前列表", list.value);
+	// console.log("当前页数", pageNo.value);
+};
+
+onMounted(async () => {
+	refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
+		// console.log("滚动容器", e);
+		const scrollTop = e.target.scrollTop;
+		const scrollHeight = e.target.scrollHeight;
+		const clientHeight = e.target.clientHeight;
+		// console.log("滚动容器", scrollTop, scrollHeight, clientHeight);
+		// 向上加载更多
+		if (scrollTop >= scrollHeight - clientHeight) {
+			console.log("加载更多");
+			if (moreScroll.value) {
+				getMoreSmokeRecordList();
+			}
+		}
+		ScrollbarTop.value = scrollTop;
+	});
+	getAlarmList();
+});
 </script>
 
 <style lang="scss" scoped>
@@ -277,9 +184,10 @@ onMounted(async () => {});
 	}
 }
 .not-data {
-	top: 73%;
-	width: 12%;
-	left: 44%;
+	top: 33%;
+	width: 30%;
+	left: 34%;
+	text-align: center;
 	position: absolute;
 	img {
 		width: 40%;
diff --git a/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue b/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue
index 0ff8ee4..ad95b8b 100644
--- a/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue
@@ -1,19 +1,47 @@
 <template>
 	<Card title="后梁固定锚杆安装状态">
 		<div class="hang-basket-content">
-			<div class="install-content">
-				<div class="install-warn" v-for="(item, index) in 5">
+			<div class="install-content" v-if="realTimeData.rearBeamFixedAnchor1">
+				<!-- <div class="install-warn" v-for="(item, index) in 5">
 					<div class="dev-name">{{ index + 1 }}#</div>
 					<div class="warn-text">报警</div>
+				</div> -->
+				<div class="install-common">
+					<div class="dev-name">{{ 1 }}#</div>
+					<div class="warn-text" style="{ color: warnType[realTimeData.rearBeamFixedAnchor1].color }">{{ warnType[realTimeData.rearBeamFixedAnchor1].name || "-" }}</div>
 				</div>
-				<div class="install-common" v-for="(item, index) in 2">
-					<div class="dev-name">{{ index + 6 }}#</div>
-					<div class="warn-text">正常</div>
+				<div class="install-common">
+					<div class="dev-name">{{ 2 }}#</div>
+					<div class="warn-text" style="{ color: warnType[realTimeData.rearBeamFixedAnchor2].color }">{{ warnType[realTimeData.rearBeamFixedAnchor2].name || "-" }}</div>
 				</div>
-				<div class="install-unconnect">
+				<div class="install-common">
+					<div class="dev-name">{{ 3 }}#</div>
+					<div class="warn-text" style="{ color: warnType[realTimeData.rearBeamFixedAnchor3].color }">{{ warnType[realTimeData.rearBeamFixedAnchor3].name || "-" }}</div>
+				</div>
+				<div class="install-common">
+					<div class="dev-name">{{ 4 }}#</div>
+					<div class="warn-text" style="{ color: warnType[realTimeData.rearBeamFixedAnchor4].color }">{{ warnType[realTimeData.rearBeamFixedAnchor4].name || "-" }}</div>
+				</div>
+				<div class="install-common">
+					<div class="dev-name">{{ 5 }}#</div>
+					<div class="warn-text" style="{ color: warnType[realTimeData.rearBeamFixedAnchor5].color }">{{ warnType[realTimeData.rearBeamFixedAnchor5].name || "-" }}</div>
+				</div>
+				<div class="install-common">
+					<div class="dev-name">{{ 6 }}#</div>
+					<div class="warn-text" style="{ color: warnType[realTimeData.rearBeamFixedAnchor6].color }">{{ warnType[realTimeData.rearBeamFixedAnchor6].name || "-" }}</div>
+				</div>
+				<div class="install-common">
+					<div class="dev-name">{{ 7 }}#</div>
+					<div class="warn-text" style="{ color: warnType[realTimeData.rearBeamFixedAnchor7].color }">{{ warnType[realTimeData.rearBeamFixedAnchor7].name || "-" }}</div>
+				</div>
+				<div class="install-common">
+					<div class="dev-name">{{ 8 }}#</div>
+					<div class="warn-text" style="{ color: warnType[realTimeData.rearBeamFixedAnchor8].color }">{{ warnType[realTimeData.rearBeamFixedAnchor8].name || "-" }}</div>
+				</div>
+				<!-- <div class="install-unconnect">
 					<div class="dev-name">8#</div>
 					<div class="warn-text">未连接</div>
-				</div>
+				</div> -->
 			</div>
 		</div>
 	</Card>
@@ -21,14 +49,54 @@
 
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
-import { reactive, ref, onMounted } from "vue";
+import { reactive, ref, onMounted, onBeforeUnmount} from "vue";
+import mitts from "@/utils/bus"; //兄弟组件传值
+
+const warnType = ref([
+	{
+		id: 0,
+		name: "正常",
+		color: "#65d7f9"
+	},
+	{
+		id: 1,
+		name: "正常",
+		color: "#65d7f9"
+	},
+	{
+		id: 2,
+		name: "未连接",
+		color: "#d1d1d1"
+	},
+	{
+		id: 3,
+		name: "未使用",
+		color: "#d1d1d1"
+	},
+	{
+		id: 4,
+		name: "报警",
+		color: "#ec6266"
+	}
+]);
+
 // 选中
 let checked = ref(1);
 function tabChange(type: any) {
 	checked.value = type;
 }
 
-onMounted(async () => {});
+let realTimeData = ref({} as any)
+
+onMounted(async () => {
+	mitts.on("hangCurrentData", e => {
+		if (e) {realTimeData.value = e;}
+	});
+});
+// 
+onBeforeUnmount(async () => {
+	mitts.off("hangCurrentData");
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sevenLargeScreen/largeMachinery/hangBasket/topRight.vue b/src/views/sevenLargeScreen/largeMachinery/hangBasket/topRight.vue
index 3425f9f..024d85e 100644
--- a/src/views/sevenLargeScreen/largeMachinery/hangBasket/topRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/hangBasket/topRight.vue
@@ -2,19 +2,23 @@
 	<Card title="告警列表">
 		<div class="hang-basket-content">
 			<div class="warn-list">
-				<el-scrollbar style="height: 100%">
-					<div class="warn-item">
+				<el-scrollbar style="height: 100%" ref="refScrollbar">
+					<div class="warn-item" v-for="item in list " :key="item.id">
+						<div class="title">{{ item.devName || "-" }}</div>
+						<div class="text">{{ item.content || "-" }}</div>
+						<div class="time">{{ item.alarmBeginTime|| " -" }}</div>
+					</div>
+					<!-- <div class="warn-item">
 						<div class="title">1#后梁固定锚杆报警</div>
 						<div class="text">牛尤淆笨闹避案劈深眨随慈勉秧填腕鸣抚噬竹雇容虏埃挑纷采拱食恭仓禽退档茨殿句！</div>
 						<div class="time">2023.06.08 12:00:00</div>
-					</div>
-					<div class="warn-item">
-						<div class="title">1#后梁固定锚杆报警</div>
-						<div class="text">牛尤淆笨闹避案劈深眨随慈勉秧填腕鸣抚噬竹雇容虏埃挑纷采拱食恭仓禽退档茨殿句！</div>
-						<div class="time">2023.06.08 12:00:00</div>
-					</div>
+					</div> -->
 				</el-scrollbar>
 			</div>
+			<div class="not-data" v-if="list.length == 0">
+						<img src="@/assets/images/noData.png" alt="" />
+						<p>暂无数据</p>
+					</div>
 		</div>
 	</Card>
 </template>
@@ -22,13 +26,84 @@
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
 import { reactive, ref, onMounted } from "vue";
-// 选中
-let checked = ref(1);
-function tabChange(type: any) {
-	checked.value = type;
-}
+import { GlobalStore } from "@/stores";
+import { hangBasketAlarmDataPage } from "@/api/modules/largeMachinery";
 
-onMounted(async () => {});
+const warnType = ref([
+	{
+		id: 1,
+		name: "未知",
+		color: "#EC6266"
+	},
+	{
+		id: 2,
+		name: "有人",
+		color: "#65D7F9"
+	},
+	{
+		id: 3,
+		name: "无人",
+		color: "#FFFFFF"
+	}
+]);
+
+const store = GlobalStore();
+let showDialog = ref(false as any);
+let rangeTime = ref("" as any);
+const list = ref([]);
+const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
+const ScrollbarTop = ref(0);
+
+let moreScroll = ref(true as any);
+
+let pageNo = ref(1 as any);
+let pageSize = ref(10 as any);
+
+// 告警列表
+const getAlarmList = async () => {
+	const res: any = await hangBasketAlarmDataPage({ projectSn: store.sn, pageNo: 1, pageSize: pageSize.value });
+	console.log("告警列表", res);
+	list.value = res.result.records;
+	if (res.result.pages == pageNo.value) {
+		moreScroll.value = false;
+	} else {
+		pageNo.value = pageNo.value + 1;
+	}
+	// console.log("当前页数", pageNo.value);
+};
+
+// 下拉加载
+const getMoreSmokeRecordList = async () => {
+	const res: any = await hangBasketAlarmDataPage({ projectSn: store.sn, pageNo: pageNo.value, pageSize: pageSize.value });
+	// console.log("下拉加载告警列表", res);
+	list.value = list.value.concat(res.result.records);
+	if (res.result.pages == pageNo.value) {
+		moreScroll.value = false;
+	} else {
+		pageNo.value = pageNo.value + 1;
+	}
+	// console.log("当前列表", list.value);
+	// console.log("当前页数", pageNo.value);
+};
+
+onMounted(async () => {
+	refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
+		// console.log("滚动容器", e);
+		const scrollTop = e.target.scrollTop;
+		const scrollHeight = e.target.scrollHeight;
+		const clientHeight = e.target.clientHeight;
+		// console.log("滚动容器", scrollTop, scrollHeight, clientHeight);
+		// 向上加载更多
+		if (scrollTop >= scrollHeight - clientHeight) {
+			console.log("加载更多");
+			if (moreScroll.value) {
+				getMoreSmokeRecordList();
+			}
+		}
+		ScrollbarTop.value = scrollTop;
+	});
+	getAlarmList();
+});
 </script>
 
 <style lang="scss" scoped>
@@ -42,7 +117,7 @@ onMounted(async () => {});
 		.warn-item {
 			box-sizing: border-box;
 			width: 94%;
-			padding: 3% 3% 9% 3%;
+			padding: 3% 3% 3% 3%;
 			margin-left: 3%;
 			margin-top: 5%;
 			background: url("@/assets/images/concreteMonitor/listBg.png") no-repeat;
@@ -62,10 +137,26 @@ onMounted(async () => {});
 				position: absolute;
 				color: #a1accb;
 				font-size: 12px;
-				bottom: 10%;
+				bottom: 20%;
 				right: 12%;
 			}
 		}
 	}
 }
+.not-data {
+	top: 20%;
+	width: 55%;
+	left: 24%;
+	text-align: center;
+	position: absolute;
+	img {
+		width: 40%;
+		margin: 5% 30%;
+	}
+	p {
+		color: #fff;
+		font-size: 14px;
+		margin: -6% 37%;
+	}
+}
 </style>
diff --git a/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/bottomLeft.vue b/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/bottomLeft.vue
index 4078085..ead13d5 100644
--- a/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/bottomLeft.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/bottomLeft.vue
@@ -1,5 +1,5 @@
 <template>
-	<Card title="压浆超标因素占比">
+	<Card title="钢束压浆合格率">
 		<div class="load-bottom-left">
 			<div class="choice-right">
 				<div class="day selected" @click="getNowData(1)" :class="checked == 1 ? 'active' : ''">今日</div>
diff --git a/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/bottomRight.vue b/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/bottomRight.vue
index f10cf98..bf15a4d 100644
--- a/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/bottomRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/bottomRight.vue
@@ -8,7 +8,7 @@
 					<div>施工单位</div>
 					<div>梁号</div>
 					<div>梁型</div>
-					<div>锚片厚度</div>
+					<div>砼设计强度</div>
 					<div>设备厂家</div>
 					<div>压浆时间</div>
 					<div>上传时间</div>
@@ -21,12 +21,12 @@
 						<div class="single-text" :title="item.constructionPart">{{ item.constructionPart }}</div>
 						<div class="single-text" :title="item.beamNumber">{{ item.beamNumber }}</div>
 						<div class="single-text" :title="item.beamType">{{ item.beamType }}</div>
-						<div class="single-text" :title="item.anchorSheetThickness">{{ item.anchorSheetThickness }}</div>
+						<div class="single-text" :title="item.concreteDesignStrength">{{ item.concreteDesignStrength }}</div>
 						<div class="single-text" :title="item.equipmentManufacturer">{{ item.equipmentManufacturer }}</div>
 						<div class="single-text" :title="item.tensionGroutTime">{{ item.tensionGroutTime }}</div>
 						<div class="single-text" :title="item.createDate">{{ item.createDate }}</div>
-						<div :style="{ color: item.passType == 2 ? '#EC6266' : '#FFFFFF' }">
-							{{ item.passType === 1 ? "合格" : item.passType === 2 ? "不合格" : "未判定" }}
+						<div :style="{ color: item.status == 2 ? '#EC6266' : '#FFFFFF' }">
+							{{ item.status === 1 ? "合格" : item.status === 2 ? "不合格" : "未判定" }}
 						</div>
 					</div>
 					<div class="not-data" v-if="list.length == 0">
@@ -72,7 +72,7 @@ const getAlarmList = async () => {
 
 // 下拉加载
 const getMoreSmokeRecordList = async () => {
-	const res: any = await countWeighInfoTrend({ projectSn: store.sn, pageNo: pageNo.value, pageSize: pageSize.value });
+	const res: any = await countWeighInfoTrend2({ projectSn: store.sn, pageNo: pageNo.value, pageSize: pageSize.value });
 	// console.log("下拉加载告警列表", res);
 	list.value = list.value.concat(res.result.records);
 	if (res.result.pages == pageNo.value) {
diff --git a/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/topCenter.vue b/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/topCenter.vue
index 449820e..7828ce6 100644
--- a/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/topCenter.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/intelligentGrout/topCenter.vue
@@ -9,11 +9,11 @@
 			<div class="right-box">
 				<div class="yesterday-use">
 					<div class="text">日压浆次数</div>
-					<div class="num">{{ realTimeTotal.tensionsPerDayNum || 0 }}</div>
+					<div class="num">{{ realTimeTotal.groutPerDayNum || 0 }}</div>
 				</div>
 				<div class="yesterday-chain">
 					<div class="text">压浆合格率</div>
-					<div class="num">{{ realTimeTotal.tensionPassRate || 0 }}<span style="font-family: none">%</span></div>
+					<div class="num">{{ realTimeTotal.groutPassRate || 0 }}<span style="font-family: none">%</span></div>
 				</div>
 				<div class="month-use">
 					<div class="text">累计压浆次数</div>
diff --git a/src/views/sevenLargeScreen/largeMachinery/intelligentTension/bottomRight.vue b/src/views/sevenLargeScreen/largeMachinery/intelligentTension/bottomRight.vue
index aca6e04..a610595 100644
--- a/src/views/sevenLargeScreen/largeMachinery/intelligentTension/bottomRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/intelligentTension/bottomRight.vue
@@ -25,8 +25,8 @@
 						<div class="single-text" :title="item.equipmentManufacturer">{{ item.equipmentManufacturer }}</div>
 						<div class="single-text" :title="item.tensionTime">{{ item.tensionTime }}</div>
 						<div class="single-text" :title="item.createDate">{{ item.createDate }}</div>
-						<div :style="{ color: item.passType == 2 ? '#EC6266' : '#FFFFFF' }">
-							{{ item.passType === 1 ? "合格" : item.passType === 2 ? "不合格" : "未判定" }}
+						<div :style="{ color: item.status == 2 ? '#EC6266' : '#FFFFFF' }">
+							{{ item.status === 1 ? "合格" : item.status === 2 ? "不合格" : "未判定" }}
 						</div>
 					</div>
 					<div class="not-data" v-if="list.length == 0">
diff --git a/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/bottomRight.vue b/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/bottomRight.vue
index d78b4cf..a2dd61a 100644
--- a/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/bottomRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/bottomRight.vue
@@ -13,6 +13,7 @@
 					<div>设计强度</div>
 					<div>强度代表值(Mpa)</div>
 					<div>试验时间</div>
+					<div>状态</div>
 					<div>操作</div>
 				</div>
 				<el-scrollbar class="list-box" ref="refScrollbar">
@@ -31,9 +32,13 @@
 						<div class="single-text" :title="item.designStrength">{{ item.designStrength }}</div>
 						<div class="single-text" :title="item.intensityRepresentativeValue">{{ item.intensityRepresentativeValue }}</div>
 						<div class="single-text" :title="item.testTime">{{ item.testTime }}</div>
+						<div class="single-text" :title="nameOptions[item.status - 1].label" v-if="item.status > 0 && item.status < 3">
+							{{ nameOptions[item.status - 1].label }}
+						</div>
+						<div v-else>-</div>
 						<div>
 							<span class="listNumber" @click="openDetailDialog(item)">详情</span>
-							<span class="listNumber" style="margin-left: 20px">报告</span>
+							<span class="listNumber" style="margin-left: 20px" v-if="item.uploadAttachment"  @click="downloadFn(item)">报告</span>
 						</div>
 					</div>
 					<div class="not-data" v-if="list.length == 0">
@@ -272,6 +277,21 @@ const list = ref([
 const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
 const ScrollbarTop = ref(0);
 
+const nameOptions = ref([
+	{
+		label: "合格",
+		value: 1
+	},
+	{
+		label: "不合格",
+		value: 2
+	},
+	{
+		label: "未判定",
+		value: 3
+	}
+]);
+
 let moreScroll = ref(true as any);
 
 let pageNo = ref(1 as any);
@@ -303,6 +323,26 @@ const getMoreSmokeRecordList = async () => {
 	// console.log("当前列表", list.value);
 	// console.log("当前页数", pageNo.value);
 };
+const BASEURL = import.meta.env.VITE_API_URL;
+function downloadFn(item: any) {
+	console.log(item);
+	let imageUrl = JSON.parse(item.uploadAttachment)[0].url;
+	console.log("url", imageUrl);
+	let x = new XMLHttpRequest();
+	console.log(BASEURL + "/image/" + imageUrl);
+	x.open("GET", BASEURL + "/image/" + imageUrl, true);
+	x.responseType = "blob";
+	x.onload = function (e) {
+		let url = window.URL.createObjectURL(x.response);
+		let a = document.createElement("a");
+		console.log(url);
+		a.href = url;
+		a.download = item.testNumber;
+		a.click();
+		document.removeChild(a);
+	};
+	x.send();
+}
 onMounted(async () => {
 	refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
 		// console.log("滚动容器", e);
diff --git a/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/curve-line.vue b/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/curve-line.vue
index 91e1d09..841b14e 100644
--- a/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/curve-line.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/curve-line.vue
@@ -3,7 +3,7 @@
 		<div class="load-content">
 			<div id="curveLine" ref="curveLine" style="width: 1000px; height: 350px"></div>
 		</div>
-		<div class="not-data" v-if="lineConfig.length == 0">
+		<div class="not-data" v-if="props.lineConfig.length == 0">
 			<img src="@/assets/images/noData.png" alt="" />
 			<p>暂无数据</p>
 		</div>
@@ -14,7 +14,7 @@
 import Card from "@/components/card.vue";
 // import symbolIcon2 from "@/assets/images/toxicGasMonitor/lineIcon2.png";
 
-import { onMounted, ref, onBeforeUnmount } from "vue";
+import { onMounted, ref, onBeforeUnmount, watch } from "vue";
 import * as echarts from "echarts";
 // import { getSelectDataListApi } from "@/api/modules/distribution";
 // import Card from "@/components/card.vue";
@@ -35,6 +35,27 @@ let unit = ref("力值/kN" as any);
 // 	["2023-9-20 15:15:00", 60]
 // ]);
 
+// ts
+type Props = {
+	lineConfig?: any; // 传入x轴对应的数据
+};
+// withDefaults 定义默认值(传入的数据类型同默认值)
+const props = withDefaults(defineProps<Props>(), {
+	lineConfig: [],
+	// num: () => [12, 13, 14] // 复杂数据类型使用函数方式
+});
+
+watch(
+	() => props.lineConfig,
+	newVal => {
+		console.log(newVal, "newVal");
+		if (newVal) {
+			// props.xData = newVal;
+			drawChart();
+		}
+	}
+);
+
 // 图表数据项
 let option = ref(null as any);
 // 选中
@@ -239,7 +260,7 @@ function initOption() {
 				}
 			}
 		],
-		series: lineConfig.value
+		series: props.lineConfig
 		// [
 		// 	// {
 		// 	// 	showAllSymbol: false,
@@ -294,19 +315,21 @@ function drawChart() {
 let startDraw = ref(false) as any;
 
 onMounted(async () => {
-	mitts.on("pressureLine", e => {
-		lineConfig.value = e;
-		console.log("接收试验曲线数值", e);
-	});
-	mitts.on("pressureLineDraw", e => {
-		if (lineConfig.value.length == 0) {
-			return;
-		}
-		startDraw.value = e;
+	// mitts.on("pressureLine", e => {
+	// 	props.lineConfig = e;
+	// 	console.log("接收试验曲线数值", e);
+	// });
+	// mitts.on("pressureLineDraw", e => {
+	// 	if (props.lineConfig.length == 0) {
+	// 		return;
+	// 	}
+	// 	startDraw.value = e;
+	// 	drawChart();
+	// 	console.log("图线绘制", e);
+	// });
+	if (props.lineConfig.length > 0) {
 		drawChart();
-		console.log("图线绘制", e);
-	});
-
+	}
 	// getMeterTotal();
 });
 
diff --git a/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/dev-detail-dialog.vue b/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/dev-detail-dialog.vue
index ed0ddbe..0b7ad43 100644
--- a/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/dev-detail-dialog.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/pressureTestMachine/dev-detail-dialog.vue
@@ -13,37 +13,38 @@
 					<div class="base-left">
 						<div class="base-text">
 							<div>施工部位</div>
-							<div>{{ detailData.constructionPart || '' }}</div>
+							<div>{{ detailData.constructionPart || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>试验类型</div>
-							<div>{{ detailData.testType || '' }}</div>
+							<div v-if="detailData.testType > 0 && detailData.testType < 17">{{ warnType[detailData.testType - 1].label }}</div>
+							<div v-else>-</div>
 						</div>
 						<div class="base-text">
 							<div>试验编号</div>
-							<div>{{ detailData.testNumber || '' }}</div>
+							<div>{{ detailData.testNumber || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>设备名称</div>
-							<div>{{ detailData.devName || '' }}</div>
+							<div>{{ detailData.devName || "" }}</div>
 						</div>
 					</div>
 					<div class="base-right">
 						<div class="base-text">
 							<div>设备编号</div>
-							<div>{{ detailData.devSn || '' }}</div>
+							<div>{{ detailData.devSn || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>制件时间</div>
-							<div>{{ detailData.productionTime || '' }}</div>
+							<div>{{ detailData.productionTime || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>试验开始时间</div>
-							<div>{{ detailData.testTime || '' }}</div>
+							<div>{{ detailData.testTime || "" }}</div>
 						</div>
 						<div class="base-text">
-							<div>操作员</div>
-							<div>{{ detailData.operator || '' }}</div>
+							<div>试验员</div>
+							<div>{{ detailData.operator || "" }}</div>
 						</div>
 					</div>
 				</div>
@@ -56,21 +57,21 @@
 				<table>
 					<tr>
 						<td>设备强度</td>
-						<td>{{ detailData.equipmentStrength || '' }}</td>
+						<td>{{ detailData.equipmentStrength || "" }}</td>
 						<td>强度代表值(Mpa)</td>
-						<td>{{ detailData.intensityRepresentativeValue || '' }}</td>
+						<td>{{ detailData.intensityRepresentativeValue || "" }}</td>
 					</tr>
 					<tr>
 						<td>试件尺寸</td>
-						<td>{{ detailData.specimenSize || '' }}</td>
+						<td>{{ detailData.specimenSize || "" }}</td>
 						<td>试件龄期</td>
-						<td>{{ detailData.specimenAge || '' }}</td>
+						<td>{{ detailData.specimenAge || "" }}</td>
 					</tr>
 					<tr>
 						<td>试件面积</td>
-						<td>{{ detailData.specimenArea || '' }}</td>
+						<td>{{ detailData.specimenArea || "" }}</td>
 						<td>公称直径(mm)</td>
-						<td>{{ detailData.nominalDiameter || '' }}</td>
+						<td>{{ detailData.nominalDiameter || "" }}</td>
 					</tr>
 				</table>
 				<div class="base-title" style="margin-bottom: 3%">试块测试值</div>
@@ -99,8 +100,8 @@
 					</el-scrollbar>
 				</div>
 			</div>
-			<div class="curve-line" v-show="checked === 2">
-				<curve-line></curve-line>
+			<div class="curve-line" v-if="checked === 2">
+				<curve-line :lineConfig="steelLineList"></curve-line>
 			</div>
 			<div class="close-icon" @click="closeDialog">
 				<el-icon><Close /></el-icon>
@@ -116,6 +117,73 @@ import curveLine from "@/views/sevenLargeScreen/largeMachinery/pressureTestMachi
 import mitts from "@/utils/bus"; //兄弟组件传值
 import { pressureBlockNumberList, pressureBlockDataList } from "@/api/modules/largeMachinery";
 
+const warnType = ref([
+	{
+		label: "混凝土试件抗压强度试验",
+		value: 1
+	},
+	{
+		label: "钢筋试验",
+		value: 2
+	},
+	{
+		label: "钢筋焊接接头试验",
+		value: 3
+	},
+	{
+		label: "钢筋机械连接接头试验",
+		value: 4
+	},
+	{
+		label: "水泥砂浆立方体抗压强度试验",
+		value: 5
+	},
+	{
+		label: "水泥砂浆立方体抗压强度试验(建筑)",
+		value: 6
+	},
+	{
+		label: "水泥净浆物理性能试验",
+		value: 7
+	},
+	{
+		label: "水泥胶砂强度试验",
+		value: 8
+	},
+	{
+		label: "水泥胶砂抗折试验",
+		value: 9
+	},
+	{
+		label: "水泥净浆抗折试验",
+		value: 10
+	},
+	{
+		label: "水泥混凝土圆柱体轴心抗压强度试验",
+		value: 11
+	},
+	{
+		label: "后张预应力孔道压浆抗压强度试验",
+		value: 12
+	},
+	{
+		label: "后张预应力孔道压浆抗折强度试验",
+		value: 13
+	},
+	{
+		label: "无机结合料稳定材料无侧限抗压强度试验",
+		value: 14
+	},
+	{
+		label: "复检钢筋焊接接头试验",
+		value: 15
+	},
+	{
+		label: "复检钢筋机械连接接头试验",
+		value: 16
+	}
+]);
+
 const store = GlobalStore();
 let showDialog = ref(false as any);
 
@@ -130,6 +198,7 @@ function closeDialog() {
 	showDialog.value = false;
 	checked.value = 1;
 	finishLine.value = false;
+	steelLineList.value = [];
 }
 
 // 选中
@@ -141,7 +210,7 @@ function getdayData(type: any) {
 
 function getWeekData(type: any) {
 	checked.value = type;
-	mitts.emit("pressureLineDraw", true);
+	// mitts.emit("pressureLineDraw", true);
 }
 let detailData = ref({} as any);
 // let dialogIndex = ref(null as any);
@@ -152,6 +221,9 @@ function openDialog(item: any) {
 	// dialogIndex.value = type;
 	dialogTitle.value = "设备详情";
 	getDetailList(item.id);
+	setTimeout(() => {
+		showDialog.value = true
+	}, 2000);
 }
 
 let steelBeamList = ref([] as any);
@@ -170,9 +242,6 @@ const getDetailList = async (detailId: any) => {
 				finishLine.value = true;
 			}
 		}
-		// dialogShow = true
-	} else {
-		showDialog.value = true;
 	}
 };
 
@@ -193,16 +262,18 @@ const getLineList = async (item: any) => {
 			type: "line",
 			smooth: true
 		};
-		steelLineList.value.push(currentData);
-	}
-	if (finishLine.value) {
-		setTimeout(() => {
-			showDialog.value = true;
-			// console.log("发送pressureLine", steelLineList.value);
-			mitts.emit("pressureLine", steelLineList.value);
-		}, 1000);
-		// console.log("曲线数据", steelLineList.value, "试块列表", steelBeamList.value);
+		if (combinedArray.length > 0) {
+			steelLineList.value.push(currentData);
+		}
 	}
+	// if (finishLine.value) {
+	// 	setTimeout(() => {
+	// 		showDialog.value = true;
+	// 		// console.log("发送pressureLine", steelLineList.value);
+	// 		mitts.emit("pressureLine", steelLineList.value);
+	// 	}, 1000);
+	// 	// console.log("曲线数据", steelLineList.value, "试块列表", steelBeamList.value);
+	// }
 };
 
 // 暴露给父组件的参数和方法(外部需要什么，都可以从这里暴露出去)
diff --git a/src/views/sevenLargeScreen/largeMachinery/roadCompaction/indexPaving.vue b/src/views/sevenLargeScreen/largeMachinery/roadCompaction/indexPaving.vue
index 5f74b51..6da7b95 100644
--- a/src/views/sevenLargeScreen/largeMachinery/roadCompaction/indexPaving.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/roadCompaction/indexPaving.vue
@@ -1,16 +1,16 @@
 <template>
 	<div class="paving-page">
 		<div class="page-left">
-			<Card title="摊铺设备列表">
+			<Card title="压实设备列表">
 				<div class="paving-list">
 					<div class="dev-num">
 						<div class="yesterday-chain">
 							<div class="text">压实设备</div>
-							<div class="num">3<span style="font-family: none"></span></div>
+							<div class="num">{{ realTimeTotal.devNum || 0 }}<span style="font-family: none"></span></div>
 						</div>
 						<div class="month-use">
 							<div class="text">在线设备</div>
-							<div class="num">100</div>
+							<div class="num">{{ realTimeTotal.onlineDevNum || 0 }}</div>
 						</div>
 					</div>
 					<div class="dev-list">
@@ -23,13 +23,15 @@
 								<div>状态</div>
 							</div>
 							<el-scrollbar class="list-box">
-								<div v-for="(item, index) in list" class="list-style" :key="item.id" @click="getMarker(item)">
+								<div v-for="(item, index) in list" class="list-style" :key="item.id" @click="getMarker(item.newestRecord)">
 									<div>{{ index + 1 }}</div>
-									<div>{{ item.personName }}</div>
-									<div>{{ item.personAge }}</div>
-									<div class="single-text" :title="item.teamGroup">{{ item.teamGroup }}</div>
-									<div :style="{ color: item.passType == 1 ? '#EC6266' : '#FFFFFF' }">
-										{{ item.passType == 0 ? "在线" : "离线" }}
+									<div>{{ item.devName }}</div>
+									<div v-if="item.newestRecord">{{ item.newestRecord.paveSpeed }}</div>
+									<div v-if="item.newestRecord" class="single-text" :title="item.newestRecord.paveTime">{{ item.newestRecord.paveTime }}</div>
+									<div v-if="!item.newestRecord">0</div>
+									<div v-if="!item.newestRecord">-</div>
+									<div :style="{ color: item.devOnline == 0 ? '#EC6266' : '#FFFFFF' }">
+										{{ item.devOnline == 1 ? "在线" : "离线" }}
 									</div>
 								</div>
 								<div class="not-data" v-if="list.length == 0">
@@ -55,8 +57,27 @@
 import Card from "@/components/card.vue";
 import { reactive, ref, onMounted } from "vue";
 import { GlobalStore } from "@/stores";
-const store = GlobalStore();
 import yaShi from "@/assets/images/carPosition/yaShi.png";
+const store = GlobalStore();
+
+import { paveDevList2, countPaveDev2 } from "@/api/modules/roadPaving";
+
+// 获取 设备列表
+const realTimeTotal = ref({}) as any;
+const getMemberCareList = async () => {
+	const res: any = await paveDevList2({ projectSn: store.sn });
+	console.log("设备列表", res);
+	if (res.success) {
+		list.value = res.result;
+	}
+};
+const getPavingList = async () => {
+	const res: any = await countPaveDev2({ projectSn: store.sn });
+	console.log("设备数据", res);
+	if (res.success) {
+		realTimeTotal.value = res.result;
+	}
+};
 
 var mouseTool;
 var marker;
@@ -66,153 +87,7 @@ var map;
 
 // let showDialog = ref(false as any);
 // let rangeTime = ref("" as any);
-const list = reactive([
-	{
-		id: 1,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 2,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 1,
-		trainScore: 78
-	},
-	{
-		id: 3,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 4,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 1,
-		trainScore: 78
-	},
-	{
-		id: 5,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 6,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 1,
-		trainScore: 78
-	},
-	{
-		id: 7,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-
-	{
-		id: 8,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 9,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 10,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 11,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 12,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 13,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 14,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 15,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 16,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	}
-]);
+const list = ref([]);
 function initMap() {
 	// var that = this;
 	//地图加载
@@ -221,12 +96,39 @@ function initMap() {
 	});
 }
 
+// function addMarker() {
+// 	// 创建一个 Icon
+// 	var startIcon = new AMap.Icon({
+// 		// 图标尺寸
+// 		size: new AMap.Size(25, 34),
+// 		// 图标的取图地址
+// 		image: "//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png",
+// 		// 图标所用图片大小
+// 		imageSize: new AMap.Size(25, 34)
+// 		// 图标取图偏移量
+// 		// imageOffset: new AMap.Pixel(-9, -3)
+// 	});
+// 	var marker = new AMap.Marker({
+// 		icon: startIcon,
+// 		position: [locationList.value[0].longitude, locationList.value[0].latitude],
+// 		size: new AMap.Size(25, 34)
+// 		// offset: new AMap.Pixel(-13, -30)
+// 	});
+// 	marker.setMap(map);
+// }
+
 function getMarker(item) {
 	clearFn();
+	if (!item) {
+		// alert("设备无实时数据");
+		map.setFitView();
+		return
+	}
+	console.log(item,"点击");
 	//初始化地图对象，加载地图
 	// let map = new AMap.Map("mapContainer", {resizeEnable: true});
-	let lnglats = [[116.403322, 39.920255]];
-
+	// let lnglats = [[116.403322, 39.920255]];
+	let lnglats = [[item.geographicalLongitude, item.geographicalLatitude]];
 	let startIcon = new AMap.Icon({
 		// 图标尺寸
 		size: new AMap.Size(50, 68),
@@ -275,9 +177,14 @@ function getMarker(item) {
 		// console.log(e)
 		let info = [];
 
-		// info.push('<p style="padding:7px;">设备序号:  ' + item.devSn + "</p>");
-		// info.push('<p style="padding:7px;">车辆/人员名称: ' + item.numberPlate + "</p>");
-		// info.push('<p style="padding:7px;">最后更新时间: ' + item.updateTime + "</p>");
+		info.push('<p style="padding:7px;">振幅:  ' + item.amplitude + "</p>");
+		info.push('<p style="padding:7px;">频率(Hz): ' + item.frequency + "</p>");
+		info.push('<p style="padding:7px;">压实时间: ' + item.paveTime + "</p>");
+		info.push('<p style="padding:7px;">地理经度(W/E):  ' + item.geographicalLongitude + "</p>");
+		info.push('<p style="padding:7px;">地理纬度(N/S)": ' + item.geographicalLatitude + "</p>");
+		info.push('<p style="padding:7px;">压实速度(m/min): ' + item.paveSpeed + "</p>");
+		info.push('<p style="padding:7px;">平均压实温度(C):  ' + item.averagePaveTemp + "</p>");
+		info.push('<p style="padding:7px;">平均压实厚度(mm): ' + item.paveDegree + "</p>");
 		info.push('<p style="padding:7px;">位置: ' + address + "</p>");
 
 		let infoWindow = new AMap.InfoWindow({
@@ -287,7 +194,7 @@ function getMarker(item) {
 		// console.log("信息窗体",infoWindow)
 		infoWindow.open(map, e.target.getPosition());
 	}
-	map.setFitView();
+	map.setFitView(marker);
 }
 
 function clearFn() {
@@ -296,6 +203,8 @@ function clearFn() {
 
 onMounted(async () => {
 	initMap();
+	getMemberCareList();
+	getPavingList();
 });
 </script>
 <style lang="scss" scoped>
@@ -440,9 +349,10 @@ onMounted(async () => {
 	}
 }
 .not-data {
-	top: 73%;
-	width: 12%;
-	left: 44%;
+	top: 35%;
+	width: 42%;
+	left: 30%;
+	text-align: center;
 	position: absolute;
 	img {
 		width: 40%;
diff --git a/src/views/sevenLargeScreen/largeMachinery/roadPaving/indexPaving.vue b/src/views/sevenLargeScreen/largeMachinery/roadPaving/indexPaving.vue
index b51170f..1cbd118 100644
--- a/src/views/sevenLargeScreen/largeMachinery/roadPaving/indexPaving.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/roadPaving/indexPaving.vue
@@ -6,11 +6,11 @@
 					<div class="dev-num">
 						<div class="yesterday-chain">
 							<div class="text">摊铺设备</div>
-							<div class="num">3<span style="font-family: none"></span></div>
+							<div class="num">{{ realTimeTotal.devNum || 0 }}<span style="font-family: none"></span></div>
 						</div>
 						<div class="month-use">
 							<div class="text">在线设备</div>
-							<div class="num">100</div>
+							<div class="num">{{ realTimeTotal.onlineDevNum || 0 }}</div>
 						</div>
 					</div>
 					<div class="dev-list">
@@ -23,13 +23,15 @@
 								<div>状态</div>
 							</div>
 							<el-scrollbar class="list-box">
-								<div v-for="(item, index) in list" class="list-style" :key="item.id" @click="getMarker(item)">
+								<div v-for="(item, index) in list" class="list-style" :key="item.id" @click="getMarker(item.newestRecord)">
 									<div>{{ index + 1 }}</div>
-									<div>{{ item.personName }}</div>
-									<div>{{ item.personAge }}</div>
-									<div class="single-text" :title="item.teamGroup">{{ item.teamGroup }}</div>
-									<div :style="{ color: item.passType == 1 ? '#EC6266' : '#FFFFFF' }">
-										{{ item.passType == 0 ? "在线" : "离线" }}
+									<div>{{ item.devName }}</div>
+									<div v-if="item.newestRecord">{{ item.newestRecord.paveSpeed }}</div>
+									<div v-if="item.newestRecord" class="single-text" :title="item.newestRecord.paveTime">{{ item.newestRecord.paveTime }}</div>
+									<div v-if="!item.newestRecord">-</div>
+									<div v-if="!item.newestRecord">-</div>
+									<div :style="{ color: item.devOnline == 0 ? '#EC6266' : '#FFFFFF' }">
+										{{ item.devOnline == 1 ? "在线" : "离线" }}
 									</div>
 								</div>
 								<div class="not-data" v-if="list.length == 0">
@@ -58,6 +60,25 @@ import { GlobalStore } from "@/stores";
 import tanPu from "@/assets/images/carPosition/tanPu.png";
 const store = GlobalStore();
 
+import { paveDevList, countPaveDev } from "@/api/modules/roadPaving";
+
+// 获取 设备列表
+const realTimeTotal = ref({}) as any;
+const getMemberCareList = async () => {
+	const res: any = await paveDevList({ projectSn: store.sn });
+	console.log("设备列表", res);
+	if (res.success) {
+		list.value = res.result;
+	}
+};
+const getPavingList = async () => {
+	const res: any = await countPaveDev({ projectSn: store.sn });
+	console.log("设备数据", res);
+	if (res.success) {
+		realTimeTotal.value = res.result;
+	}
+};
+
 var mouseTool;
 var marker;
 var lineArr;
@@ -66,153 +87,7 @@ var map;
 
 // let showDialog = ref(false as any);
 // let rangeTime = ref("" as any);
-const list = reactive([
-	{
-		id: 1,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 2,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 1,
-		trainScore: 78
-	},
-	{
-		id: 3,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 4,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 1,
-		trainScore: 78
-	},
-	{
-		id: 5,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 6,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 1,
-		trainScore: 78
-	},
-	{
-		id: 7,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-
-	{
-		id: 8,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 9,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 10,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 11,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 12,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 13,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 14,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 15,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	},
-	{
-		id: 16,
-		personName: "驾驶舱",
-		personGrade: "comp-08abcd",
-		personAge: "550m/min",
-		teamGroup: "2023-01-02 22:00:00",
-		passType: 0,
-		trainScore: 78
-	}
-]);
+const list = ref([]);
 function initMap() {
 	// var that = this;
 	//地图加载
@@ -246,8 +121,8 @@ function getMarker(item) {
 	clearFn();
 	//初始化地图对象，加载地图
 	// let map = new AMap.Map("mapContainer", {resizeEnable: true});
-	let lnglats = [[116.403322, 39.920255]];
-
+	// let lnglats = [[116.403322, 39.920255]];
+	let lnglats = [[item.geographicalLongitude, item.geographicalLatitude]];
 	let startIcon = new AMap.Icon({
 		// 图标尺寸
 		size: new AMap.Size(50, 68),
@@ -296,9 +171,14 @@ function getMarker(item) {
 		// console.log(e)
 		let info = [];
 
-		// info.push('<p style="padding:7px;">设备序号:  ' + item.devSn + "</p>");
-		// info.push('<p style="padding:7px;">车辆/人员名称: ' + item.numberPlate + "</p>");
-		// info.push('<p style="padding:7px;">最后更新时间: ' + item.updateTime + "</p>");
+		info.push('<p style="padding:7px;">振幅:  ' + item.amplitude + "</p>");
+		info.push('<p style="padding:7px;">频率(Hz): ' + item.frequency + "</p>");
+		info.push('<p style="padding:7px;">摊铺时间: ' + item.paveTime + "</p>");
+		info.push('<p style="padding:7px;">地理经度(W/E):  ' + item.geographicalLongitude + "</p>");
+		info.push('<p style="padding:7px;">地理纬度(N/S)": ' + item.geographicalLatitude + "</p>");
+		info.push('<p style="padding:7px;">摊铺速度(m/min): ' + item.paveSpeed + "</p>");
+		info.push('<p style="padding:7px;">平均摊铺温度(C):  ' + item.averagePaveTemp + "</p>");
+		info.push('<p style="padding:7px;">平均摊铺厚度(mm): ' + item.averagePaveThickness + "</p>");
 		info.push('<p style="padding:7px;">位置: ' + address + "</p>");
 
 		let infoWindow = new AMap.InfoWindow({
@@ -308,7 +188,7 @@ function getMarker(item) {
 		// console.log("信息窗体",infoWindow)
 		infoWindow.open(map, e.target.getPosition());
 	}
-	map.setFitView();
+	map.setFitView(marker);
 }
 
 function clearFn() {
@@ -317,6 +197,8 @@ function clearFn() {
 
 onMounted(async () => {
 	initMap();
+	getMemberCareList();
+	getPavingList();
 });
 </script>
 <style lang="scss" scoped>
@@ -461,9 +343,10 @@ onMounted(async () => {
 	}
 }
 .not-data {
-	top: 73%;
-	width: 12%;
-	left: 44%;
+	top: 35%;
+	width: 42%;
+	left: 30%;
+	text-align: center;
 	position: absolute;
 	img {
 		width: 40%;
diff --git a/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/dev-detail-dialog.vue b/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/dev-detail-dialog.vue
index 7c6ab64..77273e5 100644
--- a/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/dev-detail-dialog.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/dev-detail-dialog.vue
@@ -12,38 +12,39 @@
 				<div class="base-content">
 					<div class="base-left">
 						<div class="base-text">
-							<div>施工部位</div>
-							<div>{{ detailData.constructionPart || '' }}</div>
+							<div>工程名称</div>
+							<div>{{ projectTimeInfo.name || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>试验类型</div>
-							<div>{{ detailData.testType || '' }}</div>
+							<div v-if="detailData.testType > 0 && detailData.testType < 17">{{ warnType[detailData.testType - 1].label }}</div>
+							<div v-else>-</div>
 						</div>
 						<div class="base-text">
 							<div>试验编号</div>
-							<div>{{ detailData.testNumber || '' }}</div>
+							<div>{{ detailData.testNumber || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>设备名称</div>
-							<div>{{ detailData.devName || '' }}</div>
+							<div>{{ detailData.deviceName || "" }}</div>
 						</div>
 					</div>
 					<div class="base-right">
 						<div class="base-text">
 							<div>设备编号</div>
-							<div>{{ detailData.devSn || '' }}</div>
+							<div>{{ detailData.devSn || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>制件时间</div>
-							<div>{{ detailData.productionTime || '' }}</div>
+							<div>{{ detailData.productionTime || "" }}</div>
 						</div>
 						<div class="base-text">
 							<div>试验开始时间</div>
-							<div>{{ detailData.testTime || '' }}</div>
+							<div>{{ detailData.testTime || "" }}</div>
 						</div>
 						<div class="base-text">
-							<div>操作员</div>
-							<div>{{ detailData.operator || '' }}</div>
+							<div>试验员</div>
+							<div>{{ detailData.operator || "" }}</div>
 						</div>
 					</div>
 				</div>
@@ -55,23 +56,23 @@
 			<div class="test-block" v-if="checked === 1">
 				<table>
 					<tr>
-						<td>设备强度</td>
-						<td>{{ detailData.equipmentStrength || '' }}</td>
+						<td>钢筋牌号</td>
+						<td>{{ detailData.steelBarGrade || "" }}</td>
 						<td>强度代表值(Mpa)</td>
-						<td>{{ detailData.intensityRepresentativeValue || '' }}</td>
+						<td>{{ detailData.intensityRepresentativeValue || "" }}</td>
 					</tr>
 					<tr>
-						<td>试件尺寸</td>
-						<td>{{ detailData.specimenSize || '' }}</td>
-						<td>试件龄期</td>
-						<td>{{ detailData.specimenAge || '' }}</td>
+						<td>公称直径(mm)</td>
+						<td>{{ detailData.nominalDiameter || "" }}</td>
+						<td>公称截面面积(mm2)</td>
+						<td>{{ detailData.nominalCrossSectionalArea || "" }}</td>
 					</tr>
-					<tr>
+					<!-- <tr>
 						<td>试件面积</td>
 						<td>{{ detailData.specimenArea || '' }}</td>
 						<td>公称直径(mm)</td>
 						<td>{{ detailData.nominalDiameter || '' }}</td>
-					</tr>
+					</tr> -->
 				</table>
 				<div class="base-title" style="margin-bottom: 3%">试块测试值</div>
 				<div style="width: 100%">
@@ -79,14 +80,20 @@
 						<div class="list-table">
 							<div class="list-tr">
 								<div class="list-td">试块编号</div>
-								<div class="list-td">荷载力值（KN/㎡）</div>
-								<div class="list-td">抗折/抗压强度</div>
+								<div class="list-td">拉断最大力值(KN)</div>
+								<div class="list-td">屈服点(KN)</div>
+								<div class="list-td">屈服点强度(Mpa)</div>
+								<div class="list-td">坑拉强度(Mpa)</div>
+								<div class="list-td">伸长率(%)</div>
 							</div>
 
 							<div class="list-thread" v-for="item in steelBeamList" :key="item.id">
 								<div class="list-td">{{ item.devSn || "" }}</div>
-								<div class="list-td">{{ item.loadForceValue || 0 }}</div>
-								<div class="list-td">{{ item.flexuralAndCompressiveStrength || 0 }}</div>
+								<div class="list-td">{{ item.maximumBreakingForce || 0 }}</div>
+								<div class="list-td">{{ item.yieldPoint || 0 }}</div>
+								<div class="list-td">{{ item.yieldPointStrength || 0 }}</div>
+								<div class="list-td">{{ item.pitTensileStrength || 0 }}</div>
+								<div class="list-td">{{ item.elongation || 0 }}</div>
 							</div>
 
 							<!-- <div class="list-tr">
@@ -99,12 +106,12 @@
 					</el-scrollbar>
 				</div>
 			</div>
-			<div class="curve-line" v-show="checked === 2">
+			<div class="curve-line" v-if="checked === 2">
 				<div class="line-first">
-					<lineFirst></lineFirst>
+					<lineFirst :lineConfig="steelLineList"></lineFirst>
 				</div>
 				<div class="line-second">
-					<lineSecond></lineSecond>
+					<lineSecond :lineConfig="steelSecondLineList"></lineSecond>
 				</div>
 			</div>
 			<div class="close-icon" @click="closeDialog">
@@ -116,6 +123,7 @@
 
 <script lang="ts" setup>
 import { reactive, ref, onMounted } from "vue";
+import { getTaskTimeDetail } from "@/api/modules/schedulePlan";
 import { GlobalStore } from "@/stores";
 import lineFirst from "@/views/sevenLargeScreen/largeMachinery/universalTestMachine/line-first.vue";
 import lineSecond from "@/views/sevenLargeScreen/largeMachinery/universalTestMachine/line-second.vue";
@@ -136,6 +144,8 @@ function closeDialog() {
 	showDialog.value = false;
 	checked.value = 1;
 	finishLine.value = false;
+	steelLineList.value = [];
+	steelSecondLineList.value = [];
 }
 
 // 选中
@@ -158,6 +168,9 @@ function openDialog(item: any) {
 	// dialogIndex.value = type;
 	dialogTitle.value = "设备详情";
 	getDetailList(item.id);
+	setTimeout(() => {
+		showDialog.value = true;
+	}, 500);
 }
 
 let steelBeamList = ref([] as any);
@@ -170,61 +183,65 @@ const getDetailList = async (detailId: any) => {
 		// console.log("试块列表", res.result);
 		steelBeamList.value = res.result;
 		for (let index = 0; index < res.result.length; index++) {
-			const element = res.result[index];
-			getLineList(element);
 			if (index === res.result.length - 1) {
 				console.log("最后一次循环");
 				finishLine.value = true;
 			}
+			const element = res.result[index];
+			getLineList(element);
 		}
 		// dialogShow = true
-	} else {
-		showDialog.value = true;
 	}
 };
 
 const getLineList = async (item: any) => {
+	console.log("曲线数据处理", item);
 	const res: any = await pressureBlockDataList3({ projectSn: store.sn, universalTestManageBlockNumberId: item.id });
 	if (res.result.length > 0) {
-		const filteredData = res.result.filter(item => item.type === 1)
-          const filteredSecondData = res.result.filter(item => item.type === 2)
+		const filteredData = res.result.filter(item => item.type === 1);
+		const filteredSecondData = res.result.filter(item => item.type === 2);
 
-          // x y轴
-          const arr1 = filteredData.map(item => item.code)
-          const arr2 = filteredData.map(item => item.value)
+		// x y轴
+		const arr1 = filteredData.map(item => item.code);
+		const arr2 = filteredData.map(item => item.value);
 
-          const arr3 = filteredSecondData.map(item => item.code)
-          const arr4 = filteredSecondData.map(item => item.value)
+		const arr3 = filteredSecondData.map(item => item.code);
+		const arr4 = filteredSecondData.map(item => item.value);
 
-          const combinedArray = arr1.map((value, index) => [value, arr2[index]])
-          const combinedSecondArray = arr3.map((value, index) => [value, arr4[index]])
+		const combinedArray = arr1.map((value, index) => [value, arr2[index]]);
+		const combinedSecondArray = arr3.map((value, index) => [value, arr4[index]]);
 
-          console.log(combinedArray) // [[1, 4], [2, 5], [3, 6]]
-          console.log('试块曲线数据', res.result)
-          let currentData = {
-            name: item.testNumber,
-            data: combinedArray,
-            type: 'line',
-            smooth: true
-          }
-          let currentSecondData = {
-            name: item.testNumber,
-            data: combinedSecondArray,
-            type: 'line',
-            smooth: true
-          }
-          steelLineList.value.push(currentData)
-          steelSecondLineList.value.push(currentSecondData)
-	}
-	if (finishLine.value) {
-		setTimeout(() => {
-			showDialog.value = true;
-			// console.log("发送pressureLine", steelLineList.value);
-			mitts.emit("pressureLine", steelLineList.value);
-			mitts.emit("pressureScondLine", steelSecondLineList.value);
-		}, 1000);
-		// console.log("曲线数据", steelLineList.value, "试块列表", steelBeamList.value);
+		console.log(combinedArray,"力曲线"); // [[1, 4], [2, 5], [3, 6]]
+		console.log(combinedSecondArray, "位移曲线"); // [[1, 4], [2, 5], [3, 6]]
+		// console.log('试块曲线数据', res.result)
+		let currentData = {
+			name: item.devSn,
+			data: combinedArray,
+			type: "line",
+			smooth: true
+		};
+		let currentSecondData = {
+			name: item.devSn,
+			data: combinedSecondArray,
+			type: "line",
+			smooth: true
+		};
+		if (combinedArray.length > 0) {
+			steelLineList.value.push(currentData);
+		}
+		if (combinedSecondArray.length > 0) {
+			steelSecondLineList.value.push(currentSecondData);
+		}
 	}
+	// if (finishLine.value) {
+	// 	setTimeout(() => {
+	// 		showDialog.value = true;
+	// 		console.log("发送万能试验机曲线", steelLineList.value);
+	// 		mitts.emit("pressureLine", steelLineList.value);
+	// 		mitts.emit("pressureScondLine", steelSecondLineList.value);
+	// 	}, 1000);
+	// 	// console.log("曲线数据", steelLineList.value, "试块列表", steelBeamList.value);
+	// }
 };
 
 // 暴露给父组件的参数和方法(外部需要什么，都可以从这里暴露出去)
@@ -232,7 +249,82 @@ defineExpose({
 	openDialog
 });
 
+const warnType = ref([
+	{
+		label: "混凝土试件抗压强度试验",
+		value: 1
+	},
+	{
+		label: "钢筋试验",
+		value: 2
+	},
+	{
+		label: "钢筋焊接接头试验",
+		value: 3
+	},
+	{
+		label: "钢筋机械连接接头试验",
+		value: 4
+	},
+	{
+		label: "水泥砂浆立方体抗压强度试验",
+		value: 5
+	},
+	{
+		label: "水泥砂浆立方体抗压强度试验(建筑)",
+		value: 6
+	},
+	{
+		label: "水泥净浆物理性能试验",
+		value: 7
+	},
+	{
+		label: "水泥胶砂强度试验",
+		value: 8
+	},
+	{
+		label: "水泥胶砂抗折试验",
+		value: 9
+	},
+	{
+		label: "水泥净浆抗折试验",
+		value: 10
+	},
+	{
+		label: "水泥混凝土圆柱体轴心抗压强度试验",
+		value: 11
+	},
+	{
+		label: "后张预应力孔道压浆抗压强度试验",
+		value: 12
+	},
+	{
+		label: "后张预应力孔道压浆抗折强度试验",
+		value: 13
+	},
+	{
+		label: "无机结合料稳定材料无侧限抗压强度试验",
+		value: 14
+	},
+	{
+		label: "复检钢筋焊接接头试验",
+		value: 15
+	},
+	{
+		label: "复检钢筋机械连接接头试验",
+		value: 16
+	}
+]);
+
+let projectTimeInfo = ref({});
+const getProjectInfo = async () => {
+	const res: any = await getTaskTimeDetail({ projectSn: store.sn });
+	console.log("获取项目信息", res);
+	projectTimeInfo.value = res.result;
+};
+
 onMounted(async () => {
+	getProjectInfo();
 	// console.log("Mount_type", dialogIndex.value);
 });
 </script>
@@ -248,7 +340,7 @@ onMounted(async () => {
 	}
 
 	td {
-		width: 100px;
+		width: 50px;
 		padding: 10px;
 		box-sizing: border-box;
 		border: 1px solid black;
diff --git a/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/line-first.vue b/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/line-first.vue
index d93e904..9fafd46 100644
--- a/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/line-first.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/line-first.vue
@@ -3,7 +3,7 @@
 		<div class="hydrogen-content">
 			<div id="curveLineFirst" ref="curveLineFirst" style="width: 900px; height: 350px"></div>
 		</div>
-		<div class="not-data" v-if="lineConfig.length == 0">
+		<div class="not-data" v-if="props.lineConfig.length == 0">
 			<img src="@/assets/images/noData.png" alt="" />
 			<p>暂无数据</p>
 		</div>
@@ -12,7 +12,7 @@
 
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
-import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
+import { onMounted, reactive, ref, onBeforeUnmount,watch } from "vue";
 import * as echarts from "echarts";
 // import { getSelectDataListApi } from "@/api/modules/distribution";
 // import Card from "@/components/card.vue";
@@ -26,9 +26,30 @@ let unit = ref("力值/kN" as any);
 // Y轴数据
 let yData1 = ref([3, 3, 5, 4, 2] as any);
 
+// ts
+type Props = {
+	lineConfig?: any; // 传入x轴对应的数据
+};
+// withDefaults 定义默认值(传入的数据类型同默认值)
+const props = withDefaults(defineProps<Props>(), {
+	lineConfig: [],
+	// num: () => [12, 13, 14] // 复杂数据类型使用函数方式
+});
+
+watch(
+	() => props.lineConfig,
+	newVal => {
+		console.log(newVal, "newVal");
+		if (newVal) {
+			// props.xData = newVal;
+			drawChart();
+		}
+	}
+);
+
 // 图表数据项
 let option = ref(null as any);
-let lineConfig = ref ({}) as any;
+// let lineConfig = ref ([]) as any;
 
 function initOption() {
 	option.value = {
@@ -171,7 +192,7 @@ function initOption() {
 				}
 			}
 		],
-		series: lineConfig.value
+		series: props.lineConfig
 	};
 }
 
@@ -196,20 +217,24 @@ function drawChart() {
 let startDraw = ref(false) as any;
 
 onMounted(async () => {
-	mitts.on("pressureLine", e => {
-		lineConfig.value = e;
-		console.log("接收试验曲线数值", e);
-	});
-	mitts.on("pressureLineDraw", e => {
-		if (lineConfig.value.length == 0) {
-			return;
-		}
-		startDraw.value = e;
-		drawChart();
-		console.log("图线绘制", e);
-	});
+	// mitts.on("pressureLine", e => {
+	// 	props.lineConfig = e;
+	// 	console.log("接收试验曲线数值", e);
+	// });
+	// mitts.on("pressureLineDraw", e => {
+	// 	if (props.lineConfig.length == 0) {
+	// 		return;
+	// 	}
+	// 	startDraw.value = e;
+	// 	drawChart();
+	// 	console.log("图线绘制", e);
+	// });
 
 	// getMeterTotal();
+	if (props.lineConfig.length > 0) {
+		drawChart();
+	}
+	
 });
 
 onBeforeUnmount(async () => {
@@ -220,9 +245,26 @@ onBeforeUnmount(async () => {
 </script>
 
 <style lang="scss" scoped>
+.not-data {
+	top: 20%;
+	width: 40%;
+	left: 35%;
+	text-align: center;
+	position: absolute;
+	img {
+		width: 40%;
+		margin: 5% 30%;
+	}
+	p {
+		color: #fff;
+		font-size: 14px;
+		margin: -6% 37%;
+	}
+}
 .universal-line {
 	width: 100%;
 	height: 100%;
+	position: relative;
 	.hydrogen-content {
 		height: 100%;
 		position: relative;
diff --git a/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/line-second.vue b/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/line-second.vue
index ba5d204..d53d00e 100644
--- a/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/line-second.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/universalTestMachine/line-second.vue
@@ -3,7 +3,7 @@
 		<div class="hydrogen-content">
 			<div id="curveLineSecond" ref="curveLineSecond" style="width: 900px; height: 350px"></div>
 		</div>
-		<div class="not-data" v-if="lineConfig.length == 0">
+		<div class="not-data" v-if="props.lineConfig.length == 0">
 			<img src="@/assets/images/noData.png" alt="" />
 			<p>暂无数据</p>
 		</div>
@@ -12,13 +12,35 @@
 
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
-import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
+import { onMounted, reactive, ref, onBeforeUnmount, watch } from "vue";
 import * as echarts from "echarts";
 // import { getSelectDataListApi } from "@/api/modules/distribution";
 // import Card from "@/components/card.vue";
 import { GlobalStore } from "@/stores";
 import mitts from "@/utils/bus"; //兄弟组件传值
 const store = GlobalStore();
+
+// ts
+type Props = {
+	lineConfig?: any; // 传入x轴对应的数据
+};
+// withDefaults 定义默认值(传入的数据类型同默认值)
+const props = withDefaults(defineProps<Props>(), {
+	lineConfig: [],
+	// num: () => [12, 13, 14] // 复杂数据类型使用函数方式
+});
+
+watch(
+	() => props.lineConfig,
+	newVal => {
+		console.log(newVal, "newVal");
+		if (newVal) {
+			// props.xData = newVal;
+			drawChart();
+		}
+	}
+);
+
 // x轴
 let twenty_four_time = ref(["0", "0.2", "0.4", "0.6", "0.8"] as any);
 // Y轴单位
@@ -28,7 +50,7 @@ let yData1 = ref([3, 3, 5, 4, 2] as any);
 
 // 图表数据项
 let option = ref(null as any);
-let lineConfig = ref ({}) as any;
+// let lineConfig = ref ([]) as any;
 
 function initOption() {
 	option.value = {
@@ -171,7 +193,7 @@ function initOption() {
 				}
 			}
 		],
-		series: lineConfig.value
+		series: props.lineConfig
 	};
 }
 
@@ -196,19 +218,21 @@ function drawChart() {
 let startDraw = ref(false) as any;
 
 onMounted(async () => {
-	mitts.on("pressureScondLine", e => {
-		lineConfig.value = e;
-		console.log("接收试验曲线数值", e);
-	});
-	mitts.on("pressureLineDraw", e => {
-		if (lineConfig.value.length == 0) {
-			return;
-		}
-		startDraw.value = e;
+	// mitts.on("pressureScondLine", e => {
+	// 	props.lineConfig = e;
+	// 	console.log("接收试验曲线数值", e);
+	// });
+	// mitts.on("pressureLineDraw", e => {
+	// 	if (props.lineConfig.length == 0) {
+	// 		return;
+	// 	}
+	// 	startDraw.value = e;
+		
+	// 	console.log("图线绘制", e);
+	// });
+	if (props.lineConfig.length > 0) {
 		drawChart();
-		console.log("图线绘制", e);
-	});
-
+	}
 	// getMeterTotal();
 });
 
@@ -223,6 +247,7 @@ onBeforeUnmount(async () => {
 .universal-line {
 	width: 100%;
 	height: 100%;
+	position: relative;
 	.hydrogen-content {
 		height: 100%;
 		position: relative;
@@ -245,4 +270,20 @@ onBeforeUnmount(async () => {
 :deep(.el-select .el-input .el-select__caret) {
 	color: #fff;
 }
+.not-data {
+	top: 20%;
+	width: 40%;
+	left: 35%;
+	text-align: center;
+	position: absolute;
+	img {
+		width: 40%;
+		margin: 5% 30%;
+	}
+	p {
+		color: #fff;
+		font-size: 14px;
+		margin: -6% 37%;
+	}
+}
 </style>
diff --git a/src/views/sevenLargeScreen/largeMachinery/unloadPlatform/bottomLeft.vue b/src/views/sevenLargeScreen/largeMachinery/unloadPlatform/bottomLeft.vue
index 580a3d7..027863e 100644
--- a/src/views/sevenLargeScreen/largeMachinery/unloadPlatform/bottomLeft.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/unloadPlatform/bottomLeft.vue
@@ -49,10 +49,21 @@ function initOption() {
 		grid: {
 			left: "5%",
 			right: "5%",
-			bottom: "50%",
+			bottom: "15%",
 			top: "15%",
 			containLabel: true
 		},
+		// dataZoom: [
+		// 	{
+		// 		orient: "horizontal",
+		// 		type: "inside",
+		// 		show: false, //控制滚动条显示隐藏
+		// 		realtime: true, //拖动滚动条时是否动态的更新图表数据
+		// 		height: 5, //滚动条高度
+		// 		bottom: "4%",
+		// 		zoomLock: true //控制面板是否进行缩放
+		// 	}
+		// ],
 		// backgroundColor: '#101129',
 		xAxis: {
 			show: false,
@@ -208,6 +219,9 @@ function drawChart() {
 	}
 	let runDeviceState = echarts.init(document.getElementById("runDeviceState"));
 	console.log("绘制前", option.value);
+	console.log("绘制前", airTypeEchart.value);
+	console.log("绘制前", airTypeData.value);
+
 	runDeviceState.setOption(option.value);
 	// window.onresize = function () {
 	//   myEchart.resize();
diff --git a/src/views/sevenLargeScreen/largeMachinery/unloadPlatform/load-ratio-circle.vue b/src/views/sevenLargeScreen/largeMachinery/unloadPlatform/load-ratio-circle.vue
index 85f930e..d80d31a 100644
--- a/src/views/sevenLargeScreen/largeMachinery/unloadPlatform/load-ratio-circle.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/unloadPlatform/load-ratio-circle.vue
@@ -120,7 +120,7 @@ onMounted(async () => {
 	});
 });
 
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("loadRatioUnload");
 });
diff --git a/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/bottomCenter.vue b/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/bottomCenter.vue
index 520f304..3f56d67 100644
--- a/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/bottomCenter.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/bottomCenter.vue
@@ -53,15 +53,15 @@
 					<div>设备名称<span>{{ detailData.devName || " " }}</span></div>
 					<div>机组编号<span>{{ detailData.jzbh || " " }}</span></div>
 					<div>任务编号<span>{{ detailData.rwbh || " " }}</span></div>
-					<div>操作员<span style="margin-left: 24%">{{ detailData.czy || " " }}</span></div>
+					<div>试验员<span style="margin-left: 24%">{{ detailData.czy || " " }}</span></div>
 					<div>材料规格型号<span style="margin-left: 13%">{{ detailData.clggxh || " " }}</span></div>
-					<div>配比编号<span>{{ detailData.proportionName || " " }}</span></div>
+					<div>配比编号<span>{{ detailData.pbbh || " " }}</span></div>
 				</div>
 				<div class="right">
 					<!-- <div>工程名称<span>{{ detailData. || " " }}</span></div> -->
 					<div>生产数量<span style="margin-left: 20%">{{ detailData.scsl || " " }}</span></div>
 					<div>收料单位<span>{{ detailData.sldw || " " }}</span></div>
-					<div>使用部位<span style="margin-left: 20%">{{ detailData.createDate || " " }}</span></div>
+					<div>使用部位<span style="margin-left: 20%">{{ detailData.sybw || " " }}</span></div>
 					<!-- <div>施工配合比<span style="margin-left: 17%">{{ detailData.constructionMixRatio || " " }}</span></div> -->
 					<div>工程名称<span style="margin-left: 20%">{{ detailData.gcmc || 0 }}</span></div>
 					<div>司机<span style="margin-left: 28%">{{ detailData.sj || 0 }}</span></div>
@@ -367,8 +367,8 @@ const openDialog = (item: any) => {
 };
 
 const getMaterialDataList = async (detailId: any) => {
-	const res: any = await concreteMaterialDataList3({ projectSn: store.sn, stableWaterMixStationSetDataId: detailId });
-	// console.log("获取烟感监测告警监测记录列表", res);
+	const res: any = await concreteMaterialDataList3({ projectSn: store.sn, stableWaterMixStationDataId: detailId });
+	console.log("盘次", res);
 	if (res.result.length > 0) {
 		listDialog.value = res.result;
 	} else {
diff --git a/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/topCenter.vue b/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/topCenter.vue
index e114ce1..e28d9a2 100644
--- a/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/topCenter.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/topCenter.vue
@@ -9,7 +9,7 @@
 			<div class="right-box">
 				<div class="yesterday-use">
 					<div class="text">日累计(t)</div>
-					<div class="num">{{ realTimeTotal.a || 0 }}</div>
+					<div class="num">{{ realTimeTotal.dailyOutput || 0 }}</div>
 				</div>
 				<!-- <div class="yesterday-chain">
 					<div class="text">总产量(m³)</div>
@@ -21,7 +21,7 @@
 				</div> -->
 				<div class="month-chain">
 					<div class="text">总累计(t)</div>
-					<div class="num">{{ realTimeTotal.b || 0 }}</div>
+					<div class="num">{{ realTimeTotal.totalOutput || 0 }}</div>
 				</div>
 			</div>
 		</div>
diff --git a/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/topLeft.vue b/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/topLeft.vue
index e5b09d7..4469b85 100644
--- a/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/topLeft.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/topLeft.vue
@@ -85,20 +85,20 @@ function getMonthData(type: any) {
 function initOption() {
 	option.value = {
 		// backgroundColor: '#071c3a',
-		legend: {
-			align: "left",
-			top: "5%",
-			left: "2%",
-			textStyle: {
-				color: "#FFFFFF",
-				fontSize: 14,
-				padding: [0, 0, 0, 10]
-			},
-			icon: "rect",
-			itemGap: 25,
-			itemWidth: 10,
-			itemHeight: 10
-		},
+		// legend: {
+		// 	align: "left",
+		// 	top: "5%",
+		// 	left: "2%",
+		// 	textStyle: {
+		// 		color: "#FFFFFF",
+		// 		fontSize: 14,
+		// 		padding: [0, 0, 0, 10]
+		// 	},
+		// 	icon: "rect",
+		// 	itemGap: 25,
+		// 	itemWidth: 10,
+		// 	itemHeight: 10
+		// },
 		// dataZoom: [
 		// 	{
 		// 		// orient: "vertical", //水平显示
diff --git a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftBottom.vue b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftBottom.vue
index 73e14c2..cf02855 100644
--- a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftBottom.vue
+++ b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftBottom.vue
@@ -2,13 +2,23 @@
 	<Card title="监测曲线">
 		<div class="concrete-bottom-left">
 			<div class="choice-right">
-				<div class="day selected" @click="getNowData(1)" :class="checked == 1 ? 'active' : ''">温度</div>
+				<!-- <div class="day selected" @click="getNowData(1)" :class="checked == 1 ? 'active' : ''">温度</div>
 				<div class="week selected" @click="getWeekData(2)" :class="checked == 2 ? 'active' : ''">温差</div>
-				<div class="month selected" @click="getMonthData(3)" :class="checked == 3 ? 'active' : ''">降温速度</div>
+				<div class="month selected" @click="getMonthData(3)" :class="checked == 3 ? 'active' : ''">降温速度</div> -->
+				<el-select v-model="selectDay" style="width: 85%" size="small" @change="selectChange">
+					<el-option v-for="(item, index) in dayList" :key="index" :label="item.pointName" :value="item.pointNo" />
+				</el-select>
 			</div>
 			<div class="concrete-content">
 				<div class="select-right">
-					<el-date-picker v-model="selectTime" type="date" size="small" />
+					<el-date-picker
+					v-model="selectTime"
+					type="date"
+					placeholder="请选择"
+					format="YYYY/MM/DD"
+					value-format="YYYY-MM-DD"
+					@change="dateChange"
+				/>
 				</div>
 				<div id="concreteLine" ref="concreteLine" style="width: 100%; height: 100%"></div>
 			</div>
@@ -26,26 +36,59 @@ import * as echarts from "echarts";
 import { GlobalStore } from "@/stores";
 import mitts from "@/utils/bus"; //兄弟组件传值
 const store = GlobalStore();
+import { selectPointPositionList, countTrend } from "@/api/modules/concreteMonitor";
+
+// 当前对应的种类
+let selectDay = ref("");
+let dayList = ref([]);
+
+function selectChange(e: any) {
+	console.log("选择", e);
+	selectDay.value = e;
+	getChartData();
+}
+
+function dateChange(e: any) { 
+	getChartData();
+}
+
+// 获取 点位
+// const dayList = ref({}) as any;
+const getMemberCareList = async () => {
+	const res: any = await selectPointPositionList({ projectSn: store.sn, devSn: concreteDevSn.value });
+	console.log("点位", res);
+	if (res.result.length > 0) {
+		dayList.value = res.result;
+		selectDay.value = res.result[0].pointNo;
+		getChartData();
+	}
+};
+
+// 获取 曲线数据
+// const dayList = ref({}) as any;
+const getChartData = async () => {
+	const res: any = await countTrend({ projectSn: store.sn, devSn: concreteDevSn.value, pointNo: selectDay.value, date: selectTime.value });
+	console.log("曲线", res);
+	if (res.result.length > 0) {
+		twenty_four_time.value = res.result.map( (item: any) => item.x );
+		yData1.value = res.result.map( (item: any) => Number(item.y) );
+		drawChart();
+	}
+};
+
 // x轴
-// let twenty_four_time = ref([] as any);
+let twenty_four_time = ref([] as any);
 // Y轴单位
 let unit = ref("" as any);
 // Y轴数据
-// let yData1 = ref([
-// 	["2023-9-19 05:15:00", 12],
-// 	["2023-9-19 15:15:00", 200],
-// 	["2023-9-19 17:15:00", 50],
-// 	["2023-9-19 19:15:00", 24],
-// 	["2023-9-20 05:15:00", 30],
-// 	["2023-9-20 15:15:00", 60]
-// ]);
+let yData1 = ref([]);
 
 // 图表数据项
 let option = ref(null as any);
 // 选中
 // let rangeTime = ref("");
 let selectPoint = ref(1);
-let selectTime = ref("2023-09-01");
+let selectTime = ref("2024-02-02");
 
 // 选中
 let checked = ref(1);
@@ -97,11 +140,6 @@ let typeList = ref([
 let startValue = ref("2023-9-19 05:15:00" as any);
 let endValue = ref("2023-9-21 05:15:00" as any);
 
-function selectChange(e: any) {
-	console.log("当前日期", e);
-	drawChart();
-}
-
 function initOption() {
 	option.value = {
 		// backgroundColor: '#071c3a',
@@ -169,23 +207,23 @@ function initOption() {
 						global: false
 					}
 				}
-			},
-			formatter: function (params: any) {
-				// console.log("tooltip", params);
-				let currentInnerHtml = "";
-				let nowTime = params[0].axisValueLabel;
-				for (let index = 0; index < params.length; index++) {
-					let pointType = params[index].seriesName;
-					let pointValue = params[index].data[1];
-					let currentTypeData = typeList.value.filter((item: any) => {
-						return item.dayType === params[index].seriesName;
-					});
-					let unit = currentTypeData[0].typeUnit;
-					// console.log(unit, "单位");
-					currentInnerHtml = currentInnerHtml + "</br>" + params[index].marker + pointType + " " + pointValue + unit;
-				}
-				return nowTime + currentInnerHtml;
 			}
+			// formatter: function (params: any) {
+			// 	// console.log("tooltip", params);
+			// 	let currentInnerHtml = "";
+			// 	let nowTime = params[0].axisValueLabel;
+			// 	for (let index = 0; index < params.length; index++) {
+			// 		let pointType = params[index].seriesName;
+			// 		let pointValue = params[index].data[1];
+			// 		let currentTypeData = typeList.value.filter((item: any) => {
+			// 			return item.dayType === params[index].seriesName;
+			// 		});
+			// 		let unit = currentTypeData[0].typeUnit;
+			// 		// console.log(unit, "单位");
+			// 		currentInnerHtml = currentInnerHtml + "</br>" + params[index].marker + pointType + " " + pointValue + unit;
+			// 	}
+			// 	return nowTime + currentInnerHtml;
+			// }
 		},
 		grid: {
 			top: "20%",
@@ -233,8 +271,8 @@ function initOption() {
 				splitLine: {
 					show: false
 				},
-				boundaryGap: false
-				// data: twenty_four_time.value
+				boundaryGap: false,
+				data: twenty_four_time.value
 			}
 		],
 
@@ -275,51 +313,50 @@ function initOption() {
 				}
 			}
 		],
-		series: []
-		// [
-		// 	// {
-		// 	// 	showAllSymbol: false,
-		// 	// 	smooth: true, //是否平滑
-		// 	// 	name: "监测点001",
-		// 	// 	type: "line",
-		// 	// 	showSymbol: false,
-		// 	// 	color: "#4AC0F3",
-		// 	// 	data: yData1.value
-		// 	// }
-		// ]
+		series: [
+			{
+				showAllSymbol: false,
+				smooth: true, //是否平滑
+				name: "监测点001",
+				type: "line",
+				showSymbol: false,
+				color: "#4AC0F3",
+				data: yData1.value
+			}
+		]
 	};
 
-	for (let i = 0; i < typeList.value.length; i++) {
-		// 根据点位的种类画图(立杆倾斜,水平位移,立杆轴力,地基沉降)
+	// for (let i = 0; i < typeList.value.length; i++) {
+	// 	// 根据点位的种类画图(立杆倾斜,水平位移,立杆轴力,地基沉降)
 
-		// 测试点位数据[x,y]
-		let data = [
-			["00:00", 42 * 2 * (i + 1)],
-			["02:00", 24 * 2 * (i + 1)],
-			["04:00", 35 * 2 * (i + 1)],
-			["06:00", 30 * 2 * (i + 1)],
-			["08:00", 20 * 2 * (i + 1)],
-			["10:00", 50 * 2 * (i + 1)],
-			["12:00", 24 * 2 * (i + 1)],
-			["14:00", 30 * 2 * (i + 1)],
-			["16:00", 55 * 2 * (i + 1)],
-			["18:00", 30 * 2 * (i + 1)],
-			["20:00", 30 * 2 * (i + 1)],
-			["22:00", 30 * 2 * (i + 1)],
-			["24:00", 30 * 2 * (i + 1)]
-		];
-		let lineObj = {
-			smooth: true, //是否平滑
-			name: typeList.value[i].dayType,
-			type: "line",
-			showSymbol: true,
-			symbol: "emptyCircle",
-			symbolSize: 6,
-			// color: "#4AC",
-			data: data
-		};
-		option.value.series.push(lineObj);
-	}
+	// 	// 测试点位数据[x,y]
+	// 	let data = [
+	// 		["00:00", 42 * 2 * (i + 1)],
+	// 		["02:00", 24 * 2 * (i + 1)],
+	// 		["04:00", 35 * 2 * (i + 1)],
+	// 		["06:00", 30 * 2 * (i + 1)],
+	// 		["08:00", 20 * 2 * (i + 1)],
+	// 		["10:00", 50 * 2 * (i + 1)],
+	// 		["12:00", 24 * 2 * (i + 1)],
+	// 		["14:00", 30 * 2 * (i + 1)],
+	// 		["16:00", 55 * 2 * (i + 1)],
+	// 		["18:00", 30 * 2 * (i + 1)],
+	// 		["20:00", 30 * 2 * (i + 1)],
+	// 		["22:00", 30 * 2 * (i + 1)],
+	// 		["24:00", 30 * 2 * (i + 1)]
+	// 	];
+	// 	let lineObj = {
+	// 		smooth: true, //是否平滑
+	// 		name: typeList.value[i].dayType,
+	// 		type: "line",
+	// 		showSymbol: true,
+	// 		symbol: "emptyCircle",
+	// 		symbolSize: 6,
+	// 		// color: "#4AC",
+	// 		data: data
+	// 	};
+	// 	option.value.series.push(lineObj);
+	// }
 }
 
 function drawChart() {
@@ -333,13 +370,17 @@ function drawChart() {
 	concreteLine.setOption(option.value);
 }
 
+let concreteDevSn = ref("") as any;
 onMounted(async () => {
-	drawChart();
+	mitts.on("concreteDevSn", e => {
+		concreteDevSn.value = e;
+		getMemberCareList();
+	});
+	// drawChart();
 });
 
-
 onBeforeUnmount(async () => {
-	mitts.off("devSn");
+	mitts.off("concreteDevSn");
 });
 </script>
 
@@ -370,7 +411,7 @@ onBeforeUnmount(async () => {
 			position: absolute;
 			display: flex;
 			right: 22%;
-			width: 10%;
+			width: 12%;
 			top: 5%;
 			z-index: 9;
 		}
@@ -378,7 +419,7 @@ onBeforeUnmount(async () => {
 }
 
 .choice-right {
-	width: 25%;
+	width: 15%;
 	display: flex;
 	position: absolute;
 	z-index: 99;
@@ -386,7 +427,7 @@ onBeforeUnmount(async () => {
 	font-size: 10px;
 	text-align: center;
 	line-height: 20px;
-	right: -6%;
+	right: 1%;
 	top: 5%;
 	.selected {
 		height: 5%;
diff --git a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue
index e77bbd8..0a9d1ce 100644
--- a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue
+++ b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue
@@ -2,8 +2,8 @@
 	<Card title="实时监测">
 		<div class="pit-top-left">
 			<div class="select-right">
-				<el-select v-model="selectDay" style="width: 85%" size="small">
-					<el-option v-for="(item, index) in dayList" :key="index" :label="item.dayType" :value="item.value" />
+				<el-select v-model="selectDay" style="width: 85%" size="small" @change="selectChange">
+					<el-option v-for="(item, index) in dayList" :key="index" :label="item.devName" :value="item.devSn" />
 				</el-select>
 			</div>
 			<div class="point-state-top">
@@ -20,8 +20,8 @@
 					<div class="state-text">报警</div>
 				</div>
 			</div>
-			<div class="point-map">
-				<img src="@/assets/images/concreteMonitor/realtimeBg.png" alt="" />
+			<div class="point-map" v-if="list.length > 0">
+				<img :src="imgUrl" alt="" />
 				<div class="point-list" v-for="item in list" :key="item.id">
 					<div
 						class="point-item"
@@ -32,19 +32,21 @@
 								? 'changeColor2'
 								: item.alarmState == 3
 								? 'changeColor3'
-								: ''
+								: 'changeColor1'
 						"
+						:title="item.measurePointName"
 						:style="{
-							left: item.xMap + 'px',
-							top: item.yMap + 'px'
+							left: item.mapX + 'px',
+							top: item.mapY + 'px'
 						}"
+						:title="item.pointName"
 						@click="openDialog(item)"
 					></div>
 					<div
 						class="item-dialog"
 						:style="{
-							left: item.xMap + 20 + 'px',
-							top: item.yMap - 10 + 'px'
+							left: item.mapX + 20 + 'px',
+							top: item.mapY - 10 + 'px'
 						}"
 						v-if="item.id === currentIndex && showDialog"
 					>
@@ -73,57 +75,103 @@
 					</div>
 				</div>
 			</div>
-			<div class="dialog-style">
-				<point-history-dialog ref="historyRef"></point-history-dialog>
+			<div>
+				<div class="notoDta" v-if="list.length == 0">
+					<img src="@/assets/images/noData.png" alt="" />
+					<p>暂无数据</p>
+				</div>
 			</div>
+			<!-- <div class="dialog-style">
+				<point-history-dialog ref="historyRef"></point-history-dialog>
+			</div> -->
 		</div>
 	</Card>
 </template>
 
 <script setup lang="ts">
-import pointHistoryDialog from "@/views/sevenLargeScreen/qualityControl/concreteMonitor/point-history-dialog.vue";
+// import pointHistoryDialog from "@/views/sevenLargeScreen/qualityControl/concreteMonitor/point-history-dialog.vue";
 import Card from "@/components/card.vue";
 import { reactive, ref, onMounted } from "vue";
+import {
+	selectConcreteMonitorDevList,
+	concreteMonitorPlaneFigureList,
+	concreteMonitorDevToPlaneFigureList
+} from "@/api/modules/concreteMonitor";
+import { GlobalStore } from "@/stores";
+import mitts from "@/utils/bus"; //兄弟组件传值
+const store = GlobalStore();
+const BASEURL = import.meta.env.VITE_API_URL;
 // 打开点位详情弹窗
-const historyRef = ref();
+// const historyRef = ref();
 const openHistoryDialog = () => {
 	closeDialog();
-	historyRef.value.openDialog();
+	// historyRef.value.openDialog();
 	// console.log(historyRef.value);
 };
 
 // 当前对应的种类
-let selectDay = ref(1);
-let dayList = ref([
-	{
-		value: 1,
-		dayType: "桩基-灌注桩1"
-	},
-	{
-		value: 2,
-		dayType: "桩基-灌注桩2"
-	},
-	{
-		value: 3,
-		dayType: "桩基-灌注桩3"
-	},
-	{
-		value: 4,
-		dayType: "桩基-灌注桩4"
+let selectDay = ref("");
+let dayList = ref([]);
+
+function selectChange(e: any) {
+	console.log("选择", e);
+	selectDay.value = e;
+	list.value = [];
+	getPlaneFigureList();
+	mitts.emit("concreteDevSn", e);
+}
+
+// 获取 设备下拉
+// const dayList = ref({}) as any;
+const getMemberCareList = async () => {
+	const res: any = await selectConcreteMonitorDevList({ projectSn: store.sn });
+	console.log("设备下拉", res);
+	if (res.result.length > 0) {
+		dayList.value = res.result;
+		selectDay.value = res.result[0].devSn;
+		mitts.emit("concreteDevSn", res.result[0].devSn);
+		getPlaneFigureList();
 	}
-]);
+};
+let imgUrl = ref("") as any;
+let concreteMonitorPlaneFigureId = ref("") as any;
+const getPlaneFigureList = async () => {
+	const res: any = await concreteMonitorPlaneFigureList({ projectSn: store.sn, devSn: selectDay.value });
+	console.log("查设备下的图", res);
+	if (res.result.length > 0) {
+		concreteMonitorPlaneFigureId.value = res.result[0].id;
+		imgUrl.value = res.result[0].imageUrl;
+		getPointList();
+	}
+};
+
+const getPointList = async () => {
+	const res: any = await concreteMonitorDevToPlaneFigureList({
+		projectSn: store.sn,
+		concreteMonitorPlaneFigureId: concreteMonitorPlaneFigureId.value
+	});
+	console.log("查图的点", res);
+	if (res.result.length > 0) {
+		list.value = res.result;
+	}
+};
 
 let currentIndex = ref(1 as any);
 let showDialog = ref(false as any);
 function openDialog(item: any) {
-	currentIndex.value = item.id;
-	showDialog.value = true;
+	// currentIndex.value = item.id;
+	// showDialog.value = true;
 }
 function closeDialog() {
 	showDialog.value = false;
 	// console.log("点击");
 }
-const list = reactive([
+
+onMounted(async () => {
+	getMemberCareList();
+});
+
+const list = ref([
 	{
 		id: 1,
 		alarmState: 1,
@@ -327,4 +375,20 @@ const list = reactive([
 		color: #ffffff;
 	}
 }
+.notoDta {
+	top: 35%;
+	width: 50%;
+	left: 30%;
+	position: absolute;
+	text-align: center;
+	img {
+		width: 40%;
+		margin: 5% 30%;
+	}
+	p {
+		color: #fff;
+		font-size: 14px;
+		margin: -6% 37%;
+	}
+}
 </style>
diff --git a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightBottom.vue b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightBottom.vue
index 08292be..fcd4b3f 100644
--- a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightBottom.vue
+++ b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightBottom.vue
@@ -2,24 +2,24 @@
 	<Card title="实时告警">
 		<div class="concrete-right-bottom">
 			<div class="top-data">
-				<div class="data-left">告警: <span class="num">12</span>次</div>
-				<div class="data-right">预警: <span class="num">3</span>次</div>
+				<div class="data-left">告警: <span class="num">{{ meterRead.alarmNum || 0 }}</span>次</div>
+				<!-- <div class="data-right">预警: <span class="num">3</span>次</div> -->
 			</div>
 			<div class="monitor-list">
-				<el-scrollbar style="height: 100%">
+				<el-scrollbar style="height: 100%" ref="refScrollbar">
 					<div class="monitor-item" v-for="item in list" :key="item.id">
 						<div class="item-top">
-							<div class="top-title">混凝土监测</div>
-							<div class="top-state" :style="{ background: formworkOption[item.monitorType].color }">
+							<div class="top-title">{{ item.alarmType || "-" }}</div>
+							<div class="top-state" v-if="item.alarmLevel < 5" :style="{ background: formworkOption[item.alarmLevel - 1].color }">
 								<div>
-									{{ formworkOption[item.monitorType].label }}
+									{{ formworkOption[item.alarmLevel - 1].label }}
 								</div>
 							</div>
 						</div>
 						<div class="item-bottom">
-							<div class="bottom-text">浇筑体升温: 大于5</div>
-							<div class="bottom-text">实时值: 7.12</div>
-							<div class="bottom-text">2023.06.08 12:00:00</div>
+							<div class="bottom-text">{{ item.pointName || "-" }}</div>
+							<div class="bottom-text">实时值: {{ item.alarmValue || 0 }}</div>
+							<div class="bottom-text">{{ item.addTime || "-" }}</div>
 						</div>
 					</div>
 				</el-scrollbar>
@@ -30,122 +30,112 @@
 
 <script setup lang="ts">
 import Card from "@/components/card.vue";
-import { reactive, ref, onMounted } from "vue";
+import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
+import { countConcreteMonitorAlarm, concreteMonitorAlarmList } from "@/api/modules/concreteMonitor";
 import { GlobalStore } from "@/stores";
 const store = GlobalStore();
+import mitts from "@/utils/bus"; //兄弟组件传值
 
 let formworkOption = ref([
 	{
 		value: 0,
-		label: "告警",
+		label: "紧急告警",
 		color: "#EC6266"
 	},
 	{
 		value: 1,
-		label: "预警",
+		label: "重要告警",
+		color: "#EC6266"
+	},
+	{
+		value: 2,
+		label: "次要告警",
+		color: "#EEA959"
+	},
+	{
+		value: 3,
+		label: "提示告警",
 		color: "#EEA959"
 	}
 ]);
 
-const list = reactive([
-	{
-		id: 1,
-		monitorTitle: "混凝土监测",
-		monitorType: 0,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
-	},
-	{
-		id: 2,
-		monitorTitle: "混凝土监测",
-		monitorType: 0,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
-	},
-	{
-		id: 3,
-		monitorTitle: "混凝土监测",
-		monitorType: 1,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
-	},
-	{
-		id: 4,
-		monitorTitle: "混凝土监测",
-		monitorType: 1,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
-	},
-	{
-		id: 5,
-		monitorTitle: "混凝土监测",
-		monitorType: 0,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
-	},
-	{
-		id: 6,
-		monitorTitle: "混凝土监测",
-		monitorType: 0,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
-	},
-	{
-		id: 7,
-		monitorTitle: "混凝土监测",
-		monitorType: 0,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
-	},
-
-	{
-		id: 8,
-		monitorTitle: "混凝土监测",
-		monitorType: 0,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
-	},
-	{
-		id: 9,
-		monitorTitle: "混凝土监测",
-		monitorType: 0,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
-	},
-	{
-		id: 10,
-		monitorTitle: "混凝土监测",
-		monitorType: 0,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
-	},
-	{
-		id: 11,
-		monitorTitle: "混凝土监测",
-		monitorType: 0,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
-	},
-	{
-		id: 12,
-		monitorTitle: "混凝土监测",
-		monitorType: 0,
-		temperate: "大于5",
-		realtimeValue: "7.12",
-		monitorTime: "2023.06.08 12:00:00"
+const list = ref([]);
+let meterId = ref("" as any);
+// 获取实时告警
+const meterRead = ref({} as any);
+const getMeterTotal = async () => {
+	const res: any = await countConcreteMonitorAlarm({ projectSn: store.sn, devSn: meterId.value });
+	console.log("获取实时告警", res);
+	if (res.result) {
+		meterRead.value = res.result;
+	} else {
+		meterRead.value = {};
 	}
-]);
+};
+const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
+const ScrollbarTop = ref(0);
+
+let moreScroll = ref(true as any);
+
+let pageNo = ref(1 as any);
+let pageSize = ref(10 as any);
+
+// 告警列表
+const getAlarmList = async () => {
+	const res: any = await concreteMonitorAlarmList({ projectSn: store.sn, pageNo: 1, pageSize: pageSize.value, devSn: meterId.value });
+	console.log("告警列表", res);
+	list.value = res.result.records;
+	if (res.result.pages == pageNo.value) {
+		moreScroll.value = false;
+	} else {
+		pageNo.value = pageNo.value + 1;
+	}
+	// console.log("当前页数", pageNo.value);
+};
+
+// 下拉加载
+const getMoreSmokeRecordList = async () => {
+	const res: any = await concreteMonitorAlarmList({ projectSn: store.sn, pageNo: pageNo.value, pageSize: pageSize.value, devSn: meterId.value });
+	console.log("下拉加载告警列表", res);
+	list.value = list.value.concat(res.result.records);
+	if (res.result.pages == pageNo.value) {
+		moreScroll.value = false;
+	} else {
+		pageNo.value = pageNo.value + 1;
+	}
+	// console.log("当前列表", list.value);
+	// console.log("当前页数", pageNo.value);
+};
+
+onMounted(async () => {
+	mitts.on("concreteDevSn", e => {
+		// console.log("当前设备对应的devSn", e);
+		list.value = [];
+		meterId.value = e;
+		getMeterTotal();
+		getAlarmList();
+	});
+	refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
+		// console.log("滚动容器", e);
+		const scrollTop = e.target.scrollTop;
+		const scrollHeight = e.target.scrollHeight;
+		const clientHeight = e.target.clientHeight;
+		// console.log("滚动容器", scrollTop, scrollHeight, clientHeight);
+		// 向上加载更多
+		if (scrollTop >= scrollHeight - clientHeight) {
+			console.log("加载更多");
+			if (moreScroll.value) {
+				getMoreSmokeRecordList();
+			}
+		}
+		ScrollbarTop.value = scrollTop;
+	});
+	// getMeterTotal();
+});
+
+onBeforeUnmount(async () => {
+	mitts.off("concreteDevSn");
+});
 </script>
 
 <style scoped lang="scss">
@@ -167,7 +157,7 @@ const list = reactive([
 		.data-left {
 			box-sizing: border-box;
 			width: 45%;
-			margin-left: 3%;
+			margin-left: 30%;
 			font-size: 16px;
 			padding-top: 1%;
 			padding-left: 15%;
diff --git a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightTop.vue b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightTop.vue
index 6d25e5c..d75980e 100644
--- a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightTop.vue
+++ b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightTop.vue
@@ -1,13 +1,13 @@
 <template>
-	<Card title="混凝土统计">
+	<Card title="监测点位总数">
 		<div class="concrete-left-bottom">
 			<div class="concrete-total">
-				<div class="text">混凝土总数</div>
-				<div class="num">365</div>
+				<div class="text">监测点位总数</div>
+				<div class="num">{{ realTimeTotal.monitorPositionNum || 0 }}</div>
 			</div>
 			<div class="concrete-alarm">
 				<div class="text">正在告警</div>
-				<div class="num">136</div>
+				<div class="num">{{ realTimeTotal.alarmNum || 0 }}</div>
 			</div>
 		</div>
 	</Card>
@@ -15,6 +15,24 @@
 
 <script setup lang="ts">
 import Card from "@/components/card.vue";
+import { reactive, ref, onMounted } from "vue";
+import { GlobalStore } from "@/stores";
+const store = GlobalStore();
+import { countConcreteMonitorDevPointPosition } from "@/api/modules/concreteMonitor";
+
+// 获取 实时监测
+const realTimeTotal = ref({}) as any;
+const getMemberCareList = async () => {
+	const res: any = await countConcreteMonitorDevPointPosition({ projectSn: store.sn });
+	console.log("实时监测", res);
+	if (res.success) {
+		realTimeTotal.value = res.result;
+	}
+};
+
+onMounted(async () => {
+	getMemberCareList();
+});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue
index 7cae136..842983d 100644
--- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue
+++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue
@@ -1,21 +1,32 @@
 <template>
-	<Card title="土地深层水平位移监测">
-		<div class="pit-left-bottom">
-			<div class="methane-content">
+	<Card title="土体分层竖向位移">
+		<div class="pit-right-first">
+			<div class="pit-content">
 				<div class="select-right">
-					<el-form-item label="测点编号">
-						<el-select v-model="selectPoint" style="width: 75%" size="small">
-							<el-option v-for="(item, index) in pointList" :key="index" :label="item.dayType" :value="item.value" />
-						</el-select>
-					</el-form-item>
-					<!-- <el-form-item label="次数">
-						<el-select v-model="selectTime" style="width: 70%" size="small">
-							<el-option v-for="(item, index) in timeList" :key="index" :label="item.dayType" :value="item.value" />
-						</el-select>
-					</el-form-item> -->
-					<div class="check-time">监测时间: {{ checkTime }}</div>
+					<div style="width: 33%; margin-right: 5%">
+						<el-date-picker
+							v-model="rangeTime"
+							type="datetimerange"
+							range-separator="至"
+							start-placeholder="开始时间"
+							end-placeholder="结束时间"
+							:clearable="false"
+							size="small"
+							@change="selectRangeTime"
+						/>
+					</div>
+					<el-select v-model="measurePointNumber" style="width: 15%; margin-right: 5%" size="small">
+						<el-option v-for="(item, index) in pointList" :key="index" :label="item.measurePointName" :value="item.measurePointNumber" />
+					</el-select>
+					<el-select v-model="sensorSn" style="width: 15%" size="small">
+						<el-option v-for="(item, index) in timeList" :key="index" :label="item.sensorName" :value="item.sensorSn" />
+					</el-select>
+				</div>
+				<div id="pitRightLeftBottom" ref="pitRightLeftBottom" style="width: 100%; height: 100%"></div>
+				<div class="notoDta" v-if="yData1.length == 0">
+					<img src="@/assets/images/noData.png" alt="" />
+					<p>暂无数据</p>
 				</div>
-				<div id="pitLeftBottom" ref="pitLeftBottom" style="width: 100%; height: 100%"></div>
 			</div>
 		</div>
 	</Card>
@@ -23,24 +34,31 @@
 
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
-import symbolIcon from "@/assets/images/toxicGasMonitor/lineIcon.png";
 import symbolIcon2 from "@/assets/images/toxicGasMonitor/lineIcon2.png";
 
 import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
 import * as echarts from "echarts";
+import { selectDeepExcavationCurrentDataList, selectDeepExcavationAllMeasurePointList, getSensorListByMeasurePointNumber } from "@/api/modules/securityManagement";
+
+
 // import { getSelectDataListApi } from "@/api/modules/distribution";
 // import Card from "@/components/card.vue";
 import { GlobalStore } from "@/stores";
 import mitts from "@/utils/bus"; //兄弟组件传值
-let checkTime = ref("2023-08-23 19:08:26" as any);
 const store = GlobalStore();
 // x轴
+let twenty_four_time = ref([] as any);
+// Y轴单位
+let unit = ref("位移(mm)" as any);
+// Y轴数据
+let yData1 = ref([] as any);
 
 // 图表数据项
 let option = ref(null as any);
 // 选中
-let selectPoint = ref(1);
-let selectTime = ref(1);
+let rangeTime = ref("");
+let sensorSn = ref("");
+let measurePointNumber = ref("");
 
 // 当前对应的种类
 // let nowType = ref("温度");
@@ -66,31 +84,48 @@ let pointList = ref([
 let timeList = ref([
 	{
 		value: 1,
-		dayType: "1次"
+		dayType: "本次内力"
 	},
 	{
 		value: 2,
-		dayType: "2次"
-	},
-	{
-		value: 3,
-		dayType: "3次"
+		dayType: "本次变化"
 	}
 ]);
 
+// 时间轴起止时间
+let startValue = ref("2023-9-19 05:15:00" as any);
+let endValue = ref("2023-9-21 05:15:00" as any);
+
+function selectRangeTime(e: any) {
+	// console.log("选择时间", e);
+	// console.log(option.value.series[0].markLine, "数据");
+	// option.value.series[0].markLine = null;
+	startValue.value = e[0];
+	endValue.value = e[1];
+	drawChart();
+}
+
 function initOption() {
 	option.value = {
-		legend: {
-			show: true,
-			bottom: "3%",
-			icon: "rect",
-			itemWidth: 10,
-			itemHeight: 10,
-			itemGap: 55,
-			textStyle: {
-				color: "#FFFFFF"
+		// backgroundColor: '#071c3a',
+		dataZoom: [
+			{
+				// orient: "vertical", //水平显示
+				type: "slider",
+				show: true, //显示滚动条
+				height: 0,
+				// startValue: startValue.value, //起始值
+				// endValue: endValue.value, //结束值
+				// start: 0,
+				// end: 35,
+				showDetail: false,
+				bottom: "8%",
+				moveHandleStyle: {
+					color: "#4AC0F3"
+				},
+				backgroundColor: "#193C8D"
 			}
-		},
+		],
 		tooltip: {
 			trigger: "axis",
 			backgroundColor: "rgba(0, 0, 0, 0.9)",
@@ -126,67 +161,94 @@ function initOption() {
 			},
 			formatter: function (params) {
 				// console.log("tooltip", params);
-				let currentInnerHtml = "";
-				for (let index = 0; index < params.length; index++) {
-					let nowTime = params[index].seriesName;
-					let displace = params[index].data[0];
-					let deepHeight = params[index].data[1];
-					let stateText = "正常";
-					let markLine = params[index].marker;
-					if (displace > 40 || displace < -40) {
-						stateText = "异常";
-					}
-					currentInnerHtml =
-						currentInnerHtml +
-						checkTime.value +
-						"<br/>" +
-						"第" +
-						nowTime +
-						"<br/>" +
-						markLine +
-						"状态: " +
-						stateText +
-						"<br/>" +
-						"位移: " +
-						displace +
-						"mm" +
-						"<br/>" +
-						"深度: " +
-						" " +
-						deepHeight +
-						"m" +
-						"<br/>" +
-						"<br/>";
+				// let currentMarker = "";
+				let currentState = "";
+				if (params[0].value[1] > positiveAlarmValue.value || params[0].value[1] < negativeAlarmValue.value) {
+					currentState = "超出报警值";
+					// currentMarker = `<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:#f00;"> </span>`;
+				} else {
+					// currentMarker = params[0].marker;
+					currentState = "正常";
 				}
-				return currentInnerHtml;
+				return (
+					params[0].axisValueLabel +
+					params[0].name +
+					"<br/>" +
+					// currentMarker +
+					params[0].marker +
+					"状态:" +
+					currentState +
+					"<br/>" +
+					params[0].seriesName +
+					":" +
+					params[0].value[1] +
+					"kN"
+				);
 			}
 		},
 		grid: {
-			top: "25%",
-			left: "8%",
-			right: "12%",
+			top: "35%",
+			left: "7%",
+			right: "3%",
 			bottom: "20%"
 			// containLabel: true
 		},
 		xAxis: [
 			{
-				type: "value", // 设置 X 轴为数值轴
-				name: "位移（mm）", // 设置 X 轴的名称，表示位移
-				position: "top",
-				nameLocation: "end", // 设置 X 轴名称的位置
-				nameGap: 20, // 设置 X 轴名称与轴线的距离
-				inverse: false, // 不反转 X 轴
-				nameTextStyle: {
-					// align: "right", // 将 Y 轴名称文字右对齐
-					// verticalAlign: "middle", // 将 Y 轴名称文字垂直居中
-					// padding: [0, 0, 0, 10], // 设置名称文字的内边距，调整位置
-					color: "#fff"
-					// nameLocation: "start"
+				type: "time",
+				// minInterval: 3600 * 1000 * 6,
+				// min: startValue.value,
+				// max: endValue.value,
+				axisLine: {
+					show: true,
+					lineStyle: {
+						color: "#14346C"
+					}
 				},
-				interval: 20,
-				min: -60,
-				max: 60,
-				splitNumber: 3,
+				splitArea: {
+					// show: true,
+					color: "#f00",
+					lineStyle: {
+						color: "#f00"
+					}
+				},
+				axisLabel: {
+					color: "#fff",
+					formatter: function (value) {
+						//在这里写你需要的时间格式
+						let t_date = new Date(value);
+						return (
+							[t_date.getMonth() + 1, t_date.getDate()].join("-") +
+							" " +
+							[t_date.getHours(), t_date.getMinutes()].join(":") +
+							":00"
+						);
+					}
+				},
+				splitLine: {
+					show: false
+				},
+				boundaryGap: false
+				// data: twenty_four_time.value
+			}
+		],
+
+		yAxis: [
+			{
+				name: unit.value,
+				nameGap: 25,
+				nameTextStyle: {
+					align: "right", // 将 Y 轴名称文字右对齐
+					verticalAlign: "middle", // 将 Y 轴名称文字垂直居中
+					padding: [0, 5, 0, 0], // 设置名称文字的内边距，调整位置
+					color: "#fff",
+					nameLocation: "start"
+				},
+				type: "value",
+				min: negativeAlarmValue.value,
+				// min: -300,
+				// max: 300,
+				// splitNumber: 3,
 				splitLine: {
 					show: true,
 					lineStyle: {
@@ -211,121 +273,101 @@ function initOption() {
 				}
 			}
 		],
-
-		yAxis: [
-			{
-				position: "left",
-				type: "value", // 设置 Y 轴为数值轴
-				name: "深度（m）", // 设置 Y 轴的名称，表示深度
-				nameLocation: "end", // 设置 Y 轴名称的位置
-				nameGap: 25, // 设置 Y 轴名称与轴线的距离
-				inverse: true, // 反转 Y 轴，使其变为第四象限坐标系
-				nameTextStyle: {
-					color: "#fff",
-					verticalAlign: "middle",
-					padding: [0, 760, 0, 0] // 设置名称文字的内边距，调整位置
-				},
-				alignTicks: true,
-				// min: 0,
-				// max: 140,
-				splitNumber: 3,
-				splitLine: {
-					show: true,
-					lineStyle: {
-						color: "#14346C"
-					}
-				},
-				axisLine: {
-					show: true,
-					lineStyle: {
-						color: "#14346C"
-					}
-				},
-				axisLabel: {
-					show: true,
-					textStyle: {
-						color: "#fff"
-					}
-				},
-				axisTick: {
-					show: true
-				}
-			}
-		],
 		series: [
 			{
+				showAllSymbol: true,
+				// symbol: `image://${symbolIcon2}`,
+				// symbol: "circle",
+				symbolSize: 8,
+				smooth: true, //是否平滑
+				name: "基坑监测点001",
+				type: "line",
+				// symbol: "emptyCircle",
 				color: "#4AC0F3",
-				name: "1次",
-				type: "line", // 设置系列类型为折线图
-				data: [
-					[-48, 1],
-					[-25, 2],
-					[23, 5],
-					[42, 3],
-					[51, 6]
-				], // 调整数据点的 x 坐标为负数，使其显示在第四象限
+				data: yData1.value,
+				itemStyle: {
+					color: function (param) {
+						// console.log("拐点", param);
+						if (param.value[1] > 150) {
+							return "red";
+						} else {
+							return "#4AC0F3";
+						}
+					}
+					// borderColor: "#0000ff", //拐点边框颜色
+					// borderWidth: 1 //拐点边框大小
+				},
 				markLine: {
 					// 添加 MarkLine 组件配置
 					data: [
 						// { type: 'average', name: '平均值' }, // 平均值标注线
-						{ xAxis: 40, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
-						{ xAxis: 60, name: "控制值", lineStyle: { color: "#EEA959" } }, // 自定义阈值标注线
-						{ xAxis: -40, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
-						{ xAxis: -60, name: "控制值", lineStyle: { color: "#EEA959" } } // 自定义阈值标注线
+						{ yAxis: positiveAlarmValue.value, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
+						// { yAxis: 150, name: "控制值", lineStyle: { color: "#EEA959" } }, // 自定义阈值标注线
+						{ yAxis: negativeAlarmValue.value, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
+						// { yAxis: -150, name: "控制值", lineStyle: { color: "#EEA959" } } // 自定义阈值标注线
 					],
 					label: {
 						normal: {
+							// color: function (params) {
+							// 	console.log(params, "特殊值");
+							// 	// return params.lineStyle.color;
+							// },
 							color: "inherit",
 							fontSize: 14,
 							position: "insideEndBottom",
-							distance: [0, -25],
+							distance: [15, -15],
 							formatter: function (params) {
-								return params.name + "（" + params.value + "）";
+								return params.value;
 							}
 						}
 					}
-				},
-				smooth: true // 设置线条平滑显示
-			},
-			{
-				color: "#81F279",
-				name: "2次",
-				type: "line", // 设置系列类型为折线图
-				data: [
-					[-48, 1],
-					[-37, 2],
-					[25, 5],
-					[43, 3],
-					[51, 6]
-				], // 调整数据点的 x 坐标为负数，使其显示在第四象限
-				smooth: true // 设置线条平滑显示
-			},
-			{
-				color: "#6375C7",
-				name: "3次",
-				type: "line", // 设置系列类型为折线图
-				data: [
-					[-48, 1],
-					[-45, 2],
-					[23, 5],
-					[45, 3],
-					[52, 6]
-				], // 调整数据点的 x 坐标为负数，使其显示在第四象限
-				smooth: true // 设置线条平滑显示
+				}
 			}
 		]
 	};
 }
 
+// function countTime() {
+// 	// 设置起始时间和结束时间
+// 	let startDate = new Date("2023-09-18T18:02:00");
+// 	let endDate = new Date("2023-09-21T19:02:00");
+// 	// 存放小时数
+// 	let timeData = [];
+// 	// 返回特定小时数
+// 	const hours = [0, 6, 12, 18]; // 0时、6时、12时、18时
+// 	for (let i = 0; i < 72; i++) {
+// 		// 每次循环，将时间递增一小时
+// 		const date = new Date(startDate);
+// 		date.setHours(startDate.getHours() + i);
+
+// 		// 仅将特定小时数进行处理
+// 		if (hours.includes(date.getHours())) {
+// 			// 格式化为mm-dd hh:00:00格式
+// 			const month = ("0" + (date.getMonth() + 1)).slice(-2);
+// 			const day = ("0" + date.getDate()).slice(-2);
+// 			const hour = ("0" + date.getHours()).slice(-2);
+// 			const formattedTime = `2023-${month}-${day} ${hour}:00:00`;
+// 			timeData.push(formattedTime);
+// 			// console.log(formattedTime, "时间");
+// 		}
+// 		// 超过结束时间，退出循环
+// 		if (date >= endDate) {
+// 			break;
+// 		}
+// 	}
+// 	twenty_four_time.value = timeData;
+// 	drawChart();
+// }
+
 function drawChart() {
 	initOption();
-	// console.log("绘制前数据", yData.value);
-	let chartDom = document.getElementById("pitLeftBottom");
+	console.log("绘制前数据", yData1.value);
+	let chartDom = document.getElementById("pitRightLeftBottom");
 	if (chartDom) {
 		chartDom.removeAttribute("_echarts_instance_");
 	}
-	let pitLeftBottom = echarts.init(document.getElementById("pitLeftBottom"));
-	pitLeftBottom.setOption(option.value);
+	let pitRightLeftBottom = echarts.init(document.getElementById("pitRightLeftBottom"));
+	pitRightLeftBottom.setOption(option.value);
 }
 
 //获取当前时间-24小时
@@ -334,19 +376,56 @@ function drawChart() {
 // 	timeArrays.forEach((item, index) => (timeArrays[index] = (index < 10 ? "0" + index : index) + ":00"));
 // 	return timeArrays;
 // }
+// 	"measurePointNumber": "测点编号",
+// 	"relaId": "65",
+// 	"sensorSn": "1",
+
+// 查测点列表
+const getTestPointList = async () => {
+	const res: any = await selectDeepExcavationAllMeasurePointList({ projectSn: store.sn, monitorTypeId: 19 });
+	pointList.value = res.result;
+	measurePointNumber.value = res.result[0].measurePointNumber;
+	getDevList();
+	console.log("查测点列表", res);
+};
+// 查传感器列表
+const getDevList = async () => {
+	const res: any = await getSensorListByMeasurePointNumber({ projectSn: store.sn, measurePointNumber: measurePointNumber.value});
+	timeList.value = res.result;
+	sensorSn.value = res.result[0].sensorSn;
+	console.log("查传感器列表", res);
+	getEdgeAlarmTrend();
+};
+
+let negativeAlarmValue = ref(0) as any; //负报警值
+let positiveAlarmValue = ref(0) as any; //正报警值
+
+// 土体分层竖向位移
+const getEdgeAlarmTrend = async () => {
+	const res: any = await selectDeepExcavationCurrentDataList({ projectSn: store.sn, sensorSn: sensorSn.value, measurePointNumber: measurePointNumber.value, pageNo: 1, pageSize: 10 });
+	if (res.result) {
+		// option.value.xAxis.data = res.result.data.records.map((item: any) => item.x);
+		// option.value.series[0].data = res.result.map((item: any) => Number(item.y));
+		const twoDimensionalArray = res.result.data.records.map(item => [item.receiveTime, item.data]);
+		yData1.value = twoDimensionalArray
+		positiveAlarmValue.value = res.result.positiveAlarmValue
+		negativeAlarmValue.value = res.result.negativeAlarmValue
+	}
+	// twenty_four_time.value = res.result.map((item: any) => item.x);
+	// yData.value = res.result.map((item: any) => Number(item.y));
+	console.log("土体分层竖向位移", res);
+	drawChart();
+};
 
 onMounted(async () => {
-	drawChart();
-});
-
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
-onBeforeUnmount(async () => {
-	mitts.off("devSn");
+	// await getEdgeAlarmTrend();
+	getTestPointList();
+	// getDevList();
 });
 </script>
 
 <style lang="scss" scoped>
-.pit-left-bottom {
+.pit-right-first {
 	width: 100%;
 	height: 100%;
 	.title {
@@ -362,7 +441,7 @@ onBeforeUnmount(async () => {
 			margin-left: 6%;
 		}
 	}
-	.methane-content {
+	.pit-content {
 		height: 100%;
 		background: url("@/assets/images/cardImg.png") no-repeat;
 		background-size: 100% 100%;
@@ -370,21 +449,15 @@ onBeforeUnmount(async () => {
 		.select-right {
 			position: absolute;
 			display: flex;
-			right: -3%;
-			width: 50%;
+			right: -25%;
+			width: 100%;
 			top: 5%;
 			z-index: 9;
-			.check-time {
-				color: #ffffff;
-				font-size: 12px;
-				margin-top: 1%;
-			}
 		}
 	}
 }
 :deep(.el-input__wrapper) {
 	background: #112d59;
-	padding-left: 10%;
 }
 :deep(.el-input__inner) {
 	color: #fff;
@@ -392,8 +465,29 @@ onBeforeUnmount(async () => {
 :deep(.el-select .el-input .el-select__caret) {
 	color: #fff;
 }
-:deep(.el-form-item--default .el-form-item__label) {
+:deep(.el-date-editor) {
+	width: 100%;
+}
+:deep(.el-range-separator) {
 	color: #fff;
-	font-size: 12px;
+}
+:deep(.el-date-editor .el-range-input) {
+	color: #fff;
+}
+.notoDta {
+	top: 25%;
+	width: 40%;
+	left: 30%;
+	position: absolute;
+	text-align: center;
+	img {
+		width: 40%;
+		margin: 5% 30%;
+	}
+	p {
+		color: #fff;
+		font-size: 14px;
+		margin: -6% 37%;
+	}
 }
 </style>
diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom_old.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom_old.vue
new file mode 100644
index 0000000..6d94b6b
--- /dev/null
+++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom_old.vue
@@ -0,0 +1,399 @@
+<template>
+	<Card title="土地深层水平位移监测">
+		<div class="pit-left-bottom">
+			<div class="methane-content">
+				<div class="select-right">
+					<el-form-item label="测点编号">
+						<el-select v-model="selectPoint" style="width: 75%" size="small">
+							<el-option v-for="(item, index) in pointList" :key="index" :label="item.dayType" :value="item.value" />
+						</el-select>
+					</el-form-item>
+					<!-- <el-form-item label="次数">
+						<el-select v-model="selectTime" style="width: 70%" size="small">
+							<el-option v-for="(item, index) in timeList" :key="index" :label="item.dayType" :value="item.value" />
+						</el-select>
+					</el-form-item> -->
+					<div class="check-time">监测时间: {{ checkTime }}</div>
+				</div>
+				<div id="pitLeftBottom" ref="pitLeftBottom" style="width: 100%; height: 100%"></div>
+			</div>
+		</div>
+	</Card>
+</template>
+
+<script lang="ts" setup>
+import Card from "@/components/card.vue";
+import symbolIcon from "@/assets/images/toxicGasMonitor/lineIcon.png";
+import symbolIcon2 from "@/assets/images/toxicGasMonitor/lineIcon2.png";
+
+import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
+import * as echarts from "echarts";
+// import { getSelectDataListApi } from "@/api/modules/distribution";
+// import Card from "@/components/card.vue";
+import { GlobalStore } from "@/stores";
+import mitts from "@/utils/bus"; //兄弟组件传值
+let checkTime = ref("2023-08-23 19:08:26" as any);
+const store = GlobalStore();
+// x轴
+
+// 图表数据项
+let option = ref(null as any);
+// 选中
+let selectPoint = ref(1);
+let selectTime = ref(1);
+
+// 当前对应的种类
+// let nowType = ref("温度");
+let pointList = ref([
+	{
+		value: 1,
+		dayType: "基坑监测点001"
+	},
+	{
+		value: 2,
+		dayType: "基坑监测点002"
+	},
+	{
+		value: 3,
+		dayType: "基坑监测点003"
+	},
+	{
+		value: 4,
+		dayType: "基坑监测点004"
+	}
+]);
+
+let timeList = ref([
+	{
+		value: 1,
+		dayType: "1次"
+	},
+	{
+		value: 2,
+		dayType: "2次"
+	},
+	{
+		value: 3,
+		dayType: "3次"
+	}
+]);
+
+function initOption() {
+	option.value = {
+		legend: {
+			show: true,
+			bottom: "3%",
+			icon: "rect",
+			itemWidth: 10,
+			itemHeight: 10,
+			itemGap: 55,
+			textStyle: {
+				color: "#FFFFFF"
+			}
+		},
+		tooltip: {
+			trigger: "axis",
+			backgroundColor: "rgba(0, 0, 0, 0.9)",
+			borderColor: "#010306",
+			textStyle: {
+				color: "#FFFFFF"
+			},
+			axisPointer: {
+				lineStyle: {
+					color: {
+						type: "linear",
+						x: 0,
+						y: 0,
+						x2: 0,
+						y2: 1,
+						colorStops: [
+							{
+								offset: 0,
+								color: "rgba(0, 255, 233,0)"
+							},
+							{
+								offset: 0.5,
+								color: "rgba(255, 255, 255,1)"
+							},
+							{
+								offset: 1,
+								color: "rgba(0, 255, 233,0)"
+							}
+						],
+						global: false
+					}
+				}
+			},
+			formatter: function (params) {
+				// console.log("tooltip", params);
+				let currentInnerHtml = "";
+				for (let index = 0; index < params.length; index++) {
+					let nowTime = params[index].seriesName;
+					let displace = params[index].data[0];
+					let deepHeight = params[index].data[1];
+					let stateText = "正常";
+					let markLine = params[index].marker;
+					if (displace > 40 || displace < -40) {
+						stateText = "异常";
+					}
+					currentInnerHtml =
+						currentInnerHtml +
+						checkTime.value +
+						"<br/>" +
+						"第" +
+						nowTime +
+						"<br/>" +
+						markLine +
+						"状态: " +
+						stateText +
+						"<br/>" +
+						"位移: " +
+						displace +
+						"mm" +
+						"<br/>" +
+						"深度: " +
+						" " +
+						deepHeight +
+						"m" +
+						"<br/>" +
+						"<br/>";
+				}
+				return currentInnerHtml;
+			}
+		},
+		grid: {
+			top: "25%",
+			left: "8%",
+			right: "12%",
+			bottom: "20%"
+			// containLabel: true
+		},
+		xAxis: [
+			{
+				type: "value", // 设置 X 轴为数值轴
+				name: "位移（mm）", // 设置 X 轴的名称，表示位移
+				position: "top",
+				nameLocation: "end", // 设置 X 轴名称的位置
+				nameGap: 20, // 设置 X 轴名称与轴线的距离
+				inverse: false, // 不反转 X 轴
+				nameTextStyle: {
+					// align: "right", // 将 Y 轴名称文字右对齐
+					// verticalAlign: "middle", // 将 Y 轴名称文字垂直居中
+					// padding: [0, 0, 0, 10], // 设置名称文字的内边距，调整位置
+					color: "#fff"
+					// nameLocation: "start"
+				},
+				interval: 20,
+				min: -60,
+				max: 60,
+				splitNumber: 3,
+				splitLine: {
+					show: true,
+					lineStyle: {
+						color: "#14346C"
+					}
+				},
+				axisLine: {
+					show: true,
+					lineStyle: {
+						color: "#14346C"
+					}
+				},
+				axisLabel: {
+					show: true,
+					margin: 20,
+					textStyle: {
+						color: "#fff"
+					}
+				},
+				axisTick: {
+					show: true
+				}
+			}
+		],
+
+		yAxis: [
+			{
+				position: "left",
+				type: "value", // 设置 Y 轴为数值轴
+				name: "深度（m）", // 设置 Y 轴的名称，表示深度
+				nameLocation: "end", // 设置 Y 轴名称的位置
+				nameGap: 25, // 设置 Y 轴名称与轴线的距离
+				inverse: true, // 反转 Y 轴，使其变为第四象限坐标系
+				nameTextStyle: {
+					color: "#fff",
+					verticalAlign: "middle",
+					padding: [0, 760, 0, 0] // 设置名称文字的内边距，调整位置
+				},
+				alignTicks: true,
+				// min: 0,
+				// max: 140,
+				splitNumber: 3,
+				splitLine: {
+					show: true,
+					lineStyle: {
+						color: "#14346C"
+					}
+				},
+				axisLine: {
+					show: true,
+					lineStyle: {
+						color: "#14346C"
+					}
+				},
+				axisLabel: {
+					show: true,
+					textStyle: {
+						color: "#fff"
+					}
+				},
+				axisTick: {
+					show: true
+				}
+			}
+		],
+		series: [
+			{
+				color: "#4AC0F3",
+				name: "1次",
+				type: "line", // 设置系列类型为折线图
+				data: [
+					[-48, 1],
+					[-25, 2],
+					[23, 5],
+					[42, 3],
+					[51, 6]
+				], // 调整数据点的 x 坐标为负数，使其显示在第四象限
+				markLine: {
+					// 添加 MarkLine 组件配置
+					data: [
+						// { type: 'average', name: '平均值' }, // 平均值标注线
+						{ xAxis: 40, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
+						{ xAxis: 60, name: "控制值", lineStyle: { color: "#EEA959" } }, // 自定义阈值标注线
+						{ xAxis: -40, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
+						{ xAxis: -60, name: "控制值", lineStyle: { color: "#EEA959" } } // 自定义阈值标注线
+					],
+					label: {
+						normal: {
+							color: "inherit",
+							fontSize: 14,
+							position: "insideEndBottom",
+							distance: [0, -25],
+							formatter: function (params) {
+								return params.name + "（" + params.value + "）";
+							}
+						}
+					}
+				},
+				smooth: true // 设置线条平滑显示
+			},
+			{
+				color: "#81F279",
+				name: "2次",
+				type: "line", // 设置系列类型为折线图
+				data: [
+					[-48, 1],
+					[-37, 2],
+					[25, 5],
+					[43, 3],
+					[51, 6]
+				], // 调整数据点的 x 坐标为负数，使其显示在第四象限
+				smooth: true // 设置线条平滑显示
+			},
+			{
+				color: "#6375C7",
+				name: "3次",
+				type: "line", // 设置系列类型为折线图
+				data: [
+					[-48, 1],
+					[-45, 2],
+					[23, 5],
+					[45, 3],
+					[52, 6]
+				], // 调整数据点的 x 坐标为负数，使其显示在第四象限
+				smooth: true // 设置线条平滑显示
+			}
+		]
+	};
+}
+
+function drawChart() {
+	initOption();
+	// console.log("绘制前数据", yData.value);
+	let chartDom = document.getElementById("pitLeftBottom");
+	if (chartDom) {
+		chartDom.removeAttribute("_echarts_instance_");
+	}
+	let pitLeftBottom = echarts.init(document.getElementById("pitLeftBottom"));
+	pitLeftBottom.setOption(option.value);
+}
+
+//获取当前时间-24小时
+// function generateTimes() {
+// 	let timeArrays = new Array(24).fill("");
+// 	timeArrays.forEach((item, index) => (timeArrays[index] = (index < 10 ? "0" + index : index) + ":00"));
+// 	return timeArrays;
+// }
+
+onMounted(async () => {
+	drawChart();
+});
+
+//  
+onBeforeUnmount(async () => {
+	mitts.off("devSn");
+});
+</script>
+
+<style lang="scss" scoped>
+.pit-left-bottom {
+	width: 100%;
+	height: 100%;
+	.title {
+		height: 10%;
+		line-height: 33px;
+		text-align: left;
+		font-size: calc(100vw * 18 / 1920);
+		color: #ffffff;
+		background: url("@/assets/images/titleBig.webp") no-repeat;
+		background-size: 100% 100%;
+		i {
+			font-family: OPPOSansH;
+			margin-left: 6%;
+		}
+	}
+	.methane-content {
+		height: 100%;
+		background: url("@/assets/images/cardImg.png") no-repeat;
+		background-size: 100% 100%;
+		position: relative;
+		.select-right {
+			position: absolute;
+			display: flex;
+			right: -3%;
+			width: 50%;
+			top: 5%;
+			z-index: 9;
+			.check-time {
+				color: #ffffff;
+				font-size: 12px;
+				margin-top: 1%;
+			}
+		}
+	}
+}
+:deep(.el-input__wrapper) {
+	background: #112d59;
+	padding-left: 10%;
+}
+:deep(.el-input__inner) {
+	color: #fff;
+}
+:deep(.el-select .el-input .el-select__caret) {
+	color: #fff;
+}
+:deep(.el-form-item--default .el-form-item__label) {
+	color: #fff;
+	font-size: 12px;
+}
+</style>
diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue
index a077188..083d7d7 100644
--- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue
+++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue
@@ -15,14 +15,18 @@
 							@change="selectRangeTime"
 						/>
 					</div>
-					<el-select v-model="selectPoint" style="width: 15%; margin-right: 5%" size="small">
-						<el-option v-for="(item, index) in pointList" :key="index" :label="item.dayType" :value="item.value" />
+					<el-select v-model="measurePointNumber" style="width: 15%; margin-right: 5%" size="small">
+						<el-option v-for="(item, index) in pointList" :key="index" :label="item.measurePointName" :value="item.measurePointNumber" />
 					</el-select>
-					<el-select v-model="selectTime" style="width: 15%" size="small">
-						<el-option v-for="(item, index) in timeList" :key="index" :label="item.dayType" :value="item.value" />
+					<el-select v-model="sensorSn" style="width: 15%" size="small">
+						<el-option v-for="(item, index) in timeList" :key="index" :label="item.sensorName" :value="item.sensorSn" />
 					</el-select>
 				</div>
 				<div id="pitRightFirst" ref="pitRightFirst" style="width: 100%; height: 100%"></div>
+				<div class="notoDta" v-if="yData1.length == 0">
+					<img src="@/assets/images/noData.png" alt="" />
+					<p>暂无数据</p>
+				</div>
 			</div>
 		</div>
 	</Card>
@@ -34,6 +38,8 @@ import symbolIcon2 from "@/assets/images/toxicGasMonitor/lineIcon2.png";
 
 import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
 import * as echarts from "echarts";
+import { selectDeepExcavationCurrentDataList, selectDeepExcavationAllMeasurePointList, getSensorListByMeasurePointNumber } from "@/api/modules/securityManagement";
+
 // import { getSelectDataListApi } from "@/api/modules/distribution";
 // import Card from "@/components/card.vue";
 import { GlobalStore } from "@/stores";
@@ -44,21 +50,14 @@ let twenty_four_time = ref([] as any);
 // Y轴单位
 let unit = ref("内力(kN)" as any);
 // Y轴数据
-let yData1 = ref([
-	["2023-9-19 05:15:00", 12],
-	["2023-9-19 15:15:00", 200],
-	["2023-9-19 17:15:00", 50],
-	["2023-9-19 19:15:00", 24],
-	["2023-9-20 05:15:00", 30],
-	["2023-9-20 15:15:00", 60]
-] as any);
+let yData1 = ref([] as any);
 
 // 图表数据项
 let option = ref(null as any);
 // 选中
 let rangeTime = ref("");
-let selectPoint = ref(1);
-let selectTime = ref(1);
+let measurePointNumber = ref("");
+let sensorSn = ref("");
 
 // 当前对应的种类
 // let nowType = ref("温度");
@@ -116,8 +115,8 @@ function initOption() {
 				height: 0,
 				// startValue: startValue.value, //起始值
 				// endValue: endValue.value, //结束值
-				start: 0,
-				end: 35,
+				// start: 0,
+				// end: 35,
 				showDetail: false,
 				bottom: "8%",
 				moveHandleStyle: {
@@ -163,7 +162,7 @@ function initOption() {
 				// console.log("tooltip", params);
 				// let currentMarker = "";
 				let currentState = "";
-				if (params[0].value[1] > 150 || params[0].value[1] < -150) {
+				if (params[0].value[1] > positiveAlarmValue.value || params[0].value[1] < negativeAlarmValue.value) {
 					currentState = "超出报警值";
 					// currentMarker = `<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:#f00;"> </span>`;
 				} else {
@@ -174,10 +173,6 @@ function initOption() {
 					params[0].axisValueLabel +
 					params[0].name +
 					"<br/>" +
-					"分类:" +
-					// params[0].seriesName +
-					"本次内力" +
-					"<br/>" +
 					// currentMarker +
 					params[0].marker +
 					"状态:" +
@@ -200,9 +195,9 @@ function initOption() {
 		xAxis: [
 			{
 				type: "time",
-				minInterval: 3600 * 1000 * 6,
-				min: startValue.value,
-				max: endValue.value,
+				// minInterval: 3600 * 1000 * 6,
+				// min: startValue.value,
+				// max: endValue.value,
 				axisLine: {
 					show: true,
 					lineStyle: {
@@ -225,7 +220,7 @@ function initOption() {
 							[t_date.getMonth() + 1, t_date.getDate()].join("-") +
 							" " +
 							[t_date.getHours(), t_date.getMinutes()].join(":") +
-							"0:00"
+							":00"
 						);
 					}
 				},
@@ -249,9 +244,10 @@ function initOption() {
 					nameLocation: "start"
 				},
 				type: "value",
-				min: -300,
-				max: 300,
-				splitNumber: 3,
+				min: negativeAlarmValue.value,
+				// min: -300,
+				// max: 300,
+				// splitNumber: 3,
 				splitLine: {
 					show: true,
 					lineStyle: {
@@ -304,10 +300,10 @@ function initOption() {
 					// 添加 MarkLine 组件配置
 					data: [
 						// { type: 'average', name: '平均值' }, // 平均值标注线
-						{ yAxis: 250, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
-						{ yAxis: 150, name: "控制值", lineStyle: { color: "#EEA959" } }, // 自定义阈值标注线
-						{ yAxis: -250, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
-						{ yAxis: -150, name: "控制值", lineStyle: { color: "#EEA959" } } // 自定义阈值标注线
+						{ yAxis: positiveAlarmValue.value, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
+						// { yAxis: 150, name: "控制值", lineStyle: { color: "#EEA959" } }, // 自定义阈值标注线
+						{ yAxis: negativeAlarmValue.value, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
+						// { yAxis: -150, name: "控制值", lineStyle: { color: "#EEA959" } } // 自定义阈值标注线
 					],
 					label: {
 						normal: {
@@ -364,7 +360,7 @@ function initOption() {
 
 function drawChart() {
 	initOption();
-	// console.log("绘制前数据", yData.value);
+	console.log("绘制前数据", yData1.value);
 	let chartDom = document.getElementById("pitRightFirst");
 	if (chartDom) {
 		chartDom.removeAttribute("_echarts_instance_");
@@ -379,14 +375,53 @@ function drawChart() {
 // 	timeArrays.forEach((item, index) => (timeArrays[index] = (index < 10 ? "0" + index : index) + ":00"));
 // 	return timeArrays;
 // }
+// 	"measurePointNumber": "测点编号",
+// 	"relaId": "65",
+// 	"sensorSn": "1",
+
+// selectDeepExcavationAllMeasurePointList
+// getSensorListByMeasurePointNumber
+// 查测点列表
+const getTestPointList = async () => {
+	const res: any = await selectDeepExcavationAllMeasurePointList({ projectSn: store.sn, monitorTypeId: 1 });
+	pointList.value = res.result;
+	measurePointNumber.value = res.result[0].measurePointNumber;
+	getDevList();
+	console.log("查测点列表", res);
+};
+// 查传感器列表
+const getDevList = async () => {
+	const res: any = await getSensorListByMeasurePointNumber({ projectSn: store.sn, measurePointNumber: measurePointNumber.value});
+	timeList.value = res.result;
+	sensorSn.value = res.result[0].sensorSn;
+	console.log("查传感器列表", res);
+	getEdgeAlarmTrend();
+};
+
+let negativeAlarmValue = ref(0) as any; //负报警值
+let positiveAlarmValue = ref(0) as any; //正报警值
+
+// 锚杆内力监测
+const getEdgeAlarmTrend = async () => {
+	const res: any = await selectDeepExcavationCurrentDataList({ projectSn: store.sn, sensorSn: sensorSn.value, measurePointNumber: measurePointNumber.value, pageNo: 1, pageSize: 10 });
+	if (res.result) {
+		// option.value.xAxis.data = res.result.data.records.map((item: any) => item.x);
+		// option.value.series[0].data = res.result.map((item: any) => Number(item.y));
+		const twoDimensionalArray = res.result.data.records.map(item => [item.receiveTime, item.data]);
+		yData1.value = twoDimensionalArray
+		positiveAlarmValue.value = res.result.positiveAlarmValue
+		negativeAlarmValue.value = res.result.negativeAlarmValue
+	}
+	// twenty_four_time.value = res.result.map((item: any) => item.x);
+	// yData.value = res.result.map((item: any) => Number(item.y));
+	console.log("锚杆内力监测", res);
+	drawChart();
+};
 
 onMounted(async () => {
-	drawChart();
-});
-
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
-onBeforeUnmount(async () => {
-	mitts.off("devSn");
+	// await getEdgeAlarmTrend();
+	getTestPointList();
+	// getDevList();
 });
 </script>
 
@@ -394,6 +429,7 @@ onBeforeUnmount(async () => {
 .pit-right-first {
 	width: 100%;
 	height: 100%;
+	position: relative;
 	.title {
 		height: 10%;
 		line-height: 33px;
@@ -440,4 +476,20 @@ onBeforeUnmount(async () => {
 :deep(.el-date-editor .el-range-input) {
 	color: #fff;
 }
+.notoDta {
+	top: 15%;
+	width: 40%;
+	left: 30%;
+	position: absolute;
+	text-align: center;
+	img {
+		width: 40%;
+		margin: 5% 30%;
+	}
+	p {
+		color: #fff;
+		font-size: 14px;
+		margin: -6% 37%;
+	}
+}
 </style>
diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue
index 9316dec..4caedbf 100644
--- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue
+++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue
@@ -15,14 +15,18 @@
 							@change="selectRangeTime"
 						/>
 					</div>
-					<el-select v-model="selectPoint" style="width: 15%; margin-right: 5%" size="small">
-						<el-option v-for="(item, index) in pointList" :key="index" :label="item.dayType" :value="item.value" />
+					<el-select v-model="measurePointNumber" style="width: 15%; margin-right: 5%" size="small">
+						<el-option v-for="(item, index) in pointList" :key="index" :label="item.measurePointName" :value="item.measurePointNumber" />
 					</el-select>
-					<el-select v-model="selectTime" style="width: 15%" size="small">
-						<el-option v-for="(item, index) in timeList" :key="index" :label="item.dayType" :value="item.value" />
+					<el-select v-model="sensorSn" style="width: 15%" size="small">
+						<el-option v-for="(item, index) in timeList" :key="index" :label="item.sensorName" :value="item.sensorSn" />
 					</el-select>
 				</div>
 				<div id="pitRightSecond" ref="pitRightSecond" style="width: 100%; height: 100%"></div>
+				<div class="notoDta" v-if="yData1.length == 0">
+					<img src="@/assets/images/noData.png" alt="" />
+					<p>暂无数据</p>
+				</div>
 			</div>
 		</div>
 	</Card>
@@ -34,6 +38,9 @@ import symbolIcon2 from "@/assets/images/toxicGasMonitor/lineIcon2.png";
 
 import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
 import * as echarts from "echarts";
+import { selectDeepExcavationCurrentDataList, selectDeepExcavationAllMeasurePointList, getSensorListByMeasurePointNumber } from "@/api/modules/securityManagement";
+
+
 // import { getSelectDataListApi } from "@/api/modules/distribution";
 // import Card from "@/components/card.vue";
 import { GlobalStore } from "@/stores";
@@ -43,22 +50,16 @@ const store = GlobalStore();
 let twenty_four_time = ref([] as any);
 // Y轴单位
 let unit = ref("位移(mm)" as any);
+
 // Y轴数据
-let yData1 = ref([
-	["2023-9-19 05:15:00", 12],
-	["2023-9-19 15:15:00", 16],
-	["2023-9-19 17:15:00", 5],
-	["2023-9-19 19:15:00", 14],
-	["2023-9-20 05:15:00", 10],
-	["2023-9-20 15:15:00", 28]
-] as any);
+let yData1 = ref([] as any);
 
 // 图表数据项
 let option = ref(null as any);
 // 选中
 let rangeTime = ref("");
-let selectPoint = ref(1);
-let selectTime = ref(1);
+let measurePointNumber = ref("");
+let sensorSn = ref("");
 
 // 当前对应的种类
 // let nowType = ref("温度");
@@ -98,6 +99,8 @@ let endValue = ref("2023-9-21 05:15:00" as any);
 
 function selectRangeTime(e: any) {
 	// console.log("选择时间", e);
+	// console.log(option.value.series[0].markLine, "数据");
+	// option.value.series[0].markLine = null;
 	startValue.value = e[0];
 	endValue.value = e[1];
 	drawChart();
@@ -114,8 +117,8 @@ function initOption() {
 				height: 0,
 				// startValue: startValue.value, //起始值
 				// endValue: endValue.value, //结束值
-				start: 0,
-				end: 35,
+				// start: 0,
+				// end: 35,
 				showDetail: false,
 				bottom: "8%",
 				moveHandleStyle: {
@@ -161,7 +164,7 @@ function initOption() {
 				// console.log("tooltip", params);
 				// let currentMarker = "";
 				let currentState = "";
-				if (params[0].value[1] > 15 || params[0].value[1] < -15) {
+				if (params[0].value[1] > positiveAlarmValue.value || params[0].value[1] < negativeAlarmValue.value) {
 					currentState = "超出报警值";
 					// currentMarker = `<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:#f00;"> </span>`;
 				} else {
@@ -172,10 +175,6 @@ function initOption() {
 					params[0].axisValueLabel +
 					params[0].name +
 					"<br/>" +
-					"分类:" +
-					// params[0].seriesName +
-					"本次内力" +
-					"<br/>" +
 					// currentMarker +
 					params[0].marker +
 					"状态:" +
@@ -184,7 +183,7 @@ function initOption() {
 					params[0].seriesName +
 					":" +
 					params[0].value[1] +
-					"mm"
+					"kN"
 				);
 			}
 		},
@@ -198,9 +197,9 @@ function initOption() {
 		xAxis: [
 			{
 				type: "time",
-				minInterval: 3600 * 1000 * 6,
-				min: startValue.value,
-				max: endValue.value,
+				// minInterval: 3600 * 1000 * 6,
+				// min: startValue.value,
+				// max: endValue.value,
 				axisLine: {
 					show: true,
 					lineStyle: {
@@ -223,7 +222,7 @@ function initOption() {
 							[t_date.getMonth() + 1, t_date.getDate()].join("-") +
 							" " +
 							[t_date.getHours(), t_date.getMinutes()].join(":") +
-							"0:00"
+							":00"
 						);
 					}
 				},
@@ -242,14 +241,15 @@ function initOption() {
 				nameTextStyle: {
 					align: "right", // 将 Y 轴名称文字右对齐
 					verticalAlign: "middle", // 将 Y 轴名称文字垂直居中
-					// padding: [0, 0, 0, 0], // 设置名称文字的内边距，调整位置
+					padding: [0, 5, 0, 0], // 设置名称文字的内边距，调整位置
 					color: "#fff",
 					nameLocation: "start"
 				},
 				type: "value",
-				min: -30,
-				max: 30,
-				splitNumber: 3,
+				min: negativeAlarmValue.value,
+				// min: -300,
+				// max: 300,
+				// splitNumber: 3,
 				splitLine: {
 					show: true,
 					lineStyle: {
@@ -285,10 +285,11 @@ function initOption() {
 				type: "line",
 				// symbol: "emptyCircle",
 				color: "#4AC0F3",
+				data: yData1.value,
 				itemStyle: {
 					color: function (param) {
 						// console.log("拐点", param);
-						if (param.value[1] > 15) {
+						if (param.value[1] > 150) {
 							return "red";
 						} else {
 							return "#4AC0F3";
@@ -297,18 +298,21 @@ function initOption() {
 					// borderColor: "#0000ff", //拐点边框颜色
 					// borderWidth: 1 //拐点边框大小
 				},
-				data: yData1.value,
 				markLine: {
 					// 添加 MarkLine 组件配置
 					data: [
 						// { type: 'average', name: '平均值' }, // 平均值标注线
-						{ yAxis: 25, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
-						{ yAxis: 15, name: "控制值", lineStyle: { color: "#EEA959" } }, // 自定义阈值标注线
-						{ yAxis: -25, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
-						{ yAxis: -15, name: "控制值", lineStyle: { color: "#EEA959" } } // 自定义阈值标注线
+						{ yAxis: positiveAlarmValue.value, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
+						// { yAxis: 150, name: "控制值", lineStyle: { color: "#EEA959" } }, // 自定义阈值标注线
+						{ yAxis: negativeAlarmValue.value, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
+						// { yAxis: -150, name: "控制值", lineStyle: { color: "#EEA959" } } // 自定义阈值标注线
 					],
 					label: {
 						normal: {
+							// color: function (params) {
+							// 	console.log(params, "特殊值");
+							// 	// return params.lineStyle.color;
+							// },
 							color: "inherit",
 							fontSize: 14,
 							position: "insideEndBottom",
@@ -358,7 +362,7 @@ function initOption() {
 
 function drawChart() {
 	initOption();
-	// console.log("绘制前数据", yData.value);
+	console.log("绘制前数据", yData1.value);
 	let chartDom = document.getElementById("pitRightSecond");
 	if (chartDom) {
 		chartDom.removeAttribute("_echarts_instance_");
@@ -373,14 +377,51 @@ function drawChart() {
 // 	timeArrays.forEach((item, index) => (timeArrays[index] = (index < 10 ? "0" + index : index) + ":00"));
 // 	return timeArrays;
 // }
+// 	"measurePointNumber": "测点编号",
+// 	"relaId": "65",
+// 	"sensorSn": "1",
+
+// 查测点列表
+const getTestPointList = async () => {
+	const res: any = await selectDeepExcavationAllMeasurePointList({ projectSn: store.sn, monitorTypeId: 22 });
+	pointList.value = res.result;
+	measurePointNumber.value = res.result[0].measurePointNumber;
+	getDevList();
+	console.log("查测点列表", res);
+};
+// 查传感器列表
+const getDevList = async () => {
+	const res: any = await getSensorListByMeasurePointNumber({ projectSn: store.sn, measurePointNumber: measurePointNumber.value});
+	timeList.value = res.result;
+	sensorSn.value = res.result[0].sensorSn;
+	console.log("查传感器列表", res);
+	getEdgeAlarmTrend();
+};
+
+let negativeAlarmValue = ref(0) as any; //负报警值
+let positiveAlarmValue = ref(0) as any; //正报警值
+
+// 立柱竖向位移监测
+const getEdgeAlarmTrend = async () => {
+	const res: any = await selectDeepExcavationCurrentDataList({ projectSn: store.sn, sensorSn: sensorSn.value, measurePointNumber: measurePointNumber.value, pageNo: 1, pageSize: 10 });
+	if (res.result) {
+		// option.value.xAxis.data = res.result.data.records.map((item: any) => item.x);
+		// option.value.series[0].data = res.result.map((item: any) => Number(item.y));
+		const twoDimensionalArray = res.result.data.records.map(item => [item.receiveTime, item.data]);
+		yData1.value = twoDimensionalArray
+		positiveAlarmValue.value = res.result.positiveAlarmValue
+		negativeAlarmValue.value = res.result.negativeAlarmValue
+	}
+	// twenty_four_time.value = res.result.map((item: any) => item.x);
+	// yData.value = res.result.map((item: any) => Number(item.y));
+	console.log("立柱竖向位移监测", res);
+	drawChart();
+};
 
 onMounted(async () => {
-	drawChart();
-});
-
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
-onBeforeUnmount(async () => {
-	mitts.off("devSn");
+	// await getEdgeAlarmTrend();
+	getTestPointList();
+	// getDevList();
 });
 </script>
 
@@ -388,6 +429,7 @@ onBeforeUnmount(async () => {
 .pit-right-first {
 	width: 100%;
 	height: 100%;
+	position: relative;
 	.title {
 		height: 10%;
 		line-height: 33px;
@@ -434,4 +476,20 @@ onBeforeUnmount(async () => {
 :deep(.el-date-editor .el-range-input) {
 	color: #fff;
 }
+.notoDta {
+	top: 15%;
+	width: 40%;
+	left: 30%;
+	position: absolute;
+	text-align: center;
+	img {
+		width: 40%;
+		margin: 5% 30%;
+	}
+	p {
+		color: #fff;
+		font-size: 14px;
+		margin: -6% 37%;
+	}
+}
 </style>
diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue
index 2f76ca4..cd1a093 100644
--- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue
+++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue
@@ -15,14 +15,18 @@
 							@change="selectRangeTime"
 						/>
 					</div>
-					<el-select v-model="selectPoint" style="width: 15%; margin-right: 5%" size="small">
-						<el-option v-for="(item, index) in pointList" :key="index" :label="item.dayType" :value="item.value" />
+					<el-select v-model="measurePointNumber" style="width: 15%; margin-right: 5%" size="small">
+						<el-option v-for="(item, index) in pointList" :key="index" :label="item.measurePointName" :value="item.measurePointNumber" />
 					</el-select>
-					<el-select v-model="selectTime" style="width: 15%" size="small">
-						<el-option v-for="(item, index) in timeList" :key="index" :label="item.dayType" :value="item.value" />
+					<el-select v-model="sensorSn" style="width: 15%" size="small">
+						<el-option v-for="(item, index) in timeList" :key="index" :label="item.sensorName" :value="item.sensorSn" />
 					</el-select>
 				</div>
 				<div id="pitRightThird" ref="pitRightThird" style="width: 100%; height: 100%"></div>
+				<div class="notoDta" v-if="yData1.length == 0">
+					<img src="@/assets/images/noData.png" alt="" />
+					<p>暂无数据</p>
+				</div>
 			</div>
 		</div>
 	</Card>
@@ -34,6 +38,9 @@ import symbolIcon2 from "@/assets/images/toxicGasMonitor/lineIcon2.png";
 
 import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
 import * as echarts from "echarts";
+import { selectDeepExcavationCurrentDataList, selectDeepExcavationAllMeasurePointList, getSensorListByMeasurePointNumber } from "@/api/modules/securityManagement";
+
+
 // import { getSelectDataListApi } from "@/api/modules/distribution";
 // import Card from "@/components/card.vue";
 import { GlobalStore } from "@/stores";
@@ -44,21 +51,14 @@ let twenty_four_time = ref([] as any);
 // Y轴单位
 let unit = ref("位移(mm)" as any);
 // Y轴数据
-let yData1 = ref([
-	["2023-9-19 05:15:00", 12],
-	["2023-9-19 15:15:00", 160],
-	["2023-9-19 17:15:00", 50],
-	["2023-9-19 19:15:00", 24],
-	["2023-9-20 05:15:00", 30],
-	["2023-9-20 15:15:00", 60]
-] as any);
+let yData1 = ref([] as any);
 
 // 图表数据项
 let option = ref(null as any);
 // 选中
 let rangeTime = ref("");
-let selectPoint = ref(1);
-let selectTime = ref(1);
+let sensorSn = ref("");
+let measurePointNumber = ref("");
 
 // 当前对应的种类
 // let nowType = ref("温度");
@@ -98,6 +98,8 @@ let endValue = ref("2023-9-21 05:15:00" as any);
 
 function selectRangeTime(e: any) {
 	// console.log("选择时间", e);
+	// console.log(option.value.series[0].markLine, "数据");
+	// option.value.series[0].markLine = null;
 	startValue.value = e[0];
 	endValue.value = e[1];
 	drawChart();
@@ -114,8 +116,8 @@ function initOption() {
 				height: 0,
 				// startValue: startValue.value, //起始值
 				// endValue: endValue.value, //结束值
-				start: 0,
-				end: 35,
+				// start: 0,
+				// end: 35,
 				showDetail: false,
 				bottom: "8%",
 				moveHandleStyle: {
@@ -161,7 +163,7 @@ function initOption() {
 				// console.log("tooltip", params);
 				// let currentMarker = "";
 				let currentState = "";
-				if (params[0].value[1] > 150 || params[0].value[1] < -150) {
+				if (params[0].value[1] > positiveAlarmValue.value || params[0].value[1] < negativeAlarmValue.value) {
 					currentState = "超出报警值";
 					// currentMarker = `<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:#f00;"> </span>`;
 				} else {
@@ -172,10 +174,6 @@ function initOption() {
 					params[0].axisValueLabel +
 					params[0].name +
 					"<br/>" +
-					"分类:" +
-					// params[0].seriesName +
-					"本次内力" +
-					"<br/>" +
 					// currentMarker +
 					params[0].marker +
 					"状态:" +
@@ -184,7 +182,7 @@ function initOption() {
 					params[0].seriesName +
 					":" +
 					params[0].value[1] +
-					"mm"
+					"kN"
 				);
 			}
 		},
@@ -198,9 +196,9 @@ function initOption() {
 		xAxis: [
 			{
 				type: "time",
-				minInterval: 3600 * 1000 * 6,
-				min: startValue.value,
-				max: endValue.value,
+				// minInterval: 3600 * 1000 * 6,
+				// min: startValue.value,
+				// max: endValue.value,
 				axisLine: {
 					show: true,
 					lineStyle: {
@@ -223,7 +221,7 @@ function initOption() {
 							[t_date.getMonth() + 1, t_date.getDate()].join("-") +
 							" " +
 							[t_date.getHours(), t_date.getMinutes()].join(":") +
-							"0:00"
+							":00"
 						);
 					}
 				},
@@ -242,14 +240,15 @@ function initOption() {
 				nameTextStyle: {
 					align: "right", // 将 Y 轴名称文字右对齐
 					verticalAlign: "middle", // 将 Y 轴名称文字垂直居中
-					// padding: [0, 5, 0, 0], // 设置名称文字的内边距，调整位置
+					padding: [0, 5, 0, 0], // 设置名称文字的内边距，调整位置
 					color: "#fff",
 					nameLocation: "start"
 				},
 				type: "value",
-				min: -300,
-				max: 300,
-				splitNumber: 3,
+				min: negativeAlarmValue.value,
+				// min: -300,
+				// max: 300,
+				// splitNumber: 3,
 				splitLine: {
 					show: true,
 					lineStyle: {
@@ -285,6 +284,7 @@ function initOption() {
 				type: "line",
 				// symbol: "emptyCircle",
 				color: "#4AC0F3",
+				data: yData1.value,
 				itemStyle: {
 					color: function (param) {
 						// console.log("拐点", param);
@@ -297,15 +297,14 @@ function initOption() {
 					// borderColor: "#0000ff", //拐点边框颜色
 					// borderWidth: 1 //拐点边框大小
 				},
-				data: yData1.value,
 				markLine: {
 					// 添加 MarkLine 组件配置
 					data: [
 						// { type: 'average', name: '平均值' }, // 平均值标注线
-						{ yAxis: 250, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
-						{ yAxis: 150, name: "控制值", lineStyle: { color: "#EEA959" } }, // 自定义阈值标注线
-						{ yAxis: -250, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
-						{ yAxis: -150, name: "控制值", lineStyle: { color: "#EEA959" } } // 自定义阈值标注线
+						{ yAxis: positiveAlarmValue.value, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
+						// { yAxis: 150, name: "控制值", lineStyle: { color: "#EEA959" } }, // 自定义阈值标注线
+						{ yAxis: negativeAlarmValue.value, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线
+						// { yAxis: -150, name: "控制值", lineStyle: { color: "#EEA959" } } // 自定义阈值标注线
 					],
 					label: {
 						normal: {
@@ -362,7 +361,7 @@ function initOption() {
 
 function drawChart() {
 	initOption();
-	// console.log("绘制前数据", yData.value);
+	console.log("绘制前数据", yData1.value);
 	let chartDom = document.getElementById("pitRightThird");
 	if (chartDom) {
 		chartDom.removeAttribute("_echarts_instance_");
@@ -377,14 +376,51 @@ function drawChart() {
 // 	timeArrays.forEach((item, index) => (timeArrays[index] = (index < 10 ? "0" + index : index) + ":00"));
 // 	return timeArrays;
 // }
+// 	"measurePointNumber": "测点编号",
+// 	"relaId": "65",
+// 	"sensorSn": "1",
+
+// 查测点列表
+const getTestPointList = async () => {
+	const res: any = await selectDeepExcavationAllMeasurePointList({ projectSn: store.sn, monitorTypeId: 23 });
+	pointList.value = res.result;
+	measurePointNumber.value = res.result[0].measurePointNumber;
+	getDevList();
+	console.log("查测点列表", res);
+};
+// 查传感器列表
+const getDevList = async () => {
+	const res: any = await getSensorListByMeasurePointNumber({ projectSn: store.sn, measurePointNumber: measurePointNumber.value});
+	timeList.value = res.result;
+	sensorSn.value = res.result[0].sensorSn;
+	console.log("查传感器列表", res);
+	getEdgeAlarmTrend();
+};
+
+let negativeAlarmValue = ref(0) as any; //负报警值
+let positiveAlarmValue = ref(0) as any; //正报警值
+
+// 地下水位监测
+const getEdgeAlarmTrend = async () => {
+	const res: any = await selectDeepExcavationCurrentDataList({ projectSn: store.sn, sensorSn: sensorSn.value, measurePointNumber: measurePointNumber.value, pageNo: 1, pageSize: 10 });
+	if (res.result) {
+		// option.value.xAxis.data = res.result.data.records.map((item: any) => item.x);
+		// option.value.series[0].data = res.result.map((item: any) => Number(item.y));
+		const twoDimensionalArray = res.result.data.records.map(item => [item.receiveTime, item.data]);
+		yData1.value = twoDimensionalArray
+		positiveAlarmValue.value = res.result.positiveAlarmValue
+		negativeAlarmValue.value = res.result.negativeAlarmValue
+	}
+	// twenty_four_time.value = res.result.map((item: any) => item.x);
+	// yData.value = res.result.map((item: any) => Number(item.y));
+	console.log("地下水位监测", res);
+	drawChart();
+};
 
 onMounted(async () => {
-	drawChart();
-});
-
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
-onBeforeUnmount(async () => {
-	mitts.off("devSn");
+	// await getEdgeAlarmTrend();
+	getTestPointList();
+	// getDevList();
 });
 </script>
 
@@ -438,4 +474,20 @@ onBeforeUnmount(async () => {
 :deep(.el-date-editor .el-range-input) {
 	color: #fff;
 }
+.notoDta {
+	top: 15%;
+	width: 40%;
+	left: 30%;
+	position: absolute;
+	text-align: center;
+	img {
+		width: 40%;
+		margin: 5% 30%;
+	}
+	p {
+		color: #fff;
+		font-size: 14px;
+		margin: -6% 37%;
+	}
+}
 </style>
diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue
index d9d88e6..49efa6d 100644
--- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue
+++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue
@@ -1,6 +1,11 @@
 <template>
 	<Card title="点位图">
 		<div class="pit-top-left">
+			<div class="select-right">
+				<el-select v-model="selectDay" style="width: 85%" size="small" @change="selectChange">
+					<el-option v-for="(item, index) in devList" :key="index" :label="item.engineeringName" :value="item.id" />
+				</el-select>
+			</div>
 			<div class="point-state-top">
 				<div class="common">
 					<div class="background"></div>
@@ -15,8 +20,8 @@
 					<div class="state-text">超出控制值</div>
 				</div>
 			</div>
-			<div class="point-map">
-				<img src="@/assets/images/foundationPitMonitor/pointPic.png" alt="" />
+			<div class="point-map" v-if="list.length > 0">
+				<img :src="currentData.imageUrl" alt="" />
 				<div class="point-list" v-for="item in list" :key="item.id">
 					<div
 						class="point-item"
@@ -30,16 +35,16 @@
 								: ''
 						"
 						:style="{
-							left: item.xMap + 'px',
-							top: item.yMap + 'px'
+							left: item.mapX - 130 + 'px',
+							top: item.mapY - 80 + 'px'
 						}"
 						@click="openDialog(item)"
 					></div>
 					<div
 						class="item-dialog"
 						:style="{
-							left: item.xMap + 20 + 'px',
-							top: item.yMap - 10 + 'px'
+							left: item.mapX - 130 + 'px',
+							top: item.mapY - 80 + 'px'
 						}"
 						v-if="item.id === currentIndex && showDialog"
 					>
@@ -58,54 +63,90 @@
 					</div>
 				</div>
 			</div>
-			<div class="check-time">已安全监测: 2065天19时30分28秒</div>
+			<div class="notoDta" v-if="list.length == 0">
+					<img src="@/assets/images/noData.png" alt="" />
+					<p>暂无数据</p>
+				</div>
+			<!-- <div class="check-time">已安全监测: 2065天19时30分28秒</div> -->
 		</div>
 	</Card>
 </template>
 
 <script setup lang="ts">
 import Card from "@/components/card.vue";
-import { reactive, ref, onMounted } from "vue";
+import { selectDeepExcavationList, selectDeepPicList, selectDeepPointList } from "@/api/modules/securityManagement";
+import { reactive, ref, onMounted, onBeforeUnmount } from "vue";
+import mitts from "@/utils/bus"; //兄弟组件传值
+import { GlobalStore } from "@/stores";
+const store = GlobalStore();
+const BASEURL = import.meta.env.VITE_API_URL;
 let currentIndex = ref(1 as any);
-let showDialog = ref(false as any);
+// let showDialog = ref(false as any);
 function openDialog(item: any) {
-	currentIndex.value = item.id;
-	showDialog.value = true;
+	// currentIndex.value = item.id;
+	// showDialog.value = true;
 }
 function closeDialog() {
 	showDialog.value = false;
 	console.log("点击");
 }
-const list = reactive([
-	{
-		id: 1,
-		alarmState: 1,
-		xMap: 150,
-		yMap: 70,
-		pointName: "基坑监测点001"
-	},
-	{
-		id: 2,
-		alarmState: 2,
-		xMap: 120,
-		yMap: 70,
-		pointName: "基坑监测点002"
-	},
-	{
-		id: 3,
-		alarmState: 1,
-		xMap: 180,
-		yMap: 90,
-		pointName: "基坑监测点003"
-	},
-	{
-		id: 4,
-		alarmState: 3,
-		xMap: 80,
-		yMap: 100,
-		pointName: "基坑监测点004"
+const list = ref([]);
+
+
+// 当前对应的种类
+let selectDay = ref("");
+let devList = ref([]);
+
+let showDialog = ref(false as any);
+function handleClick(event: any) {
+	console.log("点击", event.target.className);
+	if (event.target.className == "list-detail") {
+		showDialog.value = false;
 	}
-]);
+}
+const getDevOption = async () => {
+	const res: any = await selectDeepExcavationList({ projectSn: store.sn });
+	console.log("设备列表", res);
+	if (res.result.length > 0) {
+		devList.value = res.result;
+		selectDay.value = res.result[0].id;
+		mitts.emit("foundationPitId", selectDay.value);
+		getGantryCurrentData();
+	}
+};
+
+function selectChange(e: any) {
+	console.log("选择", e);
+	selectDay.value = e;
+	list.value = []
+	mitts.emit("foundationPitId", e);
+	getGantryCurrentData();
+}
+
+let currentData = ref({}) as any;
+// 获取图列表
+const getGantryCurrentData = async () => {
+	const res: any = await selectDeepPicList({ projectSn: store.sn, deepExcavationId: selectDay.value });
+	console.log("获取图列表", res);
+	if (res.result.length > 0) {
+		currentData.value = res.result[0];
+		getPointList();
+	}
+};
+
+// 获取点位
+const getPointList = async () => {
+	const res: any = await selectDeepPointList({ projectSn: store.sn, planeFigureId: currentData.value.id, deepExcavationId: selectDay.value });
+	console.log("获取点位", res);
+	if (res.result.length > 0) {
+		list.value = res.result;
+	}
+};
+
+onMounted(async () => {
+	getDevOption();
+});
+
 </script>
 
 <style scoped lang="scss">
@@ -245,4 +286,36 @@ const list = reactive([
 		color: #ffffff;
 	}
 }
+.select-right {
+	position: absolute;
+	right: 1%;
+	width: 30%;
+	top: -13%;
+	z-index: 9;
+}
+:deep(.el-input__wrapper) {
+	background: #112d59;
+}
+:deep(.el-input__inner) {
+	color: #fff;
+}
+:deep(.el-select .el-input .el-select__caret) {
+	color: #fff;
+}
+.notoDta {
+	top: 35%;
+	width: 50%;
+	left: 30%;
+	position: absolute;
+	text-align: center;
+	img {
+		width: 40%;
+		margin: 5% 30%;
+	}
+	p {
+		color: #fff;
+		font-size: 14px;
+		margin: -6% 37%;
+	}
+}
 </style>
diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topRight.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topRight.vue
index ea63211..50cd184 100644
--- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topRight.vue
+++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topRight.vue
@@ -2,16 +2,23 @@
 	<Card title="近30天报警情况统计">
 		<div class="load-top-right">
 			<div id="pitWeekWarn" style="width: 100%; height: 100%"></div>
+			<div class="notoDta" v-if="!isDraw">
+				<img src="@/assets/images/noData.png" alt="" />
+				<p>暂无数据</p>
+			</div>
 		</div>
 	</Card>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from "vue";
+import { onMounted, ref, onBeforeUnmount } from "vue";
 import * as echarts from "echarts";
 import Card from "@/components/card.vue";
 import { GlobalStore } from "@/stores";
 import { noop } from "@vueuse/core";
+import { selectMonitorTypeAlarmCountList } from "@/api/modules/securityManagement";
+import mitts from "@/utils/bus"; //兄弟组件传值
+
 const store = GlobalStore();
 const airType = ref(1);
 // 选中
@@ -34,9 +41,9 @@ function getMonthData(type: any) {
 let rangeTime = ref("" as any);
 let dataList = ref([
 	{
-		value: 25,
+		value: 0,
 		show: true,
-		name: "超出控制值",
+		name: "超出报警值",
 
 		itemStyle: {
 			normal: {
@@ -46,9 +53,9 @@ let dataList = ref([
 		}
 	},
 	{
-		value: 75,
+		value: 0,
 		show: true,
-		name: "超出报警值",
+		name: "超出速率值",
 		itemStyle: {
 			normal: {
 				color: "#EEA959",
@@ -89,15 +96,15 @@ function Pie() {
 	return dataArr;
 }
 
-onMounted(() => {
-	drawEchart();
-});
-
 function drawEchart() {
 	let max = 0;
 	dataList.value.map(item => {
 		max = max + item.value;
 	});
+	let chartDom = document.getElementById("pitWeekWarn");
+	if (chartDom) {
+		chartDom.removeAttribute("_echarts_instance_");
+	}
 	let echartsTest = echarts.init(document.getElementById("pitWeekWarn"));
 	let option = {
 		tooltip: {
@@ -118,9 +125,9 @@ function drawEchart() {
 		title: {
 			text: max,
 			subtext: "风险总数",
-			x: "55%",
+			x: "49%",
 			y: "26%",
-			textAlign: "right",
+			textAlign: "center",
 			textStyle: {
 				color: "#fff",
 				fontSize: 26,
@@ -320,6 +327,42 @@ function drawEchart() {
 	};
 	echartsTest.setOption(option, true);
 }
+let deepExcavationId = ref("") as any;
+let isDraw = ref(false as any);
+const getEdgeAlarmTrend = async () => {
+	const res: any = await selectMonitorTypeAlarmCountList({
+		projectSn: store.sn,
+		deepExcavationId: deepExcavationId.value,
+		searchType: 2
+	});
+	console.log("告警数统计222222222", res);
+	if (res.code == 200 && res.result) {
+		let xData = 0;
+		let yData = 0;
+		res.result.forEach(item => {
+			xData += item.superAlarmNumber; // 超报警
+			yData += item.rateAlarmNumber; // 超速率
+		});
+		dataList.value[0].value = xData;
+		dataList.value[1].value = yData;
+		isDraw.value = true;
+		drawEchart();
+	} else {
+		isDraw.value = false;
+	}
+};
+
+onMounted(async () => {
+	mitts.on("foundationPitId", e => {
+		console.log("作业统计接收值", e);
+		isDraw.value = false;
+		deepExcavationId.value = e;
+		getEdgeAlarmTrend();
+	});
+});
+onBeforeUnmount(async () => {
+	mitts.off("foundationPitId");
+});
 </script>
 
 <style lang="scss" scoped>
@@ -403,4 +446,20 @@ function drawEchart() {
 	color: #ccc;
 	font-size: 10px;
 }
+.notoDta {
+	top: 35%;
+	width: 50%;
+	left: 30%;
+	position: absolute;
+	text-align: center;
+	img {
+		width: 40%;
+		margin: 5% 30%;
+	}
+	p {
+		color: #fff;
+		font-size: 14px;
+		margin: -6% 37%;
+	}
+}
 </style>
diff --git a/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-bottom.vue b/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-bottom.vue
index 6f02aa7..555f18d 100644
--- a/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-bottom.vue
+++ b/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-bottom.vue
@@ -18,7 +18,8 @@
 						<div>{{ item.location }}</div>
 						<div>{{ item.devName }}</div>
 						<div>{{ item.devSn }}</div>
-						<div>{{ deviceStatusOptions[item.deviceStatus].label }}</div>
+						<div v-if="item.deviceStatus < 3">{{ deviceStatusOptions[item.deviceStatus].label }}</div>
+						<div v-else>-</div>
 						<div>{{ item.alarmDetailStatus }}</div>
 						<div>{{ item.alarmTime }}</div>
 					</div>
@@ -41,7 +42,8 @@ const store = GlobalStore();
 
 const deviceStatusOptions = ref([
 	{ label: "报警恢复", value: 0 },
-	{ label: "报警", value: 1 }
+	{ label: "报警", value: 1 },
+	{ label: "心跳", value: 2 },
 ]) as any;
 
 let list = ref([]);
diff --git a/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue b/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue
index ebd354d..8ed10b3 100644
--- a/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue
+++ b/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue
@@ -415,7 +415,7 @@ function driverDetail() {
 onMounted(async () => {
 	await getTowerNumAndAlarmList();
 });
-// 即时销毁事件总线派发，否则会执行两次miits.on造成不必要的内存浪费 7.14 by CJP
+//  
 onBeforeUnmount(async () => {
 	mitts.off("serialNumberId");
 });

From 934a0431cb9a6b5dbbed6fec17dba00a89a7a9ab Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 4 Mar 2024 18:46:55 +0800
Subject: [PATCH 2/3] =?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

---
 .env.development                                             | 4 ++--
 .../comprehensiveManage/projectOverview/centerBottom.vue     | 5 +++--
 .../qualityControl/concreteMonitor/leftTop.vue               | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index ed07633..1cb52ab 100644
--- a/.env.development
+++ b/.env.development
@@ -3,7 +3,7 @@ NODE_ENV = 'development'
 
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
-VITE_API_URL = 'http://192.168.34.221:9111'
+# VITE_API_URL = 'http://192.168.34.221:9111'
 # VITE_API_URL = 'http://192.168.34.221:28888'
 # VITE_API_URL = 'http://121.196.214.246/api'
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
@@ -15,7 +15,7 @@ VITE_API_URL = 'http://192.168.34.221:9111'
 # 演示平台
 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
 # 百色七参数线上地址
-# VITE_API_URL = 'http://101.43.164.214:11111'
+VITE_API_URL = 'http://101.43.164.214:11111'
 
 # 上传
 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue
index faab353..eef64c2 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue
@@ -68,7 +68,8 @@
 import Card from "@/components/card.vue";
 import { ref, watch, onMounted } from "vue";
 import { getStageOption } from "@/api/modules/projectOverview";
-
+import { GlobalStore } from "@/stores";
+const store = GlobalStore();
 const progressList = ref([
 	// {
 	// 	name: "施工证获取",
@@ -127,7 +128,7 @@ watch(
 
 //获取里程碑option
 const getProgressOption = async () => {
-	const res: any = await getStageOption({ dictionaryEncoding: "project_construction_stage" });
+	const res: any = await getStageOption({ dictionaryEncoding: "project_construction_stage", projectSn: store.sn });
 	if (res.result.length > 0) {
 		let newArray = res.result.map((item: any) => {
 			return {
diff --git a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue
index 0a9d1ce..ce3092f 100644
--- a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue
+++ b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue
@@ -39,7 +39,6 @@
 							left: item.mapX + 'px',
 							top: item.mapY + 'px'
 						}"
-						:title="item.pointName"
 						@click="openDialog(item)"
 					></div>
 					<div

From 39a41832c633fefd8a66062e5961e1e9cfdbad5c Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Tue, 12 Mar 2024 14:25:16 +0800
Subject: [PATCH 3/3] =?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/sevenLargeScreen/headNoise/centerTop.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/sevenLargeScreen/headNoise/centerTop.vue b/src/views/sevenLargeScreen/headNoise/centerTop.vue
index cf39fc3..67b8c3e 100644
--- a/src/views/sevenLargeScreen/headNoise/centerTop.vue
+++ b/src/views/sevenLargeScreen/headNoise/centerTop.vue
@@ -16,13 +16,13 @@
 			<div class="gifImg">
 				<img src="@/assets/images/dustNoise/centerGif.gif" alt="" />
 			</div>
-			<div class="menListWd menu">温度:{{ plantCap.temperature ? plantCap.temperature : "--" }}℃</div>
-			<div class="menListSd menu">湿度:{{ plantCap.humidity ? plantCap.humidity : "--" }}%RH</div>
-			<div class="menListPm2 menu">PM2.5:{{ plantCap.pm25 ? plantCap.pm25 : "--" }}ug/m³</div>
-			<div class="menListTs menu">TSP:{{ plantCap.tsp ? plantCap.tsp : "--" }}ug/m³</div>
-			<div class="menListPm10 menu">PM10:{{ plantCap.pm10 ? plantCap.pm10 : "--" }}ug/m³</div>
-			<div class="menListZs menu">噪声:{{ plantCap.noise ? plantCap.noise : "--" }}dB</div>
-			<div class="menListFs menu">风速:{{ plantCap.windspeed ? plantCap.windspeed : "--" }}m/s</div>
+			<div class="menListWd menu">温度:{{ plantCap.temperature || plantCap.temperature == '0' ? plantCap.temperature : "--" }}℃</div>
+			<div class="menListSd menu">湿度:{{ plantCap.humidity || plantCap.humidity == '0' ? plantCap.humidity : "--" }}%RH</div>
+			<div class="menListPm2 menu">PM2.5:{{ plantCap.pm25 || plantCap.pm25 == '0' ? plantCap.pm25 : "--" }}ug/m³</div>
+			<div class="menListTs menu">TSP:{{ plantCap.tsp || plantCap.tsp == '0' ? plantCap.tsp : "--" }}ug/m³</div>
+			<div class="menListPm10 menu">PM10:{{ plantCap.pm10 || plantCap.pm10 == '0' ? plantCap.pm10 : "--" }}ug/m³</div>
+			<div class="menListZs menu">噪声:{{ plantCap.noise || plantCap.noise == '0' ? plantCap.noise : "--" }}dB</div>
+			<div class="menListFs menu">风速:{{ plantCap.windspeed || plantCap.windspeed == '0' ? plantCap.windspeed : "--" }}m/s</div>
 		</div>
 	</div>
 </template>