Merge branch 'sl' of http://61.161.152.110:10101/r/electronic-map into yx

src/router/index.js

@@ -88,7 +88,6 @@ const routes = [{
 	},
 	{
 		path: '/decision3db', //单机横向对比
-		name: 'decision3db',
 		component: () => import( /* webpackChunkName: "decision3db" */
 			'../views/Decision/Decision3Db.vue'),
 	},
@@ -112,6 +111,17 @@ const routes = [{
 	]
 },
 {
+	path: '/decision3db', //单机横向对比
+	name: 'decision3db',
+	component: () => import( /* webpackChunkName: "decision3db" */
+		'../views/Decision/Decision3Db.vue'),
+},
+{
+	path: '/windAnalysis/fx', // 风向
+	name: 'fxzstmain',
+	component: () => import('../views/windAnalysis/fxzstmain.vue'),
+},
+{
 	path: '/monitor/lightmatrix', // 光伏明细矩阵
 	name: 'LightMatrix',
 	component: () =>