admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 中建四局BIM动态获取；梁场后台BUG修复

Browse Source
This commit is contained in:
cjp 2023-12-14 09:13:45 +08:00
parent 83d2673a13
commit 6e33d046fa
5 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/projectAdmin/fourEngin/command/center.vue
View File

@ -3,7 +3,7 @@
<div class="image">
<iframe
v-if="COMPANY=='zjsj'"
src="http://14.116.253.165:8085/mainModel?type=0&projectId=1"
:src="projectData.bimCommandCenterUrl"
frameborder="0"
width="100%"
height="100%"

2
src/views/projectAdmin/fourEngin/progress/index.vue
View File

@ -28,7 +28,7 @@
<div class="left2">
<iframe
v-if="COMPANY=='zjsj'"
src="http://14.116.253.165:8085/mainModel?type=0&projectId=1"
:src="projectData.bimCommandCenterUrl"
frameborder="0"
width="100%"
height="100%"

25
src/views/projectFront/smartBeamField/beam-detail.vue
View File

@ -68,7 +68,6 @@
<el-button type="primary" size="medium" @click="showSetupBridge">架设桥梁</el-button>
</el-form-item>
</el-form>
</div>
<div class="table_wrap whiteBlock">
<el-table class="tables" :data="List" style="min-height: 330px">
@ -224,7 +223,7 @@
</el-table>
</div>
<div class="dialog-footer">
<el-button class="cancleBtn" @click="makeProgressDialog = false" icon="el-icon-circle-close" size="medium"
<el-button class="cancleBtn" @click="bindProductLineShow = false" icon="el-icon-circle-close" size="medium"
>{{ $t('message.deviceManage.cancel') }}
</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="bindBeamProduct" size="medium"
@ -263,7 +262,7 @@
</el-table-column>
</el-table>
<div class="dialog-footer">
<el-button class="cancleBtn" @click="makeProgressDialog = false" icon="el-icon-circle-close" size="medium"
<el-button class="cancleBtn" @click="bindPedestalShow = false" icon="el-icon-circle-close" size="medium"
>{{ $t('message.deviceManage.cancel') }}
</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="bindBeamPedestal" size="medium"
@ -333,7 +332,7 @@
<el-input v-model="setUpBridgeForm.erectionBeamPerson" placeholder="请输入"></el-input>
</el-form-item>
<div class="dialog-footer">
<el-button class="cancleBtn" @click="makeProgressDialog = false" icon="el-icon-circle-close" size="medium"
<el-button class="cancleBtn" @click="setupBridgeShow = false" icon="el-icon-circle-close" size="medium"
>{{ $t('message.deviceManage.cancel') }}
</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="setupBridge" size="medium"
@ -576,6 +575,15 @@ export default {
}
},
methods: {
// 操作后刷新
refreshAllData() {
this.getList() // 获取制梁进度列表
this.getBeamDetail() // 获取梁体信息详情
this.getProductList() // 获取选择生产线列表
this.getPedestalList() // 获取选择存梁台座列表
this.getCountDuration() //获取制梁进度统计
},
// 获取梁详情
getBeamDetail() {
smartBeamFieldBeamDetail({
@ -621,8 +629,7 @@ export default {
if (res.success) {
// console.log('成功绑定生产线', res)
this.closeProductLine()
this.getProductList()
this.getList()
this.refreshAllData()
this.$message.success('绑定成功')
}
})
@ -670,8 +677,9 @@ export default {
if (res.success) {
// console.log('成功绑定存梁台座', res)
this.closePedestal()
this.getPedestalList()
this.getBeamDetail()
// this.getPedestalList()
// this.getBeamDetail()
this.refreshAllData()
this.$message.success('绑定成功')
}
})
@ -763,6 +771,7 @@ export default {
smartBeamToProcessEdit(params).then(result => {
if (result.success) {
this.$message.success(result.message)
this.getBeamDetail()
this.getList()
}
})

2
src/views/projectFront/smartBeamField/beamManage.vue
View File

@ -60,7 +60,7 @@
<el-form-item>
<el-button type="primary" plain @click="getList">{{ $t('message.energyManage.waybill.query') }}</el-button>
<el-button type="warning" plain @click="refresh">{{ $t('message.deviceManage.refresh') }}</el-button>
<el-button type="primary" size="medium" @click="add">新增</el-button>
<!-- <el-button type="primary" size="medium" @click="add">新增</el-button> -->
</el-form-item>
</el-form>
</div>

4
src/views/projectFront/smartBeamField/planManage.vue
View File

@ -337,14 +337,14 @@ export default {
trigger: 'blur'
}
],
plannedMakeBeamBeginTime: [
markTime: [
{
required: true,
message: '必填',
trigger: 'blur'
}
],
plannedErectionBeamBeginTime: [
erectTime: [
{
required: true,
message: '必填',