Browse Source

未安装

zhnghongrui 1 year ago
parent
commit
6fba3ccbbd
4 changed files with 309 additions and 394 deletions
  1. 1 1
      config.js
  2. 1 1
      manifest.json
  3. 191 347
      pages/piping_record/piping_record.vue
  4. 116 45
      pages/statistics/statistics.vue

+ 1 - 1
config.js

@@ -2,7 +2,7 @@
 module.exports = {
 	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	// baseUrl: 'http://192.168.4.6:8080',
-	baseUrl: 'http://192.168.4.23:8082',
+	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/',

+ 1 - 1
manifest.json

@@ -41,7 +41,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wxf75b34dd1f737174",
+        "appid" : "wx41e003e1c9067d02",
         "setting" : {
             "urlCheck" : false,
             "es6" : false,

+ 191 - 347
pages/piping_record/piping_record.vue

@@ -67,60 +67,133 @@
 						</view>
 					</view>
 				</view>
-			</view>
 
-			<view class="background" style="margin-top: 20px;margin-bottom: 20px;">
 				<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.FJValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
+							@click="pickerShow('fj')">
+							<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('fj')">
+							<span style="color: black;">{{FJValue.name}}</span>
+							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						</view>
+					</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;">
-						{{name}}
-
-						<span
-							style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-							@click="history">历史</span>
+						户主信息
+
+						<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">
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								户主姓名
+							</view>
+							<view class="uni-list-cell-db" style="margin-top: 10;">
+								<span style="color: darkgray;" v-model="houseHeadName">{{houseHeadName}}</span>
+							</view>
+
+						</view>
+					</view>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								户主电话
+							</view>
+							<view class="uni-list-cell-db" style="margin-top: 10;">
+								<span style="color: darkgray;" v-model="houseHeadPhone">{{houseHeadPhone}}</span>
+							</view>
 
-				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+						</view>
+					</view>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								户主身份证号码
+							</view>
+							<view class="uni-list-cell-db" style="margin-top: 10;">
+								<span style="color: darkgray;"
+									v-model="houseHeadIDcardNumber">{{houseHeadIDcardNumber}}</span>
+							</view>
 
-					<view>
-						施工时间
+						</view>
 					</view>
-					<view @click="openDatetimePicker()">
-						<span style="color: black;">{{time}}</span>
-						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								管理所
+							</view>
+							<view class="uni-list-cell-db" style="margin-top: 10;">
+								<span style="color: darkgray;" v-model="administrative">{{administrative}}</span>
+							</view>
+
+						</view>
 					</view>
 				</view>
-				<view class="container" style="color: #b2b2b2;">*请上传照片</view>
-				<view style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-					<image :src="loadImgSrc('updateimg.png')" mode=""
-						style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage()"
-						v-show="reviewStatus!='1'"></image>
-					<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
-						<view
-							v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
-							<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-								@click="showPhoto(index)">
-							</image>
+			</view>
+			<view class="background">
+				<view class="uni-list">
+					<view
+						style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+						未安装
+					</view>
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+
+						<view>
+							原因
 						</view>
-						<view v-else>
-							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+						<view v-if="this.isEmpty(this.reasonValue.id)" style="margin-top: 10;"
+							@click="pickerShow('reason')">
+							<span style="color: darkgray;">请选择原因</span>
+							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 						</view>
-						<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-							<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
-							</image>
+						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('reason')">
+							<span style="color: black;">{{reasonValue.name}}</span>
+							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						</view>
+
+					</view>
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="uni-title uni-common-pl">具体原因</text>
+							<view style="width: 100%;box-sizing: border-box;">
+								<textarea class="textarea" placeholder="请输入具体原因" maxlength="255"
+									placeholder-style="padding: 10rpx;"
+									style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+									auto-height v-model="specificReasonsValue"></textarea>
+							</view>
 						</view>
 					</view>
-				</view>
 
+				</view>
 			</view>
 
-
+			</view>
 			<view class="action-btn" v-show="reviewStatus!='1'">
 				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
 			</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>
@@ -128,14 +201,13 @@
 			<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
 				titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
 
-			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
-				:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
+
 		</scroll-view>
 	</template>
 
 	<script>
 		import SelectPicker from '../../components/selectPicker/select_picker.vue'
-		import bottomSheet from '../../components/bottomSheet/bottomSheet.vue'
+
 
 		import {
 			getDicts
@@ -147,6 +219,7 @@
 			addTearOldPipe,
 			getRoomProjectList,
 			getRoomProjectId,
+			getHousesList,
 		} from '@/api/common';
 		import {
 			getToken
@@ -154,15 +227,22 @@
 		export default {
 			components: {
 				SelectPicker,
-				bottomSheet,
+
 			},
 			data() {
 				return {
 					title: '',
-					name: '管道施工记录',
+					name: '未安装',
+					administrative: '',
 					headers: {
 						Authorization: "Bearer " + getToken()
 					},
+					reasonValue: {},
+					specificReasonsValue: '',
+					FJValue: {},
+					houseHeadName: '',
+					houseHeadPhone: '',
+					houseHeadIDcardNumber: '',
 					type: '',
 					open: false,
 					reviewStatus: '', //是否可以点击
@@ -182,32 +262,20 @@
 					XQList: '',
 					LDList: '',
 					DYList: '',
+					change: false,
 					FJList: '',
-					progress: 0, //上传图片进度百分比
-					loading: false,
-					historyList: {}, //历史数据
-					inputNumberValue: '',
-					inputIntegerNumberValue: '',
-					inputDecimalNumberValue: '',
+
 				}
 			},
-			created() {
-				this.time = this.traversalTime(new Date().getTime()) //在data里定义变量-nowTime
-			},
+
 			onLoad(options) {
 				if ('params' in options) {
 
 					this.objValue = JSON.parse(decodeURIComponent(options.params));
 
-					if (this.objValue.enginType == `old_renovation`) {
-						this.title = '旧改工程-管道施工记录'
-
-					} else if (this.objValue.enginType == `new_built`) {
-						this.title = '新建工程-管道施工记录'
-					}
-
+					
 					uni.setNavigationBarTitle({
-						title: this.title
+						title: '未安装'
 					})
 				}
 
@@ -217,314 +285,88 @@
 				isEmpty(str) {
 					return (!str || 0 === str.length);
 				},
-				//获取当前时间
-				traversalTime(timestamp) {
-					//timestamp(时间戳)是整数,否则要parseInt转换
-					let time = new Date(timestamp);
-					let y = time.getFullYear();
-					let m = time.getMonth() + 1;
-					let d = time.getDate();
-					let h = time.getHours();
-					let mm = time.getMinutes();
-					let s = time.getSeconds();
-					return y + '-' + this.addTimes(m) + '-' + this.addTimes(d) + ' ' + this.addTimes(h) + ':' + this.addTimes(
-						mm) + ':' + this.addTimes(s);
-				},
-				addTimes(m) {
-					return m < 10 ? '0' + m : m
-				},
-				// 打开picker
-				openDatetimePicker() {
-					this.$refs.myPicker.show();
-				},
-				// 关闭picker
-				closeDatetimePicker() {
-					this.$refs.myPicker.hide();
-				},
-				handleSubmit(e) {
-					this.time = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
-				},
-
-				getStatus() {
-					let param = {
-						areaId: this.XQValue.id, // 小区id
-						buildingId: buildingId, // 楼宇id
-						unitId: this.isEmpty(this.DYValue.id)?'':this.DYValue.id,
-						enginCycle: this.projectValue.dictValue, // 工程周期
-						enginType: this.objValue.enginType, //写死 上一页面传过来的
-						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-					}
-					getRoomProjectId(param).then(res => {
-
-						if (res.code == '200') {
-
-							if (res.data != null && res.data.zEngineeringNodeBoList != null) {
-
-								res.data.zEngineeringNodeBoList.forEach((item, index) => {
-									if (this.objValue.enginClassValue == item.type) {
-										this.reviewStatus = item.reviewStatus;
-										if (item.reviewStatus == '1')
-											this.$modal.msg('当前工程已结束')
-									}
-
-								})
 
+				change1() {
+					this.change = !this.change
+				},
 
-							} else {
-								this.reviewStatus = '' //置空
-							}
 
-						} else {
-							this.$modal.msg(res.msg)
-							this.reviewStatus = '' //置空
-						}
-					})
-				},
-				history() {
+				submit() {
 					if (this.isEmpty(this.projectValue.dictValue)) {
 						this.$modal.msg("请选择工程周期")
-						return
+						return;
 					}
 					if (this.isEmpty(this.XZQValue.dictValue)) {
 						this.$modal.msg("请选择行政区")
-						return
+						return;
 					}
 					if (this.isEmpty(this.XQValue.id)) {
 						this.$modal.msg("请选择小区")
-						return
+						return;
 					}
 					if (this.isEmpty(this.LDValue.id)) {
 						this.$modal.msg("请选择楼栋")
-						return
+						return;
 					}
-					let param = {
-						areaId: this.XQValue.id, // 小区id
-						buildingId: this.LDValue.id, // 楼宇id
-						unitId: this.isEmpty(this.DYValue.id)?'':this.DYValue.id, // 单元id
-						enginCycle: this.projectValue.dictValue, // 工程周期
-						enginType: this.objValue.enginType, //写死 上一页面传过来的  新建/旧改
-						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+					if (this.isEmpty(this.DYValue.id)) {
+						this.$modal.msg("请选择单元")
+						return;
 					}
-					getRoomProjectId(param).then(res => {
-						if (res.code == '200') {
-							if (res.data != null) {
-								getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(res => {
-									this.historyList = res.data
-									if (res.data.zEngineeringNodeBo != null) {
-										this.showHistoryList();
-									} else {
-										this.$modal.msg("暂无历史信息")
-									}
-								})
-							} else {
-								this.$modal.msg("暂无工程信息")
-							}
-						} else {
-							this.$modal.msg(res.msg)
-						}
-					})
-				},
-				showHistoryList() {
-					this.$refs.refShare.handleShowShare();
-				},
-				submit() {
-					if (this.isEmpty(this.projectValue.dictValue)) {
-						this.$modal.msg("请选择工程周期")
-					} else if (this.isEmpty(this.XZQValue.dictValue)) {
-						this.$modal.msg("请选择行政区")
-					} else if (this.isEmpty(this.XQValue.id)) {
-						this.$modal.msg("请选择小区")
-					} else if (this.isEmpty(this.LDValue.id)) {
-						this.$modal.msg("请选择楼栋")
-					} else if (this.imgArr.length <= 0) {
-						this.$modal.msg("请上传照片")
-					} else {
-						uni.showLoading()
-						let param = {
-							district: this.XZQValue.dictValue,
-							areaId: this.XQValue.id,
-							buildingId: this.LDValue.id,
-							unitId: this.isEmpty(this.DYValue.id)?'':this.DYValue.id,
-							enginType: this.objValue.enginType, //写死 上一页面传过来的 
-							enginClassification: this.objValue
-								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-							enginCycle: this.projectValue.dictValue, //工程周期
-							zEngineeringNodeBo: {
-								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
-								zEngineeringInfoBo: {
-									constructTime: this.time,
-									zEngiineeringPhotoBoList: this.imgArr, //照片集合
-								}
+					if (this.isEmpty(this.FJValue.id)) {
+						this.$modal.msg("请选择房间")
+						return;
+					}
+					if (this.isEmpty(this.reasonValue.id)) {
+						this.$modal.msg("请选择原因")
+						return;
+					}
+					if (this.isEmpty(this.specificReasonsValue)) {
+						this.$modal.msg("请输入具体原因")
+						return;
+					}
+					uni.showLoading()
+					let param = {
+						district: this.XZQValue.dictValue,
+						areaId: this.XQValue.id,
+						buildingId: this.LDValue.id,
+						unitId: this.isEmpty(this.DYValue.id) ? '' : this.DYValue.id,
+						enginType: this.objValue.enginType, //写死 上一页面传过来的 
+						enginClassification: this.objValue
+							.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+						enginCycle: this.projectValue.dictValue, //工程周期
+						zEngineeringNodeBo: {
+							type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
+							zEngineeringInfoBo: {
+								constructTime: this.time,
+								zEngiineeringPhotoBoList: this.imgArr, //照片集合
 							}
-
 						}
 
-						addTearOldPipe(param).then(res => {
-							uni.hideLoading()
-							if (res.code == '200') {
-								uni.showToast({
-									title: res.msg,
-									icon: 'none',
-									//显示持续时间为 3秒
-									duration: 2000
-								});
-								setTimeout(function() {
-									uni.navigateBack();
-								}, 1000)
-
-							}
-						})
-						//提交接口执行逻辑
 					}
-				},
 
-				// 显示历史弹窗
-				handleShowSheet() {
-					this.shareState = true;
-				},
-				// 隐藏历史弹窗
-				handleHiddenShare() {
-					this.shareState = false;
-				},
-				showPhoto(index) {
-					uni.previewImage({
-						current: index,
-						urls: this.imgArr,
-					})
+					addTearOldPipe(param).then(res => {
+						uni.hideLoading()
+						if (res.code == '200') {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								//显示持续时间为 3秒
+								duration: 2000
+							});
+							setTimeout(function() {
+								uni.navigateBack();
+							}, 1000)
 
-				},
-				remove(index) {
-					uni.showModal({
-						title: '提示',
-						content: '是否删除该图片或视频?',
-						success: (res) => {
-							if (res.confirm) {
-								this.imgArr.splice(index, 1)
-								if (this.imgArr.length <= 0) {
-									this.photo = true;
-								}
-							}
-						}
-					})
-				},
-				choose() {
-					let _this = this;
-					uni.showActionSheet({
-						title: '上传',
-						itemList: ['图片', '视频'],
-						success: (res) => {
-							if (res.tapIndex == 0) {
-								this.chooseimage()
-							} else {
-								this.choosevideo()
-							}
 						}
 					})
-				},
-				chooseimage() {
-
-					let _this = this;
-					uni.chooseImage({
-						sizeType: ['album', 'camera'],
-						success(resp) {
-							resp.tempFiles.forEach((item, index) => {
-								const task = uni.uploadFile({
-									url: _this.$HTTP + `/obs`,
-									filePath: item.path,
-									name: 'file',
-									formData: {},
-									header: _this.headers,
-
-									success: res => {
-										// 判断是否json字符串,将其转为json格式
-										let data = JSON.parse(res.data);
-										if (![200].includes(data.code)) {
-											_this.$modal.msg(data.msg)
-										} else {
-											if (_this.progress === 100) {
-												_this.imgArr.push(data.data.url)
-												_this.$modal.msg('上传成功!')
-												_this.photo = false;
-											}
-										}
-									},
-									fail: e => {
-										_this.$modal.msg('上传失败!')
-									},
-									complete: res => {
-										uni.hideLoading();
-										_this.uploading = false;
-
-									}
-								});
-								task.onProgressUpdate(res => {
-									_this.progress = res.progress;
-									uni.showLoading({
-										title: '上传中'
-									})
-									if (_this.progress != 100) {
-										_this.loading = false
-									} else {
-										_this.loading = true
-									}
-								});
-
-							})
-
-						},
-					})
+					//提交接口执行逻辑
+
 				},
 
-				choosevideo() {
-					let _this = this;
-					uni.chooseVideo({
-						sourceType: ['album', 'camera'],
-						maxDuration: 30,
-						success(resp) {
-							const task = uni.uploadFile({
-								url: _this.$HTTP + `/obs`,
-								filePath: resp.tempFilePath,
-								name: 'file',
-								formData: {},
-								header: _this.headers,
-								success: res => {
-									// 判断是否json字符串,将其转为json格式
-									let data = JSON.parse(res.data);
-									if (![200].includes(res.statusCode)) {
-										this.uploadError(index, data);
-									} else {
-										//上传成功
-										if (_this.progress === 100) {
-											_this.imgArr.push(data.data.url)
-											_this.$modal.msg('上传成功!')
-											_this.photo = false;
-										}
-									}
-								},
-								fail: e => {
-									_this.$modal.msg('上传失败!')
-									this.uploadError(index, e);
-								},
-								complete: res => {
-									uni.hideLoading();
-									_this.uploading = false;
-								}
-							});
-							task.onProgressUpdate(res => {
-								_this.progress = res.progress;
-								uni.showLoading({
-									title: '上传中'
-								})
-								if (_this.progress != 100) {
-									_this.loading = false
-								} else {
-									_this.loading = true
-								}
-							});
 
-						},
-					})
-				},
+
+
+
 				pickerShow(e) {
 					this.type = e; //赋值类型
 					if (e == 'xzq') { //行政区
@@ -598,6 +440,7 @@
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
 						this.DYValue = ''; //重置单元数据
+						this.administrative = item.administrative;
 						getBuildingList(item.id).then(res => {
 							this.LDList = res.data
 						})
@@ -605,23 +448,24 @@
 						this.LDValue = item;
 						//根据楼栋ID 获取单元数据
 						this.DYValue = ''; //重置单元数据
-
-						if (!this.isEmpty(this.projectValue.dictValue)) {
-							//选完 判断 工程周期
-							this.getStatus();
-
-						}
 						getUnitList(item.id).then(res => {
 							this.DYList = res.data
 						})
 					} else if (this.type == 'dy') {
 						this.DYValue = item;
-
-						if (!this.isEmpty(this.projectValue.dictValue)) {
-							//选完 判断 工程周期
-							this.getStatus();
-
-						}
+						this.FJValue = ''; //重置房间数据
+						this.currentResidentsPhoe = [];
+						this.houseHeadName = "";
+						this.houseHeadPhone = "";
+						this.houseHeadIDcardNumber = "";
+						getHousesList(item.id).then(res => {
+							this.FJList = res.data
+						})
+					} else if (this.type == 'fj') {
+						this.FJValue = item;
+						this.houseHeadName = item.houseUserName;
+						this.houseHeadPhone = item.phone;
+						this.houseHeadIDcardNumber = item.idCard;
 					}
 				},
 				//关闭弹窗

+ 116 - 45
pages/statistics/statistics.vue

@@ -187,16 +187,17 @@
 						<view class="HuaDongBiao">
 							<view class="NeiRong" v-for="(item,index) in roomList" :key="index">
 								<view class="Fang" v-for="(item2, index2) in roomList[index]" :key="index2">
-									<view v-if="item2.roomStatus=='施工中'" class="ShiGongZhong">{{ item2.roomName }}
+									<view v-if="item2.roomStatus=='施工中'" class="ShiGongZhong" @click="goHistory(item2)">
+										{{ item2.roomName }}
 									</view>
 									<view v-else-if="item2.roomStatus=='未施工'" class="WeiShiGong">{{ item2.roomName }}
 									</view>
-									<view v-else class="JunGong">{{ item2.roomName }}</view>
+									<view v-else class="JunGong" @click="goHistory(item2)">{{ item2.roomName }}</view>
 								</view>
 							</view>
 						</view>
-						<view
-							style="width: 48rpx;height: 63rpx;background: #C7EAFF; position:relative; left: 50%; transform: translateX(-50%); bottom: -10rpx;">
+						<view style=" width: 48rpx;height: 63rpx;background: #C7EAFF; position:relative; left: 50%; transform:
+										translateX(-50%); bottom: -10rpx;">
 						</view>
 
 					</scroll-view>
@@ -248,7 +249,8 @@
 						<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 in item.nodeReViewStateList" v-if="state.Type!='开栓'">
+						<view class="font-twenty-eight gray" v-for="state in item.nodeReViewStateList"
+							v-if="state.Type!='开栓'">
 							{{state.Type}}-{{state.state == 1 ? '审核通过': (state.content == '暂未审核' ? '暂未审核':'审核未通过')}}
 							<view v-if="state.content != '暂未审核'">原因:{{state.content}}</view>
 						</view>
@@ -259,32 +261,37 @@
 				</view>
 			</cc-pullScroolView>
 
-			<view class="share">
-				<view :class="{'share-box': shareState}" @click="handleHiddenShare">
+
+		</view>
+
+		<view class="share">
+			<view :class="{'share-box': shareState}" @click="handleHiddenShare">
+			</view>
+			<view class="share-item" :class="{'share-show': shareState}">
+				<view class="share-to">
+					<text>请选择</text>
 				</view>
-				<view class="share-item" :class="{'share-show': shareState}">
-					<view class="share-to">
-						<text>请选择</text>
-					</view>
-					<scroll-view scroll-y="true" class="scroll-Y">
-						<view class="content">
-							<view class="block" v-for="(item, index) in typeList" :key="index"
-								@click="showTypeSheet(item)" v-if="item.Type!='开栓'">
-								<text>{{item.Type}}</text>
-							</view>
+				<scroll-view scroll-y="true" class="scroll-Y">
+					<view class="content">
+						<view class="block" v-for="(item, index) in typeList" :key="index" @click="showTypeSheet(item)"
+							v-if="item.Type!='开栓'">
+							<text>{{item.Type}}</text>
 						</view>
-					</scroll-view>
-					<view class="cancel" @click.stop="handleHiddenShare">
-						<text>取消</text>
 					</view>
+				</scroll-view>
+				<view class="cancel" @click.stop="handleHiddenShare">
+					<text>取消</text>
 				</view>
 			</view>
 		</view>
+
+		<bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
 	</view>
 </template>
 
 <script>
 	import SelectPicker from '../../components/selectPicker/select_picker.vue'
+	import bottomSheet from '../../components/bottomSheet/bottomSheet.vue'
 	import CCBProjectList from '../../uni_modules/cc-pullScroolView/components/cc-pullScroolView/cc-pullScroolView.vue';
 	import {
 		gethistoryList,
@@ -307,16 +314,20 @@
 		getEnginSpecificationsList,
 		getMunicipalStatisticsData,
 		getObtainRoomcCompletionInformationList,
+		getRoomProjectId,
+		getRoomProjectList,
 	} from '@/api/common'
 
 	export default {
 		components: {
 			SelectPicker,
 			CCBProjectList,
+			bottomSheet
 
 		},
 		data() {
 			return {
+				historyList: {}, //历史数据
 				userRole: getUserRole(),
 				tabValue: ['旧改', '新建'],
 				tabIndex: 0,
@@ -365,6 +376,7 @@
 				roomCount: 4,
 				nodeId: '',
 				nodeType: '',
+				roomItem: {},
 				// List: [{
 				// 		id: 1,
 				// 		title: '民用工程'
@@ -399,7 +411,10 @@
 		created() {},
 		onLoad() {
 			this.isLeader = getUserType()
-			this.changeTab();
+			//this.changeTab();
+			if (this.isLeader == 'app_user') {
+				this.changeTab();
+			}
 
 		},
 
@@ -419,6 +434,19 @@
 
 		},
 		methods: {
+			goHistory(item) {
+
+				this.roomItem = item;
+				getDicts(item.enginCycle + '_indoor_engin').then(response => {
+					this.typeList = response.data;
+
+					let result = JSON.parse(JSON.stringify(this.typeList).replace(/dictValue/g, 'Type'));
+					this.typeList = result;
+					this.handleShowSheet();
+				});
+
+
+			},
 			isEmpty(str) {
 				return (!str || 0 === str.length);
 			},
@@ -449,33 +477,76 @@
 					this.handleShowSheet();
 				}
 			},
+			showHistoryList() {
+				this.$refs.refShare.handleShowShare();
+			},
 			showTypeSheet(item) {
-				let obj = {
-					id: this.nodeId,
-					type: item.Type
-				};
-				this.handleHiddenShare();
+				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', //写死 室内 
+					}
+					getRoomProjectId(param).then(res => {
 
-				if (this.nodeType == 'indoor_engin') { //室内
-					uni.navigateTo({
-						url: '/pages/statistics/historyDetails?params=' + encodeURIComponent(JSON
-							.stringify(
-								obj))
-					})
-				} else if (this.nodeType == 'overhead') { //架空
-					uni.navigateTo({
-						url: '/pages/statistics/historyDetailsCourtyard?params=' + encodeURIComponent(JSON
-							.stringify(
-								obj))
-					})
-				} else if (this.nodeType == 'courtyard') { //庭院
-					uni.navigateTo({
-						url: '/pages/statistics/historyDetailsCourtyard?params=' + encodeURIComponent(JSON
-							.stringify(
-								obj))
+						if (res.code == '200') {
+
+							if (res.data != null) {
+
+								getRoomProjectList(res.data.id, item.Type).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)
+						}
 					})
-				}
 
+
+				} else {
+					let obj = {
+						id: this.nodeId,
+						type: item.Type
+					};
+					this.handleHiddenShare();
+
+					if (this.nodeType == 'indoor_engin') { //室内
+						uni.navigateTo({
+							url: '/pages/statistics/historyDetails?params=' + encodeURIComponent(JSON
+								.stringify(
+									obj))
+						})
+					} else if (this.nodeType == 'overhead') { //架空
+						uni.navigateTo({
+							url: '/pages/statistics/historyDetailsCourtyard?params=' + encodeURIComponent(JSON
+								.stringify(
+									obj))
+						})
+					} else if (this.nodeType == 'courtyard') { //庭院
+						uni.navigateTo({
+							url: '/pages/statistics/historyDetailsCourtyard?params=' + encodeURIComponent(JSON
+								.stringify(
+									obj))
+						})
+					}
+				}
 			},
 			pickerShow(e) {
 				this.type = e; //赋值类型
@@ -749,7 +820,7 @@
 				this.pageSize = 10; // 条数
 				this.totalNum = '';
 				this.pageNum = 1; // 页数
-				this.tabIndex = e;
+				//this.tabIndex = e;
 				this.requestData();
 
 			},