冲突处理

src/router/index.js

@@ -5,730 +5,634 @@ import {
 import Home from '../views/Home/Home.vue'
 
 const routes = [{
-		path: '/',
-		redirect: '/monitor/home'
-	},
-	{
-		path: '/monitor/home', // 驾驶舱
-		name: 'Home',
-		component: Home,
-	},
-	{
-		path: '/monitor/about',
-		name: 'About',
-		component: () =>
-			import( /* webpackChunkName: "about" */ '../views/About.vue'),
-	},
-	{
-		path: '/monitor/demo',
-		name: 'Demo',
-		component: () =>
-			import( /* webpackChunkName: "Demo" */ '../views/Demo.vue'),
-	},
-	{
-		path: '/monitor/status', // 状态监视
-		name: 'Status',
-		component: () =>
-			import( /* webpackChunkName: "status" */ '../views/Status/Status.vue'),
-	},
-	{
-		path: '/monitor/agc', // AGC 监视
-		name: 'Agc',
-		component: () =>
-			import( /* webpackChunkName: "agc" */ '../views/Agc/Agc.vue'),
-	},
-	{
-		path: '/monitor/windsite',
-		name: 'WindSite',
-		component: () =>
-			import( /* webpackChunkName: "windsite" */ '../views/WindSite/WindSite.vue'),
-		children: [{
-				path: 'home/:wpId', // 场站监视
-				component: () =>
-					import( /* webpackChunkName: "windsitehome" */ '../views/WindSite/pages/Home/Home.vue'),
-			}, {
-				path: 'draughtfanlist/:wpId', // 风机列表
-				component: () =>
-					import( /* webpackChunkName: "windsitedraughtfanlist" */
-						'../views/WindSite/pages/DraughtFanList.vue'),
-			}, {
-				path: 'matrix/:wpId', // 风场矩阵
-				component: () =>
-					import( /* webpackChunkName: "windsitematrix" */ '../views/WindSite/pages/Matrix.vue'),
-			}, {
-				path: 'lightmatrix/:wpId',
-				component: () =>
-					import( /* webpackChunkName: "windsitelightmatrix" */
-						'../views/WindSite/pages/LightMatrix.vue'),
-			}, {
-				path: 'box/:wpId',
-				component: () =>
-					import( /* webpackChunkName: "windsitebox" */ '../views/WindSite/pages/Box.vue'),
-			}, {
-				path: 'info/:wpId/:wtId', // 单机状态监视
-				component: () =>
-					import( /* webpackChunkName: "info" */ '../views/WindSite/pages/Info/Info.vue'),
-			}, {
-				path: 'tower/:wpId', // 测风塔
-				component: () =>
-					import( /* webpackChunkName: "windsitetower" */ '../views/WindSite/pages/Tower.vue'),
-			}, {
-				path: 'inverter-info/:wpId',
-				component: () =>
-					import( /* webpackChunkName: "inverter-info" */
-					'../views/WindSite/pages/Inverter-Info.vue'),
-			}, {
-				path: 'map/:wpId',
-				component: () =>
-					import( /* webpackChunkName: "windsitemap" */ '../views/WindSite/pages/Map.vue'),
-			}, {
-				path: 'map1/:wpId',
-				component: () =>
-					import( /* webpackChunkName: "windsitemap1" */ '../views/WindSite/pages/Map1.vue'),
-			}, {
-				path: '/decision/decision1', //风机绩效榜
-				name: 'decision1',
-				component: () => import( /* webpackChunkName: "decision1" */ '../views/Decision/Decision1.vue'),
-			},
-			{
-				path: '/decision/decision1Mx', //风机绩效榜明细
-				name: 'decision1Mx',
-				component: () => import( /* webpackChunkName: "decision1Mx" */
-					'../views/Decision/Decision1Mx.vue'),
-			},
-
-			{
-				path: '/decision/decision2', //五项损失率
-				name: 'decision2',
-				component: () => import( /* webpackChunkName: "decision2" */ '../views/Decision/Decision2.vue'),
-			},
-			{
-				path: '/decision/decision2Cndb', //场内对标
-				name: 'decision2Cndb',
-				component: () => import( /* webpackChunkName: "decision2Cndb" */
-					'../views/Decision/Decision2Cndb.vue'),
-			},
-			{
-				path: '/decision/decision2Cjdb', //场际对标
-				name: 'decision2Cjdb',
-				component: () => import( /* webpackChunkName: "decision2Cjdb" */
-					'../views/Decision/Decision2Cjdb.vue'),
-			},
-			{
-				path: '/decision/decision2Xmdb', //项目对标
-				name: 'decision2Xmdb',
-				component: () => import( /* webpackChunkName: "decision2Xmdb" */
-					'../views/Decision/Decision2Xmdb.vue'),
-			},
-			{
-				path: '/decision/decision2Xldb', //线路对标
-				name: 'decision2Xldb',
-				component: () => import( /* webpackChunkName: "decision2Xldb" */
-					'../views/Decision/Decision2Xldb.vue'),
-			},
-			{
-				path: '/decision/decision3', //性能对标
-				name: 'decision3',
-				component: () => import( /* webpackChunkName: "decision3" */ '../views/Decision/Decision3.vue'),
-			},
-			{
-				path: '/decision/decision3db', //单机横向对比
-				name: 'decision3db',
-				component: () => import( /* webpackChunkName: "decision3db" */
-					'../views/Decision/Decision3Db.vue'),
-			},
-			{
-				path: '/decision/decision4', //值际对标
-				name: 'decision4',
-				component: () => import( /* webpackChunkName: "decision4" */ '../views/Decision/Decision4.vue'),
-			},
-			{
-				path: '/decision/decision4czzl', //操作指令统计
-				name: 'decision4czzl',
-				component: () => import( /* webpackChunkName: "decision4czzl" */
-					'../views/Decision/Decision4Czzl.vue'),
-			},
-			{
-				path: '/health',
-				name: 'health',
-				component: () => import('../views/HealthControl/Health.vue'),
-			},
-			{
-				path: '/health/health1',
-				name: 'health1',
-				component: () => import('../views/HealthControl/Health1.vue'),
-			},
-			{
-				path: '/health/health2', // 健康管理首页
-				name: 'health2',
-				component: () => import('../views/HealthControl/Health2.vue'),
-			},
-			{
-				path: '/health/health3/:wpId', // 场站健康管理
-				name: 'health3',
-				component: () => import('../views/HealthControl/Health3.vue'),
-			},
-			{
-				path: '/health/health4',
-				name: 'health4',
-				children: [{
-						path: 'healthLineChart/:wtId', // 风机健康趋势
-						component: () => import( /* webpackChunkName: "healthLineChart" */
-							'../views/HealthControl/healthLineChart.vue'),
-					},
-					{
-						path: 'healthLineChart2/:wtId', // 健康趋势
-						component: () => import( /* webpackChunkName: "healthLineChart2" */
-							'../views/HealthControl/healthLineChart2.vue'),
-					}
-				],
-				component: () => import('../views/HealthControl/Health4.vue'),
-			},
-			{
-				path: '/health/health5/',
-				name: 'health5',
-				component: () => import('../views/HealthControl/Health5.vue'),
-			},
-			{
-				path: '/health/health6', // 健康总览
-				name: 'health6',
-				component: () => import('../views/HealthControl/Health6.vue'),
-			},
-			{
-				path: '/cutAnalyse', // 切入切出分析
-				name: 'cutAnalyse',
-				component: () => import('../views/cutAnalyse/index.vue'),
-			},
-			{
-				path: '/cutAnalyse', // 切入切出分析
-				name: 'cutAnalyse',
-				component: () => import('../views/cutAnalyse/index.vue'),
-			},
-			{
-				path: '/wtSaturability', // 单机饱和度
-				name: 'wtSaturability',
-				component: () => import('../views/wtSaturability/index.vue'),
-			},
-			{
-				path: '/windAnalysis', // 风资源分析
-				name: 'windAnalysis',
-				component: () => import('../views/windAnalysis/index.vue'),
-			},
-			{
-				path: 'boosterstation/:wpId', // 升压站
-				component: () =>
-					import( /* webpackChunkName: "boosterstation" */
-						'../views/WindSite/pages/BoosterStation.vue'),
-			},
-			{
-				path: "generalappearance/:wpId", // 总样貌
-				component: () =>
-					import( /* webpackChunkName: "generalappearance" */
-						"../views/WindSite/pages/GeneralAppearance.vue"),
-			},
-		]
-	},
-	{
-		path: '/monitor/lightmatrix', // 光伏明细矩阵
-		name: 'LightMatrix',
-		component: () =>
-			import( /* webpackChunkName: "lightmatrix" */ '../views/LightMatrix/LightMatrix.vue'),
-	},
-	{
-		path: '/monitor/lightmatrix1', // 基础矩阵
-		name: 'LightMatrix1',
-		component: () =>
-			import( /* webpackChunkName: "lightmatrix1" */ '../views/LightMatrix1/LightMatrix1.vue'),
-	},
-	{
-		path: '/monitor/lightmatrix2', // 欠发矩阵
-		name: 'LightMatrix2',
-		component: () =>
-			import( /* webpackChunkName: "lightmatrix2" */ '../views/LightMatrix2/LightMatrix2.vue'),
-	}, {
-		path: '/monitor/lightmatrix3', // 明细矩阵
-		name: 'LightMatrix3',
-		component: () =>
-			import( /* webpackChunkName: "lightmatrix3" */ '../views/LightMatrix3/LightMatrix3.vue'),
-	}, {
-		path: '/decision/decision1', //风机绩效榜
-		name: 'decision1',
-		component: () =>
-			import( /* webpackChunkName: "decision1" */ '../views/Decision/Decision1.vue'),
-	},
-	{
-		path: '/decision/decision1Mx', //风机绩效榜明细
-		name: 'decision1Mx',
-		component: () =>
-			import( /* webpackChunkName: "decision1Mx" */ '../views/Decision/Decision1Mx.vue'),
-	},
-	{
-		path: '/decision/decision2', //五项损失率
-		name: 'decision2',
-		component: () =>
-			import( /* webpackChunkName: "decision2" */ '../views/Decision/Decision2.vue'),
-	},
-	{
-		path: '/decision/decision2Cndb', //场内对标
-		name: 'decision2Cndb',
-		component: () =>
-			import( /* webpackChunkName: "decision2Cndb" */ '../views/Decision/Decision2Cndb.vue'),
-	},
-	{
-		path: '/decision/decision2Cjdb', //场际对标
-		name: 'decision2Cjdb',
-		component: () =>
-			import( /* webpackChunkName: "decision2Cjdb" */ '../views/Decision/Decision2Cjdb.vue'),
-	},
-	{
-		path: '/decision/decision2Xmdb', //项目对标
-		name: 'decision2Xmdb',
-		component: () =>
-			import( /* webpackChunkName: "decision2Xmdb" */ '../views/Decision/Decision2Xmdb.vue'),
-	},
-	{
-		path: '/decision/decision2Xldb', //线路对标
-		name: 'decision2Xldb',
-		component: () =>
-			import( /* webpackChunkName: "decision2Xldb" */ '../views/Decision/Decision2Xldb.vue'),
-	},
-	{
-		path: '/decision/decision3', //性能对标
-		name: 'decision3',
-		component: () =>
-			import( /* webpackChunkName: "decision3" */ '../views/Decision/Decision3.vue'),
-	},
-	{
-		path: '/decision/decision4', //值际对标
-		name: 'decision4',
-		component: () =>
-			import( /* webpackChunkName: "decision4" */ '../views/Decision/Decision4.vue'),
-	},
-	{
-		path: '/decision/decision4czzl', //操作指令统计
-		name: 'decision4czzl',
-		component: () =>
-			import( /* webpackChunkName: "decision4czzl" */ '../views/Decision/Decision4Czzl.vue'),
-	},
-	{
-		path: '/health',
-		name: 'health',
-		component: () =>
-			import('../views/HealthControl/Health.vue'),
-	},
-	{
-		path: '/health/health1',
-		name: 'health1',
-		component: () =>
-			import('../views/HealthControl/Health1.vue'),
-	},
-	{
-		path: '/health/health2', // 健康管理首页
-		name: 'health2',
-		component: () =>
-			import('../views/HealthControl/Health2.vue'),
-	},
-	{
-		path: '/health/health3/:wpId', // 场站健康管理
-		name: 'health3',
-		component: () =>
-			import('../views/HealthControl/Health3.vue'),
-	},
-	{
-		path: '/health/health4',
-		name: 'health4',
-		children: [{
-				path: "/health/health0/:wpId/:wtId",
-				name: "health0",
-				component: () =>
-					import("../views/HealthControl/Health0.vue"),
-			}, {
-				path: "/health/health10/:wtId",
-				name: "health10",
-				component: () =>
-					import( /* webpackChunkName: "health8" */ "../views/HealthControl/Health10.vue"),
-			}, {
-				path: 'healthLineChart/:wtId', // 风机健康趋势
-				component: () =>
-					import( /* webpackChunkName: "healthLineChart" */
-						'../views/HealthControl/healthLineChart.vue'),
-			},
-			{
-				path: 'healthLineChart2/:wtId', // 健康趋势
-				component: () =>
-					import( /* webpackChunkName: "healthLineChart2" */
-						'../views/HealthControl/healthLineChart2.vue'),
-			}
-		],
-		component: () =>
-			import('../views/HealthControl/Health4.vue'),
-	},
-	{
-		path: '/health/health5/',
-		name: 'health5',
-		component: () =>
-			import('../views/HealthControl/Health5.vue'),
-	},
-	{
-		path: '/health/health6', // 健康总览
-		name: 'health6',
-		component: () =>
-			import('../views/HealthControl/Health6.vue'),
-	},
-	{
-		path: '/cutAnalyse', // 切入切出分析
-		name: 'cutAnalyse',
-		component: () =>
-			import('../views/cutAnalyse/index.vue'),
-	},
-	{
-		path: '/cutAnalyse', // 切入切出分析
-		name: 'cutAnalyse',
-		component: () =>
-			import('../views/cutAnalyse/index.vue'),
-	},
-	{
-		path: '/wtSaturability', // 单机饱和度
-		name: 'wtSaturability',
-		component: () =>
-			import('../views/wtSaturability/index.vue'),
-	},
-	{
-		path: '/windAnalysis', // 风资源分析
-		name: 'windAnalysis',
-		component: () =>
-			import('../views/windAnalysis/index.vue'),
-	},
-	{
-		path: '/powerRank', // 发电效率排行
-		name: 'powerRank',
-		component: () =>
-			import('../views/powerRank/index.vue'),
-	},
-	{
-		path: '/totalPowerRank', // 总发电效率排行
-		name: 'totalPowerRank',
-		component: () =>
-			import('../views/totalPowerRank/index.vue'),
-	},
-	{
-		path: '/warningRank', // 报警排行
-		name: 'warningRank',
-		component: () =>
-			import('../views/warningRank/index.vue'),
-	},
-	{
-		path: '/realSearch', // 测点数据查询
-		name: 'realSearch',
-		component: () =>
-			import('../views/realSearch/index.vue'),
-	},
-	{
-		path: '/singleAnalysis', // 单机月度分析
-		name: 'singleAnalysis',
-		component: () =>
-			import('../views/singleAnalysis/index.vue'),
-	},
-	{
-		path: '/performanceAnalysis', // 单机信息总览
-		name: 'performanceAnalysis',
-		component: () => import('../views/performanceAnalysis/index.vue'),
-	},
-	{
-		path: "/performanceAnalysis/detail/:wpId/:wtId", // 单机信息总览详情
-		name: "performanceAnalysisDetail",
-		component: () => import( /* webpackChunkName: "performanceAnalysisDetail" */ "../views/NewPages/dj1.vue"),
-	},
-	{
-		path: '/historySearch', // 测点历史数据查询
-		name: 'historySearch',
-		component: () =>
-			import('../views/historySearch/index.vue'),
-	},
-	{
-		path: '/knowledge', //故障知识列表
-		name: 'knowledge1',
-		component: () =>
-			import('../views/Knowledge/Knowledge1.vue'),
-	},
-	{
-		path: '/knowledge2', //安全措施知识
-		name: 'knowledge2',
-		component: () =>
-			import('../views/Knowledge/Knowledge2.vue'),
-	},
-	{
-		path: '/knowledge3', //风险辨识知识
-		name: 'knowledge3',
-		component: () =>
-			import('../views/Knowledge/Knowledge3.vue'),
-	},
-	{
-		path: '/knowledge4', //作业指导知识
-		name: 'knowledge4',
-		component: () =>
-			import('../views/Knowledge/Knowledge4.vue'),
-	},
-	{
-		path: '/knowledge5', //特征参数
-		name: 'knowledge5',
-		component: () =>
-			import('../views/Knowledge/Knowledge5.vue'),
-	},
-	{
-		path: '/knowledge6', //排查检修方案
-		name: 'knowledge6',
-		component: () =>
-			import('../views/Knowledge/Knowledge6.vue'),
-	},
-	{
-		path: '/knowledge7', //预警知识
-		name: 'knowledge7',
-		component: () =>
-			import('../views/Knowledge/Knowledge7.vue'),
-	},
-	{
-		path: '/allLifeManage', // 全生命周期管理
-		name: 'allLifeManage',
-		component: () =>
-			import('../views/allLifeManage/index.vue'),
-	},
-	{
-		path: "/health/health8",
-		name: "health8",
-		component: () =>
-			import( /* webpackChunkName: "health8" */ "../views/HealthControl/Health8.vue"),
-	},
-	{
-		path: "/monitor/sandtable",
-		name: "sandtable",
-		component: () =>
-			import( /* webpackChunkName: "sandtable" */ "../views/SandTable/SandTable.vue"),
-	},
-	{
-		path: "/planPower",
-		name: "planPower",
-		component: () =>
-			import( /* webpackChunkName: "planPower" */ "../views/planPower/index.vue"),
-	},
-	{
-		path: "/new/pf1",
-		name: "pf1",
-		component: () =>
-			import( /* webpackChunkName: "pf1" */ "../views/NewPages/power-forecast-1.vue"),
-	},
-	{
-		path: "/new/fs",
-		name: "fs",
-		component: () =>
-			import( /* webpackChunkName: "fs" */ "../views/NewPages/forecast-system.vue"),
-	},
-	{
-		path: '/new/ztfx', // 专题分析
-		name: 'ztfx',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/ztfx.vue'),
-	},
-	{
-		path: '/new/fnlyl', // 风能利用率
-		name: 'fnlyl',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/fnlyl.vue'),
-	},
-	{
-		path: '/new/whssl', // 维护损失率
-		name: 'whssl',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/whssl.vue'),
-	},
-	{
-		path: '/new/gzssl', // 故障损失率
-		name: 'gzssl',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/gzssl.vue'),
-	},
-	{
-		path: '/new/xdssl', // 限电损失率
-		name: 'xdssl',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/xdssl.vue'),
-	},
-	{
-		path: '/new/xnssl', // 性能损失率
-		name: 'xnssl',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/xnssl.vue'),
-	},
-	{
-		path: '/new/slssl', // 受累损失率
-		name: 'slssl',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/slssl.vue'),
-	},
-	{
-		path: '/new/mtbf', // mtbf
-		name: 'mtbf',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/mtbf.vue'),
-	},
-	{
-		path: '/new/mttr', // mttr
-		name: 'mttr',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/mttr.vue'),
-	},
-	{
-		path: '/new/zfwjsl', // 复位及时率
-		name: 'zfwjsl',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/fwjsl.vue'),
-	},
-	{
-		path: '/new/zztzhl', // 状态转换率
-		name: 'zztzhl',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/ztzhl.vue'),
-	},
-	{
-		path: '/new/zxqjsl', // 消缺及时率
-		name: 'zxqjsl',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/xqjsl.vue'),
-	},
-	{
-		path: '/new/zfdl', // 发电量分析
-		name: 'zfdl',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/fdl.vue'),
-	},
-	{
-		path: '/new/zzhcydl', // 综合场用电量
-		name: 'zzhcydl',
-		component: () => import( /* webpackChunkName: "ztfx" */ '../views/specific/zhcydl.vue'),
-	},
-	{
-		path: '/new/intelligentalarmcenter',
-		name: 'intelligentalarmcenter',
-		component: () =>
-			import( /* webpackChunkName: "intelligentalarmcenter" */
-				'../views/NewPages/intelligent-alarm-center.vue'),
-	},
-	{
-		path: '/new/personnel',
-		name: 'personnel',
-		component: () =>
-			import( /* webpackChunkName: "personnel" */ '../views/NewPages/personnel.vue'),
-	},
-	{
-		path: '/new/znzhfx/:wtId/:year/:month',
-		name: 'znzhfx',
-		component: () =>
-			import( /* webpackChunkName: "ztfx" */ '../views/NewPages/znzhfx.vue'),
-	},
-	{
-		path: '/new/alarmcenter',
-		name: 'alarmcenter',
-		component: () =>
-			import( /* webpackChunkName: "personnel" */ '../views/NewPages/alarm-center.vue'),
-	},
-	{
-		path: '/new/knowledgebase',
-		name: 'knowledgebase',
-		component: () =>
-			import( /* webpackChunkName: "knowledgebase" */ '../views/NewPages/knowledge-base.vue'),
-	},
-	{
-		path: "/new/dj",
-		name: "dj",
-		component: () =>
-			import( /* webpackChunkName: "dj" */ "../views/NewPages/dj.vue"),
-	},
-	{
-		path: "/new/dj2",
-		name: "dj2",
-		component: () =>
-			import( /* webpackChunkName: "dj2" */ "../views/NewPages/dj2.vue"),
-	},
-	{
-		path: "/new/dialog",
-		name: "dialog",
-		component: () =>
-			import( /* webpackChunkName: "dj2" */ "../views/NewPages/dialogs.vue"),
-	}, // 三率管理/复位及时率
-	{
-		path: '/fwjsl',
-		name: 'fwjsl',
-		component: () =>
-			import('../views/Decision/slgl/fwjsl.vue')
-	},
-	// 三率管理/状态转换率
-	{
-		path: '/ztzhl',
-		name: 'ztzhl',
-		component: () =>
-			import('../views/Decision/slgl/ztzhl.vue')
-	},
-	// 三率管理/消缺及时率
-	{
-		path: '/xqjsl',
-		name: 'xqjsl',
-		component: () =>
-			import('../views/Decision/slgl/xqjsl.vue')
-	},
-	// 曲线排行榜
-	{
-		path: '/qxpclfx',
-		name: 'qxpclfx',
-		component: () => import('../views/nxfx/qxpclfx.vue')
-	},
-	// 等级评估(单机等级评估管理-量化评级)
-	{
-		path: '/djpg',
-		name: 'djpg',
-		component: () => import('../views/HealthControl/gradeassessment.vue')
-	},
-	{
-		path: "/new/powerforecast2",
-		name: "powerforecast2",
-		component: () => import( /* webpackChunkName: "powerforecast2" */ "../views/NewPages/power-forecast-2.vue"),
-	},
-	{
-		path: "/new/alarmcenter1",
-		name: "alarmcenter1",
-		component: () => import( /* webpackChunkName: "alarmcenter1" */ "../views/NewPages/alarm-center-1.vue"),
-	},
-	{
-		path: "/new/tjsj",
-		name: "tjsj",
-		component: () =>
-			import( /* webpackChunkName: "tjsj" */ "../views/warn/tjsj.vue"),
-	},
-	{
-		path: "/new/xdgl",
-		name: "xdgl",
-		component: () =>
-			import( /* webpackChunkName: "xdgl" */ "../views/warn/xdgl.vue"),
-	},
-	{
-		path: "/new/alarmcenter2",
-		name: "alarmcenter2",
-		component: () =>
-			import( /* webpackChunkName: "alarmcenter2" */ "../views/NewPages/alarm-center-2.vue"),
-	},
-	{
-		path: "/new/historysearch",
-		name: "historysearch",
-		component: () => import( /* webpackChunkName: "historysearch" */ "../views/NewPages/history-search.vue"),
-	}, // 报警中心-升压站报警
+        path: '/',
+        redirect: '/monitor/home'
+    },
+    {
+        path: '/monitor/home', // 驾驶舱
+        name: 'Home',
+        component: Home,
+    },
+    {
+        path: '/monitor/about',
+        name: 'About',
+        component: () =>
+            import ( /* webpackChunkName: "about" */ '../views/About.vue'),
+    },
+    {
+        path: '/monitor/demo',
+        name: 'Demo',
+        component: () =>
+            import ( /* webpackChunkName: "Demo" */ '../views/Demo.vue'),
+    },
+    {
+        path: '/monitor/status', // 状态监视
+        name: 'Status',
+        component: () =>
+            import ( /* webpackChunkName: "status" */ '../views/Status/Status.vue'),
+    },
+    {
+        path: '/monitor/agc', // AGC 监视
+        name: 'Agc',
+        component: () =>
+            import ( /* webpackChunkName: "agc" */ '../views/Agc/Agc.vue'),
+    },
+    {
+        path: '/monitor/windsite',
+        name: 'WindSite',
+        component: () =>
+            import ( /* webpackChunkName: "windsite" */ '../views/WindSite/WindSite.vue'),
+        children: [{
+                path: 'home/:wpId', // 场站监视
+                component: () =>
+                    import ( /* webpackChunkName: "windsitehome" */ '../views/WindSite/pages/Home/Home.vue'),
+            }, {
+                path: 'draughtfanlist/:wpId', // 风机列表
+                component: () =>
+                    import ( /* webpackChunkName: "windsitedraughtfanlist" */ '../views/WindSite/pages/DraughtFanList.vue'),
+            }, {
+                path: 'matrix/:wpId', // 风场矩阵
+                component: () =>
+                    import ( /* webpackChunkName: "windsitematrix" */ '../views/WindSite/pages/Matrix.vue'),
+            }, {
+                path: 'lightmatrix/:wpId',
+                component: () =>
+                    import ( /* webpackChunkName: "windsitelightmatrix" */ '../views/WindSite/pages/LightMatrix.vue'),
+            }, {
+                path: 'box/:wpId',
+                component: () =>
+                    import ( /* webpackChunkName: "windsitebox" */ '../views/WindSite/pages/Box.vue'),
+            }, {
+                path: 'info/:wpId/:wtId', // 单机状态监视
+                component: () =>
+                    import ( /* webpackChunkName: "info" */ '../views/WindSite/pages/Info/Info.vue'),
+            }, {
+                path: 'tower/:wpId', // 测风塔
+                component: () =>
+                    import ( /* webpackChunkName: "windsitetower" */ '../views/WindSite/pages/Tower.vue'),
+            }, {
+                path: 'inverter-info/:wpId',
+                component: () =>
+                    import ( /* webpackChunkName: "inverter-info" */ '../views/WindSite/pages/Inverter-Info.vue'),
+            }, {
+                path: 'map/:wpId',
+                component: () =>
+                    import ( /* webpackChunkName: "windsitemap" */ '../views/WindSite/pages/Map.vue'),
+            }, {
+                path: 'map1/:wpId',
+                component: () =>
+                    import ( /* webpackChunkName: "windsitemap1" */ '../views/WindSite/pages/Map1.vue'),
+            },
+            {
+                path: 'boosterstation/:wpId', // 升压站
+                component: () =>
+                    import ( /* webpackChunkName: "boosterstation" */ '../views/WindSite/pages/BoosterStation.vue'),
+            },
+            {
+                path: "generalappearance/:wpId", // 总样貌
+                component: () =>
+                    import ( /* webpackChunkName: "generalappearance" */ "../views/WindSite/pages/GeneralAppearance.vue"),
+            },
+        ]
+    },
+    {
+        path: '/monitor/lightmatrix', // 光伏明细矩阵
+        name: 'LightMatrix',
+        component: () =>
+            import ( /* webpackChunkName: "lightmatrix" */ '../views/LightMatrix/LightMatrix.vue'),
+    },
+    {
+        path: '/monitor/lightmatrix1', // 基础矩阵
+        name: 'LightMatrix1',
+        component: () =>
+            import ( /* webpackChunkName: "lightmatrix1" */ '../views/LightMatrix1/LightMatrix1.vue'),
+    },
+    {
+        path: '/monitor/lightmatrix2', // 欠发矩阵
+        name: 'LightMatrix2',
+        component: () =>
+            import ( /* webpackChunkName: "lightmatrix2" */ '../views/LightMatrix2/LightMatrix2.vue'),
+    }, {
+        path: '/monitor/lightmatrix3', // 明细矩阵
+        name: 'LightMatrix3',
+        component: () =>
+            import ( /* webpackChunkName: "lightmatrix3" */ '../views/LightMatrix3/LightMatrix3.vue'),
+    }, {
+        path: '/decision/decision1', //风机绩效榜
+        name: 'decision1',
+        component: () =>
+            import ( /* webpackChunkName: "decision1" */ '../views/Decision/Decision1.vue'),
+    },
+    {
+        path: '/decision/decision1Mx', //风机绩效榜明细
+        name: 'decision1Mx',
+        component: () =>
+            import ( /* webpackChunkName: "decision1Mx" */ '../views/Decision/Decision1Mx.vue'),
+    },
+    {
+        path: '/decision/decision2', //五项损失率
+        name: 'decision2',
+        component: () =>
+            import ( /* webpackChunkName: "decision2" */ '../views/Decision/Decision2.vue'),
+    },
+    {
+        path: '/decision/decision2Cndb', //场内对标
+        name: 'decision2Cndb',
+        component: () =>
+            import ( /* webpackChunkName: "decision2Cndb" */ '../views/Decision/Decision2Cndb.vue'),
+    },
+    {
+        path: '/decision/decision2Cjdb', //场际对标
+        name: 'decision2Cjdb',
+        component: () =>
+            import ( /* webpackChunkName: "decision2Cjdb" */ '../views/Decision/Decision2Cjdb.vue'),
+    },
+    {
+        path: '/decision/decision2Xmdb', //项目对标
+        name: 'decision2Xmdb',
+        component: () =>
+            import ( /* webpackChunkName: "decision2Xmdb" */ '../views/Decision/Decision2Xmdb.vue'),
+    },
+    {
+        path: '/decision/decision2Xldb', //线路对标
+        name: 'decision2Xldb',
+        component: () =>
+            import ( /* webpackChunkName: "decision2Xldb" */ '../views/Decision/Decision2Xldb.vue'),
+    },
+    {
+        path: '/decision/decision3', //性能对标
+        name: 'decision3',
+        component: () =>
+            import ( /* webpackChunkName: "decision3" */ '../views/Decision/Decision3.vue'),
+    },
+    {
+        path: '/decision/decision4', //值际对标
+        name: 'decision4',
+        component: () =>
+            import ( /* webpackChunkName: "decision4" */ '../views/Decision/Decision4.vue'),
+    },
+    {
+        path: '/decision/decision4czzl', //操作指令统计
+        name: 'decision4czzl',
+        component: () =>
+            import ( /* webpackChunkName: "decision4czzl" */ '../views/Decision/Decision4Czzl.vue'),
+    },
+    {
+        path: '/health',
+        name: 'health',
+        component: () =>
+            import ('../views/HealthControl/Health.vue'),
+    },
+    {
+        path: '/health/healthDay', //风机  日  信息量化评级管理
+        name: 'healthDay',
+        component: () =>
+            import ('../views/HealthControl/HealthDay.vue'),
+    },
+    {
+        path: '/health/healthMonth', //风机  月  信息量化评级管理
+        name: 'healthMonth',
+        component: () =>
+            import ('../views/HealthControl/HealthMonth.vue'),
+    },
+    {
+        path: '/health/healthYear', //风机  年  信息量化评级管理
+        name: 'healthYear',
+        component: () =>
+            import ('../views/HealthControl/HealthYear.vue'),
+    },
+    {
+        path: '/health/health1',
+        name: 'health1',
+        component: () =>
+            import ('../views/HealthControl/Health1.vue'),
+    },
+    {
+        path: '/health/health2', // 健康管理首页
+        name: 'health2',
+        component: () =>
+            import ('../views/HealthControl/Health2.vue'),
+    },
+    {
+        path: '/health/health3/:wpId', // 场站健康管理
+        name: 'health3',
+        component: () =>
+            import ('../views/HealthControl/Health3.vue'),
+    },
+    {
+        path: '/health/health4',
+        name: 'health4',
+        children: [{
+                path: "/health/health0/:wpId/:wtId",
+                name: "health0",
+                component: () =>
+                    import ("../views/HealthControl/Health0.vue"),
+            }, {
+                path: "/health/health10/:wpId/:wtId",
+                name: "health10",
+                component: () =>
+                    import ( /* webpackChunkName: "health8" */ "../views/HealthControl/Health10.vue"),
+            }, {
+                path: 'healthLineChart/:wpId/:wtId', // 风机健康趋势
+                component: () =>
+                    import ( /* webpackChunkName: "healthLineChart" */ '../views/HealthControl/healthLineChart.vue'),
+            },
+            {
+                path: 'healthLineChart2/:wpId/:wtId', // 健康趋势
+                component: () =>
+                    import ( /* webpackChunkName: "healthLineChart2" */ '../views/HealthControl/healthLineChart2.vue'),
+            }
+        ],
+        component: () =>
+            import ('../views/HealthControl/Health4.vue'),
+    },
+    {
+        path: '/health/health5/',
+        name: 'health5',
+        component: () =>
+            import ('../views/HealthControl/Health5.vue'),
+    },
+    {
+        path: '/health/health6', // 健康总览
+        name: 'health6',
+        component: () =>
+            import ('../views/HealthControl/Health6.vue'),
+    },
+    {
+        path: '/cutAnalyse', // 切入切出分析
+        name: 'cutAnalyse',
+        component: () =>
+            import ('../views/cutAnalyse/index.vue'),
+    },
+    {
+        path: '/cutAnalyse', // 切入切出分析
+        name: 'cutAnalyse',
+        component: () =>
+            import ('../views/cutAnalyse/index.vue'),
+    },
+    {
+        path: '/wtSaturability', // 单机饱和度
+        name: 'wtSaturability',
+        component: () =>
+            import ('../views/wtSaturability/index.vue'),
+    },
+    {
+        path: '/windAnalysis', // 风资源分析
+        name: 'windAnalysis',
+        component: () =>
+            import ('../views/windAnalysis/index.vue'),
+    },
+    {
+        path: '/powerRank', // 发电效率排行
+        name: 'powerRank',
+        component: () =>
+            import ('../views/powerRank/index.vue'),
+    },
+    {
+        path: '/totalPowerRank', // 总发电效率排行
+        name: 'totalPowerRank',
+        component: () =>
+            import ('../views/totalPowerRank/index.vue'),
+    },
+    {
+        path: '/warningRank', // 报警排行
+        name: 'warningRank',
+        component: () =>
+            import ('../views/warningRank/index.vue'),
+    },
+    {
+        path: '/realSearch', // 测点数据查询
+        name: 'realSearch',
+        component: () =>
+            import ('../views/realSearch/index.vue'),
+    },
+    {
+        path: '/singleAnalysis', // 单机月度分析
+        name: 'singleAnalysis',
+        component: () =>
+            import ('../views/singleAnalysis/index.vue'),
+    },
+    {
+        path: '/performanceAnalysis', // 单机信息总览
+        name: 'performanceAnalysis',
+        component: () =>
+            import ('../views/performanceAnalysis/index.vue'),
+    },
+    {
+        path: "/performanceAnalysis/detail/:wpId/:wtId", // 单机信息总览详情
+        name: "performanceAnalysisDetail",
+        component: () =>
+            import ( /* webpackChunkName: "performanceAnalysisDetail" */ "../views/NewPages/dj1.vue"),
+    },
+    {
+        path: '/historySearch', // 测点历史数据查询
+        name: 'historySearch',
+        component: () =>
+            import ('../views/historySearch/index.vue'),
+    },
+    {
+        path: '/knowledge', //故障知识列表
+        name: 'knowledge1',
+        component: () =>
+            import ('../views/Knowledge/Knowledge1.vue'),
+    },
+    {
+        path: '/knowledge2', //安全措施知识
+        name: 'knowledge2',
+        component: () =>
+            import ('../views/Knowledge/Knowledge2.vue'),
+    },
+    {
+        path: '/knowledge3', //风险辨识知识
+        name: 'knowledge3',
+        component: () =>
+            import ('../views/Knowledge/Knowledge3.vue'),
+    },
+    {
+        path: '/knowledge4', //作业指导知识
+        name: 'knowledge4',
+        component: () =>
+            import ('../views/Knowledge/Knowledge4.vue'),
+    },
+    {
+        path: '/knowledge5', //特征参数
+        name: 'knowledge5',
+        component: () =>
+            import ('../views/Knowledge/Knowledge5.vue'),
+    },
+    {
+        path: '/knowledge6', //排查检修方案
+        name: 'knowledge6',
+        component: () =>
+            import ('../views/Knowledge/Knowledge6.vue'),
+    },
+    {
+        path: '/knowledge7', //预警知识
+        name: 'knowledge7',
+        component: () =>
+            import ('../views/Knowledge/Knowledge7.vue'),
+    },
+    {
+        path: '/allLifeManage', // 全生命周期管理
+        name: 'allLifeManage',
+        component: () =>
+            import ('../views/allLifeManage/index.vue'),
+    },
+    {
+        path: "/health/health8",
+        name: "health8",
+        component: () =>
+            import ( /* webpackChunkName: "health8" */ "../views/HealthControl/Health8.vue"),
+    },
+    {
+        path: "/monitor/sandtable",
+        name: "sandtable",
+        component: () =>
+            import ( /* webpackChunkName: "sandtable" */ "../views/SandTable/SandTable.vue"),
+    },
+    {
+        path: "/warnStatistics", // 预警评判分析
+        name: "warnStatistics",
+        component: () =>
+            import ( /* webpackChunkName: "warnStatistics" */ "../views/warnStatistics/index.vue"),
+    },
+    {
+        path: "/malfunctionStatistics", // 故障评判分析
+        name: "malfunctionStatistics",
+        component: () =>
+            import ( /* webpackChunkName: "malfunctionStatistics" */ "../views/malfunctionStatistics/index.vue"),
+    },
+    {
+        path: "/planPower", // 计划发电量填报
+        name: "planPower",
+        component: () =>
+            import ( /* webpackChunkName: "planPower" */ "../views/planPower/index.vue"),
+    },
+    {
+        path: "/new/pf1",
+        name: "pf1",
+        component: () =>
+            import ( /* webpackChunkName: "pf1" */ "../views/NewPages/power-forecast-1.vue"),
+    },
+    {
+        path: "/new/fs",
+        name: "fs",
+        component: () =>
+            import ( /* webpackChunkName: "fs" */ "../views/NewPages/forecast-system.vue"),
+    },
+    {
+        path: '/new/ztfx', // 专题分析
+        name: 'ztfx',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/ztfx.vue'),
+    },
+    {
+        path: '/new/fnlyl', // 风能利用率
+        name: 'fnlyl',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/fnlyl.vue'),
+    },
+    {
+        path: '/new/whssl', // 维护损失率
+        name: 'whssl',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/whssl.vue'),
+    },
+    {
+        path: '/new/gzssl', // 故障损失率
+        name: 'gzssl',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/gzssl.vue'),
+    },
+    {
+        path: '/new/xdssl', // 限电损失率
+        name: 'xdssl',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/xdssl.vue'),
+    },
+    {
+        path: '/new/xnssl', // 性能损失率
+        name: 'xnssl',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/xnssl.vue'),
+    },
+    {
+        path: '/new/slssl', // 受累损失率
+        name: 'slssl',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/slssl.vue'),
+    },
+    {
+        path: '/new/mtbf', // mtbf
+        name: 'mtbf',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/mtbf.vue'),
+    },
+    {
+        path: '/new/mttr', // mttr
+        name: 'mttr',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/mttr.vue'),
+    },
+    {
+        path: '/new/zfwjsl', // 复位及时率
+        name: 'zfwjsl',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/fwjsl.vue'),
+    },
+    {
+        path: '/new/zztzhl', // 状态转换率
+        name: 'zztzhl',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/ztzhl.vue'),
+    },
+    {
+        path: '/new/zxqjsl', // 消缺及时率
+        name: 'zxqjsl',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/xqjsl.vue'),
+    },
+    {
+        path: '/new/zfdl', // 发电量分析
+        name: 'zfdl',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/fdl.vue'),
+    },
+    {
+        path: '/new/zzhcydl', // 综合场用电量
+        name: 'zzhcydl',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/specific/zhcydl.vue'),
+    },
+    {
+        path: '/new/intelligentalarmcenter',
+        name: 'intelligentalarmcenter',
+        component: () =>
+            import ( /* webpackChunkName: "intelligentalarmcenter" */ '../views/NewPages/intelligent-alarm-center.vue'),
+    },
+    {
+        path: '/new/personnel',
+        name: 'personnel',
+        component: () =>
+            import ( /* webpackChunkName: "personnel" */ '../views/NewPages/personnel.vue'),
+    },
+    {
+        path: '/new/znzhfx/:wtId/:year/:month',
+        name: 'znzhfx',
+        component: () =>
+            import ( /* webpackChunkName: "ztfx" */ '../views/NewPages/znzhfx.vue'),
+    },
+    {
+        path: '/new/alarmcenter',
+        name: 'alarmcenter',
+        component: () =>
+            import ( /* webpackChunkName: "personnel" */ '../views/NewPages/alarm-center.vue'),
+    },
+    {
+        path: '/new/knowledgebase',
+        name: 'knowledgebase',
+        component: () =>
+            import ( /* webpackChunkName: "knowledgebase" */ '../views/NewPages/knowledge-base.vue'),
+    },
+    {
+        path: "/new/dj",
+        name: "dj",
+        component: () =>
+            import ( /* webpackChunkName: "dj" */ "../views/NewPages/dj.vue"),
+    },
+    {
+        path: "/new/dj2",
+        name: "dj2",
+        component: () =>
+            import ( /* webpackChunkName: "dj2" */ "../views/NewPages/dj2.vue"),
+    },
+    {
+        path: "/new/dialog",
+        name: "dialog",
+        component: () =>
+            import ( /* webpackChunkName: "dj2" */ "../views/NewPages/dialogs.vue"),
+    }, // 三率管理/复位及时率
+    {
+        path: '/fwjsl',
+        name: 'fwjsl',
+        component: () =>
+            import ('../views/Decision/slgl/fwjsl.vue')
+    },
+    // 三率管理/状态转换率
     {
-        path: "/alarmCenter/boosterAlarm",
-        name: "boosterAlarm",
-        component: () => import("../views/alarmCenter/boosterAlarm.vue")
+        path: '/ztzhl',
+        name: 'ztzhl',
+        component: () =>
+            import ('../views/Decision/slgl/ztzhl.vue')
     },
-    // 报警中心-SCADA报警
+    // 三率管理/消缺及时率
     {
-        path: "/alarmCenter/scadaAlarm",
-        name: "scadaAlarm",
-        component: () => import("../views/alarmCenter/scadaAlarm.vue")
+        path: '/xqjsl',
+        name: 'xqjsl',
+        component: () =>
+            import ('../views/Decision/slgl/xqjsl.vue')
     },
-    // 报警中心-自定义报警
+    // 曲线排行榜
     {
-        path: "/alarmCenter/customAlarm",
-        name: "customAlarm",
-        component: () => import("../views/alarmCenter/customAlarm.vue")
+        path: '/qxpclfx',
+        name: 'qxpclfx',
+        component: () =>
+            import ('../views/nxfx/qxpclfx.vue')
     },
-    // 报警中心-自定义报警统计
+    // 等级评估(单机等级评估管理-量化评级)
     {
-        path: "/alarmCenter/customStatistics",
-        name: "customStatistics",
-        component: () => import("../views/alarmCenter/customStatistics.vue")
+        path: '/djpg',
+        name: 'djpg',
+        component: () =>
+            import ('../views/HealthControl/gradeassessment.vue')
+    },
+    {
+        path: "/new/powerforecast2",
+        name: "powerforecast2",
+        component: () =>
+            import ( /* webpackChunkName: "powerforecast2" */ "../views/NewPages/power-forecast-2.vue"),
+    },
+    {
+        path: "/new/alarmcenter1",
+        name: "alarmcenter1",
+        component: () =>
+            import ( /* webpackChunkName: "alarmcenter1" */ "../views/NewPages/alarm-center-1.vue"),
+    },
+    {
+        path: "/new/tjsj",
+        name: "tjsj",
+        component: () =>
+            import ( /* webpackChunkName: "tjsj" */ "../views/warn/tjsj.vue"),
+    },
+    {
+        path: "/new/xdgl",
+        name: "xdgl",
+        component: () =>
+            import ( /* webpackChunkName: "xdgl" */ "../views/warn/xdgl.vue"),
+    },
+    {
+        path: "/new/alarmcenter2",
+        name: "alarmcenter2",
+        component: () =>
+            import ( /* webpackChunkName: "alarmcenter2" */ "../views/NewPages/alarm-center-2.vue"),
+    },
+    {
+        path: "/new/historysearch",
+        name: "historysearch",
+        component: () =>
+            import ( /* webpackChunkName: "historysearch" */ "../views/NewPages/history-search.vue"),
+    },
+    {
+        path: "/new/matrix",
+        name: "matrix",
+        component: () =>
+            import ( /* webpackChunkName: "matrix" */ "../views/NewPages/Matrix-Detail.vue"),
+    },
+	{
+        path: "/new/matrix",
+        name: "matrix",
+        component: () =>
+            import ( /* webpackChunkName: "matrix" */ "../views/NewPages/Matrix-Detail.vue"),
     },
 ]
 const router = createRouter({

src/views/HealthControl/Health0.vue

@@ -69,7 +69,7 @@
               <div class="fan-code-label font-md gray-l">低频：</div>
               <div class="fan-code-value font-md green">{{stoptypemap && stoptypemap.top3type}}</div>
             </div>
-            <span class="svg-icon svg-icon-white svg-icon-md mg-l-16">
+            <!-- <span class="svg-icon svg-icon-white svg-icon-md mg-l-16">
               <SvgIcon svgid="svg-wind-site"></SvgIcon>
             </span>
             <div class="fan-code bg">
@@ -77,7 +77,7 @@
             </div>
             <div class="fan-code">
               <div class="fan-code-value nm font-md green">{{stoptypemap && stoptypemap.wtscore}}</div>
-            </div>
+            </div> -->
             <button class="btn mg-l-16" type="button"  @click="onClickReport()">
               <i class="el-icon-s-order mg-r-8"></i><span>健康报告</span>
             </button>
@@ -99,9 +99,9 @@
           </el-col>
           <el-col :span="6"></el-col>
           <el-col :span="6"></el-col>
-          <!-- <el-col :span="6">
-            <progress-bar title="风机" name="风机健康度" :progress='partmap && partmap.fj.smsyl' :color="partmap &&color(partmap.fj.jkzt)"></progress-bar>
-          </el-col> -->
+          <el-col :span="6">
+            <progress-bar title="风机" name="风机健康度" :progress='stoptypemap && stoptypemap.wtscore' :color="stoptypemap &&color('05bb4c')"></progress-bar>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="6" class="mg-t-16">
@@ -713,9 +713,9 @@ export default {
     };
   },
   created() {
-      this.search()
-        this.wtid = this.$route.params.wtId;
-        this.wpid = this.$route.params.wpId;
+    this.wtid = this.$route.params.wtId;
+    this.wpid = this.$route.params.wpId;
+    this.search()
   },
   methods: {
     // 查看健康报告

src/views/HealthControl/Health10.vue

@@ -581,7 +581,6 @@ export default {
       that.API.requestData({
         method: "POST",
         subUrl: "healthsub/findPowerChar",
-        timeout: 300000,
         data: {
           wtId: that.wtId
         },
@@ -617,8 +616,6 @@ export default {
           });
           that.powerChartData.value = chartData;
           that.powerChartData.units = chartUnits;
-
-          console.log(123123,chartData)
         }
       });
     },

