Browse Source

不用功能暂时注销

wkyy 1 năm trước cách đây
mục cha
commit
d0ed64efde

+ 2 - 0
pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -64,6 +64,8 @@
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/energy/index.js'
+	
 	export default {
 		data() {
 			return {

+ 10 - 1
pages/statistics/statistics.vue

@@ -144,7 +144,7 @@
 				</view>
 			</view>
 			<!-- 统计2 异常告警记录 -->
-			<view class="statistics-2 statistics">
+			<view class="statistics-2 statistics" v-if="false">
 				<view class="title">
 					<view class="icon">
 						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
@@ -313,6 +313,11 @@
 				var n = this.merchantList1[this.current];
 				this.merchantList1[this.current] = m;
 				this.merchantList2[index] = n;
+				
+				this.companyId = item.id;
+				this.getPowerConsumption(0);
+				this.getEquipmentDataMonitoring(0);
+				this.popShow = false;
 			},
 			// 单位
 			getCompanyInfoList() {
@@ -425,21 +430,25 @@
 				this.getEquipmentDataMonitoring(0);
 			},
 			toDataMonitoringList() {
+				return
 				uni.navigateTo({
 					url: '/pages/equipmentDataMonitoring/dataMonitoring-list'
 				})
 			},
 			toWorkOrderManagement() {
+				return
 				uni.navigateTo({
 					url: '/pages/workOrderManagement/workOrderManagement'
 				})
 			},
 			toEquipmentElectricity() {
+				return
 				uni.navigateTo({
 					url: '/pages/equipmentDataMonitoring/equipmentElectricity'
 				})
 			},
 			toElectronicMonitoring(item) {
+				return
 				uni.navigateTo({
 					url: '/pages/equipmentDataMonitoring/electronicMonitoring'
 				})