Merge branch 'zdsz3.0' of http://192.168.10.18:3000/sunwei/zdsz_vue into zdsz3.0

src/components/EngineePipe/index.vue

@@ -170,7 +170,8 @@ export default {
         zEngineeringNodeBo: {
           type: null,
           zEngineeringInfoBo: {},    //节点信息
-        }
+        },
+        zEngineeringNodeBoList:[]
       },
       zEngineeringInfoBo: {
         constructAddre: '',        // 施工地址

src/components/ObsImageUpload/indexFile.vue

@@ -15,7 +15,7 @@
                :headers="headers"
     >
       <div slot="tip" class="el-upload__tip">cad文件类型：dwg，dwt；word文件类型：doc，docx；Excel文件类型：xls,xlsx;照片文件类型：jpg,png,jpeg</div>
-      <i class="el-icon-plus abs"></i>
+      <el-button class="el-icon-plus abs" type="primary">上传文件</el-button>
     </el-upload>
 
     <!-- 上传提示 -->

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -531,7 +531,8 @@
           },
           /** 修改按钮操作 */
           handleUpdate(row) {
-            viewEngineeringPipeJacking(row.id).then(res => {
+            const id = row.id || this.ids;
+            viewEngineeringPipeJacking(id).then(res => {
               this.$refs.enginPipe.putEnginPipe(res.data,'put')
             })
           },