From 495ba3d681cfd2ccc6ecf6a87eaf5cf6281855f6 Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Wed, 30 Aug 2023 17:15:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BC=96=E5=86=99PC=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E3=80=81=E6=94=BF=E5=8A=A1=E7=AB=AF=E8=B5=B7=E9=87=8D=E6=9C=BA?=
=?UTF-8?q?=E7=9B=91=E7=AE=A1=E9=9D=99=E6=80=81+=E5=AF=B9=E6=8E=A5?=
=?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/modules/goverment.ts | 28 +++
.../liftSupervision/operatingData/index.scss | 1 +
.../liftSupervision/operatingData/index.vue | 6 +-
.../liftSupervision/operatingData/index.scss | 6 +
.../liftSupervision/operatingData/index.vue | 190 +++++++++---------
.../equipManagement/index.scss | 5 -
.../liftSupervision/equipManagement/index.vue | 87 ++++----
.../historyData/alarmData/index.scss | 5 -
.../historyData/alarmData/index.vue | 41 +++-
.../historyData/realTimeData/index.scss | 5 -
.../historyData/realTimeData/index.vue | 41 +++-
.../historyData/workCycleData/index.scss | 5 -
.../historyData/workCycleData/index.vue | 41 +++-
.../liftSupervision/operatingData/index.scss | 7 +-
.../liftSupervision/operatingData/index.vue | 100 +++++----
15 files changed, 356 insertions(+), 212 deletions(-)
diff --git a/src/api/modules/goverment.ts b/src/api/modules/goverment.ts
index b2080c3..c89acbd 100644
--- a/src/api/modules/goverment.ts
+++ b/src/api/modules/goverment.ts
@@ -615,3 +615,31 @@ export const towerCraneAlarmPage = (params: any) => {
export const towerCraneDataPage = (params: any) => {
return http.post(BASEURL + `/gov/towerCraneCurrentData/page`, params);
};
+
+// 升降机监管
+// 设备管理列表
+export const lifterEquipAll = (params: any) => {
+ return http.post(BASEURL + `/gov/lifter/list`, params);
+};
+// 获取运行数据
+export const lifterOperationData = (params: any) => {
+ return http.post(BASEURL + `/gov/lifterCurrentData/getOperation`, params);
+};
+// 分页列表查询实时数据项目信息
+export const getLifterRealTimePojectPage = (params: any) => {
+ return http.post(BASEURL + `/gov/lifter/projectPage`, params);
+};
+// 分页列表查询实时数据工程信息
+export const getLifterRealTimeEngineeringPage = (params: any) => {
+ return http.post(BASEURL + `/gov/lifter/engineeringPage`, params);
+};
+
+// 报警数据分页列表
+export const lifterAlarmPage = (params: any) => {
+ return http.post(BASEURL + `/gov/lifterAlarm/page`, params);
+};
+
+// 实时数据分页列表
+export const lifterDataPage = (params: any) => {
+ return http.post(BASEURL + `/gov/lifterCurrentData/page`, params);
+};
diff --git a/src/views/enterprise/liftSupervision/operatingData/index.scss b/src/views/enterprise/liftSupervision/operatingData/index.scss
index a453c97..ab9abf5 100644
--- a/src/views/enterprise/liftSupervision/operatingData/index.scss
+++ b/src/views/enterprise/liftSupervision/operatingData/index.scss
@@ -259,6 +259,7 @@
font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
font-size: 12px;
font-weight: 400;
+ white-space: nowrap;
}
> span:nth-child(1) {
display: inline-block;
diff --git a/src/views/enterprise/liftSupervision/operatingData/index.vue b/src/views/enterprise/liftSupervision/operatingData/index.vue
index f115672..a855f28 100644
--- a/src/views/enterprise/liftSupervision/operatingData/index.vue
+++ b/src/views/enterprise/liftSupervision/operatingData/index.vue
@@ -27,7 +27,7 @@
安装日期: {{ equipInfo.installTime ? equipInfo.installTime : "" }}
终端编号: {{ equipInfo.devNumber ? equipInfo.devNumber : "" }}
更新时间: {{ equipInfo.realTime ? equipInfo.realTime : "" }}
- 安装时间: {{ equipInfo.installTime ? equipInfo.installTime : "" }}
+
@@ -192,9 +192,9 @@ const aspectList = ref([
{
name: "载重",
value: 10,
- unit: "T",
+ unit: "kg",
img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href,
- prop: "maxLoad"
+ prop: "loading"
},
{
name: "人数",
diff --git a/src/views/goverment/liftSupervision/operatingData/index.scss b/src/views/goverment/liftSupervision/operatingData/index.scss
index 8597e67..e315425 100644
--- a/src/views/goverment/liftSupervision/operatingData/index.scss
+++ b/src/views/goverment/liftSupervision/operatingData/index.scss
@@ -37,6 +37,7 @@
white-space: nowrap;
}
.leftMenu_item {
+ margin-top: 20px;
.middleSize {
font-size: 12px;
}
@@ -125,7 +126,11 @@
display: flex;
flex-direction: column;
> span {
+ width: 260px;
margin-bottom: 20px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap; //单行
}
}
.common-info {
@@ -315,6 +320,7 @@
font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
font-size: 12px;
font-weight: 400;
+ white-space: nowrap;
}
> span:nth-child(1) {
display: inline-block;
diff --git a/src/views/goverment/liftSupervision/operatingData/index.vue b/src/views/goverment/liftSupervision/operatingData/index.vue
index 8c96333..243523e 100644
--- a/src/views/goverment/liftSupervision/operatingData/index.vue
+++ b/src/views/goverment/liftSupervision/operatingData/index.vue
@@ -22,13 +22,11 @@
-
今日报警次数：{{ data.aiAlarmStat === null ? 0 : parse(data.aiAlarmStat)?.todayAlarm }}
+
今日报警次数：{{ data.alarmNum ? data.alarmNum : 0 }}
-
+
@@ -55,19 +53,20 @@
@@ -111,7 +110,7 @@
:tabs="['历史报警', '历史监测信息']"
:pageable="pages"
class="LeftMenu"
- @change-page="onCurChange"
+ @change-page="onActiveCurChange"
>
@@ -152,12 +151,12 @@
{{ item.devName }}
- 角度
- {{ item.angle ? item.angle : 0 }}°
+ 制动距离
+ {{ item.brakingDistance ? item.brakingDistance : 0 }}m
- 倾角
- {{ item.obliquity ? item.obliquity : 0 }}°
+ 倾斜角
+ {{ item.biasAngle ? item.biasAngle : 0 }}°
@@ -167,7 +166,7 @@
倾角X
- {{ item.obliquityX ? item.obliquityX : 0 }}°
+ {{ item.dipAngleX ? item.dipAngleX : 0 }}°
@@ -177,17 +176,17 @@
倾角Y
- {{ item.obliquityY ? item.obliquityY : 0 }}°
+ {{ item.dipAngleY ? item.dipAngleY : 0 }}°
- 载重
- {{ item.loading ? item.loading : 0 }}kg
+ 准载
+ {{ item.maxLoad ? item.maxLoad : 0 }}kg
- 幅度
- {{ item.ranger ? item.ranger : 0 }}m
+ 运行速度
+ {{ item.speed ? item.speed : 0 }}m
监测时间: {{ item.createTime ? item.createTime : "" }}
@@ -208,13 +207,14 @@ import LeftMenuPlus from "@/components/LeftMenuPlus/LeftMenu.vue";
import layoutTop from "@/components/layoutTop/index.vue";
import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
import {
- getRealTimepPojectPage,
- getRealTimeEngineeringPage,
- towerCraneAlarmPage,
- towerCraneDataPage,
- towerCraneEquipAll,
- operationData
+ getLifterRealTimePojectPage,
+ getLifterRealTimeEngineeringPage,
+ lifterAlarmPage,
+ lifterDataPage,
+ lifterEquipAll,
+ lifterOperationData
} from "@/api/modules/goverment";
+const equipActive = ref(0);
const monitorList = ref([]);
const alarmList = ref([]);
const equipList = ref([]);
@@ -239,19 +239,40 @@ const pages = ref({
total: 0
});
const aspectList = ref([
- {
- name: "力矩",
- value: 10,
- unit: "N·M",
- img: new URL("@/assets/images/onlineSupervision/力矩.png", import.meta.url).href,
- prop: "torque"
- },
{
name: "载重",
value: 10,
- unit: "T",
+ unit: "kg",
img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href,
- prop: "loading"
+ prop: "maxLoad"
+ },
+ {
+ name: "人数",
+ value: 10,
+ unit: "人",
+ img: new URL("@/assets/images/onlineSupervision/力矩.png", import.meta.url).href,
+ prop: "peopleNumber"
+ },
+ {
+ name: "倾角X",
+ value: 10,
+ unit: "°",
+ img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href,
+ prop: "dipAngleX"
+ },
+ {
+ name: "倾角Y",
+ value: 10,
+ unit: "°",
+ img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href,
+ prop: "dipAngleX"
+ },
+ {
+ name: "高度",
+ value: 10,
+ unit: "m",
+ img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href,
+ prop: "maxHeight"
},
{
name: "风速",
@@ -261,32 +282,11 @@ const aspectList = ref([
prop: "windSpeed"
},
{
- name: "高度",
+ name: "运行速度",
value: 10,
- unit: "m",
- img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href,
- prop: "height"
- },
- {
- name: "回转角度",
- value: 10,
- unit: "°",
- img: new URL("@/assets/images/onlineSupervision/回转角度.png", import.meta.url).href,
- prop: "angle"
- },
- {
- name: "塔身倾角",
- value: 10,
- unit: "°",
- img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href,
- prop: "obliquity"
- },
- {
- name: "幅度",
- value: 10,
- unit: "m",
- img: new URL("@/assets/images/onlineSupervision/幅度.png", import.meta.url).href,
- prop: "ranger"
+ unit: "m/s",
+ img: new URL("@/assets/images/onlineSupervision/风速.png", import.meta.url).href,
+ prop: "speed"
}
]);
const searchSn = ref("");
@@ -296,17 +296,17 @@ const proTable = ref();
// 报警项目转换
const alarmTransform = (obj: any) => {
let str = "";
- if (obj["environmentAlarm"] == 1) str += "环境防碰撞报警,";
- if (obj["forceAlarm"] == 1) str += "力矩报警,";
- if (obj["heightLowerAlarm"] == 1) str += "高度下限位报警,";
- if (obj["heightUpperAlarm"] == 1) str += "高度上限位报警,";
- if (obj["maxRangeAlarm"] == 1) str += "幅度外限位报警,";
- if (obj["minRangeAlarm"] == 1) str += "幅度内限位报警,";
- if (obj["multiAntiCollisionAlarm"] == 1) str += "多机防撞报警,";
- if (obj["negAngleAlarm"] == 1) str += "逆时针回转限位报警,";
- if (obj["obliquityAlarm"] == 1) str += "倾角报警,";
- if (obj["posAngleAlarm"] == 1) str += "顺时针回转限位报警,";
- if (obj["standardHighAlarm"] == 1) str += "塔机间竖向高度报警,";
+ if (obj["fallAlarm"] == 1) str += "防坠机报警,";
+ if (obj["heightAlarm"] == 1) str += "高度报警,";
+ if (obj["motor1Alarm"] == 1) str += "1号电机报警,";
+ if (obj["motor2Alarm"] == 1) str += "2号电机报警,";
+ if (obj["motor3Alarm"] == 1) str += "3号电机报警,";
+ if (obj["obliquityXAlarm"] == 1) str += "倾角X报警,";
+ if (obj["obliquityYAlarm"] == 1) str += "倾角Y报警,";
+ if (obj["peopleCntAlarm"] == 1) str += "人数报警,";
+ if (obj["speedAlarm"] == 1) str += "速度报警,";
+ if (obj["topAlarm"] == 1) str += "防冲顶报警,";
+ if (obj["weightAlarm"] == 1) str += "载重报警,";
if (obj["windSpeedAlarm"] == 1) str += "风速报警";
return str;
};
@@ -318,8 +318,8 @@ const getEquipList = async () => {
} else {
requestData.engineeringSn = searchSn.value;
}
- const res = await towerCraneEquipAll(requestData);
- console.log(res);
+ const res = await lifterEquipAll(requestData);
+ console.log(res, "设备列表");
if (res && res.result && res.result.length > 0) {
equipList.value = res.result;
getEquipInfo(res.result[0]);
@@ -330,10 +330,11 @@ const getEquipList = async () => {
};
// 获取设备信息
const getEquipInfo = async (obj: any) => {
+ equipActive.value = equipList.value.findIndex(item => item.id == obj.id);
let requestData = {
id: obj.id
};
- const res = await operationData(requestData);
+ const res = await lifterOperationData(requestData);
console.log(res);
if (res && res.result) {
equipInfo.value = { ...obj, ...res.result };
@@ -356,7 +357,7 @@ const getMonitorList = async () => {
requestData.createTime_begin = searchForm.value.timeRange[0];
requestData.createTime_end = searchForm.value.timeRange[1];
}
- const res = await towerCraneDataPage(requestData);
+ const res = await lifterDataPage(requestData);
console.log(res);
if (res && res.result && res.result.records.length > 0) {
monitorList.value = res.result.records;
@@ -381,7 +382,7 @@ const getAlarmList = async () => {
requestData.createTime_begin = searchForm.value.timeRange[0];
requestData.createTime_end = searchForm.value.timeRange[1];
}
- const res = await towerCraneAlarmPage(requestData);
+ const res = await lifterAlarmPage(requestData);
console.log(res);
if (res && res.result && res.result.records.length > 0) {
alarmList.value = res.result.records;
@@ -397,7 +398,7 @@ function parse(val) {
// 页面的项目名称和工程名称的div点击事件
const onSearch = async (params: any) => {
console.log(params);
- active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn);
+ alarmActive.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn);
getEquipList();
if (active.value === 0) {
getAlarmList();
@@ -408,7 +409,7 @@ const onSearch = async (params: any) => {
// leftMenu页面的搜索按钮
const onSearchInput = async (params: string) => {
leftMenuSearchForm.value.name = params;
- if (active.value === 0) {
+ if (alarmActive.value === 0) {
getProPage();
} else {
getEngPage();
@@ -416,13 +417,22 @@ const onSearchInput = async (params: string) => {
};
// leftMenu页面的分页
const onCurChange = async (params: number) => {
- alarmPages.value.pageSize = params;
- if (active.value === 0) {
+ alarmPages.value.pageNo = params;
+ if (alarmActive.value === 0) {
getProPage();
} else {
getEngPage();
}
};
+// 右侧报警数据分页
+const onActiveCurChange = async (params: number) => {
+ pages.value.pageNo = params;
+ if (active.value === 0) {
+ getAlarmList();
+ } else {
+ getMonitorList();
+ }
+};
// 右侧报警数据搜索
const search = () => {
console.log(666);
@@ -439,7 +449,7 @@ const getProPage = async () => {
...pages.value,
projectName: leftMenuSearchForm.value.name
};
- const { result } = await getRealTimepPojectPage(requestData);
+ const { result } = await getLifterRealTimePojectPage(requestData);
records.value = result.records;
pages.value.total = Number(result.total);
};
@@ -449,9 +459,9 @@ const getEngPage = async () => {
...pages.value,
engineeringName: leftMenuSearchForm.value.name
};
- const { result } = await getRealTimeEngineeringPage(requestData);
+ const { result } = await getLifterRealTimeEngineeringPage(requestData);
records.value = result.records;
- pages.value.total = +result.total;
+ pages.value.total = Number(result.total);
};
watch(
() => active.value,
diff --git a/src/views/project/liftSupervision/equipManagement/index.scss b/src/views/project/liftSupervision/equipManagement/index.scss
index ebdacf0..5030cce 100644
--- a/src/views/project/liftSupervision/equipManagement/index.scss
+++ b/src/views/project/liftSupervision/equipManagement/index.scss
@@ -33,8 +33,3 @@
}
}
}
-:deep() {
- .tabs-option {
- display: none;
- }
-}
diff --git a/src/views/project/liftSupervision/equipManagement/index.vue b/src/views/project/liftSupervision/equipManagement/index.vue
index 59a6bc8..4067589 100644
--- a/src/views/project/liftSupervision/equipManagement/index.vue
+++ b/src/views/project/liftSupervision/equipManagement/index.vue
@@ -171,7 +171,6 @@
-
