能耗修改

src/api/energyManagement/energyManagement.js

@@ -65,10 +65,19 @@ export const getDetail = (params) => {
   });
 };
 
-// 提交
+// 新增
 export const submit = (params) => {
   return request({
-    url: '/blade-desk/bsEnergyTarget/submit',
+    url: '/blade-desk/bsEnergyTarget/save',
+    method: 'post',
+    data: params,
+  });
+};
+
+// 修改
+export const update = (params) => {
+  return request({
+    url: '/blade-desk/bsEnergyTarget/update',
     method: 'post',
     data: params,
   });

src/components/jh-select/index.vue

@@ -98,7 +98,6 @@ export default {
   },
   methods: {
     debounce(func, wait) {
-      console.log('22222222222222222')
       let timeout = null;
       return (...args) => {
         clearTimeout(timeout);

src/views/energyManagement/components/batchAddWater.vue

@@ -139,7 +139,7 @@
 </template>
 
 <script>
-import {getDetail,submit} from '@/api/energyManagement/energyManagement'
+import {getDetail,submit,update} from '@/api/energyManagement/energyManagement'
 export default {
     props:{
         showAdd:{
@@ -195,15 +195,18 @@ export default {
         }
     },
     mounted(){
-        this.openShow = this.showAdd
         if (this.moldAddMore && this.form.tableData.length === 0) {
             this.addTable();
+            this.openShow = this.showAdd
         }else{
             getDetail({
                 type:this.type == 'water' ? 1 : 2,
                 year:this.checkYear
             }).then(res =>{
+                res.data.data.originalYear = res.data.data.year
                 this.form.tableData = [res.data.data]
+                this.openShow = this.showAdd
+                console.log('form--------',this.form.tableData)
             })
         }
     },
@@ -256,16 +259,21 @@ export default {
                     submitData.map(item =>{
                         item.type = this.type == 'water' ? 1 : 2
                     })
-                }
 
                     submit(submitData).then(res =>{
                         if(res.data.code == 200){
-                        this.$message.success(this.checkYear == '' ? '新增成功' : '修改成功')
+                            this.$message.success('新增成功')
                             this.closeDialog(true)
                         }
                     })
-
+                }else{
-
+                    update(submitData[0]).then(res =>{
+                        if(res.data.code == 200){
+                            this.$message.success('修改成功')
+                            this.closeDialog(true)
+                        }
+                    })
+                }
             })
         }
     }

src/views/energyManagement/components/electricityTarget.vue

@@ -39,7 +39,6 @@
       templateName="用电目标模板.xls"
       importUrl="/blade-desk/bsEnergyTarget/electric-import-excel"
      @closeDialog="closeDialog"></basic-import>
-  </div>
     <batchAddWater
       v-if="showAdd" 
       type="electricity" 
@@ -48,6 +47,7 @@
       :checkYear="checkYear" 
       @closeDialog="closeDialog"
     ></batchAddWater>
+  </div>
 </template>
 <script>
 import basicImport from '@/components/basic-import/main.vue'
@@ -240,6 +240,7 @@ export default {
   },
   methods: {
     handleAdd(){
+      console.log('11111111111111111111')
       this.showAdd = true
       this.moldAddMore = true
     },
@@ -370,6 +371,20 @@ export default {
         type:2,
         ...this.query
       }).then(res =>{
+        res.data.data.records.map(item =>{
+          item.m01Target = item.m01Target == -1 ? 0 : item.m01Target
+          item.m02Target = item.m02Target == -1 ? 0 : item.m02Target
+          item.m03Target = item.m03Target == -1 ? 0 : item.m03Target
+          item.m04Target = item.m04Target == -1 ? 0 : item.m04Target
+          item.m05Target = item.m05Target == -1 ? 0 : item.m05Target
+          item.m06Target = item.m06Target == -1 ? 0 : item.m06Target
+          item.m07Target = item.m07Target == -1 ? 0 : item.m07Target
+          item.m08Target = item.m08Target == -1 ? 0 : item.m08Target
+          item.m09Target = item.m09Target == -1 ? 0 : item.m09Target
+          item.m10Target = item.m10Target == -1 ? 0 : item.m10Target
+          item.m11Target = item.m11Target == -1 ? 0 : item.m11Target
+          item.m12Target = item.m12Target == -1 ? 0 : item.m12Target
+        })
         this.data = res.data.data.records;
         this.page.total = res.data.data.total;
         this.loading = false;

src/views/energyManagement/components/waterTarget.vue

@@ -387,6 +387,20 @@ export default {
         console.log('res.data:', res.data);
 
         if (res.data && res.data.data) {
+          res.data.data.records.map(item =>{
+            item.m01Target = item.m01Target == -1 ? 0 : item.m01Target
+            item.m02Target = item.m02Target == -1 ? 0 : item.m02Target
+            item.m03Target = item.m03Target == -1 ? 0 : item.m03Target
+            item.m04Target = item.m04Target == -1 ? 0 : item.m04Target
+            item.m05Target = item.m05Target == -1 ? 0 : item.m05Target
+            item.m06Target = item.m06Target == -1 ? 0 : item.m06Target
+            item.m07Target = item.m07Target == -1 ? 0 : item.m07Target
+            item.m08Target = item.m08Target == -1 ? 0 : item.m08Target
+            item.m09Target = item.m09Target == -1 ? 0 : item.m09Target
+            item.m10Target = item.m10Target == -1 ? 0 : item.m10Target
+            item.m11Target = item.m11Target == -1 ? 0 : item.m11Target
+            item.m12Target = item.m12Target == -1 ? 0 : item.m12Target
+          })
           this.data = res.data.data.records || [];
           this.page.total = res.data.data.total || 0;
           console.log('数据处理成功:', {