可视化统计

src/components/ConstructionDetails/index.vue

@@ -94,7 +94,7 @@
                       </el-select>
                     </el-form-item>
                   <el-form-item
-                    v-if="currentDicts.some(item=>item.label==='底腿开挖前')||currentDicts.some(item=>item.label==='底腿下沟')||currentDicts.some(item=>item.label==='底腿回填')"
+                    v-if="currentDicts.some(item=>item.label==='底腿')"
                     :prop="i.number + ''"
                     :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                     label="管径"
@@ -216,7 +216,7 @@
                 </el-input> -->
             </div>
             <!-- <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage"> -->
-              <div style="display: flex;width: 100%;height: 100%;" v-if="!node==='下沟'">
+              <div style="display: flex;width: 100%;height: 100%;" v-if="!(node==='下沟')">
                 <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 41px;">图片</h3>
                 <ObsImageUpload
                   :class=" status == 'read-only' ? 'obsImageUploads' : '' "
@@ -289,7 +289,7 @@
               ></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: 41px;">回填后照片</h3>
+              <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 41px;">回填后</h3>
               <ObsImageUpload
                 :class=" status == 'read-only' ? 'obsImageUploads' : '' "
                 ref="obsImageUpload"
@@ -300,7 +300,42 @@
                 :disabled="status == 'read-only' "
               ></ObsImageUpload>
             </div>
-
+            <div style="display: flex;width: 100%;height: 100%;" v-if="currentDicts.some(item=>item.label==='底腿')">
+              <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 41px;">开挖前</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getbeforeBottomUrl(arguments,idx)"
+                :value="e.beforeBottom"
+                :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="currentDicts.some(item=>item.label==='底腿')">
+              <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 41px;">回填</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getlegBackfillingUrl(arguments,idx)"
+                :value="e.legBackfilling"
+                :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="currentDicts.some(item=>item.label==='底腿')">
+              <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 41px;">下沟</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getinferiorSulcusUrl(arguments,idx)"
+                :value="e.inferiorSulcus"
+                :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
             <!-- </el-form-item> -->
             <hr>
           </el-collapse-item>
@@ -579,7 +614,7 @@ export default {
         }
         this.currentDicts = dicts
       }
-      this.currentDicts = dicts
+      //this.currentDicts = dicts
       console.log("this.currentDicts",this.currentDicts)
       this.dialogVisible = true
       this.$forceUpdate()
@@ -608,6 +643,15 @@ export default {
     getwarningtTapeUrl(_,idx) {
       this.currentCollapses[idx].warningtTape = [...arguments][0][0].map(e=>e.url) || [];
     },
+    getbeforeBottomUrl(_,idx) {
+      this.currentCollapses[idx].beforeBottom = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getlegBackfillingUrl(_,idx) {
+      this.currentCollapses[idx].legBackfilling = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getinferiorSulcusUrl(_,idx) {
+      this.currentCollapses[idx].inferiorSulcus = [...arguments][0][0].map(e=>e.url) || [];
+    },
     getphotosAfterUrl(_,idx) {
       this.currentCollapses[idx].photosAfter = [...arguments][0][0].map(e=>e.url) || [];
     },

src/components/EnginNodeInfo/index.vue

@@ -73,6 +73,18 @@
         <ObsImageUpload ref="photosAfter" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.photosAfter"
                         @input="getphotosAfterUrl"></ObsImageUpload>
       </el-form-item>
+      <el-form-item label="开挖前" prop="beforeBottom" v-if="currentContain.includes('beforeBottom')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="beforeBottom" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.beforeBottom"
+                        @input="getbeforeBottomUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="回填" prop="legBackfilling" v-if="currentContain.includes('legBackfilling')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="legBackfilling" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.legBackfilling"
+                        @input="getlegBackfillingUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="下沟" prop="inferiorSulcus" v-if="currentContain.includes('inferiorSulcus')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="inferiorSulcus" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.inferiorSulcus"
+                        @input="getinferiorSulcusUrl"></ObsImageUpload>
+      </el-form-item>
       <el-form-item label="视频" prop="Video" v-if="currentContain.includes('Video')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
         <ObsImageUpload ref="Video" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.Video"
                         @input="getVideoUrl"></ObsImageUpload>
@@ -443,6 +455,9 @@ export default {
           this.nodeInfoBo.zEngineeringInfoBo.stonePowder=this.nodeInfo.stonePowder
           this.nodeInfoBo.zEngineeringInfoBo.warningtTape=this.nodeInfo.warningtTape
           this.nodeInfoBo.zEngineeringInfoBo.photosAfter=this.nodeInfo.photosAfter
+          this.nodeInfoBo.zEngineeringInfoBo.beforeBottom=this.nodeInfo.beforeBottom
+          this.nodeInfoBo.zEngineeringInfoBo.inferiorSulcus=this.nodeInfo.inferiorSulcus
+          this.nodeInfoBo.zEngineeringInfoBo.legBackfilling=this.nodeInfo.legBackfilling
           this.nodeInfoBo.zEngineeringInfoBo.Video=this.nodeInfo.Video
           this.nodeInfoBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
           delete this.nodeInfo.zEngiineeringPhotoBoList
@@ -496,6 +511,15 @@ export default {
     getphotosAfterUrl(url) {
       this.nodeInfo.photosAfter = this.$refs.photosAfter.fileList ? this.$refs.photosAfter.fileList.map(e=>e.url):[];
     },
+    getbeforeBottomUrl(url) {
+      this.nodeInfo.beforeBottom = this.$refs.beforeBottom.fileList ? this.$refs.beforeBottom.fileList.map(e=>e.url):[];
+    },
+    getlegBackfillingUrl(url) {
+      this.nodeInfo.legBackfilling = this.$refs.legBackfilling.fileList ? this.$refs.legBackfilling.fileList.map(e=>e.url):[];
+    },
+    getinferiorSulcusUrl(url) {
+      this.nodeInfo.inferiorSulcus = this.$refs.inferiorSulcus.fileList ? this.$refs.inferiorSulcus.fileList.map(e=>e.url):[];
+    },
     getVideoUrl(url) {
       this.nodeInfo.Video = this.$refs.Video.fileList ? this.$refs.Video.fileList.map(e=>e.url):[];
     },

src/views/zdsz/engineeringCivil/index.vue

@@ -877,31 +877,15 @@ export default {
           ]
         },
         {
-          name: '底腿开挖前',
+          name: '底腿',
           components: [
             [
               'caliber'                              // 管径
             ],
             'constructTime',
-            'zEngiineeringPhotoBoList',                // 照片
-          ]
-        }, {
-          name: '底腿下沟',
-          components: [
-            [
-              'caliber'                              // 管径
-            ],
-            'constructTime',
-            'zEngiineeringPhotoBoList',                // 照片
-          ]
-        }, {
-          name: '底腿回填',
-          components: [
-            [
-              'caliber'                              // 管径
-            ],
-            'constructTime',
-            'zEngiineeringPhotoBoList',                // 照片
+            'beforeBottom',
+            'legBackfilling',
+            'inferiorSulcus',                // 照片
           ]
         },
         {