电量监控

pages/equipmentDataMonitoring/dataMonitoring-list.vue

@@ -139,12 +139,20 @@
 			return {
 				show2: false, // 状态选择
 				state: '全部状态',
-				stateList: [],
+				stateList: [
+					{label: '全部状态', value: ''},
+					{label: '设备正常', value: '0'},
+					{label: '设备离线', value: '1'},
+					{label: '温度异常', value: '2'},
+					{label: '烟感异常', value: '3'},
+					{label: '设备异常', value: '4'}
+				],
 				show1: false, // 设备选择
 				device: '全部设备',
 				selectDeviceList: [],
 				deviceList: [],
 				companyId: '',
+				status: '',
 				pageIndex: 1,
 				recordsTotal: 0,
 				value1: 0,
@@ -200,20 +208,7 @@
 				})
 				API.alarmConfiguration().then((response) => {
 					uni.hideLoading();
-					var list1 = [];
 					var list2 = [];
-					if(response.data.alarmConfigList && response.data.alarmConfigList.length != 0) {
-						list1 = response.data.alarmConfigList.map(item => {
-							return {
-								label: item.name,
-								value: item.id
-							}
-						});
-					}
-					list1.unshift({
-						value: '',
-						label: '全部状态'
-					});
 					
 					if(response.data.companyInfoList && response.data.companyInfoList.length != 0) {
 						list2 = response.data.companyInfoList.map(item => {
@@ -240,7 +235,7 @@
 			// 状态查询
 			stateChange(e) {
 				console.log(e);
-				this.configId = e[0].value;
+				this.status = e[0].value;
 				this.state = e[0].label;
 				
 				this.getList(true);
@@ -269,7 +264,8 @@
 				var data = {
 					pageIndex: this.pageIndex,
 					pageSize: 5,
-					companyId: this.companyId
+					companyId: this.companyId,
+					status: this.status
 				};
 				API.homePageDeviceData(data).then((res) => {
 					uni.hideLoading()

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -106,10 +106,10 @@
 			</view>
 			<view class="statistics-item">
 				<view class="item-title">
-					电费统计（度）
+					电费统计（元）
 				</view>
 				<view class="item-value">
-					18,287.23
+					{{fee}}
 				</view>
 			</view>
 		</view>
@@ -396,7 +396,8 @@
 	export default {
 		data() {
 			return {
-				electricity: 0, //电量统计
+				electricity: 0, //电量统计
+				fee: 0, //电费统计
 				abnormalRecordsList: [], //异常list
 				companyId: '', //企业id
 				meterId: '', //设备id
@@ -745,7 +746,8 @@
 					}
 					this.showTop = [0, 0, 0, 0, 0, 0, 0, 0]
 					var electricity = response.data.kwhMap.kwh + "";
-					this.electricity = response.data.kwhMap.kwh;
+					this.electricity = response.data.kwhMap.kwh;
+					this.fee = response.data.kwhMap.fee;
 
 					if (electricity) {
 						var sz = electricity.split(".")

pages/workOrderManagement/workOrderManagement.vue

@@ -170,10 +170,10 @@
 				workOrderId: '', //工单id
 				classificationIndex: 0, //分类
 				classificationList: [
-					{value: '0', name: '全部'},
-					{value: '1', name: '待指派'},
-					{value: '2', name: '进行中'},
-					{value: '3', name: '已解决'}
+					{value: '', name: '全部'},
+					{value: 'created', name: '待指派'},
+					{value: 'dispatched', name: '进行中'},
+					{value: 'ended', name: '已解决'}
 				],
 				workOrderList: [], //工单列表
 				recordsTotal: 0,
@@ -183,6 +183,7 @@
 					qkey: '', //关键字(工单编号/设备名/故障信息)
 					startDate: '', //开始日期	
 					endDate: '', //截止日期
+					status: '' //工单状态
 				},
 				keyword: '',
 				closeShow: false,
@@ -216,6 +217,9 @@
 			//分类
 			classificationClick(item,index) {
 				this.classificationIndex = index;
+				this.queryForm.status = item.value;
+				
+				this.getQueryMy(true);
 			},
 			myLoadmore() {
 				this.queryForm.pageIndex += 1;
@@ -247,6 +251,7 @@
 			//选择关闭原因
 			reasonClick(item,index) {
 				this.current = index;
+				this.closeReason = item;
 			},
 			//关闭工单
 			closeWorkOrder() {
@@ -254,7 +259,10 @@
 					title: "加载中",
 					mask: true,
 				})
-				API_workOrder.usClose({id: this.workOrderId}).then((res) => {
+				API_workOrder.usClose({
+					id: this.workOrderId,
+					closeReason: this.closeReason
+				}).then((res) => {
 					uni.hideLoading();
 					this.closeShow = false;
 					uni.navigateTo({

pages/workOrderManagement/workOrderStatistics.vue

@@ -10,6 +10,7 @@
 					{{item}}
 				</view>
 			</view>
+			
 			<!-- 数据统计 -->
 			<view class="data-statistics">
 				<view class="title">