工业工程列表导出

src/api/zdsz/countIndustry.js

@@ -3,8 +3,9 @@ import request from '@/utils/request'
 // 查询工程用料统计列表
 export function materialStatistics(query) {
   return request({
-    url: '/zdsz/materialStatistics/list',
-    method: 'post',
+    // url: '/zdsz/materialStatistics/list',
+    url: '/zdsz/engineeringWasteMaterial/engineeringIndustryList',
+    method: 'get',
     data: query
   })
 }

src/views/zdsz/enginee/industry/industry_statistics/index.vue

@@ -10,30 +10,30 @@
         <!--        <div class="topContain">-->
         <div style="width: 100%;height: 100%;display: flex;">
             <el-form :model="queryParams" :rules="searchRules" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" class="searchForm">
-                <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" label-width="80px">
-                    <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-form-item>
+                <!--<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" label-width="80px">-->
+                    <!--<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-form-item>-->
                 <el-form-item label="工程类型" prop="enginType">
                     <el-select v-model="queryParams.enginType" placeholder="请选择工程类型" clearable
                                @change="enginTypeHasChangeds"
@@ -131,6 +131,7 @@
 
         </div>
         <el-table
+            v-if="false"
             class="materialStatisticsTable"
             :data="AreaCompletionInformationList"
             style="width: 100%">
@@ -169,41 +170,69 @@
                 class="materialStatisticsTable"
                 :data="tableData"
                 style="width: 100%">
+                <!--<el-table-column-->
+                    <!--prop="areaName"-->
+                    <!--label="小区"-->
+                <!--&gt;-->
+                <!--</el-table-column>-->
                 <el-table-column
-                    prop="areaName"
-                    label="小区"
-                >
-                </el-table-column>
-                <el-table-column
-                    prop="enginType"
-                    label="工程类型">
+                    prop="enginName"
+                    label="工程名称">
                 </el-table-column>
+                <!--<el-table-column-->
+                    <!--prop="enginType"-->
+                    <!--label="工程类型">-->
+                <!--</el-table-column>-->
                 <el-table-column
                     prop="enginClassification"
                     label="工程分类">
                 </el-table-column>
-                <!--              <el-table-column-->
-                <!--                prop="nodeType"-->
-                <!--                label="工程步骤">-->
-                <!--              </el-table-column>-->
                 <el-table-column
-                    prop="realityQuality"
-                    label="材质"
-                >
+                    prop="actualityPE"
+                    label="PE实际用料">
                 </el-table-column>
                 <el-table-column
-                    prop="realitySpecifications"
-                    label="规格"
-                >
+                    prop="anticipationPE"
+                    label="PE预计用料">
                 </el-table-column>
                 <el-table-column
-                    prop="estimatedSize"
-                    label="预计用料">
+                    prop="percentagePE"
+                    label="PE用料占比">
                 </el-table-column>
                 <el-table-column
-                    prop="realitySize"
-                    label="实际用料">
+                    prop="actualityIron"
+                    label="钢材实际用料">
                 </el-table-column>
+                <el-table-column
+                    prop="anticipationIron"
+                    label="钢材预计用料">
+                </el-table-column>
+                <el-table-column
+                    prop="percentageIron"
+                    label="钢材用料占比">
+                </el-table-column>
+                <!--              <el-table-column-->
+                <!--                prop="nodeType"-->
+                <!--                label="工程步骤">-->
+                <!--              </el-table-column>-->
+                <!--<el-table-column-->
+                    <!--prop="realityQuality"-->
+                    <!--label="材质"-->
+                <!--&gt;-->
+                <!--</el-table-column>-->
+                <!--<el-table-column-->
+                    <!--prop="realitySpecifications"-->
+                    <!--label="规格"-->
+                <!--&gt;-->
+                <!--</el-table-column>-->
+                <!--<el-table-column-->
+                    <!--prop="estimatedSize"-->
+                    <!--label="预计用料">-->
+                <!--</el-table-column>-->
+                <!--<el-table-column-->
+                    <!--prop="realitySize"-->
+                    <!--label="实际用料">-->
+                <!--</el-table-column>-->
 
             </el-table>
 
@@ -385,7 +414,7 @@
             },
             getList()
             {
-
+// 666
                 materialStatistics(this.queryParams).then(res=>{
                     this.tableData=res.data;
                     let seriesData = [];
@@ -545,9 +574,10 @@
             // },
             /** 导出按钮操作 */
             handleExport() {
-                this.download('zdsz/materialStatistics/export', {
+                // this.download('zdsz/materialStatistics/export', {
+                this.download('zdsz/engineeringWasteMaterial/engineeringIndustryExport', {
                     ...this.queryParams
-                }, `用料统计${new Date().getTime()}.xlsx`)
+                }, `工业统计${new Date().getTime()}.xlsx`)
             },
             tableRowClassName(){
                 // return "background:#199ED8;border: 2px solid #000066"