解决冲突

src/views/AlarmPage/AlarmStatusPage.vue

@@ -127,7 +127,7 @@
                 <th style="width: 25%">报警上上限：</th>
                 <td style="width: 60%; margin: 0; padding: 0">
                   <table cellpadding="0" cellspacing="0">
-                    <tr>
+                    <tr height="60px">
                       <td style="text-align: left">
                         <el-form-item prop="topMost">
                           <el-input v-float-number style="width: 80%" v-model="addParams.topMost"></el-input>
@@ -141,7 +141,7 @@
                 <th style="width: 25%">报警上限：</th>
                 <td style="width: 60%; margin: 0; padding: 0">
                   <table cellpadding="0" cellspacing="0">
-                    <tr>
+                    <tr height="60px">
                       <td style="text-align: left">
                         <el-form-item prop="upper">
                           <el-input v-float-number style="width: 80%" v-model="addParams.upper"></el-input>
@@ -156,7 +156,7 @@
                 <th style="width: 25%">报警下限：</th>
                 <td style="width: 60%; margin: 0; padding: 0">
                   <table cellpadding="0" cellspacing="0">
-                    <tr>
+                    <tr height="60px">
                       <td style="text-align: left">
                         <el-form-item prop="lower">
                           <el-input v-float-number style="width: 80%" v-model="addParams.lower"></el-input>
@@ -170,7 +170,7 @@
                 <th style="width: 25%">报警下下限：</th>
                 <td style="width: 60%; margin: 0; padding: 0">
                   <table cellpadding="0" cellspacing="0">
-                    <tr>
+                    <tr height="60px">
                       <td style="text-align: left">
                         <el-form-item prop="downMost">
                           <el-input v-float-number style="width: 80%" v-model="addParams.downMost"></el-input>
@@ -226,7 +226,7 @@
 
           <div class="btngrounp">
             <div v-if="button">
-              <el-button :disabled="param.cnName === '' ? true : false" type="primary" @click="onAdd">添加</el-button>
+              <el-button :disabled="param.cnName === '' ? true : false" type="primary" :loading="btnLoading" @click="onAdd">添加</el-button>
               <el-button disabled type="primary" @click="onDel">删除</el-button>
             </div>
             <div v-else>
