aaa

.gitattributes

+dist/**/* merge=ours
+Dockerfile merge=ours
+src/server/api.js merge=ours
+src/router/* merge=ours
+src/views/home.vue merge=ours
\ No newline at end of file

src/views/houseData/shebei.vue

@@ -10,96 +10,6 @@
 		   </div>
         <div class="portalDetailContentBody" ref='portalDetailContentBody'>
           <template >
-            <div class="layoutMargin detailsPartSection">
-              <p id="experience" class="detailsPartTitle">设施设备基础信息</p>
-              <div style="margin:0 16px;">
-                  <a-row type="flex" justify="start">
-                  <a-col span="8">
-                    <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"小区编码"' :text='febInfo.csName'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                      <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"地面机动车库数量"' :text='febInfo.upVehicleGarageNum'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                      <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"地下机动车库数量"' :text='febInfo.downVehicleGarageNum'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                       <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"机械车库数量"' :text='febInfo.mechGarageNum'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                      <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"非机动车库数量"' :text='febInfo.nonVehicleGarageNum'></DetailsItem>
-                      </a-col>
-                    </a-row>
-
-                </a-col>
-                  <a-col span="8">
-                  <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"供水消防总泵数量"' :text='febInfo.firePumpNum'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                  <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"供水消防总泵维保单位"' :text='febInfo.firePumpRepairComp'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                  <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"供水生活总泵数量"' :text='febInfo.waterPumpNum'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                        <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"供水生活总泵维保单位"' :text='febInfo.waterPumpRepairComp'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                    <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"监控主控室位置"' :text='febInfo.monitoringRoomPosition'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                  </a-col>
-
-                  <a-col span="8">
-                    <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"非机动车库烟感喷淋数量"' :text='febInfo.nonVehicleSmokeSprayNum'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                    <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"生活垃圾库房"' :text='febInfo.domesticGarbageWarehouse'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                    <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"建筑垃圾库房"' :text='febInfo.constructionWasteWarehouse'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                    <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"非机动车集中充电设施设备改造数量"' :text='febInfo.nonVehicleChargeNum'></DetailsItem>
-                      </a-col>
-                    </a-row>
-                    <a-row type="flex" justify="start" class="detailsPartLine">
-                      <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan="12" label="" text=""></DetailsItem>
-                      </a-col>
-                    </a-row>
-                  </a-col>
-                </a-row>
-              </div>
-            </div>
             <div class="layoutMargin detailsPartSection">
               <a-tabs class="portalTable" :activeKey="activeKey" @change="changeTabs">
                 <a-tab-pane v-for="item in tabList" :tab="item.name" :key="item.key" />