Merge branch 'mw' of http://124.70.43.205:3000/yangxiao/sis_zhfx into wangbo

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

@@ -5,16 +5,16 @@
 				<previewPicture v-if="datas">
 					<template v-slot:svg>
 						<svg class="svg" 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>
+						<g id="other">
 							<g>
 								<polygon fill="#B21F63" points="1003.109,29.538 1009.84,4.413 1016.568,29.538   "/>
 								<rect x="1008.969" y="29.538" fill="#B21F63" width="1.537" height="50.888"/>
 								<rect x="500.114" y="80.427" fill="#B21F63" width="595.531" height="1.537"/>
-								<text transform="matrix(1 0 0 1 1032.9893 52.8999)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.0484">105</text>
+								<text transform="matrix(1 0 0 1 1032.9893 52.8999)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.048">105</text>
 							</g>
 							<g>
 								<rect x="71.679" y="130.277" fill="#B6065C" width="862.731" height="1.537"/>
-								<text transform="matrix(1 0 0 1 455.7104 111.1514)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.0484"> 361 </text>
+								<text transform="matrix(1 0 0 1 455.7104 111.1514)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.048"> 361 </text>
 								<g>
 									<rect x="527.506" y="97.923" fill="none" stroke="#4F4B7F" stroke-miterlimit="10" width="58.69" height="23.273"/>
 									<rect x="527.506" y="97.923" opacity="0.7" fill="#212967" enable-background="new    " width="58.69" height="23.273"/>
@@ -1965,7 +1965,7 @@
 							</g>
 							<g>
 								<rect x="71.365" y="364.197" fill="#B6065C" width="862.732" height="1.537"/>
-								<text transform="matrix(1 0 0 1 455.3984 345.0713)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.0484"> 362 </text>
+								<text transform="matrix(1 0 0 1 455.3984 345.0713)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.048"> 362 </text>
 								<g>
 									<rect x="527.194" y="331.843" fill="none" stroke="#4F4B7F" stroke-miterlimit="10" width="58.69" height="23.273"/>
 									<rect x="527.194" y="331.843" opacity="0.7" fill="#212967" enable-background="new    " width="58.69" height="23.273"/>
@@ -5250,11 +5250,11 @@
 		width: 90%;
 		height: 90%;
 	}
-	.light #other text[font-size="12.5667"],
-	.light #other text[font-size="13.9275"]{
+	.light #other text[font-size="14.048"],
+	.light #other text[font-size="3.4688"]{
 		fill:#000000;
 	}
-	.light #data text{
+	.light #alldata text{
 		fill:#FFFFFF;
 	}
 </style>

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

@@ -24,25 +24,25 @@
 								<g>
 									<rect x="729.21" y="112.439" fill="none" stroke="#545281" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 									<rect x="729.21" y="112.439" opacity="0.7" fill="#2F3068" enable-background="new    " width="52.5" height="20.818"></rect>
-									<text transform="matrix(1 0 0 1 735.199 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#2进线</text>
+									<text transform="matrix(1 0 0 1 735.199 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#2进线</text>
 								</g>
 								<text transform="matrix(1 0 0 1 338.3215 105.7727)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">512</text>
 								<g>
 									<rect x="333.543" y="112.439" fill="none" stroke="#545281" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 									<rect x="333.543" y="112.439" opacity="0.7" fill="#2F3068" enable-background="new    " width="52.5" height="20.818"></rect>
-									<text transform="matrix(1 0 0 1 339.5325 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#1进线</text>
+									<text transform="matrix(1 0 0 1 339.5325 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#1进线</text>
 								</g>
 								<text transform="matrix(1 0 0 1 870.8694 105.7727)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">526</text>
 								<g>
 									<rect x="870.867" y="112.439" fill="none" stroke="#545281" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 									<rect x="870.867" y="112.439" opacity="0.7" fill="#2F3068" enable-background="new    " width="52.5" height="20.818"></rect>
-									<text transform="matrix(1 0 0 1 876.8577 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#3进线</text>
+									<text transform="matrix(1 0 0 1 876.8577 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#3进线</text>
 								</g>
 								<text transform="matrix(1 0 0 1 1354.3889 105.7727)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">527</text>
 								<g>
 									<rect x="1354.389" y="112.439" fill="none" stroke="#545281" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 									<rect x="1354.389" y="112.439" opacity="0.7" fill="#2F3068" enable-background="new    " width="52.5" height="20.818"></rect>
-									<text transform="matrix(1 0 0 1 1360.3772 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#4进线</text>
+									<text transform="matrix(1 0 0 1 1360.3772 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#4进线</text>
 								</g>
 								<text transform="matrix(1 0 0 1 190.8508 420.1721)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="13.9276">#3</text>
 								
