历史筛选

api/common.js

@@ -26,22 +26,12 @@ export function getHistoryDetails(id, name) {
 	})
 }
 //  通过身份查询历史 
-export function gethistoryList(createBy, pageNum, pageSize) {
-	//let enginClassification = 'indoor_engin';
-	let enginCycle = '0';
-	const data = {
-		//enginType,
-		//enginClassification,
-		enginCycle,
-		createBy,
-		pageNum,
-		pageSize
+export function gethistoryList(param) {
 
-	}
 	return request({
 		'url': '/zdsz/engineeringCivil/list',
 		'method': 'get',
-		'data': data
+		'data': param
 	})
 }
 // 新增拆旧管

config.js

@@ -1,8 +1,8 @@
 // 应用全局配置
 module.exports = {
-	baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
+	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	// baseUrl: 'http://192.168.4.6:8080',
-	 //baseUrl: 'http://192.168.4.23:8080',
+	 baseUrl: 'http://192.168.4.23:8080',
 	//baseUrl: 'http://192.168.4.11:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',

pages/statistics/statistics.vue

@@ -217,11 +217,7 @@
 					</view>
 				</view>
 
-				<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
-					subtitleKey="id" v-model="name"></SelectPicker>
 
-				<SelectPicker :list="dictOptions" @change="changeSelect" v-if="openDict" @close="closeDict"
-					titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
 			</scroll-view>
 		</view>
 		<view v-else-if="isLeader=='app_user'">
@@ -243,14 +239,183 @@
 					</view>
 				</view>
 			</view> -->
+
+			<view class="background">
+
+
+				<view>
+
+					<view
+						style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+						筛选
+
+						<image v-if="change==false" :src="loadImgSrc('icon_user_open.png')" @click='change1'
+							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
+						</image>
+						<image v-if="change==true" :src="loadImgSrc('icon_user_close.png')" @click='change1'
+							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
+						</image>
+					</view>
+				</view>
+				<view v-show="change" style="padding-right: 10px;">
+
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view>
+								行政区
+							</view>
+							<view v-if="this.isEmpty(this.XZQValue3.dictValue)" style="margin-top: 10;"
+								@click="pickerShow('xzq3')">
+								<span style="color: darkgray;">请选择行政区</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq3')">
+								<span style="color: black;">{{XZQValue3.dictLabel}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+
+						</view>
+					</view>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view>
+								小区
+							</view>
+
+							<view v-if="this.isEmpty(this.XQValue3.id)" class="uni-list-cell-db" style="margin-top: 10;"
+								@click="pickerShow('xq3')">
+								<span style="color: darkgray;">请选择小区</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq3')">
+								<span style="color: black;">{{XQValue3.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+						</view>
+					</view>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								楼栋
+							</view>
+							<view v-if="this.isEmpty(this.LDValue3.id)" class="uni-list-cell-db" style="margin-top: 10;"
+								@click="pickerShow('ld3')">
+								<span style="color: darkgray;">请选择楼栋</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld3')">
+								<span style="color: black;">{{LDValue3.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+						</view>
+					</view>
+					<view class="uni-list" style="margin-top: 10;">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								单元
+							</view>
+							<view v-if="this.isEmpty(this.DYValue3.id)" class="uni-list-cell-db" style="margin-top: 10;"
+								@click="pickerShow('dy3')">
+								<span style="color: darkgray;">请选择单元</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy3')">
+								<span style="color: black;">{{DYValue3.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+						</view>
+					</view>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								房间
+							</view>
+							<view v-if="this.isEmpty(this.FJValue3.id)" class="uni-list-cell-db" style="margin-top: 10;"
+								@click="pickerShow('fj3')">
+								<span style="color: darkgray;">请选择房间</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fj3')">
+								<span style="color: black;">{{FJValue3.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+						</view>
+					</view>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								工程类型
+							</view>
+							<view v-if="this.isEmpty(this.ProjectType.dictValue)" class="uni-list-cell-db"
+								style="margin-top: 10;" @click="pickerShow('gclx')">
+								<span style="color: darkgray;">请选择工程类型</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gclx')">
+								<span style="color: black;">{{ProjectType.dictLabel}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+						</view>
+					</view>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								工程分类
+							</view>
+							<view v-if="this.isEmpty(this.ProjectClassification.dictValue)" class="uni-list-cell-db"
+								style="margin-top: 10;" @click="pickerShow('gcfl')">
+								<span style="color: darkgray;">请选择工程分类</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcfl')">
+								<span style="color: black;">{{ProjectClassification.dictLabel}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+						</view>
+					</view>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								工程步骤
+							</view>
+							<view v-if="this.isEmpty(this.ProjectSteps.dictValue)" class="uni-list-cell-db"
+								style="margin-top: 10;" @click="pickerShow('gcbz')">
+								<span style="color: darkgray;">请选择工程步骤</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcbz')">
+								<span style="color: black;">{{ProjectSteps.dictLabel}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+						</view>
+					</view>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								审核状态
+							</view>
+							<view v-if="this.isEmpty(this.ReviewStatus.dictValue)" class="uni-list-cell-db"
+								style="margin-top: 10;" @click="pickerShow('shzt')">
+								<span style="color: darkgray;">请选择审核状态</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('shzt')">
+								<span style="color: black;">{{ReviewStatus.dictLabel}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+						</view>
+					</view>
+					<button class="tj-btn" style="margin: 40rpx 90rpx;" @click="serch"> 搜索</button>
+				</view>
+			</view>
 			<cc-pullScroolView class="pullScrollView" ref="pullScroll" :pullDown="pullDown" :isDownLoading="true">
 				<view class="notice" v-for="(item,index) in list" :key="index">
 					<view class="justify-content" @click="chooseNode(item)">
 						<view class="font-forty">
 							{{item.areaName+item.buildingName+item.unitName+item.houseName+(item.enginType=='new_built'? '-新建':'-旧改')+'-'+item.enginClassificationName}}
 						</view>
-						<view class="font-twenty-eight gray" v-for="(state,stateIndex) in item.nodeReViewStateList" :key="stateIndex"
-							v-if="state.Type!='开栓'">
+						<view class="font-twenty-eight gray" v-for="(state,stateIndex) in item.nodeReViewStateList"
+							:key="stateIndex" v-if="state.Type!='开栓'">
 							{{state.Type}}-{{state.state == 1 ? '审核通过': (state.content == '暂未审核' ? '暂未审核':'审核未通过')}}
 							<view v-if="state.content != '暂未审核'">原因：{{state.content}}</view>
 						</view>
@@ -286,6 +451,11 @@
 		</view>
 
 		<bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
+		<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
+			subtitleKey="id" v-model="name"></SelectPicker>
+
+		<SelectPicker :list="dictOptions" @change="changeSelect" v-if="openDict" @close="closeDict" titleKey="dictLabel"
+			subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
 	</view>
 </template>
 
@@ -334,10 +504,10 @@
 				isLeader: '',
 				list: [],
 				newlist: [],
-				pageSize: 10, // 条数
+				pageSize: 10,
 				totalNum: '',
-				pageNum: 1, // 页数
-				typeList: '', //二次弹窗数据
+				pageNum: 1,
+				typeList: '',
 				villageIndex: 0,
 				specificationIndex: 0,
 				materialIndex: 0,
@@ -359,6 +529,10 @@
 				XQList2: [],
 				LDList2: [],
 				DYList2: [],
+				XQList3: [],
+				LDList3: [],
+				DYList3: [],
+				FJList3: [],
 				projectValue2: {
 					'dictValue': '0'
 				},
@@ -367,6 +541,16 @@
 				XQValue2: {},
 				LDValue2: {},
 				DYValue2: {},
+				XZQValue3: {},
+				XQValue3: {},
+				LDValue3: {},
+				DYValue3: {},
+				FJValue3: {},
+				ProjectType: {},
+				ProjectClassification: {},
+				ProjectSteps: {},
+				ReviewStatus: {},
+				change: false,
 				specificationValue: {},
 				specificationList: [],
 				materialValue: {},
@@ -377,41 +561,13 @@
 				nodeId: '',
 				nodeType: '',
 				roomItem: {},
-				// List: [{
-				// 		id: 1,
-				// 		title: '民用工程'
-				// 	},
-				// 	{
-				// 		id: 2,
-				// 		title: '工业工程'
-				// 	},
-				// 	{
-				// 		id: 3,
-				// 		title: '市政工程'
-				// 	},
-				// 	{
-				// 		id: 4,
-				// 		title: '危险作业工程'
-				// 	},
-				// 	{
-				// 		id: 5,
-				// 		title: '顶管工程'
-				// 	},
-				// 	{
-				// 		id: 6,
-				// 		title: '基建工程'
-				// 	},
-				// 	{
-				// 		id: 7,
-				// 		title: '开栓'
-				// 	},
-				// ]
+
 			}
 		},
 		created() {},
 		onLoad() {
 			this.isLeader = getUserType()
-			//this.changeTab();
+
 			if (this.isLeader == 'app_user') {
 				this.changeTab();
 			}
@@ -420,12 +576,12 @@
 
 		// 上拉加载
 		onReachBottom() {
-			// 数据全部加载完
+
 
 			if (this.pageNum * 10 >= this.totalNum) {
 
 			} else {
-				// 显示加载中
+
 				this.$refs.pullScroll.showUpLoading();
 				this.pageNum++;
 				this.requestData();
@@ -447,14 +603,20 @@
 
 
 			},
+			serch() {
+				this.changeTab();
+			},
+			change1() {
+				this.change = !this.change
+			},
 			isEmpty(str) {
 				return (!str || 0 === str.length);
 			},
-			// 显示二次弹窗
+
 			handleShowSheet() {
 				this.shareState = true;
 			},
-			// 隐藏二次弹窗
+
 			handleHiddenShare() {
 				this.shareState = false;
 			},
@@ -549,12 +711,53 @@
 				}
 			},
 			pickerShow(e) {
-				this.type = e; //赋值类型
-				if (e == 'gczq') { //工程周期
+				this.type = e;
+				if (e == 'gczq') {
 					this.openDict = true;
 					getDicts("engin_cycle").then(response => {
 						this.dictOptions = response.data;
 					});
+				} else if (e == 'gclx') {
+
+					this.openDict = true;
+					getDicts('indoor_engin_type').then(response => {
+						this.dictOptions = response.data;
+					});
+				} else if (e == 'gcfl') {
+					if (this.isEmpty(this.ProjectType.dictValue)) {
+						this.$modal.msg('请选择工程类型')
+
+					} else {
+						this.openDict = true;
+						getDicts(this.ProjectType.dictValue).then(response => {
+							this.dictOptions = response.data;
+
+						});
+					}
+				} else if (e == 'gcbz') {
+					if (this.isEmpty(this.ProjectClassification.dictValue)) {
+						this.$modal.msg('请选择工程分类')
+
+					} else {
+						this.openDict = true;
+						getDicts(this.ProjectType.dictValue + "_" + this.ProjectClassification.dictValue).then(
+							response => {
+								this.dictOptions = response.data;
+
+							});
+					}
+				} else if (e == 'shzt') {
+					if (this.isEmpty(this.ProjectSteps.dictValue)) {
+						this.$modal.msg('请选择工程步骤')
+
+					} else {
+						this.openDict = true;
+						getDicts('state_options').then(
+							response => {
+								this.dictOptions = response.data;
+
+							});
+					}
 				} else if (e == 'xzq') {
 					if (this.isEmpty(this.projectValue.dictValue)) {
 						this.$modal.msg('请选择工程周期')
@@ -565,7 +768,7 @@
 							this.dictOptions = response.data;
 						});
 					}
-				} else if (e == 'xq') { //小区
+				} else if (e == 'xq') {
 					if (this.isEmpty(this.XZQValue.dictValue)) {
 						this.$modal.msg('请选择行政区')
 
@@ -573,7 +776,7 @@
 						this.open = true;
 						this.selectList = this.XQList;
 					}
-				} else if (e == 'ld') { //楼栋
+				} else if (e == 'ld') {
 
 					if (this.isEmpty(this.XQValue.id)) {
 						this.$modal.msg('请选择小区')
@@ -583,7 +786,7 @@
 						this.selectList = this.LDList;
 					}
 
-				} else if (e == 'dy') { //单元
+				} else if (e == 'dy') {
 					if (this.isEmpty(this.LDValue.id)) {
 						this.$modal.msg('请选择楼栋')
 
@@ -591,12 +794,12 @@
 						this.open = true;
 						this.selectList = this.DYList;
 					}
-				} else if (e == 'gczq2') { //工程周期
+				} else if (e == 'gczq2') {
 					this.openDict = true;
 					getDicts("engin_cycle").then(response => {
 						this.dictOptions = response.data;
 					});
-				} else if (e == 'xzq2') { //行政区2
+				} else if (e == 'xzq2' || e == 'xzq3') {
 					if (this.isEmpty(this.projectValue2.dictValue)) {
 						this.$modal.msg('请选择工程周期')
 
@@ -606,7 +809,7 @@
 							this.dictOptions = response.data;
 						});
 					}
-				} else if (e == 'xq2') { //小区2
+				} else if (e == 'xq2') {
 					if (this.isEmpty(this.XZQValue2.dictValue)) {
 						this.$modal.msg('请选择行政区')
 
@@ -614,7 +817,7 @@
 						this.open = true;
 						this.selectList = this.XQList2;
 					}
-				} else if (e == 'ld2') { //楼栋2
+				} else if (e == 'ld2') {
 
 					if (this.isEmpty(this.XQValue2.id)) {
 						this.$modal.msg('请选择小区')
@@ -624,7 +827,7 @@
 						this.selectList = this.LDList2;
 					}
 
-				} else if (e == 'dy2') { //单元2
+				} else if (e == 'dy2') {
 					if (this.isEmpty(this.LDValue2.id)) {
 						this.$modal.msg('请选择楼栋')
 
@@ -632,7 +835,41 @@
 						this.open = true;
 						this.selectList = this.DYList2;
 					}
-				} else if (e == 'gg') { //规格
+				} else if (e == 'xq3') {
+					if (this.isEmpty(this.XZQValue3.dictValue)) {
+						this.$modal.msg('请选择行政区')
+
+					} else {
+						this.open = true;
+						this.selectList = this.XQList3;
+					}
+				} else if (e == 'ld3') {
+
+					if (this.isEmpty(this.XQValue3.id)) {
+						this.$modal.msg('请选择小区')
+
+					} else {
+						this.open = true;
+						this.selectList = this.LDList3;
+					}
+
+				} else if (e == 'dy3') {
+					if (this.isEmpty(this.LDValue2.id)) {
+						this.$modal.msg('请选择楼栋')
+
+					} else {
+						this.open = true;
+						this.selectList = this.DYList3;
+					}
+				} else if (e == 'fj3') {
+					if (this.isEmpty(this.LDValue3.id)) {
+						this.$modal.msg('请选择楼栋')
+
+					} else {
+						this.open = true;
+						this.selectList = this.FJList3;
+					}
+				} else if (e == 'gg') {
 					if (this.isEmpty(this.materialValue.id)) {
 						this.$modal.msg('请选择材料')
 
@@ -641,45 +878,59 @@
 						this.selectList = this.materialList;
 
 					}
-				} else if (e == 'cz') { //材料
+				} else if (e == 'cz') {
 					this.open = true;
 					getEnginMaterialQualityList("民用工程").then(response => {
 						this.selectList = response.data;
 					});
 				}
 			},
+
 			changeSelect(item, index) {
-				// this.index = index;
-				// this.address = item.communityName;
+
 				this.open = false;
 				this.openDict = false;
 				if (this.type == 'xzq') {
 					this.XZQValue = item;
 
-					//根据行政区id获取小区数据
-					this.XQValue = ''; //重置小区数据
-					this.LDValue = ''; //重置楼栋数据
-					this.DYValue = ''; //重置单元数据
-					this.FJValue = ''; //重置房间数据
+
+					this.XQValue = '';
+					this.LDValue = '';
+					this.DYValue = '';
+					this.FJValue = '';
 					getAreaList(item.dictValue).then(res => {
 						this.XQList = res.data;
 					})
 				} else if (this.type == 'gczq') {
 					this.projectValue = item
 
+				} else if (this.type == 'gclx') {
+					this.ProjectType = item
+					this.ProjectClassification = '';
+					this.ProjectSteps = '';
+					this.ReviewStatus = '';
+				} else if (this.type == 'gcfl') {
+					this.ProjectClassification = item
+					this.ProjectSteps = '';
+					this.ReviewStatus = '';
+				} else if (this.type == 'gcbz') {
+					this.ProjectSteps = item
+					this.ReviewStatus = '';
+				} else if (this.type == 'shzt') {
+					this.ReviewStatus = item
 				} else if (this.type == 'xq') {
 					this.XQValue = item;
-					//根据小区id 获取楼栋数据
-					this.LDValue = ''; //重置楼栋数据
-					this.DYValue = ''; //重置单元数据
-					this.FJValue = ''; //重置房间数据
+
+					this.LDValue = '';
+					this.DYValue = '';
+					this.FJValue = '';
 
 					this.queryMaterialsUsedList();
 				} else if (this.type == 'ld') {
 					this.LDValue = item;
-					//根据楼栋ID 获取单元数据
-					this.DYValue = ''; //重置单元数据
-					this.FJValue = ''; //重置房间数据
+
+					this.DYValue = '';
+					this.FJValue = '';
 					getUnitList(item.id).then(res => {
 						this.DYList = res.data
 					})
@@ -692,55 +943,90 @@
 				} else if (this.type == 'xzq2') {
 					this.XZQValue2 = item;
 
-					//根据行政区id获取小区数据
-					this.XQValue2 = ''; //重置小区数据
-					this.LDValue2 = ''; //重置楼栋数据
-					this.DYValue2 = ''; //重置单元数据
-					this.FJValue2 = ''; //重置房间数据
+
+					this.XQValue2 = '';
+					this.LDValue2 = '';
+					this.DYValue2 = '';
+					this.FJValue2 = '';
 					getAreaList(item.dictValue).then(res => {
 						this.XQList2 = res.data;
 					})
-				} else if (this.type == 'xq2') { //小区2
+				} else if (this.type == 'xzq3') {
+					this.XZQValue3 = item;
+
+					this.XQValue3 = '';
+					this.LDValue3 = '';
+					this.DYValue3 = '';
+					this.FJValue3 = '';
+					getAreaList(item.dictValue).then(res => {
+						this.XQList3 = res.data;
+					})
+				} else if (this.type == 'xq2') {
 					this.XQValue2 = item;
-					//根据小区id 获取楼栋数据
-					this.LDValue2 = ''; //重置楼栋数据
-					this.DYValue2 = ''; //重置单元数据
-					this.FJValue2 = ''; //重置房间数据
+
+					this.LDValue2 = '';
+					this.DYValue2 = '';
+					this.FJValue2 = '';
 					getBuildingList(item.id).then(res => {
 						this.LDList2 = res.data
 					})
+				} else if (this.type == 'xq3') {
+					this.XQValue3 = item;
+
+					this.LDValue3 = '';
+					this.DYValue3 = '';
+					this.FJValue3 = '';
+					getBuildingList(item.id).then(res => {
+						this.LDList3 = res.data
+					})
 				} else if (this.type == 'ld2') {
 					this.LDValue2 = item;
-					//根据楼栋ID 获取单元数据
-					this.DYValue2 = ''; //重置单元数据
-					this.FJValue2 = ''; //重置房间数据
+
+					this.DYValue2 = '';
+					this.FJValue2 = '';
 					getUnitList(item.id).then(res => {
 						this.DYList2 = res.data
 					})
 
+				} else if (this.type == 'ld3') {
+					this.LDValue3 = item;
+
+					this.DYValue3 = '';
+					this.FJValue3 = '';
+					getUnitList(item.id).then(res => {
+						this.DYList3 = res.data
+					})
+
+				} else if (this.type == 'dy3') {
+					this.DYValue3 = item;
+					this.FJValue3 = '';
+					getHousesList(item.id).then(res => {
+						this.FJList3 = res.data
+					})
+
 				} else if (this.type == 'dy2') {
 					this.DYValue2 = item;
 					this.queryProjectStatisticsList();
-				} else if (this.type == 'gg') { //规格
+				} else if (this.type == 'gg') {
 					this.specificationValue = item;
 					this.queryMaterialsUsedList();
-				} else if (this.type == 'cz') { //材料
+				} else if (this.type == 'cz') {
 					this.materialValue = item;
-					this.specificationValue = ''; //重置规格
+					this.specificationValue = '';
 
 					this.queryMaterialsUsedList();
-					//根据材质ID 获取规格数据
+
 					getEnginSpecificationsList(item.id).then(res => {
 						this.materialList = res.data
 					})
 
 				}
 			},
-			//关闭弹窗
+
 			close(e) {
 				this.open = false
 			},
-			//关闭弹窗
+
 			closeDict(e) {
 				this.openDict = false
 			},
@@ -784,7 +1070,7 @@
 					return "#80d9ae";
 				}
 			},
-			//材料清空val 
+
 			clearMaterialInfo() {
 				this.materialValue = '';
 				this.specificationValue = '';
@@ -795,7 +1081,7 @@
 				this.queryMaterialsUsedList();
 			},
 
-			// 下拉刷新
+
 			pullDown(pullScroll) {
 
 				this.pageNum = 1;
@@ -816,11 +1102,11 @@
 
 				});
 			},
-			changeTab(e) {
-				this.pageSize = 10; // 条数
+			changeTab() {
+				this.pageSize = 10;
 				this.totalNum = '';
-				this.pageNum = 1; // 页数
-				//this.tabIndex = e;
+				this.pageNum = 1;
+
 				this.requestData();
 
 			},
@@ -829,15 +1115,31 @@
 				uni.showLoading()
 
 				let type = ''
+				let param = {
+					district: this.XZQValue3.dictValue == undefined ? '' : this.XZQValue3.dictValue,
+					areaId: this.XQValue3.id == undefined ? '' : this.XQValue3.id,
+					buildingId: this.LDValue3.id == undefined ? '' : this.LDValue3.id,
+					unitId: this.DYValue3.id == undefined ? '' : this.DYValue3.id,
+					houseId: this.FJValue3.id == undefined ? '' : this.FJValue3.id,
+					enginType: this.ProjectType.dictValue == undefined ? '' : this.ProjectType.dictValue,
+					enginCycle: '0',
+					enginClassification: this.ProjectClassification.dictValue == undefined ? '' : this
+						.ProjectClassification.dictValue,
+					type: this.ProjectSteps.dictValue == undefined ? '' : this.ProjectSteps.dictValue,
+					completionStatus: this.ReviewStatus.dictValue == undefined ? '' : this.ReviewStatus.dictValue,
+					createBy: user.state.name,
+					pageNum: this.pageNum,
+					pageSize: this.pageSize
 
-				gethistoryList(user.state.name, this.pageNum, this.pageSize).then(res => {
+				}
+				gethistoryList(param).then(res => {
 
 					this.totalNum = res.total
 
 					if (res.code == '200') {
 						uni.hideLoading()
 						if (res.rows.length !== 0) {
-							//首次加载10条数据，后进行拼接
+
 							if (this.pageNum == 1) {
 								this.list = [];
 								this.list = res.rows
@@ -845,13 +1147,13 @@
 								this.list = this.list.concat(res.rows)
 							}
 
-							// 如果是最后一页
+
 							if (this.pageNum * 10 >= this.totalNum) {
 								this.$refs.pullScroll.finish();
 
 							} else {
 
-								// 不是最后一页
+
 								this.$refs.pullScroll.success();
 							}
 
@@ -880,7 +1182,8 @@
 		top: 50%;
 		transform: translateY(-50%);
 	}
-	.uni-media-list{
+
+	.uni-media-list {
 		width: 100%;
 	}
 
@@ -1220,4 +1523,16 @@
 			border-top: 1rpx solid #E4E7ED;
 		}
 	}
+
+	.background {
+		// border: 15px solid hsla(0, 0%, 100%, .5);
+		background: white;
+		background-clip: padding-box;
+		padding: 20rpx;
+		border-radius: 20rpx;
+		margin: 20rpx 10rpx;
+		/*从padding开始往外面裁剪背景*/
+
+
+	}
 </style>