zhengkaixin 2 ヶ月 前
コミット
3f8d3a05c3

+ 85 - 85
App.vue

@@ -7,97 +7,97 @@
 <script>
 	
 	import './config/.env.js'
-	import './assets/js/font.js'
-	export default {
-		onLaunch: function() {
+	import './assets/js/font.js'
+	export default {
+		onLaunch: function() {
 			console.log('App Launch')
-				
+				
 		},
-		 
+		 
 		onShow: function() {
-			
-			console.log('App Show ---- App Show')
-		},
-		onHide: function() {
-			console.log('App Hide  -- App Hide  -App Hide')
-		}
-	}
-</script>
-
-<style lang="scss">
-	
-	html, body {
-	  background-color:#F2F4F6;
-	  margin: 0;
-	  padding: 0;
-	}
-	// 导航
-	.navbar-c{
-		background-color: #fff;
-		line-height: 88rpx;
-		padding: 0 24rpx;
-		display: flex;
-		align-items: center;
-		position: sticky;
-		left: 0;
-		right: 0;
-		top: 0;
-		z-index: 99999;
-		.back{
-			.img{
-				width: 48rpx;
-				height: 48rpx;
-				vertical-align: middle;
-			}
-		}
-		
-		.title{
-			color: rgb(16,16,16);
-			font-size: 36rpx;
-			    flex: 1;
-			    position: absolute;
-			    left: 0;
-			    right: 0;
-			    text-align: center;
-			    flex-shrink: 0;
-			
-			.img{
-				width: 32rpx;
-				height: 32rpx;
-				vertical-align: middle;
-				margin-left: 8rpx;
-			}
-		}
-		.right{
-			display: flex;
-			align-items: center;
-			margin-left: auto;
-			font-size: 32rpx;
-			color: rgba(16,16,16,1);
-			.img{
-				width: 32rpx;
-				height: 32rpx;
-				margin-right: 4rpx;
-			}
-		}
-	}
-	// 导航栏标题文字
-	.u-title {
-		font-size: 36rpx !important
-	}
-	/deep/.uicon-nav-back{
-		color: #101010 !important;
-		font-weight: bold !important;
-		font-size: 36rpx !important
+			
+			console.log('App Show ---- App Show')
+		},
+		onHide: function() {
+			console.log('App Hide  -- App Hide  -App Hide')
+		}
+	}
+</script>
+
+<style lang="scss">
+	
+	html, body {
+	  background-color:#F2F4F6;
+	  margin: 0;
+	  padding: 0;
+	}
+	// 导航
+	.navbar-c{
+		background-color: #fff;
+		line-height: 88rpx;
+		padding: 0 24rpx;
+		display: flex;
+		align-items: center;
+		position: sticky;
+		left: 0;
+		right: 0;
+		top: 0;
+		z-index: 99999;
+		.back{
+			.img{
+				width: 48rpx;
+				height: 48rpx;
+				vertical-align: middle;
+			}
+		}
+		
+		.title{
+			color: rgb(16,16,16);
+			font-size: 36rpx;
+			    flex: 1;
+			    position: absolute;
+			    left: 0;
+			    right: 0;
+			    text-align: center;
+			    flex-shrink: 0;
+			
+			.img{
+				width: 32rpx;
+				height: 32rpx;
+				vertical-align: middle;
+				margin-left: 8rpx;
+			}
+		}
+		.right{
+			display: flex;
+			align-items: center;
+			margin-left: auto;
+			font-size: 32rpx;
+			color: rgba(16,16,16,1);
+			.img{
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 4rpx;
+			}
+		}
+	}
+	// 导航栏标题文字
+	.u-title {
+		font-size: 36rpx !important
+	}
+	::v-deep.uicon-nav-back{
+		color: #101010 !important;
+		font-weight: bold !important;
+		font-size: 36rpx !important
 	}
 	#__vconsole{
 		z-index: 99999;
 		position: absolute;
-	}
-	.slot{
-		color: rgba(16,16,16,1);
-		font-size: 32rpx;
-		margin-right: 32rpx;
+	}
+	.slot{
+		color: rgba(16,16,16,1);
+		font-size: 32rpx;
+		margin-right: 32rpx;
 	}
 	.uni-icon-success-no-circle:before {
 	    content: "" !important ;
@@ -107,5 +107,5 @@
 		margin: -10px 1px 10px 1px;
 	}
 	
-	
+	
 </style>

+ 204 - 204
components/Map-equipment.vue

