1.将预警分析和故障分析改为弹窗；

2.MCH_GDC.vue和宣和光电厂地图JSON改；
3.改路由

src/router/index.js

@@ -416,18 +416,6 @@ const routes = [{
 		import( /* webpackChunkName: "malfunctionStatistics" */ "../views/malfunctionRecall/index.vue"),
 },
 {
-	path: "/health/gzzd/gzfl", // 故障分类
-	name: "gzfl",
-	component: () =>
-		import( /* webpackChunkName: "malfunctionStatistics" */ "../views/malfunctionDiagnose/gzfl.vue"),
-},
-{
-	path: "/health/gzzd/yjfl", // 预警分类
-	name: "yjfl",
-	component: () =>
-		import( /* webpackChunkName: "malfunctionStatistics" */ "../views/malfunctionDiagnose/yjfl.vue"),
-},
-{
 	path: "/health/frist",
 	name: "health",
 	component: () =>

src/views/NewPages/alarm-center-1.vue

@@ -63,6 +63,7 @@
         <div class="query-actions">
           <button class="btn green" @click="searchData">搜索</button>
           <button class="btn green" @click="searchTree">筛选</button>
+		  <button class="btn green" @click="fx">分析</button>
         </div>
       </div>
     </div>
@@ -138,6 +139,9 @@
         :showLegend="true"
       />
     </el-dialog>
+	<el-dialog :title="dialogTitleFX" v-model="dialogVisibleFX" width="70%" top="10vh" custom-class="modal" :close-on-click-modal="false" :destroy-on-close='true'>
+	  <FX :date='startdate' :wpid='wpvalue'/>
+	</el-dialog>
   </div>
 </template>
 
@@ -145,11 +149,14 @@
 import Panel3 from "../../components/coms/panel/panel3.vue";
 import Table3 from "../../components/coms/table/table3.vue";
 import MultipleYLineChartNormal from "./multiple-y-line-chart-normal.vue";
+import FX from "./alarm-center-yjfx.vue";
 import BASE from '@tools/basicTool.js';
 export default {
-  components: { Panel3, Table3, MultipleYLineChartNormal },
+  components: { Panel3, Table3, MultipleYLineChartNormal,FX },
   data() {
     return {
+		dialogTitleFX: "",
+		dialogVisibleFX: false,
       dialogTitle: "",
       chooseStatus: false,
       dialogVisible: false,
@@ -666,6 +673,11 @@ export default {
       }
       this.cascaderOptions = cascaderOptions;
     },
+	fx(){
+		this.startdate=new Date(this.startdate).formatDate("yyyy-MM-dd");
+		this.dialogTitleFX= "预警分析";
+		this.dialogVisibleFX= true;
+	}
   },
 };
 </script>

src/views/NewPages/alarm-center-2.vue

@@ -30,7 +30,8 @@
         </div>
         <div class="query-actions">
           <button class="btn green" @click="searchData">搜索</button>
-          <button class="btn green">导出</button>
+          <!-- <button class="btn green">导出</button> -->
+		  <button class="btn green" @click="fx">分析</button>
         </div>
       </div>
     </div>
@@ -62,16 +63,22 @@
         </template>
       </table-2>
     </panel-3>
+	<el-dialog :title="dialogTitleFX" v-model="dialogVisibleFX" width="70%" top="10vh" custom-class="modal" :close-on-click-modal="false" :destroy-on-close='true'>
+	  <FX :date='startdate' :wpid='wpvalue'/>
+	</el-dialog>
   </div>
 </template>
 
 <script>
 import Panel3 from "../../components/coms/panel/panel3.vue";
 import Table2 from "../../components/coms/table/table2.vue";
+import FX from "./alarm-center-gzfx.vue";
 export default {
-  components: { Panel3, Table2 },
+  components: { Panel3, Table2,FX },
   data () {
     return {
+		dialogTitleFX: "",
+		dialogVisibleFX: false,
       wpvalue: "",
       wpoptions: "",
       options: [],
@@ -237,6 +244,11 @@ export default {
       this.tableData.column = column;
       this.tableData.data = dataAll;
     },
+	fx(){
+		this.startdate=new Date(this.startdate).formatDate("yyyy-MM-dd");
+		this.dialogTitleFX= "预警分析";
+		this.dialogVisibleFX= true;
+	}
   },
 };
 </script>

src/views/malfunctionDiagnose/gzfl.vue

@@ -1,30 +1,5 @@
 <template>
 	<div>
-		<div class="action-bar">
-			<div class="query mg-b-16">
-				<div class="query-items">
-					<div class="query-item">
-						<div class="lable">风场：</div>
-						<div class="search-input">
-							<el-select v-model="wpvalue" clearable placeholder="请选择" popper-class="select">
-								<el-option v-for="item in ChangZhan" :key="item.id" :label="item.name" :value="item.id">
-								</el-option>
-							</el-select>
-						</div>
-					</div>
-					<div class="query-item">
-						<div class="lable">日期：</div>
-						<div class="search-input">
-							<el-date-picker v-model="myDate" type="date" placeholder="开始日期" popper-class="date-select"
-					   value-format="YYYY-MM-DD"></el-date-picker>
-						</div>
-					</div>
-				</div>
-				<div class="query-actions">
-					<button class="btn green" @click="searchData">搜索</button>
-				</div>
-			</div>
-		</div>
 		<el-row>
 			<el-col :span="14">
 				<panel :title="'日雷达图'" class="radar-panel" :icon="'svg-wind-site'">
@@ -65,6 +40,16 @@
 			panel,
 			RadarChart
 		},
+		props:{
+			date: {
+			  type: String,
+			  default: "2021-06-06",
+			},
+			wpid: {
+			  type: String,
+			  default: "MHS_FDC",
+			},
+		},
 		data() {
 			return {
 				rzdfsData: {
@@ -79,25 +64,10 @@
 					indicator: ["N0", "N1", "N2", "N3", "N4", "N5"],
 					data: [{value: [44200, 14200, 20000, 35000, 50000, 38000],name: "",}, ],
 				},
-				ChangZhan: [],
-				wpvalue: '',
-				myDate: ""
 			}
 		},
 		created() {
-			var that = this;
-			that.API.requestData({
-				method: "GET",
-				baseURL: "http://10.155.32.4:9001/",
-				subUrl: "benchmarking/wplist",
-				success(res) {
-					that.ChangZhan = res.data;
-					that.wpvalue = res.data[0].id;
-					let end = new Date();
-					that.myDate = end.formatDate("yyyy-MM-dd");
-					that.searchData();
-				},
-			});
+			this.searchData();
 		},
 		methods: {
 			searchData(){
@@ -107,8 +77,8 @@
 					subUrl: "radar/gzfx",
 					showLoading:true,
 					data:{
-						stId:that.wpvalue,
-						Date:that.myDate
+						stId:that.wpid,
+						Date:that.date
 					},
 					success(res) {
 						let key = ['变桨','变频器','齿轮箱','发电机','风机其它','滑环','机舱加热','控制','冷却','偏航','液压','主轴'];

src/views/malfunctionDiagnose/yjfl.vue

@@ -1,30 +1,5 @@
 <template>
 	<div>
-		<div class="action-bar">
-			<div class="query mg-b-16">
-				<div class="query-items">
-					<div class="query-item">
-						<div class="lable">风场：</div>
-						<div class="search-input">
-							<el-select v-model="wpvalue" clearable placeholder="请选择" popper-class="select">
-								<el-option v-for="item in ChangZhan" :key="item.id" :label="item.name" :value="item.id">
-								</el-option>
-							</el-select>
-						</div>
-					</div>
-					<div class="query-item">
-						<div class="lable">日期：</div>
-						<div class="search-input">
-							<el-date-picker v-model="myDate" type="date" placeholder="开始日期" popper-class="date-select"
-					   value-format="YYYY-MM-DD"></el-date-picker>
-						</div>
-					</div>
-				</div>
-				<div class="query-actions">
-					<button class="btn green" @click="searchData">搜索</button>
-				</div>
-			</div>
-		</div>
 		<el-row>
 			<el-col :span="14">
 				<panel :title="'日雷达图'" class="radar-panel" :icon="'svg-wind-site'">
@@ -65,6 +40,16 @@
 			panel,
 			RadarChart
 		},
+		props:{
+			date: {
+			  type: String,
+			  default: "2021-06-06",
+			},
+			wpid: {
+			  type: String,
+			  default: "MHS_FDC",
+			},
+		},
 		data() {
 			return {
 				rzdfsData: {
@@ -79,25 +64,10 @@
 					indicator: ["N0", "N1", "N2", "N3", "N4", "N5"],
 					data: [{value: [44200, 14200, 20000, 35000, 50000, 38000],name: "",}, ],
 				},
-				ChangZhan: [],
-				wpvalue: '',
-				myDate: ""
 			}
 		},
 		created() {
-			var that = this;
-			that.API.requestData({
-				method: "GET",
-				baseURL: "http://10.155.32.4:9001/",
-				subUrl: "benchmarking/wplist",
-				success(res) {
-					that.ChangZhan = res.data;
-					that.wpvalue = res.data[0].id;
-					let end = new Date();
-					that.myDate = end.formatDate("yyyy-MM-dd");
-					that.searchData();
-				},
-			});
+			this.searchData();
 		},
 		methods: {
 			searchData(){
@@ -107,8 +77,8 @@
 					subUrl: "radar/yjfx",
 					showLoading:true,
 					data:{
-						stationid:that.wpvalue,
-						date:that.myDate
+						stationid:that.wpid,
+						date:that.date
 					},
 					success(res) {
 						let key = ['测风系统','传动链','发电机','变桨系统','齿轮箱','液压系统','偏航系统','机舱','其它','塔底柜'];
@@ -128,7 +98,6 @@
 				});
 			}
 		},
-
 	};
 </script>
 

src/views/layout/Menu.vue

@@ -414,16 +414,6 @@ export default {
                   icon: "svg-wind-site",
                   path: "/health/gzzd/malfunctionRecall",
                 },
-                {
-                  text: "故障分类",
-                  icon: "svg-wind-site",
-                  path: "/health/gzzd/gzfl",
-                },
-                {
-                  text: "预警分类",
-                  icon: "svg-wind-site",
-                  path: "/health/gzzd/yjfl",
-                },
               ],
             },
             {