路由修改

src/router/index.js

@@ -777,7 +777,6 @@ const routes = [{
 		component: () =>
 			import( /* webpackChunkName: "malfunctionStatistics" */ "../views/malfunctionRecall/index.vue"),
 	}, {
-<<<<<<< HEAD
 		path: "/bjgltjb",
 		name: "bjgltjb",
 		component: () =>
@@ -811,581 +810,6 @@ const routes = [{
 			name: "phdffx",
 			component: () => import( /* webpackChunkName: "malfunctionStatistics" */ "../views/windAnalysis/phdffx.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: "/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: '/assess/index',
-	name: 'assessindex',
-	component: () => import('../views/HealthControl/assess/assessindex.vue')
-},
-{
-	path: '/assess/config',
-	name: 'assessconfig',
-	component: () => import('../views/HealthControl/assess/assessconfig.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: "/alarmCenter/boosterAlarm",
-	name: "boosterAlarm",
-	component: () => import("../views/alarmCenter/boosterAlarm.vue")
-},
-// 报警中心-SCADA报警
-{
-	path: "/alarmCenter/scadaAlarm",
-	name: "scadaAlarm",
-	component: () => import("../views/alarmCenter/scadaAlarm.vue")
-},
-// 报警中心-自定义报警
-{
-	path: "/alarmCenter/customAlarm",
-	name: "customAlarm",
-	component: () => import("../views/alarmCenter/customAlarm.vue")
-},
-// 报警中心-自定义报警统计
-{
-	path: "/alarmCenter/customStatistics",
-	name: "customStatistics",
-	component: () => import("../views/alarmCenter/customStatistics.vue")
-},
-{
-	path: "/malfunctionDiagnose", // 故障诊断
-	name: "customStatistics",
-	component: () => import("../views/malfunctionDiagnose/index.vue")
-},
-{
-	path: "/new/pb",
-	name: "pb",
-	component: () => import( /* webpackChunkName: "powerbenchmarking" */ "../views/NewPages/power-benchmarking.vue"),
-},
-{
-	path: "/powerCurve", // 功率曲线拟合
-	name: "powerCurve",
-	component: () => import( /* webpackChunkName: "powerCurve" */ "../views/powerCurve/index.vue"),
-}, {
-	path: "/tjfx",
-	name: "tjfx",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/tjfx.vue"),
-},
-{
-	path: "/bdzcx",
-	name: "bdzcx",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/bdzcx.vue"),
-},
-{
-	path: "/oafd",
-	name: "oafd",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/oafd.vue"),
-},
-{
-	path: "/oagf",
-	name: "oagf",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/oagf.vue"),
-},
-{
-	path: "/missfdrb",
-	name: "missfdrb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/missfdrb.vue"),
-},
-{
-	path: "/missgfrb",
-	name: "missgfrb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/missgfrb.vue"),
-},
-{
-	path: "/xnyfdscyb",
-	name: "xnyfdscyb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/xnyfdscyb.vue"),
-},
-{
-	path: "/mhsscyb",
-	name: "mhsscyb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/mhsscyb.vue"),
-},
-{
-	path: "/nssscyb",
-	name: "nssscyb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/nssscyb.vue"),
-},
-{
-	path: "/qsscyb",
-	name: "qsscyb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/qsscyb.vue"),
-},
-{
-	path: "/sbqscyb",
-	name: "sbqscyb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/sbqscyb.vue"),
-},
-{
-	path: "/xsscyb",
-	name: "xsscyb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/xsscyb.vue"),
-},
-{
-	path: "/xnygfscyb",
-	name: "xnygfscyb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/xnygfscyb.vue"),
-},
-{
-	path: "/dwkscyb",
-	name: "dwkscyb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/dwkscyb.vue"),
-},
-{
-	path: "/plscyb",
-	name: "plscyb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/plscyb.vue"),
-},
-{
-	path: "/xhscyb",
-	name: "xhscyb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/xhscyb.vue"),
-},
-{
-	path: "/fdczzdy",
-	name: "fdczzdy",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/fdczzdy.vue"),
-},
-{
-	path: "/fdxmzdy",
-	name: "fdxmzdy",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/fdxmzdy.vue"),
-},
-{
-	path: "/gfczzdy",
-	name: "gfczzdy",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/gfczzdy.vue"),
-},
-{
-	path: "/gfxmzdy",
-	name: "gfxmzdy",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/gfxmzdy.vue"),
-},
-{
-	path: "/xnyrb",
-	name: "xnyrb",
-	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/xnyrb.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: "/malfunctionRecall", // 故障回溯
-	name: "malfunctionRecall",
-	component: () =>
-		import( /* webpackChunkName: "malfunctionRecall" */ "../views/malfunctionRecall/index.vue"),
-}, {
-	path: "/bjgltjb",
-	name: "bjgltjb",
-	component: () =>
-		import( /* webpackChunkName: "bjgltjb" */ "../views/report/bjgltjb.vue"),
-},
-{
-	path: "/xzycfsdl",
-	name: "xzycfsdl",
-	component: () =>
-		import( /* webpackChunkName: "xzycfsdl" */ "../views/report/xzycfsdl.vue"),
-},
-{
-	path: "/nhycfsdl",
-	name: "nhycfsdl",
-	component: () =>
-		import( /* webpackChunkName: "nhycfsdl" */ "../views/report/nhycfsdl.vue"),
-}, {
-	path: "/globalMonitor", // 全局监视
-	name: "globalMonitor",
-	component: () =>
-		import( /* webpackChunkName: "globalMonitor" */ "../views/globalMonitor/index.vue"),
-},
-{
-	path: "/reportPandect", // 报表总览
-	name: "reportPandect",
-	component: () =>
-		import( /* webpackChunkName: "reportPandect" */ "../views/reportPandect/index.vue"),
-},
->>>>>>> 001b705a84d50a7bd820e7224e3f3a871d543b93
 ]
 const router = createRouter({
 	history: createWebHashHistory(),