@@ -1,205 +1,205 @@
-<template>
-	<view>
-		<view id="container" :style="myStyle"></view>
-
-	</view>
-</template>
-
-<script>
-	let _self;
-
-	function mapMovestart(e) {
-		//'movestart')
-	}
-
-	function mapMove(e) {
-		//		//'mapMove')
-	}
-
-	function mapMoveend(e) {
-		//let _self = e;
-		let pos = _self.logMapInfo();
-
-		_self.$emit('onMoveEnd', pos);
-		//'mapMoveend')
-	}
-
-
-	import MapLoader from '@/apis/utils/AMap'
-
-	export default {
-		name: "Map-equipment",
-		data() {
-			return {
-				AMap: null,
-				mapcharger: null,
-				myStyle: "width: 100%; height: 1200rpx;",
-				longitude: 112.276527,
-				latitude: 30.306427,
-				iconList: []
-
-			};
-		},
-		methods: {
-			setList(sz) {
-				if (this.AMap == null) {
-					return
-				}
-				for (var i in this.iconList) {
-					if (this.iconList[i].marker) {
-						this.iconList[i].marker.setMap(null);
-					}
-					this.mapcharger.remove(this.iconList[i]);
-				}
-				this.iconList = []
-				for (var i in sz) {
-					var ob = sz[i];
-					this.addIcon(ob);
-
-				}
-
-			},
-			iconTemp1(marker, pos) {
-				var classId = ""
-				if (pos.status == 1) {
-					classId = "location1"
-				}
-				if (pos.status == 2) {
-					classId = "location2"
-				}
-				//初始化原点模板
-				var img = require("@/assets/img/antFill-alert Copy 1.svg")
-
-				var content = `<div class='${classId} ${pos.name}'><img src='${img}'/><div   class="corner"></div></div>`;
-
-				marker.setContent(content)
-				marker.setzIndex(900);
-			},
-			iconTemp2(marker, pos) {
-				//展开原点模板
-				var classId = "location2"
-				var statusName = pos.online ? '在线' : '离线';
-
-				var img1 = require("@/assets/img/antFill-alert.svg")
-				var img2 = require("@/assets/img/antFill-alert(2).svg")
-
-				var content = `<div class='${classId} ${pos.name}'>
-				<div  class="icon2-left" ><img src='${img1}'/></div>
-				
-				<div   class="icon2-right">
-					<div  class="corner2" ></div>
-					<div  class="corner2-top" >${pos.name}</div>
-					<div  class="corner2-bottom" ><img class="img2" src='${img2}'/>${statusName}</div>
-				</div>
-				</div>`;
-
-				marker.setContent(content)
-				marker.setzIndex(920);
-			},
-			addIcon(pos) {
-				let marker = new AMap.Marker({
-					content: '',
-					position: [pos.longitude, pos.latitude],
-					//offset: new AMap.Pixel(-20, -40),
-					offset: new AMap.Pixel(0, 0), //设置点标记偏移量
-					anchor: 'bottom-center',
-					zIndex: 900,
-					showPositionPoint: true,
-					autoRotation: true,
-				});
-				this.iconTemp1(marker, pos)
-				marker.setMap(this.mapcharger);
-				this.myEmit("charger", marker, pos)
-				this.iconList.push({
-					marker: marker,
-					info: pos
-				});
-
-			},
-			updateIcon(obj) {
-				if (this.iconList.length == 0) {
-					return
-				}
-				let index = this.iconList.findIndex(item => item.info.id == obj.id);
-				console.log("updateIcon", index)
-				for (var i in this.iconList) {
-					var marker = this.iconList[i].marker
-					var pos = this.iconList[i].info
-
-					this.iconTemp1(marker, pos)
-				}
-				var pos = this.iconList[index].info
-				var marker = this.iconList[index].marker
-				this.iconTemp2(marker, pos)
-			},
-			myEmit(type, ob1, obj) {
-				var _this = this;
-				console.log("myEmit")
-				AMap.event.addListener(ob1, 'click', function(e) {
-					console.log("myEmit2", type, ob1, obj)
-					_this.$emit('clickMap', {
-						type: type,
-						obj: obj
-					})
-				})
-
-			},
-			setMyStyle(s) {
-				this.myStyle = s;
-			},
-			logMapInfo() {
-				var posCenter = this.mapcharger.getCenter();
-				//			  //'center'+JSON.stringify(posCenter));
-				var limitBounds = this.mapcharger.getBounds();
-				let pos = {
-					center: posCenter,
-					bounds: limitBounds
-				};
-				return pos;
-			},
-			init() {
-				_self = this;
-				var _this = this;
-				MapLoader().then(AMap => {
-					this.AMap = AMap;
-					_this.mapcharger && _this.mapcharger.destroy();
-					_this.mapcharger = new AMap.Map("container", {
-						resizeEnable: true,
-						dragEnable: true,
-						center: [this.longitude, this.latitude],
-						zoom: 13
-					});
-					_this.mapcharger.setMapStyle('amap://styles/f9b17f73bb4576ab1894c29fe9d03c6c');
-
-					_this.$emit('onload')
-					//_this.addPosition();
-					_this.listenMove();
-
-				})
-
-			},
-			listenMove() {
-				var _this = this;
-
-				_this.mapcharger.on('movestart', mapMovestart);
-				_this.mapcharger.on('mapmove', mapMove);
-				_this.mapcharger.on('moveend', mapMoveend);
-
-			},
-
-		}
-
-	}
-</script>
-
-<style scoped>
-	/*去除下标*/
-	/deep/.amap-logo {
-		display: none !important;
-	}
-
-	/deep/.amap-copyright {
-		opacity: 0;
-		font-size: 1px;
-	}
+<template>
+	<view>
+		<view id="container" :style="myStyle"></view>
+
+	</view>
+</template>
+
+<script>
+	let _self;
+
+	function mapMovestart(e) {
+		//'movestart')
+	}
+
+	function mapMove(e) {
+		//		//'mapMove')
+	}
+
+	function mapMoveend(e) {
+		//let _self = e;
+		let pos = _self.logMapInfo();
+
+		_self.$emit('onMoveEnd', pos);
+		//'mapMoveend')
+	}
+
+
+	import MapLoader from '@/apis/utils/AMap'
+
+	export default {
+		name: "Map-equipment",
+		data() {
+			return {
+				AMap: null,
+				mapcharger: null,
+				myStyle: "width: 100%; height: 1200rpx;",
+				longitude: 112.276527,
+				latitude: 30.306427,
+				iconList: []
+
+			};
+		},
+		methods: {
+			setList(sz) {
+				if (this.AMap == null) {
+					return
+				}
+				for (var i in this.iconList) {
+					if (this.iconList[i].marker) {
+						this.iconList[i].marker.setMap(null);
+					}
+					this.mapcharger.remove(this.iconList[i]);
+				}
+				this.iconList = []
+				for (var i in sz) {
+					var ob = sz[i];
+					this.addIcon(ob);
+
+				}
+
+			},
+			iconTemp1(marker, pos) {
+				var classId = ""
+				if (pos.status == 1) {
+					classId = "location1"
+				}
+				if (pos.status == 2) {
+					classId = "location2"
+				}
+				//初始化原点模板
+				var img = require("@/assets/img/antFill-alert Copy 1.svg")
+
+				var content = `<div class='${classId} ${pos.name}'><img src='${img}'/><div   class="corner"></div></div>`;
+
+				marker.setContent(content)
+				marker.setzIndex(900);
+			},
+			iconTemp2(marker, pos) {
+				//展开原点模板
+				var classId = "location2"
+				var statusName = pos.online ? '在线' : '离线';
+
+				var img1 = require("@/assets/img/antFill-alert.svg")
+				var img2 = require("@/assets/img/antFill-alert(2).svg")
+
+				var content = `<div class='${classId} ${pos.name}'>
+				<div  class="icon2-left" ><img src='${img1}'/></div>
+				
+				<div   class="icon2-right">
+					<div  class="corner2" ></div>
+					<div  class="corner2-top" >${pos.name}</div>
+					<div  class="corner2-bottom" ><img class="img2" src='${img2}'/>${statusName}</div>
+				</div>
+				</div>`;
+
+				marker.setContent(content)
+				marker.setzIndex(920);
+			},
+			addIcon(pos) {
+				let marker = new AMap.Marker({
+					content: '',
+					position: [pos.longitude, pos.latitude],
+					//offset: new AMap.Pixel(-20, -40),
+					offset: new AMap.Pixel(0, 0), //设置点标记偏移量
+					anchor: 'bottom-center',
+					zIndex: 900,
+					showPositionPoint: true,
+					autoRotation: true,
+				});
+				this.iconTemp1(marker, pos)
+				marker.setMap(this.mapcharger);
+				this.myEmit("charger", marker, pos)
+				this.iconList.push({
+					marker: marker,
+					info: pos
+				});
+
+			},
+			updateIcon(obj) {
+				if (this.iconList.length == 0) {
+					return
+				}
+				let index = this.iconList.findIndex(item => item.info.id == obj.id);
+				console.log("updateIcon", index)
+				for (var i in this.iconList) {
+					var marker = this.iconList[i].marker
+					var pos = this.iconList[i].info
+
+					this.iconTemp1(marker, pos)
+				}
+				var pos = this.iconList[index].info
+				var marker = this.iconList[index].marker
+				this.iconTemp2(marker, pos)
+			},
+			myEmit(type, ob1, obj) {
+				var _this = this;
+				console.log("myEmit")
+				AMap.event.addListener(ob1, 'click', function(e) {
+					console.log("myEmit2", type, ob1, obj)
+					_this.$emit('clickMap', {
+						type: type,
+						obj: obj
+					})
+				})
+
+			},
+			setMyStyle(s) {
+				this.myStyle = s;
+			},
+			logMapInfo() {
+				var posCenter = this.mapcharger.getCenter();
+				//			  //'center'+JSON.stringify(posCenter));
+				var limitBounds = this.mapcharger.getBounds();
+				let pos = {
+					center: posCenter,
+					bounds: limitBounds
+				};
+				return pos;
+			},
+			init() {
+				_self = this;
+				var _this = this;
+				MapLoader().then(AMap => {
+					this.AMap = AMap;
+					_this.mapcharger && _this.mapcharger.destroy();
+					_this.mapcharger = new AMap.Map("container", {
+						resizeEnable: true,
+						dragEnable: true,
+						center: [this.longitude, this.latitude],
+						zoom: 13
+					});
+					_this.mapcharger.setMapStyle('amap://styles/f9b17f73bb4576ab1894c29fe9d03c6c');
+
+					_this.$emit('onload')
+					//_this.addPosition();
+					_this.listenMove();
+
+				})
+
+			},
+			listenMove() {
+				var _this = this;
+
+				_this.mapcharger.on('movestart', mapMovestart);
+				_this.mapcharger.on('mapmove', mapMove);
+				_this.mapcharger.on('moveend', mapMoveend);
+
+			},
+
+		}
+
+	}
+</script>
+
+<style scoped>
+	/*去除下标*/
+	::v-deep.amap-logo {
+		display: none !important;
+	}
+
+	::v-deep.amap-copyright {
+		opacity: 0;
+		font-size: 1px;
+	}
 </style>

