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

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

View File

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

View File

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

View File

@ -68,7 +68,6 @@
<el-button type="primary" size="medium" @click="showSetupBridge">架设桥梁</el-button> <el-button type="primary" size="medium" @click="showSetupBridge">架设桥梁</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class="table_wrap whiteBlock"> <div class="table_wrap whiteBlock">
<el-table class="tables" :data="List" style="min-height: 330px"> <el-table class="tables" :data="List" style="min-height: 330px">
@ -224,7 +223,7 @@
</el-table> </el-table>
</div> </div>
<div class="dialog-footer"> <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') }} >{{ $t('message.deviceManage.cancel') }}
</el-button> </el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="bindBeamProduct" size="medium" <el-button type="primary" icon="el-icon-circle-check" @click="bindBeamProduct" size="medium"
@ -263,7 +262,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="dialog-footer"> <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') }} >{{ $t('message.deviceManage.cancel') }}
</el-button> </el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="bindBeamPedestal" size="medium" <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-input v-model="setUpBridgeForm.erectionBeamPerson" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<div class="dialog-footer"> <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') }} >{{ $t('message.deviceManage.cancel') }}
</el-button> </el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="setupBridge" size="medium" <el-button type="primary" icon="el-icon-circle-check" @click="setupBridge" size="medium"
@ -576,6 +575,15 @@ export default {
} }
}, },
methods: { methods: {
//
refreshAllData() {
this.getList() //
this.getBeamDetail() //
this.getProductList() // 线
this.getPedestalList() //
this.getCountDuration() //
},
// //
getBeamDetail() { getBeamDetail() {
smartBeamFieldBeamDetail({ smartBeamFieldBeamDetail({
@ -621,8 +629,7 @@ export default {
if (res.success) { if (res.success) {
// console.log('线', res) // console.log('线', res)
this.closeProductLine() this.closeProductLine()
this.getProductList() this.refreshAllData()
this.getList()
this.$message.success('绑定成功') this.$message.success('绑定成功')
} }
}) })
@ -670,8 +677,9 @@ export default {
if (res.success) { if (res.success) {
// console.log('', res) // console.log('', res)
this.closePedestal() this.closePedestal()
this.getPedestalList() // this.getPedestalList()
this.getBeamDetail() // this.getBeamDetail()
this.refreshAllData()
this.$message.success('绑定成功') this.$message.success('绑定成功')
} }
}) })
@ -763,6 +771,7 @@ export default {
smartBeamToProcessEdit(params).then(result => { smartBeamToProcessEdit(params).then(result => {
if (result.success) { if (result.success) {
this.$message.success(result.message) this.$message.success(result.message)
this.getBeamDetail()
this.getList() this.getList()
} }
}) })

View File

@ -60,7 +60,7 @@
<el-form-item> <el-form-item>
<el-button type="primary" plain @click="getList">{{ $t('message.energyManage.waybill.query') }}</el-button> <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="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-item>
</el-form> </el-form>
</div> </div>

View File

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