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

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 => {
+//   return http.post(`/api/energy/Delete`,{params:{EnergyId}}).then(res => res).catch(function (error) {
+//       console.log(error);
+//   })
+// }
 export const postEnergyDel = params => {
-  return http.post('/api/energy/getData', {
-    params:{params}
-  }).then(res => res).catch(function (error) {
+  return http.post(`/api/energy/Delete`, params).then(res => res).catch(function (error) {
+    console.log(error);
+  })
+}
+
+// 能源消耗-修改
+export const postEnergyUpdate = params => {
+  return http.post(`/api/energy/Save`, params).then(res => res).catch(function (error) {
     console.log(error);
   })
 }
@@ -17,27 +33,56 @@ export const postEnergyDel = 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);
+  })
+}
+
+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);
     })
@@ -47,6 +92,7 @@ export const postEnergyManageSave = params => {
     return http.post(`/api/energy/Save`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
+>>>>>>> 4ac876ed216e6184e11a156638cd9a19a43ddb02
 }
 
 
@@ -59,11 +105,19 @@ 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 => {  // 修改年度参数
@@ -71,6 +125,7 @@ export const alterAnnualParam = params => {  // 修改年度参数
 }
 
 export const addAnnualParam = params => {  // 新增年度参数
+<<<<<<< HEAD
   return http.post('/api/Scheduling/BizHeatSet/Add', params)
 }
 
@@ -81,6 +136,18 @@ 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')
+>>>>>>> 4ac876ed216e6184e11a156638cd9a19a43ddb02
 }
 
 export const addPhenomenon = params => {  // 新增数据————天气工况
@@ -91,7 +158,11 @@ 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 = () => { // 获取数据列表————风力配置

src/views/SchedulingPage/EnergyManagePage.vue

@@ -5,19 +5,12 @@ import axios from 'axios'
 import { Search, Document } from "@element-plus/icons-vue"
 import { postEnergyManage, postSecAbsTUc, postEnergyManageSave, postEnergyDel } from "@/api/scheduling"
 import http from '../../api/http'
-// const { proxy } = getCurrentInstance()
+const { proxy } = getCurrentInstance()
 const tableData = ref([{}])
 const formEnergy = reactive({})
 const energyForm = ref()
 const dialogVisible = ref(false)
 const getEnergyData = async () => {
-  // const data = await proxy.$api.getEnergyData(config)
-  // const data = await postSecAbsTUc(config)
-  // console.log(data);
-  // const data = postEnergyManage(tableData.energyType=["0","1","2","3","4"])
-  // console.log(data);
-  // const data = await postEnergyManageSave(formEnergy.value)
-
   await http.post("/api/energy/getData", tableData.energyType = ["0", "1", "2", "3", "4"]).then(res => {
     console.log("res:", res);
     tableData.value = res.data
@@ -112,38 +105,42 @@ const handleChange = (page) => {
 // 删除
 // const handleDelete = async (row) => {
 //   // console.log(row.energyId);
-//   // const energyId = row.energyId
+//   console.log('"'+row.energyId+'"');
 //   await ElMessageBox.confirm("你确定要删除吗？", {
 //     confirmButtonText: '确定',
 //     cancelButtonText: '取消',
 //     type: 'warning',
 //     confirmButtonClass: 'ExitConfirmButton'
-//   })
-
-//   await postEnergyDel(row.energyId)
+//   }).then(async () => {
+//     // await postEnergyDel('"'+row.energyId+'"')
+//     await postEnergyDel({EnergyId:row.energyId})
 //     ElMessage({
-//     type:'success',message:'删除成功'
+//       type: 'success', message: '删除成功'
 //     })
 //     getEnergyData()
+//   })
 // }
 
 // 删除
-const handleDelete = async (row) => {
-  await ElMessageBox.confirm("你确定要删除吗？", {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-    confirmButtonClass: 'ExitConfirmButton'
-  })
-  await http.post("api/energy/Delete", params:{EnergyId:row.energyId}, false).then(res => {
-    console.log(res);
-  }).then(res => {
-    ElMessage({
-      type: 'success', message: '删除成功'
-    })
-    getEnergyData()
-  })
-}
+// const handleDelete = async (row) => {
+//   console.log(row.energyId);
+//   console.log('"' + row.energyId + '"');
+//   let EnergyId = row.energyId
+//   await ElMessageBox.confirm("你确定要删除吗？", {
+//     confirmButtonText: '确定',
+//     cancelButtonText: '取消',
+//     type: 'warning',
+//     confirmButtonClass: 'ExitConfirmButton'
+//   })
+//   await http.post("api/energy/Delete?EnergyId="+'"'+row.energyId +'"',false ).then(res => {
+//     console.log(res);
+//   }).then(res => {
+//     ElMessage({
+//       type: 'success', message: '删除成功'
+//     })
+//     getEnergyData()
+//   })
+// }
 
 
 // 新增
@@ -184,8 +181,19 @@ const onSubmit = () => {
       formEnergy.recordDate = /^\d{4}-\d{2}-\d{2}$/.test(formEnergy.recordDate) ? formEnergy.recordDate : timeFormat(formEnergy.recordDate)
       if (action.value === 'add') {
         // res = await proxy.$api.addEnergy(formEnergy)
-        res = postEnergyManageSave(formEnergy)
+        // res =await postEnergyManageSave(formEnergy.value)
+        // console.log(res);
+
+        await http.post("api/energy/Save",formEnergy.value , false).then(res => {
           console.log(res);
+        }).then(res => {
+          ElMessage({
+            type: 'success', message: '新增成功'
+          })
+          getEnergyData()
+        })
+
+
 
 
         if (res) {
@@ -195,7 +203,9 @@ const onSubmit = () => {
         }
       } else {
         // res = await proxy.$api.editEnergy(formEnergy)
-        // proxy.$refs['energyForm'].resetFields()
+        res = postEnergyManageSave(formEnergy.value)
+        console.log(res);
+        proxy.$refs['energyForm'].resetFields()
         dialogVisible.value = false
 
         getEnergyData()