Selaa lähdekoodia

可视化统计

wangtong 1 vuosi sitten
vanhempi
commit
c8ad811635

+ 47 - 6
src/views/zdsz/enginee/material/material_statistics/index.vue

@@ -73,16 +73,45 @@
                 <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-button
+                    icon="el-icon-download"
+                    @click="handleExport"
+                    size="mini"
+                    v-hasPermi="['zdsz:visual_house:export']"
+                  >导出</el-button>
                 </el-form-item>
               </el-form>
 
         </div>
+      <el-table
+        class="materialStatisticsTable"
+        :data="AreaCompletionInformationList"
+        style="width: 100%">
+        <el-table-column
+          prop="areaName"
+          width="250"
+          label="小区"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="scale"
+          label="规模(户)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="notstart"
+          label="未施工(户)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="willDone"
+          label="施工中(户)">
+        </el-table-column>
+        <el-table-column
+          prop="done"
+          label="竣工(户)">
+        </el-table-column>
+      </el-table>
         <div style="width: 100%; height: 100%;">
             <el-table
                 class="materialStatisticsTable"
@@ -130,6 +159,7 @@ import {
   getUnitList,                            // 获取当前单元集合
 } from '@/api/zdsz/enginee'
 import {
+  getAreaCompletionInformationList,
   getEnginMaterialQualityList, getEnginSpecificationsList,
   materialStatistics                           // 获取当前单元集合
 } from '@/api/zdsz/overhead'
@@ -201,7 +231,10 @@ export default {
             currentCommunity:null,      // 当前小区
             currentBuilding:null,       // 当前楼宇
             currentUnit:null,// 当前单元
+          AreaCompletionInformationList:[],
           queryParams:{
+            pageNum:1,
+            pageSize:10,
             district:null,
             areaId:undefined,
             realityQuality:undefined,
@@ -235,6 +268,13 @@ export default {
           this.tableData=res.data
         })
       },
+      getAreaCompletionInformationList()
+      {
+        getAreaCompletionInformationList(this.queryParams).then(res=>{
+          //this.AreaCompletionInformationList=res.total
+          this.AreaCompletionInformationList=res.rows
+        })
+      },
       getEnginMaterialQualityList()
       {
       getEnginMaterialQualityList().then(res=>{
@@ -254,6 +294,7 @@ export default {
             if(valid){
                 // 校验 pass
                 this.getList();
+              this.getAreaCompletionInformationList()
             } else {
                 this.$message.error('请填写必填项!')
             }

+ 17 - 0
src/views/zdsz/enginee/material/progres_statistics/progres_statistics.vue

@@ -47,6 +47,12 @@
             <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>
 <!--            <el-select-->
@@ -77,6 +83,11 @@
             label="小区名称"
             >
             </el-table-column>
+          <el-table-column
+            prop="scale"
+            label="规模(户)"
+          >
+          </el-table-column>
             <el-table-column
             prop="notstart"
             label="未施工(户)"
@@ -144,6 +155,12 @@ export default {
       this.getList()
   },
   methods:{
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('zdsz/engineeringCivil/getAreaCompletionInformationListexport', {
+        ...this.queryParams
+      }, `进度统计${new Date().getTime()}.xlsx`)
+    },
     getAreaList(district) {
       if (district === undefined || district == null || district === '')
         return

+ 3 - 1
src/views/zdsz/enginee/material/progres_visual/index.vue

@@ -133,7 +133,7 @@
           </el-date-picker>
       </div> -->
       <el-button class="searchBtn" @click="searchCompletionInfo">查询</el-button>
-      <el-button class="searchBtn">导出</el-button>
+<!--      <el-button class="searchBtn">导出</el-button>-->
       <div class="unitStatus">
         <div
           v-for="(e,idx) in unitStatusOption"
@@ -196,6 +196,7 @@ import {getBuildingList} from "@/api/zdsz/building";
 import {getUnits} from "@/api/zdsz/unit";
 import {getDicts} from "@/api/system/dict/data";
 import {getObtainRoomcCompletionInformationList, viewQueryProcessSource} from "@/api/zdsz/enginee"
+import {getAreaCompletionInformationList} from "@/api/zdsz/overhead";
 
 export default {
   name: 'ProgreVisual',
@@ -286,6 +287,7 @@ export default {
         unitId: null,
       },
       roomsInfo: [],
+      AreaCompletionInformationList:[],
       updateParams: {},
       currentRoomId: null,
       currentEnginType: null,