wkyy 1 rok pred
rodič
commit
e5423046f0

+ 6 - 6
pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -125,7 +125,7 @@
 			</view>
 		</view>
 		<!-- 异常波动 -->
-		<view class="abnormal" v-if="false">
+		<view class="abnormal">
 			<view class="headline">
 				<view class="title">
 					<view class="icon">
@@ -135,7 +135,7 @@
 						异常告警
 					</view>
 				</view>
-				<view class="more">
+				<view class="more" @click="gotoUrl('/pages/abnormal/abnormalAlarmRecord?id=')">
 					查看全部
 					<u-icon name="arrow-right" size="24" color="#d4d4d4"></u-icon>
 				</view>
@@ -165,7 +165,7 @@
 		</view>
 
 		<!-- 能源监测 -->
-		<view class="energy-inspection" v-if="false">
+		<view class="energy-inspection">
 			<view class="title">
 				<view class="icon">
 
@@ -217,7 +217,7 @@
 			</view>
 		</view>
 		<!-- 数据分析 -->
-		<view class="data-analysis" v-if="false">
+		<view class="data-analysis">
 			<view class="title">
 				<view class="icon">
 
@@ -252,7 +252,7 @@
 		</view>
 
 		<!-- 设备信息 -->
-		<view class="equipment-information" v-if="false">
+		<view class="equipment-information">
 			<view class="title">
 
 				<view class="icon">
@@ -364,7 +364,7 @@
 
 		</view>
 		<!-- 故障上报 -->
-		<view class="create-order" v-if="false">
+		<view class="create-order">
 			<view class="img-box">
 				<image class="img" src="@/assets/img/fas fa-exclamation-triangle Copy 2@3x.png" mode=""></image>
 			</view>

+ 1 - 1
pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -11,7 +11,7 @@
 
 		</view>
 		<!-- 标签 -->
-		<view class="tabs-box" v-if="companyList.length >2">
+		<view class="tabs-box" v-if="companyList.length > 2">
 			<view class="tabs">
 				<u-tabs :list="merchantList1" :is-scroll="false" inactive-color="#999999" active-color="#666666" :current="current"
 					@change="change"></u-tabs>

+ 4 - 4
pages/statistics/statistics.vue

@@ -5,17 +5,17 @@
 			<view class="title">
 				能源中心
 			</view>
-			<view class="icon" v-if="codes.indexOf('detector') != -1" @click="toDataMonitoringList">
+			<view class="icon" @click="toDataMonitoringList" v-if="codes.indexOf('detector') != -1">
 				<image class="img" src="@/assets/img/riLine-equalizer-line.svg" mode=""></image>
 			</view>
 		</view>
 		<!-- 标签 -->
-		<view class="tabs-box" v-if="companyList.length >2">
-			<view class="tabs">
+		<view class="tabs-box">
+			<view class="tabs" v-if="companyList.length > 2">
 				<u-tabs :list="merchantList1" :is-scroll="false" active-color="#fff" inactive-color="#CCE2FF" bg-color="#1677FF"
 					:current="current" @change="change"></u-tabs>
 			</view>
-			<view class="more" @click="popShow=true" v-if="companyList.length > 3">
+			<view class="more" @click="popShow=true" v-if="companyList.length > 2">
 				<u-icon name="arrow-down" color="#fff" size="40"></u-icon>
 			</view>
 		</view>

+ 2 - 2
pages/workOrderManagement/faultReport.vue

