fix

virgo.wzfrontend/yui_wx/components/device/control.vue

@@ -0,0 +1,64 @@
+<template>
+	<view class="control-index">
+		<view class="control-off">
+			<view class="control-off-icon">
+				<uni-icons type="icon-yiping" custom-prefix="iconfont" color="#fff" size="20"></uni-icons>
+			</view>
+			<view class="control-off-label">{{title}}</view>
+			<view class="control-off-btn">开门</view>
+		</view>
+		<view class="common-charts">
+			<view class="common-chart-title">实时考勤</view>
+			<view class="common-chart-box">
+
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: ['title']
+	}
+</script>
+
+<style lang="scss">
+	.control-index {
+		padding: 30rpx;
+
+		.control-off {
+			background: #fff;
+			padding: 30rpx;
+			border-radius: 16rpx;
+			box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+			display: flex;
+			align-items: center;
+		}
+
+		.control-off-icon {
+			width: 80rpx;
+			height: 80rpx;
+			background: $uni-primary;
+			border-radius: 12rpx;
+			text-align: center;
+			line-height: 80rpx;
+		}
+
+		.control-off-label {
+			flex: 1;
+			font-size: 32rpx;
+			font-weight: 500;
+			margin-left: 20rpx;
+		}
+
+		.control-off-btn {
+			width: 120rpx;
+			height: 60rpx;
+			border-radius: 60rpx;
+			color: #fff;
+			background: $uni-primary;
+			text-align: center;
+			line-height: 60rpx;
+		}
+	}
+</style>

virgo.wzfrontend/yui_wx/components/device/environment.vue

