1.马厂湖svg显示不正常改；2.月曲线排行场站默认麻黄山，需后端改接口；3.新增明华要求页面，差接口及详情页内容

src/router/index.js

@@ -754,6 +754,11 @@ const routes = [{
 	name: "boosterAlarm",
 	component: () => import("../views/alarmCenter/boosterAlarm.vue")
 },
+{
+	path: "/others/otherComponent",
+	name: "otherComponent",
+	component: () => import("../views/Others/otherComponent.vue")
+},
 // 报警中心-SCADA报警
 {
 	path: "/others/alarmCenter/scadaAlarm",

src/views/Others/otherComponent.vue

@@ -0,0 +1,191 @@
+<template>
+	<tab :data="tabData" @select="select" />
+	<el-row>
+		<el-col :span="3">
+			<el-tree :data="elTreeData.data[currTab]" :props="elTreeData.defaultProps" @node-click="handleNodeClick"></el-tree>
+		</el-col>
+		<el-col :span="21">
+			<tab :data="tabData2[currTab]" @select="select2" />
+			<Fj v-if="currTab == 0" :currTab="currTab2" height="85vh"/>
+			<Syz v-if="currTab == 1" :currTab="currTab2" height="85vh"/>
+		</el-col>
+	</el-row>
+</template>
+
+<script>
+	import Tab from "../../components/coms/tabs/tab.vue";
+	import Fj from "./otherComponentFj.vue";
+	import Syz from "./otherComponentSyz.vue";
+	export default {
+		components: {Tab,Fj,Syz},
+		data() {
+			return {
+				currTab: 0,
+				currTab2: 0,
+				tabData: [{
+						id: "0",
+						text: "风机",
+					},
+					{
+						id: "1",
+						text: "升压站",
+					}
+				],
+				tabData2: [
+					[{
+							id: "0",
+							text: "位置",
+						},
+						{
+							id: "1",
+							text: "技术参数",
+						},
+						{
+							id: "2",
+							text: "预防性维护",
+						},
+						{
+							id: "3",
+							text: "设备历史",
+						},
+						{
+							id: "4",
+							text: "设备维护操作记录",
+						}
+					],
+					[{
+							id: "0",
+							text: "位置2",
+						},
+						{
+							id: "1",
+							text: "技术参数",
+						},
+						{
+							id: "2",
+							text: "预防性维护",
+						},
+						{
+							id: "3",
+							text: "设备历史",
+						},
+						{
+							id: "4",
+							text: "设备维护操作记录",
+						}
+					],
+				],
+				elTreeData: {
+					data: [[{
+							label: "一级 1",
+							children: [{
+								label: "二级 1-1",
+								children: [{
+									label: "三级 1-1-1",
+								}, ],
+							}, ],
+						},
+						{
+							label: "一级 2",
+							children: [{
+									label: "二级 2-1",
+									children: [{
+										label: "三级 2-1-1",
+									}, ],
+								},
+								{
+									label: "二级 2-2",
+									children: [{
+										label: "三级 2-2-1",
+									}, ],
+								},
+							],
+						},
+						{
+							label: "一级 3",
+							children: [{
+									label: "二级 3-1",
+									children: [{
+										label: "三级 3-1-1",
+									}, ],
+								},
+								{
+									label: "二级 3-2",
+									children: [{
+										label: "三级 3-2-1",
+									}, ],
+								},
+							],
+						},
+					],
+					[{
+							label: "mw一级 1",
+							children: [{
+								label: "二级 1-1",
+								children: [{
+									label: "三级 1-1-1",
+								}, ],
+							}, ],
+						},
+						{
+							label: "一级 2",
+							children: [{
+									label: "二级 2-1",
+									children: [{
+										label: "三级 2-1-1",
+									}, ],
+								},
+								{
+									label: "二级 2-2",
+									children: [{
+										label: "三级 2-2-1",
+									}, ],
+								},
+							],
+						},
+						{
+							label: "一级 3",
+							children: [{
+									label: "二级 3-1",
+									children: [{
+										label: "三级 3-1-1",
+									}, ],
+								},
+								{
+									label: "二级 3-2",
+									children: [{
+										label: "三级 3-2-1",
+									}, ],
+								},
+							],
+						},
+					]],
+					defaultProps: {
+						children: "children",
+						label: "label",
+					},
+				},
+			};
+		},
+		methods: {
+			select(data) {
+				if (data.id != this.currTab) {
+					this.currTab = parseInt(data.id);
+					this.currTab2 = 0;
+				}
+			},
+			select2(data) {
+				console.log(data)
+				this.currTab2 = parseInt(data.id);
+			},
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/Others/otherComponentFj.vue

@@ -0,0 +1,49 @@
+<template>
+	<el-scrollbar v-if="currTab == 0" :height="height">
+	 风机1
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 1" :height="height">
+	 2
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 2" :height="height">
+	 3
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 3" :height="height">
+	 4
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 4" :height="height">
+	 5
+	</el-scrollbar>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			};
+		},
+		props:{
+			currTab:{
+			  type: Number
+			},
+			height: {
+			  type: String
+			},
+		},
+		methods:{
+			
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/Others/otherComponentSyz.vue

@@ -0,0 +1,49 @@
+<template>
+	<el-scrollbar v-if="currTab == 0" :height="height">
+	升压站 1
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 1" :height="height">
+	 2
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 2" :height="height">
+	 3
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 3" :height="height">
+	 4
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 4" :height="height">
+	 5
+	</el-scrollbar>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			};
+		},
+		props:{
+			currTab:{
+			  type: Number
+			},
+			height: {
+			  type: String
+			},
+		},
+		methods:{
+			
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

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

@@ -1500,18 +1500,12 @@
 						const spKey = fmtNumber(key.replace(/[^0-9]/gi, ""));
 						const dgDom = $("#_x23_" + spKey).find("text");
 						
-						console.log(key,spKey)
-						
-
 						if (dgDom && key.indexOf("dl") !== -1) {
-							// dgDom.eq(0).html(item);
-							dgDom.eq(0).html(111);
+							dgDom.eq(0).html(item);
 						} else if (dgDom && key.indexOf("dy") !== -1) {
-							// dgDom.eq(1).html(item);
-							dgDom.eq(1).html(222);
+							dgDom.eq(1).html(item);
 						} else if (dgDom && key.indexOf("yg") !== -1) {
-							// dgDom.eq(2).html(item);
-							dgDom.eq(2).html(333);
+							dgDom.eq(2).html(item);
 						}
 					}
 				}

src/views/nxfx/qxpclfx.vue

@@ -89,7 +89,7 @@ export default {
       cur: 0,
       optionData: ["月曲线偏差率排行榜", "日曲线偏差率排行榜"],
       ChangZhan: [],
-      value1: "XS_FDC",
+      value1: "MHS_FDC",
       date: "",
       date2: "",
       shows: true,