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

Merge branch 'kun_dev' of http://139.9.66.234:18023/dhp/wisdomisitezwfront into kun_dev

Browse Source
This commit is contained in:
kun 2023-09-09 18:11:52 +08:00
commit 33ce7a23ed
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,7 +216,7 @@ const aspectList = ref([
value: 10, value: 10,
unit: "°", unit: "°",
img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href, img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href,
prop: "dipAngleX" prop: "dipAngleY"
}, },
{ {
name: "高度", name: "高度",

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

@ -273,7 +273,7 @@ const aspectList = ref([
value: 10, value: 10,
unit: "°", unit: "°",
img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href, img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href,
prop: "dipAngleX" prop: "dipAngleY"
}, },
{ {
name: "高度", name: "高度",

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

@ -217,7 +217,7 @@ const aspectList = ref([
value: 10, value: 10,
unit: "°", unit: "°",
img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href, img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href,
prop: "dipAngleX" prop: "dipAngleY"
}, },
{ {
name: "高度", name: "高度",
@ -293,7 +293,8 @@ const getMonitorList = async () => {
const getAlarmList = async () => { const getAlarmList = async () => {
let requestData = { let requestData = {
pageNo: pages.value.pageNo, pageNo: pages.value.pageNo,
pageSize: pages.value.pageSize pageSize: pages.value.pageSize,
devId: equipInfo.value.id
} as any; } as any;
if (activeValue.value == "eng") { if (activeValue.value == "eng") {
requestData.engineeringSn = searchSn.value; requestData.engineeringSn = searchSn.value;
@ -331,7 +332,6 @@ const getEquipList = async () => {
equipList.value = []; equipList.value = [];
} }
}; };
// 获取设备信息 // 获取设备信息
const getEquipInfo = async (obj: any) => { const getEquipInfo = async (obj: any) => {
equipActive.value = equipList.value.findIndex(item => item.id == obj.id); equipActive.value = equipList.value.findIndex(item => item.id == obj.id);
@ -407,6 +407,11 @@ const getengineering = async () => {
searchSn.value = res.result[0].engineeringSn; searchSn.value = res.result[0].engineeringSn;
} }
getEquipList(); getEquipList();
if (active.value === 0) {
getAlarmList();
} else {
getMonitorList();
}
console.log(res); console.log(res);
}; };
// 点击抽屉的工程名称更新页面 // 点击抽屉的工程名称更新页面