2023-02-08 update

1. sis zhfx 升压站上面的图中  点位获取数据变动  done
2. sis 升压站弹框  右侧字体颜色调亮  弹框取消滚动   done
3. sis monitor/windsite/map 升压站的下一个图标   注释掉光伏场站   done

src/views/WindSite/components/boosterstation/directScreen.vue

@@ -234,7 +234,7 @@ export default {
 			// line-height: 40px;
 			margin-bottom: 20px;
 			background-image: linear-gradient(to bottom, rgb(145, 145, 240),rgb(245, 245, 245),rgb(145, 145, 233));
-			color: rgb(59, 59, 230);
+			color: rgb(0, 0, 179);
 			font-size: 16px;
 			text-align: center;
 			border-radius: 6px;
@@ -245,7 +245,7 @@ export default {
 			justify-content: center;
 			&[data-active='true']{
 				background-image: linear-gradient(to bottom, red,rgb(243, 136, 128),red);
-				color: rgb(243, 193, 28);
+				color: rgb(255, 196, 0);
 			}
 		}
 	}

src/views/WindSite/components/boosterstation/energy.vue

@@ -273,7 +273,7 @@ export default {
 			// line-height: 40px;
 			margin-bottom: 20px;
 			background-image: linear-gradient(to bottom, rgb(145, 145, 240),rgb(245, 245, 245),rgb(145, 145, 233));
-			color: rgb(59, 59, 230);
+			color: rgb(0, 0, 179);
 			font-size: 16px;
 			text-align: center;
 			border-radius: 6px;
@@ -284,7 +284,7 @@ export default {
 			justify-content: center;
 			&[data-active='true']{
 				background-image: linear-gradient(to bottom, red,rgb(243, 136, 128),red);
-				color: rgb(243, 193, 28);
+				color: rgb(255, 196, 0);
 			}
 		}
 	}

src/views/WindSite/components/boosterstation/publictest.vue

@@ -229,7 +229,7 @@ export default {
 			// line-height: 40px;
 			margin-bottom: 20px;
 			background-image: linear-gradient(to bottom, rgb(145, 145, 240),rgb(245, 245, 245),rgb(145, 145, 233));
-			color: rgb(59, 59, 230);
+			color: rgb(0, 0, 179);
 			font-size: 16px;
 			text-align: center;
 			border-radius: 6px;
@@ -240,7 +240,7 @@ export default {
 			justify-content: center;
 			&[data-active='true']{
 				background-image: linear-gradient(to bottom, red,rgb(243, 136, 128),red);
-				color: rgb(243, 193, 28);
+				color: rgb(255, 196, 0);
 			}
 		}
 	}

src/views/WindSite/components/boosterstation/ups.vue

@@ -4,7 +4,7 @@
 	<div class="d-subtt">主画面</div>
 	<div class="d-pn">
 		<div class="d-pn-tb">
-					<svg width="800" viewbox="0 0 363 447" style="transform: translateX(-290px) translateY(-240px) scale(0.75);" height="800" xmlns="http://www.w3.org/2000/svg">
+					<svg width="800" viewbox="0 0 363 447" style="transform: translateX(-289px) translateY(-250px) scale(0.75);" height="800" xmlns="http://www.w3.org/2000/svg">
 					<line x1="250" y1="350" x2="830" y2="350" stroke="#FFFF33" stroke-width="3" />
 					<line x1="250" y1="460" x2="830" y2="460" stroke="#FFFF33" stroke-width="3" />
 					<line x1="250" y1="570" x2="830" y2="570" stroke="#FFFF33" stroke-width="3" />