@@ -1574,7 +1574,7 @@
 		height: 90%;
 	}
 	.light #other text[font-size="12.5667"],
-	.light #other text[font-size="13.9275"]{
+	.light #other text[font-size="13.9276"]{
 		fill:#000000;
 	}
 	.light #data text{

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

@@ -32,7 +32,7 @@
 									<rect x="1004.688" y="87.653" opacity="0.7" fill="#212967" width="52.5"
 										height="20.818" />
 									<text transform="matrix(1 0 0 1 1010.6763 101.8457)" fill="#FFFFFF"
-										font-family="'MicrosoftYaHei'" font-size="12.5667">
+										font-family="'MicrosoftYaHei'" font-size="12.566">
 										#1进线
 									</text>
 								</g>
@@ -6029,7 +6029,7 @@ gg==" transform="matrix(0.24 0 0 0.24 1029.5508 430.3193)"></image>
 									<rect x="357.188" y="87.653" opacity="0.7" fill="#212967" width="52.5"
 										height="20.818" />
 									<text transform="matrix(1 0 0 1 363.1763 101.8457)" fill="#FFFFFF"
-										font-family="'MicrosoftYaHei'" font-size="12.5667">
+										font-family="'MicrosoftYaHei'" font-size="12.566">
 										#2进线
 									</text>
 								</g>
@@ -14166,12 +14166,12 @@ YII=" transform="matrix(0.24 0 0 0.24 1183.2881 191.6758)"></image>
 									</text>
 								</g>
 							</g>
-							<g id="data">
+							<g id="arrow">
 								<rect x="1314.85" y="31.309" fill="#E50612" width="15.15" height="27.441" />
 								<rect x="976.197" y="79.779" :fill="green" width="15.15" height="27.441" />
 								<rect x="328.141" y="79.779" fill="#E50612" width="15.15" height="27.441" />
 							</g>
-							<g id="arrow">
+							<g id="data">
 								<g id="_x23_3">
 									<g>
 										<text transform="matrix(1 0 0 1 166.8882 421.5078)" fill="#1B813B"
@@ -15140,8 +15140,6 @@ YII=" transform="matrix(0.24 0 0 0.24 1183.2881 191.6758)"></image>
 						return 0;
 				}
 			},
-
-
 			// 根据机箱状态返回颜色，后续如果需要区分颜色可以在这里新增逻辑返回对应的颜色值
 			getColor() {
 				return "#fff";
@@ -15187,7 +15185,7 @@ YII=" transform="matrix(0.24 0 0 0.24 1183.2881 191.6758)"></image>
 	}
 
 	.light #other text[font-size="12.5667"],
-	.light #other text[font-size="13.9275"]{
+	.light #other text[font-size="13.9276"]{
 		fill:#000000;
 	}
 	.light #data text{

src/views/WindSite/pages/GeneralAppearance.vue

@@ -38,13 +38,13 @@
 				<div class="sub-title-item">
 					<img src="../../../assets/map/fan/black.png" />
 					<span class="sub-title gray">离线台数</span>
-					<span class="sub-count font-num gray">{{ wpnumMap.lxts }}</span>
+					<span class="sub-count font-num gray">{{ wpnumMap.lxts }} {{wpId}}</span>
 				</div>
 			</div>
-			<div class="query-actions btnR" v-if="wpId == 'PL01_GC' || wpId == 'PL02_GC'">
-				<button class="btn" :class="wpId == 'PL01_GC'?'green':''" @click="pl('PL01_GC')">平罗一期</button>
-				<button class="btn" :class="wpId == 'PL02_GC'?'green':''" @click="pl('PL02_GC')">平罗二期</button>
-			</div>
+			<!-- <div class="query-actions btnR" v-if="wpId == 'PL_GDC' || wpId == 'PL2_GDC'">
+				<button class="btn" :class="wpId == 'PL_GDC'?'green':''" @click="pl('PL_GDC')">平罗一期</button>
+				<button class="btn" :class="wpId == 'PL2_GDC'?'green':''" @click="pl('PL2_GDC')">平罗二期</button>
+			</div> -->
 		</div>
 		<div>
 			<MHS class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'MHS_FDC'" />
@@ -184,6 +184,7 @@
 						if (res.code == 200) {
 							that.wpnumMap = res.data.fczbmap.jczbmap;
 							that.fjmap = res.data.fjmap[0];
+							console.log(that.fjmap)
 							that.zmmap = res.data.zmmap;
 						}
 					},