民用添加调压柜

src/components/ConstructionDetails/index.vue

@@ -96,11 +96,11 @@
                       </el-select>
                     </el-form-item>
                   <el-form-item
-                    v-if="currentDicts.some(item=>item.label==='底腿')"
+                    v-if="currentDicts.some(item=>item.label==='底腿')||node==='调压柜安装'"
                     :prop="i.remark + ''"
                     :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                     label="施工内容"
-                    v-show="currentDicts.some(item=>item.label==='底腿')"
+                    v-show="currentDicts.some(item=>item.label==='底腿')||node==='调压柜安装'"
                     label-width="95px"
                   >
                     <div class="block" style="display: inline-block; margin-right: 20px;">
@@ -252,7 +252,7 @@
                 </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')">
+              <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>
                 <ObsImageUpload
                   :class=" status == 'read-only' ? 'obsImageUploads' : '' "
@@ -372,7 +372,7 @@
                 :disabled="status == 'read-only' "
               ></ObsImageUpload>
             </div>
-            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='回填'">
+            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='回填'||node==='调压柜安装'">
               <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 25px;">石粉回填照片</h3>
               <ObsImageUpload
                 :class=" status == 'read-only' ? 'obsImageUploads' : '' "
@@ -456,6 +456,54 @@
                 :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: center;text-indent: 25px;">调压柜铭牌</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getboxBrandUrl(arguments,idx)"
+                :value="e.boxBrand"
+                :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: center;text-indent: 25px;">调压箱防雷接地</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getLightningUrl(arguments,idx)"
+                :value="e.lightning"
+                :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: center;text-indent: 25px;">调压箱底腿连接</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getBottomLegUrl(arguments,idx)"
+                :value="e.bottomLeg"
+                :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: center;text-indent: 25px;">调压箱护栏及地面硬化(远景)</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getGroundHardeningUrl(arguments,idx)"
+                :value="e.groundHardening"
+                :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
             <!-- </el-form-item> -->
             <div style="display: flex;  justify-content: flex-end; width: 100%;height: 100%;">
             <el-button  plain type="danger" @click=" handleDelete(e)" v-hasPermi="['zdsz:engineeringCivilNode:remove']" style="width: 94px;">删除</el-button>
@@ -910,6 +958,18 @@ export default {
     getlegBackfillingUrl(_,idx) {
       this.currentCollapses[idx].legBackfilling = [...arguments][0][0].map(e=>e.url) || [];
     },
+    getboxBrandUrl(_,idx) {
+      this.currentCollapses[idx].boxBrand = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getLightningUrl(_,idx) {
+      this.currentCollapses[idx].lightning = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getBottomLegUrl(_,idx) {
+      this.currentCollapses[idx].bottomLeg = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getGroundHardeningUrl(_,idx) {
+      this.currentCollapses[idx].groundHardening = [...arguments][0][0].map(e=>e.url) || [];
+    },
     getinferiorSulcusUrl(_,idx) {
       this.currentCollapses[idx].inferiorSulcus = [...arguments][0][0].map(e=>e.url) || [];
     },

src/components/EnginNodeInfo/index.vue

@@ -4,8 +4,6 @@
  *@date: 2024-01-10 14:44:14
  *@version: V1.0.5
  -->
-
-
 <template>
   <div style="width: 100%; height: 100%;">
     <!-- 节点表单 -->
@@ -99,6 +97,22 @@
         <ObsImageUpload ref="constructionRecords" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.constructionRecords"
                         @input="getconstructionRecordsUrl"></ObsImageUpload>
       </el-form-item>
+      <el-form-item label="调压箱铭牌" prop="boxBrand" v-if="currentContain.includes('boxBrand')" class="obsImage" :class=" enginType == '调压柜安装' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="boxBrand" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.boxBrand"
+                        @input="getboxBrandUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="调压箱防雷接地" prop="Lightning" v-if="currentContain.includes('Lightning')" class="obsImage" :class=" enginType == '调压柜安装' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="Lightning" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.lightning"
+                        @input="getLightningUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="调压箱底腿连接" prop="BottomLeg" v-if="currentContain.includes('BottomLeg')" class="obsImage" :class=" enginType == '调压柜安装' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="BottomLeg" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.bottomLeg"
+                        @input="getBottomLegUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="调压箱护栏及地面硬化（远景）" prop="GroundHardening" v-if="currentContain.includes('GroundHardening')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="GroundHardening" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.groundHardening"
+                        @input="getGroundHardeningUrl"></ObsImageUpload>
+      </el-form-item>
 
       <el-form-item label="备注" prop="remark" v-if="currentContain.includes('remark')">
         <el-input
@@ -526,6 +540,10 @@ export default {
           this.nodeInfoBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
           this.nodeInfoBo.zEngineeringInfoBo.constructAddre=this.nodeInfo.constructAddre
           this.nodeInfoBo.zEngineeringInfoBo.onTheDitch=this.nodeInfo.onTheDitch
+          this.nodeInfoBo.zEngineeringInfoBo.boxBrand=this.nodeInfo.boxBrand
+          this.nodeInfoBo.zEngineeringInfoBo.lightning=this.nodeInfo.lightning
+          this.nodeInfoBo.zEngineeringInfoBo.bottomLeg=this.nodeInfo.bottomLeg
+          this.nodeInfoBo.zEngineeringInfoBo.groundHardening=this.nodeInfo.groundHardening
           delete this.nodeInfo.zEngiineeringPhotoBoList
           console.log('即将返回的节点Info',this.nodeInfoBo)
           result = this.nodeInfoBo
@@ -591,6 +609,18 @@ export default {
     getinferiorSulcusUrl(url) {
       this.nodeInfo.inferiorSulcus = this.$refs.inferiorSulcus.fileList ? this.$refs.inferiorSulcus.fileList.map(e=>e.url):[];
     },
+    getboxBrandUrl(url) {
+      this.nodeInfo.boxBrand = this.$refs.boxBrand.fileList ? this.$refs.boxBrand.fileList.map(e=>e.url):[];
+    },
+    getLightningUrl(url) {
+      this.nodeInfo.lightning = this.$refs.Lightning.fileList ? this.$refs.Lightning.fileList.map(e=>e.url):[];
+    },
+    getGroundHardeningUrl(url) {
+      this.nodeInfo.groundHardening = this.$refs.GroundHardening.fileList ? this.$refs.GroundHardening.fileList.map(e=>e.url):[];
+    },
+    getBottomLegUrl(url) {
+      this.nodeInfo.bottomLeg = this.$refs.BottomLeg.fileList ? this.$refs.BottomLeg.fileList.map(e=>e.url):[];
+    },
     getconstructionRecordsUrl(url) {
       this.nodeInfo.constructionRecords = this.$refs.constructionRecords.fileList ? this.$refs.constructionRecords.fileList.map(e=>e.url):[];
     },

src/views/zdsz/engineeringCivil/index.vue

@@ -1154,6 +1154,20 @@ export default {
             'inferiorSulcus',                // 照片
           ]
         },
+        {
+          name: '调压柜安装',
+          components: [
+            [
+              'specificConstruction'//具体施工位置
+            ],
+            'constructTime',
+            'boxBrand',
+            'Lightning',
+            'BottomLeg',
+            'GroundHardening',
+            'stonePowder',                // 照片
+          ]
+        },
         // {
         //   name: '管道施工记录',
         //   components: [