操作日志-列表

pages/home/home.vue

@@ -44,7 +44,7 @@
 				<span>炮孔测量数据导出</span>
 				<!-- <button size="mini" class="funcBtn" type="primary" @click="navTo('export')">导出</button> -->
 			</p>
-			<p class="list-item">
+			<p class="list-item" @click="navTo('operateLog')">
 				<image src="/static/image/paokong/operatelog.png" alt="" />
 				<span>操作日志</span>
 				<!-- <button size="mini" class="funcBtn" type="primary" @click="navTo('export')">导出</button> -->
@@ -116,6 +116,8 @@
 					url = '/pages/home/importFileDataPreview'
 				}else if(flag === 'paokongceliang'){
 					url = '/pages/home/paokongceliang'
+				}else if(flag === 'operateLog'){
+					url = '/pages/home/operateLog'
 				}
 				
 				uni.navigateTo({
@@ -181,8 +183,8 @@
 	
 	width: 646rpx;
 	height: 300rpx;
+	background: url('/static/image/paokong/home-title-bg.png');
 	// background-color: linear-gradient(-90deg, #F6F9FF 31%, #E4EFFF 100%);
-	background-image: url('/static/image/paokong/home-title-bg.png');
 	background-position: center right;
 	background-size: cover;
 	box-shadow: 0rpx 2rpx 24rpx 0rpx rgba(7,36,72,0.11);

pages/home/importFile.vue

@@ -101,9 +101,6 @@
 			        dateRangeMaxDeal(e){
 			            console.log('超过最大连选天数：',e)
 			        },
-			        dateChange(day){
-			            this.date = day
-			        },
 			// 获取选中的日期
 			changeDate(data) {
 				console.log(data)

pages/home/operateLog.vue

@@ -6,10 +6,10 @@
 		<view class="body-wrapper">
 			<view class="demo-uni-row">
 				<uni-row>
-					<uni-col :span="7" class="_title">
+					<uni-col :span="6" class="_title">
 						<view>工程名称</view>
 					</uni-col>
-					<uni-col :span="15">
+					<uni-col :span="16">
 						<uni-data-select v-model="form.productName" :localdata="selectListLv1" :clear="false"
 							@change="changeLv1"></uni-data-select>
 					</uni-col>
@@ -17,66 +17,106 @@
 			</view>
 			<view class="demo-uni-row">
 				<uni-row class="demo-uni-row mb-10">
-					<uni-col :span="7" class="_title">
+					<uni-col :span="6" class="_title">
 						<view>爆区名称</view>
 					</uni-col>
-					<uni-col :span="15">
+					<uni-col :span="16">
 						<uni-data-select v-model="form.artilleryAreaName" :localdata="selectListLv2" :clear="false"
 							@change="changeLv2"></uni-data-select>
 					</uni-col>
 				</uni-row>
 			</view>
-			<view class="demo-uni-row">
+			
+			<view class="demo-uni-row row-date">
 				<uni-row class="demo-uni-row mb-10">
-					<uni-col :span="7" class="_title">
+					<uni-col :span="6" class="_title">
 						<view>记录时间</view>
 					</uni-col>
-					<uni-col :span="15">
-						<uni-data-select v-model="form.artilleryAreaName" :localdata="selectListLv2" :clear="false"
-							@change="changeLv2"></uni-data-select>
+					<uni-col :span="16">
+						<picker style="width: 200rpx;" mode="date" :value="searchForm.startTime" :start="startDate" :end="endDate" @change="bindDateChange4start">
+							<view class="uni-input">{{searchForm.startTime}}</view>
+						</picker>
+						<picker style="width: 200rpx;" mode="date" :value="searchForm.endTime" :start="startDate" :end="endDate" @change="bindDateChange4end">
+							<view class="uni-input">{{searchForm.endTime}}</view>
+						</picker>
 					</uni-col>
 				</uni-row>
+				<view class="funcBtn end" @tap="resetForm">
+					搜索
+				</view>
 			</view>
 		</view>
 
 
-		<view class="footer-wrapper">
-			<view class="funcBtn end" @tap="resetForm">
-				搜索
-			</view>
+		<view class="table-wrapper">
+			<uni-table ref="table" :loading="loading" emptyText="暂无更多数据" @selection-change="selectionChange">
+				<uni-tr>
+					<uni-th width="50" align="center"><span style="color:#3a74ba;font-size:30rpx;">序号</span></uni-th>
+					<uni-th width="100" align="center">操作模块</uni-th>
+					<uni-th width="80" align="center">操作类型</uni-th>
+					<uni-th width="120" align="center">操作人</uni-th>
+					<uni-th width="130" align="center">操作时间</uni-th>
+					<uni-th width="200" align="center">操作内容</uni-th>
+				</uni-tr>
+				<uni-tr v-for="(item, index) in dataList" :key="index">
+					<uni-td align="center">{{index}}</uni-td>
+					<uni-td align="center">{{ item.operationModule }}</uni-td>
+					<uni-td align="center">{{ item.operationType }}</uni-td>
+					<uni-td align="center">{{ item.operationPerson }}</uni-td>
+					<uni-td align="center">{{ item.operationTime }}</uni-td>
+					<uni-td align="center">{{ item.operationRemark }}</uni-td>
+				</uni-tr>
+			</uni-table>
 		</view>
 
 		<view class="" v-show="!connected" style="text-align: center; color: darkgray; margin-top:20rpx;">
 			{{ pageLoadText }}
 		</view>
+
+		<!-- 	<uni-popup ref="popup" type="bottom" border-radius="10px 10px 0 0">
+			<miku-calendar :calendarBg="'#fff'"
+				:dateRange="[new Date('2024/02/01').getTime(),new Date('2024/02/27').getTime()]" :dateRangeMax="365"
+				@dateRangeMaxDeal="dateRangeMaxDeal" mode='dateRange' :showArrow="true" themeColor="rgb(100,124,203)"
+				arrowColor="rgb(100,124,203)" @confirm="calendarConfirm"></miku-calendar>
+
+
+		</uni-popup> -->
 	</view>
 </template>
 
 <script>
 	import CustomNavbar from '@/pages/component/CustomNavbar.vue';
-	import {
-		blueToothMixin
-	} from '../../common/mixin.js'
+	import mikuCalendar from "@/components/miku-calendar/mikuCalendar.vue";
 	import {
 		getCurrentTime,
 		showCustomToast,
 		showCustomModal
 	} from '../../common/util.js'
 	import {
-		getSelectList,
-		getDetailInfo,
-		saveData,
-		getDict
-	} from '../../api/blueToothMeasure.js'
+		getDataList,
+		getselectList4productName,
+		getselectList4tester,
+	} from '../../api/operatorLog.js'
 	export default {
-		mixins: [blueToothMixin],
 		components: {
 			CustomNavbar,
+			mikuCalendar
 		},
 		data() {
+			const currentDate = this.getDate({
+				format: true
+			})
 			return {
-				navBarTitle: '炮孔测量',
+				loading: false,
+				searchForm: {
+					startTime: currentDate,
+					endTime: currentDate,
+				},
+				dataList: [],
+	
+				navBarTitle: '操作日志',
 				redirectUrl: '/pages/home/blueSearch?refer=blueMeasure',
+				searchDate: '',
 				// 表单数据相关
 				zhuangyaoDict: [],
 				form: {
@@ -89,12 +129,9 @@
 					'actualDepth': '',
 					'actualWaterLevel': ''
 				},
-				dataList: [],
-				selectListLv1: [],
-				selectListLv2: [],
-				selectListLv3: [],
-				selectListLv4: [],
-				selectListLv5: [],
+				
+				selectList4productName: [],
+				selectList4tester: [],
 			};
 		},
 
@@ -103,201 +140,67 @@
 		 */
 		onLoad: function(options) {
 			uni.hideLoading()
-			// this.dataList = uni.getStorageSync('importDataList') || []
-			// console.log('this.dataList',JSON.stringify(this.dataList));
-			this.getDictInfo()
-			this.getSelectListLv1()
-
-			// this.initLink()
+			this.getData()
+		},
+		computed: {
+			startDate() {
+				return this.getDate('start');
+			},
+			endDate() {
+				return this.getDate('end');
+			}
 		},
 		methods: {
-			async getDictInfo() {
-				let res = await getDict({
-					type: 'zhuangyao_type'
+			// 搜索
+			search() {
+				this.getData(1, this.searchVal)
+			},
+			// 获取数据
+			async getData() {
+				this.loading = true
+				let res = await getDataList({
+					...this.searchForm
 				})
 				if (res) {
-					this.zhuangyaoDict = res.map((item) => {
-						return {
-							text: item.dictLabel,
-							value: item.dictValue
-						}
-					})
+					this.loading = false
+					this.dataList = res.rows
+					this.loading = false
 				}
 			},
-			changeLvCommonReset(lvNum) { // 下拉列表值改变，清空级联数据公共方法
-				let newFildArr = []
-				let newDataListSelectArr = []
-
-				let formFieldArr = [
-					'productName', 'artilleryAreaName', 'cannonHoleArrayNum', 'cannonHoleNum',
-					'status', 'expectedDepth',
-					'actualDepth', 'actualWaterLevel'
-				]
-
-
-				let dataListSelectArr = [
-					'selectListLv1', 'selectListLv2', 'selectListLv3',
-					'selectListLv4', 'selectListLv5'
-				]
-
-				// [1, 2, 3, 4, 5];  lvNum:2  => [3, 4, 5]
-				newFildArr = formFieldArr.slice(lvNum);
-				newFildArr.forEach((key) => {
-					this['form'][key] = ''
-				});
-				newDataListSelectArr = dataListSelectArr.slice(lvNum);
-				newDataListSelectArr.forEach((key) => {
-					this[key] = []
-				});
-
+			bindDateChange4start: function(e) {
+				this.searchForm.startTime = e.detail.value
 			},
-			async getSelectListLv1() {
-				// const dataArr = JSON.parse(JSON.stringify(this.dataList))
-				// // 获取第一个数据列表
-				// this.selectListLv1 = getCascadeList(dataArr, {
-				// 	productName: null
-				// }).map((item) => {
-				// 	return {
-				// 		text: item.productName,
-				// 		value: item.productName
-				// 	}
-				// })
-				const res = await getSelectList({
-					productName: '',
-					artilleryAreaName: '',
-					cannonHoleArrayNum: '',
-					cannonHoleNum: ''
-				})
-				console.log('响应res', res)
-				this.selectListLv1 = res.map((item) => {
-					return {
-						text: item,
-						value: item
-					}
-				})
-			},
-			changeLv1(e) {
-				// console.log("e:", e);
-				this.changeLvCommonReset(1)
-
-				this.getSelectListLv2(e)
-
+			bindDateChange4end: function(e) {
+				this.searchForm.endTime = e.detail.value
 			},
-
-			async getSelectListLv2(prevLvVal) {
-				// const dataArr = JSON.parse(JSON.stringify(this.dataList))
-				// this.selectListLv2 = getCascadeList(dataArr, {
-				// 	productName: prevLvVal,
-				// }).map((item) => {
-				// 	return {
-				// 		text: item.artilleryAreaName,
-				// 		value: item.artilleryAreaName
-				// 	}
-				// })
-				// //console.log('this.selectListLv2', this.selectListLv2)
-				const res = await getSelectList({
-					productName: prevLvVal,
-					artilleryAreaName: '',
-					cannonHoleArrayNum: '',
-					cannonHoleNum: ''
-				})
-				console.log('响应res', res)
-				this.selectListLv2 = res.map((item) => {
-					return {
-						text: item,
-						value: item
-					}
-				})
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
 			},
-			changeLv2(e) {
-				//console.log("e:", e);
-
-				this.changeLvCommonReset(2)
-				this.getSelectListLv3(e)
+			selectDate() {
+				// 通过组件定义的ref调用uni-popup方法 ,如果传入参数 ，type 属性将失效 ，仅支持 ['top','left','bottom','right','center']
+				this.$refs.popup.open('center')
 			},
-
-			async getSelectListLv3(prevLvVal) {
-				// const dataArr = JSON.parse(JSON.stringify(this.dataList))
-				// this.selectListLv3 = getCascadeList(dataArr, {
-				// 	productName: this.form.productName,
-				// 	artilleryAreaName: prevLvVal
-				// }).map((item) => {
-				// 	return {
-				// 		text: item.cannonHoleArrayNum,
-				// 		value: item.cannonHoleArrayNum
-				// 	}
-				// })
-				const res = await getSelectList({
-					productName: this.form.productName,
-					artilleryAreaName: prevLvVal,
-					cannonHoleArrayNum: '',
-					cannonHoleNum: ''
-				})
-				console.log('响应res', res)
-				this.selectListLv3 = res.map((item) => {
-					return {
-						text: item,
-						value: item
-					}
-				})
+			calendarConfirm(e) {
+				console.log(e)
+				const formattedDates = e.map(date => date.split(' ')[0]);
+				this.searchDate = formattedDates
+				this.$refs.popup.close()
 			},
-			changeLv3(e) {
-				//console.log("e:", e);
-				this.changeLvCommonReset(3)
-				this.getSelectListLv4(e)
+			dateRangeMaxDeal(e) {
+				console.log('超过最大连选天数：', e)
 			},
-
-			async getSelectListLv4(prevLvVal) {
-				// const dataArr = JSON.parse(JSON.stringify(this.dataList))
-				// this.selectListLv4 = getCascadeList(dataArr, {
-				// 	productName: this.form.productName,
-				// 	artilleryAreaName: this.form.artilleryAreaName,
-				// 	cannonHoleArrayNum: prevLvVal
-				// }).map((item) => {
-				// 	return {
-				// 		text: item.cannonHoleNum,
-				// 		value: item.cannonHoleNum
-				// 	}
-				// })
-				const res = await getSelectList({
-					productName: this.form.productName,
-					artilleryAreaName: this.form.artilleryAreaName,
-					cannonHoleArrayNum: prevLvVal,
-					cannonHoleNum: ''
-				})
-				console.log('响应res', res)
-				this.selectListLv4 = res.map((item) => {
-					return {
-						text: item,
-						value: item
-					}
-				})
-			},
-			changeLv4(e) {
-				// this.changeLvCommonReset(4)
-				// //console.log("e:", e);
-				// this.getSelectListLv5(e)
-				this.getDetailInfo(e)
-			},
-
-			// getSelectListLv5(prevLvVal) {
-			// 	const dataArr = JSON.parse(JSON.stringify(this.dataList))
-			// 	this.selectListLv5 = getCascadeList(dataArr, {
-			// 		productName: this.form.productName,
-			// 		artilleryAreaName: this.form.artilleryAreaName,
-			// 		cannonHoleArrayNum: this.form.cannonHoleArrayNum,
-			// 		cannonHoleNum: prevLvVal,
-			// 	}).map((item) => {
-			// 		return {
-			// 			text: item.boreholeNumber,
-			// 			value: item.boreholeNumber
-			// 		}
-			// 	})
-			// },
-			// changeLv5(e) {
-			// 	//console.log("e:", e);
-			// 	this.getDetailInfo(e)
-			// },
 			async getDetailInfo() {
 				let res = await getDetailInfo()
 				if (res) {
@@ -310,114 +213,18 @@
 					title: '暂无详情信息'
 				})
 			},
-			async saveData() { // 保存当前表单数据到本地
-				let formFieldArr = [
-					'productName', 'artilleryAreaName', 'cannonHoleArrayNum',
-					'cannonHoleNum', 'boreholeNumber'
-				]
-				var validFlag = true
-				for (var i = 0; i < formFieldArr.length; i++) {
-					console.log('this.form[formFieldArr[i]]', i, this.form[formFieldArr[i]])
-					if (!this.form[formFieldArr[i]]) {
-						validFlag = false
-						break;
-					}
-				}
-				if (!validFlag) {
-					showCustomModal({
-						content: `手动填写数据不可为空`
-					})
-					return
-				}
-				// const index = this.dataList.findIndex((item) => {
-				// 	return item.productName === this.form.productName &&
-				// 		item.artilleryAreaName === this.form.artilleryAreaName &&
-				// 		item.cannonHoleArrayNum === this.form.cannonHoleArrayNum &&
-				// 		item.cannonHoleNum === this.form.cannonHoleNum &&
-				// 		item.boreholeNumber === this.form.boreholeNumber
-				// })
-				if (this.form.measureDepth && this.form.shuiwei) {
-
-					let res = await saveData({
-						...this.form
-					})
-					// this.$set(this.dataList[index], 'actualWaterLevel', this.form.actualWaterLevel);
-					// this.$set(this.dataList[index], 'actualDepth', this.form.actualDepth);
-					// this.$set(this.dataList[index], 'remark', getCurrentTime());
-					// uni.setStorageSync('importDataList', JSON.parse(JSON.stringify(this.dataList)))
-					if (res) {
-						uni.showToast({
-							title: '保存成功',
-							icon: false
-						})
-						this.resetForm()
-					}
-					return
-				}
-				showCustomModal({
-					content: '孔深水位不能为空',
-				})
-			},
 		}
 	};
-
-	/**
-	 * 处理级联数据方法
-	 */
-	function getCascadeList(originArr = [], paramObj) {
-		let sonArr = new Array()
-		// let sonArr = new Set()
-
-
-		if (paramObj.artilleryAreaName && paramObj.productName && paramObj.cannonHoleArrayNum && paramObj
-			.cannonHoleNum) { // 返回第5级
-			const tempArr = originArr.filter((item) => {
-				return item.productName === paramObj.productName &&
-					item.artilleryAreaName === paramObj.artilleryAreaName &&
-					item.cannonHoleArrayNum === paramObj.cannonHoleArrayNum &&
-					item.cannonHoleNum === paramObj.cannonHoleNum
-			})
-			const uniqueArray = Array.from(new Map(tempArr.map(item => [item.boreholeNumber, item])).values());
-			return uniqueArray
-		}
-
-		if (paramObj.artilleryAreaName && paramObj.productName && paramObj.cannonHoleArrayNum) { // 返回第4级
-			const tempArr = originArr.filter((item) => {
-				return item.productName === paramObj.productName &&
-					item.artilleryAreaName === paramObj.artilleryAreaName &&
-					item.cannonHoleArrayNum === paramObj.cannonHoleArrayNum
-			})
-			const uniqueArray = Array.from(new Map(tempArr.map(item => [item.cannonHoleNum, item])).values());
-			return uniqueArray
-		}
-
-		if (paramObj.artilleryAreaName && paramObj.productName) { // 返回第三级
-			const tempArr = originArr.filter((item) => {
-				return item.productName === paramObj.productName &&
-					item.artilleryAreaName === paramObj.artilleryAreaName
-			})
-			const uniqueArray = Array.from(new Map(tempArr.map(item => [item.cannonHoleArrayNum, item])).values());
-			return uniqueArray
-		}
-
-
-		if (paramObj.productName) { // 返回2级列表
-			const tempArr = originArr.filter((item) => { // 二级列表基于1级选择后的值进行过滤
-				return item.productName === paramObj.productName
-			})
-			const uniqueArray = Array.from(new Map(tempArr.map(item => [item.artilleryAreaName, item])).values());
-			return uniqueArray
-		}
-
-
-		if (!paramObj.productName) { // 返回1级列表
-			const uniqueArray = Array.from(new Map(originArr.map(item => [item.productName, item])).values());
-			return uniqueArray
-		}
-	}
 </script>
 
 <style lang="scss">
+	::v-deep .uni-popup .uni-popup__wrapper {
+		display: block;
+		position: relative;
+		width: 80vw;
+	}
+
+
 	::v-deep .uni-select__input-placeholder {
 		// placeholder样式调整
 		font-size: 30rpx !important;
@@ -429,12 +236,35 @@
 		align-items: center;
 	}
 
-	.uni-col-7 {
+	.uni-col-6 {
 		font-size: 32rpx;
 		font-weight: bold;
 		color: #000000;
 		line-height: 110rpx;
 	}
+	.row-date{
+		.uni-col-16 {
+			display: flex;
+			height: 110rpx;
+			line-height: 110rpx;
+			position: relative;
+			&::after{
+				content: '-';
+				width: 70rpx;
+				height: 70rpx;
+				position: absolute;
+				right: 232rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				text-align: center;
+				line-height: 70rpx;
+				font-size: 29rpx;
+				color: #000000;
+			}
+		}
+	}
+	
+	
 
 	.demo-uni-row {
 		line-height: 70rpx;
@@ -442,6 +272,8 @@
 
 		.uni-select {
 			height: 108rpx;
+			height: 110rpx;
+			line-height: 110rpx;
 		}
 	}
 
@@ -492,129 +324,24 @@
 		padding-right: 15rpx;
 		background: #FFFFFF;
 		border-radius: 10rpx;
-
-		.sumary-title {
-			position: relative;
-			padding-left: 50rpx;
-			font-size: 32rpx;
-			color: #007AFF;
-			margin-top: 20rpx;
-			margin-bottom: 20rpx;
-
-			&:before {
-				content: '';
-				width: 16rpx;
-				height: 16rpx;
-				background: #007AFF;
-				border-radius: 50%;
-				position: absolute;
-				left: 20rpx;
-				top: 50%;
-				transform: translateY(-50%);
-			}
-		}
-	}
-
-	.logo-wrapper {
-		display: flex;
-		justify-content: center;
-
-		image {
-			width: 366rpx;
-			height: 432rpx;
-			margin: 0 auto;
-		}
+		overflow: hidden;
 	}
 
-	// ._title {
-	// 	// border: 1px solid lightgray;
-	// 	height: 70rpx;
-	// 	text-align: center;
-	// 	line-height: 70rpx;
-	// 	margin-right: 10rpx;
-	// 	font-size: 32rpx;
-	// 	font-weight: bold;
-	// 	color: #000000;
-	// }
-
-	._content {
-		// border: 1px solid lightgray;
-		height: 70rpx;
-		line-height: 70rpx;
-		padding-left: 20rpx;
-		position: relative;
-
-		// &:after {
-		// 	content: 'm';
-		// 	width: 70rpx;
-		// 	height: 70rpx;
-		// 	// border-left: 1px solid lightgray;
-		// 	position: absolute;
-		// 	right: -12rpx;
-		// 	top: 0;
-		// 	text-align: center;
-		// 	line-height: 70rpx;
-		// 	font-size: 29rpx;
-		// 	color: #000000;
-		// }
-	}
 
 	.funcBtn {
-		width: 280rpx;
-		height: 70rpx;
-		line-height: 70rpx;
+		width: 560rpx;
+		height: 74rpx;
+		line-height: 74rpx;
 		background: #007AFF;
-		border-radius: 35rpx;
+		border-radius: 37rpx;
 		text-align: center;
-		font-size: 29rpx;
+		font-size: 32rpx;
 		color: #FFFFFF;
-		border: 2px solid #007AFF;
-
-		&.end {
-			background: #FFFFFF;
-			;
-			color: #007AFF;
-		}
+		margin: 33rpx auto;
+		// border: 2px solid #007AFF;
 
 		&.loading {
 			opacity: 0.5;
 		}
 	}
-
-	.footer-wrapper {
-		display: flex;
-		justify-content: space-around;
-		margin-top: 50rpx;
-	}
-
-
-	.unaffix {
-		&:after {
-			display: none;
-		}
-	}
-
-	/**
- * 蓝牙连接互动相关
- */
-	page {
-		color: #333;
-	}
-
-	/*划线  */
-	.line {
-		background-color: blue;
-		height: 5px;
-		width: 100%;
-	}
-
-	.div {
-		background-color: white;
-		height: 10px;
-		width: 10px;
-	}
-
-	.blank {
-		height: 150rpx;
-	}
 </style>
\ No newline at end of file