diff --git a/src/api/modules/headNoise.ts b/src/api/modules/headNoise.ts index b1353cc..2554015 100644 --- a/src/api/modules/headNoise.ts +++ b/src/api/modules/headNoise.ts @@ -11,10 +11,14 @@ export const environmentDevList = (params: {}) => { }; //趋势图-查询环境设备实时数据---近24小时数据 +// export const selectDustNoiseDataApi = (params: {}) => { +// return http.post(BASEURL + `/xmgl/dustNoiseData/selectDustNoiseData`, params); +// }; export const selectDustNoiseDataApi = (params: {}) => { - return http.post(BASEURL + `/xmgl/dustNoiseData/selectDustNoiseData`, params); + return http.post(BASEURL + `/xmgl/dustNoiseData/queryTodayTrendGroupByHour`, params); }; + //查询环境设备最新一条实时数据 export const getRealTimeDustNoiseDataApi = (params: {}) => { return http.post(BASEURL + `/xmgl/dustNoiseData/getRealTimeDustNoiseData`, params); diff --git a/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue b/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue index 93c1810..503dabb 100644 --- a/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue +++ b/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue @@ -27,11 +27,19 @@ let pubKey = ref(""); let initCount = ref(0); let oWebControl = ref(null); let cameraIndexCode = ref>([]); +// let objData = ref({ +// appkey: "23914849", //海康提供的appkey +// ip: "221.12.137.200", //海康提供的ip +// secret: "UV4xyujBtOGA4D0kvXG7", //海康提供的secret +// port: 444, +// playMode: 0, // 0 预览 1回放 +// layout: "1x1" //页面展示的模块数【16】 +// }); let objData = ref({ - appkey: "23914849", //海康提供的appkey - ip: "221.12.137.200", //海康提供的ip - secret: "UV4xyujBtOGA4D0kvXG7", //海康提供的secret - port: 444, + appkey: "24017757", //海康提供的appkey + ip: "182.101.141.23", //海康提供的ip + secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret + port: 18443, playMode: 0, // 0 预览 1回放 layout: "1x1" //页面展示的模块数【16】 }); diff --git a/src/views/sevenLargeScreen/elevatorMonitoring/right.vue b/src/views/sevenLargeScreen/elevatorMonitoring/right.vue index f4f6da0..dff5f04 100644 --- a/src/views/sevenLargeScreen/elevatorMonitoring/right.vue +++ b/src/views/sevenLargeScreen/elevatorMonitoring/right.vue @@ -22,20 +22,20 @@
载重
-
{{elevatorList.loading||0}}kg
+
{{ elevatorList.loading || 0 }}kg
速度
-
{{elevatorList.speed||0}}m/s
+
{{ elevatorList.speed || 0 }}m/s
X倾角
-
{{elevatorList.dipAngleX||0}}°
+
{{ elevatorList.dipAngleX || 0 }}°
Y倾角
-
{{elevatorList.dipAngleY}}°
+
{{ elevatorList.dipAngleY }}°
@@ -47,14 +47,14 @@
运行状态
人脸识别系统
-
今日工作时长:{{lifeList.workTime||0}}min
-
今日装载次数:{{lifeList.loadingNum||0}}次
-
今日装载工效:{{lifeList.loadingErgonomic||0}}kg/min
-
今日装载重量:{{lifeList.loadingWeight||0}}kg
-
今日违章次数:{{lifeList.violationNum||0}}次
+
今日工作时长:{{ lifeList.workTime || 0 }}min
+
今日装载次数:{{ lifeList.loadingNum || 0 }}次
+
今日装载工效:{{ lifeList.loadingErgonomic || 0 }}kg/min
+
今日装载重量:{{ lifeList.loadingWeight || 0 }}kg
+
今日违章次数:{{ lifeList.violationNum || 0 }}次
-
+
司机信息 设备信息
-
认证状态:-
-
姓名:{{ item.workerName||'未知'}}
-
性别:{{ item.sex==1?'男':item.sex==2?'女':'未知'}}
-
年龄:{{ item.age||'未知'}}
-
工作年限:{{item.workYear||0}}年
+ +
姓名:{{ item.workerName || "未知" }}
+
性别:{{ item.sex == 1 ? "男" : item.sex == 2 ? "女" : "未知" }}
+
年龄:{{ item.age || "未知" }}
+
本次连续工作时长:{{ item.continuousWorkingTime || "未知" }}
身份证号:{{ item.idCard||'未知' }} + >{{ item.idCard || "未知" }} +
+
+ + 特种资格证书编号:{{ item.specialCertificateNumber || "未知" }} +
+
+ 资格证书: {{ "查看详情" }}
@@ -87,27 +95,27 @@

下限位

-

{{elevatorList.bottomAlarm==1?'报警':'正常'}}

+

{{ elevatorList.bottomAlarm == 1 ? "报警" : "正常" }}

速度

-

{{elevatorList.speed||0}}m/s

+

{{ elevatorList.speed || 0 }}m/s

载重

-

{{elevatorList.loading||0}}kg

+

{{ elevatorList.loading || 0 }}kg

X倾角

-

{{elevatorList.dipAngleX||0}}°

+

{{ elevatorList.dipAngleX || 0 }}°

Y倾角

-

{{elevatorList.dipAngleY||0}}°

+

{{ elevatorList.dipAngleY || 0 }}°

@@ -122,19 +130,14 @@
- +