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

src/api/zdsz/engineeringAirWall.js

@@ -51,12 +51,14 @@ export function QueryEngineeAirWall({id, type}) {
   // alert(`${id}`)
   // alert(`${type}`)
   return request({
+    // url: `/zdsz/engineeringAirWall/${id}/${type}`,
     url: `/zdsz/engineeringAirWall/${id}/${type}`,
     method: 'get',
   })
 }
 
 export function UpdateEngineeAirWall(data) {
+  console.log("UpdateEngineeAirWall=",data)
   return request({
     url: '/zdsz/engineeringAirWall/updateNodeByBo',
     method: 'put',

src/api/zdsz/engineeringGasOpening.js

@@ -0,0 +1,69 @@
+import request from '@/utils/request'
+
+// 根据url直接获取type
+function getTypeFromUrl(url) {
+  // 使用正则表达式或其他方法从 URL 中提取 type 参数
+  const params = new URLSearchParams(url.split('?')[1]);
+  return params.get('type');
+}
+
+export function getEngineeGasOpeningList(data) {
+  data.type = getTypeFromUrl(window.location.href)
+  return request({
+    url: `/zdsz/engineeringGasOpening/list`,
+    method: 'get',
+    params:data
+  })
+}
+
+export function addEngineeEngineeGasOpening(data) {
+  return request({
+    url: '/zdsz/engineeringGasOpening',
+    method: 'post',
+    data
+  })
+}
+
+export function putEngineeGasOpening(id) {
+  return request({
+    url: `/zdsz/engineeringGasOpening/${id}`,
+    method: 'get',
+
+  })
+}
+
+export function EditEngineeGasOpening(data) {
+  return request({
+    url: '/zdsz/engineeringGasOpening',
+    method: 'put',
+    data
+  })
+}
+
+export function DelEngineeGasOpening(id) {
+  return request({
+    url: `/zdsz/engineeringGasOpening/${id}`,
+    method: 'delete',
+  })
+}
+
+export function QueryEngineeGasOpening({id, type}) {
+  // alert(`${id}`)
+  // alert(`${type}`)
+  return request({
+    // url: `/zdsz/engineeringGasOpening/${id}/${type}`,
+    url: `/zdsz/engineeringGasOpening/${id}/${type}`,
+    method: 'get',
+  })
+}
+
+export function UpdateEngineeGasOpening(data) {
+  console.log("UpdateEngineeGasOpening=",data)
+  return request({
+    url: '/zdsz/engineeringGasOpening/updateNodeByBo',
+    method: 'put',
+    data
+  })
+}
+
+

src/components/ConstructionDetails/index.vue

@@ -50,6 +50,27 @@
                   }}</span>
             </div>
             <hr>
+            <!--带气封堵施工 start-->
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe' || engineType==='iron_air'">
+              <h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">工程名称：{{ e.headName }}</h4>
+              <h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">地点：{{ e.constructAddre }}</h4>
+              <h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">作业方式：{{ e.segmentedCompressionQualified }}</h4>
+              <h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">施工内容：{{ e.remark }}</h4>
+              <h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">管道压力：{{ e.constructAccordingDrawings }}</h4>
+              <!--<el-form class="nodeForm materialForm">-->
+                <!--<el-form-item-->
+                    <!--:prop="e.headName + ''"-->
+                    <!--:class="'labelWidth'"-->
+                    <!--label="工程名称"-->
+                    <!--label-width="95px"-->
+                <!--&gt;-->
+                  <!--<div class="block" style="display: inline-block; margin-right: 20px;">-->
+                    <!--<el-input v-model="e.headName" placeholder="请输入工程名称" style="width: 100%"  oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"  max="999999999" :disabled="status == 'read-only'"> </el-input>-->
+                  <!--</div>-->
+                <!--</el-form-item>-->
+              <!--</el-form>-->
+            </div>
+            <!--带气封堵施工 end-->
             <!--  用料明细 -->
             <div
                 v-for="(i,index) in e.zEngineeringMaterialBo || [] "
@@ -252,8 +273,8 @@
                 </el-input> -->
             </div>
             <!-- <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage"> -->
-              <div style="display: flex;width: 100%;height: 100%;" v-if="!(currentDicts.some(item=>item.label==='底腿'))&&!(node==='下沟')&&!(node=='回填')&&!(node=='trench_construction')&&!(node=='underditch_construction')&&!(node=='调压柜安装')">
-                <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">图片{{node}}</h3>
+              <div style="display: flex;width: 100%;height: 100%;" v-if="!(currentDicts.some(item=>item.label==='底腿'))&&!(node==='下沟')&&!(node=='回填')&&!(node=='trench_construction')&&!(node=='underditch_construction')&&!(engineType=='pe')&&!(engineType=='iron_air')&&!(node=='调压柜安装')">
+                <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">图片</h3>
                 <ObsImageUpload
                   :class=" status == 'read-only' ? 'obsImageUploads' : '' "
                   ref="obsImageUpload"
@@ -271,7 +292,7 @@
                   ref="obsImageUpload"
                   :limit="11"
                   :fileType="['png', 'jpg', 'jpeg']"
-                  @input="getductalEpitheliumUrl(arguments,idx)"
+                  @input="getwelding(arguments,idx)"
                   :value="e.welding"
                   :disabled="status == 'read-only' "
               ></ObsImageUpload>
@@ -283,7 +304,7 @@
                   ref="obsImageUpload"
                   :limit="11"
                   :fileType="['png', 'jpg', 'jpeg']"
-                  @input="getductalEpitheliumUrl(arguments,idx)"
+                  @input="getaczoiling(arguments,idx)"
                   :value="e.aczoiling"
                   :disabled="status == 'read-only' "
               ></ObsImageUpload>
@@ -295,7 +316,7 @@
                   ref="obsImageUpload"
                   :limit="11"
                   :fileType="['png', 'jpg', 'jpeg']"
-                  @input="getductalEpitheliumUrl(arguments,idx)"
+                  @input="getpiping(arguments,idx)"
                   :value="e.piping"
                   :disabled="status == 'read-only' "
               ></ObsImageUpload>
@@ -307,7 +328,7 @@
                   ref="obsImageUpload"
                   :limit="11"
                   :fileType="['png', 'jpg', 'jpeg']"
-                  @input="getductalEpitheliumUrl(arguments,idx)"
+                  @input="getwarning(arguments,idx)"
                   :value="e.warning"
                   :disabled="status == 'read-only' "
               ></ObsImageUpload>
@@ -319,11 +340,227 @@
                   ref="obsImageUpload"
                   :limit="11"
                   :fileType="['png', 'jpg', 'jpeg']"
-                  @input="getductalEpitheliumUrl(arguments,idx)"
+                  @input="getbackfilling(arguments,idx)"
                   :value="e.backfilling"
                   :disabled="status == 'read-only' "
               ></ObsImageUpload>
             </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">鞍型焊接</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getpeSaddleWelding(arguments,idx)"
+                  :value="e.peSaddleWelding"
+                  :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">气密实验</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getpeAirtightTest(arguments,idx)"
+                  :value="e.peAirtightTest"
+                  :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">开孔</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getpeHolesOpening(arguments,idx)"
+                  :value="e.peHolesOpening"
+                  :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">清扫</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getpeCleaning(arguments,idx)"
+                  :value="e.peCleaning"
+                  :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">封堵</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getpePlugging(arguments,idx)"
+                  :value="e.pePlugging"
+                  :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">碰口作业</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getpeCollisionOperating(arguments,idx)"
+                  :value="e.peCollisionOperating"
+                  :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">通气捡漏</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getpeAirrecovering(arguments,idx)"
+                  :value="e.peAirrecovering"
+                  :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">作业完成</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getpeHomeworkDone(arguments,idx)"
+                  :value="e.peHomeworkDone"
+                  :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='iron_air'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">管道壁厚</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getironPipelineThickness(arguments,idx)"
+                  :value="e.ironPipelineThickness"
+                  :disabled="status == 'read-only'"
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='iron_air'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">焊接四通</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getiron4Welding(arguments,idx)"
+                  :value="e.iron4Welding"
+                  :disabled="status == 'read-only'"
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='iron_air'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">焊接旁通</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getironBypassWelding(arguments,idx)"
+                  :value="e.ironBypassWelding"
+                  :disabled="status == 'read-only'"
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='iron_air'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">开孔</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getironHolesOpening(arguments,idx)"
+                  :value="e.ironHolesOpening"
+                  :disabled="status == 'read-only'"
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='iron_air'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">封堵</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getironCleaning(arguments,idx)"
+                  :value="e.ironCleaning"
+                  :disabled="status == 'read-only'"
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='iron_air'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">氮气吹扫</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getironNitrogenPurging(arguments,idx)"
+                  :value="e.ironNitrogenPurging"
+                  :disabled="status == 'read-only'"
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='iron_air'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">管道置换</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getironPipelineReplacing(arguments,idx)"
+                  :value="e.ironPipelineReplacing"
+                  :disabled="status == 'read-only'"
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='iron_air'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">下堵</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getironLowerEndCap(arguments,idx)"
+                  :value="e.ironLowerEndCap"
+                  :disabled="status == 'read-only'"
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='iron_air'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">四通防腐</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getiron4Aczoiling(arguments,idx)"
+                  :value="e.iron4Aczoiling"
+                  :disabled="status == 'read-only'"
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='iron_air'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">作业完成</h3>
+              <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getironHomeworkDone(arguments,idx)"
+                  :value="e.ironHomeworkDone"
+                  :disabled="status == 'read-only'"
+              ></ObsImageUpload>
+            </div>
             <div style="display: flex;width: 100%;height: 100%;" v-if="node==='下沟'">
               <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">管上皮深度测量照片</h3>
               <ObsImageUpload
@@ -608,7 +845,9 @@ export default {
       materialQualityList:[],                     // 材质
       specificationsList:[],                      // 规格
       materialComponList:[],
-      enginType:null,
+      // The data property "enginType" is already declared as a prop.
+      // enginType:null, // Use prop default value instead.
+      engineType:null,
       enginClassification:null,
       nodeInfo:{
           backfillTime:'',                       // 回填时间
@@ -665,7 +904,8 @@ export default {
     // 此处监听variable变量，当期有变化时执行
     currentDicts(item1, item2) {
       // item1为新值，item2为旧值
-      console.log('item1为新值，item2为旧值', item1[0].value)
+      console.log('item1为新值，item2为旧值 item1=', item1)
+      console.log('item1为新值，item2为旧值 item1[0].value=', item1[0].value)
       this.activeNames = item1[0].value
       this.$parent.viewNodeSource(item1[0].value)
       // alert(item1[0].value)
@@ -781,6 +1021,7 @@ export default {
       console.log('节点123',e)
       console.log('节点',e)
       this.node=e.name
+      // alert(this.node)
       this.nodesource=e
       let data = {enginType:this.enginType}
       data.enginSort = this.enginSort
@@ -853,13 +1094,19 @@ export default {
       if(dicts && dicts[0]){
         this.node = dicts[0].value
       }
+      // alert(enginType)
       console.log(1)
-      console.log(currentStatus)
-      console.log(type)
-      console.log(kind)
+      console.log('dicts=',dicts)
+      console.log('type=',type)
+      console.log('currentStatus=',currentStatus)
+      console.log('kind=',kind)
+      console.log('node=',this.node)
+      console.log('enginType=',enginType)
       console.log(2)
       // if (kind=='民用'||kind=='基建'){
-        this.enginType=enginType
+      // alert(enginType)
+      //   this.enginType=enginType
+        this.engineType=enginType
         this.enginSort=enginSort
         this.enginClassification=enginClassification
         let data = {enginType:enginType}
@@ -923,6 +1170,15 @@ export default {
         }
         this.currentDicts = dicts
       }
+      // alert(enginType)
+      if(enginType == 'pe'){
+        this.currentDicts = dicts
+        this.node = dicts[0].value
+      }else if(enginType == 'iron_air'){
+        this.currentDicts = dicts
+        this.node = dicts[0].value
+      }
+      // alert(this.currentDicts)
       //this.currentDicts = dicts
       console.log("this.currentDicts",this.currentDicts)
       this.dialogVisible = true
@@ -989,7 +1245,122 @@ export default {
     {
       this.currentCollapses[idx].onTheDitch = [...arguments][0][0].map(e=>e.url) || [];
       console.log(this.currentCollapses[idx].onTheDitch)
-    }
+    },
+    getwelding(_,idx)
+    {
+      this.currentCollapses[idx].welding = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].welding)
+    },
+    getaczoiling(_,idx)
+    {
+      this.currentCollapses[idx].aczoiling = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].aczoiling)
+    },
+    getpiping(_,idx)
+    {
+      this.currentCollapses[idx].piping = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].piping)
+    },
+    getwarning(_,idx)
+    {
+      this.currentCollapses[idx].warning = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].warning)
+    },
+    getbackfilling(_,idx)
+    {
+      this.currentCollapses[idx].backfilling = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].backfilling)
+    },
+    getpeAirrecovering(_,idx)
+    {
+      this.currentCollapses[idx].peAirrecovering = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].peAirrecovering)
+    },
+    getpeAirtightTest(_,idx)
+    {
+      this.currentCollapses[idx].peAirtightTest = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].peAirtightTest)
+    },
+    getpeCleaning(_,idx)
+    {
+      this.currentCollapses[idx].peCleaning = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].peCleaning)
+    },
+    getpeCollisionOperating(_,idx)
+    {
+      this.currentCollapses[idx].peCollisionOperating = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].peCollisionOperating)
+    },
+    getpeHolesOpening(_,idx)
+    {
+      this.currentCollapses[idx].peHolesOpening = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].peHolesOpening)
+    },
+    getpeHomeworkDone(_,idx)
+    {
+      this.currentCollapses[idx].peHomeworkDone = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].peHomeworkDone)
+    },
+    getpePlugging(_,idx)
+    {
+      this.currentCollapses[idx].pePlugging = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].pePlugging)
+    },
+    getpeSaddleWelding(_,idx)
+    {
+      this.currentCollapses[idx].peSaddleWelding = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].peSaddleWelding)
+    },
+    getiron4Aczoiling(_,idx)
+    {
+      this.currentCollapses[idx].iron4Aczoiling = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].iron4Aczoiling)
+    },
+    getiron4Welding(_,idx)
+    {
+      this.currentCollapses[idx].iron4Welding = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].iron4Welding)
+    },
+    getironBypassWelding(_,idx)
+    {
+      this.currentCollapses[idx].ironBypassWelding = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].ironBypassWelding)
+    },
+    getironCleaning(_,idx)
+    {
+      this.currentCollapses[idx].ironCleaning = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].ironCleaning)
+    },
+    getironHolesOpening(_,idx)
+    {
+      this.currentCollapses[idx].ironHolesOpening = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].ironHolesOpening)
+    },
+    getironHomeworkDone(_,idx)
+    {
+      this.currentCollapses[idx].ironHomeworkDone = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].ironHomeworkDone)
+    },
+    getironLowerEndCap(_,idx)
+    {
+      this.currentCollapses[idx].ironLowerEndCap = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].ironLowerEndCap)
+    },
+    getironNitrogenPurging(_,idx)
+    {
+      this.currentCollapses[idx].ironNitrogenPurging = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].ironNitrogenPurging)
+    },
+    getironPipelineReplacing(_,idx)
+    {
+      this.currentCollapses[idx].ironPipelineReplacing = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].ironPipelineReplacing)
+    },
+    getironPipelineThickness(_,idx)
+    {
+      this.currentCollapses[idx].ironPipelineThickness = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].ironPipelineThickness)
+    },
   }
 }
 </script>

