操作日志

apis/pagejs/meterTimer.js

@@ -57,4 +57,13 @@ export function changeStatus(data) {
 		data: data,
 		url: url
 	})
-}
+}
+
+export function haveMeterList(data) {
+	var url='/mobile/ElectricityMeter/haveMeterList';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}

pages/deductionRecord/deductionRecord.vue

@@ -79,7 +79,9 @@
 		</view>
 		<!-- 标签 -->
 		<view class="tabs">
-			<u-picker  v-model="tabsFrom.show1" mode="selector" :range="tabsFrom.selector1"  range-key="label" @confirm="selector1confirm" ></u-picker>
+			<u-picker  v-model="tabsFrom.show1"
+			  :default-selector="[tabsFrom.show1Index]"
+			 mode="selector" :range="tabsFrom.selector1"  range-key="label" @confirm="selector1confirm" ></u-picker>
 			<u-picker-select title="日期选择" v-model="tabsFrom.show2"
 			 :defaultTime="tabsFrom.show2Index" :endYear="endYear"
 			 mode="time" :params="params"  @confirm="selector2confirm" @reset="selector2reset" ></u-picker-select>

pages/tenantList/operationLog.vue

@@ -5,9 +5,12 @@
 		</u-navbar>
 		<!-- 标签 -->
 		<view class="tabs">
-			<u-picker v-model="tabsFrom.show1" mode="selector" :range="tabsFrom.selector1" range-key="label"
+			<u-picker v-model="tabsFrom.show1" mode="selector"
+			 :default-selector="[tabsFrom.show1Index]"
+			 :range="tabsFrom.selector1" range-key="label"
 				@confirm="selector1confirm"></u-picker>
-			<u-picker-select title="日期选择" v-model="tabsFrom.show2" :defaultTime="tabsFrom.show2Index" :endYear="endYear"
+			<u-picker-select title="日期选择" :noselect="false"
+			v-model="tabsFrom.show2" :defaultTime="tabsFrom.show2Index" :endYear="endYear"
 				mode="time" :params="params" @confirm="selector2confirm" @reset="selector2reset"></u-picker-select>
 
 
@@ -18,39 +21,55 @@
 		</view>
 		<!-- 日志 -->
 		<view class="log">
-			<view class="log-item" v-for="item in 2">
+			<view class="log-item" v-for="(item,i) in list">
 				<view class="item-infos">
 					<view class="place">
-						大厅灯控 <text>(一楼大厅)</text>
+						{{item.meterName}} <text v-if="item.installationAddress">({{item.installationAddress}})</text>
 					</view>
 					<view class="date">
-						2024.02.14 16:00:00
+						{{item.createTime}}
 					</view>
 				</view>
 				
 				<view class="else">
 					<view class="operation">
-						打开
+						{{item.switchStatusN}}
 					</view>
 					<view class="from">
-						来自 本地操作
+						来自 {{item.typeN}}
 					</view>
 				</view>
 			</view>
+			<u-divider :isnone="list.length==0" v-if="recordsTotal==list.length"  nonetext="无记录"
+				border-color="#CFD2D5">已经到底了</u-divider>
 		</view>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/meterTimer.js'
