merge dev-jack into shenzhen-dev

This commit is contained in:
Jack 2022-08-17 15:17:47 +08:00
commit 0617936964
3 changed files with 66 additions and 18 deletions

View File

@ -8,24 +8,37 @@
<div id="domId" style="width: 100%; height: 95vh"></div>
<script src="https://static.bimface.com/api/BimfaceSDKLoader/BimfaceSDKLoader@latest-release.js" charset="utf-8"></script>
<script>
let viewer3D
let app
let viewToken = '11b0d307c09f43bfa5fa3922bcce0342'
let loaderConfig = new BimfaceSDKLoaderConfig()
loaderConfig.viewToken = viewToken
BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback)
function successCallback(viewMetaData) {
let domShow = document.getElementById('domId')
let webAppConfig = new Glodon.Bimface.Application.WebApplication3DConfig()
webAppConfig.domElement = domShow
app = new Glodon.Bimface.Application.WebApplication3D(webAppConfig)
app.addView(viewToken)
viewer3D = app.getViewer()
const bimCallback = viewToken => {
let viewer3D
let app
// let viewToken = '11b0d307c09f43bfa5fa3922bcce0342'
let loaderConfig = new BimfaceSDKLoaderConfig()
loaderConfig.viewToken = viewToken
BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback)
function successCallback(viewMetaData) {
let domShow = document.getElementById('domId')
let webAppConfig = new Glodon.Bimface.Application.WebApplication3DConfig()
webAppConfig.domElement = domShow
app = new Glodon.Bimface.Application.WebApplication3D(webAppConfig)
app.addView(viewToken)
viewer3D = app.getViewer()
}
function failureCallback(error) {
console.log(error)
}
}
function failureCallback(error) {
console.log(error)
}
window.addEventListener('message', function(e) {
const data = e.data || {}
if (data.token) {
bimCallback(data.token)
}
// console.log(e.data, '父级页面传来的数据')
// setTimeout(() => {
// window.parent.postMessage({ msg: 'hello' })
// }, 2000)
})
</script>
</body>
</html>

View File

@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') {
// tag: 本地
// axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地
axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL = 'http://192.168.34.246:6023/' // 邱平毅本地
// axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
// axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
// axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇

View File

@ -10,7 +10,7 @@
</div>
</div>
<div class="centerBox">
<iframe src="/bim.html" frameborder="0" width="100%" height="100%"></iframe>
<iframe src="/bim.html" frameborder="0" width="100%" height="100%" id="iframe" @load="load"></iframe>
</div>
<div class="rightBox">
<div class="rightTop">
@ -29,12 +29,47 @@ import leftCenter from './leftCenter'
import rightTop from './rightTop'
import rightCenter from './rightCenter'
import { projectJlwBimListApi, getJlwTokenApi } from '@/assets/js/api/project'
export default {
components: {
leftTop,
leftCenter,
rightTop,
rightCenter
},
mounted() {
this.iframe = document.getElementById('iframe')
window.addEventListener('message', this.getIframeMessage)
this.getModelList()
},
data() {
return {
iframe: null
}
},
methods: {
load() {
this.iframe.contentWindow.postMessage('Message from parentload complate')
},
getIframeMessage(e) {
// console.log('Message from iframe', e.data)
},
getModelList() {
projectJlwBimListApi({ projectSn: this.$store.state.projectSn }).then(res => {
this.buildList = res.result.page.records
res.result.page.records.forEach(item => {
if (item.isEnable) {
this.getToken(item.fileId)
}
})
})
},
getToken(fileId) {
getJlwTokenApi({ fileId, projectSn: this.$store.state.projectSn }).then(res => {
const token = res.result
this.iframe.contentWindow.postMessage({ token })
})
}
}
}
</script>