+ 2 - 2
pages/equipmentDataMonitoring/dataMonitoring-map.vue

@@ -493,7 +493,7 @@
 			height: 100vh;
 		}
 
-		/deep/.location1 {
+		::v-deep.location1 {
 			width: 36px;
 			height: 36px;
 
@@ -526,7 +526,7 @@
 			}
 		}
 
-		/deep/.location2 {
+		::v-deep.location2 {
 			width: 280rpx;
 			border-radius: 50px;
 			background-color: #27B148;

+ 216 - 216
pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -11,9 +11,9 @@
 				<view class="back" @click="backDataMonitoringList">
 					<u-icon name="arrow-left" color="#fff" size="36"></u-icon>
 				</view>
-				<view class="title" @click="titleCk">
-					<view class="e">
-						{{tabsFrom.title}}
+				<view class="title" @click="titleCk">
+					<view class="e">
+						{{tabsFrom.title}}
 					</view>
 					<u-icon name="arrow-down" color="#fff" v-if="tabsFrom.selector1.length"
 					 size="24"></u-icon>
@@ -97,27 +97,27 @@
 					</view>
 				</view>
 			</view> -->
-        <!-- 统计 -->
-		<view class="statistics-content">
-			<view class="statistics-item">
-				<!-- @click="gotoUrl('/pages/equipmentDataMonitoring/electricityConsumptionDetail?id='
-				+FormData.meterId+'&name='+tabsFrom.title+'&type='+FormData.type)"> -->
-				<view class="item-title">
-					<image class="img" src="@/assets/img/meterStatistics@3x.png"></image>电量统计(度)
-				</view>
-				<view class="item-value">
-					<text>{{electricity}}</text>
-					<!-- <u-icon name="arrow-right" color="#cccccc" size="24" ></u-icon> -->
-				</view>
-			</view>
-			<view class="statistics-item" >
-				<view class="item-title item-title2">
-					<image class="img" src="@/assets/img/electricityStatistics@3x.png"></image>电费统计(元)
-				</view>
-				<view class="item-value">
-					{{fee}}
-				</view>
-			</view>
+        <!-- 统计 -->
+		<view class="statistics-content">
+			<view class="statistics-item">
+				<!-- @click="gotoUrl('/pages/equipmentDataMonitoring/electricityConsumptionDetail?id='
+				+FormData.meterId+'&name='+tabsFrom.title+'&type='+FormData.type)"> -->
+				<view class="item-title">
+					<image class="img" src="@/assets/img/meterStatistics@3x.png"></image>电量统计(度)
+				</view>
+				<view class="item-value">
+					<text>{{electricity}}</text>
+					<!-- <u-icon name="arrow-right" color="#cccccc" size="24" ></u-icon> -->
+				</view>
+			</view>
+			<view class="statistics-item" >
+				<view class="item-title item-title2">
+					<image class="img" src="@/assets/img/electricityStatistics@3x.png"></image>电费统计(元)
+				</view>
+				<view class="item-value">
+					{{fee}}
+				</view>
+			</view>
 		</view>
 			<view class="radio">
 				<u-radio-group v-model="value" @change="radioGroupChange">
