admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bug修改

Browse Source
This commit is contained in:
cjp 2023-09-06 18:13:06 +08:00
parent d50611763b
commit 13aff82f6b
10 changed files with 190 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/enterprise/liftSupervision/historyData/alarmData/index.vue
View File

@ -14,15 +14,25 @@
:onReset="true" :onReset="true"
> >
<template #equipInfo="{ row }"> <template #equipInfo="{ row }">
<span>设备名称: {{ row.devName }}</span> <div class="table-data">
<span>设备名称:{{ row.devName }}</span>
</div>
<br /> <br />
<span>设备编号: {{ row.devNumber }}</span> <div class="table-data">
<span>设备编号: {{ row.devNumber }}</span>
</div>
<br /> <br />
<span>司机姓名: {{ row.driverName }}</span> <div class="table-data">
<span>司机姓名: {{ row.driverName }}</span>
</div>
<br /> <br />
<span>司机身份证号: {{ row.driverIdCard }}</span> <div class="table-data">
<span>司机身份证号: {{ row.driverIdCard }}</span>
</div>
<br /> <br />
<span>特种作业号: {{ row.certification }}</span> <div class="table-data">
<span>特种作业号: {{ row.certification }}</span>
</div>
</template> </template>
<template #alarmInfo="{ row }"> <template #alarmInfo="{ row }">
<div class="table-data"> <div class="table-data">

66
src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue
View File

@ -14,39 +14,69 @@
:onReset="true" :onReset="true"
> >
<template #equipInfo="{ row }"> <template #equipInfo="{ row }">
<span>设备名称: {{ row.devName }}</span> <div class="table-data">
<span>设备名称: {{ row.devName }}</span>
</div>
<br /> <br />
<span>设备编号: {{ row.devNumber }}</span> <div class="table-data">
<span>设备编号: {{ row.devNumber }}</span>
</div>
<br /> <br />
<span>司机姓名: {{ row.driverName }}</span> <div class="table-data">
<span>司机姓名: {{ row.driverName }}</span>
</div>
<br /> <br />
<span>司机身份证号: {{ row.driverIdCard }}</span> <div class="table-data">
<span>司机身份证号: {{ row.driverIdCard }}</span>
</div>
<br /> <br />
<span>开始运行高度: {{ row.height ? row.height : 0 }}m</span> <div class="table-data">
<span>高度比: {{ row.heightRatio ? row.heightRatio : 0 }}m</span>
</div>
<br /> <br />
<span>停止运行高度: {{ row.stopHeight ? row.stopHeight : 0 }}m</span> <div class="table-data">
<span>载重: {{ row.loading ? row.loading : 0 }}kg</span>
</div>
<br /> <br />
<span>高度比: {{ row.heightRatio ? row.heightRatio : 0 }}m</span> <div class="table-data">
<span>最大载重比: {{ row.loadRatio ? row.loadRatio : 0 }}%</span>
</div>
<br /> <br />
<span>载重: {{ row.loading ? row.loading : 0 }}kg</span> <div class="table-data">
<span>倾斜度: {{ row.biasAngle ? row.biasAngle : 0 }}°</span>
</div>
<br /> <br />
<span>最大载重比: {{ row.loadRatio ? row.loadRatio : 0 }}%</span> <div class="table-data">
<span>倾角X: {{ row.dipAngleX ? row.dipAngleX : 0 }}°</span>
</div>
<br /> <br />
<span>倾斜度: {{ row.biasAngle ? row.angle : 0 }}°</span> <div class="table-data">
<span>倾角Y: {{ row.dipAngleY ? row.dipAngleY : 0 }}°</span>
</div>
<br /> <br />
<span>倾角X: {{ row.dipAngleX ? row.dipAngleX : 0 }}°</span> <div class="table-data">
<span>楼层数: {{ row.floorNum ? row.floorNum : 0 }}</span>
</div>
<br /> <br />
<span>倾角Y: {{ row.dipAngleY ? row.dipAngleY : 0 }}°</span> <div class="table-data">
<span>人数: {{ row.peopleNumber ? row.peopleNumber : 0 }}</span>
</div>
<br /> <br />
<span>楼层数: {{ row.floorNum ? row.floorNum : 0 }}</span> <div class="table-data">
<span>风速: {{ row.windSpeed ? row.windSpeed : 0 }}m/s</span>
</div>
<br /> <br />
<span>人数: {{ row.peopleNumber ? row.peopleNumber : 0 }}</span> <div class="table-data">
<span>前门状态: {{ row.frontDoorState == 1 ? "关" : row.frontDoorState == 2 ? "开" : "" }}</span>
</div>
<br /> <br />
<span>风速: {{ row.windSpeed ? row.windSpeed : 0 }}m/s</span> <div class="table-data">
<span>运行状态: {{ row.runningState == 1 ? "上升" : row.runningState == 2 ? "下降" : "" }}</span>
</div>
<br /> <br />
<span>前门状态: {{ row.frontDoorState == 1 ? "关" : row.frontDoorState == 2 ? "开" : "" }}</span> <div class="table-data">
<br /> <span>数据接受时间: {{ row.createTime ? row.createTime : "" }}</span>
<span>运行状态: {{ row.runningState == 1 ? "上升" : row.runningState == 2 ? "下降" : "" }}</span> </div>
<br /> <br />
</template> </template>
<template #alarmInfo="{ row }"> <template #alarmInfo="{ row }">

