Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

src/components/ConstructionDetails/index.vue

@@ -331,7 +331,7 @@
                 </el-input> -->
             </div>
             <!-- <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage"> -->
-              <div style="display: flex;width: 100%;height: 100%;">
+              <div style="display: flex;width: 100%;height: 100%;" v-if="enginType!='市政工程'">
                 <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">图片</h3>
                 <ObsImageUpload
                   :class=" status == 'read-only' ? 'obsImageUploads' : '' "

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -831,12 +831,15 @@ export default {
   },
   // 填写节点信息
   updateNodeOption(value){
+    console.log('修改基建：',value)
+    console.log('修改基建：',this.updateParams)
     delete this.updateParams.zEngineeringNodeBoList
     // this.updateParams.zEngineeringNodeBo.zEngineeringInfoBoList = zEngineeringInfoBoList
     try {
       this.updateParams.zEngineeringNodeBo.zEngineeringInfoBoList = this.updateParams.zEngineeringNodeBo.zEngineeringInfoBoList.filter(obj => value.map(o => o.id).includes(obj.id))
     } catch (e) {
     }
+    console.log('修改基建施工信息：',this.updateParams)
     putEngineeringInfrastructure(this.updateParams).then(res => {
       console.log(res)
       if(res.code == 200){
@@ -845,7 +848,7 @@ export default {
           type: 'success'
         });
         this.$refs.ConstructionDetails.dialogVisible = false
-        this.updateParams = {}
+        // this.updateParams = {}
 
       }
     })