@@ -178,8 +178,8 @@
 			//选择设备
 			deviceConfirm(e) {
 				console.log(e)
-				this.faultForm.deviceId = e[2].value;
-				this.faultForm.deviceName = e[2].label;
+				this.faultForm.deviceId = e[0].value;
+				this.faultForm.deviceName = e[0].label;
 			},
 			getLoadMyDevices() {
 				uni.showLoading({

+ 41 - 22
pages/workOrderManagement/workOrderManagement.vue

@@ -15,7 +15,8 @@
 
 		<!-- 搜索 -->
 		<view class="search-box">
-			<u-search placeholder="搜索" bg-color="#fff" height="80" :show-action="true" v-model="keyword">
+			<u-search placeholder="搜索" bg-color="#fff" height="80" :show-action="true" v-model="queryForm.qkey"
+				@custom="searchWorkOrder">
 
 
 			</u-search>
@@ -36,28 +37,19 @@
 			</view>
 			<!-- 分类 -->
 			<view class="classify">
-				<view class="item item-checked">
-					全部18
-					<view class="checked-circle">
+				<view class="item" v-for="(item,index) in classificationList" :key="index"
+					:class="classificationIndex==index ? 'item-checked' : ''" @click="classificationClick(item,index)">
+					{{item.name}}18
+					<view class="checked-circle" v-if="classificationIndex==index">
 
 					</view>
 				</view>
-				<view class="item">
-					待指派 2
-				</view>
-				<view class="item">
-					进行中 3
-				</view>
-				<view class="item">
-					已解决 13
-				</view>
 			</view>
 			<!-- 工单详情 -->
-			<!-- <view class="work-order" v-for="(item,index) in workOrderList" :key="index"> -->
-			<view class="work-order">
+			<view class="work-order" v-for="(item,index) in workOrderList" :key="index">
 				<!-- 紧急 -->
-				<view @click="gotoUrl('/pages/workOrderManagement/workOrderDetails?id=')">
-					<view class="urgency">
+				<view @click="gotoUrl('/pages/workOrderManagement/workOrderDetails?id='+item.id)">
+					<view class="urgency" v-if="item.urgentIf">
 						紧急
 					</view>
 					<view class="order-item">
@@ -65,7 +57,7 @@
 							<image class="img" src="@/assets/img/riFill-building-fill1.svg" mode=""></image>
 						</view>
 						<view class="item-value value-bold">
-							荆鹏集团-荆鹏软件园01
+							{{item.ownerOrgName}}-{{item.deviceName}}
 						</view>
 					</view>
 					<view class="order-item">
@@ -73,7 +65,7 @@
 							<image class="img" src="@/assets/img/riFill-alert-fill.svg" mode=""></image>
 						</view>
 						<view class="item-value value-bold">
-							温度过高
+							{{item.faultTypeName}}
 						</view>
 					</view>
 					<view class="order-item">
@@ -81,7 +73,7 @@
 							<image class="img" src="@/assets/img/riFill-map-pin-fill.svg" mode=""></image>
 						</view>
 						<view class="item-value">
-							沙市区江津东路附155号
+							{{item.deviceAddress}}
 						</view>
 					</view>
 					<view class="order-item">
@@ -89,7 +81,7 @@
 							<image class="img" src="@/assets/img/riFill-time-fill.svg" mode=""></image>
 						</view>
 						<view class="item-value">
-							2024-02-04 20:00:00
+							{{item.createTime}}
 						</view>
 					</view>
 				</view>
@@ -115,6 +107,9 @@
 					</view>
 				</view>
 			</view>
+			
+			<u-divider :isnone="workOrderList.length==0" nonetext="暂无工单" border-color="#CFD2D5">
+				已经到底了</u-divider>
 		</view>
 
 		<!-- 关闭原因 -->
@@ -171,6 +166,13 @@
 		},
 		data() {
 			return {
+				classificationIndex: 0, //分类
+				classificationList: [
+					{value: '0', name: '全部'},
+					{value: '1', name: '指派'},
+					{value: '2', name: '进行中'},
+					{value: '3', name: '已解决'}
+				],
 				workOrderList: [], //工单列表
 				recordsTotal: 0,
 				queryForm: {
@@ -188,9 +190,26 @@
 			}
 		},
 		onLoad() {
-			// this.getQueryMy();
+			this.getQueryMy();
+		},
+		onReachBottom() {
+			if (this.workOrderList.length < this.recordsTotal) {
+				this.myLoadmore();
+			}
 		},
 		methods: {
+			//搜索
+			searchWorkOrder() {
+				this.getQueryMy(true);
+			},
+			//分类
+			classificationClick(item,index) {
+				this.classificationIndex = index;
+			},
+			myLoadmore() {
+				this.queryForm.pageIndex += 1;
+				this.getAbnormalAlarmRecord();
+			},
 			getQueryMy(bl) {
 				uni.showLoading({
 					title: "加载中",