fix

virgo.wzfrontend/console/src/components/work/common/testAlarm.vue

@@ -83,7 +83,7 @@
 		methods: {
 			init(option) {
 				//type 1.周界报警设备 2.周界报警 3.电子巡查设备 4.消防设备 5.消防设备报警 6.消防通道 7.易燃易爆品设备 8.易燃易爆品报警9.化学用品设备 10.化学用品报警11.废气污染物设备 12.废气污染物报警 13.环境设备
-				//type 14.供配电 15.电梯机房 16.电梯 17.冷源设备 18.冷源设备试试监控
+				//type 14.供配电 15.电梯机房 16.电梯 17.冷源设备 18.冷源设备试试监控 19.给排水-生活 20.给排水-消防  21.给排水-排水 22.给排水-绿色低碳23.给排水-报警信息
 				let postData = {
 					type: this.type,
 					projectId: this.$store.getters.project.id

virgo.wzfrontend/console/src/views/work/energy/electrical/elevator.vue

@@ -162,7 +162,6 @@
 	import projectItemTree from '@/components/common/projectItemTree'
 	import testAlarm from '@/components/work/common/testAlarm'
 	import model from '@/components/work/common/model'
-
 	import {
 		getEnergyDeviceList
 	} from '@/httpApi/test'
@@ -219,7 +218,7 @@
 						data = [],
 						x = [];
 					for (let i = 0; i < this.list.length; i++) {
-						let roomName = this.list[i].projectItemTargetRoomName;
+						let roomName = this.list[i].projectItemTargetRoomNumber;
 						if (!obj[roomName]) obj[roomName] = [];
 						obj[roomName].push(this.list[i]);
 						data.push(this.list[i].column1);

virgo.wzfrontend/console/src/views/work/energy/electrical/lighting/indoor.vue

@@ -77,7 +77,8 @@
 		data() {
 			return {
 				list: [],
-				openList: []
+				openList: [],
+				option: null
 			}
 		},
 		created() {
@@ -89,6 +90,7 @@
 					type: 4,
 					projectId: this.$store.getters.project.id
 				}
+				this.option = option;
 				if (option) postData = Object.assign(postData, option);
 				getEnergyDeviceList(postData).then(res => {
 					this.list = res.data.map(node => {
@@ -110,7 +112,7 @@
 				}).then(res => {
 					if (res.state) {
 						this.$message.success('操作成功');
-						this.init();
+						this.init(this.option);
 					}
 				})
 			},

virgo.wzfrontend/console/src/views/work/energy/electrical/lighting/outdoor.vue

@@ -70,7 +70,7 @@
 			return {
 				list: [],
 				allChecked: false,
-				postData: {}
+				option: null
 			}
 		},
 		created() {
@@ -82,10 +82,8 @@
 					type: 5,
 					projectId: this.$store.getters.project.id
 				}
-				if (option) {
-					postData = Object.assign(postData, option);
-					this.postData = postData;
-				}
+				this.option = option;
+				if (option) postData = Object.assign(postData, option);
 				getEnergyDeviceList(postData).then(res => {
 					this.list = res.data.map(node => {
 						if (node['column2']) node['column2'] = node.column2.split(',');
@@ -100,7 +98,7 @@
 				updateEnergyDeviceState(val ? 1 : 2, this.list.map(node => node.id)).then(res => {
 					if (res.state) {
 						this.$message.success('操作成功');
-						this.init(this.postData);
+						this.init(this.option);
 					}
 				})
 			},
@@ -111,7 +109,7 @@
 				}).then(res => {
 					if (res.state) {
 						this.$message.success('操作成功');
-						this.init(this.postData);
+						this.init(this.option);
 					}
 				})
 			},

virgo.wzfrontend/console/src/views/work/energy/water/hvac/coldsource.vue

@@ -77,7 +77,7 @@
 			<div class="chart-box">
 				<div ref="cold" class="chart-cold"></div>
 				<div class="chart-legend">
-					<div class="legend-item" v-for="item in testList" :key="index">
+					<div class="legend-item" v-for="item in testList" :key="item.id">
 						<span class="dage"></span>
 						<span class="name">{{item.name}}</span>
 						<span class="number">{{item.value}}</span>
@@ -232,7 +232,7 @@
 	import {
 		getDeviceCountList,
 		getDeviceAlarmList,
-		getEnergyDeviceList,
+		getEnergyDeviceList,
 		updateEnergyDevice
 	} from '@/httpApi/test'
 	import model from '@/components/work/common/model'

virgo.wzfrontend/console/src/views/work/energy/water/hvac/end.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="yui-tree-box">
-		<select-space></select-space>
+		<project-item-tree @treeclick="treeclick" iconfontClass="el-icon-place"></project-item-tree>
 		<div class="hui-tree-content">
 			<div class="end-box box-background">
 				<model type="end" fileId="10000786667774"></model>
@@ -29,15 +29,13 @@
 						</div>
 					</div>
 				</div>
-				<div class="end-list">
+				<div class="end-list" v-if="list.length > 0">
 					<div class="end-list-box">
-						<div class="end-item">
+						<div class="end-item" v-for="(item,index) in list" :key="index">
 							<div class="end-title">
 								<i class="iconfont huifont-shuzhuangcaidanxiala"></i>
-								<span class="end-space hui-ellipsis">1F</span>
-								<span class="end-title-name hui-ellipsis">
-									1F默认房间
-								</span>
+								<span class="end-space hui-ellipsis">{{item.projectItemTargetName}}</span>
+								<span class="end-title-name hui-ellipsis">{{item.roomName}}</span>
 							</div>
 							<div class="end-content">
 								<div class="content-item">
@@ -45,7 +43,7 @@
 										平均温度
 									</div>
 									<div class="content-value">
-										<span class="content-number alibaba color-cyan">12</span>℃
+										<span class="content-number alibaba color-cyan">{{item.temp}}</span>℃
 									</div>
 								</div>
 								<div class="content-item">
@@ -53,7 +51,7 @@
 										平均湿度
 									</div>
 									<div class="content-value">
-										<span class="content-number alibaba color-cyan">15</span>%
+										<span class="content-number alibaba color-cyan">{{item.humidity}}</span>%
 									</div>
 								</div>
 								<div class="content-item">
@@ -61,7 +59,7 @@
 										开启设备
 									</div>
 									<div class="content-value">
-										<span class="content-number alibaba color-cyan">5</span>台
+										<span class="content-number alibaba color-cyan">{{item.openDevice}}</span>台
 									</div>
 								</div>
 								<div class="content-item">
@@ -69,179 +67,7 @@
 										故障设备
 									</div>
 									<div class="content-value">
-										<span class="content-number alibaba color-cyan">0</span>台
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="end-item">
-							<div class="end-title">
-								<i class="iconfont huifont-shuzhuangcaidanxiala"></i>
-								<span class="end-space hui-ellipsis">1F</span>
-								<span class="end-title-name hui-ellipsis">
-									1F默认房间
-								</span>
-							</div>
-							<div class="end-content">
-								<div class="content-item">
-									<div class="content-label">
-										平均温度
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">12</span>℃
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										平均湿度
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">15</span>%
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										开启设备
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">5</span>台
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										故障设备
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">0</span>台
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="end-item">
-							<div class="end-title">
-								<i class="iconfont huifont-shuzhuangcaidanxiala"></i>
-								<span class="end-space hui-ellipsis">1F</span>
-								<span class="end-title-name hui-ellipsis">
-									1F默认房间
-								</span>
-							</div>
-							<div class="end-content">
-								<div class="content-item">
-									<div class="content-label">
-										平均温度
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">12</span>℃
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										平均湿度
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">15</span>%
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										开启设备
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">5</span>台
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										故障设备
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">0</span>台
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="end-item">
-							<div class="end-title">
-								<i class="iconfont huifont-shuzhuangcaidanxiala"></i>
-								<span class="end-space  hui-ellipsis">1F</span>
-								<span class="end-title-name hui-ellipsis">
-									1F默认房间
-								</span>
-							</div>
-							<div class="end-content">
-								<div class="content-item">
-									<div class="content-label">
-										平均温度
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">12</span>℃
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										平均湿度
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">15</span>%
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										开启设备
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">5</span>台
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										故障设备
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">0</span>台
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="end-item">
-							<div class="end-title">
-								<i class="iconfont huifont-shuzhuangcaidanxiala"></i>
-								<span class="end-space hui-ellipsis">1F</span>
-								<span class="end-title-name hui-ellipsis">
-									1F默认房间
-								</span>
-							</div>
-							<div class="end-content">
-								<div class="content-item">
-									<div class="content-label">
-										平均温度
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">12</span>℃
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										平均湿度
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">15</span>%
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										开启设备
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">5</span>台
-									</div>
-								</div>
-								<div class="content-item">
-									<div class="content-label">
-										故障设备
-									</div>
-									<div class="content-value">
-										<span class="content-number alibaba color-cyan">0</span>台
+										<span class="content-number alibaba color-cyan">{{item.faultDevice}}</span>台
 									</div>
 								</div>
 							</div>
@@ -254,13 +80,74 @@
 </template>
 
 <script>
-	import selectSpace from '@/components/work/common/selectSpace'
+	import projectItemTree from '@/components/common/projectItemTree'
 	import model from '@/components/work/common/model'
+	import {
+		getEnergyDeviceList
+	} from '@/httpApi/test'
 	export default {
 		components: {
-			selectSpace,
+			projectItemTree,
 			model
-		}
+		},
+		data() {
+			return {
+				list: []
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init(option) {
+				let postData = {
+					projectId: this.$store.getters.project.id,
+					type: 8
+				}
+				if (option) postData = Object.assign(postData, option);
+				getEnergyDeviceList(postData).then(res => {
+					let data = res.data
+					let obj = {},
+						list = [];
+					for (let i = 0; i < data.length; i++) {
+						let roomName = data[i].projectItemTargetRoomNumber;
+						if (!obj[roomName]) {
+							obj[roomName] = 1;
+							list.push({
+								id: data[i].projectItemTargetRoomId,
+								roomName: roomName,
+								projectItemTargetName: data[i].projectItemTargetName,
+								children: []
+							})
+						}
+						list.find(node => node.id === data[i].projectItemTargetRoomId).children.push(data[i])
+					}
+					this.list = list.map(node => {
+						let allTemp = 0,
+							allHumidity = 0,
+							openDevice = 0,
+							faultDevice = 0;
+						for (let i = 0; i < node.children.length; i++) {
+							allTemp += Number(node.children[i].column1);
+							allHumidity += Number(node.children[i].column3);
+							if (node.children[i].state === 1) openDevice++;
+							if (node.children[i].state === 3) faultDevice++;
+						}
+						node['openDevice'] = openDevice;
+						node['faultDevice'] = faultDevice;
+						node['temp'] = Math.round(allTemp / node.children.length * 100) / 100;
+						node['humidity'] = Math.round(allHumidity / node.children.length * 100) / 100;
+						return node
+					})
+				})
+			},
+			treeclick(item) {
+				let obj = item.id ? {
+					projectItemTargetId: item.id
+				} : {}
+				this.init(obj);
+			},
+		},
 	}
 </script>
 

virgo.wzfrontend/console/src/views/work/energy/water/hvac/heatsource.vue

@@ -1,91 +1,22 @@
 <template>
 	<div class="work-heatsource">
 		<model type="heatsource" fileId="10000786667774"></model>
-		<div class="heatsource-count">
-			<div class="count-item">
-				<div class="count-item-label hui-ellipsis">1#主管能量计</div>
+		<div class="heatsource-count" v-if="list.length>0">
+			<div class="count-item" v-for="(item,index) in list" :key="index">
+				<div class="count-item-label hui-ellipsis">{{item.name}}</div>
 				<div class="count-item-value">
 					<span>流量</span>
-					<span class="count-number alibaba color-cyan">12</span>
-					<span>kw</span>
-				</div>
-			</div>
-			<div class="count-item">
-				<div class="count-item-label hui-ellipsis">2#主管能量计</div>
-				<div class="count-item-value">
-					<span>流量</span>
-					<span class="count-number alibaba color-cyan">32</span>
-					<span>kw</span>
-				</div>
-			</div>
-			<div class="count-item">
-				<div class="count-item-label hui-ellipsis">3#主管能量计</div>
-				<div class="count-item-value">
-					<span>流量</span>
-					<span class="count-number alibaba color-cyan">55.4</span>
-					<span>kw</span>
-				</div>
-			</div>
-			<div class="count-item">
-				<div class="count-item-label hui-ellipsis">4#主管能量计</div>
-				<div class="count-item-value">
-					<span>流量</span>
-					<span class="count-number alibaba color-cyan">1.23</span>
+					<span class="count-number alibaba color-cyan">{{item.column1}}</span>
 					<span>kw</span>
 				</div>
 			</div>
 		</div>
-		<div class="heatsource-list">
+		<div class="heatsource-list" v-if="steamBoiler.length>0">
 			<div class="heatsource-list-box">
-				<div class="heatsource-item">
-					<div class="heatsource-title">
-						<i class="iconfont huifont-shuzhuangcaidanxiala"></i>
-						<span class="heatsource-title-name hui-ellipsis">
-							蒸汽锅炉-卧式_64294:蒸汽锅炉-卧蒸汽锅炉-卧式_64294:蒸汽锅炉-卧
-						</span>
-					</div>
-					<div class="heatsource-content">
-						<div class="content-item">
-							<div class="content-label">
-								运行状态
-							</div>
-							<div class="content-value">
-								<el-switch v-model="value1">
-								</el-switch>
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								控制温度
-							</div>
-							<div class="content-value">
-								<span class="content-number alibaba color-cyan">12</span>℃
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								供水温度
-							</div>
-							<div class="content-value">
-								<span class="content-number alibaba color-cyan">18.2</span>℃
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								回水温度
-							</div>
-							<div class="content-value">
-								<span class="content-number alibaba color-cyan">15.2</span>℃
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="heatsource-item">
+				<div class="heatsource-item" v-for="(item,index) in steamBoiler" :key="index">
 					<div class="heatsource-title">
 						<i class="iconfont huifont-shuzhuangcaidanxiala"></i>
-						<span class="heatsource-title-name hui-ellipsis">
-							蒸汽锅炉-卧式_64294:蒸汽锅炉-卧蒸汽锅炉-卧式_64294:蒸汽锅炉-卧
-						</span>
+						<span class="heatsource-title-name hui-ellipsis">{{item.name}}</span>
 					</div>
 					<div class="heatsource-content">
 						<div class="content-item">
@@ -93,7 +24,8 @@
 								运行状态
 							</div>
 							<div class="content-value">
-								<el-switch v-model="value2">
+								<el-switch v-model="item.state" :active-value="1" :inactive-value="2"
+									@change="value=>changeDoor(value,item)">
 								</el-switch>
 							</div>
 						</div>
@@ -102,7 +34,7 @@
 								控制温度
 							</div>
 							<div class="content-value">
-								-
+								<span class="content-number alibaba color-cyan">{{item.data.controlTemp}}</span>℃
 							</div>
 						</div>
 						<div class="content-item">
@@ -110,7 +42,7 @@
 								供水温度
 							</div>
 							<div class="content-value">
-								-
+								<span class="content-number alibaba color-cyan">{{item.data.supplyTemp}}</span>℃
 							</div>
 						</div>
 						<div class="content-item">
@@ -118,136 +50,7 @@
 								回水温度
 							</div>
 							<div class="content-value">
-								-
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="heatsource-item">
-					<div class="heatsource-title">
-						<i class="iconfont huifont-shuzhuangcaidanxiala"></i>
-						<span class="heatsource-title-name hui-ellipsis">
-							蒸汽锅炉-卧式_64294:蒸汽锅炉-卧蒸汽锅炉-卧式_64294:蒸汽锅炉-卧
-						</span>
-					</div>
-					<div class="heatsource-content">
-						<div class="content-item">
-							<div class="content-label">
-								运行状态
-							</div>
-							<div class="content-value">
-								<el-switch v-model="value1">
-								</el-switch>
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								控制温度
-							</div>
-							<div class="content-value">
-								<span class="content-number alibaba color-cyan">12</span>℃
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								供水温度
-							</div>
-							<div class="content-value">
-								<span class="content-number alibaba color-cyan">18.2</span>℃
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								回水温度
-							</div>
-							<div class="content-value">
-								<span class="content-number alibaba color-cyan">15.2</span>℃
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="heatsource-item">
-					<div class="heatsource-title">
-						<i class="iconfont huifont-shuzhuangcaidanxiala"></i>
-						<span class="heatsource-title-name hui-ellipsis">
-							蒸汽锅炉-卧式_64294:蒸汽锅炉-卧蒸汽锅炉-卧式_64294:蒸汽锅炉-卧
-						</span>
-					</div>
-					<div class="heatsource-content">
-						<div class="content-item">
-							<div class="content-label">
-								运行状态
-							</div>
-							<div class="content-value">
-								<el-switch v-model="value2">
-								</el-switch>
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								控制温度
-							</div>
-							<div class="content-value">
-								-
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								供水温度
-							</div>
-							<div class="content-value">
-								-
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								回水温度
-							</div>
-							<div class="content-value">
-								-
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="heatsource-item">
-					<div class="heatsource-title">
-						<i class="iconfont huifont-shuzhuangcaidanxiala"></i>
-						<span class="heatsource-title-name hui-ellipsis">
-							蒸汽锅炉-卧式_64294:蒸汽锅炉-卧蒸汽锅炉-卧式_64294:蒸汽锅炉-卧
-						</span>
-					</div>
-					<div class="heatsource-content">
-						<div class="content-item">
-							<div class="content-label">
-								运行状态
-							</div>
-							<div class="content-value">
-								<el-switch v-model="value1">
-								</el-switch>
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								控制温度
-							</div>
-							<div class="content-value">
-								<span class="content-number alibaba color-cyan">12</span>℃
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								供水温度
-							</div>
-							<div class="content-value">
-								<span class="content-number alibaba color-cyan">18.2</span>℃
-							</div>
-						</div>
-						<div class="content-item">
-							<div class="content-label">
-								回水温度
-							</div>
-							<div class="content-value">
-								<span class="content-number alibaba color-cyan">15.2</span>℃
+								<span class="content-number alibaba color-cyan">{{item.data.backTemp}}</span>℃
 							</div>
 						</div>
 					</div>
@@ -259,13 +62,48 @@
 
 <script>
 	import model from '@/components/work/common/model'
+	import {
+		getEnergyDeviceList,
+		updateEnergyDevice
+	} from '@/httpApi/test'
 	export default {
 		data() {
 			return {
-				value1: true,
-				value2: false,
+				steamBoiler: [],
+				list: []
 			}
 		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				getEnergyDeviceList({
+					type: 7,
+					projectId: this.$store.getters.project.id
+				}).then(res => {
+					if (res.state) {
+						let data = res.data;
+						this.steamBoiler = data.filter(node => node.column3 === '蒸汽锅炉').map(node => {
+							if (node['data']) node['data'] = JSON.parse(node.data);
+							return node;
+						});
+						this.list = data.filter(node => node.column3 === '主管能量计');
+					}
+				})
+			},
+			changeDoor(value, item) {
+				updateEnergyDevice({
+					id: item.id,
+					state: value
+				}).then(res => {
+					if (res.state) {
+						this.$message.success('操作成功');
+						this.init();
+					}
+				})
+			},
+		},
 		components: {
 			model
 		},

virgo.wzfrontend/console/src/views/work/energy/water/supply/drainage.vue

@@ -1,11 +1,11 @@
 <template>
 	<div class="yui-tree-box">
-		<select-space></select-space>
+		<project-item-tree @treeclick="treeclick" iconfontClass="el-icon-place"></project-item-tree>
 		<div class="hui-tree-content">
 			<div class="drainage box-background">
 				<div class="drainage-box">
 					<div class="drainage-center">
-						<test-alarm></test-alarm>
+						<test-alarm ref="testAlarm" :type="21"></test-alarm>
 						<div class="bim-box">
 							<model type="drainage" fileId="10000815010702"></model>
 						</div>
@@ -26,125 +26,19 @@
 									<img src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/9cd9340b47d8419e9da73321edad0f42"
 										alt="" />
 								</div>
-								<div class="cold-water-list">
-									<div class="cold-water-item">
-										<span class="cold-water-count">1#</span>
-										<span class="cold-water-content">
-											排水泵
-											<span class="color-cyan">0.02</span>
-										</span>
-										<span class="cold-water-operation">
-											<el-switch v-model="value1">
-											</el-switch>
-										</span>
-									</div>
-									<div class="cold-water-item">
-										<span class="cold-water-count">2#</span>
-										<span class="cold-water-content">
-											排水泵
-											<span class="color-cyan">0.03</span>
-										</span>
-										<span class="cold-water-operation">
-											<el-switch v-model="value1">
-											</el-switch>
-										</span>
-									</div>
-									<div class="cold-water-item">
-										<span class="cold-water-count">3#</span>
-										<span class="cold-water-content">
-											排水泵
-											<span class="color-cyan">0.05</span>
-										</span>
-										<span class="cold-water-operation">
-											<el-switch v-model="value2">
-											</el-switch>
-										</span>
-									</div>
-									<div class="cold-water-item">
-										<span class="cold-water-count">4#</span>
-										<span class="cold-water-content">
-											排水泵
-											<span class="color-cyan">0.01</span>
-										</span>
-										<span class="cold-water-operation">
-											<el-switch v-model="value2">
-											</el-switch>
-										</span>
-									</div>
-									<div class="cold-water-item">
-										<span class="cold-water-count">5#</span>
-										<span class="cold-water-content">
-											排水泵
-											<span class="color-cyan">0.06</span>
-										</span>
-										<span class="cold-water-operation">
-											<el-switch v-model="value2">
-											</el-switch>
-										</span>
-									</div>
-									<div class="cold-water-item">
-										<span class="cold-water-count">5#</span>
-										<span class="cold-water-content">
-											排水泵
-											<span class="color-cyan">0.08</span>
-										</span>
-										<span class="cold-water-operation">
-											<el-switch v-model="value1">
-											</el-switch>
-										</span>
-									</div>
-									<div class="cold-water-item">
-										<span class="cold-water-count">6#</span>
-										<span class="cold-water-content">
-											排水泵
-											<span class="color-cyan">0.01</span>
-										</span>
-										<span class="cold-water-operation">
-											<el-switch v-model="value1">
-											</el-switch>
-										</span>
-									</div>
-									<div class="cold-water-item">
-										<span class="cold-water-count">7#</span>
-										<span class="cold-water-content">
-											排水泵
-											<span class="color-cyan">0.02</span>
-										</span>
-										<span class="cold-water-operation">
-											<el-switch v-model="value1">
-											</el-switch>
-										</span>
-									</div>
-									<div class="cold-water-item">
-										<span class="cold-water-count">8#</span>
-										<span class="cold-water-content">
-											排水泵
-											<span class="color-cyan">0.01</span>
-										</span>
-										<span class="cold-water-operation">
-											<el-switch v-model="value1">
-											</el-switch>
-										</span>
-									</div>
-									<div class="cold-water-item">
-										<span class="cold-water-count">9#</span>
-										<span class="cold-water-content">
-											排水泵
-											<span class="color-cyan">0.03</span>
-										</span>
-										<span class="cold-water-operation">
-											<el-switch v-model="value1">
-											</el-switch>
-										</span>
-									</div>
-									<div class="cold-water-item">
-										<span class="cold-water-count">10#</span>
+								<div class="cold-water-list hui-no-tips" v-if="list.length === 0">
+									<empty width="80" description="暂无排水设备" style="margin: 20px 0;"></empty>
+								</div>
+								<div class="cold-water-list" v-else>
+									<div class="cold-water-item" v-for="item in list" :key="item.id">
+										<span class="cold-water-count">{{item.name}}</span>
 										<span class="cold-water-content">
-											排水泵
-											<span class="color-cyan">0.06</span>
+
+											<span class="color-cyan">{{item.column1}}</span>
 										</span>
 										<span class="cold-water-operation">
-											<el-switch v-model="value1">
+											<el-switch v-model="item.state" :active-value="1" :inactive-value="2"
+												@change="value=>changeDoor(value,item)">
 											</el-switch>
 										</span>
 									</div>
@@ -159,28 +53,70 @@
 </template>
 
 <script>
-	import selectSpace from '@/components/work/common/selectSpace'
+	import projectItemTree from '@/components/common/projectItemTree'
 	import testAlarm from '@/components/work/common/testAlarm'
 	import model from '@/components/work/common/model'
+	import {
+		getEnergyDeviceList,
+		updateEnergyDevice
+	} from '@/httpApi/test'
 	export default {
 		data() {
 			return {
-				value1: true,
-				value2: false
+				list: [],
+				option: null
 			}
 		},
 		created() {
 			this.$nextTick(() => {
-				this.chart(this.$refs.chart1, [1, 3, 2, 6, 1])
+				this.init();
 			})
 		},
 		components: {
 			testAlarm,
-			selectSpace,
+			projectItemTree,
 			model
 		},
 		methods: {
-			chart(elem, data) {
+			treeclick(item) {
+				let obj = item.id ? {
+					projectItemTargetId: item.id
+				} : {};
+				if (this.$refs.testAlarm) this.$refs.testAlarm.init(obj);
+				this.init(obj);
+			},
+			init(option) {
+				let postData = {
+					projectId: this.$store.getters.project.id,
+					type: 11
+				}
+				this.option = option;
+				if (option) postData = Object.assign(postData, option);
+				getEnergyDeviceList(postData).then(res => {
+					if (res.state) {
+						this.list = res.data;
+						let x = [],
+							data = [];
+						for (let i = 0; i < res.data.length; i++) {
+							x.push(res.data[i].name);
+							data.push(res.data[i].column1);
+						}
+						this.chart(this.$refs.chart1, data, x);
+					}
+				})
+			},
+			changeDoor(value, item) {
+				updateEnergyDevice({
+					id: item.id,
+					state: value
+				}).then(res => {
+					if (res.state) {
+						this.$message.success('操作成功');
+						this.init(this.option);
+					}
+				})
+			},
+			chart(elem, data, x) {
 				let chart = echarts.init(elem);
 				let option = {
 					tooltip: {
@@ -209,7 +145,7 @@
 					color: ['#1978E5'],
 					xAxis: {
 						type: 'category',
-						data: ['安装', '保养', '维修', '巡检', '拆除'],
+						data: x,
 						axisLabel: {
 							margin: 4,
 							color: '#D0DEEE',

virgo.wzfrontend/console/src/views/work/energy/water/supply/firefighting.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="yui-tree-box">
-		<select-space></select-space>
+		<project-item-tree @treeclick="treeclick" iconfontClass="el-icon-place"></project-item-tree>
 		<div class="hui-tree-content">
 			<div class="firefighting box-background">
 				<div class="firefighting-box">
 					<div class="firefighting-center">
-						<test-alarm></test-alarm>
+						<test-alarm ref="testAlarm" :type="20"></test-alarm>
 						<div class="bim-box">
-							<model type="firefighting" fileId="10000815010702"></model>
+							<!-- <model type="firefighting" fileId="10000815010702"></model> -->
 						</div>
 					</div>
 					<div class="firefighting-right">
@@ -20,7 +20,7 @@
 									<i class="iconfont huifont-shuiwei"></i>
 								</div>
 								<span class="label">实时液位高度</span>
-								<span class="number alibaba">82</span>
+								<span class="number alibaba">{{nowData}}</span>
 								<span class="unit">cm</span>
 							</div>
 						</div>
@@ -39,27 +39,61 @@
 
 <script>
 	import testAlarm from '@/components/work/common/testAlarm'
-	import selectSpace from '@/components/work/common/selectSpace'
+	import projectItemTree from '@/components/common/projectItemTree'
 	import model from '@/components/work/common/model'
+	import {
+		getEnergyDeviceList
+	} from '@/httpApi/test'
 	export default {
 		data() {
-			return {}
+			return {
+				nowData: 0
+			}
 		},
 		created() {
 			this.$nextTick(() => {
-				this.chart(this.$refs.chart1, {
-					data1: [1, 3, 2, 6, 1],
-					data2: [0, 4, 3, 4, 0]
-				});
+				this.init();
 			})
 		},
 		components: {
 			testAlarm,
-			selectSpace,
+			projectItemTree,
 			model
 		},
 		methods: {
-			chart(elem, data) {
+			init(option) {
+				let postData = {
+					projectId: this.$store.getters.project.id,
+					type: 10
+				}
+				if (option) postData = Object.assign(postData, option);
+				getEnergyDeviceList(postData).then(res => {
+					if (res.state) {
+						let data = res.data;
+						let nowData = data.filter(node => node.column3 === '消防水箱')[0];
+						this.nowData = !nowData ? 0 : nowData.column1;
+						this.testWater(this.$refs.chart1, data.filter(node => node.column3 === '消防用水'));
+					}
+				})
+			},
+			testWater(elem, data) {
+				let list = data.reverse();
+				let x = [],
+					datas = [];
+				for (let i = 0; i < list.length; i++) {
+					x.push(this.$dayjs(data[i].date).format('MM/DD'));
+					datas.push(list[i].column1);
+				}
+				this.chart(elem, x, datas);
+			},
+			treeclick(item) {
+				let obj = item.id ? {
+					projectItemTargetId: item.id
+				} : {};
+				if (this.$refs.testAlarm) this.$refs.testAlarm.init(obj);
+				this.init(obj);
+			},
+			chart(elem, x, data) {
 				let chart = echarts.init(elem);
 				let option = {
 					tooltip: {
@@ -88,7 +122,7 @@
 					color: ['#2DB85C', '#AFB9CC'],
 					xAxis: {
 						type: 'category',
-						data: ['安装', '保养', '维修', '巡检', '拆除'],
+						data: x,
 						axisLabel: {
 							margin: 4,
 							color: '#D0DEEE',
@@ -120,7 +154,7 @@
 						}
 					},
 					series: [{
-						data: data.data1,
+						data: data,
 						type: 'line',
 						showSymbol: false,
 						label: {
@@ -140,31 +174,10 @@
 							])
 						},
 						z: 99
-					}, {
-						data: data.data2,
-						type: 'line',
-						showSymbol: false,
-						label: {
-							show: true,
-							color: '#D0DEEE'
-						},
-						smooth: true,
-						areaStyle: {
-							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-									offset: 0,
-									color: 'rgba(175,185,204,0.15)'
-								},
-								{
-									offset: 1,
-									color: 'rgba(175,185,204,0)'
-								}
-							])
-						},
-						z: 99
 					}]
 				};
 				chart.setOption(option);
-			},
+			}
 		},
 	}
 </script>

virgo.wzfrontend/console/src/views/work/energy/water/supply/life.vue

@@ -1,11 +1,11 @@
 <template>
 	<div class="yui-tree-box">
-		<select-space></select-space>
+		<project-item-tree @treeclick="treeclick" iconfontClass="el-icon-place"></project-item-tree>
 		<div class="hui-tree-content">
 			<div class="life box-background">
 				<div class="life-box">
 					<div class="life-center">
-						<test-alarm></test-alarm>
+						<test-alarm ref="testAlarm" :type="19"></test-alarm>
 						<div class="bim-box">
 							<model type="life" fileId="10000815010702"></model>
 						</div>
@@ -20,7 +20,7 @@
 									<i class="iconfont huifont-shuiwei"></i>
 								</div>
 								<span class="label">实时液位</span>
-								<span class="number alibaba">82</span>
+								<span class="number alibaba">{{nowData}}</span>
 								<span class="unit">cm</span>
 							</div>
 						</div>
@@ -30,19 +30,19 @@
 							</div>
 							<div class="instrument-box">
 								<div class="instrument-item">
-									<div class="color-cyan">0.5</div>
+									<div class="color-cyan">{{waterQuality.ntu}}</div>
 									<div class="label">浊度(NTU)</div>
 								</div>
 								<div class="instrument-item">
-									<div class="color-cyan">0.3</div>
+									<div class="color-cyan">{{waterQuality.cl2}}</div>
 									<div class="label">余氣(mg/L)</div>
 								</div>
 								<div class="instrument-item">
-									<div class="color-cyan">6.5</div>
-									<div class="label">PH(单位)</div>
+									<div class="color-cyan">{{waterQuality.ph}}</div>
+									<div class="label">PH</div>
 								</div>
 								<div class="instrument-item">
-									<div class="color-cyan">236</div>
+									<div class="color-cyan">{{waterQuality.tds}}</div>
 									<div class="label">TDS(mg/L)</div>
 								</div>
 							</div>
@@ -50,28 +50,12 @@
 						<div class="water-chart">
 							<div class="hui-chart-title">
 								生活水泵用水趋势
-								<div class="select">
-									<el-select size="mini" v-model="value" placeholder="请选择">
-										<el-option label="浓度" :value="1">
-										</el-option>
-										<el-option label="浊度" :value="2">
-										</el-option>
-									</el-select>
-								</div>
 							</div>
 							<div ref="chart1" class="water-chart-box"></div>
 						</div>
 						<div class="water-chart">
 							<div class="hui-chart-title">
 								生活水泵用能趋势
-								<div class="select">
-									<el-select size="mini" v-model="value" placeholder="请选择">
-										<el-option label="浓度" :value="1">
-										</el-option>
-										<el-option label="浊度" :value="2">
-										</el-option>
-									</el-select>
-								</div>
 							</div>
 							<div ref="chart2" class="water-chart-box"></div>
 						</div>
@@ -84,33 +68,75 @@
 
 <script>
 	import testAlarm from '@/components/work/common/testAlarm'
-	import selectSpace from '@/components/work/common/selectSpace'
+	import projectItemTree from '@/components/common/projectItemTree'
 	import model from '@/components/work/common/model'
+	import {
+		getEnergyDeviceList
+	} from '@/httpApi/test'
 	export default {
 		data() {
 			return {
-				value: ''
+				nowData: 0,
+				waterQuality: {
+					"ntu": "0",
+					"cl2": "0",
+					"ph": "0",
+					"tds": "0"
+				}
 			}
 		},
 		components: {
 			testAlarm,
-			selectSpace,
+			projectItemTree,
 			model
 		},
 		created() {
 			this.$nextTick(() => {
-				this.chart(this.$refs.chart1, {
-					data1: [1, 3, 2, 6, 1],
-					data2: [0, 4, 3, 4, 0]
-				});
-				this.chart(this.$refs.chart2, {
-					data1: [1, 3, 2, 6, 1],
-					data2: [0, 4, 3, 4, 0]
-				});
+				this.init();
 			})
 		},
 		methods: {
-			chart(elem, data) {
+			init(option) {
+				let postData = {
+					projectId: this.$store.getters.project.id,
+					type: 9
+				}
+				if (option) postData = Object.assign(postData, option);
+				getEnergyDeviceList(postData).then(res => {
+					if (res.state) {
+						let data = res.data;
+						let nowData = data.filter(node => node.column3 === '水箱')[0];
+						this.nowData = !nowData ? 0 : nowData.column1;
+						let waterQuality = data.filter(node => node.column3 === '水质')[0];
+						this.waterQuality = !waterQuality ? {
+							"ntu": "0",
+							"cl2": "0",
+							"ph": "0",
+							"tds": "0"
+						} : JSON.parse(waterQuality.data);
+						this.testWater(this.$refs.chart1, data.filter(node => node.column3 === '水泵用水'));
+						this.testWater(this.$refs.chart2, data.filter(node => node.column3 === '水泵用电'));
+					}
+				})
+			},
+			testWater(elem, data) {
+				let list = data.reverse();
+				let x = [],
+					datas = [];
+				for (let i = 0; i < list.length; i++) {
+					x.push(this.$dayjs(data[i].date).format('MM/DD'));
+					datas.push(list[i].column1);
+				}
+				this.chart(elem, x, datas);
+			},
+			treeclick(item) {
+				let obj = item.id ? {
+					projectItemTargetId: item.id
+				} : {};
+				if (this.$refs.testAlarm) this.$refs.testAlarm.init(obj);
+				this.init(obj);
+			},
+			chart(elem, x, data) {
 				let chart = echarts.init(elem);
 				let option = {
 					tooltip: {
@@ -139,7 +165,7 @@
 					color: ['#2DB85C', '#AFB9CC'],
 					xAxis: {
 						type: 'category',
-						data: ['安装', '保养', '维修', '巡检', '拆除'],
+						data: x,
 						axisLabel: {
 							margin: 4,
 							color: '#D0DEEE',
@@ -171,7 +197,7 @@
 						}
 					},
 					series: [{
-						data: data.data1,
+						data: data,
 						type: 'line',
 						showSymbol: false,
 						label: {
@@ -191,27 +217,6 @@
 							])
 						},
 						z: 99
-					}, {
-						data: data.data2,
-						type: 'line',
-						showSymbol: false,
-						label: {
-							show: true,
-							color: '#D0DEEE'
-						},
-						smooth: true,
-						areaStyle: {
-							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-									offset: 0,
-									color: 'rgba(175,185,204,0.15)'
-								},
-								{
-									offset: 1,
-									color: 'rgba(175,185,204,0)'
-								}
-							])
-						},
-						z: 99
 					}]
 				};
 				chart.setOption(option);

virgo.wzfrontend/console/src/views/work/energy/water/supply/lowcarbon.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="yui-tree-box">
-		<select-space></select-space>
+		<project-item-tree @treeclick="treeclick" iconfontClass="el-icon-place"></project-item-tree>
 		<div class="hui-tree-content">
 			<div class="lowcarbon box-background">
 				<div class="lowcarbon-box">
 					<div class="lowcarbon-center">
-						<test-alarm></test-alarm>
+						<test-alarm ref="testAlarm" :type="22"></test-alarm>
 						<div class="bim-box">
-							<model type="firefighting" fileId="10000815010702"></model>
+							<!-- <model type="firefighting" fileId="10000815010702"></model> -->
 						</div>
 					</div>
 					<div class="lowcarbon-right">
@@ -20,7 +20,7 @@
 									<i class="iconfont huifont-shuiwei"></i>
 								</div>
 								<span class="label">实时液位高度</span>
-								<span class="number alibaba">82</span>
+								<span class="number alibaba">{{nowData}}</span>
 								<span class="unit">cm</span>
 							</div>
 						</div>
@@ -36,19 +36,19 @@
 							</div>
 							<div class="instrument-box">
 								<div class="instrument-item">
-									<div class="color-cyan">0.5</div>
+									<div class="color-cyan">{{waterQuality.ntu}}</div>
 									<div class="label">浊度(NTU)</div>
 								</div>
 								<div class="instrument-item">
-									<div class="color-cyan">0.3</div>
+									<div class="color-cyan">{{waterQuality.cl2}}</div>
 									<div class="label">余氣(mg/L)</div>
 								</div>
 								<div class="instrument-item">
-									<div class="color-cyan">6.5</div>
-									<div class="label">PH(单位)</div>
+									<div class="color-cyan">{{waterQuality.ph}}</div>
+									<div class="label">PH</div>
 								</div>
 								<div class="instrument-item">
-									<div class="color-cyan">236</div>
+									<div class="color-cyan">{{waterQuality.tds}}</div>
 									<div class="label">TDS(mg/L)</div>
 								</div>
 							</div>
@@ -57,10 +57,10 @@
 									当日趋势
 								</div>
 								<div class="select">
-									<el-select size="mini" v-model="value" placeholder="请选择">
-										<el-option label="浓度" :value="1">
-										</el-option>
-										<el-option label="浊度" :value="2">
+									<el-select size="mini" v-model="instrumentValue" placeholder="请选择"
+										@change="testQuality">
+										<el-option :label="item.name" :value="item.id" v-for="(item,index) in quality"
+											:key="index">
 										</el-option>
 									</el-select>
 								</div>
@@ -73,14 +73,13 @@
 									报警信息
 								</div>
 							</div>
-							<div class="lowcarbon-list">
-								<div class="lowcarbon-item">
-									<div class="label">报警信息原因</div>
-									<div class="date">2024-01-01 12:00:01</div>
-								</div>
-								<div class="lowcarbon-item">
-									<div class="label">报警信息原因</div>
-									<div class="date">2024-01-01 12:00:01</div>
+							<div class="lowcarbon-list hui-no-tips" v-if="list.length === 0">
+								<empty width="40" description="暂无报警记录"></empty>
+							</div>
+							<div class="lowcarbon-list" v-else>
+								<div class="lowcarbon-item" v-for="(item,index) in list" :key="index">
+									<div class="label">{{item.info}}</div>
+									<div class="date">{{item.date}}</div>
 								</div>
 							</div>
 						</div>
@@ -93,30 +92,117 @@
 
 <script>
 	import testAlarm from '@/components/work/common/testAlarm'
-	import selectSpace from '@/components/work/common/selectSpace'
+	import projectItemTree from '@/components/common/projectItemTree'
 	import model from '@/components/work/common/model'
+	import {
+		getEnergyDeviceList,
+		getDeviceAlarmList
+	} from '@/httpApi/test'
 	export default {
 		data() {
 			return {
-				value: ''
+				quality: [{
+					id: 'ntu',
+					name: '浊度'
+				}, {
+					id: 'cl2',
+					name: '余氯'
+				}, {
+					id: 'ph',
+					name: 'PH'
+				}, {
+					id: 'tds',
+					name: 'TDS'
+				}],
+				instrumentValue: 'ntu',
+				nowData: 0,
+				waterQuality: {
+					"ntu": "0",
+					"cl2": "0",
+					"ph": "0",
+					"tds": "0"
+				},
+				qualityList: [],
+				list: []
 			}
 		},
 		components: {
 			testAlarm,
-			selectSpace,
+			projectItemTree,
 			model
 		},
 		created() {
 			this.$nextTick(() => {
-				this.chart(this.$refs.chart1, {
-					data1: [1, 3, 2, 6, 1],
-					data2: [0, 4, 3, 4, 0]
-				});
-				this.chart1(this.$refs.chart2, [1, 3, 2, 6, 1]);
+				this.init();
 			})
 		},
 		methods: {
-			chart1(elem, data) {
+			init(option) {
+				let postData = {
+					projectId: this.$store.getters.project.id,
+					type: 11
+				}
+				if (option) postData = Object.assign(postData, option);
+				getEnergyDeviceList(postData).then(res => {
+					if (res.state) {
+						let data = res.data;
+						let nowData = data.filter(node => node.column3 === '生活水箱')[0];
+						this.nowData = !nowData ? 0 : nowData.column1;
+						let waterQuality = data.filter(node => node.column3 === '水质')[0];
+						this.waterQuality = !waterQuality ? {
+							"ntu": "0",
+							"cl2": "0",
+							"ph": "0",
+							"tds": "0"
+						} : JSON.parse(waterQuality.data);
+						this.testWater(this.$refs.chart1, data.filter(node => node.column3 === '水泵用水'));
+						this.qualityList = data.filter(node => node.column3 === '水质').map(node => {
+							if (node.data) {
+								node.data = JSON.parse(node.data);
+							} else {
+								node.data = {};
+							}
+							return node;
+						}).reverse();
+						this.testQuality();
+					}
+				})
+				let postDatas = {
+					projectId: this.$store.getters.project.id,
+					type: 23
+				}
+				if (option) postDatas = Object.assign(postDatas, option);
+				getDeviceAlarmList(postDatas).then(res => {
+					if (res.state) this.list = res.data;
+				})
+			},
+			testWater(elem, data) {
+				let list = data.reverse();
+				let x = [],
+					datas = [];
+				for (let i = 0; i < list.length; i++) {
+					x.push(this.$dayjs(data[i].date).format('MM/DD'));
+					datas.push(list[i].column1);
+				}
+				this.chart(elem, x, datas);
+			},
+			testQuality() {
+				let x = [],
+					datas = [];
+				for (let i = 0; i < this.qualityList.length; i++) {
+					x.push(this.$dayjs(this.qualityList[i].date).format('MM/DD'));
+					datas.push(this.qualityList[i].data[this.instrumentValue]);
+				}
+				this.chart1(this.$refs.chart2, datas, x);
+			},
+			treeclick(item) {
+				let obj = item.id ? {
+					projectItemTargetId: item.id
+				} : {};
+				if (this.$refs.testAlarm) this.$refs.testAlarm.init(obj);
+				this.init(obj);
+			},
+			chart1(elem, data, x) {
 				let chart = echarts.init(elem);
 				let option = {
 					tooltip: {
@@ -145,7 +231,7 @@
 					color: ['#AFB9CC'],
 					xAxis: {
 						type: 'category',
-						data: ['安装', '保养', '维修', '巡检', '拆除'],
+						data: x,
 						axisLabel: {
 							margin: 4,
 							color: '#D0DEEE',
@@ -206,7 +292,7 @@
 				};
 				chart.setOption(option);
 			},
-			chart(elem, data) {
+			chart(elem, x, data) {
 				let chart = echarts.init(elem);
 				let option = {
 					tooltip: {
@@ -226,16 +312,16 @@
 						}
 					},
 					grid: {
-						left: '5',
-						top: '40',
+						left: '0',
+						top: '20',
 						right: '10',
 						bottom: '0',
 						containLabel: true
 					},
-					color: ['#3371FF', '#06E0E9'],
+					color: ['#2DB85C', '#AFB9CC'],
 					xAxis: {
 						type: 'category',
-						data: ['安装', '保养', '维修', '巡检', '拆除'],
+						data: x,
 						axisLabel: {
 							margin: 4,
 							color: '#D0DEEE',
@@ -252,13 +338,7 @@
 						}
 					},
 					yAxis: {
-						name: '单位',
 						type: 'value',
-						nameTextStyle: {
-							color: '#D0DEEE',
-							fontSize: 10,
-							align: 'right',
-						},
 						axisLabel: {
 							margin: 10,
 							color: '#D0DEEE',
@@ -273,41 +353,22 @@
 						}
 					},
 					series: [{
-						data: data.data1,
-						type: 'line',
-						showSymbol: false,
-						label: {
-							show: true,
-							color: '#D0DEEE'
-						},
-						areaStyle: {
-							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-									offset: 0,
-									color: 'rgba(51,113,255,0.15)'
-								},
-								{
-									offset: 1,
-									color: 'rgba(51,113,255,0)'
-								}
-							])
-						},
-						z: 99
-					}, {
-						data: data.data2,
+						data: data,
 						type: 'line',
 						showSymbol: false,
 						label: {
 							show: true,
 							color: '#D0DEEE'
 						},
+						smooth: true,
 						areaStyle: {
 							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
 									offset: 0,
-									color: 'rgba(6,224,233,0.15)'
+									color: 'rgba(45,184,92,0.15)'
 								},
 								{
 									offset: 1,
-									color: 'rgba(6,224,233,0)'
+									color: 'rgba(45,184,92,0)'
 								}
 							])
 						},