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

src/api/zdsz/overhead.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+// 查询工程用料统计列表
+export function materialStatistics(query) {
+  return request({
+    url: '/zdsz/materialStatistics/list',
+    method: 'post',
+    data: query
+  })
+}
+export function getAreaCompletionInformationList(query) {
+  return request({
+    url: '/zdsz/engineeringCivil/getAreaCompletionInformationList',
+    method: 'get',
+    params: query
+  })
+}
+export function getEnginMaterialQualityList() {
+  return request({
+    url: '/zdsz/enginMaterialQuality/getEnginMaterialQualityList',
+    method: 'get',
+    params: {enginType:'民用工程'}
+  })
+}
+export function getEnginSpecificationsList(materId) {
+  return request({
+    url: '/zdsz/enginSpecifications/getEnginSpecificationsList',
+    method: 'get',
+     params: {materId:materId}
+  })
+}

src/components/ConstructionDetails/index.vue

@@ -182,7 +182,7 @@
 </template>
 
 <script>
-import { 
+import {
     getEnginMaterialQualityList,                    // 材质
     getEnginSpecificationsList,                     // 规格
     getDictType,                                    // 腐蚀程度
@@ -193,7 +193,7 @@ export default {
   dicts:[
       'visit_type',
       'self_closing_valve_type',
-      
+
   ],
   props: ['currentCollapses','nodeDetailType','enginType'],
   data() {

src/components/EngineeNode/index.vue

@@ -350,7 +350,7 @@ export default {
                 });
                 return false
               }
-            }) 
+            })
           });
           return p;
         },
