解决冲突

src/api/scheduling.js

 import http from './http'
 //能源消耗-获取
 export const postEnergyManage = params => {
-<<<<<<< HEAD
     return http.post(`/api/energy/getData`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
-=======
-    return http.post(`/api/energy/getData`, params).then(res => res).catch(function (error) {
-        console.log(error);
-    })
->>>>>>> 4ac876ed216e6184e11a156638cd9a19a43ddb02
 }
 // 能源消耗-删除
 // export const postEnergyDel = EnergyId => {
@@ -33,46 +27,27 @@ export const postEnergyUpdate = params => {
 
 // 瞬时热量-获取列表
 export const postInstantHeat = params => {
-<<<<<<< HEAD
-  return http.post(`api/Scheduling/BizInstantaneousHeat/Get`).then(res => res).catch(function (error) {
-    console.log(error);
-  })
-=======
     return http.post(`api/Scheduling/BizInstantaneousHeat/Get`).then(res => res).catch(function (error) {
         console.log(error);
     })
->>>>>>> 4ac876ed216e6184e11a156638cd9a19a43ddb02
 }
 
 // 瞬时热量-新增修改
 export const postInstantHeatUpdate = params => {
-<<<<<<< HEAD
     return http.post(`api/Scheduling/BizInstantaneousHeat/Update`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
-=======
-    return http.post(`api/Scheduling/BizInstantaneousHeat/Update`, params).then(res => res).catch(function (error) {
-        console.log(error);
-    })
->>>>>>> 4ac876ed216e6184e11a156638cd9a19a43ddb02
 }
 
 // 参数设置
 export const postConfigBoilerUpdate = params => {
-<<<<<<< HEAD
     return http.post(`api/configboiler/Save`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
-=======
-    return http.post(`api/configboiler/Save`, params).then(res => res).catch(function (error) {
-        console.log(error);
-    })
->>>>>>> 4ac876ed216e6184e11a156638cd9a19a43ddb02
 }
 
 
 export const postSecAbsTUc = params => {
-<<<<<<< HEAD
     return http.post(`/api/analysis/external/SecAbsTUc`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
@@ -82,17 +57,6 @@ export const postEnergyManageSave = params => {
     return http.post(`/api/energy/Save`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
-=======
-    return http.post(`/api/analysis/external/SecAbsTUc`, params).then(res => res).catch(function (error) {
-        console.log(error);
-    })
-}
-
-export const postEnergyManageSave = params => {
-    return http.post(`/api/energy/Save`, params).then(res => res).catch(function (error) {
-        console.log(error);
-    })
->>>>>>> 4ac876ed216e6184e11a156638cd9a19a43ddb02
 }
 
 
@@ -105,19 +69,11 @@ export const alterWeatherMagData = params => { // 添加或修改气象干预数
 }
 
 export const getTransfer = param => { // 获取换热站列表
-<<<<<<< HEAD
     return http.post(`/api/cusweather/getTransferIds?id=${param}`, param)
 }
 
 export const getAnnualParam = () => { // 获取年度参数列表
     return http.post('/api/Scheduling/BizHeatSet/Get')
-=======
-    return http.post(`/api/cusweather/getTransferIds?id=${param}`, param)
-}
-
-export const getAnnualParam = () => { // 获取年度参数列表
-    return http.post('/api/Scheduling/BizHeatSet/Get')
->>>>>>> 4ac876ed216e6184e11a156638cd9a19a43ddb02
 }
 
 export const alterAnnualParam = params => {  // 修改年度参数
@@ -125,18 +81,6 @@ export const alterAnnualParam = params => {  // 修改年度参数
 }
 
 export const addAnnualParam = params => {  // 新增年度参数
-<<<<<<< HEAD
-  return http.post('/api/Scheduling/BizHeatSet/Add', params)
-}
-
-export const deleteAnnualParam = params => {  // 删除年度参数
-  // console.log("地址：",`/api/Scheduling/BizHeatSet/Delete?Id=${params}`)
-  return http.post(`/api/Scheduling/BizHeatSet/Delete?Id=${params}`)
-}
-
-export const getPhenomenon = () => { // 获取数据列表————天气工况
-  return http.post('/api/Scheduling/WeatherCondition/Get')
-=======
     return http.post('/api/Scheduling/BizHeatSet/Add', params)
 }
 
@@ -147,7 +91,6 @@ export const deleteAnnualParam = params => {  // 删除年度参数
 
 export const getPhenomenon = () => { // 获取数据列表————天气工况
     return http.post('/api/Scheduling/WeatherCondition/Get')
->>>>>>> 4ac876ed216e6184e11a156638cd9a19a43ddb02
 }
 
 export const addPhenomenon = params => {  // 新增数据————天气工况
@@ -158,11 +101,7 @@ export const alterPhenomenon = params => {  // 修改数据————天气工
 }
 
 export const deletePhenomenon = params => {  // 删除数据————天气工况
-<<<<<<< HEAD
-  return http.post(`/api/Scheduling/WeatherCondition/Delete?Id=${params}`)
-=======
     return http.post(`/api/Scheduling/WeatherCondition/Delete?Id=${params}`)
->>>>>>> 4ac876ed216e6184e11a156638cd9a19a43ddb02
 }
 
 export const getWind = () => { // 获取数据列表————风力配置