@@ -199,7 +199,8 @@ export default {
 	display: flex;
 	border: 2px solid rgba(255,255,255,0.6);
 	.d-pn-tb{
-		width: 44%;
+		width: 88%;
+		overflow: hidden;
 		margin-top: 10px;
 		margin-bottom: 20px;
 		margin-right: 20px;
@@ -238,7 +239,7 @@ export default {
 			// line-height: 40px;
 			margin-bottom: 20px;
 			background-image: linear-gradient(to bottom, rgb(145, 145, 240),rgb(245, 245, 245),rgb(145, 145, 233));
-			color: rgb(59, 59, 230);
+			color: rgb(0, 0, 179);
 			text-align: center;
 			border-radius: 6px;
 			margin-right: 10px;
@@ -248,7 +249,7 @@ export default {
 			justify-content: center;
 			&[data-active='true']{
 				background-image: linear-gradient(to bottom, red,rgb(243, 136, 128),red);
-				color: rgb(243, 193, 28);
+				color: rgb(255, 196, 0);
 			}
 		}
 	}

src/views/WindSite/components/generalappearance/ak.vue

@@ -2,7 +2,7 @@
 	<div>
 		<el-row :gutter="10">
 			<el-col :span="24">
-				<previewPicture v-if="datas">
+				<previewPicture v-if="datas.length">
 					<template v-slot:svg>
 						<svg class="svg" style="transform:scale(2) translateY(200px) translateX(50px);" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1111.711px" height="550.14px" viewBox="0 0 1111.711 550.14" enable-background="new 0 0 1111.711 550.14" xml:space="preserve">
 						<g id="other">
@@ -232,10 +232,10 @@
 									<text transform="matrix(1 0 0 1 454.0218 167.3525)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[0].gl}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 454.0218 171.9033)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[0].fdl}}</text>
+									<text transform="matrix(1 0 0 1 454.0218 171.9033)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[0].dy}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 454.0218 176.4531)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[0].fs}}</text>
+									<text transform="matrix(1 0 0 1 454.0218 176.4531)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[0].dl}}</text>
 								</g>
 							</g>
 							<g id="_x23_2">
@@ -243,10 +243,10 @@
 									<text transform="matrix(1 0 0 1 485.6522 167.3525)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[1].gl}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 485.6522 171.9033)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[1].fdl}}</text>
+									<text transform="matrix(1 0 0 1 485.6522 171.9033)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[1].dy}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 485.6522 176.4531)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[1].fs}}</text>
+									<text transform="matrix(1 0 0 1 485.6522 176.4531)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[1].dl}}</text>
 								</g>
 							</g>
 							<g id="_x23_3">
@@ -254,10 +254,10 @@
 									<text transform="matrix(1 0 0 1 516.6097 167.3525)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[2].gl}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 516.6097 171.9033)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[2].fdl}}</text>
+									<text transform="matrix(1 0 0 1 516.6097 171.9033)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[2].dy}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 516.6097 176.4531)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[2].fs}}</text>
+									<text transform="matrix(1 0 0 1 516.6097 176.4531)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[2].dl}}</text>
 								</g>
 							</g>
 							<g id="_x23_4">
@@ -265,10 +265,10 @@
 									<text transform="matrix(1 0 0 1 547.5081 167.3525)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[3].gl}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 547.5081 171.9033)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[3].fdl}}</text>
+									<text transform="matrix(1 0 0 1 547.5081 171.9033)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[3].dy}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 547.5081 176.4531)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[3].fs}}</text>
+									<text transform="matrix(1 0 0 1 547.5081 176.4531)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[3].dl}}</text>
 								</g>
 							</g>
 							<g id="_x23_5">
@@ -276,10 +276,10 @@
 									<text transform="matrix(1 0 0 1 453.9871 197.3076)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[4].gl}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 453.9871 201.8574)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[4].fdl}}</text>
+									<text transform="matrix(1 0 0 1 453.9871 201.8574)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[4].dy}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 453.9871 206.4072)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[4].fs}}</text>
+									<text transform="matrix(1 0 0 1 453.9871 206.4072)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[4].dl}}</text>
 								</g>
 							</g>
 							<g id="_x23_6">
@@ -287,10 +287,10 @@
 									<text transform="matrix(1 0 0 1 485.6175 197.3076)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[5].gl}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 485.6175 201.8574)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[5].fdl}}</text>
+									<text transform="matrix(1 0 0 1 485.6175 201.8574)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[5].dy}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 485.6175 206.4072)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[5].fs}}</text>
+									<text transform="matrix(1 0 0 1 485.6175 206.4072)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[5].dl}}</text>
 								</g>
 							</g>
 							<g id="_x23_7">
@@ -298,10 +298,10 @@
 									<text transform="matrix(1 0 0 1 517.2479 197.3076)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[6].gl}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 517.2479 201.8574)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[6].fdl}}</text>
+									<text transform="matrix(1 0 0 1 517.2479 201.8574)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[6].dy}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 517.2479 206.4072)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[6].fs}}</text>
+									<text transform="matrix(1 0 0 1 517.2479 206.4072)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[6].dl}}</text>
 								</g>
 							</g>
 							<g id="_x23_8">
@@ -309,10 +309,10 @@
 									<text transform="matrix(1 0 0 1 548.8783 197.3076)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[7].gl}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 548.8783 201.8574)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[7].fdl}}</text>
+									<text transform="matrix(1 0 0 1 548.8783 201.8574)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[7].dy}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 548.8783 206.4072)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[7].fs}}</text>
+									<text transform="matrix(1 0 0 1 548.8783 206.4072)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[7].dl}}</text>
 								</g>
 							</g>
 							<g id="_x23_9">
@@ -320,10 +320,10 @@
 									<text transform="matrix(1 0 0 1 453.9871 226.8438)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[8].gl}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 453.9871 231.3945)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[8].fdl}}</text>
+									<text transform="matrix(1 0 0 1 453.9871 231.3945)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[8].dy}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 453.9871 235.9443)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[8].fs}}</text>
+									<text transform="matrix(1 0 0 1 453.9871 235.9443)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[8].dl}}</text>
 								</g>
 							</g>
 							<g id="_x23_10">
@@ -331,10 +331,10 @@
 									<text transform="matrix(1 0 0 1 485.617 226.8438)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[9].gl}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 485.617 231.3945)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[9].fdl}}</text>
+									<text transform="matrix(1 0 0 1 485.617 231.3945)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[9].dy}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 485.617 235.9443)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[9].fs}}</text>
+									<text transform="matrix(1 0 0 1 485.617 235.9443)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[9].dl}}</text>
 								</g>
 							</g>
 							<g id="_x23_11">
@@ -342,10 +342,10 @@
 									<text transform="matrix(1 0 0 1 516.5736 226.8438)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[10].gl}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 516.5736 231.3945)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[10].fdl}}</text>
+									<text transform="matrix(1 0 0 1 516.5736 231.3945)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[10].dy}}</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 516.5736 235.9443)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[10].fs}}</text>
+									<text transform="matrix(1 0 0 1 516.5736 235.9443)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.3134">{{datas[10].dl}}</text>
 								</g>
 							</g>
 						</g>
@@ -374,7 +374,7 @@
 				//   graph: null,
 				green: "#02A434",
 				red: "#FF0000",
-				datas: undefined,
+				datas: [],
 				dgIds: [],
 			};
 		},
