diff --git a/public/static/bim.html b/public/static/bim.html index f27042e..003f877 100644 --- a/public/static/bim.html +++ b/public/static/bim.html @@ -14,9 +14,12 @@
diff --git a/src/api/modules/elevator.ts b/src/api/modules/elevator.ts index 4bca0ff..7dddd40 100644 --- a/src/api/modules/elevator.ts +++ b/src/api/modules/elevator.ts @@ -43,6 +43,11 @@ export const getRelatedInfoApi = (params: {}) => { return http.get(BASEURL + `/xmgl/lifter/getRelatedInfo`, params); }; +// 通过id查询升降机基本信息信息 +export const getLifterQueryByIdApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/lifter/queryById`, params); +}; + diff --git a/src/api/modules/tower.ts b/src/api/modules/tower.ts index 7d288d1..6945fd4 100644 --- a/src/api/modules/tower.ts +++ b/src/api/modules/tower.ts @@ -34,4 +34,10 @@ export const getRelatedInfoApi = (params: {}) => { // 右下-实时数据 export const getNewestDataApi = (params: {}) => { return http.post(BASEURL + `/xmgl/towerCurrentData/getNewestTowerCurrentData`, params); +}; + + +// 查询启用的视频配置 +export const getUseProjectVideoConfigApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/projectVideoConfig/getUseProjectVideoConfig`, params); }; \ No newline at end of file diff --git a/src/views/sevenLargeScreen/bImModel/index.vue b/src/views/sevenLargeScreen/bImModel/index.vue index 6786df5..261e2b1 100644 --- a/src/views/sevenLargeScreen/bImModel/index.vue +++ b/src/views/sevenLargeScreen/bImModel/index.vue @@ -10,24 +10,20 @@ import { getSelectProjectBimfaceList, getViewTokenByFileId } from "@/api/modules import { ref, onMounted } from "vue"; const store = GlobalStore(); const url = ref(""); -const iframe = ref(null); -const token = ref(""); -// function load() { -// iframe.value.contentWindow.postMessage("Message from parent:load complate!"); -// } +const token = ref("" as any); //获取bim列表 function getBimfaceList() { getSelectProjectBimfaceList({ projectSn: store.sn }).then(res => { res.result.page.records.forEach(item => { if (item.isEnable) { token.value = res.result.viewToken; - console.log("token的值", token); - iframe.value.contentWindow.postMessage({ token }); - // getBimfaceToken(item.fileId); + console.log("token的值", token.value); + localStorage.setItem('bimToken', JSON.stringify(token.value)); } }); }); } + //获取token // function getBimfaceToken(fileId) { // getViewTokenByFileId({ projectSn: store.sn, fileId }).then(res => { diff --git a/src/views/sevenLargeScreen/distributionMonitoring/topLeft.vue b/src/views/sevenLargeScreen/distributionMonitoring/topLeft.vue index d80428a..8410189 100644 --- a/src/views/sevenLargeScreen/distributionMonitoring/topLeft.vue +++ b/src/views/sevenLargeScreen/distributionMonitoring/topLeft.vue @@ -17,6 +17,7 @@
+ + + +
@@ -424,30 +428,7 @@ const option = reactive({ } ] }); -// let deciData = reactive({ -// devicList: [ -// { -// decName: "配电箱设备1", -// status: 0 -// }, -// { -// decName: "配电箱设备2", -// status: 1 -// }, -// { -// decName: "配电箱设备3", -// status: 0 -// }, -// { -// decName: "配电箱设备4", -// status: 0 -// }, -// { -// decName: "配电箱设备5", -// status: 0 -// } -// ] -// }); + function drawChart() { let leftTopEcharts = echarts.init(document.getElementById("topLeftEcharts")); leftTopEcharts.setOption(option); @@ -562,5 +543,6 @@ onMounted(() => { } } } + } diff --git a/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue b/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue index dc9eee4..93c1810 100644 --- a/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue +++ b/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue @@ -12,13 +12,14 @@ + diff --git a/src/views/sevenLargeScreen/towerCraneMonitoring/monitor.vue b/src/views/sevenLargeScreen/towerCraneMonitoring/monitor.vue index 573dfff..814744e 100644 --- a/src/views/sevenLargeScreen/towerCraneMonitoring/monitor.vue +++ b/src/views/sevenLargeScreen/towerCraneMonitoring/monitor.vue @@ -12,13 +12,12 @@