Browse Source

fix:公司管理 , 区域管理 ,导出/模板下载字段增加修改 , 公司保存接口调整

chenxinlei 2 years ago
parent
commit
07ce722824

+ 1 - 1
src/api/station.js

@@ -8,7 +8,7 @@ const companys=(data)=>{
 }
 const addCompanys=(pairs)=>{
   return request({
-      url:`/save`,
+      url:`/companys`,
       method:"post",
       data: pairs
   })

+ 32 - 2
src/views/stationConfiguration/area/index.vue

@@ -147,8 +147,23 @@ export default {
           this.templateExcel = [
             {
               id: '',
+              companyid: '',
               name: '',
-              code: ''
+              aname: '',
+              windcapacity: '',
+              windcapacityunit: '',
+              windquantity: '',
+              capacity: '',
+              capacityunit: '',
+              quantityjz: '',
+              quantityzc: '',
+              jrwindcapacity: '',
+              jrwindcapacityunit: '',
+              jrwindquantity: '',
+              jrcapacity: '',
+              jrcapacityunit: '',
+              jrquantityjz: '',
+              jrquantityzc: '',
             }
           ]
           // 导出
@@ -156,8 +171,23 @@ export default {
           res.data.records.forEach(item => {
             exportExcel.push({
               id: item.id,
+              companyid: item.companyid,
               name: item.name,
-              code: item.code
+              aname: item.aname,
+              windcapacity: item.windcapacity,
+              windcapacityunit: item.windcapacityunit,
+              windquantity: item.windquantity,
+              capacity: item.capacity,
+              capacityunit: item.capacityunit,
+              quantityjz: item.quantityjz,
+              quantityzc: item.quantityzc,
+              jrwindcapacity: item.jrwindcapacity,
+              jrwindcapacityunit: item.jrwindcapacityunit,
+              jrwindquantity: item.jrwindquantity,
+              jrcapacity: item.jrcapacity,
+              jrcapacityunit: item.jrcapacityunit,
+              jrquantityjz: item.jrquantityjz,
+              jrquantityzc: item.jrquantityzc
             })
           })
           this.exportExcel = exportExcel

+ 30 - 2
src/views/stationConfiguration/company/index.vue

@@ -128,7 +128,21 @@ export default {
             {
               id: '',
               name: '',
-              rid: ''
+              aname: '',
+              windcapacity: '',
+              windcapacityunit: '',
+              windquantity: '',
+              capacity: '',
+              capacityunit: '',
+              quantityjz: '',
+              quantityzc: '',
+              jrwindcapacity: '',
+              jrwindcapacityunit: '',
+              jrwindquantity: '',
+              jrcapacity: '',
+              jrcapacityunit: '',
+              jrquantityjz: '',
+              jrquantityzc: ''
             }
           ]
           let exportExcel = []
@@ -136,7 +150,21 @@ export default {
             exportExcel.push({
               id: item.id,
               name: item.name,
-              rid: item.rid
+              aname: item.aname,
+              windcapacity: item.windcapacity,
+              windcapacityunit: item.windcapacityunit,
+              windquantity: item.windquantity,
+              capacity: item.capacity,
+              capacityunit: item.capacityunit,
+              quantityjz: item.quantityjz,
+              quantityzc: item.quantityzc,
+              jrwindcapacity: item.jrwindcapacity,
+              jrwindcapacityunit: item.jrwindcapacityunit,
+              jrwindquantity: item.jrwindquantity,
+              jrcapacity: item.jrcapacity,
+              jrcapacityunit: item.jrcapacityunit,
+              jrquantityjz: item.jrquantityjz,
+              jrquantityzc:item.jrquantityzc
             })
           })
           this.exportExcel = exportExcel