@@ -286,6 +286,7 @@ const roleId = ref(false)
 
 function open() {
   show.value = true
+  btnLoading.value=false
 }
 
 function onsubmit() {
@@ -719,8 +720,9 @@ const selectAfterParams = (row) => {
 // 添加 addParams中写三个类型相同的属性，根据类型和设备进行动态的删除和添加
 // 点击添加按钮要根据参数所属不同的类型和设备进行传参
 // 修改亦如此
-
+const btnLoading = ref(false)
 const onAdd = async () => {
+btnLoading.value = true
   // console.log("!!!!!!!", addParams.value);
   // 提交添加或修改-以上至少有一个选项有值
   if (addParams.value.topMost || addParams.value.upper || addParams.value.lower || addParams.value.downMost) {
@@ -747,6 +749,7 @@ const onAdd = async () => {
           param.value.cnName = ""
           form_control.value = true
           getCnNames()
+          btnLoading.value = false
         } else {
           ElMessage.error("操作失败")
         }
@@ -764,6 +767,7 @@ const onAdd = async () => {
           param.value.cnName = ""
           form_control.value = true
           getCnNames()
+          btnLoading.value = false
         } else {
           ElMessage.error("操作失败")
         }
@@ -782,6 +786,7 @@ const onAdd = async () => {
           param.value.cnName = ""
           form_control.value = true
           getCnNames()
+          btnLoading.value = false
         } else {
           ElMessage.error("操作失败")
         }
@@ -789,6 +794,7 @@ const onAdd = async () => {
     }
 
   } else {
+    btnLoading.value= false
     ElMessage.error("请至少输入一个报警上下限数值")
   }
 

src/views/SchedulingPage/ConfigBoilerPage.vue

@@ -10,7 +10,7 @@
                 <table cellpadding="0" cellspacing="0">
                   <tr>
                     <td style="text-align: left">
-                      <el-form-item prop="openingOfElectricValve">
+                      <el-form-item prop="openingOfElectricValve" style="padding: 0;margin: 0;">
                         <el-input v-float-number style="width: 80%; text-align: left"
                           v-model="formDatas.openingOfElectricValve">
                           <template #append>
@@ -39,7 +39,7 @@
                 <table cellpadding="0" cellspacing="0">
                   <tr>
                     <td style="text-align: left">
-                      <el-form-item prop="boilerOutletWaterTemperature">
+                      <el-form-item prop="boilerOutletWaterTemperature" style="padding: 0;margin: 0;">
                         <el-input style="width: 80%" v-model="formDatas.boilerOutletWaterTemperature">
                           <template #append>
                             <div style="width: 40px">℃</div>
@@ -57,7 +57,7 @@
                 <table cellpadding="0" cellspacing="0">
                   <tr>
                     <td style="text-align: left">
-                      <el-form-item prop="holdingTime">
+                      <el-form-item prop="holdingTime" style="padding: 0;margin: 0;">
                         <el-input v-float-number style="width: 80%" v-model="formDatas.holdingTime">
                           <template #append>
                             <div style="width: 40px">分钟</div>
@@ -75,7 +75,7 @@
                 <table cellpadding="0" cellspacing="0">
                   <tr>
                     <td style="text-align: left">
-                      <el-form-item prop="upperLlimitMainFlow">
+                      <el-form-item prop="upperLlimitMainFlow" style="padding: 0;margin: 0;">
                         <el-input v-float-number style="width: 80%" v-model="formDatas.upperLlimitMainFlow">
                           <template #append>
                             <div style="width: 40px">m3/h</div>
@@ -93,7 +93,7 @@
                 <table cellpadding="0" cellspacing="0">
                   <tr>
                     <td style="text-align: left">
-                      <el-form-item prop="lowerLlimitMainFlow">
+                      <el-form-item prop="lowerLlimitMainFlow" style="padding: 0;margin: 0;">
                         <el-input v-float-number style="width: 80%" v-model="formDatas.lowerLlimitMainFlow">
                           <template #append>
                             <div style="width: 40px">m3/h</div>
@@ -111,7 +111,7 @@
                 <table cellpadding="0" cellspacing="0">
                   <tr>
                     <td style="text-align: left">
-                      <el-form-item prop="maxTargetTemperature">
+                      <el-form-item prop="maxTargetTemperature" style="padding: 0;margin: 0;">
                         <el-input style="width: 80%" v-model="formDatas.maxTargetTemperature">
                           <template #append>
                             <div style="width: 40px">℃</div>
@@ -129,7 +129,7 @@
                 <table cellpadding="0" cellspacing="0">
                   <tr>
                     <td style="text-align: left">
-                      <el-form-item prop="bestHoldingTime">
+                      <el-form-item prop="bestHoldingTime" style="padding: 0;margin: 0;">
                         <el-input v-float-number style="width: 80%" v-model="formDatas.bestHoldingTime">
                           <template #append>
                             <div style="width: 40px">分钟</div>

src/views/SchedulingPage/EnergyManagePage.vue

@@ -123,6 +123,9 @@ const rules = reactive({
   recordDate: [{ required: true, message: "日期是必选项" }],
 });
 
+// 放重复点击操作
+const clicked = ref(false)
+
 // 删除
 const handleDelete = (row) => {
   console.log(row.energyId);
@@ -191,14 +194,15 @@ const onSubmit = () => {
         ? formEnergy.recordDate
         : timeFormat(formEnergy.recordDate);
       if (action.value === "add") {
-        http.post("api/energy/Save", { ...formEnergy.value }, false).then(res => {
+      http.post("api/energy/Save", { ...formEnergy.value }, false).then(res => {
+        loading.value = true
           if (res.success) {
             dialogVisible.value = false
             ElMessage.success(res.message)
             getEnergyData();
-            loading.value = false
           }
         })
+        loading.value = false
       } else {
         delete formEnergy.value.supplyName;
         formEnergy.value.updateNullFields = "";
@@ -343,12 +347,12 @@ onMounted(() => {
   </div>
   <el-dialog v-model="dialogVisible" :title="action == 'add' ? '数据新增' : '数据修改'" width="50%" :before-close="handleClose">
     <el-form :inline="true" :model="formEnergy" :rules="rules" ref="energyForm" :hide-required-asterisk="true">
-      <table cellpadding="0" cellspacing="1" style="background-color: #99bbe8">
+      <table cellpadding="0" cellspacing="1" style="background-color: #99bbe8 ; height: 50px;">
         <tr>
           <th style="width: 25%">供热站</th>
           <td style="width: 60%; margin: 0; padding: 0">
             <table cellpadding="0" cellspacing="0">
-              <tr>
+              <tr height="50px">
                 <td style="text-align: left">
                   <el-form-item prop="supplyName" style="margin: 0; padding: 0; width: 100%;">
                     <el-select v-model="formEnergy.supplyId" placeholder="请选择">
@@ -365,7 +369,7 @@ onMounted(() => {
           <th style="width: 25%">能源类型</th>
           <td style="width: 60%; margin: 0; padding: 0">
             <table cellpadding="0" cellspacing="0">
-              <tr>
+              <tr height="66px">
                 <td style="text-align: left">
                   <el-form-item prop="energyType" style="margin: 0; padding: 0; width: 100%">
                     <el-select v-model="formEnergy.energyType" placeholder="请选择">
@@ -385,7 +389,7 @@ onMounted(() => {
           <th style="width: 25%">能源用度</th>
           <td style="width: 60%; margin: 0; padding: 0">
             <table cellpadding="0" cellspacing="0">
-              <tr>
+              <tr height="66px">
                 <td style="text-align: left">
                   <el-form-item prop="record" style="margin: 0; padding: 0; width: 100%">
                     <el-input v-float-number v-model="formEnergy.record" placeholder="请输入能源用度" />
@@ -399,7 +403,7 @@ onMounted(() => {
           <th style="width: 25%">日期</th>
           <td style="width: 60%; margin: 0; padding: 0">
             <table cellpadding="0" cellspacing="0">
-              <tr>
+              <tr height="66px">
                 <td>
                   <el-form-item prop="recordDate" style="margin: 0; padding: 0; width: 100%">
                     <el-date-picker value-format="YYYY-MM-DD HH:mm:ss" v-model="formEnergy.recordDate" type="datetime"