@@ -147,13 +147,13 @@
 
 				</view>
 			</view>
-			<view class="total" >
-				<view class="total-item">
-					电量合计:{{sumQuantity}}度
-				</view>
-				<view class="total-item">
-					电费合计:{{sumFee}}元
-				</view>
+			<view class="total" >
+				<view class="total-item">
+					电量合计:{{sumQuantity}}度
+				</view>
+				<view class="total-item">
+					电费合计:{{sumFee}}元
+				</view>
 			</view>
 		</view>
 		<!-- 异常波动 -->
@@ -180,12 +180,12 @@
 						{{item.configName}}
 					</view>
 					<view class="time">
-						{{item.createTime}}
-						<!-- 箭头 -->
-							<view class="more">
-								<u-icon name="arrow-right" color="#acacac"  size="24"></u-icon>
+						{{item.createTime}}
+						<!-- 箭头 -->
+							<view class="more">
+								<u-icon name="arrow-right" color="#acacac"  size="24"></u-icon>
 							</view>
-					</view>
+					</view>
 					
 				</view>
 			</view>
@@ -335,14 +335,14 @@
 					<view class="headline">
 						设备信息
 					</view>
-					<view class="infos">
-						<view class="item">
-							<view class="item-title">
-								设备名称
-							</view>
-							<view class="item-value">
-								{{meterDetail.name}}
-							</view>
+					<view class="infos">
+						<view class="item">
+							<view class="item-title">
+								设备名称
+							</view>
+							<view class="item-value">
+								{{meterDetail.name}}
+							</view>
 						</view>
 						<view class="item">
 							<view class="item-title">