@@ -0,0 +1,183 @@
+<template>
+	<view class="environment-index">
+		<view class="environment-box">
+			<view class="environment-box-title">实时数据</view>
+			<div class="air-item">
+				<div class="test-item">
+					<div class="name">温度(°C)</div>
+					<div class="number">{{realTimeData.temperature}}</div>
+				</div>
+				<div class="test-item line">
+					<div class="name">湿度(%)</div>
+					<div class="number">{{realTimeData.humidity}}</div>
+				</div>
+				<div class="test-item">
+					<div class="name">风速(m/s)</div>
+					<div class="number">{{realTimeData.windSpeed}}</div>
+				</div>
+			</div>
+			<div class="air-item">
+				<div class="test-item">
+					<div class="name">粉尘(mg/m³)</div>
+					<div class="number">{{realTimeData.dust}}</div>
+				</div>
+				<div class="test-item line">
+					<div class="name">噪声(dB)</div>
+					<div class="number">{{realTimeData.noise}}</div>
+				</div>
+				<div class="test-item">
+					<div class="name">气压(Kpa)</div>
+					<div class="number">{{realTimeData.pressure}}</div>
+				</div>
+			</div>
+		</view>
+		<view class="common-charts">
+			<view class="common-chart-title">温度监测</view>
+			<view class="common-chart-box">
+				<u-echart ref="temperature"></u-echart>
+			</view>
+		</view>
+		<view class="common-charts">
+			<view class="common-chart-title">湿度监测</view>
+			<view class="common-chart-box">
+				<u-echart ref="humidity"></u-echart>
+			</view>
+		</view>
+		<view class="common-charts">
+			<view class="common-chart-title">粉尘监测</view>
+			<view class="common-chart-box">
+				<u-echart ref="dust"></u-echart>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uEchart from './uEchart.vue'
+	export default {
+		data() {
+			return {
+				realTimeData: {
+					dust: '1.2', //粉尘
+					noise: '55', //噪声
+					temperature: '26', //温度
+					humidity: '40', //湿度
+					pressure: '100', //气压
+					windSpeed: '1', //风速
+					windDirection: '东北' //风向
+				},
+				echart: [{
+					ref: 'temperature',
+					type: 'line',
+					color: ["#1890FF"],
+					categories: ['03:00', '06:00', '09:00', '12:00', '15:00', '18:00', '21:00', '24:00'],
+					series: [{
+						name: '温度',
+						data: [21.3, 24.0, 24.1, 24.1, 24.4, 24.0, 23.4, 23.3]
+					}]
+				}, {
+					ref: 'humidity',
+					type: 'line',
+					color: ["#73C0DE"],
+					categories: ['03:00', '06:00', '09:00', '12:00', '15:00', '18:00', '21:00', '24:00'],
+					series: [{
+						name: '湿度',
+						data: [37, 38, 38.1, 38.1, 38.4, 38.0, 36.4, 36]
+					}]
+				}, {
+					ref: 'dust',
+					type: 'line',
+					color: ["#FAC858"],
+					categories: ['03:00', '06:00', '09:00', '12:00', '15:00', '18:00', '21:00', '24:00'],
+					series: [{
+						name: '粉尘',
+						data: [7, 8, 3.1, 8.1, 8.4, 8, 6.4, 9]
+					}]
+				}]
+			}
+		},
+		mounted() {
+			setTimeout(() => {
+				for (var i = 0; i < this.echart.length; i++) {
+					let item = this.echart[i];
+					this.$refs[item.ref].initCharts({
+						type: item.type,
+						categories: item.categories,
+						series: item.series,
+						animation: true,
+						background: "#FFFFFF",
+						color: item.color,
+						padding: [10, 5, 0, 0],
+						enableScroll: false,
+						legend: {
+							show: false
+						},
+						xAxis: {
+							disableGrid: true
+						},
+						yAxis: {
+							gridType: "dash",
+							dashLength: 2
+						},
+						extra: {
+							line: {
+								type: "curve",
+								width: 2,
+								activeType: "hollow"
+							}
+						}
+					})
+				}
+			}, 500)
+		},
+		components: {
+			uEchart
+		},
+	}
+</script>
+
+<style lang="scss">
+	.environment-index {
+		padding: 30rpx;
+
+		.environment-box {
+			background: #fff;
+			padding: 30rpx;
+			border-radius: 16rpx;
+			box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+		}
+
+		.air-item {
+			display: flex;
+			align-items: center;
+			margin: 10rpx 0;
+		}
+
+		.test-item {
+			flex: 1;
+			width: 0;
+			overflow: hidden;
+			text-align: center;
+			padding: 2px 0;
+			position: relative;
+
+			.name {
+				font-size: 24rpx;
+				margin-bottom: 8rpx;
+				line-height: 36rpx;
+				color: $uni-secondary-color;
+			}
+
+			.number {
+				font-size: 36rpx;
+				color: $uni-success;
+			}
+		}
+
+		.environment-box-title {
+			padding-bottom: 30rpx;
+			font-size: 32rpx;
+			font-weight: 500;
+		}
+	}
+</style>

virgo.wzfrontend/yui_wx/components/device/meter.vue

@@ -53,10 +53,10 @@
 				</image>
 			</view>
 		</view>
-		<view class="meter-charts">
-			<view class="meter-chart-title">历史用电量</view>
-			<view class="meter-chart-box">
-				<u-echart tips="用电量"></u-echart>
+		<view class="common-charts">
+			<view class="common-chart-title">历史用电量</view>
+			<view class="common-chart-box">
+				<u-echart ref="echart"></u-echart>
 			</view>
 		</view>
 	</view>
@@ -71,6 +71,40 @@
 
 			}
 		},
+		mounted() {
+			setTimeout(() => {
+				this.$refs.echart.initCharts({
+					type: 'line',
+					categories: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月'],
+					series: [{
+						name: '用电量',
+						data: [86, 122, 93, 98, 91, 88, 95, 102, 110, 80]
+					}],
+					animation: true,
+					background: "#FFFFFF",
+					color: ["#1890FF"],
+					padding: [10, 0, 0, 0],
+					enableScroll: false,
+					legend: {
+						show: false
+					},
+					xAxis: {
+						disableGrid: true
+					},
+					yAxis: {
+						gridType: "dash",
+						dashLength: 2
+					},
+					extra: {
+						line: {
+							type: "straight",
+							width: 2,
+							activeType: "hollow"
+						}
+					}
+				})
+			}, 500)
+		},
 		components: {
 			uEchart
 		},
