소스 검색

庭院历史修改

zhnghongrui 1 년 전
부모
커밋
5e00323b61
4개의 변경된 파일724개의 추가작업 그리고 14개의 파일을 삭제
  1. 2 2
      config.js
  2. 6 0
      pages.json
  3. 688 0
      pages/statistics/historyDetailsCourtyard.vue
  4. 28 12
      pages/statistics/statistics.vue

+ 2 - 2
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/',

+ 6 - 0
pages.json

@@ -104,6 +104,12 @@
 			"path": "pages/statistics/historyDetails",
 			"style": {
 				"navigationBarTitleText": "历史详情"
+			}
+		},
+		{
+			"path": "pages/statistics/historyDetailsCourtyard",
+			"style": {
+				"navigationBarTitleText": "历史详情"
 
 			}
 		},

+ 688 - 0
pages/statistics/historyDetailsCourtyard.vue

@@ -0,0 +1,688 @@
+<template>
+	<view>
+		<view class="uni-media-list">
+
+			<view class="uni-media-list-body">
+				<view v-for="(value, key) in dataJson.zEngineeringNodeBo.zEngineeringInfoBoList" :key="key"
+					v-if="isEdit(value)">
+					<view class="uni-media-list-text-top">
+						<view class="tit-text">施工时间:</view>{{value.updateTime}}
+					</view>
+					<view class="uni-common-mt" style="width: 100%;">
+						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+									#000;margin-top: 5px;">施工内容:</text>
+						<view style="width: 100%;padding-right: 20rpx;box-sizing: border-box;">
+							<textarea class="textarea" maxlength="255" placeholder-style="padding: 10rpx;"
+								style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal; min-height: 30px;"
+								auto-height :value="value.remark"
+								@blur="bindTextAreaBlur($event.target.value,key)"></textarea>
+						</view>
+					</view>
+					<view v-if="title=='开挖前'||title=='开挖后'||title=='焊口照片'||title=='隐蔽工程'">
+						<view class="" 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="choose('ohter',key)">
+							</image>
+							<view v-for="(item,index) in  value.zEngiineeringPhotoBoList" :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,value.zEngiineeringPhotoBoList)">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="remove(index,key)"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
+							</view>
+						</view>
+
+
+					</view>
+
+
+					<view v-if="title=='回填'">
+
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px; margin-left: 8px;">石粉回填照片:</text>
+						</view>
+
+						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+							<image :src="loadImgSrc('updateimg.png')" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('sfht',key)">
+							</image>
+							<view v-for="(item,index) in value.stonePowder" :key="index" style="position: relative;">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										@click="showPhoto(index,value.stonePowder)">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="removeht(index,key,'sfht')"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
+							</view>
+						</view>
+
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">警示带铺设照片:</text>
+						</view>
+						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+							<image :src="loadImgSrc('updateimg.png')" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('jsdps',key)">
+							</image>
+							<view v-for="(item,index) in value.warningtTape" :key="index" style="position: relative;">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										@click="showPhoto(index,value.warningtTape)">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="removeht(index,key,'jsdps')"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
+							</view>
+						</view>
+
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">回填后照片:</text>
+						</view>
+						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+							<image :src="loadImgSrc('updateimg.png')" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('hth',key)">
+							</image>
+							<view v-for="(item,index) in value.photosAfter" :key="index" style="position: relative;">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										@click="showPhoto(index,value.photosAfter)">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="removeht(index,key,'hth')"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
+
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="gesture-area" v-show="playVideo" >
+			 <view @click="closeVideo()"
+			 	style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+			 	<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+			 	</image>
+			 </view>
+			 <video :src="playVideoSrc"></video>
+		</view> -->
+		<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
+			subtitleKey="id">
+		</SelectPicker>
+		<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
+			titleKey="dictLabel" subtitleKey="dictValue" v-model="name"></SelectPicker>
+		<view class="action-btn" v-if="hideButton==false">
+			<button @click="submit" class="btn cu-btn block bg-blue lg round">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import SelectPicker from '../../components/selectPicker/select_picker.vue'
+	import {
+		getDicts
+	} from "@/api/system/dict/data";
+	import {
+		getToken
+	} from '../../utils/auth';
+	import user from '@/store/modules/user'
+	import {
+		getHistoryDetails,
+		getEnginMaterialQualityList,
+		putHistory,
+		getEnginSpecificationsList
+	} from '@/api/common'
+	export default {
+		components: {
+			SelectPicker,
+		},
+		data() {
+			return {
+				// playVideo: false,//视频播放放大
+				// playVideoSrc:'',
+				selectZbfList: [],
+				dictOptions: [],
+				openDict: false,
+				dataIndex: 0, //数据用第几条
+				imageIndex: 0,
+				headers: {
+					Authorization: "Bearer " + getToken()
+				},
+				nodeId: '',
+				type: '',
+				title: '',
+				dataJson: '',
+				enginClassification: '',
+				enginType: '',
+				enginClassValue: '',
+				selectList: [],
+				open: false,
+				chooseType: '',
+				hideButton: false,
+			}
+		},
+		onLoad(options) {
+			if ('params' in options) {
+				let e = JSON.parse(decodeURIComponent(options.params));
+				this.nodeId = e.id;
+				this.type = e.type;
+				getHistoryDetails(this.nodeId, this.type).then(response => {
+					if (response.data.zEngineeringNodeBo != null) {
+						this.hideButton = false;
+						this.dataJson = response.data;
+						this.title = response.data.zEngineeringNodeBo.type;
+						this.enginType = response.data.enginType;
+						this.enginClassification = response.data.enginClassification;
+
+					} else {
+						this.hideButton = true;
+						this.$modal.msg("暂无历史信息")
+					}
+				});
+
+			}
+		},
+		methods: {
+			bindTextAreaBlur(e, index) {
+
+				this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[index].remark = e;
+
+			},
+			removeht(index, key, type) {
+				uni.showModal({
+					title: '提示',
+					content: '是否删除该图片或视频?',
+					success: (res) => {
+						if (res.confirm) {
+
+							if (type == 'sfht') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].stonePowder
+									.splice(index, 1)
+
+							} else if (type == 'jsdps') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].warningtTape
+									.splice(index, 1)
+
+							} else if (type == 'hth') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].photosAfter
+									.splice(index, 1)
+
+							}
+
+						}
+					}
+				})
+			},
+			remove(index, key) {
+				uni.showModal({
+					title: '提示',
+					content: '是否删除该图片或视频?',
+					success: (res) => {
+						if (res.confirm) {
+
+							this.dataJson.zEngineeringNodeBo
+								.zEngineeringInfoBoList[key]
+								.zEngiineeringPhotoBoList.splice(index, 1)
+
+						}
+					}
+				})
+			},
+			choose(type, index) {
+				this.dataIndex = index;
+				let _this = this;
+				uni.showActionSheet({
+					title: '上传',
+					itemList: ['图片', '视频'],
+					success: (res) => {
+						if (res.tapIndex == 0) {
+							this.chooseimage(type)
+						} else {
+							this.choosevideo(type)
+						}
+					}
+				})
+			},
+			chooseimage(e) {
+
+				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 => {
+									let data = JSON.parse(res.data);
+									if (![200].includes(data.code)) {
+										_this.$modal.msg(data.msg)
+									} else {
+										if (_this.progress === 100) {
+											if (e == 'other') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.zEngiineeringPhotoBoList.push(data.data
+														.url);
+											} else if (e == 'sfht') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.stonePowder.push(data.data
+														.url);
+											} else if (e == 'jsdps') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.warningtTape.push(data.data
+														.url);
+											} else if (e == 'hth') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.photosAfter.push(data.data
+														.url);
+											}
+
+											_this.$modal.msg('上传成功!')
+										}
+									}
+								},
+								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(e) {
+				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 => {
+								let data = JSON.parse(res.data);
+								if (![200].includes(res.statusCode)) {
+									this.uploadError(index, data);
+								} else {
+									//上传成功
+									if (_this.progress === 100) {
+										if (e == 'other') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.zEngiineeringPhotoBoList.push(data.data.url);
+										} else if (e == 'sfht') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.stonePowder.push(data.data.url);
+
+										} else if (e == 'jsdps') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.warningtTape.push(data.data.url);
+										} else if (e == 'hth') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.photosAfter.push(data.data.url);
+										}
+										_this.$modal.msg('上传成功!')
+									}
+								}
+							},
+							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
+							}
+						});
+
+					},
+				})
+			},
+			showPhoto(index, arr) {
+
+				let newArr = [];
+				arr.forEach((item, index) => {
+					if (item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ||
+						item.substring(item.length - 4) == 'jpeg') {
+						newArr.push(item)
+					}
+				});
+
+				uni.previewImage({
+					current: index,
+					urls: newArr,
+				})
+
+			},
+			// showVideo(arr) {
+			// 	this.playVideo = true;
+			// 	this.playVideoSrc = arr;
+			// },
+			// closeVideo(){
+			// 	this.playVideo = false;
+			// },
+
+
+
+
+			isEmpty(str) {
+
+				return (!str || 0 === str.length);
+
+			},
+
+
+
+			isEdit(item) {
+				var isShow = item.createBy == this.$user.state.name;
+
+				return isShow;
+			},
+			submit() {
+				let isSubmit = true;
+				if (this.title == '回填') {
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
+						if (res.stonePowder.length == 0) {
+							this.$modal.msg("请上传石粉回填照片");
+							isSubmit = false;
+						}
+						if (res.warningtTape.length == 0) {
+							this.$modal.msg("请上传警示带铺设照片");
+							isSubmit = false;
+						}
+						if (res.photosAfter.length == 0) {
+							this.$modal.msg("请上传回填后照片");
+							isSubmit = false;
+						}
+					})
+				} else {
+
+
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
+						if (res.zEngiineeringPhotoBoList.length == 0) {
+							this.$modal.msg("请上传照片");
+							isSubmit = false;
+						}
+
+					})
+				}
+				if (!isSubmit) {
+					return
+				}
+
+				putHistory(this.dataJson).then(
+
+					response => {
+						if (response.code == '200') {
+							uni.hideLoading()
+							uni.showToast({
+								title: response.msg,
+								icon: 'none',
+								duration: 2000
+							});
+							setTimeout(function() {
+								uni.navigateBack();
+							}, 1000)
+
+						}
+
+					});
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss">
+	.uni-media-list-body {
+		background: #fff;
+		border: 1px solid #eee;
+		border-radius: 40rpx;
+		margin: 20rpx;
+		padding: 10rpx 0 40rpx;
+		box-shadow: 0 0 5px #eee;
+	}
+
+	.uni-media-list-text-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10px;
+		position: relative;
+
+	}
+
+
+	.to-right-icon {
+		width: 15px;
+		height: 15px;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+	}
+
+	.share {
+		width: 100%;
+		height: 100%;
+
+	}
+
+	.tit-text {
+		color: #4f535a;
+		margin-right: 20rpx;
+	}
+
+	.normal-text {}
+
+	.cz-style {
+		background: #e8f4f9;
+		margin: 20rpx;
+		padding: 10rpx;
+		border-radius: 20rpx;
+		border: 1px solid #d4e3f0;
+	}
+
+	.uni-media-list-text-top {
+		font-size: 14px;
+		color: #696969;
+		padding: 20rpx 20rpx;
+		border-bottom: 1px solid #eee;
+		display: flex;
+		align-items: center;
+	}
+
+	.share-box {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0rpx;
+		left: 0rpx;
+		bottom: 0rpx;
+		right: 0rpx;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition: .3s;
+		z-index: 999;
+	}
+
+	// 进入分享动画
+	.share-show {
+		transition: all 0.3s ease;
+		transform: translateY(0%) !important;
+		border-radius: 20px 20px 0px 0px;
+	}
+
+	.scroll-Y {
+		height: 58vh;
+	}
+
+	// 离开分享动画
+	.share-item {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 70%;
+		background-color: #FFFFFF;
+		transition: all 0.3s ease;
+		transform: translateY(100%);
+		z-index: 1999;
+
+		.share-to {
+			width: 100%;
+			height: 30px;
+			display: flex;
+			justify-content: left;
+			margin: 30rpx 35rpx;
+			align-items: center;
+
+
+		}
+
+		.content {
+			width: 100%;
+			height: auto;
+			display: flex;
+			flex-wrap: wrap;
+
+			.block {
+				width: 100%;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: left;
+				height: auto;
+
+				image {
+					width: 80rpx;
+					height: 80rpx;
+				}
+
+				text {
+					margin-top: 16rpx;
+					font-size: 28rpx;
+					color: #606266;
+				}
+			}
+		}
+
+		.cancel {
+			width: 100%;
+			height: 3rem;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-top: 1rpx solid #E4E7ED;
+		}
+
+
+	}
+
+	.uni-media-list-text-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10px;
+		position: relative;
+
+	}
+
+	.uni-list {
+		border: 1xp solid #eee;
+	}
+
+	.to-right-icon {
+		width: 15px;
+		height: 15px;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+	}
+
+
+	.text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	// .gesture-area {
+	// 	//加浮动弹窗
+	//   width: 100%;
+	//   height: 100%;
+	// }
+</style>

