From 6e33d046fa45af6c3ec7d956652eef9f01767027 Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Thu, 14 Dec 2023 09:13:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80BIM?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96=EF=BC=9B=E6=A2=81=E5=9C=BA?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectAdmin/fourEngin/command/center.vue |  2 +-
 .../projectAdmin/fourEngin/progress/index.vue |  2 +-
 .../smartBeamField/beam-detail.vue            | 25 +++++++++++++------
 .../smartBeamField/beamManage.vue             |  2 +-
 .../smartBeamField/planManage.vue             |  4 +--
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/projectAdmin/fourEngin/command/center.vue b/src/views/projectAdmin/fourEngin/command/center.vue
index 2f81d6b9..88dd44e6 100644
--- a/src/views/projectAdmin/fourEngin/command/center.vue
+++ b/src/views/projectAdmin/fourEngin/command/center.vue
@@ -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%"
diff --git a/src/views/projectAdmin/fourEngin/progress/index.vue b/src/views/projectAdmin/fourEngin/progress/index.vue
index 8bc6230e..ab05b54c 100644
--- a/src/views/projectAdmin/fourEngin/progress/index.vue
+++ b/src/views/projectAdmin/fourEngin/progress/index.vue
@@ -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%"
diff --git a/src/views/projectFront/smartBeamField/beam-detail.vue b/src/views/projectFront/smartBeamField/beam-detail.vue
index 09c1a4d4..5e13bae1 100644
--- a/src/views/projectFront/smartBeamField/beam-detail.vue
+++ b/src/views/projectFront/smartBeamField/beam-detail.vue
@@ -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()
               }
             })
diff --git a/src/views/projectFront/smartBeamField/beamManage.vue b/src/views/projectFront/smartBeamField/beamManage.vue
index 1d7d6b8e..72ed2eac 100644
--- a/src/views/projectFront/smartBeamField/beamManage.vue
+++ b/src/views/projectFront/smartBeamField/beamManage.vue
@@ -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>
diff --git a/src/views/projectFront/smartBeamField/planManage.vue b/src/views/projectFront/smartBeamField/planManage.vue
index 68161889..ca4eadc5 100644
--- a/src/views/projectFront/smartBeamField/planManage.vue
+++ b/src/views/projectFront/smartBeamField/planManage.vue
@@ -337,14 +337,14 @@ export default {
             trigger: 'blur'
           }
         ],
-        plannedMakeBeamBeginTime: [
+         markTime: [
           {
             required: true,
             message: '必填',
             trigger: 'blur'
           }
         ],
-        plannedErectionBeamBeginTime: [
+        erectTime: [
           {
             required: true,
             message: '必填',