@@ -157,24 +191,5 @@
 				margin-right: 40rpx;
 			}
 		}
-
-		.meter-charts {
-			margin-top: 30rpx;
-			background: #fff;
-			padding: 30rpx;
-			border-radius: 16rpx;
-			box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
-
-			.meter-chart-title {
-				padding-bottom: 30rpx;
-				font-size: 32rpx;
-				font-weight: 500;
-			}
-
-			.meter-chart-box {
-				width: 100%;
-				height: 300rpx;
-			}
-		}
 	}
 </style>

virgo.wzfrontend/yui_wx/components/device/uEchart.vue

@@ -1,67 +1,93 @@
 <template>
-	<view class="charts-box">
-		<qiun-data-charts type="line" :opts="opts" :chartData="chartData" :canvas2d="true"
-			canvasId="pPSnGQMxUSQgItJRPiXgRJePqmRONHhG"></qiun-data-charts>
+	<view :id="'mybox'+cid" class="u-echart" v-if="cid">
+		<canvas :canvas-id="'uEchart'+cid" :id="'uEchart'+cid" class="u-echart" type="2d" @tap="tap">
+		</canvas>
 	</view>
 </template>
 
 <script>
+	import uCharts from '@/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js';
+	var uChartsInstance = {};
 	export default {
-		props: ['tips'],
 		data() {
 			return {
-				chartData: {},
-				opts: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc"
-					],
-					padding: [10, 0, 0, 0],
-					enableScroll: false,
-					legend: {
-						show: false
-					},
-					xAxis: {
-						disableGrid: true
-					},
-					yAxis: {
-						gridType: "dash",
-						dashLength: 2
-					},
-					extra: {
-						line: {
-							type: "straight",
-							width: 2,
-							activeType: "hollow"
-						}
-					}
-				}
+				cWidth: '',
+				cHeight: '',
+				pixelRatio: '',
+				cid: '',
+				scrollTop: 0
 			};
 		},
-		onReady() {
-			this.getServerData();
+		created() {
+			this.cid = this._uid;
+		},
+		mounted() {
+			let _self = this
+			uni.$on('onPageScroll', function(data) {
+				_self.scrollTop = Number(data);
+			})
 		},
 		methods: {
-			getServerData() {
-				//模拟从服务器获取数据时的延时
-				setTimeout(() => {
-					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
-					let res = {
-						categories: ["1月", "2月", "3月", "4月", "5月", "6月"],
-						series: [{
-							name: this.tips,
-							data: [35, 8, 25, 37, 4, 20]
-						}]
-					};
-					this.chartData = JSON.parse(JSON.stringify(res));
-				}, 500);
+			initCharts(option) {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#mybox' + this._uid).boundingClientRect(data => {
+					this.cWidth = data.width;
+					this.cHeight = data.height;
+					this.pixelRatio = uni.getSystemInfoSync().pixelRatio;
+					this.drawCharts('uEchart' + this._uid, option);
+				}).exec();
 			},
+			drawCharts(id, option) {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#' + id).fields({
+					node: true,
+					size: true
+				}).exec(res => {
+					if (res[0]) {
+						const canvas = res[0].node;
+						const ctx = canvas.getContext('2d');
+						canvas.width = res[0].width * this.pixelRatio;
+						canvas.height = res[0].height * this.pixelRatio;
+						const commonOption = {
+							context: ctx,
+							width: this.cWidth * this.pixelRatio,
+							height: this.cHeight * this.pixelRatio,
+							pixelRatio: this.pixelRatio
+						}
+						const chartsOption = Object.assign(commonOption, option);
+						uChartsInstance[id] = new uCharts(chartsOption);
+					} else {
+						console.error("[uCharts]: 未获取到 context");
+					}
+				});
+			},
+			tap(e) {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#mybox' + this._uid).boundingClientRect(data => {
+					let rchartdom = data,
+						tmpe = {};
+					if (e.detail.x) { //tap或者click的事件
+						tmpe = {
+							x: e.detail.x - rchartdom.left,
+							y: e.detail.y - rchartdom.top - this.scrollTop
+						}
+					} else { //mouse的事件
+						tmpe = {
+							x: e.clientX - rchartdom.left,
+							y: e.clientY - rchartdom.top - this.scrollTop
+						}
+					}
+					e.changedTouches = [];
+					e.changedTouches.unshift(tmpe);
+					uChartsInstance[e.target.id].showToolTip(e);
+				}).exec();
+			}
 		}
 	};
 </script>
 
 <style scoped>
