|
@@ -200,12 +200,14 @@
|
|
<view class="HuaDongBiao">
|
|
<view class="HuaDongBiao">
|
|
<view class="NeiRong" v-for="(item,index) in roomList" :key="index">
|
|
<view class="NeiRong" v-for="(item,index) in roomList" :key="index">
|
|
<view class="Fang" v-for="(item2, index2) in roomList[index]" :key="index2">
|
|
<view class="Fang" v-for="(item2, index2) in roomList[index]" :key="index2">
|
|
- <view v-if="item2.roomStatus=='施工中'" class="ShiGongZhong" @click="goHistory(item2)">
|
|
|
|
|
|
+ <view v-if="item2.roomStatus=='施工中'" class="ShiGongZhong"
|
|
|
|
+ @click="goHistory(item2,'Room')">
|
|
{{ item2.roomName }}
|
|
{{ item2.roomName }}
|
|
</view>
|
|
</view>
|
|
<view v-else-if="item2.roomStatus=='未施工'" class="WeiShiGong">{{ item2.roomName }}
|
|
<view v-else-if="item2.roomStatus=='未施工'" class="WeiShiGong">{{ item2.roomName }}
|
|
</view>
|
|
</view>
|
|
- <view v-else class="JunGong" @click="goHistory(item2)">{{ item2.roomName }}</view>
|
|
|
|
|
|
+ <view v-else class="JunGong" @click="goHistory(item2,'Room')">{{ item2.roomName }}
|
|
|
|
+ </view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -276,22 +278,23 @@
|
|
|
|
|
|
<scroll-view :scroll-x="true" class="view_bg_build" v-if="CourtyardRoomList.length > 0"
|
|
<scroll-view :scroll-x="true" class="view_bg_build" v-if="CourtyardRoomList.length > 0"
|
|
style="margin-top: 10px;">
|
|
style="margin-top: 10px;">
|
|
- <view class="HuaDongBiao">
|
|
|
|
- <view class="NeiRong" v-for="(item,index) in CourtyardRoomList" :key="index">
|
|
|
|
- <view class="Fang" v-for="(item2, index2) in CourtyardRoomList[index]" :key="index2">
|
|
|
|
- <view v-if="item2.buildingStatus=='施工中'" class="ShiGongZhong"
|
|
|
|
- @click="goHistory(item2)">
|
|
|
|
- {{ item2.buildingName }}
|
|
|
|
|
|
+ <view class="HuaDongBiao flex-col">
|
|
|
|
+ <view class="NeiRong dong" v-for="(item,index) in CourtyardRoomList" :key="index">
|
|
|
|
+ <view class="Fang">
|
|
|
|
+ <view v-if="item.unitStatus=='施工中'" class="ShiGongZhong"
|
|
|
|
+ @click="goHistory(item,'Courtyard')">
|
|
|
|
+ {{ item.unitName }}
|
|
</view>
|
|
</view>
|
|
- <view v-else-if="item2.buildingStatus=='未施工'" class="WeiShiGong">
|
|
|
|
- {{ item2.buildingName }}
|
|
|
|
|
|
+ <view v-else-if="item.unitStatus=='未施工'" class="WeiShiGong">
|
|
|
|
+ {{ item.unitName }}
|
|
</view>
|
|
</view>
|
|
- <view v-else class="JunGong" @click="goHistory(item2)">{{ item2.buildingName }}
|
|
|
|
|
|
+ <view v-else class="JunGong" @click="goHistory(item,'Courtyard')">
|
|
|
|
+ {{ item.unitName }}
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
</scroll-view>
|
|
</scroll-view>
|
|
<view v-if="CourtyardRoomList.length == 0" style="padding:50rpx;text-align: center;">暂无数据</view>
|
|
<view v-if="CourtyardRoomList.length == 0" style="padding:50rpx;text-align: center;">暂无数据</view>
|
|
@@ -369,19 +372,21 @@
|
|
|
|
|
|
<scroll-view :scroll-x="true" class="view_bg_build" v-if="OverheadRoomList.length > 0"
|
|
<scroll-view :scroll-x="true" class="view_bg_build" v-if="OverheadRoomList.length > 0"
|
|
style="margin-top: 10px;">
|
|
style="margin-top: 10px;">
|
|
- <view class="HuaDongBiao">
|
|
|
|
- <view class="NeiRong" v-for="(item,index) in OverheadRoomList" :key="index">
|
|
|
|
- <view class="Fang" v-for="(item2, index2) in OverheadRoomList[index]" :key="index2">
|
|
|
|
- <view v-if="item2.unitStatus=='施工中'" class="ShiGongZhong" @click="goHistory(item2)">
|
|
|
|
- {{ item2.unitName }}
|
|
|
|
|
|
+ <view class="HuaDongBiao flex-col">
|
|
|
|
+ <view class="NeiRong dong" v-for="(item,index) in OverheadRoomList" :key="index">
|
|
|
|
+ <view class="Fang">
|
|
|
|
+ <view v-if="item.unitStatus=='施工中'" class="ShiGongZhong"
|
|
|
|
+ @click="goHistory(item,'Overhead')">
|
|
|
|
+ {{ item.unitName }}
|
|
</view>
|
|
</view>
|
|
- <view v-else-if="item2.unitStatus=='未施工'" class="WeiShiGong">{{ item2.unitName }}
|
|
|
|
|
|
+ <view v-else-if="item.unitStatus=='未施工'" class="WeiShiGong">{{ item.unitName }}
|
|
|
|
+ </view>
|
|
|
|
+ <view v-else class="JunGong" @click="goHistory(item,'Overhead')">{{ item.unitName }}
|
|
</view>
|
|
</view>
|
|
- <view v-else class="JunGong" @click="goHistory(item2)">{{ item2.unitName }}</view>
|
|
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
</scroll-view>
|
|
</scroll-view>
|
|
<view v-if="OverheadRoomList.length == 0" style="padding:50rpx;text-align: center;">暂无数据</view>
|
|
<view v-if="OverheadRoomList.length == 0" style="padding:50rpx;text-align: center;">暂无数据</view>
|
|
@@ -458,19 +463,22 @@
|
|
|
|
|
|
<scroll-view :scroll-x="true" class="view_bg_build" v-if="BottomLegRoomList.length > 0"
|
|
<scroll-view :scroll-x="true" class="view_bg_build" v-if="BottomLegRoomList.length > 0"
|
|
style="margin-top: 10px;">
|
|
style="margin-top: 10px;">
|
|
- <view class="HuaDongBiao">
|
|
|
|
- <view class="NeiRong" v-for="(item,index) in BottomLegRoomList" :key="index">
|
|
|
|
- <view class="Fang" v-for="(item2, index2) in BottomLegRoomList[index]" :key="index2">
|
|
|
|
- <view v-if="item2.unitStatus=='施工中'" class="ShiGongZhong" @click="goHistory(item2)">
|
|
|
|
- {{ item2.unitName }}
|
|
|
|
|
|
+ <view class="HuaDongBiao flex-col">
|
|
|
|
+ <view class="NeiRong dong" v-for="(item,index) in BottomLegRoomList" :key="index">
|
|
|
|
+ <view class="Fang">
|
|
|
|
+ <view v-if="item.unitStatus=='施工中'" class="ShiGongZhong"
|
|
|
|
+ @click="goHistory(item,'BottomLeg')">
|
|
|
|
+ {{ item.unitName }}
|
|
|
|
+ </view>
|
|
|
|
+ <view v-else-if="item.unitStatus=='未施工'" class="WeiShiGong">{{ item.unitName }}
|
|
</view>
|
|
</view>
|
|
- <view v-else-if="item2.unitStatus=='未施工'" class="WeiShiGong">{{ item2.unitName }}
|
|
|
|
|
|
+ <view v-else class="JunGong" @click="goHistory(item,'BottomLeg')">
|
|
|
|
+ {{ item.unitName }}
|
|
</view>
|
|
</view>
|
|
- <view v-else class="JunGong" @click="goHistory(item2)">{{ item2.unitName }}</view>
|
|
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
</scroll-view>
|
|
</scroll-view>
|
|
<view v-if="BottomLegRoomList.length == 0" style="padding:50rpx;text-align: center;">暂无数据</view>
|
|
<view v-if="BottomLegRoomList.length == 0" style="padding:50rpx;text-align: center;">暂无数据</view>
|
|
@@ -1150,6 +1158,7 @@
|
|
nodeId: '',
|
|
nodeId: '',
|
|
nodeType: '',
|
|
nodeType: '',
|
|
roomItem: {},
|
|
roomItem: {},
|
|
|
|
+ roomType: '',
|
|
roomId: '',
|
|
roomId: '',
|
|
projectList: [],
|
|
projectList: [],
|
|
projectBody01: {},
|
|
projectBody01: {},
|
|
@@ -1319,17 +1328,69 @@
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- goHistory(item) {
|
|
|
|
|
|
+ goHistory(item, type) {
|
|
|
|
|
|
|
|
+ this.roomType = type;
|
|
this.roomItem = item;
|
|
this.roomItem = item;
|
|
- getDicts(item.enginCycle + '_indoor_engin').then(response => {
|
|
|
|
- this.typeList = response.data;
|
|
|
|
|
|
+ if (type != 'BottomLeg') {
|
|
|
|
+ let label = '';
|
|
|
|
+ switch (type) {
|
|
|
|
+ case 'Room': //室内
|
|
|
|
+ label = item.enginCycle + '_indoor_engin';
|
|
|
|
+ break
|
|
|
|
+ case 'Courtyard': //庭院
|
|
|
|
+ label = 'old_renovation_courtyard';
|
|
|
|
+ break
|
|
|
|
+ case 'Overhead': //架空
|
|
|
|
+ label = 'old_renovation_overhead';
|
|
|
|
+ break
|
|
|
|
+ }
|
|
|
|
|
|
- let result = JSON.parse(JSON.stringify(this.typeList).replace(/dictValue/g, 'Type'));
|
|
|
|
- this.typeList = result;
|
|
|
|
- this.handleShowSheet();
|
|
|
|
- });
|
|
|
|
|
|
+ getDicts(label).then(response => {
|
|
|
|
+ this.typeList = response.data;
|
|
|
|
+
|
|
|
|
+ let result = JSON.parse(JSON.stringify(this.typeList).replace(/dictValue/g, 'Type'));
|
|
|
|
+ this.typeList = result;
|
|
|
|
+ this.handleShowSheet();
|
|
|
|
+ });
|
|
|
|
+ } else { //底腿
|
|
|
|
+ let param = {
|
|
|
|
+ areaId: item.areaId, // 小区id
|
|
|
|
+ buildingId: item.buildingId, // 楼宇id
|
|
|
|
+ unitId: item.unitId, // 单元id
|
|
|
|
+ enginCycle: this.projectValue2.dictValue, // 工程周期
|
|
|
|
+ enginType: item.enginCycle,
|
|
|
|
+ enginClassification: 'bottom_leg',
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ getRoomProjectId(param).then(res => {
|
|
|
|
+
|
|
|
|
+ if (res.code == '200') {
|
|
|
|
+
|
|
|
|
+ if (res.data != null) {
|
|
|
|
+
|
|
|
|
+ getRoomProjectList(res.data.id, '底腿').then(res => {
|
|
|
|
+
|
|
|
|
+ if (res.data.zEngineeringNodeBo != null) {
|
|
|
|
+
|
|
|
|
+ this.historyList = res.data
|
|
|
|
+ this.showHistoryList();
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+ this.$modal.msg("暂无历史信息")
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ })
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+ this.$modal.msg("暂无工程信息")
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ this.$modal.msg(res.msg)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
|
|
|
|
+ }
|
|
|
|
|
|
},
|
|
},
|
|
serch() {
|
|
serch() {
|
|
@@ -1454,16 +1515,42 @@
|
|
},
|
|
},
|
|
showTypeSheet(item) {
|
|
showTypeSheet(item) {
|
|
if (this.isLeader == 'sys_user') {
|
|
if (this.isLeader == 'sys_user') {
|
|
-
|
|
|
|
- let param = {
|
|
|
|
- areaId: this.roomItem.areaId,
|
|
|
|
- buildingId: this.roomItem.buildingId,
|
|
|
|
- unitId: this.roomItem.unitId,
|
|
|
|
- houseId: this.roomItem.roomId,
|
|
|
|
- enginCycle: this.projectValue2.dictValue, // 工程周期
|
|
|
|
- enginType: this.roomItem.enginCycle,
|
|
|
|
- enginClassification: 'indoor_engin', //写死 室内
|
|
|
|
|
|
+ let param = '';
|
|
|
|
+ console.log("====", this.roomType, item.Type)
|
|
|
|
+ if (this.roomType == 'Room') { //室内
|
|
|
|
+ param = {
|
|
|
|
+ areaId: this.roomItem.areaId,
|
|
|
|
+ buildingId: this.roomItem.buildingId,
|
|
|
|
+ unitId: this.roomItem.unitId,
|
|
|
|
+ houseId: this.roomItem.roomId,
|
|
|
|
+ enginCycle: this.projectValue2.dictValue, // 工程周期
|
|
|
|
+ enginType: this.roomItem.enginCycle,
|
|
|
|
+ enginClassification: 'indoor_engin', //写死 室内
|
|
|
|
+ }
|
|
|
|
+ } else if (this.roomType == 'Courtyard') {
|
|
|
|
+ //庭院
|
|
|
|
+ param = {
|
|
|
|
+ areaId: this.roomItem.areaId,
|
|
|
|
+ buildingId: this.roomItem.buildingId,
|
|
|
|
+ // unitId: this.roomItem.unitId,
|
|
|
|
+ // houseId: this.roomItem.roomId,
|
|
|
|
+ enginCycle: this.projectValue2.dictValue, // 工程周期
|
|
|
|
+ enginType: this.roomItem.enginCycle,
|
|
|
|
+ enginClassification: 'courtyard', //写死 室内
|
|
|
|
+ }
|
|
|
|
+ } else if (this.roomType == 'Overhead') {
|
|
|
|
+ //架空
|
|
|
|
+ param = {
|
|
|
|
+ areaId: this.roomItem.areaId,
|
|
|
|
+ buildingId: this.roomItem.buildingId,
|
|
|
|
+ unitId: this.roomItem.unitId,
|
|
|
|
+ // houseId: this.roomItem.roomId,
|
|
|
|
+ enginCycle: this.projectValue2.dictValue, // 工程周期
|
|
|
|
+ enginType: this.roomItem.enginCycle,
|
|
|
|
+ enginClassification: 'overhead', //写死 室内
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
getRoomProjectId(param).then(res => {
|
|
getRoomProjectId(param).then(res => {
|
|
|
|
|
|
if (res.code == '200') {
|
|
if (res.code == '200') {
|
|
@@ -1474,8 +1561,17 @@
|
|
|
|
|
|
if (res.data.zEngineeringNodeBo != null) {
|
|
if (res.data.zEngineeringNodeBo != null) {
|
|
|
|
|
|
- this.historyList = res.data
|
|
|
|
- this.showHistoryList();
|
|
|
|
|
|
+ this.bottomSheetTitle = item.Type
|
|
|
|
+ if (item.Type == '下沟' || item.Type == '全貌照片' || item.Type ==
|
|
|
|
+ '焊接') {
|
|
|
|
+ this.historyListMore = res.data
|
|
|
|
+
|
|
|
|
+ this.showHistoryMoreList();
|
|
|
|
+ } else {
|
|
|
|
+ this.historyList = res.data
|
|
|
|
+ this.showHistoryList();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
} else {
|
|
} else {
|
|
this.$modal.msg("暂无历史信息")
|
|
this.$modal.msg("暂无历史信息")
|
|
@@ -2836,4 +2932,15 @@
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ .dong {
|
|
|
|
+ width: 31%;
|
|
|
|
+ margin: 0 2px;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ .flex-col {
|
|
|
|
+ display: flex;
|
|
|
|
+ flex-direction: row !important;
|
|
|
|
+ flex-wrap: wrap;
|
|
|
|
+ }
|
|
</style>
|
|
</style>
|