@@ -373,25 +373,25 @@
 								设备地址
 							</view>
 							<view class="item-value">
-								<span>{{meterDetail.installationAddress}}</span>
+								<span>{{meterDetail.installationAddress}}</span>
 								<!-- <image class="img" src="@/assets/img/riFill-navigation-fill 1.svg"></image> -->
 							</view>
-						</view>
-						<view class="item">
-							<view class="item-title">
-								地址简称
-							</view>
-							<view class="item-value">
-								{{meterDetail.installationAddressSimple}}
-							</view>
-						</view>
-						<view class="item">
-							<view class="item-title">
-								使用单位
-							</view>
-							<view class="item-value">
-								{{meterDetail.customer}}
-							</view>
+						</view>
+						<view class="item">
+							<view class="item-title">
+								地址简称
+							</view>
+							<view class="item-value">
+								{{meterDetail.installationAddressSimple}}
+							</view>
+						</view>
+						<view class="item">
+							<view class="item-title">
+								使用单位
+							</view>
+							<view class="item-value">
+								{{meterDetail.customer}}
+							</view>
 						</view>
 						<view class="item">
 							<view class="item-title">
@@ -434,22 +434,22 @@
 		getWeek
 	} from '@/apis/utils'
 	import * as echarts from 'echarts';