+	import {
+		nextDay,
+		nextMonth,
+	} from '@/apis/utils'
+	
 	export default {
 		data() {
 			return {
+				meterList:[],
 				endYear:'',
+					pageIndex: 1,
 					queryMonth:"",
+					recordsTotal:0,
+					list:[],
+					meterId:"",
+					formData:{
+						startDate:""
+					},
 				params: {
 					year: true,
 					month: true,
-					day: true,
+					day: false,
 					hour: false,
 					minute: false,
 					second: false
@@ -86,16 +105,104 @@
 				},
 			}
 		},
-		onLoad() {
+		onLoad(op) {
 			this.endYear=new Date().getFullYear()
 			
-			var date=new Date()
-			this.formData.startDate=date.getFullYear()+"-"+(date.getMonth() + 1) +"-1"
-			this.queryMonth=date.getFullYear()+"年"+(date.getMonth() + 1) +"月"
-			
-			
+			//var date=new Date()
+			//this.formData.startDate=date.getFullYear()+"-"+(date.getMonth() + 1) +"-1"
+			//this.queryMonth=date.getFullYear()+"年"+(date.getMonth() + 1) +"月"
+		
+			if(op.id){
+				
+				this.meterId=op.id;
+				
+			}
+			this.getHaveMeterList()
+			this.rechargeRecord()
+		},
+		onReachBottom() {
+			if (this.list.length < this.recordsTotal) {
+				this.myLoadmore();
+			}
 		},
 		methods: {
+			myLoadmore() {
+				this.pageIndex += 1;
+				this.rechargeRecord();
+			},
+			getHaveMeterList(){
+				
+				
+				var data = {
+				
+					queryForm:"property",
+					
+				};
+				API.haveMeterList(data).then((response) => {
+					
+					//var MeterList=response.data.switchRecordList.data
+					this.meterList = response.data.remoteReadingMeterList;
+					//this.recordsTotal = response.data.switchRecordList.recordsTotal;
+					this.tabsFrom.selector1=[]
+					this.tabsFrom.selector1=[{
+						label: "全部类型",
+						value: '',
+					}]
+					var i =0;
+					this.meterList.forEach(item=>{
+						this.tabsFrom.selector1.push({
+							label: item.name,
+							value: item.id,
+						})
+						
+						i++
+						if(item.id==this.meterId){
+							this.selector1confirmTest([i])
+						}
+					})
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			rechargeRecord(bl){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.list = [];
+					this.pageIndex = 1;
+				}
+				var data = {
+					pageIndex: this.pageIndex,
+					pageSize: 20,
+					meterId:this.meterId,
+					queryForm:"property",
+					yearMonth:this.formData.startDate
+					// companyId: this.companyId,
+					// status: this.status
+				};
+				API.meterTimerRecord(data).then((response) => {
+					uni.hideLoading();
+					var list=response.data.switchRecordList.data
+					this.list = [
+						...this.list,
+						...list
+					];
+					this.recordsTotal = response.data.switchRecordList.recordsTotal;
+					
+				
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
 			selector2confirm(e) {
 
 				this.tabsFrom.show2Text = e.year + "年" + e.month + "月"
@@ -118,13 +225,13 @@
 
 				} else {
 					this.queryMonth = e.year + "年" + e.month + "月"
-					this.formData.startDate = e.year + "-" + e.month + "-1"
+					this.formData.startDate = e.year + "-" + e.month 
 
 					this.formData.endDate = nextMonth(e.year, e.month, 1, 1)
 
 
 				}
-				this.rechargeRecord()
+				this.rechargeRecord(true)
 			},
 			selector2reset(e) {
 
@@ -134,17 +241,24 @@
 
 				this.formData.startDate = date.getFullYear() + "-" + (date.getMonth() + 1) + "-1"
 				this.queryMonth = date.getFullYear() + "年" + (date.getMonth() + 1) + "月"
-				this.rechargeRecord()
+				this.rechargeRecord(true)
 			},
 			selector1confirm(e) {
 
 				var index = e[0]
 				this.tabsFrom.show1Index = index
 				this.tabsFrom.show1Text = this.tabsFrom.selector1[index].label
-				this.formData.type = this.tabsFrom.selector1[index].value
-				this.rechargeRecord()
+				this.meterId = this.tabsFrom.selector1[index].value
+				this.rechargeRecord(true)
+			},
+			selector1confirmTest(e) {
+			
+				var index = e[0]
+				this.tabsFrom.show1Index = index
+				this.tabsFrom.show1Text = this.tabsFrom.selector1[index].label
+				//this.meterId = this.tabsFrom.selector1[index].value
+				//this.rechargeRecord(true)
 			},
-
 
 
 		}

pages/tenantList/remoteControl.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<u-navbar title="远程控制"  title-color="#101010" >
-			<view class="u-nav-slot" slot="right" v-if="0" >
+			<view class="u-nav-slot" slot="right"  @click="gotoUrl('/pages/tenantList/operationLog')" >
 				 操作日志
 			</view>
 		</u-navbar>