src/views/zdsz/engineeringAirWall/index.vue

@@ -319,7 +319,7 @@
       :status="status"
       :currentCollapses="currentCollapses"
       @updateNodeOption="updateNodeOption"
-      :enginType="'带气封堵施工'"
+      :enginType="enginType"
     />
   </div>
 </template>
@@ -374,13 +374,15 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      // 工程类型
+      enginType: true,
       // 工程分类显示
       engineeType: true,
       // 总条数
       total: 0,
       currentNode: [],
       currentCollapses: [],
-      // 市政工程|工业工程表格数据
+      // 带气封堵施工表格数据
       comprehensiveList: [],
       // 弹出层标题
       title: "",
@@ -396,8 +398,6 @@ export default {
       },
       nodeDetailVisible: false, // 施工信息dialog
       MaterVisible: false, // 用料信息dialog
-      // 字典
-      dicts: {},
       // 表单参数
       form: {
         files: [], // 附件
@@ -499,7 +499,8 @@ export default {
   },
   mounted() {
     // 获取材质
-    getEnginMaterialQualityList({enginType: this.$route.query.type == '1' ? '工业工程' : '市政工程'}).then(res => {
+    // getEnginMaterialQualityList({enginType: this.$route.query.type == '1' ? '工业工程' : '市政工程'}).then(res => {
+    getEnginMaterialQualityList({enginType: '带气封堵施工'}).then(res => {
       this.materialQualityList = res.data
     });
   },
@@ -554,8 +555,13 @@ export default {
     },
     updateNodeOption(value) {
       console.log(this.form);
-      console.log(value)
+      console.log('updateNodeOption=',value)
+      console.log('this.form=',this.form)
       this.form.files = this.form.pics
+      if(this.form.zEngineeringNodeBo && !this.form.zEngineeringNodeBo.zEngineeringInfoBo){
+        this.form.zEngineeringNodeBo.zEngineeringInfoBo = {}
+      }
+      this.form.zEngineeringNodeBo.zEngineeringInfoBo.ironPipelineThickness = value[0].ironPipelineThickness
       UpdateEngineeAirWall(this.form).then(res => {
         this.$modal.msgSuccess("修改成功");
 
@@ -686,6 +692,7 @@ export default {
     // 历史查询
     viewSource(e) {
       console.log('历史查询', e)
+      console.log('历史查询e.enginType', e.enginType)
       this.currentId = e.id
       let val = e.enginType + "_" + e.enginClassification
       val = 'air_wall_node'
@@ -698,19 +705,40 @@ export default {
             "value": res.data[i].dictValue,
           })
         }
+        this.enginType = e.enginType
         // 此处有注释
         this.$refs.ConstructionDetails.open([{
           value: "历史数据",
           label: "历史数据"
-        }], this.form.type,null,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
+        }], e.enginType,null,null,null,null,null,e.enginType)
         // this.$refs.ConstructionDetails.open(dict, this.form.type,null,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
         this.status = 'read-only'
       })
     },
-    // 历史查询
+    // 修改施工信息
     updateviewSource(e) {
+      let dicts = []
+      let enginType = e.enginType
+      const dict = this.dict.type.air_wall_node
+      for(let i = 0; i < dict.length; i++){
+        if(dict[i].value == enginType){
+          dicts.push({
+            value: dict[i].value,
+            label: dict[i].label
+          })
+        }
+      }
+      // this.enginType = enginType
       this.currentId = e.id
-      this.$refs.ConstructionDetails.open(_, this.form.type,null,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
+
+      console.log("修改施工信息",e)
+      console.log("修改施工信息 dict",dict)
+      // this.$refs.ConstructionDetails.open(_, this.form.type,null,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
+      // let dicts = [{
+      //   value: "历史数据",
+      //   label: "历史数据"
+      // }]
+      this.$refs.ConstructionDetails.open(dicts, this.form.type,null,null,null,null,null,enginType)
       this.status = 'put'
     },
     viewNodeSource(e) {
@@ -722,7 +750,7 @@ export default {
         id: this.currentId,
         type: e
       }).then(res => {
-        console.log(res)
+        console.log("{id, type}",res)
         this.form = res.data
         try {
           this.currentCollapses = res.data.zEngineeringNodeBo.zEngineeringInfoBoList

src/views/zdsz/engineeringIndustry/index.vue

@@ -712,7 +712,7 @@ export default {
         id: this.currentId,
         type: e
       }).then(res => {
-        console.log(res)
+        console.log("{id, type}",res)
         this.form = res.data
         try {
           this.currentCollapses = res.data.zEngineeringNodeBo.zEngineeringInfoBoList