@@ -382,27 +382,37 @@
 			// 渲染每个机箱的表格参数
 			renderData(data) {
 				// 取出开关的 DOM
-				const switchDom = $("#sc").find("rect");
+				// const switchDom = $("#sc").find("rect");
 				// 遍历数据，首先取出开关单独写逻辑渲染颜色，除了开关以外的就是每个机箱的数据
 				for (let key in data) {
-					// 渲染开关
-					const item = data[key];
-					if (key === "hzj105") {
-						switchDom.eq(0).attr("fill", item ? this.green : this.red);
-					} else if (key === "hzj361") {
-						switchDom.eq(1).attr("fill", item ? this.green : this.red);
-					} else if (key === "hzj362") {
-						switchDom.eq(2).attr("fill", item ? this.green : this.red);
-					} else {
-						const dgDom = $('#alldata').find('#data'+key.slice(3,5)).find('g').eq(parseInt(key.slice(5,7)) - 1).find('text');
-						if (dgDom && key.indexOf("dl") !== -1) {
-							dgDom.eq(0).html(item);
-						} else if (dgDom && key.indexOf("dy") !== -1) {
-							dgDom.eq(1).html(item);
-						} else if (dgDom && key.indexOf("gl") !== -1) {
-							dgDom.eq(2).html(item);
+					const item = data[key]
+					if(this.datas[Number(key.substring(2,4))-1]===undefined){
+						this.datas[Number(key.substring(2,4))-1] = {
+							gl: 0,
+							dy: 0,
+							dl: 0
 						}
 					}
+					this.datas[Number(key.substring(2,4))-1][key.substring(4)] = data[key]
+
+					// 渲染开关
+					// const item = data[key];
+					// if (key === "hzj105") {
+					// 	switchDom.eq(0).attr("fill", item ? this.green : this.red);
+					// } else if (key === "hzj361") {
+					// 	switchDom.eq(1).attr("fill", item ? this.green : this.red);
+					// } else if (key === "hzj362") {
+					// 	switchDom.eq(2).attr("fill", item ? this.green : this.red);
+					// } else {
+					// 	const dgDom = $('#alldata').find('#data'+key.slice(3,5)).find('g').eq(parseInt(key.slice(5,7)) - 1).find('text');
+					// 	if (dgDom && key.indexOf("dl") !== -1) {
+					// 		dgDom.eq(0).html(item);
+					// 	} else if (dgDom && key.indexOf("dy") !== -1) {
+					// 		dgDom.eq(1).html(item);
+					// 	} else if (dgDom && key.indexOf("gl") !== -1) {
+					// 		dgDom.eq(2).html(item);
+					// 	}
+					// }
 				}
 
 				// 给电柜上个色呗
@@ -436,7 +446,7 @@
 		watch: {
 			// 风机数据
 			data(value) {
-				this.datas = value;
+				// this.datas = value;
 			},
 
 			// 总貌数据

src/views/WindSite/pages/Map.vue

@@ -279,10 +279,10 @@ export default {
               icon: "svg-wind-site",
               btns: [],
             },
-            {
-              icon: "svg-photovoltaic",
-              btns: [],
-            },
+            // {
+            //   icon: "svg-photovoltaic",
+            //   btns: [],
+            // },
           ];
 
           res.data.forEach((ele, index) => {
@@ -292,10 +292,10 @@ export default {
                 code: ele.id,
               });
             } else {
-              btnGroup[1].btns.push({
-                text: ele.name,
-                code: ele.id,
-              });
+              // btnGroup[1].btns.push({
+              //   text: ele.name,
+              //   code: ele.id,
+              // });
             }
           });