-	/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
-	.charts-box {
+	.u-echart {
 		width: 100%;
 		height: 100%;
 	}

virgo.wzfrontend/yui_wx/components/device/water.vue

@@ -53,9 +53,9 @@
 			</view>
 		</view>
 		<view class="meter-charts">
-			<view class="meter-chart-title">历史用电量</view>
+			<view class="meter-chart-title">历史用水量</view>
 			<view class="meter-chart-box">
-				<u-echart tips="用水量"></u-echart>
+				<u-echart ref="echart"></u-echart>
 			</view>
 		</view>
 	</view>
@@ -70,6 +70,40 @@
 
 			}
 		},
+		mounted() {
+			setTimeout(() => {
+				this.$refs.echart.initCharts({
+					type: 'line',
+					categories: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月'],
+					series: [{
+						name: '用水量',
+						data: [36, 42, 23, 38, 41, 28, 35, 42, 30, 40]
+					}],
+					animation: true,
+					background: "#FFFFFF",
+					color: ["#1890FF"],
+					padding: [10, 0, 0, 0],
+					enableScroll: false,
+					legend: {
+						show: false
+					},
+					xAxis: {
+						disableGrid: true
+					},
+					yAxis: {
+						gridType: "dash",
+						dashLength: 2
+					},
+					extra: {
+						line: {
+							type: "straight",
+							width: 2,
+							activeType: "hollow"
+						}
+					}
+				})
+			}, 500)
+		},
 		components: {
 			uEchart
 		},

virgo.wzfrontend/yui_wx/main.js

@@ -32,7 +32,6 @@ Vue.prototype.$navigateTo = (url) => {
 			url: url
 		})
 	}
-
 }
 Vue.prototype.$navigateBack = uni.navigateBack;
 import field from './config/field.js'

virgo.wzfrontend/yui_wx/pages/deviceDetail/deviceDetail.vue

@@ -4,6 +4,8 @@
 		<lighting v-else-if="type === 'lighting'" :title="title" :space="space"></lighting>
 		<meter-show v-else-if="type === 'meter'" :title="title" :space="space"></meter-show>
 		<water v-else-if="type === 'water'" :title="title" :space="space"></water>
+		<environment v-else-if="type === 'environment'"></environment>
+		<control v-else-if="type === 'control'" :title="title"></control>
 	</view>
 </template>
 
@@ -12,6 +14,8 @@
 	import lighting from '@/components/device/lighting';
 	import meterShow from '@/components/device/meter';
 	import water from '@/components/device/water';
+	import environment from '@/components/device/environment';
+	import control from '@/components/device/control'
 	export default {
 		data() {
 			return {
@@ -28,6 +32,10 @@
 			});
 			this.type = body.type
 		},
+		onPageScroll(e) {
+			// 获取页面滚动的垂直距离
+			uni.$emit('onPageScroll', e.scrollTop);
+		},
 		methods: {
 
 		},
@@ -35,7 +43,9 @@
 			aircondition,
 			lighting,
 			meterShow,
-			water
+			water,
+			environment,
+			control
 		},
 	}
 </script>

virgo.wzfrontend/yui_wx/static/font/iconfont.css

