admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
cjp 2023-07-29 18:49:39 +08:00
parent 37db6d303e
commit e06e7cbc4a
3 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/views/sevenLargeScreen/elevatorMonitoring/leftCenter.vue
View File

@ -33,20 +33,22 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, onMounted } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
import Card from "@/components/card.vue"; import Card from "@/components/card.vue";
import { getAlarmTypeApi } from "@/api/modules/elevator"; import { getAlarmTypeApi } from "@/api/modules/elevator";
import { GlobalStore } from "@/stores"; import { GlobalStore } from "@/stores";
import mitts from "@/utils/bus"; //兄弟组件传值
const store = GlobalStore(); const store = GlobalStore();
let rangeTime = ref([new Date(new Date().getFullYear(), new Date().getMonth(), 1), new Date()] as any); let rangeTime = ref([new Date(new Date().getFullYear(), new Date().getMonth(), 1), new Date()] as any);
let listData = ref([] as any); let listData = ref([] as any);
let alarmTotal = ref("" as any); let alarmTotal = ref("" as any);
// let startTime = ref("" as any); // let startTime = ref("" as any);
// let endTime = ref("" as any); // let endTime = ref("" as any);
let devId = ref("" as any);
//获取报警分析数据 //获取报警分析数据
const getAlarmTypeList = async () => { const getAlarmTypeList = async () => {
const res = await getAlarmTypeApi({ const res = await getAlarmTypeApi({
// devSn: devId.value,
projectSn: store.sn, projectSn: store.sn,
queryStartTime: rangeTime.value[0], queryStartTime: rangeTime.value[0],
queryEndTime: rangeTime.value[1] queryEndTime: rangeTime.value[1]
@ -69,6 +71,19 @@ function timeChange(e: any) {
} }
onMounted(() => { onMounted(() => {
getAlarmTypeList(); getAlarmTypeList();
// mitts.on("elevaTorSelectId", e => {
// devId.value = e;
// console.log("收到设备ID", e);
// getAlarmTypeList();
// // gerUserVideo();
// // setTimeout(() => {
// // gerUserVideo();
// // }, 500);
// });
});
onBeforeUnmount(async () => {
// mitts.off("elevaTorSelectId");
}); });
</script> </script>

28
src/views/sevenLargeScreen/elevatorMonitoring/right.vue
View File

@ -54,7 +54,7 @@
<div><span class="textColor"> 今日违章次数：</span>{{ lifeList.violationNum || 0 }}次</div> <div><span class="textColor"> 今日违章次数：</span>{{ lifeList.violationNum || 0 }}次</div>
</div> </div>
</div> </div>
<div class="rightInfo" v-for="(item, index) in driverInfo" :key="index"> <div class="rightInfo">
<div class="titleStatus"> <div class="titleStatus">
司机信息 司机信息
<span <span
@ -64,33 +64,33 @@
</div> </div>
<div class="infoBox"> <div class="infoBox">
<!-- <div><span class="textColor">认证状态：</span>-</div> --> <!-- <div><span class="textColor">认证状态：</span>-</div> -->
<div><span class="textColor"> 姓名：</span>{{ item.workerName || "未知" }}</div> <div><span class="textColor"> 姓名：</span>{{ driverInfo.workerName || "未知" }}</div>
<div><span class="textColor"> 性别：</span>{{ item.sex == 1 ? "男" : item.sex == 2 ? "女" : "未知" }}</div> <div><span class="textColor"> 性别：</span>{{ driverInfo.sex == 1 ? "男" : driverInfo.sex == 2 ? "女" : "未知" }}</div>
<div><span class="textColor"> 年龄：</span>{{ item.age || "未知" }}</div> <div><span class="textColor"> 年龄：</span>{{ driverInfo.age || "未知" }}</div>
<div><span class="textColor"> 本次连续工作时长：</span>{{ item.continuousWorkingTime || "未知" }}</div> <div><span class="textColor"> 本次连续工作时长：</span>{{ driverInfo.continuousWorkingTime || "未知" }}</div>
<div> <div>
<span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"> <span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
身份证号:</span 身份证号:</span
>{{ item.idCard || "未知" }} >{{ driverInfo.idCard || "未知" }}
</div> </div>
<div> <div>
<span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"> <span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
特种资格证书编号:</span 特种资格证书编号:</span
>{{ item.specialCertificateNumber || "未知" }} >{{ driverInfo.specialCertificateNumber || "未知" }}
</div> </div>
<div> <div>
<span class="textColor"> 资格证书：</span> <a style="color: #64d6f8; cursor: pointer;" @click="driverDetail">{{ "查看详情" }}</a> <span class="textColor"> 资格证书：</span> <a style="color: #64d6f8; cursor: pointer;" @click="driverDetail">{{ "查看详情" }}</a>
</div> </div>
</div> </div>
<div class="driverPhoto"><img :src="item.imageUrl" alt="" /></div> <div class="driverPhoto"><img :src="driverInfo.imageUrl" alt="" /></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="bottom"> <div class="bottom">
<div class="bottomList"> <div class="bottomList">
<p>上限位</p> <p>防冲顶</p>
<p class="number">正常</p> <p class="number">{{ elevatorList.topAlarm == 1 ? "报警" : "正常" }}</p>
<div class="bg"></div> <div class="bg"></div>
</div> </div>
<div class="bottomList"> <div class="bottomList">
@ -120,12 +120,12 @@
</div> </div>
<div class="bottomList"> <div class="bottomList">
<p>前门锁</p> <p>前门锁</p>
<p class="number">正常</p> <p class="number">{{ elevatorList.frontDoorState == 1 ? "关" : "开" }}</p>
<div class="bg"></div> <div class="bg"></div>
</div> </div>
<div class="bottomList"> <div class="bottomList">
<p>后门锁</p> <p>后门锁</p>
<p class="number">正常</p> <p class="number">{{ elevatorList.backDoorState == 1 ? "关" : "开" }}</p>
<div class="bg"></div> <div class="bg"></div>
</div> </div>
</div> </div>
@ -192,7 +192,7 @@ let lifeList = ref({} as any);
const getSelectTower = async () => { const getSelectTower = async () => {
const res = await getQueryTodayOperatingApi({ const res = await getQueryTodayOperatingApi({
projectSn: store.sn, projectSn: store.sn,
devSn: lifeValue.value devSn: lifterDevSn.value
}); });
if (res.result) { if (res.result) {
console.log("获取运行状态", res); console.log("获取运行状态", res);
@ -207,7 +207,7 @@ const getDriverInfoList = async () => {
devSn: lifterDevSn.value devSn: lifterDevSn.value
}); });
if (res.result) { if (res.result) {
driverInfo.value = res.result.devWorker.workerList; driverInfo.value = res.result.devWorker.currentWorker;
console.log("获取司机信息", res); console.log("获取司机信息", res);
// 全部数据获取完后异步发放设备ID给摄像头，实现进入页面播放摄像头 // 全部数据获取完后异步发放设备ID给摄像头，实现进入页面播放摄像头
setTimeout(() => { setTimeout(() => {

27
src/views/sevenLargeScreen/towerCraneMonitoring/right.vue
View File

@ -88,7 +88,7 @@
<div><span class="textColor"> 今日报警：</span>{{ item.alarmNum || 0 }}次</div> <div><span class="textColor"> 今日报警：</span>{{ item.alarmNum || 0 }}次</div>
</div> </div>
</div> </div>
<div class="rightInfo" v-for="(item, index) in driverInfo" :key="index"> <div class="rightInfo">
<div class="titleStatus"> <div class="titleStatus">
司机信息 司机信息
<span <span
@ -98,25 +98,28 @@
</div> </div>
<div class="infoBox"> <div class="infoBox">
<div><span class="textColor"> 姓名：</span>{{ item.workerName || "未知" }}</div> <div><span class="textColor"> 姓名：</span>{{ driverInfo.workerName || "未知" }}</div>
<div><span class="textColor"> 性别：</span>{{ item.sex == 1 ? "男" : item.sex == 2 ? "女" : "未知" }}</div> <div>
<div><span class="textColor"> 年龄：</span>{{ item.age || "未知" }}</div> <span class="textColor"> 性别：</span>{{ driverInfo.sex == 1 ? "男" : driverInfo.sex == 2 ? "女" : "未知" }}
<div><span class="textColor"> 本次连续工作时长：</span>{{ item.continuousWorkingTime || "未知" }}</div> </div>
<div><span class="textColor"> 年龄：</span>{{ driverInfo.age || "未知" }}</div>
<div><span class="textColor"> 本次连续工作时长：</span>{{ driverInfo.continuousWorkingTime || "未知" }}</div>
<div> <div>
<span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"> <span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
身份证号:</span 身份证号:</span
>{{ item.idCard || "未知" }} >{{ driverInfo.idCard || "未知" }}
</div> </div>
<div> <div>
<span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"> <span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
特种资格证书编号:</span 特种资格证书编号:</span
>{{ item.specialCertificateNumber || "未知" }} >{{ driverInfo.specialCertificateNumber || "未知" }}
</div> </div>
<div> <div>
<span class="textColor"> 资格证书：</span> <a style="color: #64d6f8; cursor: pointer;" @click="driverDetail">{{ "查看详情" }}</a> <span class="textColor"> 资格证书：</span>
<a style="color: #64d6f8; cursor: pointer" @click="driverDetail">{{ "查看详情" }}</a>
</div> </div>
</div> </div>
<div class="driverPhoto"><img :src="item.imageUrl" alt="" /></div> <div class="driverPhoto"><img :src="driverInfo.imageUrl" alt="" /></div>
</div> </div>
</div> </div>
</div> </div>
@ -294,12 +297,12 @@ const getTowerNumAndAlarmList = async () => {
//获取运行状态 //获取运行状态
let towerList = ref([] as any); let towerList = ref([] as any);
const getSelectTower = async () => { const getSelectTower = async () => {
towerList.value.length = 0 towerList.value.length = 0;
const res = await getTowerCurrentCountApi({ const res = await getTowerCurrentCountApi({
projectSn: store.sn projectSn: store.sn
}); });
if (res.result) { if (res.result) {
console.log("运行状态",res.result); console.log("运行状态", res.result);
res.result.forEach((item: any) => { res.result.forEach((item: any) => {
if (item.devSn == towerDevSn.value) { if (item.devSn == towerDevSn.value) {
towerList.value.push(item); towerList.value.push(item);
@ -315,7 +318,7 @@ const getDriverInfoList = async () => {
devSn: towerDevSn.value devSn: towerDevSn.value
}); });
if (res.result) { if (res.result) {
driverInfo.value = res.result.devWorker.workerList.slice(0,1); driverInfo.value = res.result.devWorker.currentWorker;
} }
}; };