Merge branch 'master' of ssh://gitlab.91isoft.com:10022/hikvision/web-project

src/api/scheduling.js

 import http from './http'
 //能源消耗-获取
 export const postEnergyManage = params => {
-
   return http.post(`/api/energy/getData`, params).then(res => res).catch(function (error) {
     console.log(error);
   })
@@ -31,17 +30,10 @@ export const postInstantHeat = params => {
   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);
-  })
 }
 
 
 export const postInstantHeatUpdate = params => {
-
-  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);
   })
@@ -52,9 +44,6 @@ export const postConfigBoilerUpdate = params => {
   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);
-  })
 }
 
 
@@ -64,7 +53,22 @@ export const postSecAbsTUc = params => {
   })
 }
 
+export const postEnergyManageSave = params => {
+  return http.post(`/api/energy/Save`, 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);
+//     })
+// }
+
 
+export const getWeatherMagData = () => { // 获取气象干预数据
+    return http.get(`/api/cusweather/getData`)
+}
 
 export const alterWeatherMagData = params => { // 添加或修改气象干预数据/重新绑定换热站
   return http.post(`/api/cusweather/SaveAll`, params)
@@ -76,12 +80,8 @@ export const getTransfer = 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')
-// }
 
 export const alterAnnualParam = params => {  // 修改年度参数
   return http.post('/api/Scheduling/BizHeatSet/Update', params)
@@ -98,18 +98,8 @@ export const deleteAnnualParam = params => {  // 删除年度参数
 
 export const getPhenomenon = () => { // 获取数据列表————天气工况
   return http.post('/api/Scheduling/WeatherCondition/Get')
-  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')
-// }
-
 export const addPhenomenon = params => {  // 新增数据————天气工况
   return http.post('/api/Scheduling/WeatherCondition/Add', params)
 }

src/views/SchedulingPage/AnnualParamPage.vue

@@ -131,8 +131,8 @@ function resetInput() {
           <el-input clearable v-model="searchKey"/>
         </el-col>
       </el-row>
-      <el-button type="primary" class="add-search-btn" @click="handleAdd">新增</el-button>
       <el-button type="primary" class="add-search-btn" @click="handleSearch">查询</el-button>
+      <el-button type="primary" class="add-search-btn" @click="handleAdd">新增</el-button>
     </div>
     <div class="table-wrapper">
       <el-table

src/views/SchedulingPage/PhenomenonPage.vue

@@ -24,6 +24,13 @@ function revise(val){
   reviseForm.value = {...val}
   reviseWindowOpen.value = true
 } // 修改按钮单击事件
+function search(){
+  if(!searchKey.value){
+    getData()
+  }else {
+    data.value = dataBackup.value.filter(item => item.phenomenonName.includes(searchKey.value))
+  }
+}
 function omit(val){
   let id = val.phenomenonId
   ElMessageBox.confirm(
@@ -40,13 +47,6 @@ function omit(val){
     })
   }).catch(err=>{})
 } // 删除按钮单击事件
-function search(){
-  if(!searchKey.value){
-    getData()
-  }else {
-    data.value = dataBackup.value.filter(item => item.phenomenonName.includes(searchKey.value) )
-  }
-}
 function handleClose(){
   reviseWindowOpen.value = false
   addWindowOpen.value = false