@@ -12,6 +12,10 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yiping:before {
+  content: "\e680";
+}
+
 .icon-yongshuiliang:before {
   content: "\e627";
 }

virgo.wzfrontend/yui_wx/static/scss/common.scss

@@ -623,4 +623,22 @@ button[type=primary]{
 			}
 		}
 	}
+}
+.common-charts {
+	margin-top: 30rpx;
+	background: #fff;
+	padding: 30rpx;
+	border-radius: 16rpx;
+	box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+
+	.common-chart-title {
+		padding-bottom: 30rpx;
+		font-size: 32rpx;
+		font-weight: 500;
+	}
+
+	.common-chart-box {
+		width: 100%;
+		height: 300rpx;
+	}
 }

virgo.wzfrontend/yui_wx/uitls/chat.js

@@ -57,7 +57,7 @@ const $chat = {
 			 *	1 关键性日志，日志量较少，生产环境时建议使用 
 			 *	2 无日志级别，SDK 将不打印任何日志
 			 */
-			logLevel: 0, // 日志等级， 
+			logLevel: 2, // 日志等级， 
 			reConnectInterval: 3000, // 重连时间间隔
 			reConnectTotal: 99, // 最大重连次数，0不限制一直重连 
 			heartInterval: 35000, //心跳时间间隔(默认30s) 

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/contract/clauseDetail.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/contract/steps.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/control.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/control.wxml

@@ -0,0 +1 @@
+<view class="control-index"><view class="control-off"><view class="control-off-icon"><uni-icons vue-id="fecb6372-1" type="icon-yiping" custom-prefix="iconfont" color="#fff" size="20" bind:__l="__l"></uni-icons></view><view class="control-off-label">{{title}}</view><view class="control-off-btn">开门</view></view><view class="common-charts"><view class="common-chart-title">实时考勤</view><view class="common-chart-box"></view></view></view>

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/control.wxss

@@ -0,0 +1,43 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.control-index {
+  padding: 30rpx;
+}
+.control-index .control-off {
+  background: #fff;
+  padding: 30rpx;
+  border-radius: 16rpx;
+  box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+  display: flex;
+  align-items: center;
+}
+.control-index .control-off-icon {
+  width: 80rpx;
+  height: 80rpx;
+  background: #08979c;
+  border-radius: 12rpx;
+  text-align: center;
+  line-height: 80rpx;
+}
+.control-index .control-off-label {
+  flex: 1;
+  font-size: 32rpx;
+  font-weight: 500;
+  margin-left: 20rpx;
+}
+.control-index .control-off-btn {
+  width: 120rpx;
+  height: 60rpx;
+  border-radius: 60rpx;
+  color: #fff;
+  background: #08979c;
+  text-align: center;
+  line-height: 60rpx;
+}
+

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/environment.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "u-echart": "/components/device/uEchart"
+  },
+  "component": true
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/environment.wxss

@@ -0,0 +1,46 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.environment-index {
+  padding: 30rpx;
+}
+.environment-index .environment-box {
+  background: #fff;
+  padding: 30rpx;
+  border-radius: 16rpx;
+  box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+}
+.environment-index .air-item {
+  display: flex;
+  align-items: center;
+  margin: 10rpx 0;
+}
+.environment-index .test-item {
+  flex: 1;
+  width: 0;
+  overflow: hidden;
+  text-align: center;
+  padding: 2px 0;
+  position: relative;
+}
+.environment-index .test-item .name {
+  font-size: 24rpx;
+  margin-bottom: 8rpx;
+  line-height: 36rpx;
+  color: #8c8c8c;
+}
+.environment-index .test-item .number {
+  font-size: 36rpx;
+  color: #389e0d;
+}
+.environment-index .environment-box-title {
+  padding-bottom: 30rpx;
+  font-size: 32rpx;
+  font-weight: 500;
+}
+

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/meter.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "u-echart": "/components/device/uEchart"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/meter.wxss

