whx hai 5 meses
pai
achega
9b1dea4cb5

+ 5 - 4
virgo.wzfrontend/console/public/index.html

@@ -5,15 +5,16 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<link rel="icon" href="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/2f7b4bfaf9e64817bc2cb46f3a632b01">
 		<link rel="stylesheet" type="text/css" href="<%= BASE_URL %>reset.css" />
-		<link rel="stylesheet" href="//at.alicdn.com/t/c/font_4358860_plro02z515r.css">
-		<script type="text/javascript" src="https://api.tianditu.gov.cn/api?v=4.0&tk=72632adad893994a0450b55949c8a8fc">
+		<link rel="stylesheet" href="//at.alicdn.com/t/c/font_4358860_plro02z515r.css">
+		<script type="text/javascript" src="https://api.tianditu.gov.cn/api?v=4.0&tk=72632adad893994a0450b55949c8a8fc">
 		</script>
 		<title>红链智慧建筑</title>
 		<script src="<%= BASE_URL %>jquery.js"></script>
 		<link rel="stylesheet" type="text/css" href="<%= BASE_URL %>icon/font.css" />
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/echarts/5.4.3/echarts.min.js"></script>
-		<script src="https://static.bimface.com/api/BimfaceSDKLoader/BimfaceSDKLoader@latest-release.js"></script>
-		
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/echarts-gl/2.0.8/echarts-gl.min.js"></script>
+		<script src="https://static.bimface.com/api/BimfaceSDKLoader/BimfaceSDKLoader@latest-release.js"></script>
+
 	</head>
 	<body id="body">
 		<noscript>

+ 114 - 311
virgo.wzfrontend/console/src/views/work/energy/strategy/conservation.vue

@@ -51,70 +51,8 @@
 					冷却塔换热侧
 				</div>
 				<div class="conservation-chart">
-					<div class="chart-item">
-						<div class="chart-title">
-							1#冷却塔
-						</div>
-						<div class="legend-box">
-							<div class="legend-item">
-								<span class="legend-page" style="background:#06E0E9;"></span>
-								<span class="legend-name">冷却塔出水温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#F04243;"></span>
-								<span class="legend-name">室外湿球温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#2DB85C;"></span>
-								<span class="legend-name">逼近温度</span>
-							</div>
-						</div>
-						<div ref="chart3" class="chart-box"></div>
-					</div>
-					<div class="chart-item">
-						<div class="chart-title">
-							2#冷却塔
-						</div>
-						<div class="legend-box">
-							<div class="legend-item">
-								<span class="legend-page" style="background:#06E0E9;"></span>
-								<span class="legend-name">冷却塔出水温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#F04243;"></span>
-								<span class="legend-name">室外湿球温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#2DB85C;"></span>
-								<span class="legend-name">逼近温度</span>
-							</div>
-						</div>
-						<div ref="chart4" class="chart-box"></div>
-					</div>
-					<div class="chart-item">
-						<div class="chart-title">
-							3#冷却塔
-						</div>
-						<div class="legend-box">
-							<div class="legend-item">
-								<span class="legend-page" style="background:#06E0E9;"></span>
-								<span class="legend-name">冷却塔出水温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#F04243;"></span>
-								<span class="legend-name">室外湿球温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#2DB85C;"></span>
-								<span class="legend-name">逼近温度</span>
-							</div>
-						</div>
-						<div ref="chart5" class="chart-box"></div>
-					</div>
-					<div class="chart-item">
-						<div class="chart-title">
-							4#冷却塔
-						</div>
+					<div class="chart-item" v-for="(item,index) in list" :key="index">
+						<div class="chart-title">{{item.name}}</div>
 						<div class="legend-box">
 							<div class="legend-item">
 								<span class="legend-page" style="background:#06E0E9;"></span>
@@ -129,13 +67,13 @@
 								<span class="legend-name">逼近温度</span>
 							</div>
 						</div>
-						<div ref="chart6" class="chart-box"></div>
+						<div :ref="'charts'+index" class="chart-box"></div>
 					</div>
 				</div>
 			</div>
 			<div class="conservation-item">
 				<div class="hui-chart-title">
-					输配
+					室外
 				</div>
 				<div class="conservation-chart">
 					<div class="chart-item">
@@ -151,11 +89,6 @@
 								<span class="legend-page" style="background:#06E0E9;"></span>
 								<span class="legend-name">室外湿球温度</span>
 							</div>
-							<div class="legend-item">
-								<span class="legend-page"
-									style="background: linear-gradient(360deg, rgba(157,96,251,0) 0%, #9D60FB 100%);"></span>
-								<span class="legend-name">室外湿球温度</span>
-							</div>
 						</div>
 						<div ref="chart7" class="chart-box"></div>
 					</div>
@@ -179,24 +112,7 @@
 			</div>
 			<div class="conservation-item">
 				<div class="hui-chart-title">
-					室外侧
-				</div>
-				<div class="conservation-select combination-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>
-					<el-select size="mini" v-model="value" placeholder="请选择">
-						<el-option label="浓度" :value="1">
-						</el-option>
-						<el-option label="浊度" :value="2">
-						</el-option>
-					</el-select>
-					<el-date-picker size="mini" v-model="value1" type="daterange" range-separator="-"
-						start-placeholder="开始日期" end-placeholder="结束日期">
-					</el-date-picker>
+					设备侧
 				</div>
 				<div class="chart-table">
 					<div class="chart-table-item">
@@ -206,27 +122,27 @@
 					<div class="chart-table-item">
 						<div class="title">冷却水进水温度及负荷率与时间组合分布图</div>
 						<div class="big-chart">
-							<el-table :data="tableData" style="width: 100%" height="100%">
+							<el-table :data="tableData1" style="width: 100%" height="100%">
 								<el-table-column prop="type" label="负荷率" width="120">
 								</el-table-column>
 								<el-table-column label="冷却水进水温度(°C)">
-									<el-table-column prop="name" label="4°C" min-width="60">
+									<el-table-column prop="name4" label="4°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="20°C" min-width="60">
+									<el-table-column prop="name20" label="20°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="22°C" min-width="60">
+									<el-table-column prop="name22" label="22°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="24°C" min-width="60">
+									<el-table-column prop="name24" label="24°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="26°C" min-width="60">
+									<el-table-column prop="name26" label="26°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="28°C" min-width="60">
+									<el-table-column prop="name28" label="28°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="30°C" min-width="60">
+									<el-table-column prop="name30" label="30°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="32°C" min-width="60">
+									<el-table-column prop="name32" label="32°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="124°C" min-width="80">
+									<el-table-column prop="name124" label="124°C" min-width="80">
 									</el-table-column>
 								</el-table-column>
 							</el-table>
@@ -241,41 +157,33 @@
 					<div class="chart-table-item">
 						<div class="title">冷却水进水温度及负荷率与时间组合分布图</div>
 						<div class="big-chart">
-							<el-table :data="tableData" style="width: 100%" height="100%">
+							<el-table :data="tableData2" style="width: 100%" height="100%">
 								<el-table-column prop="type" label="负荷率" width="120">
 								</el-table-column>
 								<el-table-column label="冷却水进水温度(°C)">
-									<el-table-column prop="name" label="4°C" min-width="60">
+									<el-table-column prop="name4" label="4°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="20°C" min-width="60">
+									<el-table-column prop="name20" label="20°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="22°C" min-width="60">
+									<el-table-column prop="name22" label="22°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="24°C" min-width="60">
+									<el-table-column prop="name24" label="24°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="26°C" min-width="60">
+									<el-table-column prop="name26" label="26°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="28°C" min-width="60">
+									<el-table-column prop="name28" label="28°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="30°C" min-width="60">
+									<el-table-column prop="name30" label="30°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="32°C" min-width="60">
+									<el-table-column prop="name32" label="32°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="124°C" min-width="80">
+									<el-table-column prop="name124" label="124°C" min-width="80">
 									</el-table-column>
 								</el-table-column>
 							</el-table>
 						</div>
 					</div>
 				</div>
-				<div class="conservation-select combination-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 class="conservation-chart">
 					<div class="chart-item">
 						<div class="chart-title">
@@ -366,132 +274,106 @@
 </template>
 
 <script>
+	import {
+		getEnergyDeviceList
+	} from '@/httpApi/test'
 	export default {
 		data() {
 			return {
 				value: '',
 				value1: [],
-				tableData: [{
-					type: '0%',
-					name: 10,
-				}, {
-					type: '10%',
-					name: 10,
-				}, {
-					type: '20%',
-					name: 10,
-				}, {
-					type: '30%',
-					name: 10,
-				}, {
-					type: '40%',
-					name: 10,
-				}, {
-					type: '50%',
-					name: 10,
-				}, {
-					type: '60%',
-					name: 10,
-				}, {
-					type: '70%',
-					name: 10,
-				}, {
-					type: '80%',
-					name: 10,
-				}, {
-					type: '90%',
-					name: 10,
-				}, {
-					type: '100%',
-					name: 10,
-				}, {
-					type: '时间权重总汇',
-					name: 10,
-				}, {
-					type: '总时长(H)',
-					name: 10,
-				}]
+				tableData1: [],
+				tableData2: [],
+				chartData: [],
+				list: []
 			}
 		},
 		created() {
 			this.$nextTick(() => {
-				this.chart(this.$refs.chart1, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4]
-				], ['#3371FF', '#06E0E9'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7', '类目8', '类目9',
-					'类目10'
-				])
-				this.chart(this.$refs.chart2, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4]
-				], ['#3371FF', '#06E0E9'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7', '类目8', '类目9',
-					'类目10'
-				])
-				this.chart(this.$refs.chart3, [
-					[1, 3, 2, 6, 1, 1],
-					[2, 3, 1, 4, 4, 2],
-					[3, 2, 1, 5, 3, 3],
-				], ['#06E0E9', '#F04243', '#2DB85C'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6'])
-				this.chart(this.$refs.chart4, [
-					[1, 3, 2, 6, 1, 1],
-					[2, 3, 1, 4, 4, 2],
-					[3, 2, 1, 5, 3, 3],
-				], ['#06E0E9', '#F04243', '#2DB85C'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6'])
-				this.chart(this.$refs.chart5, [
-					[1, 3, 2, 6, 1, 1],
-					[2, 3, 1, 4, 4, 2],
-					[3, 2, 1, 5, 3, 3],
-				], ['#06E0E9', '#F04243', '#2DB85C'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6'])
-				this.chart(this.$refs.chart6, [
-					[1, 3, 2, 6, 1, 1],
-					[2, 3, 1, 4, 4, 2],
-					[3, 2, 1, 5, 3, 3],
-				], ['#06E0E9', '#F04243', '#2DB85C'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6'])
-				this.chart(this.$refs.chart7, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4]
-				], ['#3371FF', '#06E0E9'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7', '类目8', '类目9',
-					'类目10'
-				], 'bar', [2, 3, 1, 4, 4, 2, 3, 1, 4, 4])
-				this.chart(this.$refs.chart8, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4]
-				], ['#3371FF', '#06E0E9'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7', '类目8', '类目9',
-					'类目10'
-				])
-				this.chart2(this.$refs.chart9);
-				this.chart2(this.$refs.chart10);
-				this.chart(this.$refs.chart11, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4],
-					[3, 4, 3, 4, 5, 3, 2, 3, 1, 3]
-				], ['#3371FF', '#06E0E9', '#F9B115'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7',
-					'类目8', '类目9', '类目10'
-				])
-				this.chart(this.$refs.chart12, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4],
-					[3, 4, 3, 4, 5, 3, 2, 3, 1, 3]
-				], ['#3371FF', '#06E0E9', '#F9B115'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7',
-					'类目8', '类目9', '类目10'
-				])
-				this.chart(this.$refs.chart13, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4],
-					[3, 4, 3, 4, 5, 3, 2, 3, 1, 3]
-				], ['#3371FF', '#06E0E9', '#F9B115'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7',
-					'类目8', '类目9', '类目10'
-				])
-				this.chart(this.$refs.chart14, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4],
-					[3, 4, 3, 4, 5, 3, 2, 3, 1, 3]
-				], ['#3371FF', '#06E0E9', '#F9B115'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7',
-					'类目8', '类目9', '类目10'
-				])
+				console.log(this.tableData);
+				this.init();
 			})
 		},
 		methods: {
+			init() {
+				getEnergyDeviceList({
+					projectId: this.$store.getters.project.id,
+					type: 15
+				}).then(res => {
+					if (res.state) {
+						this.chartData = res.data;
+						let data1 = this.returnData('输配侧', '1');
+						if (data1.length > 0) {
+							this.chart(this.$refs.chart1, JSON.parse(data1[0].column1), JSON.parse(data1[0]
+								.column2), JSON.parse(data1[0].column3))
+						}
+						let data2 = this.returnData('输配侧', '2');
+						if (data2.length > 0) {
+							this.chart(this.$refs.chart2, JSON.parse(data2[0].column1), JSON.parse(data2[0]
+								.column2), JSON.parse(data2[0].column3))
+						}
+						this.list = this.returnData('冷却塔');
+						this.$nextTick(() => {
+							for (let i = 0; i < this.list.length; i++) {
+								this.chart(this.$refs['charts' + i][0], JSON.parse(this.list[i].column1),
+									JSON.parse(this.list[i].column2), JSON.parse(this.list[i].column3))
+							}
+						})
+						let data7 = this.returnData('输配侧', '3');
+						if (data7.length > 0) {
+							this.chart(this.$refs.chart7, JSON.parse(data7[0].column1), JSON.parse(data7[0]
+								.column2), JSON.parse(data7[0].column3))
+						}
+						let data8 = this.returnData('输配侧', '4');
+						if (data8.length > 0) {
+							this.chart(this.$refs.chart8, JSON.parse(data8[0].column1), JSON.parse(data8[0]
+								.column2), JSON.parse(data8[0].column3))
+						}
+						let data9 = this.returnData('设备侧', '5');
+						if (data9.length > 0) {
+							this.chart2(this.$refs.chart9, JSON.parse(data9[0].column2), JSON.parse(data9[0]
+								.column3), JSON.parse(data9[0].column1))
+						}
+						let data10 = this.returnData('设备侧', '6');
+						if (data10.length > 0) {
+							this.chart2(this.$refs.chart10, JSON.parse(data10[0].column2), JSON.parse(data10[0]
+								.column3), JSON.parse(data10[0].column1))
+						}
+						let data11 = this.returnData('设备侧', '1');
+						if (data11.length > 0) {
+							this.chart(this.$refs.chart11, JSON.parse(data11[0].column1), JSON.parse(data11[0]
+								.column2), JSON.parse(data11[0].column3))
+						}
+						let data12 = this.returnData('设备侧', '2');
+						if (data12.length > 0) {
+							this.chart(this.$refs.chart12, JSON.parse(data12[0].column1), JSON.parse(data12[0]
+								.column2), JSON.parse(data12[0].column3))
+						}
+						let data13 = this.returnData('设备侧', '3');
+						if (data13.length > 0) {
+							this.chart(this.$refs.chart13, JSON.parse(data13[0].column1), JSON.parse(data13[0]
+								.column2), JSON.parse(data13[0].column3))
+						}
+						let data14 = this.returnData('设备侧', '4');
+						if (data14.length > 0) {
+							this.chart(this.$refs.chart14, JSON.parse(data14[0].column1), JSON.parse(data14[0]
+								.column2), JSON.parse(data14[0].column3))
+						}
+						let data15 = this.returnData('设备侧', '7');
+						if (data15.length > 0) {
+							this.tableData1 = JSON.parse(data15[0].column1)
+						}
+						let data16 = this.returnData('设备侧', '8');
+						if (data16.length > 0) {
+							this.tableData2 = JSON.parse(data16[0].column1)
+						}
+					}
+				})
+			},
+			returnData(name, type) {
+				if (!type) return this.chartData.filter(node => node.data === name);
+				return this.chartData.filter(node => node.name === name && node.data === type);
+			},
 			chart(elem, data, color, x, type, data1) {
 				let chart = echarts.init(elem);
 				let series = [];
@@ -595,87 +477,8 @@
 				};
 				chart.setOption(option);
 			},
-			chart2(elem) {
+			chart2(elem, hours, days, data) {
 				let chart = echarts.init(elem);
-				// prettier-ignore
-				var hours = ['12a', '1a', '2a', '3a', '4a', '5a', '6a',
-					'7a', '8a', '9a', '10a', '11a',
-					'12p', '1p', '2p', '3p', '4p', '5p',
-					'6p', '7p', '8p', '9p', '10p', '11p'
-				];
-				// prettier-ignore
-				var days = ['Saturday', 'Friday', 'Thursday',
-					'Wednesday', 'Tuesday', 'Monday', 'Sunday'
-				];
-				// prettier-ignore
-				var data = [
-					[0, 10, 0],
-					[0, 11, 2],
-					[0, 12, 4],
-					[0, 13, 1],
-					[0, 14, 1],
-					[0, 15, 3],
-					[0, 16, 4],
-					[0, 17, 6],
-					[0, 18, 4],
-					[0, 19, 4],
-					[0, 20, 3],
-					[0, 21, 3],
-					[0, 22, 2],
-					[0, 23, 5],
-					[1, 0, 7],
-					[1, 1, 0],
-					[1, 2, 0],
-					[1, 3, 0],
-					[1, 4, 0],
-					[1, 5, 0],
-					[1, 6, 0],
-					[1, 7, 0],
-					[1, 8, 0],
-					[1, 9, 0],
-					[1, 10, 5],
-					[1, 23, 2],
-					[2, 0, 1],
-					[2, 1, 1],
-					[2, 14, 8],
-					[2, 15, 10],
-					[2, 16, 6],
-					[2, 17, 5],
-					[2, 18, 5],
-					[2, 19, 5],
-					[2, 20, 7],
-					[2, 21, 4],
-					[2, 22, 2],
-					[2, 23, 4],
-					[3, 0, 7],
-					[3, 1, 3],
-					[3, 2, 0],
-					[3, 3, 0],
-					[3, 4, 0],
-					[3, 5, 0],
-					[3, 6, 0],
-					[3, 7, 0],
-					[3, 20, 6],
-					[3, 21, 4],
-					[3, 22, 4],
-					[3, 23, 1],
-					[4, 0, 1],
-					[4, 1, 3],
-					[4, 2, 0],
-					[4, 20, 3],
-					[4, 21, 7],
-					[4, 22, 3],
-					[4, 23, 0],
-					[5, 8, 2],
-					[5, 9, 0],
-					[5, 10, 4],
-					[5, 11, 1],
-					[5, 12, 5],
-					[5, 13, 10],
-					[5, 14, 5],
-					[5, 15, 7],
-					[5, 16, 11],
-				];
 				let option = {
 					tooltip: {},
 					visualMap: {

+ 114 - 311
virgo.wzfrontend/console/src/views/work/energy/strategy/prediction.vue

@@ -51,70 +51,8 @@
 					冷却塔换热侧
 				</div>
 				<div class="conservation-chart">
-					<div class="chart-item">
-						<div class="chart-title">
-							1#冷却塔
-						</div>
-						<div class="legend-box">
-							<div class="legend-item">
-								<span class="legend-page" style="background:#06E0E9;"></span>
-								<span class="legend-name">冷却塔出水温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#F04243;"></span>
-								<span class="legend-name">室外湿球温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#2DB85C;"></span>
-								<span class="legend-name">逼近温度</span>
-							</div>
-						</div>
-						<div ref="chart3" class="chart-box"></div>
-					</div>
-					<div class="chart-item">
-						<div class="chart-title">
-							2#冷却塔
-						</div>
-						<div class="legend-box">
-							<div class="legend-item">
-								<span class="legend-page" style="background:#06E0E9;"></span>
-								<span class="legend-name">冷却塔出水温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#F04243;"></span>
-								<span class="legend-name">室外湿球温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#2DB85C;"></span>
-								<span class="legend-name">逼近温度</span>
-							</div>
-						</div>
-						<div ref="chart4" class="chart-box"></div>
-					</div>
-					<div class="chart-item">
-						<div class="chart-title">
-							3#冷却塔
-						</div>
-						<div class="legend-box">
-							<div class="legend-item">
-								<span class="legend-page" style="background:#06E0E9;"></span>
-								<span class="legend-name">冷却塔出水温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#F04243;"></span>
-								<span class="legend-name">室外湿球温度</span>
-							</div>
-							<div class="legend-item">
-								<span class="legend-page" style="background:#2DB85C;"></span>
-								<span class="legend-name">逼近温度</span>
-							</div>
-						</div>
-						<div ref="chart5" class="chart-box"></div>
-					</div>
-					<div class="chart-item">
-						<div class="chart-title">
-							4#冷却塔
-						</div>
+					<div class="chart-item" v-for="(item,index) in list" :key="index">
+						<div class="chart-title">{{item.name}}</div>
 						<div class="legend-box">
 							<div class="legend-item">
 								<span class="legend-page" style="background:#06E0E9;"></span>
@@ -129,13 +67,13 @@
 								<span class="legend-name">逼近温度</span>
 							</div>
 						</div>
-						<div ref="chart6" class="chart-box"></div>
+						<div :ref="'charts'+index" class="chart-box"></div>
 					</div>
 				</div>
 			</div>
 			<div class="conservation-item">
 				<div class="hui-chart-title">
-					输配
+					室外
 				</div>
 				<div class="conservation-chart">
 					<div class="chart-item">
@@ -151,11 +89,6 @@
 								<span class="legend-page" style="background:#06E0E9;"></span>
 								<span class="legend-name">室外湿球温度</span>
 							</div>
-							<div class="legend-item">
-								<span class="legend-page"
-									style="background: linear-gradient(360deg, rgba(157,96,251,0) 0%, #9D60FB 100%);"></span>
-								<span class="legend-name">室外湿球温度</span>
-							</div>
 						</div>
 						<div ref="chart7" class="chart-box"></div>
 					</div>
@@ -179,24 +112,7 @@
 			</div>
 			<div class="conservation-item">
 				<div class="hui-chart-title">
-					室外侧
-				</div>
-				<div class="conservation-select combination-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>
-					<el-select size="mini" v-model="value" placeholder="请选择">
-						<el-option label="浓度" :value="1">
-						</el-option>
-						<el-option label="浊度" :value="2">
-						</el-option>
-					</el-select>
-					<el-date-picker size="mini" v-model="value1" type="daterange" range-separator="-"
-						start-placeholder="开始日期" end-placeholder="结束日期">
-					</el-date-picker>
+					设备侧
 				</div>
 				<div class="chart-table">
 					<div class="chart-table-item">
@@ -206,27 +122,27 @@
 					<div class="chart-table-item">
 						<div class="title">冷却水进水温度及负荷率与时间组合分布图</div>
 						<div class="big-chart">
-							<el-table :data="tableData" style="width: 100%" height="100%">
+							<el-table :data="tableData1" style="width: 100%" height="100%">
 								<el-table-column prop="type" label="负荷率" width="120">
 								</el-table-column>
 								<el-table-column label="冷却水进水温度(°C)">
-									<el-table-column prop="name" label="4°C" min-width="60">
+									<el-table-column prop="name4" label="4°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="20°C" min-width="60">
+									<el-table-column prop="name20" label="20°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="22°C" min-width="60">
+									<el-table-column prop="name22" label="22°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="24°C" min-width="60">
+									<el-table-column prop="name24" label="24°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="26°C" min-width="60">
+									<el-table-column prop="name26" label="26°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="28°C" min-width="60">
+									<el-table-column prop="name28" label="28°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="30°C" min-width="60">
+									<el-table-column prop="name30" label="30°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="32°C" min-width="60">
+									<el-table-column prop="name32" label="32°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="124°C" min-width="80">
+									<el-table-column prop="name124" label="124°C" min-width="80">
 									</el-table-column>
 								</el-table-column>
 							</el-table>
@@ -241,41 +157,33 @@
 					<div class="chart-table-item">
 						<div class="title">冷却水进水温度及负荷率与时间组合分布图</div>
 						<div class="big-chart">
-							<el-table :data="tableData" style="width: 100%" height="100%">
+							<el-table :data="tableData2" style="width: 100%" height="100%">
 								<el-table-column prop="type" label="负荷率" width="120">
 								</el-table-column>
 								<el-table-column label="冷却水进水温度(°C)">
-									<el-table-column prop="name" label="4°C" min-width="60">
+									<el-table-column prop="name4" label="4°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="20°C" min-width="60">
+									<el-table-column prop="name20" label="20°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="22°C" min-width="60">
+									<el-table-column prop="name22" label="22°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="24°C" min-width="60">
+									<el-table-column prop="name24" label="24°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="26°C" min-width="60">
+									<el-table-column prop="name26" label="26°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="28°C" min-width="60">
+									<el-table-column prop="name28" label="28°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="30°C" min-width="60">
+									<el-table-column prop="name30" label="30°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="32°C" min-width="60">
+									<el-table-column prop="name32" label="32°C" min-width="60">
 									</el-table-column>
-									<el-table-column prop="name" label="124°C" min-width="80">
+									<el-table-column prop="name124" label="124°C" min-width="80">
 									</el-table-column>
 								</el-table-column>
 							</el-table>
 						</div>
 					</div>
 				</div>
-				<div class="conservation-select combination-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 class="conservation-chart">
 					<div class="chart-item">
 						<div class="chart-title">
@@ -366,132 +274,106 @@
 </template>
 
 <script>
+	import {
+		getEnergyDeviceList
+	} from '@/httpApi/test'
 	export default {
 		data() {
 			return {
 				value: '',
 				value1: [],
-				tableData: [{
-					type: '0%',
-					name: 10,
-				}, {
-					type: '10%',
-					name: 10,
-				}, {
-					type: '20%',
-					name: 10,
-				}, {
-					type: '30%',
-					name: 10,
-				}, {
-					type: '40%',
-					name: 10,
-				}, {
-					type: '50%',
-					name: 10,
-				}, {
-					type: '60%',
-					name: 10,
-				}, {
-					type: '70%',
-					name: 10,
-				}, {
-					type: '80%',
-					name: 10,
-				}, {
-					type: '90%',
-					name: 10,
-				}, {
-					type: '100%',
-					name: 10,
-				}, {
-					type: '时间权重总汇',
-					name: 10,
-				}, {
-					type: '总时长(H)',
-					name: 10,
-				}]
+				tableData1: [],
+				tableData2: [],
+				chartData: [],
+				list: []
 			}
 		},
 		created() {
 			this.$nextTick(() => {
-				this.chart(this.$refs.chart1, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4]
-				], ['#3371FF', '#06E0E9'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7', '类目8', '类目9',
-					'类目10'
-				])
-				this.chart(this.$refs.chart2, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4]
-				], ['#3371FF', '#06E0E9'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7', '类目8', '类目9',
-					'类目10'
-				])
-				this.chart(this.$refs.chart3, [
-					[1, 3, 2, 6, 1, 1],
-					[2, 3, 1, 4, 4, 2],
-					[3, 2, 1, 5, 3, 3],
-				], ['#06E0E9', '#F04243', '#2DB85C'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6'])
-				this.chart(this.$refs.chart4, [
-					[1, 3, 2, 6, 1, 1],
-					[2, 3, 1, 4, 4, 2],
-					[3, 2, 1, 5, 3, 3],
-				], ['#06E0E9', '#F04243', '#2DB85C'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6'])
-				this.chart(this.$refs.chart5, [
-					[1, 3, 2, 6, 1, 1],
-					[2, 3, 1, 4, 4, 2],
-					[3, 2, 1, 5, 3, 3],
-				], ['#06E0E9', '#F04243', '#2DB85C'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6'])
-				this.chart(this.$refs.chart6, [
-					[1, 3, 2, 6, 1, 1],
-					[2, 3, 1, 4, 4, 2],
-					[3, 2, 1, 5, 3, 3],
-				], ['#06E0E9', '#F04243', '#2DB85C'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6'])
-				this.chart(this.$refs.chart7, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4]
-				], ['#3371FF', '#06E0E9'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7', '类目8', '类目9',
-					'类目10'
-				], 'bar', [2, 3, 1, 4, 4, 2, 3, 1, 4, 4])
-				this.chart(this.$refs.chart8, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4]
-				], ['#3371FF', '#06E0E9'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7', '类目8', '类目9',
-					'类目10'
-				])
-				this.chart2(this.$refs.chart9);
-				this.chart2(this.$refs.chart10);
-				this.chart(this.$refs.chart11, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4],
-					[3, 4, 3, 4, 5, 3, 2, 3, 1, 3]
-				], ['#3371FF', '#06E0E9', '#F9B115'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7',
-					'类目8', '类目9', '类目10'
-				])
-				this.chart(this.$refs.chart12, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4],
-					[3, 4, 3, 4, 5, 3, 2, 3, 1, 3]
-				], ['#3371FF', '#06E0E9', '#F9B115'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7',
-					'类目8', '类目9', '类目10'
-				])
-				this.chart(this.$refs.chart13, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4],
-					[3, 4, 3, 4, 5, 3, 2, 3, 1, 3]
-				], ['#3371FF', '#06E0E9', '#F9B115'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7',
-					'类目8', '类目9', '类目10'
-				])
-				this.chart(this.$refs.chart14, [
-					[1, 3, 2, 6, 1, 1, 3, 2, 6, 1],
-					[2, 3, 1, 4, 4, 2, 3, 1, 4, 4],
-					[3, 4, 3, 4, 5, 3, 2, 3, 1, 3]
-				], ['#3371FF', '#06E0E9', '#F9B115'], ['类目1', '类目2', '类目3', '类目4', '类目5', '类目6', '类目7',
-					'类目8', '类目9', '类目10'
-				])
+				console.log(this.tableData);
+				this.init();
 			})
 		},
 		methods: {
+			init() {
+				getEnergyDeviceList({
+					projectId: this.$store.getters.project.id,
+					type: 16
+				}).then(res => {
+					if (res.state) {
+						this.chartData = res.data;
+						let data1 = this.returnData('输配侧', '1');
+						if (data1.length > 0) {
+							this.chart(this.$refs.chart1, JSON.parse(data1[0].column1), JSON.parse(data1[0]
+								.column2), JSON.parse(data1[0].column3))
+						}
+						let data2 = this.returnData('输配侧', '2');
+						if (data2.length > 0) {
+							this.chart(this.$refs.chart2, JSON.parse(data2[0].column1), JSON.parse(data2[0]
+								.column2), JSON.parse(data2[0].column3))
+						}
+						this.list = this.returnData('冷却塔');
+						this.$nextTick(() => {
+							for (let i = 0; i < this.list.length; i++) {
+								this.chart(this.$refs['charts' + i][0], JSON.parse(this.list[i].column1),
+									JSON.parse(this.list[i].column2), JSON.parse(this.list[i].column3))
+							}
+						})
+						let data7 = this.returnData('输配侧', '3');
+						if (data7.length > 0) {
+							this.chart(this.$refs.chart7, JSON.parse(data7[0].column1), JSON.parse(data7[0]
+								.column2), JSON.parse(data7[0].column3))
+						}
+						let data8 = this.returnData('输配侧', '4');
+						if (data8.length > 0) {
+							this.chart(this.$refs.chart8, JSON.parse(data8[0].column1), JSON.parse(data8[0]
+								.column2), JSON.parse(data8[0].column3))
+						}
+						let data9 = this.returnData('设备侧', '5');
+						if (data9.length > 0) {
+							this.chart2(this.$refs.chart9, JSON.parse(data9[0].column2), JSON.parse(data9[0]
+								.column3), JSON.parse(data9[0].column1))
+						}
+						let data10 = this.returnData('设备侧', '6');
+						if (data10.length > 0) {
+							this.chart2(this.$refs.chart10, JSON.parse(data10[0].column2), JSON.parse(data10[0]
+								.column3), JSON.parse(data10[0].column1))
+						}
+						let data11 = this.returnData('设备侧', '1');
+						if (data11.length > 0) {
+							this.chart(this.$refs.chart11, JSON.parse(data11[0].column1), JSON.parse(data11[0]
+								.column2), JSON.parse(data11[0].column3))
+						}
+						let data12 = this.returnData('设备侧', '2');
+						if (data12.length > 0) {
+							this.chart(this.$refs.chart12, JSON.parse(data12[0].column1), JSON.parse(data12[0]
+								.column2), JSON.parse(data12[0].column3))
+						}
+						let data13 = this.returnData('设备侧', '3');
+						if (data13.length > 0) {
+							this.chart(this.$refs.chart13, JSON.parse(data13[0].column1), JSON.parse(data13[0]
+								.column2), JSON.parse(data13[0].column3))
+						}
+						let data14 = this.returnData('设备侧', '4');
+						if (data14.length > 0) {
+							this.chart(this.$refs.chart14, JSON.parse(data14[0].column1), JSON.parse(data14[0]
+								.column2), JSON.parse(data14[0].column3))
+						}
+						let data15 = this.returnData('设备侧', '7');
+						if (data15.length > 0) {
+							this.tableData1 = JSON.parse(data15[0].column1)
+						}
+						let data16 = this.returnData('设备侧', '8');
+						if (data16.length > 0) {
+							this.tableData2 = JSON.parse(data16[0].column1)
+						}
+					}
+				})
+			},
+			returnData(name, type) {
+				if (!type) return this.chartData.filter(node => node.data === name);
+				return this.chartData.filter(node => node.name === name && node.data === type);
+			},
 			chart(elem, data, color, x, type, data1) {
 				let chart = echarts.init(elem);
 				let series = [];
@@ -595,87 +477,8 @@
 				};
 				chart.setOption(option);
 			},
-			chart2(elem) {
+			chart2(elem, hours, days, data) {
 				let chart = echarts.init(elem);
-				// prettier-ignore
-				var hours = ['12a', '1a', '2a', '3a', '4a', '5a', '6a',
-					'7a', '8a', '9a', '10a', '11a',
-					'12p', '1p', '2p', '3p', '4p', '5p',
-					'6p', '7p', '8p', '9p', '10p', '11p'
-				];
-				// prettier-ignore
-				var days = ['Saturday', 'Friday', 'Thursday',
-					'Wednesday', 'Tuesday', 'Monday', 'Sunday'
-				];
-				// prettier-ignore
-				var data = [
-					[0, 10, 0],
-					[0, 11, 2],
-					[0, 12, 4],
-					[0, 13, 1],
-					[0, 14, 1],
-					[0, 15, 3],
-					[0, 16, 4],
-					[0, 17, 6],
-					[0, 18, 4],
-					[0, 19, 4],
-					[0, 20, 3],
-					[0, 21, 3],
-					[0, 22, 2],
-					[0, 23, 5],
-					[1, 0, 7],
-					[1, 1, 0],
-					[1, 2, 0],
-					[1, 3, 0],
-					[1, 4, 0],
-					[1, 5, 0],
-					[1, 6, 0],
-					[1, 7, 0],
-					[1, 8, 0],
-					[1, 9, 0],
-					[1, 10, 5],
-					[1, 23, 2],
-					[2, 0, 1],
-					[2, 1, 1],
-					[2, 14, 8],
-					[2, 15, 10],
-					[2, 16, 6],
-					[2, 17, 5],
-					[2, 18, 5],
-					[2, 19, 5],
-					[2, 20, 7],
-					[2, 21, 4],
-					[2, 22, 2],
-					[2, 23, 4],
-					[3, 0, 7],
-					[3, 1, 3],
-					[3, 2, 0],
-					[3, 3, 0],
-					[3, 4, 0],
-					[3, 5, 0],
-					[3, 6, 0],
-					[3, 7, 0],
-					[3, 20, 6],
-					[3, 21, 4],
-					[3, 22, 4],
-					[3, 23, 1],
-					[4, 0, 1],
-					[4, 1, 3],
-					[4, 2, 0],
-					[4, 20, 3],
-					[4, 21, 7],
-					[4, 22, 3],
-					[4, 23, 0],
-					[5, 8, 2],
-					[5, 9, 0],
-					[5, 10, 4],
-					[5, 11, 1],
-					[5, 12, 5],
-					[5, 13, 10],
-					[5, 14, 5],
-					[5, 15, 7],
-					[5, 16, 11],
-				];
 				let option = {
 					tooltip: {},
 					visualMap: {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/index.html


virgo.wzfrontend/src/main/resources/static/console/static/css/1271.4e4fcddb.css → virgo.wzfrontend/src/main/resources/static/console/static/css/6091.4e4fcddb.css


virgo.wzfrontend/src/main/resources/static/console/static/css/566.4e4fcddb.css → virgo.wzfrontend/src/main/resources/static/console/static/css/7866.4e4fcddb.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1271-legacy.b63a885f.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1271.07fab09a.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/566-legacy.3469210b.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/566.a40baf10.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/6091-legacy.fe9c3980.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/6091.71e9b7af.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/7866-legacy.27b70d53.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/7866.f95169cd.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.679f6118.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/app.328c7760.js