@@ -364,7 +364,7 @@ export default {
             // todo: 将当前tab页所选节点信息录入
             this.zEngineeringInfoBo = currentNodeInfo.zEngineeringInfoBo
             // console.log('_______',this.zEngineeringInfoBo)
-          
+
           }else{
             // todo: 校验当前表单
             this.$refs.nodeForm.validate(e => {
@@ -630,7 +630,7 @@ export default {
         },
         open(queryParams,type = null,nodeOptions = []){
             this.formType = false
-            this.nodeList = [] 
+            this.nodeList = []
             this.currentNode = []
             this.zEngineeringNodeBoList = []
             console.log(queryParams)
@@ -687,7 +687,7 @@ export default {
               this.tabsModel = nodeOptions[0].name
               console.log('当前工程所有节点',this.nodeList)
             }
-            
+
             // end
             this.currentType = type
             console.log(this.queryParams)

src/components/ObsImageUpload/indexFile.vue

@@ -10,37 +10,39 @@
                :on-error="handleUploadError"
                :on-exceed="handleExceed"
                :on-remove="handleRemove"
-                name="file"
+               name="file"
                :file-list="fileList"
                :headers="headers"
     >
-      <div slot="tip" class="el-upload__tip">cad文件类型：dwg，dwt；word文件类型：doc，docx；Excel文件类型：xls,xlsx;照片文件类型：jpg,png,jpeg</div>
+      <div slot="tip" class="el-upload__tip">
+        cad文件类型：dwg，dwt；word文件类型：doc，docx；Excel文件类型：xls,xlsx;照片文件类型：jpg,png,jpeg
+      </div>
       <el-button class="el-icon-plus abs" type="primary">上传文件</el-button>
     </el-upload>
 
     <!-- 上传提示 -->
     <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
-      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b></template>
+      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b></template>
       的文件
     </div>
     <!-- 文件列表 -->
-<!--    <transition-group class="upload-file-list el-upload-list el-upload-list&#45;&#45;text" name="el-fade-in-linear" tag="ul">-->
-<!--      <li :key="file.url + index" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">-->
-<!--        <el-link :href="`${file.url}`" :underline="false" target="_blank">-->
-<!--          <span class="el-icon-document"> {{ file.name }} </span>-->
-<!--        </el-link>-->
-<!--        <div class="ele-upload-list__item-content-action">-->
-<!--          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>-->
-<!--        </div>-->
-<!--      </li>-->
-<!--    </transition-group>-->
+    <!--    <transition-group class="upload-file-list el-upload-list el-upload-list&#45;&#45;text" name="el-fade-in-linear" tag="ul">-->
+    <!--      <li :key="file.url + index" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">-->
+    <!--        <el-link :href="`${file.url}`" :underline="false" target="_blank">-->
+    <!--          <span class="el-icon-document"> {{ file.name }} </span>-->
+    <!--        </el-link>-->
+    <!--        <div class="ele-upload-list__item-content-action">-->
+    <!--          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>-->
+    <!--        </div>-->
+    <!--      </li>-->
+    <!--    </transition-group>-->
   </el-form>
 </template>
 
 <script>
-import { getToken } from "@/utils/auth";
+import {getToken} from "@/utils/auth";
 
 export default {
   props: {
@@ -55,14 +57,14 @@ export default {
       type: Number,
       default: 5,
     },
-    disabled:{
-      type:Boolean,
+    disabled: {
+      type: Boolean,
       default: false
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg'],
+      default: () => ['dwg', 'dwt', 'doc', 'docx', 'xls', 'xlsx', 'png', 'jpg', 'jpeg'],
     },
     // 是否显示提示
     isShowTip: {
@@ -75,7 +77,7 @@ export default {
       dialogImageUrl: "",
       dialogVisible: false,
       hideUpload: false,
-      type:"",
+      type: "",
       baseUrl: process.env.VUE_APP_BASE_API,
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/obs", // 上传的图片服务器地址
       headers: {
@@ -93,7 +95,7 @@ export default {
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "object") {
-              item = { name: item.fileName, url: item.picUrl };
+              item = {name: item.fileName, url: item.picUrl};
             }
             return item;
           });
@@ -113,27 +115,27 @@ export default {
     },
   },
   methods: {
-    handlePreview(file){
-      if (file.url==null)return;
+    handlePreview(file) {
+      if (file.url == null) return;
       const link = document.createElement('a');
       link.href = file.url;
-      link.download = file.name?file.name:'文件'; // 可以指定下载后的文件名
+      link.download = file.name ? file.name : '文件'; // 可以指定下载后的文件名
       link.click();
     },
     // 删除文件
     handleDelete(index) {
 
       const obj = this.fileList[index];
-      if(obj!=null) {
-          this.fileList.splice(index, 1);
+      if (obj != null) {
+        this.fileList.splice(index, 1);
       }
       this.$emit("input", this.fileList);
     },
     // 删除图片
     handleRemove(file, fileList) {
       const findex = this.fileList.map(f => f.url).indexOf(file.url);
-      if(findex > -1) {
-          this.fileList.splice(findex, 1);
+      if (findex > -1) {
+        this.fileList.splice(findex, 1);
       }
 
       this.$emit("removeFile", this.fileList);
@@ -141,9 +143,10 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res) {
       if (res.code == 200) {
-        this.fileList.push({ name: res.data.fileName, url: res.data.url });
+        this.fileList.push({name: res.data.fileName, url: res.data.url});
         this.$emit("input", this.fileList);
-        this.loading.close();
+        if (this.loading)
+          this.loading.close();
       } else {
         this.$message.error(res.msg);
         this.loading.close();
@@ -162,18 +165,18 @@ export default {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
           let name = '';
           let flag = false;
-          if (!['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg'].includes(fileExtension)){
-            name='cad文件类型：dwg，dwt；word文件类型：doc，docx；Excel文件类型：xls,xlsx;照片文件类型：jpg,png,jpeg';
+          if (!['dwg', 'dwt', 'doc', 'docx', 'xls', 'xlsx', 'png', 'jpg', 'jpeg'].includes(fileExtension)) {
+            name = 'cad文件类型：dwg，dwt；word文件类型：doc，docx；Excel文件类型：xls,xlsx;照片文件类型：jpg,png,jpeg';
             flag = true
           }
-          if (flag==true) {
+          if (flag == true) {
             this.$message.error(
               `文件格式不正确, 规则：${name}!`
             );
             return false;
           }
           return true
-        }else {
+        } else {
           return false
         }
 
@@ -207,7 +210,7 @@ export default {
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
-      this.type=file.name.slice(file.name.lastIndexOf(".")+1);
+      this.type = file.name.slice(file.name.lastIndexOf(".") + 1);
       console.log(this.type)
     },
     // 对象转成指定字符串分隔
@@ -227,6 +230,7 @@ export default {
 ::v-deep.hide .el-upload--picture-card {
   display: none;
 }
+
 // 去掉动画效果
 ::v-deep .el-list-enter-active,
 ::v-deep .el-list-leave-active {
@@ -237,21 +241,25 @@ export default {
   opacity: 0;
   transform: translateY(0);
 }
+
 .upload-file-uploader {
   margin-bottom: 5px;
 }
+
 .upload-file-list .el-upload-list__item {
   border: 1px solid #e4e7ed;
   line-height: 2;
   margin-bottom: 10px;
   position: relative;
 }
+
 .upload-file-list .ele-upload-list__item-content {
   display: flex;
   justify-content: space-between;
   align-items: center;
   color: inherit;
 }
+
 .ele-upload-list__item-content-action .el-link {
   margin-right: 10px;
 }

src/views/zdsz/enginee/material/material_statistics/index.vue

@@ -1,11 +1,4 @@
 
- <!-- 
-    *@description: 用料统计
-    *@author: yh Fu
-    *@date: 2023-12-25 13:07:41
-    *@version: V1.0.5 
-    -->
-
 <template>
     <div class="MaterialStatistics_Contain">
         <el-radio-group v-model="currentMenu" style="margin-bottom: 20px;" @input="toModule">
@@ -13,104 +6,82 @@
             <el-radio-button label="1">进度统计</el-radio-button>
             <el-radio-button label="2">可视化进度</el-radio-button>
         </el-radio-group>
-        <div class="topContain">
+<!--        <div class="topContain">-->
             <div style="width: 100%;height: 100%;display: flex;">
-                <div>
-                    <el-select 
-                    v-model="currentDistrict" 
-                    placeholder="请选择行政区"
-                    class="projectSelect districtSelect" 
-                    popper-class="projectDropDown" 
-                    :popper-append-to-body="false"
-                    @change="districtHasChanged"
-                    >
+              <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+                <el-form-item label="行政区" prop="district">
+                  <el-select v-model="queryParams.district" placeholder="请选择行政区" clearable
+                             @change="queryParams.areaId = undefined;getAreaList(queryParams.district)"
+                             @clear="queryParams.areaId = undefined;areaList=[];
+                   queryParams.buildingId = undefined;buildingList=[];
+                   queryParams.unitId = undefined;unitList=[]">
                     <el-option
-                        v-for="e in dict.type.district"
-                        :key="e.value"
-                        :label="e.label"
-                        :value="e.value">
-                    </el-option>
-                </el-select>
-                </div>
-                <div>
-                    <el-select 
-                        v-model="currentCommunity" 
-                        placeholder="请选择小区"
-                        class="projectSelect communitySelect" 
-                        popper-class="projectDropDown" 
-                        :popper-append-to-body="false"
-                        @change="communityHasChanged"
-                        >
-                        <el-option
-                            v-for="e in communityOptions"
-                            :key="e.id"
-                            :label="e.name"
-                            :value="e.id">
-                        </el-option>
-                    </el-select>
-
-                </div>
-                <el-select 
-                    v-model="currentBuilding" 
-                    placeholder="请选择楼栋"
-                    class="projectSelect" 
-                    @change="buildingHasChanged"
-                    popper-class="projectDropDown" 
-                    :popper-append-to-body="false"
-                    >
+                      v-for="dict in dict.type.district"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="小区名称" prop="areaId">
+                  <el-select v-model="queryParams.areaId" filterable clearable placeholder="请选择小区">
                     <el-option
-                        v-for="e in buildingOptions"
-                        :key="e.id"
-                        :label="e.name"
-                        :value="e.id">
+                      v-for="item in areaList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
                     </el-option>
-                </el-select>
-                <el-select 
-                    v-model="currentUnit" 
-                    placeholder="请选择单元"
-                    class="projectSelect" 
-                    popper-class="projectDropDown" 
-                    :popper-append-to-body="false"
-                    >
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="材质" prop="realityQuality" label-width="45px">
+                  <el-select v-model="queryParams.realityQuality" placeholder="请选择材质" filterable clearable
+                             @change="queryParams.realityQuality != undefined;getEnginSpecificationsList(queryParams.realityQuality)"
+                             @clear="queryParams.realityQuality = undefined;"
+                  >
                     <el-option
-                        v-for="e in unitOptions"
-                        :key="e.id"
-                        :label="e.name"
-                        :value="e.id">
-                    </el-option>
-                </el-select>
-                <el-select 
-                    v-model="currentType" 
-                    placeholder="请选择工程类型" 
-                    class="projectSelect" 
-                    popper-class="projectDropDown" 
-                    :popper-append-to-body="false"
-                    >
+                      v-for="obj in EnginMaterialQualityList"
+                      :key="obj.id"
+                      :label="obj.name"
+                      :value="obj.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="规格" prop="realitySpecifications"label-width="45px">
+                  <el-select v-model="queryParams.realitySpecifications" filterable clearable placeholder="请选择规格"
+                  >
                     <el-option
-                        v-for="e in typeOptions"
-                        :key="e.value"
-                        :label="e.label"
-                        :value="e.value">
+                      v-for="item in EnginSpecificationsList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
                     </el-option>
-                </el-select>
-                <el-date-picker
-                    v-model="currentDate"
-                    class="projectSelect" 
-                    popper-class="projectDropDown" 
-                    :popper-append-to-body="false"
-                    type="date"
-                    placeholder="选择日期">
-                </el-date-picker>
-            </div>
-            
-            <el-button class="searchBtn">查询</el-button>
-            <el-button 
-                icon="el-icon-download"
-                @click="handleExport"
-                class="searchBtn"
-                v-hasPermi="['zdsz:visual_house:export']"
-                >导出</el-button>
-        </div>    
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="工程周期" prop="enginCycle">
+                  <el-select v-model="queryParams.enginCycle" filterable clearable placeholder="请选择规格"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.engin_cycle"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item>
+                  <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                  <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                  <el-button
+                    icon="el-icon-download"
+                    @click="handleExport"
+                    size="mini"
+                    v-hasPermi="['zdsz:visual_house:export']"
+                  >导出</el-button>
+                </el-form-item>
+              </el-form>
+
+        </div>
         <div style="width: 100%; height: 100%;">
             <el-table
                 class="materialStatisticsTable"
@@ -119,45 +90,68 @@
                 border
                 :cell-style="tableRowClassName"
                 style="width: 100%">
+              <el-table-column
+                prop="areaName"
+                label="小区"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="materialQuality"
+                label="材质"
+              >
+              </el-table-column>
                 <el-table-column
-                prop="date"
-                width="250"
-                label=""
+                prop="estimatedSpecifications"
+                label="规格"
                 >
                 </el-table-column>
                 <el-table-column
-                prop="name"
-                label="预计用料"
-                >
+                prop="estimatedSize"
+                label="预计用料">
                 </el-table-column>
-                <el-table-column
-                prop="address"
+              <el-table-column
+                prop="realitySize"
                 label="实际用料">
-                </el-table-column>
+              </el-table-column>
+              <el-table-column
+                prop="enginCycle"
+                label="工程周期">
+              </el-table-column>
             </el-table>
+
         </div>
-        
+
     </div>
 </template>
 
 <script>
 import {
-    getAreaList,                            // 获取当前小区集合
-    getBuildingList,                        // 获取当前楼栋集合
-    getUnitList,                            // 获取当前单元集合
+  getAreaList,                            // 获取当前小区集合
+  getBuildingList, getHousesList,                        // 获取当前楼栋集合
+  getUnitList,                            // 获取当前单元集合
 } from '@/api/zdsz/enginee'
+import {
+  getEnginMaterialQualityList, getEnginSpecificationsList,
+  materialStatistics                           // 获取当前单元集合
+} from '@/api/zdsz/overhead'
+import {getUnits} from "@/api/zdsz/unit";
 export default {
+
     name:'MaterialStatistics',
-    dicts:['district'],
+    dicts:['district','engin_cycle'],
     data(){
         return {
+          buildingList: [],
+          areaList:[],
+          unitList: [],
+          showSearch: true,
             currentDate:null,
             currentMenu:0,   // 0:用料管理 1:进度统计 2:可视化进度
             typeOptions:[
                 {
                     value: '0',
                     label: '市政工程'
-                }, 
+                },
                 {
                     value: '1',
                     label: '工业工程'
@@ -165,11 +159,11 @@ export default {
                 {
                     value: '2',
                     label: '民用工程'
-                }, 
+                },
                 {
                     value: '3',
                     label: '危险作业'
-                }, 
+                },
                 {
                     value: '4',
                     label: '顶管工程'
@@ -183,7 +177,7 @@ export default {
                 {
                     value: '0',
                     label: '领秀世家'
-                }, 
+                },
                 {
                     value: '1',
                     label: '上东府里'
@@ -191,11 +185,11 @@ export default {
                 {
                     value: '2',
                     label: '清华园'
-                }, 
+                },
                 {
                     value: '3',
                     label: '万科蓝山'
-                }, 
+                },
                 {
                     value: '4',
                     label: '龙腾香格里'
@@ -207,57 +201,134 @@ export default {
             currentDistrict:null,       // 当前行政区
             currentCommunity:null,      // 当前小区
             currentBuilding:null,       // 当前楼宇
-            currentUnit:null,           // 当前单元
-            tableData: [
-                {
-                    date: '规格',
-                    name: '0.5cm',
-                    address: '1cm'
-                }, 
-                {
-                    date: '尺寸',
-                    name: '1.2m',
-                    address: '1.5m'
-                }, 
-                {
-                    date: '材质',
-                    name: 'pv',
-                    address: '钢 pv pc'
-                }, 
-            ]
+            currentUnit:null,// 当前单元
+          queryParams:{
+            areaId:undefined,
+            realityQuality:undefined,
+            realitySpecifications:undefined
+          },
+          EnginMaterialQualityList:[],
+          EnginSpecificationsList:[],
+            tableData: []
 
         }
     },
     mounted(){
         console.log(this.dict)
+      this.getEnginMaterialQualityList()
+      //this.getEnginSpecificationsList()
     },
     methods:{
-        // 当前所选行政区发生改变 查询当前小区集合
-        districtHasChanged(district){
-            this.currentCommunity = null
-            getAreaList({district}).then(res => {
-                this.communityOptions = res.data
-            })
-        },
-        // 当前所选小区发生改变 查询当前楼栋集合
-        communityHasChanged(areaId){
-            this.currentBuilding = null
-            getBuildingList({areaId}).then(res => {
-                this.buildingOptions = res.data
-            })
-        },
-        buildingHasChanged(buildingId){
-            this.currentUnit = null
-            getUnitList({buildingId}).then(res => {
-                console.log(res)
-                this.unitOptions = res.data
-            })
-        },
+      getList()
+      {
+
+        materialStatistics(this.queryParams).then(res=>{
+          this.tableData=res.data
+        })
+      },
+      getEnginMaterialQualityList()
+      {
+      getEnginMaterialQualityList().then(res=>{
+        this.EnginMaterialQualityList=res.data
+      })
+      },
+      getEnginSpecificationsList(materId)
+      {
+        getEnginSpecificationsList(materId).then(res=>{
+          this.EnginSpecificationsList=res.data
+        })
+      },
+
+      /** 搜索按钮操作 */
+      handleQuery() {
+        // this.queryParams = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.tableData=[]
+        //this.handleQuery();
+      },
+      getAreaList(district) {
+        if (district === undefined || district == null || district === '')
+          return
+        getAreaList({district: district}).then(res => this.areaList = res.data)
+      },
+      getBuildingList1(areaId) {
+        if (areaId === undefined || areaId == null || areaId === '')
+          return
+        getBuildingList({areaId: areaId}).then(res => this.buildingList = res.data)
+      },
+      getUnitList1(buildingId) {
+        if (buildingId === undefined || buildingId == null || buildingId === '')
+          return
+        getUnits(this.queryParams.areaId, buildingId).then(res => this.unitList = res.data)
+      },
+      currentEnginTypeChange(val){
+        const enginDict = val[1]
+        const enginType = val[0]
+        this.queryParams.enginType = enginType
+        this.enginClassification=enginDict
+        this.enginClassificationOption = this.dict.type[enginDict]
+        console.log(this.value)
+      },
+      // 当前所选行政区发生改变 查询当前小区集合
+      districtHasChanged(district){
+        this.queryParams.areaId = null
+        this.queryParams.buildingId = null
+        this.queryParams.unitId = null
+        getAreaList({district}).then(res => {
+          this.communityOptions = res.data
+        })
+      },
+      // 当前所选小区发生改变 查询当前楼栋集合
+      communityHasChanged(areaId){
+        this.queryParams.buildingId = null
+        this.queryParams.unitId = null
+        getBuildingList({areaId}).then(res => {
+          this.buildingOptions = res.data
+        })
+      },
+      buildingHasChanged(buildingId){
+        console.log(buildingId)
+        this.queryParams.unitId = null
+        getUnitList({buildingId}).then(res => {
+          this.unitOptions = res.data
+        })
+      },
+      unitHasChanged(unitId){
+        getHousesList({unitId}).then(res => {
+          console.log(res)
+          this.houseOptions = res.data
+        })
+      },
+        // // 当前所选行政区发生改变 查询当前小区集合
+        // districtHasChanged(district){
+        //     this.currentCommunity = null
+        //     getAreaList({district}).then(res => {
+        //         this.communityOptions = res.data
+        //     })
+        // },
+        // // 当前所选小区发生改变 查询当前楼栋集合
+        // communityHasChanged(areaId){
+        //     this.currentBuilding = null
+        //     getBuildingList({areaId}).then(res => {
+        //         this.buildingOptions = res.data
+        //     })
+        // },
+        // buildingHasChanged(buildingId){
+        //     this.currentUnit = null
+        //     getUnitList({buildingId}).then(res => {
+        //         console.log(res)
+        //         this.unitOptions = res.data
+        //     })
+        // },
         /** 导出按钮操作 */
         handleExport() {
-            this.download('zdsz/visual_house/export', {
+            this.download('zdsz/materialStatistics/export', {
                 ...this.queryParams
-            }, `house_${new Date().getTime()}.xlsx`)
+            }, `用料统计${new Date().getTime()}.xlsx`)
         },
         tableRowClassName(){
             return "background:#199ED8;border: 2px solid #000066"
@@ -281,17 +352,12 @@ export default {
     width: 100%;
     height: 100%;
     padding: 1%;
-    .topContain{  
+    .topContain{
         display: flex;
         justify-content: space-between;
         width: 100%;
-        // height: 40px;
-        .searchBtn{
-            // height: 100%;
-            width: 11%;
-            background-color: #1890FF;
-            color: #fff;
-        }
+         height: 40px;
+
         ::v-deep .projectSelect{
             width: 16%;
             .el-input__inner{
@@ -376,4 +442,4 @@ export default {
 }
 }
 
-</style>
+</style>

src/views/zdsz/enginee/material/progres_statistics/progres_statistics.vue

@@ -1,10 +1,4 @@
 
- <!-- 
-    *@description: 进度统计
-    *@author: yh Fu
-    *@date: 2023-12-25 13:26:18
-    *@version: V1.0.5 
-    -->
 
 <template>
     <div class="ProgreStatistics_Contain">
@@ -14,37 +8,77 @@
             <el-radio-button label="2">可视化进度</el-radio-button>
         </el-radio-group>
         <div class="topContain">
-            <el-select 
-                v-model="currentType" 
-                placeholder="请选择"
-                class="projectSelect" 
-                popper-class="projectDropDown" 
-                :popper-append-to-body="false"
-                >
-            <el-option
-                v-for="e in typeOptions"
-                :key="e.value"
-                :label="e.label"
-                :value="e.value">
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true"  v-show="showSearch" label-width="68px">
+            <el-form-item label="行政区" prop="district">
+              <el-select v-model="queryParams.district" placeholder="请选择行政区" clearable
+                         @change="queryParams.areaId = undefined;getAreaList(queryParams.district)"
+                         @clear="queryParams.areaId = undefined;areaList=[];
+                   queryParams.buildingId = undefined;buildingList=[];
+                   queryParams.unitId = undefined;unitList=[]">
+                <el-option
+                  v-for="dict in dict.type.district"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="小区名称" prop="areaId">
+              <el-select v-model="queryParams.areaId" filterable clearable placeholder="请选择小区">
+                <el-option
+                  v-for="item in areaList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
                 </el-option>
-            </el-select>
-            <el-button class="searchBtn">查询</el-button>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="工程周期" prop="enginCycle">
+              <el-select v-model="queryParams.enginCycle" filterable clearable placeholder="请选择规格">
+                <el-option
+                  v-for="dict in dict.type.engin_cycle"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+<!--            <el-select-->
+<!--                v-model="currentType"-->
+<!--                placeholder="请选择"-->
+<!--                class="projectSelect"-->
+<!--                popper-class="projectDropDown"-->
+<!--                :popper-append-to-body="false"-->
+<!--                >-->
+<!--            <el-option-->
+<!--                v-for="e in typeOptions"-->
+<!--                :key="e.value"-->
+<!--                :label="e.label"-->
+<!--                :value="e.value">-->
+<!--                </el-option>-->
+<!--            </el-select>-->
+<!--            <el-button class="searchBtn">查询</el-button>-->
         </div>
         <el-table
             class="materialStatisticsTable"
             :data="tableData"
-            header-cell-style="background-color:#199ED8;border: 2px solid #000066"
+            header-cell-style="background-color:#FFFFFF;border: 1px solid #000066"
             border
             :cell-style="tableRowClassName"
             style="width: 100%">
             <el-table-column
-            prop="name"
+            prop="areaName"
             width="250"
             label="小区名称"
             >
             </el-table-column>
             <el-table-column
-            prop="doing"
+            prop="notstart"
             label="未开工（户）"
             >
             </el-table-column>
@@ -58,20 +92,39 @@
             </el-table-column>
 
         </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
     </div>
 </template>
 
 <script>
+import  {
+  getAreaCompletionInformationList
+} from '@/api/zdsz/overhead'
+import {getAreaList, getBuildingList} from "@/api/zdsz/enginee";
+import {getUnits} from "@/api/zdsz/unit";
 export default {
     name:'ProgreStatistics',
+   dicts:['engin_cycle','district'],
     data(){
         return {
+          showSearch: true,
+          buildingList: [],
+          areaList:[],
+          unitList: [],
+          total:0,
+          queryParams:{pageNum:1,pageSize:10, areaId:undefined,enginCycle:"0"},
             currentMenu:1,   // 0:用料管理 1:进度统计 2:可视化进度
             typeOptions:[
                 {
                     value: '0',
                     label: '市政工程'
-                }, 
+                },
                 {
                     value: '1',
                     label: '工业工程'
@@ -79,11 +132,11 @@ export default {
                 {
                     value: '2',
                     label: '民用工程'
-                }, 
+                },
                 {
                     value: '3',
                     label: '危险作业'
-                }, 
+                },
                 {
                     value: '4',
                     label: '顶管工程'
@@ -99,38 +152,74 @@ export default {
                     doing: '30',
                     willDone:'19',
                     done:'20'
-                }, 
+                },
                 {
                     name: '清华园',
                     doing: '30',
                     willDone:'19',
                     done:'20'
-                }, 
+                },
                 {
                     name: '领秀世家',
                     doing: '30',
                     willDone:'19',
                     done:'20'
-                }, 
+                },
                 {
                     name: '上东府里',
                     doing: '30',
                     willDone:'19',
                     done:'20'
-                }, 
+                },
                 {
                     name: '龙腾香格里',
                     doing: '30',
                     willDone:'19',
                     done:'20'
-                }, 
+                },
             ],
             currentType:'管'
         }
     },
-    methods:{
+  mounted() {
+      this.getList()
+  },
+  methods:{
+    getAreaList(district) {
+      if (district === undefined || district == null || district === '')
+        return
+      getAreaList({district: district}).then(res => this.areaList = res.data)
+    },
+    getBuildingList1(areaId) {
+      if (areaId === undefined || areaId == null || areaId === '')
+        return
+      getBuildingList({areaId: areaId}).then(res => this.buildingList = res.data)
+    },
+    getUnitList1(buildingId) {
+      if (buildingId === undefined || buildingId == null || buildingId === '')
+        return
+      getUnits(this.queryParams.areaId, buildingId).then(res => this.unitList = res.data)
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.tableData=[]
+      this.queryParams = {pageNum:1,pageSize:10, areaId:undefined,enginCycle:"0"};
+      this.handleQuery();
+    },
+      getList()
+      {
+        getAreaCompletionInformationList(this.queryParams).then(res=>{
+          this.total=res.total
+          this.tableData=res.rows
+          })
+      },
         tableRowClassName(){
-            return "background:#199ED8;border: 2px solid #000066"
+            return "background:#FFFFFF;border: 1px solid #000066"
         },
         toModule(){
             console.log(this.$router)
@@ -148,10 +237,10 @@ export default {
     width: 100%;
     height: 100%;
     padding: 1%;
-    .topContain{  
+    .topContain{
         display: flex;
         justify-content: space-between;
-        width: 38%;
+        width: 100%;
         .searchBtn{
             width: 11%;
             background: linear-gradient(to right , #2197F2, #0BB0DE);
@@ -183,13 +272,14 @@ export default {
         ::v-deep .el-table__row{
             background-color: #2F4280;
         }
-        ::v-deep tbody tr:hover>td { 
-            transform: translateX(8px) translateY(-8px);
+        ::v-deep tbody tr:hover>td {
+            transform: translateX(3px) translateY(-3px);
             z-index: 100;
-            box-shadow: 10px 10px 10px 10px #182652;
-            background-color: #30478E;
-            color: #fff;
-        }	
+            box-shadow: 3px 3px 3px 3px rgba(82, 82, 82, 0.5);
+            background-color: rgba(98, 98, 98, 0.52);
+          font-size: 15px;
+            color: #ea0404;
+        }
     }
     .materialStatisticsTable::before{
         background-color:#000066 ;
@@ -198,4 +288,4 @@ export default {
         background-color:#000066 ;
     }
 }
-</style>
+</style>

src/views/zdsz/engineeringDangerous/index.vue

@@ -74,17 +74,17 @@
         >删除
         </el-button>
       </el-col>
-<!--      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['zdsz:engineeringDangerous:export']"
-        >导出
-        </el-button>
-      </el-col>-->
+      <!--      <el-col :span="1.5">
+              <el-button
+                type="warning"
+                plain
+                icon="el-icon-download"
+                size="mini"
+                @click="handleExport"
+                v-hasPermi="['zdsz:engineeringDangerous:export']"
+              >导出
+              </el-button>
+            </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -154,13 +154,13 @@
             @click="addNewPipe(scope.row)"
           >新增顶管工程
           </el-button>
-<!--          <el-button
-            type="text"
-            icon="el-icon-edit"
-            size="mini"
-            @click="viewSource(scope.row)"
-          >历史
-          </el-button>-->
+          <!--          <el-button
+                      type="text"
+                      icon="el-icon-edit"
+                      size="mini"
+                      @click="viewSource(scope.row)"
+                    >历史
+                    </el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -399,59 +399,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="附件" prop="" v-if="currentType==='put'">
+            <el-form-item label="附件" prop="">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
                              :value="form.pics"
               ></ObsFileUpload>
             </el-form-item>
-            <el-form-item label="附件" prop="" v-if="currentType==='add'">
-              <ObsFileUpload ref="obsFileUpload" :file-size="100"
-                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
-                             :value="form.files"
-              ></ObsFileUpload>
-            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: 20%;">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
-<!--         <el-button :loading="buttonLoading" type="primary" @click="openNode">填写节点信息</el-button>-->
-<!--        <el-button :loading="buttonLoading" type="primary" @click="toNodeDetail">填写节点信息</el-button>-->
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 节点信息dialog -->
-<!--    <el-dialog :visible="openNodeForm" :rules="nodesRule" title="节点信息" append-to-body customClass="appendElNodeDialog" width="70% !important">
-    <el-form ref="nodeForm" :model="zEngineeringInfoBo" :rules="nodeRules" label-width="200px">
-      <el-form-item label="施工时间" prop="constructTime">
-        <el-date-picker
-          v-model="zEngineeringInfoBo.constructTime"
-          value-format="yyyy-MM-dd hh:mm:ss"
-          type="datetime"
-          placeholder="请选择施工时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="照片" prop="zEngiineeringPhotoBoList" style="width: 100%;">
-        <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="zEngineeringInfoBo.zEngiineeringPhotoBoList"
-                        @input="getUrl"></ObsImageUpload>
-      </el-form-item>
-      <div style="display: flex;margin-top: 3%;">
-        <div style="width: 80%;"></div>
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
-        <el-button @click="nodeCancel">取 消</el-button>
-      </div>
-    </el-form>
-    </el-dialog>-->
-<!--    <enginee-node
-      ref="childNode"
-      @closeToSucceed="closeToSucceed"
-    />-->
-    <EngineePipe ref="enginPipe"/>
-    <ConstructionDetails
-      ref="ConstructionDetails"
-      :currentCollapses="currentCollapses"
-    />
+
   </div>
 </template>
 
@@ -461,14 +423,10 @@ import {
   getEngineeringDangerous,
   delEngineeringDangerous, queryEngineeringDangerous, updateEngineeringDangerous, addEngineeringDangerous,
 } from "@/api/zdsz/engineeringDangerous";
-import EngineeNode from "@/components/EngineeNode/index";
 import data from "@/views/system/dict/data.vue";
-import EngineePipe from '@/components/EngineePipe'
-import ConstructionDetails from "@/components/ConstructionDetails/index.vue";
 import {validPhoneMobile, checkPositiveDecimal} from "@/api/rules";
 
 
-
 export default {
   name: "EngineeringDangerous",
   computed: {
@@ -476,13 +434,11 @@ export default {
       return data
     }
   },
-  components: {
-    EngineePipe, EngineeNode, ConstructionDetails
-  },
+  components: {},
   data() {
     return {
       //备用
-     // openNodeForm:false,
+      // openNodeForm:false,
       //备用
       currentCollapses: [],
       nodeType: "危险作业工程",
@@ -509,7 +465,7 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        files: [],
+        pics: [],
         pageNum: 1,
         pageSize: 10,
         basicInformation: undefined,
@@ -545,10 +501,10 @@ export default {
         backfill: undefined,
         tamp: undefined,
         levelingTheSite: undefined,
-      /*  zEngineeringNodeBo: {
-          type: "危险作业工程",
-          zEngineeringInfoBo: {}  //节点信息
-        }*/
+        /*  zEngineeringNodeBo: {
+            type: "危险作业工程",
+            zEngineeringInfoBo: {}  //节点信息
+          }*/
       },
       zEngineeringInfoBo: {
         constructAddre: '',        // 施工地址
@@ -598,9 +554,9 @@ export default {
         enginAddre: [
           {required: true, message: "工程地点不能为空", trigger: "blur"}
         ],
-      /*  enginTime: [
-          {required: true, message: "工程时间不能为空", trigger: "blur"}
-        ],*/
+        /*  enginTime: [
+            {required: true, message: "工程时间不能为空", trigger: "blur"}
+          ],*/
         hazardousWorkPitsLong: [
           //{required: true, message: "危险作业坑大小(长)不能为空", trigger: "blur"},
           {validator: checkPositiveDecimal, trigger: 'blur'},
@@ -617,125 +573,8 @@ export default {
           // {required: true, message: "现场负责人电话不能为空", trigger: "blur"}
           {validator: validPhoneMobile, trigger: 'blur'},
         ],
-        /*   pipeDiameter: [
-             {required: true, message: "管径不能为空", trigger: "blur"}
-           ],
-           tubularProduct: [
-             {required: true, message: "管材不能为空", trigger: "blur"}
-           ],
-           casingPresent: [
-             {required: true, message: "是否存在套管不能为空", trigger: "blur"}
-           ],
-           pipePressure: [
-             {required: true, message: "管道压力不能为空", trigger: "blur"}
-           ],
-           gasSourceDirection: [
-             {required: true, message: "气源方向不能为空", trigger: "blur"}
-           ],
-           taskPosition: [
-             {required: true, message: "作业位置不能为空", trigger: "blur"}
-           ],
-           valvePosition: [
-             {required: true, message: "与作业相关阀门位置不能为空", trigger: "blur"}
-           ],
-           stressReport: [
-             {required: true, message: "压力报告不能为空", trigger: "blur"}
-           ],
-           supervisionRecord: [
-             {required: true, message: "监理旁站记录不能为空", trigger: "blur"}
-           ],
-           workContactForm: [
-             {required: true, message: "工作联系单不能为空", trigger: "blur"}
-           ],
-           linePatrolConfirmationForm: [
-             {required: true, message: "巡线确认单不能为空", trigger: "blur"}
-           ],
-           hazardousWorkPitsLong: [
-             {required: true, message: "危险作业坑大小(长)不能为空", trigger: "blur"}
-           ],
-           hazardousWorkPitsWide: [
-             {required: true, message: "危险作业坑大小(宽)不能为空", trigger: "blur"}
-           ],
-           hazardousWorkPitsDeep: [
-             {required: true, message: "危险作业坑大小(深)不能为空", trigger: "blur"}
-           ],
-           needSupport: [
-             {required: true, message: "是否需要支护不能为空", trigger: "blur"}
-           ],
-           otherPipelineConditionsWorkPit: [
-             {required: true, message: "作业坑内其他管道情况不能为空", trigger: "blur"}
-           ],
-           siteHead: [
-             {required: true, message: "现场负责人不能为空", trigger: "blur"}
-           ],
-           siteHeadPhone: [
-             {required: true, message: "现场负责人电话不能为空", trigger: "blur"}
-           ],
-           operatorInformation: [
-             {required: true, message: "作业人员信息不能为空", trigger: "blur"}
-           ],
-           inspectionPort: [
-             {required: true, message: "检口不能为空", trigger: "blur"}
-           ],
-           pipelinePainting: [
-             {required: true, message: "管道刷油不能为空", trigger: "blur"}
-           ],
-           pipelineSupport: [
-             {required: true, message: "管道支护不能为空", trigger: "blur"}
-           ],
-           pipelineCorrosionProtection: [
-             {required: true, message: "管道防腐不能为空", trigger: "blur"}
-           ],
-           masonryValveWell: [
-             {required: true, message: "砌筑阀门井不能为空", trigger: "blur"}
-           ],
-           protectionWell: [
-             {required: true, message: "保护井不能为空", trigger: "blur"}
-           ],
-           pipeProtectionWelMasonry: [
-             {required: true, message: "管件保护井砌筑不能为空", trigger: "blur"}
-           ],
-           backfill: [
-             {required: true, message: "回填不能为空", trigger: "blur"}
-           ],
-           tamp: [
-             {required: true, message: "夯实不能为空", trigger: "blur"}
-           ],
-           levelingTheSite: [
-             {required: true, message: "平整场地不能为空", trigger: "blur"}
-           ],*/
-      },
-      // 节点规则校验
-     /* nodeRules: {
-        type: [
-          {required: true, message: "节点类型不能为空", trigger: 'blur'}
-        ],
-        constructAddre: [
-          {required: true, message: "施工地址不能为空", trigger: 'blur'}
-        ],
-        constructPhone: [
-          {required: true, message: "施工人电话不能为空", trigger: 'blur'}
-        ],
-        constructUser: [
-          {required: true, message: "施工人不能为空", trigger: 'blur'}
-        ],
-        headName: [
-          {required: true, message: "负责人不能为空", trigger: 'blur'}
-        ],
-        headPhone: [
-          {required: true, message: "负责人电话不能为空", trigger: 'blur'}
-        ],
 
-      },*/
-      //备用
-  /*    nodesRule:{
-        zEngiineeringPhotoBoList: [
-          {required: true, message: "图片不能为空", trigger: 'blur'}
-        ],
-        constructTime: [
-          {required: true, message: "施工时间不能为空", trigger: 'blur'}
-        ],
-      },*/
+      },
       //备用
       currentType: null, // 组件类型 put修改 add新增
     };
@@ -749,7 +588,15 @@ export default {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.id != null) {
-            this.form.files = this.$refs.obsFileUpload.fileList
+            this.form.pics = []
+            for (let i = 0; i < this.$refs.obsFileUpload.fileList.length; i++) {
+              console.log(this.$refs.obsFileUpload.fileList[i])
+              this.form.pics.push({
+                'fileName': this.$refs.obsFileUpload.fileList[i].name,
+                'picUrl': this.$refs.obsFileUpload.fileList[i].url
+              })
+            }
+
             updateEngineeringDangerous(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -758,7 +605,14 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            this.form.files = this.$refs.obsFileUpload.fileList
+            this.form.pics = []
+            for (let i = 0; i < this.$refs.obsFileUpload.fileList.length; i++) {
+              console.log(this.$refs.obsFileUpload.fileList[i])
+              this.form.pics.push({
+                'fileName': this.$refs.obsFileUpload.fileList[i].name,
+                'picUrl': this.$refs.obsFileUpload.fileList[i].url
+              })
+            }
             addEngineeringDangerous(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -770,65 +624,7 @@ export default {
         }
       });
     },
-    //备用
-   /* openNode(){
-      this.$refs["form"].validate(valid => {
-        if (valid){
-          this.openNodeForm=true
-          console.log(this.form.id)
-          if (this.form.id !== undefined){
-            getEngineeringDangerous(this.form.id).then((res)=>{
-              console.log(res.data)
-              this.zEngineeringInfoBo = res.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0]
-              this.nodeType = res.data.zEngineeringNodeBoList[0].type
-            })
-          }
-        }
 
-      })
-    },
-    nodeCancel(){
-      this.resetNodeForm()
-      this.openNodeForm = false
-    },
-    resetNodeForm(){
-      this.$refs['nodeForm'].resetFields()
-      this.resetForm("nodeForm");
-    },
-
-    submitForm() {
-      this.$refs["nodeForm"].validate(valid => {
-        if (valid) {
-          if (this.form.id == null) {
-            this.form.zEngineeringNodeBo = {}
-            this.form.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
-            this.form.zEngineeringNodeBo.type = this.nodeType
-            this.form.files = this.$refs.obsFileUpload.fileList
-            this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = []
-            console.log(this.form)
-            addEngineeringDangerous(this.form).then(res => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.openNodeForm = false
-              this.getList();
-            })
-          } else {
-            // 危险修改
-            this.form.zEngineeringNodeBo = {}
-            this.form.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
-            this.form.zEngineeringNodeBo.type = this.nodeType
-            this.form.files = this.$refs.obsFileUpload.fileList
-            this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = []
-            updateEngineeringDangerous(this.form).then(res => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.openNodeForm = false
-              this.getList();
-            })
-          }
-        }
-      });
-    },*/
     //备用
     viewSource(e) {
       this.currentId = e.id
@@ -854,12 +650,12 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.currentType === 'put') {
-            this.form.files = this.$refs.obsFileUpload.fileList
+            this.form.pics = this.$refs.obsFileUpload.fileList
             this.$refs.childNode.open(this.form, 37, [{name: "危险作业工程"}])
             return
           }
           if (this.currentType === 'add') {
-            this.form.files = this.$refs.obsFileUpload.fileList
+            this.form.pics = this.$refs.obsFileUpload.fileList
             this.$refs.childNode.open(this.form, 3, [{name: "危险作业工程"}])
             return
           }
@@ -867,12 +663,12 @@ export default {
       })
 
 
-  /*    return
-      this.$refs['form'].validate(e => {
-        if (e) {
-          this.nodeDetailVisible = true
-        }
-      })*/
+      /*    return
+          this.$refs['form'].validate(e => {
+            if (e) {
+              this.nodeDetailVisible = true
+            }
+          })*/
 
     },
     // 新增顶管工程
@@ -880,25 +676,25 @@ export default {
       this.$refs.enginPipe.openDialog({
         id: data.id,
         type: "危险作业工程"
-      }, 'add',data)
+      }, 'add', data)
     },
     getUrl(url) {
       this.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e => e.url) : [];
     },
     /** 查询危险工程列表 */
-   /* getList() {
-      this.loading = true;
-      listEngineeringDangerous({
-        basicInformation: this.queryParams.basicInformation,
-        enginName: this.queryParams.enginName,
-        enginAddre: this.queryParams.enginAddre,
-        params: this.queryParams
-      }).then(res => {
-        this.engineeringDangerousList = res.rows;
-        this.total = res.total;
-        this.loading = false;
-      });
-    },*/
+    /* getList() {
+       this.loading = true;
+       listEngineeringDangerous({
+         basicInformation: this.queryParams.basicInformation,
+         enginName: this.queryParams.enginName,
+         enginAddre: this.queryParams.enginAddre,
+         params: this.queryParams
+       }).then(res => {
+         this.engineeringDangerousList = res.rows;
+         this.total = res.total;
+         this.loading = false;
+       });
+     },*/
     getList() {
       this.loading = true;
       listEngineeringDangerous(this.queryParams).then(response => {
@@ -1045,7 +841,8 @@ export default {
   .el-form-item:not(:nth-child(1):nth-child(2)) {
     margin-top: 0.5%;
   }
-  .el-form-item__error{
+
+  .el-form-item__error {
     width: 200px;
     color: #ff4949;
     font-size: 12px;
@@ -1055,6 +852,7 @@ export default {
     top: 100%;
     left: 0;
   }
+
   .remark_input {
     .el-textarea__inner {
       width: 238%;