src/views/HealthControl/Health4.vue

@@ -31,6 +31,7 @@ export default {
   data() {
     return {
       activeIndex:0,
+      wpId:"",
       wtId:"",
       menuDatas: [{
         icon: "svg-agc",
@@ -50,8 +51,9 @@ export default {
 
   created() {
    this.wtId = this.$route.params.wtId;
+   this.wpId = this.$route.params.wpId;
    this.menuDatas.forEach(ele=>{
-     ele.path += ('/'+this.wtId);
+     ele.path += ('/'+this.wpId + '/'+this.wtId);
    });
   },
   

src/views/HealthControl/Health5.vue

@@ -89,7 +89,7 @@ export default {
     },
     // 跳转按钮
     onClickJump(item){
-      console.warn(item);
+      // console.warn(item);
        this.$router.push({
         path: `/health/health0/${item.wpId}/${item.wtId}`
       });

src/views/HealthControl/healthLineChart.vue

@@ -17,6 +17,7 @@ export default {
 
   created() {
     this.wtId = this.$route.params.wtId;
+    this.wpId = this.$route.params.wpId;
     this.requestData();
   },
   

src/views/HealthControl/healthLineChart2.vue

@@ -69,11 +69,13 @@ export default {
       bardata: { area: [], legend: [], data: [] }, // 损失电量分析echart数值
       lineData: [],
       wtId: undefined,
+      wpId: undefined,
       hisValue: {},  //健康走势图
     };
   },
   created() {
     this.wtId = this.$route.params.wtId;
+    this.wpId = this.$route.params.wpId;
     this.requestCoulometry(2)
     this.requestHisValue()
     this.requestMttrrand()

src/views/NewPages/dj1.vue

@@ -472,7 +472,7 @@ import RadarChart from "../../components/chart/radar/radar-chart.vue";
 import panel from "../../components/coms/panel/panel.vue";
 import Table from "../../components/coms/table/table.vue";
 export default {
-  components: { panel, AreaBarChart, MultipleBarLineChart, Table, MarkerLineChart, DirectionRadarChart, DualPieChart, RadarChart },
+  components: { panel, AreaLineChart, MultipleBarLineChart, Table, MarkerLineChart, DirectionRadarChart, DualPieChart, RadarChart },
   setup() {},
   data() {
     return {

src/views/WindSite/pages/BoosterStation.vue

@@ -56,8 +56,8 @@ export default {
   methods: {
     select(res) {
       this.$router.replace({
-        path: `/monitor/windsite/boosterstation/${res.code}`,
-      });
+      path: `/monitor/windsite/boosterstation/${res.code}`,
+    });
     },
     getWp() {
       let that = this;

src/views/WindSite/pages/GeneralAppearance.vue

@@ -18,6 +18,7 @@
           <img src="../../../assets/map/fan/black.png" />
           <span class="sub-title gray">接入台数</span>
           <span class="sub-count font-num white">{{wpnumMap.jrts}}</span>
+          
         </div>
         <div class="sub-title-item">
           <img src="../../../assets/map/fan/green.png" />