8
src/views/enterprise/liftSupervision/operatingData/index.vue
View File

@ -17,8 +17,8 @@
<span>最大载重: {{ equipInfo.maxLoad ? equipInfo.maxLoad : 0 }}kg</span> <span>最大载重: {{ equipInfo.maxLoad ? equipInfo.maxLoad : 0 }}kg</span>
<span>额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人</span> <span>额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人</span>
<span>当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}</span> <span>当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}</span>
<span>最大高度: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}m</span> <span>最大高度: {{ equipInfo.height ? equipInfo.height : 0 }}m</span>
<span>高度百分比: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}%</span> <span>高度百分比: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}%</span>
<!-- <span>额定上行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> <!-- <span>额定上行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span>
<span>额定下行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> --> <span>额定下行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> -->
</div> </div>
@ -113,7 +113,7 @@
<div class="info-list-item-aspect"> <div class="info-list-item-aspect">
<div class="info-list-item-aspect-item"> <div class="info-list-item-aspect-item">
<span>制动距离</span> <span>制动距离</span>
<span>{{ item.brakingDistance ? item.brakingDistance : 0 }}°</span> <span>{{ item.brakingDistance ? item.brakingDistance : 0 }}m</span>
</div> </div>
<div class="info-list-item-aspect-item"> <div class="info-list-item-aspect-item">
<span>倾斜角</span> <span>倾斜角</span>
@ -222,7 +222,7 @@ const aspectList = ref([
value: 10, value: 10,
unit: "m", unit: "m",
img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href, img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href,
prop: "maxHeight" prop: "height"
}, },
{ {
name: "风速", name: "风速",

16
src/views/goverment/liftSupervision/operatingData/index.vue
View File

@ -56,8 +56,8 @@
<span>最大载重: {{ equipInfo.maxLoad ? equipInfo.maxLoad : 0 }}kg</span> <span>最大载重: {{ equipInfo.maxLoad ? equipInfo.maxLoad : 0 }}kg</span>
<span>额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人</span> <span>额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人</span>
<span>当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}</span> <span>当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}</span>
<span>最大高度: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}m</span> <span>最大高度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span>
<span>高度百分比: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}%</span> <span>高度百分比: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}%</span>
<!-- <span>额定上行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> <!-- <span>额定上行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span>
<span>额定下行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> --> <span>额定下行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> -->
</div> </div>
@ -145,6 +145,10 @@
<span>{{ item.createTime }}</span> <span>{{ item.createTime }}</span>
</div> </div>
</div> </div>
<div class="no-data" v-if="alarmList.length == 0">
<img src="@/assets/images/notData.png" alt="notData" />
<div>暂无数据</div>
</div>
</div> </div>
<div class="info-list" v-if="active == 1"> <div class="info-list" v-if="active == 1">
<div class="info-list-item" v-for="(item, index) in monitorList" :key="index"> <div class="info-list-item" v-for="(item, index) in monitorList" :key="index">
@ -191,6 +195,10 @@
</div> </div>
<div>监测时间: {{ item.createTime ? item.createTime : "" }}</div> <div>监测时间: {{ item.createTime ? item.createTime : "" }}</div>
</div> </div>
<div class="no-data" v-if="monitorList.length == 0">
<img src="@/assets/images/notData.png" alt="notData" />
<div>暂无数据</div>
</div>
</div> </div>
</template> </template>
</LeftMenuPlus> </LeftMenuPlus>
@ -244,7 +252,7 @@ const aspectList = ref([
value: 10, value: 10,
unit: "kg", unit: "kg",
img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href, img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href,
prop: "maxLoad" prop: "loading"
}, },
{ {
name: "人数", name: "人数",
@ -272,7 +280,7 @@ const aspectList = ref([
value: 10, value: 10,
unit: "m", unit: "m",
img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href, img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href,
prop: "maxHeight" prop: "height"
}, },
{ {
name: "风速", name: "风速",

21
src/views/project/liftSupervision/equipManagement/index.vue
View File

@ -253,6 +253,26 @@ const formData = ref({
useRegistrationTime: "", useRegistrationTime: "",
verifyCode: "" verifyCode: ""
}); });
const emptyFormData = ref({
id: "",
devName: "",
devNumber: "",
elevatorType: "",
installTime: "",
installImage: "",
registrationCertificate: "",
model: "",
gearModule: "",
maxHeight: "",
maxLoad: "",
ratedPeopleNum: "",
filingNumber: "",
totalFloor: "",
useRegistrationNumber: "",
useRegistrationTime: "",
verifyCode: ""
});
// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数） // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
const proTable = ref(); const proTable = ref();
@ -508,6 +528,7 @@ const getTableList = (params: any) => {
}; };
// 新增 // 新增
const handleAddItem = () => { const handleAddItem = () => {
formData.value = emptyFormData.value;
formRef.value?.resetFields(); formRef.value?.resetFields();
title.value = "新增设备"; title.value = "新增设备";
newUnitDialog.value = true; newUnitDialog.value = true;

20
src/views/project/liftSupervision/historyData/alarmData/index.vue
View File

@ -14,15 +14,25 @@
:onReset="true" :onReset="true"
> >
<template #equipInfo="{ row }"> <template #equipInfo="{ row }">
<span>设备名称: {{ row.devName }}</span> <div class="table-data">
<span>设备名称:{{ row.devName }}</span>
</div>
<br /> <br />
<span>设备编号: {{ row.devNumber }}</span> <div class="table-data">
<span>设备编号: {{ row.devNumber }}</span>
</div>
<br /> <br />
<span>司机姓名: {{ row.driverName }}</span> <div class="table-data">
<span>司机姓名: {{ row.driverName }}</span>
</div>
<br /> <br />
<span>司机身份证号: {{ row.driverIdCard }}</span> <div class="table-data">
<span>司机身份证号: {{ row.driverIdCard }}</span>
</div>
<br /> <br />
<span>特种作业号: {{ row.certification }}</span> <div class="table-data">
<span>特种作业号: {{ row.certification }}</span>
</div>
</template> </template>
<template #alarmInfo="{ row }"> <template #alarmInfo="{ row }">
<div class="table-data"> <div class="table-data">

68
src/views/project/liftSupervision/historyData/realTimeData/index.vue
View File

@ -14,41 +14,69 @@
:onReset="true" :onReset="true"
> >
<template #equipInfo="{ row }"> <template #equipInfo="{ row }">
<span>设备名称: {{ row.devName }}</span> <div class="table-data">
<span>设备名称: {{ row.devName }}</span>
</div>
<br /> <br />
<span>设备编号: {{ row.devNumber }}</span> <div class="table-data">
<span>设备编号: {{ row.devNumber }}</span>
</div>
<br /> <br />
<span>司机姓名: {{ row.driverName }}</span> <div class="table-data">
<span>司机姓名: {{ row.driverName }}</span>
</div>
<br /> <br />
<span>司机身份证号: {{ row.driverIdCard }}</span> <div class="table-data">
<span>司机身份证号: {{ row.driverIdCard }}</span>
</div>
<br /> <br />
<span>开始运行高度: {{ row.height ? row.height : 0 }}m</span> <div class="table-data">
<span>高度比: {{ row.heightRatio ? row.heightRatio : 0 }}m</span>
</div>
<br /> <br />
<span>停止运行高度: {{ row.stopHeight ? row.stopHeight : 0 }}m</span> <div class="table-data">
<span>载重: {{ row.loading ? row.loading : 0 }}kg</span>
</div>
<br /> <br />
<span>高度比: {{ row.heightRatio ? row.heightRatio : 0 }}m</span> <div class="table-data">
<span>最大载重比: {{ row.loadRatio ? row.loadRatio : 0 }}%</span>
</div>
<br /> <br />
<span>载重: {{ row.loading ? row.loading : 0 }}kg</span> <div class="table-data">
<span>倾斜度: {{ row.biasAngle ? row.biasAngle : 0 }}°</span>
</div>
<br /> <br />
<span>最大载重比: {{ row.loadRatio ? row.loadRatio : 0 }}%</span> <div class="table-data">
<span>倾角X: {{ row.dipAngleX ? row.dipAngleX : 0 }}°</span>
</div>
<br /> <br />
<span>倾斜度: {{ row.biasAngle ? row.angle : 0 }}°</span> <div class="table-data">
<span>倾角Y: {{ row.dipAngleY ? row.dipAngleY : 0 }}°</span>
</div>
<br /> <br />
<span>倾角X: {{ row.dipAngleX ? row.dipAngleX : 0 }}°</span> <div class="table-data">
<span>楼层数: {{ row.floorNum ? row.floorNum : 0 }}</span>
</div>
<br /> <br />
<span>倾角Y: {{ row.dipAngleY ? row.dipAngleY : 0 }}°</span> <div class="table-data">
<span>人数: {{ row.peopleNumber ? row.peopleNumber : 0 }}</span>
</div>
<br /> <br />
<span>楼层数: {{ row.floorNum ? row.floorNum : 0 }}</span> <div class="table-data">
<span>风速: {{ row.windSpeed ? row.windSpeed : 0 }}m/s</span>
</div>
<br /> <br />
<span>人数: {{ row.peopleNumber ? row.peopleNumber : 0 }}</span> <div class="table-data">
<span>前门状态: {{ row.frontDoorState == 1 ? "关" : row.frontDoorState == 2 ? "开" : "" }}</span>
</div>
<br /> <br />
<span>风速: {{ row.windSpeed ? row.windSpeed : 0 }}m/s</span> <div class="table-data">
<span>运行状态: {{ row.runningState == 1 ? "上升" : row.runningState == 2 ? "下降" : "" }}</span>
</div>
<br /> <br />
<span>前门状态: {{ row.frontDoorState == 1 ? "关" : row.frontDoorState == 2 ? "开" : "" }}</span> <div class="table-data">
<br /> <span>数据接受时间: {{ row.createTime ? row.createTime : "" }}</span>
<span>运行状态: {{ row.runningState == 1 ? "上升" : row.runningState == 2 ? "下降" : "" }}</span> </div>
<br />
<span>数据接受时间: {{ row.createTime ? row.createTime : "" }}</span>
<br /> <br />
</template> </template>
<template #alarmInfo="{ row }"> <template #alarmInfo="{ row }">

17
src/views/project/liftSupervision/historyData/workCycleData/index.vue
View File

@ -14,13 +14,22 @@
:onReset="true" :onReset="true"
> >
<template #equipDriverInfo="{ row }"> <template #equipDriverInfo="{ row }">
<span>设备名称: {{ row.devName }}</span> <div class="table-data">
<span>设备名称: {{ row.devName }}</span>
</div>
<br /> <br />
<span>设备编号: {{ row.devNumber }}</span> <div class="table-data">
<span>设备编号: {{ row.devNumber }}</span>
</div>
<br /> <br />
<span>司机姓名: {{ row.driverName }}</span> <div class="table-data">
<span>司机姓名: {{ row.driverName }}</span>
</div>
<br />
<div class="table-data">
<span>司机身份证号: {{ row.driverIdCard }}</span>
</div>
<br /> <br />
<span>司机身份证号: {{ row.driverIdCard }}</span>
</template> </template>
<template #workCycleInfo="{ row }"> <template #workCycleInfo="{ row }">
<div class="table-data"> <div class="table-data">

1
src/views/project/liftSupervision/operatingData/index.scss
View File

@ -259,6 +259,7 @@
font-family: "Source Han Sans CN-Regular", "Source Han Sans CN"; font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
white-space: nowrap;
} }
> span:nth-child(1) { > span:nth-child(1) {
display: inline-block; display: inline-block;

26
src/views/project/liftSupervision/operatingData/index.vue
View File

@ -17,8 +17,8 @@
<span>最大载重: {{ equipInfo.maxLoad ? equipInfo.maxLoad : 0 }}kg</span> <span>最大载重: {{ equipInfo.maxLoad ? equipInfo.maxLoad : 0 }}kg</span>
<span>额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人</span> <span>额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人</span>
<span>当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}</span> <span>当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}</span>
<span>最大高度: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}m</span> <span>最大高度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span>
<span>高度百分比: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}%</span> <span>高度百分比: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}%</span>
<!-- <span>额定上行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> <!-- <span>额定上行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span>
<span>额定下行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> --> <span>额定下行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> -->
</div> </div>
@ -112,12 +112,12 @@
<div>{{ item.devName }}</div> <div>{{ item.devName }}</div>
<div class="info-list-item-aspect"> <div class="info-list-item-aspect">
<div class="info-list-item-aspect-item"> <div class="info-list-item-aspect-item">
<span>角度</span> <span>制动距离</span>
<span>{{ item.angle ? item.angle : 0 }}°</span> <span>{{ item.brakingDistance ? item.brakingDistance : 0 }}m</span>
</div> </div>
<div class="info-list-item-aspect-item"> <div class="info-list-item-aspect-item">
<span>倾角</span> <span>倾斜角</span>
<span>{{ item.obliquity ? item.obliquity : 0 }}°</span> <span>{{ item.biasAngle ? item.biasAngle : 0 }}°</span>
</div> </div>
</div> </div>
<div class="info-list-item-aspect"> <div class="info-list-item-aspect">
@ -127,7 +127,7 @@
</div> </div>
<div class="info-list-item-aspect-item"> <div class="info-list-item-aspect-item">
<span>倾角X</span> <span>倾角X</span>
<span>{{ item.obliquityX ? item.obliquityX : 0 }}°</span> <span>{{ item.dipAngleX ? item.dipAngleX : 0 }}°</span>
</div> </div>
</div> </div>
<div class="info-list-item-aspect"> <div class="info-list-item-aspect">
@ -137,17 +137,17 @@
</div> </div>
<div class="info-list-item-aspect-item"> <div class="info-list-item-aspect-item">
<span>倾角Y</span> <span>倾角Y</span>
<span>{{ item.obliquityY ? item.obliquityY : 0 }}°</span> <span>{{ item.dipAngleY ? item.dipAngleY : 0 }}°</span>
</div> </div>
</div> </div>
<div class="info-list-item-aspect"> <div class="info-list-item-aspect">
<div class="info-list-item-aspect-item"> <div class="info-list-item-aspect-item">
<span>载重</span> <span>准载</span>
<span>{{ item.loading ? item.loading : 0 }}kg</span> <span>{{ item.maxLoad ? item.maxLoad : 0 }}kg</span>
</div> </div>
<div class="info-list-item-aspect-item"> <div class="info-list-item-aspect-item">
<span>幅度</span> <span>运行速度</span>
<span>{{ item.ranger ? item.ranger : 0 }}m</span> <span>{{ item.speed ? item.speed : 0 }}m</span>
</div> </div>
</div> </div>
<div>监测时间: {{ item.createTime ? item.createTime : "" }}</div> <div>监测时间: {{ item.createTime ? item.createTime : "" }}</div>
@ -224,7 +224,7 @@ const aspectList = ref([
value: 10, value: 10,
unit: "m", unit: "m",
img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href, img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href,
prop: "maxHeight" prop: "height"
}, },
{ {
name: "风速", name: "风速",