@@ -72,20 +72,4 @@
   height: 200rpx;
   margin-right: 40rpx;
 }
-.meter-index .meter-charts {
-  margin-top: 30rpx;
-  background: #fff;
-  padding: 30rpx;
-  border-radius: 16rpx;
-  box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
-}
-.meter-index .meter-charts .meter-chart-title {
-  padding-bottom: 30rpx;
-  font-size: 32rpx;
-  font-weight: 500;
-}
-.meter-index .meter-charts .meter-chart-box {
-  width: 100%;
-  height: 300rpx;
-}
 

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/uEchart.json

@@ -1,6 +1,4 @@
 {
-  "usingComponents": {
-    "qiun-data-charts": "/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts"
-  },
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/uEchart.wxml

@@ -1 +1 @@
-<view class="charts-box data-v-31158030"><qiun-data-charts vue-id="1cc9f254-1" type="line" opts="{{opts}}" chartData="{{chartData}}" canvas2d="{{true}}" canvasId="pPSnGQMxUSQgItJRPiXgRJePqmRONHhG" class="data-v-31158030" bind:__l="__l"></qiun-data-charts></view>
+<block wx:if="{{cid}}"><view class="u-echart data-v-31158030" id="{{'mybox'+cid}}"><canvas class="u-echart data-v-31158030" canvas-id="{{'uEchart'+cid}}" id="{{'uEchart'+cid}}" type="2d" data-event-opts="{{[['tap',[['tap',['$event']]]]]}}" bindtap="__e"></canvas></view></block>

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/uEchart.wxss

@@ -1,67 +1,5 @@
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
-.charts-box.data-v-31158030 {
+.u-echart.data-v-31158030 {
 	width: 100%;
 	height: 100%;
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/water.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "u-echart": "/components/device/uEchart"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/deviceDetail/deviceDetail.json

@@ -4,6 +4,8 @@
     "aircondition": "/components/device/aircondition",
     "lighting": "/components/device/lighting",
     "meter-show": "/components/device/meter",
-    "water": "/components/device/water"
+    "water": "/components/device/water",
+    "environment": "/components/device/environment",
+    "control": "/components/device/control"
   }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/deviceDetail/deviceDetail.wxss

@@ -1 +0,0 @@
-/* pages/deviceDetail/deviceDetail.wxss */

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/monitorList/monitorList.wxss

@@ -1 +0,0 @@
-/* pages/monitorList/monitorList.wxss */

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/static/font/iconfont.css

@@ -12,6 +12,10 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yiping:before {
+  content: "\e680";
+}
+
 .icon-yongshuiliang:before {
   content: "\e627";
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/static/scss/common.scss

@@ -623,4 +623,22 @@ button[type=primary]{
 			}
 		}
 	}
+}
+.common-charts {
+	margin-top: 30rpx;
+	background: #fff;
+	padding: 30rpx;
+	border-radius: 16rpx;
+	box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+
+	.common-chart-title {
+		padding-bottom: 30rpx;
+		font-size: 32rpx;
+		font-weight: 500;
+	}
+
+	.common-chart-box {
+		width: 100%;
+		height: 300rpx;
+	}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/hb-comment/components/hb-comment/hb-comment.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-dateformat": "/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "qiun-loading": "/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading",
     "qiun-error": "/uni_modules/qiun-data-charts/components/qiun-error/qiun-error"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-drop-down/components/uv-drop-down-item/uv-drop-down-item.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-text": "/uni_modules/uv-text/components/uv-text/uv-text",
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-drop-down/components/uv-drop-down-popup/uv-drop-down-popup.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-transition": "/uni_modules/uv-transition/components/uv-transition/uv-transition",
     "uv-text": "/uni_modules/uv-text/components/uv-text/uv-text"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-drop-down/components/uv-drop-down/uv-drop-down.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-sticky": "/uni_modules/uv-sticky/components/uv-sticky/uv-sticky"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-swiper/components/uv-swiper-indicator/uv-swiper-indicator.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }