whx il y a 5 mois
Parent
commit
928bafffb0
71 fichiers modifiés avec 246 ajouts et 238 suppressions
  1. 1 1
      virgo.wzfrontend/console/src/components/work/common/testAlarm.vue
  2. 1 1
      virgo.wzfrontend/console/src/httpApi/test.js
  3. 203 195
      virgo.wzfrontend/console/src/views/work/energy/water/hvac/coldsource.vue
  4. 1 1
      virgo.wzfrontend/src/main/resources/static/console/index.html
  5. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/css/5903.2ae46d4c.css
  6. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/css/8043.2ae46d4c.css
  7. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/1037-legacy.d66a4a21.js
  8. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/1171-legacy.f3b9409d.js
  9. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/1216-legacy.807de6da.js
  10. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/1216.54f76e13.js
  11. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/1368.9dd896ca.js
  12. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/1953.1e2d5930.js
  13. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/2314.f56a4738.js
  14. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/252-legacy.97b77e5e.js
  15. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/252.f00ab650.js
  16. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/260.01d66b9d.js
  17. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/2623-legacy.1c78a7ec.js
  18. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/287-legacy.c4bd63e3.js
  19. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/3028.75646d43.js
  20. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/3427.313f8dfe.js
  21. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/3475-legacy.0f7be815.js
  22. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/368.19ef65b0.js
  23. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/3889-legacy.a82c6089.js
  24. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/3911.0d02635c.js
  25. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/4027.f3740d92.js
  26. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/4135-legacy.4913fb00.js
  27. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4612-legacy.7ce2b8e0.js
  28. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4755-legacy.325721e0.js
  29. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/483.e9d9af18.js
  30. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4937-legacy.7b57abb4.js
  31. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/532-legacy.4cb174f2.js
  32. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/5644.b30f101d.js
  33. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/5903.b0e9a6da.js
  34. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/618-legacy.380db165.js
  35. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6654-legacy.0cf56adc.js
  36. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6720-legacy.66fd4d0a.js
  37. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/6742.97e6a669.js
  38. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6789.18ff18d2.js
  39. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/6849-legacy.8ca1dbb4.js
  40. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/6849.6ea406d2.js
  41. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6946-legacy.29a268b2.js
  42. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6957.d7e98ac9.js
  43. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/7099-legacy.48218c34.js
  44. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7110.a0327f0a.js
  45. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7236.5b0b47b1.js
  46. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7342-legacy.5982d60e.js
  47. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7470-legacy.eb2b2cec.js
  48. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7528.3c912314.js
  49. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7870.fd044143.js
  50. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/8043-legacy.4d21eca9.js
  51. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/8095-legacy.f1b52b67.js
  52. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/8184-legacy.9031ef89.js
  53. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/8223.743e14ff.js
  54. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/8257-legacy.7c30cbb4.js
  55. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/8261-legacy.688d7a05.js
  56. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/8261.08b43dc5.js
  57. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/83.65a83472.js
  58. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/8446.2ac826d7.js
  59. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/8551.163580ff.js
  60. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/882-legacy.801f9cc3.js
  61. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9015.2a46b15f.js
  62. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/9019-legacy.66b4948f.js
  63. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/943-legacy.49c5b68e.js
  64. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/943.2541603f.js
  65. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/959.908456cb.js
  66. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/9600-legacy.9ce5d567.js
  67. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/9743-legacy.aa210943.js
  68. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9864.569f141c.js
  69. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.6e39654b.js
  70. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.aa7a311c.js
  71. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/app.1a92d48c.js

+ 1 - 1
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.电梯
+				//type 14.供配电 15.电梯机房 16.电梯 17.冷源设备 18.冷源设备试试监控
 				let postData = {
 					type: this.type,
 					projectId: this.$store.getters.project.id

+ 1 - 1
virgo.wzfrontend/console/src/httpApi/test.js

@@ -344,7 +344,7 @@ export function updateEnergyDevice(data) {
 	})
 }
 /* 
- * 批量更新能源设备状
+ * 批量更新能源设备状
  * 
  * 
  */

+ 203 - 195
virgo.wzfrontend/console/src/views/work/energy/water/hvac/coldsource.vue

@@ -9,7 +9,7 @@
 				<div class="count-image count-image1"></div>
 				<div class="count-label">
 					<span class="count-name">设备健康度</span>
-					<span class="count-number alibaba">99</span>
+					<span class="count-number alibaba">{{testCount.column1}}</span>
 					<span class="count-unit">分</span>
 				</div>
 			</div>
@@ -17,50 +17,23 @@
 				<div class="count-image count-image2"></div>
 				<div class="count-label">
 					<span class="count-name">故障设备</span>
-					<span class="count-number alibaba">0</span>
+					<span class="count-number alibaba">{{testCount.offline}}</span>
 					<span class="count-unit">台</span>
 				</div>
 			</div>
 			<div class="chart-table">
-				<div class="chart-tr">
+				<div class="chart-tr title">
 					<span class="chart-name">设备名称</span>
 					<span class="chart-label">故障内容</span>
 					<span class="chart-date">故障时间</span>
 				</div>
-				<div class="chart-tr">
-					<span class="chart-name">设备名称</span>
-					<span class="chart-label">故障原因导致的</span>
-					<span class="chart-date">2023-12-13</span>
-				</div>
-				<div class="chart-tr">
-					<span class="chart-name">设备名称</span>
-					<span class="chart-label">故障原因导致的</span>
-					<span class="chart-date">2023-12-13</span>
-				</div>
-				<div class="chart-tr">
-					<span class="chart-name">设备名称</span>
-					<span class="chart-label">故障原因导致的</span>
-					<span class="chart-date">2023-12-13</span>
-				</div>
-				<div class="chart-tr">
-					<span class="chart-name">设备名称</span>
-					<span class="chart-label">故障原因导致的</span>
-					<span class="chart-date">2023-12-13</span>
-				</div>
-				<div class="chart-tr">
-					<span class="chart-name">设备名称</span>
-					<span class="chart-label">故障原因导致的</span>
-					<span class="chart-date">2023-12-13</span>
-				</div>
-				<div class="chart-tr">
-					<span class="chart-name">设备名称</span>
-					<span class="chart-label">故障原因导致的</span>
-					<span class="chart-date">2023-12-13</span>
-				</div>
-				<div class="chart-tr">
-					<span class="chart-name">设备名称</span>
-					<span class="chart-label">故障原因导致的</span>
-					<span class="chart-date">2023-12-13</span>
+				<empty width="80" description="暂无故障记录" style="margin: 20px 0;" v-if="list.length === 0"></empty>
+				<div v-else style="min-height: 128px;">
+					<div class="chart-tr" v-for="(item,index) in list" :key="index">
+						<span class="chart-name">{{item.deviceName}}</span>
+						<span class="chart-label">{{item.info}}</span>
+						<span class="chart-date">{{$dayjs(item.date).format('YYYY-MM-DD')}}</span>
+					</div>
 				</div>
 			</div>
 			<div class="hui-chart-title">
@@ -70,14 +43,14 @@
 				<div class="now-item">
 					<div class="now-title">实时制冷量</div>
 					<div class="now-label">
-						<span class="count-number alibaba">12</span>
+						<span class="count-number alibaba">{{nowData.totalNumber}}</span>
 						<span class="count-unit">kw</span>
 					</div>
 				</div>
 				<div class="now-item">
 					<div class="now-title">实时排热量</div>
 					<div class="now-label">
-						<span class="count-number alibaba">12</span>
+						<span class="count-number alibaba">{{nowData.online}}</span>
 						<span class="count-unit">kw</span>
 					</div>
 				</div>
@@ -86,14 +59,14 @@
 				<div class="now-item">
 					<div class="now-title">实时总耗功率</div>
 					<div class="now-label">
-						<span class="count-number alibaba">12</span>
+						<span class="count-number alibaba">{{nowData.offline}}</span>
 						<span class="count-unit">kw</span>
 					</div>
 				</div>
 				<div class="now-item">
 					<div class="now-title">热平衡度</div>
 					<div class="now-label">
-						<span class="count-number alibaba">45</span>
+						<span class="count-number alibaba">{{nowData.column1}}</span>
 						<span class="count-unit">%</span>
 					</div>
 				</div>
@@ -104,25 +77,10 @@
 			<div class="chart-box">
 				<div ref="cold" class="chart-cold"></div>
 				<div class="chart-legend">
-					<div class="legend-item">
-						<span class="dage"></span>
-						<span class="name">冷水机组</span>
-						<span class="number">2 23.5%</span>
-					</div>
-					<div class="legend-item">
-						<span class="dage"></span>
-						<span class="name">冷冻水泵</span>
-						<span class="number">8 45%</span>
-					</div>
-					<div class="legend-item">
-						<span class="dage"></span>
-						<span class="name">冷却水泵</span>
-						<span class="number">1 20%</span>
-					</div>
-					<div class="legend-item">
+					<div class="legend-item" v-for="item in testList" :key="index">
 						<span class="dage"></span>
-						<span class="name">冷却塔</span>
-						<span class="number">3 25.5%</span>
+						<span class="name">{{item.name}}</span>
+						<span class="number">{{item.value}}</span>
 					</div>
 				</div>
 			</div>
@@ -132,7 +90,7 @@
 			<div class="real-time-label">
 				<div class="real-time-key">冷冻总管流量计</div>
 				<div class="real-time-value">
-					<span class="number alibaba">6.39</span>
+					<span class="number alibaba">{{coldPumpNumber}}</span>
 					kw
 				</div>
 			</div>
@@ -191,15 +149,13 @@
 						冷战能效
 					</div>
 					<div class="cold-energy-value">
-						<span class="color-cyan">优</span>
-						<span class="number alibaba">6.17</span>
+						<span :class="reurnStateColor(num)">{{reurnStateColor(num,1)}}</span>
+						<span class="number alibaba">{{num}}</span>
 						<span class="unit">kw</span>
 					</div>
 				</div>
 			</div>
-			<div class="hui-chart-title">
-				冷水机组
-			</div>
+			<div class="hui-chart-title">冷水机组</div>
 			<div class="cold-water">
 				<div class="cold-water-title">
 					<div class="cold-water-label">
@@ -224,116 +180,44 @@
 						<img src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/57e5b1c42af4477f8db041d4aea8fea5"
 							alt="" />
 					</div>
-					<div class="cold-water-list">
-						<div class="cold-water-item">
-							<span class="cold-water-count">1#</span>
-							<span class="cold-water-content">
-								COU
-								<span class="color-yellow">3.25</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">
-								COU
-								<span class="color-red">1.22</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">
-								COU
-								<span class="color-cyan">5</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">
-								COU
-								<span class="color-blue">4.5</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>
+					<div class="cold-water-list hui-no-tips" v-if="coldGroup.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 coldGroup" :key="item.id">
+							<span class="cold-water-count">{{item.name}}</span>
 							<span class="cold-water-content">
-								COU
-								<span class="color-red">0</span>
+								<span :class="reurnStateColor(item.column1)">{{item.column1}}</span>
 							</span>
 							<span class="cold-water-operation">
-								<el-switch v-model="value2">
+								<el-switch v-model="item.state" :active-value="1" :inactive-value="2"
+									@change="value=>changeDoor(value,item)">
 								</el-switch>
 							</span>
 						</div>
 					</div>
 				</div>
 			</div>
-			<div class="hui-chart-title">
-				冷却塔
-			</div>
+			<div class="hui-chart-title">冷却塔</div>
 			<div class="cold-water">
 				<div class="cold-water-box">
 					<div class="cold-water-image">
 						<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>3.25</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>1.22</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>5</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>
+					<div class="cold-water-list hui-no-tips" v-if="coldTower.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 coldTower" :key="item.id">
+							<span class="cold-water-count">{{item.name}}</span>
 							<span class="cold-water-content">
-								换热效率
-								<span>4.5</span>
+								效率
+								<span>{{item.column1}}</span>
 							</span>
 							<span class="cold-water-operation">
-								<el-switch v-model="value2">
+								<el-switch v-model="item.state" :active-value="1" :inactive-value="2"
+									@change="value=>changeDoor(value,item)">
 								</el-switch>
 							</span>
 						</div>
@@ -345,28 +229,165 @@
 </template>
 
 <script>
