Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

src/router/index.js

@@ -384,7 +384,7 @@ const routes = [
             {
                 path: '/Scheduling/AnnualParam',
                 name: 'AnnualParamPage',
-                component:()=>import('@/views/SchedulingPage/AnnualParamPage.vue'),
+                component: () => import('@/views/SchedulingPage/AnnualParamPage.vue'),
                 meta: {
                     title: '年度参数'
                 }
@@ -405,86 +405,104 @@ const routes = [
                 meta: {
                     title: '天气工况管理'
                 }
+
+            }, {
+                path: '/Scheduling/InstantHeat',
+                name: 'InstantHeatPage',
+                component: () => import('@/views/SchedulingPage/InstantHeatPage.vue'),
+                meta: {
+                    title: '瞬时热量对比配置'
+                }
             }
-<<<<<<< HEAD
-=======
-        },{
-            path: '/Scheduling/InstantHeat',
-            name: 'InstantHeatPage',
-            component: () => import('@/views/SchedulingPage/InstantHeatPage.vue'),
-            meta: {
-                title: '瞬时热量对比配置'
-            }
-        },
-        {
-            path: '/Scheduling/WindManage',
-            name: 'Phenomenon',
-            component: () => import('../views/SchedulingPage/WindManagePage.vue'),
-            meta: {
-                title: '风力配置管理'
-            }
-        }
->>>>>>> 21138bfaa9093e9c1562a373e453c9b1618084d9
         ]
     },
     {
         path: '/About',
-        name: "/About",
-        component: AboutPage
-    },
+        name:
+            "/About",
+        component:
+        AboutPage
+    }
+    ,
     {
         path: '/GisHome',
-        name: '/GisHome',
-        component: () => import('@/views/Gis/screenDisplay.vue'),
-        meta: {
-            title: '地图'
-        }
-    },
-    //捕获404路由
+        name:
+            '/GisHome',
+        component:
+            () => import('@/views/Gis/screenDisplay.vue'),
+        meta:
+            {
+                title: '地图'
+            }
+    }
+    ,
+//捕获404路由
     {
         path: '/:pathMatch(.*)*',
-        name: 'NotFound',
-        component: () => import('@/views/404.vue')
-    },
+        name:
+            'NotFound',
+        component:
+            () => import('@/views/404.vue')
+    }
+    ,
     {
         path: '/TransferArt',
-        name: '/TransferArt',
-        component: () => import('@/components/art/TransferArt.vue'),
-        meta: {
-            title: '换热站工艺图'
-        }
-    },
+        name:
+            '/TransferArt',
+        component:
+            () => import('@/components/art/TransferArt.vue'),
+        meta:
+            {
+                title: '换热站工艺图'
+            }
+    }
+    ,
     {
         path: '/BoilerArt',
-        name: '/BoilerArt',
-        component: () => import('@/components/art/BoilerArt.vue'),
-        meta: {
-            title: '锅炉工艺图'
-        }
-    },
+        name:
+            '/BoilerArt',
+        component:
+            () => import('@/components/art/BoilerArt.vue'),
+        meta:
+            {
+                title: '锅炉工艺图'
+            }
+    }
+    ,
     {
         path: '/AllBoilerArt',
-        name: 'AllBoilerArt',
-        component: () => import('@/components/art/AllBoilerArt.vue'),
-        meta: {
-            title: '锅炉全景工艺图'
-        }
-    },
+        name:
+            'AllBoilerArt',
+        component:
+            () => import('@/components/art/AllBoilerArt.vue'),
+        meta:
+            {
+                title: '锅炉全景工艺图'
+            }
+    }
+    ,
     {
         path: '/MeasurementArt',
-        name: 'MeasurementArt',
-        component: () => import('@/components/art/MeasurementArt.vue'),
-        meta: {
-            title: '计量站全景工艺图'
-        }
-    },
+        name:
+            'MeasurementArt',
+        component:
+            () => import('@/components/art/MeasurementArt.vue'),
+        meta:
+            {
+                title: '计量站全景工艺图'
+            }
+    }
+    ,
     {
         path: '/Visualizations',
-        name: 'Visualizations',
-        component: () => import('@/views/Visualizations/index.vue'),
-        meta: {
-            title: '可视化'
-        }
+        name:
+            'Visualizations',
+        component:
+            () => import('@/views/Visualizations/index.vue'),
+        meta:
+            {
+                title: '可视化'
+            }
     }
 ]
 

src/views/SchedulingPage/AnalysisManage.vue

-<template>
-    生产与结算数据分析表
-</template>
\ No newline at end of file

src/views/SchedulingPage/AnnualParam.vue

-<template>
-    年度参数管理
-</template>
\ No newline at end of file

src/views/SchedulingPage/ConfigBoiler.vue

-<template>
-    锅炉参数配置
-</template>
\ No newline at end of file

src/views/SchedulingPage/EnergyManage.vue

-<template>
-    能源消耗
-</template>
\ No newline at end of file

src/views/SchedulingPage/InstantHeat.vue

-<template>
-    瞬时热量对比配置
-</template>
\ No newline at end of file

src/views/SchedulingPage/Phenomenon.vue

-<template>
-    天气工况
-</template>
\ No newline at end of file

src/views/SchedulingPage/WeatherManage.vue

-<template>
-    气象干预
-</template>
\ No newline at end of file

src/views/SchedulingPage/WindManage.vue

-<template>
-    风力配置管理
-</template>
\ No newline at end of file