解决冲突

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