+ 28 - 12
pages/statistics/statistics.vue

@@ -224,8 +224,8 @@
 		<view v-else-if="isLeader=='app_user'">
 
 
-			
-	<!-- 		<view class="grid-body">
+
+			<!-- 		<view class="grid-body">
 				<view class="Grid">
 					<view class="Grid-Item" v-for="item in List" :key="item.id" @click="changeTab(item.id)"
 						hover-class="click-hover" hover-start-time="50" hover-stay-time="50"
@@ -358,6 +358,7 @@
 				roomList: [],
 				roomCount: 4,
 				nodeId: '',
+				nodeType: '',
 				// List: [{
 				// 		id: 1,
 				// 		title: '民用工程'
@@ -427,6 +428,7 @@
 			chooseNode(item) {
 				this.typeList = item.nodeReViewStateList
 				this.nodeId = item.id;
+				this.nodeType = item.enginClassification;
 				this.handleShowSheet();
 			},
 			showTypeSheet(item) {
@@ -435,11 +437,27 @@
 					type: item.Type
 				};
 				this.handleHiddenShare();
-				uni.navigateTo({
-					url: '/pages/statistics/historyDetails?params=' + encodeURIComponent(JSON
-						.stringify(
-							obj))
-				})
+
+				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/historyDetails?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; //赋值类型
@@ -713,7 +731,7 @@
 				this.pageSize = 10; // 条数
 				this.totalNum = '';
 				this.pageNum = 1; // 页数
-				this.tabIndex=e;
+				this.tabIndex = e;
 				this.requestData();
 
 			},
@@ -722,8 +740,8 @@
 				uni.showLoading()
 
 				let type = ''
-				
-				gethistoryList( user.state.name, this.pageNum, this.pageSize).then(res => {
+
+				gethistoryList(user.state.name, this.pageNum, this.pageSize).then(res => {
 
 					this.totalNum = res.total
 
@@ -1110,6 +1128,4 @@
 			border-top: 1rpx solid #E4E7ED;
 		}
 	}
-
-	
 </style>