+	import {
+		getDeviceCountList,
+		getDeviceAlarmList,
+		getEnergyDeviceList,
+		updateEnergyDevice
+	} from '@/httpApi/test'
 	import model from '@/components/work/common/model'
 	export default {
 		data() {
 			return {
-				value1: true,
-				value2: false,
+				list: [],
+				testCount: {
+					column1: 0,
+					offline: 0
+				},
+				coldGroup: [],
+				coldTower: [],
+				coldPump: [],
+				coldPumpNumber: 0,
+				num: 0,
+				testList: [],
+				nowData: {
+					column1: 0,
+					totalNumber: 0,
+					online: 0,
+					offline: 0
+				}
 			}
 		},
 		created() {
 			this.$nextTick(() => {
-				this.chartCold();
-				this.chartEnergy({
-					min: 0,
-					max: 10,
-					value: 5
-				});
+				this.init();
 			})
 		},
 		components: {
 			model
 		},
 		methods: {
+			init() {
+				getDeviceCountList({
+					type: 18,
+					projectId: this.$store.getters.project.id
+				}).then(res => {
+					if (res.state) {
+						this.nowData = res.data[0] ? res.data[0] : {
+							column1: 0,
+							totalNumber: 0,
+							online: 0,
+							offline: 0
+						}
+					}
+				})
+				getDeviceCountList({
+					type: 17,
+					projectId: this.$store.getters.project.id
+				}).then(res => {
+					if (res.state) {
+						this.testCount = res.data[0] ? res.data[0] : {
+							column1: 0,
+							offline: 0
+						}
+					}
+				})
+				getDeviceAlarmList({
+					type: 17,
+					projectId: this.$store.getters.project.id
+				}).then(res => {
+					if (res.state) {
+						this.list = res.data;
+					}
+				})
+				getEnergyDeviceList({
+					type: 6,
+					projectId: this.$store.getters.project.id
+				}).then(res => {
+					if (res.state) {
+						let data = res.data;
+						this.testChart(data);
+						this.coldGroup = data.filter(node => node.column3 === '冷水机组');
+						this.coldTower = data.filter(node => node.column3 === '冷却塔');
+						this.coldPump = data.filter(node => node.column3 === '冷冻水泵');
+						if (this.coldGroup.length > 0) {
+							let number = 0;
+							for (let i = 0; i < this.coldGroup.length; i++) {
+								number += Number(this.coldGroup[i].column1);
+							}
+							this.num = Math.round((number / this.coldGroup.length) * 100) / 100;
+						}
+						this.chartEnergy({
+							min: 0,
+							max: 10,
+							value: this.num
+						});
+						if (this.coldPump.length > 0) {
+							let number = 0;
+							for (let i = 0; i < this.coldPump.length; i++) {
+								number += Number(this.coldPump[i].column1);
+							}
+							this.coldPumpNumber = number;
+						}
+					}
+				})
+			},
+			reurnStateColor(num, type) {
+				let colorClass = '',
+					str = '';
+				if (num > 5.02) {
+					colorClass = 'color-cyan';
+					str = '优';
+				} else if (num > 4.14 && num <= 5.02) {
+					colorClass = 'color-blue';
+					str = '良';
+				} else if (num > 3.52 && num <= 4.14) {
+					colorClass = 'color-orange';
+					str = '一般';
+				} else if (num <= 3.52) {
+					colorClass = 'color-red';
+					str = '需改善';
+				}
+				return type === 1 ? str : colorClass;
+			},
+			changeDoor(value, item) {
+				updateEnergyDevice({
+					id: item.id,
+					state: value
+				}).then(res => {
+					if (res.state) {
+						this.$message.success('操作成功');
+						getEnergyDeviceList({
+							type: 6,
+							projectId: this.$store.getters.project.id
+						}).then(res => {
+							if (res.state) {
+								let data = res.data;
+								this.coldGroup = data.filter(node => node.column3 === '冷水机组');
+								this.coldTower = data.filter(node => node.column3 === '冷却塔');
+							}
+						})
+					}
+				})
+			},
+			testChart(data) {
+				let obj = {},
+					list = [];
+				for (let i = 0; i < data.length; i++) {
+					if (!obj[data[i].column3]) {
+						obj[data[i].column3] = 1;
+						list.push({
+							name: data[i].column3,
+							value: 0,
+						})
+					}
+					list.find(node => node.name == data[i].column3).value++;
+				}
+				this.testList = list;
+				let title = list[0].name;
+				let len = list[0].value;
+				this.chartCold(title, ((len / data.length) * 100).toFixed(2).padStart(5, '0'), list);
+			},
 			chartEnergy(data) {
 				let chart = echarts.init(this.$refs.energy);
 				let option = {
@@ -382,9 +403,9 @@
 							lineStyle: {
 								width: 10,
 								color: [
-									[0.3, '#F04243'],
-									[0.5, '#FEBC00'],
-									[0.8, '#25AAFE'],
+									[0.352, '#F04243'],
+									[0.414, '#FEBC00'],
+									[0.502, '#25AAFE'],
 									[1, '#06E0E9']
 								]
 							}
@@ -458,9 +479,9 @@
 							lineStyle: {
 								width: 10,
 								color: [
-									[0.3, '#F04243'],
-									[0.5, '#FEBC00'],
-									[0.8, '#25AAFE'],
+									[0.352, '#F04243'],
+									[0.414, '#FEBC00'],
+									[0.502, '#25AAFE'],
 									[1, '#06E0E9']
 								]
 							}
@@ -497,10 +518,8 @@
 				};
 				chart.setOption(option);
 			},
-			chartCold() {
+			chartCold(title, len, data) {
 				let chart = echarts.init(this.$refs.cold);
-				let title = '冷水机组',
-					len = "23.5"
 				let option = {
 					title: {
 						text: ("{name|" + title + "}" + "\n{percent|" + len + "%}"),
@@ -544,11 +563,11 @@
 						]),
 						new echarts.graphic.LinearGradient(1, 1, 0, 0, [{
 								offset: 0,
-								color: "transparent"
+								color: "#95C0FF"
 							},
 							{
 								offset: 1,
-								color: "#95C0FF"
+								color: "transparent"
 							}
 						]),
 						new echarts.graphic.LinearGradient(0, 1, 1, 1, [{
@@ -594,23 +613,7 @@
 						labelLine: {
 							show: false
 						},
-						data: [{
-								value: 3,
-								name: "冷水机组"
-							},
-							{
-								value: 2,
-								name: "冷冻水泵"
-							},
-							{
-								value: 1,
-								name: "冷却水泵"
-							},
-							{
-								value: 1,
-								name: "冷却塔"
-							}
-						]
+						data: data
 					}]
 				};
 				chart.setOption(option);
@@ -689,7 +692,8 @@
 			}
 
 			.cold-water-image {
-				padding-left: 10px;
+				width: 76px;
+				text-align: center;
 			}
 
 			.cold-water-list {
@@ -1011,9 +1015,13 @@
 				font-size: 12px;
 				line-height: 32px;
 				padding: 0 10px;
+
+				&.title {
+					background: rgba(97, 133, 214, 0.08);
+				}
 			}
 
-			.chart-tr:nth-child(2n-1) {
+			.chart-tr:nth-child(2n) {
 				background: rgba(97, 133, 214, 0.08);
 			}
 

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/index.html


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/css/5903.2ae46d4c.css


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/css/8043.2ae46d4c.css


virgo.wzfrontend/src/main/resources/static/console/static/js/1037-legacy.c7b80ece.js → virgo.wzfrontend/src/main/resources/static/console/static/js/1037-legacy.d66a4a21.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1171-legacy.f3b9409d.js


virgo.wzfrontend/src/main/resources/static/console/static/js/1216-legacy.b9d9904a.js → virgo.wzfrontend/src/main/resources/static/console/static/js/1216-legacy.807de6da.js


virgo.wzfrontend/src/main/resources/static/console/static/js/1216.e27062f4.js → virgo.wzfrontend/src/main/resources/static/console/static/js/1216.54f76e13.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1368.9dd896ca.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1953.1e2d5930.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/2314.f56a4738.js


virgo.wzfrontend/src/main/resources/static/console/static/js/252-legacy.01a6edef.js → virgo.wzfrontend/src/main/resources/static/console/static/js/252-legacy.97b77e5e.js


virgo.wzfrontend/src/main/resources/static/console/static/js/252.36e50819.js → virgo.wzfrontend/src/main/resources/static/console/static/js/252.f00ab650.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/260.01d66b9d.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/2623-legacy.1c78a7ec.js


virgo.wzfrontend/src/main/resources/static/console/static/js/287-legacy.4dd7e7a1.js → virgo.wzfrontend/src/main/resources/static/console/static/js/287-legacy.c4bd63e3.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/3028.75646d43.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/3427.313f8dfe.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/3475-legacy.0f7be815.js


virgo.wzfrontend/src/main/resources/static/console/static/js/368.25057958.js → virgo.wzfrontend/src/main/resources/static/console/static/js/368.19ef65b0.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/3889-legacy.a82c6089.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/3911.0d02635c.js


virgo.wzfrontend/src/main/resources/static/console/static/js/4027.25f633bb.js → virgo.wzfrontend/src/main/resources/static/console/static/js/4027.f3740d92.js


virgo.wzfrontend/src/main/resources/static/console/static/js/4135-legacy.2a65a23f.js → virgo.wzfrontend/src/main/resources/static/console/static/js/4135-legacy.4913fb00.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4612-legacy.7ce2b8e0.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4755-legacy.325721e0.js


virgo.wzfrontend/src/main/resources/static/console/static/js/483.78f4075e.js → virgo.wzfrontend/src/main/resources/static/console/static/js/483.e9d9af18.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4937-legacy.7b57abb4.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/532-legacy.4cb174f2.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/5644.b30f101d.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/5903.b0e9a6da.js


virgo.wzfrontend/src/main/resources/static/console/static/js/618-legacy.a5b2abd6.js → virgo.wzfrontend/src/main/resources/static/console/static/js/618-legacy.380db165.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6654-legacy.0cf56adc.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6720-legacy.66fd4d0a.js


virgo.wzfrontend/src/main/resources/static/console/static/js/6742.1d4ff6c8.js → virgo.wzfrontend/src/main/resources/static/console/static/js/6742.97e6a669.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6789.18ff18d2.js


virgo.wzfrontend/src/main/resources/static/console/static/js/6849-legacy.22117e43.js → virgo.wzfrontend/src/main/resources/static/console/static/js/6849-legacy.8ca1dbb4.js


virgo.wzfrontend/src/main/resources/static/console/static/js/6849.da2399dc.js → virgo.wzfrontend/src/main/resources/static/console/static/js/6849.6ea406d2.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6946-legacy.29a268b2.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6957.d7e98ac9.js


virgo.wzfrontend/src/main/resources/static/console/static/js/7099-legacy.bee84812.js → virgo.wzfrontend/src/main/resources/static/console/static/js/7099-legacy.48218c34.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7110.a0327f0a.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7236.5b0b47b1.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7342-legacy.5982d60e.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7470-legacy.eb2b2cec.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7528.3c912314.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7870.fd044143.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/8043-legacy.4d21eca9.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/8095-legacy.f1b52b67.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/8184-legacy.9031ef89.js


virgo.wzfrontend/src/main/resources/static/console/static/js/8223.e8238bfd.js → virgo.wzfrontend/src/main/resources/static/console/static/js/8223.743e14ff.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/8257-legacy.7c30cbb4.js


virgo.wzfrontend/src/main/resources/static/console/static/js/8261-legacy.8f3a2cfc.js → virgo.wzfrontend/src/main/resources/static/console/static/js/8261-legacy.688d7a05.js


virgo.wzfrontend/src/main/resources/static/console/static/js/8261.2e373d23.js → virgo.wzfrontend/src/main/resources/static/console/static/js/8261.08b43dc5.js


virgo.wzfrontend/src/main/resources/static/console/static/js/83.9265f00c.js → virgo.wzfrontend/src/main/resources/static/console/static/js/83.65a83472.js


virgo.wzfrontend/src/main/resources/static/console/static/js/8446.5229b6e9.js → virgo.wzfrontend/src/main/resources/static/console/static/js/8446.2ac826d7.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/8551.163580ff.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/882-legacy.801f9cc3.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9015.2a46b15f.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/9019-legacy.66b4948f.js


virgo.wzfrontend/src/main/resources/static/console/static/js/943-legacy.30fa62ad.js → virgo.wzfrontend/src/main/resources/static/console/static/js/943-legacy.49c5b68e.js


virgo.wzfrontend/src/main/resources/static/console/static/js/943.5bb227ba.js → virgo.wzfrontend/src/main/resources/static/console/static/js/943.2541603f.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/959.908456cb.js


virgo.wzfrontend/src/main/resources/static/console/static/js/9600-legacy.0a1a2de1.js → virgo.wzfrontend/src/main/resources/static/console/static/js/9600-legacy.9ce5d567.js


virgo.wzfrontend/src/main/resources/static/console/static/js/9743-legacy.cccc9ddf.js → virgo.wzfrontend/src/main/resources/static/console/static/js/9743-legacy.aa210943.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9864.569f141c.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.6e39654b.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.aa7a311c.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/app.1a92d48c.js