统计问题

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

@@ -58,17 +58,17 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="工程步骤" prop="enginClassification">
-                  <el-select v-model="queryParams.nodeType" placeholder="请选择工程步骤" clearable
-                             @clear="currentEnginTypeChangeOptions2=[];queryParams.enginClassification=undefined;queryParams.enginType=undefined;queryParams.nodeType=undefined">
-                    <el-option
-                      v-for="dict in currentEnginTypeChangeOptions2"
-                      :key="dict.dictValue"
-                      :label="dict.dictLabel"
-                      :value="dict.dictValue"
-                    />
-                  </el-select>
-                </el-form-item>
+<!--                <el-form-item label="工程步骤" prop="enginClassification">-->
+<!--                  <el-select v-model="queryParams.nodeType" placeholder="请选择工程步骤" clearable-->
+<!--                             @clear="currentEnginTypeChangeOptions2=[];queryParams.enginClassification=undefined;queryParams.enginType=undefined;queryParams.nodeType=undefined">-->
+<!--                    <el-option-->
+<!--                      v-for="dict in currentEnginTypeChangeOptions2"-->
+<!--                      :key="dict.dictValue"-->
+<!--                      :label="dict.dictLabel"-->
+<!--                      :value="dict.dictValue"-->
+<!--                    />-->
+<!--                  </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)"
@@ -166,17 +166,17 @@
                 prop="enginClassification"
                 label="工程分类">
               </el-table-column>
+<!--              <el-table-column-->
+<!--                prop="nodeType"-->
+<!--                label="工程步骤">-->
+<!--              </el-table-column>-->
               <el-table-column
-                prop="nodeType"
-                label="工程步骤">
-              </el-table-column>
-              <el-table-column
-                prop="materialQuality"
+                prop="realityQuality"
                 label="材质"
               >
               </el-table-column>
                 <el-table-column
-                prop="estimatedSpecifications"
+                prop="realitySpecifications"
                 label="规格"
                 >
                 </el-table-column>

src/views/zdsz/engineeringCivil/index.vue

@@ -42,7 +42,10 @@
         </el-select>
       </el-form-item>
       <el-form-item label="单元" prop="unitId">
-        <el-select v-model="queryParams1.unitId" placeholder="请选择单元" filterable clearable>
+        <el-select v-model="queryParams1.unitId" placeholder="请选择单元" filterable clearable
+                   @change="queryParams1.houseId = undefined;getHouseList1(queryParams1.unitId)"
+                   @clear="queryParams1.houseId = undefined;houseList=[]"
+        >
           <el-option
             v-for="obj in unitList"
             :key="obj.id"
@@ -51,6 +54,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="房间" prop="houseId">
+        <el-select v-model="queryParams1.houseId" placeholder="请选择房间" filterable clearable>
+          <el-option
+            v-for="obj in houseList"
+            :key="obj.id"
+            :label="obj.name"
+            :value="obj.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="工程类型" prop="enginType">
         <el-select v-model="queryParams1.enginType" placeholder="请选择工程类型" clearable
                    @change="enginTypeHasChangeds"
@@ -796,6 +809,7 @@ import {
 import {getAreaList} from "@/api/zdsz/area";
 import {getBuildingList} from "@/api/zdsz/building";
 import {getUnits} from "@/api/zdsz/unit";
+import {getHouses} from "@/api/zdsz/house";
 import {getDicts} from "@/api/system/dict/data";
 import EnginNodeInfo from "@/components/EnginNodeInfo/index";
 import EngineePipe from '@/components/EngineePipe'
@@ -1299,6 +1313,7 @@ export default {
       areaList: [],
       buildingList: [],
       unitList: [],
+      houseList: [],
       currentDistrict: null,       // 当前行政区
       currentCommunity: null,      // 当前小区
       currentBuilding: null,       // 当前楼宇
@@ -1750,6 +1765,11 @@ export default {
         return
       getUnits(buildingId).then(res => this.unitList = res.data)
     },
+    getHouseList1(unitId) {
+      if (unitId === undefined || unitId == null || unitId === '')
+        return
+      getHouses(unitId).then(res => this.houseList = res.data)
+    },
     /** 查询民用工程列表 */
     getList() {
       this.loading = true;