能源消耗接口-第二次提交

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 => {
@@ -27,27 +33,46 @@ 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);
   })
@@ -57,8 +82,18 @@ 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
+}
 
 
 export const getWeatherMagData = () => { // 获取气象干预数据
@@ -70,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 => {  // 修改年度参数
@@ -82,6 +125,18 @@ 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)
 }
 
@@ -92,12 +147,36 @@ export const deleteAnnualParam = params => {  // 删除年度参数
 
 export const getPhenomenon = () => { // 获取数据列表————天气工况
     return http.post('/api/Scheduling/WeatherCondition/Get')
+>>>>>>> 4ac876ed216e6184e11a156638cd9a19a43ddb02
 }
 
+export const addPhenomenon = params => {  // 新增数据————天气工况
+    return http.post('/api/Scheduling/WeatherCondition/Add', params)
+}
 export const alterPhenomenon = params => {  // 修改数据————天气工况
   return http.post('/api/Scheduling/WeatherCondition/Update', 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 = () => { // 获取数据列表————风力配置
+    return http.post('/api/Scheduling/WindConfiguration/Get')
+}
+
+export const addWind = params => {  // 新增数据————风力配置
+    return http.post('/api/Scheduling/WindConfiguration/Add', params)
+}
+
+export const alterWind = params => {  // 修改数据————风力配置
+    return http.post('/api/Scheduling/WindConfiguration/Update',params)
+}
+
+export const deleteWind = params => {  // 删除数据————风力配置
+    return http.post(`/api/Scheduling/WindConfiguration/Delete?Id=${params}`)
 }

src/views/SchedulingPage/AnnualParamPage.vue

@@ -16,6 +16,7 @@ const reviseWindowOpen = ref(false)
 const addWindowOpen = ref(false)
 const reviseForm = ref({})
 const addForm = ref({
+  supplyId:"00000000-0000-0000-0000-000000000000",
   energyType:'',
   year:'',
   standard:'',

src/views/SchedulingPage/PhenomenonPage.vue

 <script setup>
 import {onMounted, ref} from "vue";
 import {ElMessageBox} from "element-plus";
-import {getPhenomenon,alterPhenomenon,deletePhenomenon} from "@/api/scheduling.js"
+import {getPhenomenon,addPhenomenon,alterPhenomenon,deletePhenomenon} from "@/api/scheduling.js"
 
 const data = ref()
 const searchKey = ref('') // 查询参数
 const reviseWindowOpen = ref(false)
+const addWindowOpen = ref(false)
 const reviseForm = ref({}) // 修改表单
+const addForm = ref({}) // 新增表单
 const tableHeaderClass = data => {  // 表头样式
   return 'table-header-class'
 }
@@ -14,6 +16,9 @@ const tableBodyClass = data => {   // 表体样式
   return 'table-body-class'
 }
 
+function add(){
+  addWindowOpen.value = true
+}  // 新增按钮单击事件
 function revise(val){
   reviseForm.value = {...val}
   reviseWindowOpen.value = true
@@ -36,6 +41,8 @@ function omit(val){
 } // 删除按钮单击事件
 function handleClose(){
   reviseWindowOpen.value = false
+  addWindowOpen.value = false
+  resetInput()
 } // 关闭弹窗
 function onReviseSubmit(){
   alterPhenomenon(reviseForm.value).then(res=>{
@@ -43,7 +50,20 @@ function onReviseSubmit(){
     reviseWindowOpen.value = false
   })
 } // 修改表单提交
-
+function onAddSubmit(){
+  addPhenomenon(addForm.value).then(res=>{
+    handleClose()
+    getData()
+  })
+} // 新增表单提交
+function resetInput(){
+  addForm.value = {
+    phenomenonName: '',
+    phenomenonType: '',
+    phenomenonTemp: '',
+    phenomenonDesc: ''
+  }
+} // 清空新增表单输入框
 
 onMounted(()=>{
   getData()
@@ -65,6 +85,7 @@ function getData(){
       </el-col>
     </el-row>
     <el-button type="primary" class="add-search-btn">查询</el-button>
+    <el-button type="primary" @click="add" class="add-search-btn">新增</el-button>
   </div>
   <div class="table-wrapper">
     <el-table
@@ -105,6 +126,16 @@ function getData(){
             </el-select>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8" col-label class="energy-type-class">类型：</el-col>
+          <el-col :span="16" col-value>
+            <el-select placeholder="" size="small" v-model="reviseForm.phenomenonType" style="width: 370px">
+              <el-option value="1" label="1"/>
+              <el-option value="2" label="2"/>
+              <el-option value="3" label="3"/>
+            </el-select>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="8" col-label>对应温度：</el-col>
           <el-col :span="16" col-value>
@@ -125,6 +156,52 @@ function getData(){
         </div>
       </template>
     </el-dialog>   <!-- 修改弹窗 -->
+    <el-dialog
+        title="天气工况设置新增"
+        v-model="addWindowOpen"
+        width="700px"
+        :before-close="handleClose">
+      <template #default>
+        <el-row first>
+          <el-col :span="8" col-label class="energy-type-class">名称：</el-col>
+          <el-col :span="16" col-value>
+            <el-select placeholder="" size="small" v-model="addForm.phenomenonName" style="width: 370px">
+              <el-option value="晴天" label="晴天"/>
+              <el-option value="多云" label="多云"/>
+              <el-option value="阴天" label="阴天"/>
+            </el-select>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8" col-label class="energy-type-class">类型：</el-col>
+          <el-col :span="16" col-value>
+            <el-select placeholder="" size="small" v-model="addForm.phenomenonType" style="width: 370px">
+              <el-option value="1" label="1"/>
+              <el-option value="2" label="2"/>
+              <el-option value="3" label="3"/>
+            </el-select>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8" col-label>对应温度：</el-col>
+          <el-col :span="16" col-value>
+            <el-input v-model="addForm.phenomenonTemp" placeholder="" style="width: 370px"/>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8" col-label>描述：</el-col>
+          <el-col :span="16" col-value>
+            <el-input v-model="addForm.phenomenonDesc" placeholder="" style="width: 370px"/>
+          </el-col>
+        </el-row>
+      </template>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onAddSubmit">保存</el-button>
+          <el-button type="primary" @click="handleClose">关闭</el-button>
+        </div>
+      </template>
+    </el-dialog>   <!-- 新增弹窗 -->
   </div>
 </div>
 </template>