-	import * as API from '@/apis/pagejs/index.js'
-	import * as API_electricityMeter from '@/apis/pagejs/electricityMeter.js'
+	import * as API from '@/apis/pagejs/index.js'
+	import * as API_electricityMeter from '@/apis/pagejs/electricityMeter.js'
 	import * as WxJsApi from '@/apis/utils/wxJsApi.js'
 
 	export default {
 		data() {
-			return {
-				meterDetail: {}, //设备信息
-				electricity: 0, //电量统计
+			return {
+				meterDetail: {}, //设备信息
+				electricity: 0, //电量统计
 				fee: 0, //电费统计
 				abnormalRecordsList: [], //异常list
 				companyId: '', //企业id
 				meterId: '', //设备id
 				titleName: '',
 				clickType: -1,
-				sumQuantity: 0,
+				sumQuantity: 0,
 				sumFee: 0,
 				equipmentInfosShow: false,
 				kWhList: [],
@@ -549,54 +549,54 @@
 			this.getElectricityStatistics();
 			this.getTimeSlotStatistics();
 			this.getCompanyInfoList();
-			this.getAbnormalAlarmRecord();
+			this.getAbnormalAlarmRecord();
 			this.getMeterDetails(this.meterId);
-		},
-		onReady() {
-			WxJsApi.getWxConfig(['getLocation', 'openLocation', 'addEventListener', 'scanQRCode']).then((res) => {
-				// //(res)
-			}).catch(error => {
-				//(res)
-			})
+		},
+		onReady() {
+			WxJsApi.getWxConfig(['getLocation', 'openLocation', 'addEventListener', 'scanQRCode']).then((res) => {
+				// //(res)
+			}).catch(error => {
+				//(res)
+			})
 		},
 		beforeDestroy() {
 			this.clearTimer(); // 组件销毁前清除定时器
 			this.intervalReady = false;
 			console.log("组件销毁前清除定时器")
 		},
-		methods: {
-			toMeterLocation() {
-				// WxJsApi.openLocation({
-				// 	latitude: parseFloat(this.meterDetail.latitude), //目的地latitude
-				// 	longitude: parseFloat(this.meterDetail.longitude), //目的地longitude
-				// 	name: this.meterDetail.name,
-				// 	address: this.meterDetail.installationAddress,
-				// 	scale: 15, //地图缩放大小,可根据情况具体调整
-				// 	success(res) {
-				// 		uni.hideLoading()
-				// 	},
-				// 	complete() {
-				// 		//	uni.hideLoading()
-				// 	}
-				// });
-			},
-			getMeterDetails(meterId) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API_electricityMeter.meterDetails({
-					meterId: meterId
-				}).then((res) => {
-					uni.hideLoading();
+		methods: {
+			toMeterLocation() {
+				// WxJsApi.openLocation({
+				// 	latitude: parseFloat(this.meterDetail.latitude), //目的地latitude
+				// 	longitude: parseFloat(this.meterDetail.longitude), //目的地longitude
+				// 	name: this.meterDetail.name,
+				// 	address: this.meterDetail.installationAddress,
+				// 	scale: 15, //地图缩放大小,可根据情况具体调整
+				// 	success(res) {
+				// 		uni.hideLoading()
+				// 	},
+				// 	complete() {
+				// 		//	uni.hideLoading()
+				// 	}
+				// });
+			},
+			getMeterDetails(meterId) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API_electricityMeter.meterDetails({
+					meterId: meterId
+				}).then((res) => {
+					uni.hideLoading();
 					this.meterDetail = res.data.meter;
-						this.dtuInfo = res.data.dtuInfo;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
+						this.dtuInfo = res.data.dtuInfo;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			},
 			clearTimer() {
 				if (this.intervalId) {
@@ -642,7 +642,7 @@
 					configId: '',
 					pageIndex: 1,
 					pageSize: 2,
-					companyId: this.companyId,
+					companyId: this.companyId,
 					meterId: this.meterId
 				}).then((res) => {
 					uni.hideLoading();
@@ -677,7 +677,7 @@
 					this.value = '4';
 
 					this.getTimeSlotStatistics();
-					this.getElectricityStatistics();
+					this.getElectricityStatistics();
 					this.getMeterDetails(e[2].value);
 				}
 			},
@@ -694,7 +694,7 @@
 				this.value = '4';
 
 				this.getTimeSlotStatistics();
-				this.getElectricityStatistics();
+				this.getElectricityStatistics();
 				this.getMeterDetails(this.meterId);
 			},
 			queryDate(queryTime, day) {
@@ -729,7 +729,7 @@
 							return {
 								label: item.name,
 								value: item.id,
-								children: [
+								children: [
 									// {
 									// 	label: '抄表',
 									// 	value: '1',
@@ -807,8 +807,8 @@
 						uni.hideLoading();
 					}
 					this.hourMap = response.data.hourMap;
-					this.sumQuantity = response.data.kwhMap.kwh;
-					this.sumFee = response.data.kwhMap.fee;
+					this.sumQuantity = response.data.kwhMap.kwh;
+					this.sumFee = response.data.kwhMap.fee;
 					
 					this.getBarCharts(this.hourMap, interval);
 
@@ -843,8 +843,8 @@
 						uni.hideLoading();
 					}
 					this.showTop = [0, 0, 0, 0, 0, 0, 0, 0]
-					var electricity = response.data.kwhMap.kwh + "";
-					this.electricity = response.data.kwhMap.kwh;
+					var electricity = response.data.kwhMap.kwh + "";
+					this.electricity = response.data.kwhMap.kwh;
 					this.fee = response.data.kwhMap.fee;
 
 					if (electricity) {
@@ -923,10 +923,10 @@
 							type: 'shadow'
 						},
 						formatter: (value) => {
-							
-							var name = value[0].name;
-							var obj=list[name]
-							var text= `<p>${name}</p>`
+							
+							var name = value[0].name;
+							var obj=list[name]
+							var text= `<p>${name}</p>`
 														
 							
 							if (obj.electricityPrice != undefined) {
@@ -986,9 +986,9 @@
 					this.queryDate(this.tabsFrom.show2Index, false)
 				}
 			},
-			selector2cancel() {
-				if(this.clickType != -1) {
-					
+			selector2cancel() {
+				if(this.clickType != -1) {
+					
 				}
 				this.value = this.clickType;
 			},
@@ -1001,7 +1001,7 @@
 					this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
 					this.queryDay = parseUnixTime(new Date(this.FormData2.queryDate), '{y}年{m}月{d}日');
 					this.getTimeSlotStatistics();
-				} else {
+				} else {
 					this.clickType="4"
 					this.FormData.type = this.clickType;
 					this.value = this.clickType;
@@ -1042,7 +1042,7 @@
 		padding-bottom: 184rpx;
 	}
 
-	/deep/.u-select__header__title {
+	::v-deep.u-select__header__title {
 		font-size: 36rpx;
 		font-weight: bold;
 	}
@@ -1053,7 +1053,7 @@
 		top: 0;
 		left: 0;
 		right: 0;
-		z-index: 999;
+		z-index: 999;
 		width: 100%;
 
 		.back {
@@ -1065,13 +1065,13 @@
 			color: #fff;
 			display: flex;
 			align-items: center;
-			justify-content: center;
-			flex: 1;
-			.e{
-				 width: 70%;
-				 white-space: nowrap;
-				 text-overflow: ellipsis;
-				 overflow: hidden;
+			justify-content: center;
+			flex: 1;
+			.e{
+				 width: 70%;
+				 white-space: nowrap;
+				 text-overflow: ellipsis;
+				 overflow: hidden;
 			}
 		}
 
@@ -1083,19 +1083,19 @@
 		}
 	}
 
-	/deep/.uicon-nav-back {
+	::v-deep.uicon-nav-back {
 		color: #fff !important;
 
 	}
 
 	.background {
 		background-color: rgba(22, 119, 255, 1);
-		padding-top: 88rpx;
+		padding-top: 88rpx;
 		height: 150px;
 		padding-bottom: 100rpx;
           position: relative;
 
-		/deep/.u-border-bottom:after {
+		::v-deep.u-border-bottom:after {
 			border: none;
 		}
 
@@ -1114,15 +1114,15 @@
 
 
 	.background::after {
-	
-		  content: '';
-		  position: absolute;
-		  bottom:-39rpx;
-		  width: 100%;
-		  height: 40rpx; /* 弧形的高度 */
-		  background-color: rgba(22, 119, 255, 1); /* 弧形的颜色 */
-		  border-radius: 50%; /* 创建圆形 */
-		  border-top-left-radius: 0;
+	
+		  content: '';
+		  position: absolute;
+		  bottom:-39rpx;
+		  width: 100%;
+		  height: 40rpx; /* 弧形的高度 */
+		  background-color: rgba(22, 119, 255, 1); /* 弧形的颜色 */
+		  border-radius: 50%; /* 创建圆形 */
+		  border-top-left-radius: 0;
 		  border-top-right-radius: 0;
 
 	}
@@ -1186,53 +1186,53 @@
 		padding: 32rpx 32rpx 0rpx;
 		border-radius: 8px;
 		margin: -188rpx 32rpx 0;
-		position: relative;
-		border: 1px solid rgba(255,255,255,1);
-		background: linear-gradient(180deg, rgba(187,216,255,1) 0%,rgba(255,255,255,1) 63%);
-		// 统计
-		.statistics-content{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			
-			
-			.statistics-item{
-				width: 300rpx;
-				padding: 24rpx 0 24rpx 24rpx;
-				border-radius: 8px;
-				box-shadow: 0px 0px 8px 0px rgba(22,119,255,0.3);
-				background-color: #fff;
-			}
-			.item-title{
-				color: rgba(22,119,255,1);
-				font-size: 32rpx;
-				display: flex;
-				align-items: center;
-				font-weight: bold;
-				.img{
-					width: 32rpx;
-					height: 32rpx;
-					vertical-align: middle;
-					margin-right: 4rpx;
-				}
-			}
-			.item-title2{
-				color: rgba(129,97,255,1);
-			}
-			.item-value{
-				color: rgba(16,16,16,1);
-				font-size: 48rpx;
-				font-weight: bold;
-				margin-top: 8rpx;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
+		position: relative;
+		border: 1px solid rgba(255,255,255,1);
+		background: linear-gradient(180deg, rgba(187,216,255,1) 0%,rgba(255,255,255,1) 63%);
+		// 统计
+		.statistics-content{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			
+			
+			.statistics-item{
+				width: 300rpx;
+				padding: 24rpx 0 24rpx 24rpx;
+				border-radius: 8px;
+				box-shadow: 0px 0px 8px 0px rgba(22,119,255,0.3);
+				background-color: #fff;
+			}
+			.item-title{
+				color: rgba(22,119,255,1);
+				font-size: 32rpx;
+				display: flex;
+				align-items: center;
+				font-weight: bold;
+				.img{
+					width: 32rpx;
+					height: 32rpx;
+					vertical-align: middle;
+					margin-right: 4rpx;
+				}
+			}
+			.item-title2{
+				color: rgba(129,97,255,1);
+			}
+			.item-value{
+				color: rgba(16,16,16,1);
+				font-size: 48rpx;
+				font-weight: bold;
+				margin-top: 8rpx;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
 				text{
 					display: inline-block;
-					width: 80%;
-					margin-right: 4rpx;
-				}
-			}
+					width: 80%;
+					margin-right: 4rpx;
+				}
+			}
 		}
 
 		.title {
@@ -1309,17 +1309,17 @@
 		.radio {
 			margin-top: 24rpx;
             padding-left: 8rpx;
-			/deep/.u-radio {
-				margin-bottom: 8px;
-				min-width: 25% !important;
-				
-				
-				
-				
-			}
-			/deep/.u-radio__label{
-				margin-left: 24rpx;
-				font-size: 28rpx;			;
+			::v-deep.u-radio {
+				margin-bottom: 8px;
+				min-width: 25% !important;
+				
+				
+				
+				
+			}
+			::v-deep.u-radio__label{
+				margin-left: 24rpx;
+				font-size: 28rpx;			;
 			}
 
 		}
@@ -1352,22 +1352,22 @@
 
 				color: rgba(51, 51, 51, 1);
 				font-size: 36rpx;
-				margin-left: 16rpx;
+				margin-left: 16rpx;
 				font-weight: bold;
 			}
 
 			.more {
-				margin-left: auto;
-				border: 1px solid rgba(187,187,187,1);
-				border-radius: 4px;
-				padding: 8rpx;
+				margin-left: auto;
+				border: 1px solid rgba(187,187,187,1);
+				border-radius: 4px;
+				padding: 8rpx;
 				font-size: 24rpx;
 			}
-		}
-		.total{
-			text-align: center;
-			color: rgba(51,51,51,1);
-			font-weight: bold;
+		}
+		.total{
+			text-align: center;
+			color: rgba(51,51,51,1);
+			font-weight: bold;
 		}
 
 		.chart {
@@ -1406,7 +1406,7 @@
 				align-items: center;
 				color: rgba(51, 51, 51, 1);
 				font-size: 36rpx;
-				margin-left: 16rpx;
+				margin-left: 16rpx;
 				font-weight: bold;
 			}
 
@@ -1512,11 +1512,11 @@
 
 				.time {
 					color: rgba(119, 119, 119, 1);
-					font-size: 24rpx;
-					display: flex;
-					align-items: center;
-					.more{
-						margin-left: 4rpx;
+					font-size: 24rpx;
+					display: flex;
+					align-items: center;
+					.more{
+						margin-left: 4rpx;
 					}
 				}
 			}

+ 2 - 2
pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -333,11 +333,11 @@
 		width: 200rpx;
 	}
 
-	/deep/.u-drawer-content {
+	::v-deep.u-drawer-content {
 		margin-top: 88rpx;
 	}
 
-	// /deep/.u-tab-item {
+	// ::v-deep.u-tab-item {
 	// 	width: 25% !important;
 	// 	flex: none !important;
 	// }

+ 1 - 1
pages/mine/changePassword.vue

@@ -80,7 +80,7 @@
 			display: flex;
 			align-items: center;
 			border-bottom: 1px solid rgba(221,221,221,1);
-			/deep/.u-input__input{
+			::v-deep.u-input__input{
 				height: 96rpx;
 			}
 		}

+ 1 - 1
pages/mine/changePhone.vue

@@ -169,7 +169,7 @@
 			display: flex;
 			align-items: center;
 			border-bottom: 1px solid rgba(221,221,221,1);
-			/deep/.u-input__input{
+			::v-deep.u-input__input{
 				height: 96rpx;
 			}
 			

+ 1 - 1
pages/mine/contactService.vue

@@ -110,7 +110,7 @@
 				margin-top: 28rpx;
 				width: 522rpx;
 
-				/deep/.u-tab-item {
+				::v-deep.u-tab-item {
 
 					font-size: 24rpx !important;
 				}

+ 1 - 1
pages/mine/feedback.vue

@@ -100,7 +100,7 @@
 				width: 100%;
 				height: 200rpx;
 			}
-			/deep/.uni-textarea-placeholder{
+			::v-deep.uni-textarea-placeholder{
 				color: #b2b2b2;
 				font-size: 32rpx;
 			}

+ 1 - 1
pages/mine/findBackPassword.vue

@@ -198,7 +198,7 @@
 			display: flex;
 			align-items: center;
 			border-bottom: 1px solid rgba(221,221,221,1);
-			/deep/.u-input__input{
+			::v-deep.u-input__input{
 				height: 96rpx;
 			}
 			

+ 2 - 2
pages/mine/setting.vue

@@ -71,11 +71,11 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/.u-cell_title {
+	::v-deep.u-cell_title {
 		color: rgba(51, 51, 51, 1);
 	}
 
-	/deep/.u-cell__value {
+	::v-deep.u-cell__value {
 		color: #777777;
 	}
 

ファイルの差分が大きいため隠しています
+ 568 - 568
pages/statistics/statistics.vue


+ 3 - 3
pages/workOrderManagement/faultReport.vue

@@ -214,7 +214,7 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/.u-select__header__title {
+	::v-deep.u-select__header__title {
 		font-size: 36rpx;
 		font-weight: bold;
 	}
@@ -310,11 +310,11 @@
 
 		.textarea {
 
-			/deep/.uni-textarea-placeholder {
+			::v-deep.uni-textarea-placeholder {
 				color: #b2b2b2;
 			}
 
-			/deep/uni-textarea {
+			::v-deepuni-textarea {
 				width: 660rpx;
 				height: 180rpx;
 

+ 4 - 4
pages/workOrderManagement/workOrderDetails.vue

@@ -398,7 +398,7 @@
 			}
 
 
-			/deep/.u-time-axis {
+			::v-deep.u-time-axis {
 				padding-left: 4rpx;
 			}
 
@@ -434,7 +434,7 @@
 				margin-top: 8rpx;
 			}
 
-			/deep/.u-dot {
+			::v-deep.u-dot {
 				background: #cdcdcd !important;
 				width: 18rpx;
 				height: 18rpx;
@@ -442,11 +442,11 @@
 			}
 
 
-			/deep/.u-time-axis-item::before {
+			::v-deep.u-time-axis-item::before {
 				border-left: 1px solid #cdcdcd !important;
 			}
 
-			/deep/.u-time-axis-item {
+			::v-deep.u-time-axis-item {
 				margin-bottom: 40rpx;
 			}
 

+ 3 - 3
pages/workOrderManagement/workOrderManagement.vue

@@ -313,19 +313,19 @@
 		z-index: 999;
 		background-color: #F2F4F6;
 
-		/deep/.u-content {
+		::v-deep.u-content {
 			border-radius: 8px !important;
 		}
 
 		;
 
-		/deep/.u-search {
+		::v-deep.u-search {
 			position: relative
 		}
 
 		;
 
-		/deep/.u-action {
+		::v-deep.u-action {
 			width: 96rpx;
 			line-height: 56rpx;
 			border-radius: 4px;

+ 1 - 1
pages/workOrderManagement/workOrderStatistics.vue

@@ -349,7 +349,7 @@
 		padding-bottom: 100rpx;
 	}
 
-	/deep/.uicon-nav-back {
+	::v-deep.uicon-nav-back {
 		color: #FFF !important;
 
 	}

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません