fix: 公司管理 / 区域管理,列表,新增修改页面字段修改,接口联调

src/api/station.js

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

src/utils/request.js

@@ -73,7 +73,7 @@ instance.interceptors.request.use(
       config.data = qs.stringify(config.data)
     if (debounce.some((item) => config.url.includes(item)))
       loadingInstance = Vue.prototype.$baseLoading()
-      console.log(111111,config);
+      // console.log(111111,config);
     return config
   },
   (error) => {

src/views/stationConfiguration/area/components/TableEdit.vue

@@ -1,18 +1,62 @@
 <template>
   <el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
     <el-form ref="form" :model="form" :rules="rules">
-      <el-form-item label="id" prop="id">
-        <el-input class="inputs" v-model.trim="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>
-      </el-form-item>
-      <el-form-item label="公司编号" prop="companyid">
-        <el-input class="inputs" v-model.trim="form.companyid" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item label="名称" prop="name">
-        <el-input class="inputs" v-model.trim="form.name" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item label="别名" prop="aname">
-        <el-input class="inputs" v-model.trim="form.aname" autocomplete="off"></el-input>
-      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item :disabled="!idAdd?true:false" label="id" prop="id"><el-input class="inputs" v-model.trim="form.id" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="公司编号" prop="companyid"><el-input class="inputs" v-model.trim="form.companyid" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="名称" prop="name"><el-input class="inputs" v-model.trim="form.name" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="别名" prop="aname"><el-input class="inputs" v-model.trim="form.aname" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="风电装机容量" prop="windcapacity"><el-input class="inputs" v-model.trim="form.windcapacity" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="风电容量单位" prop="windcapacityunit"><el-input class="inputs" v-model.trim="form.windcapacityunit" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="风电装机数量" prop="windquantity"><el-input class="inputs" v-model.trim="form.windquantity" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="光伏装机容量" prop="capacity"><el-input class="inputs" v-model.trim="form.capacity" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="光伏容量单位" prop="capacityunit"><el-input class="inputs" v-model.trim="form.capacityunit" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="光伏装机数量集中" prop="quantityjz"><el-input class="inputs" v-model.trim="form.quantityjz" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="光伏装机数量组串" prop="quantityzc"><el-input class="inputs" v-model.trim="form.quantityzc" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="接入风电装机容量2" prop="jrwindcapacity"><el-input class="inputs" v-model.trim="form.jrwindcapacity" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="接入风电容量单位2" prop="jrwindcapacityunit"><el-input class="inputs" v-model.trim="form.jrwindcapacityunit" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="接入风电装机数量2" prop="jrwindquantity"><el-input class="inputs" v-model.trim="form.jrwindquantity" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="接入光伏装机容量2" prop="jrcapacity"><el-input class="inputs" v-model.trim="form.jrcapacity" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="接入光伏容量单位2" prop="jrcapacityunit"><el-input class="inputs" v-model.trim="form.jrcapacityunit" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="接入光伏装机数量集中" prop="jrquantityjz"><el-input class="inputs" v-model.trim="form.jrquantityjz" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item   label="接入光伏装机数量组串" prop="jrquantityzc"><el-input class="inputs" v-model.trim="form.jrquantityzc" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="close">取 消</el-button>
@@ -35,15 +79,43 @@ export default {
     return {
       form: {
         id: '',
-        companyid: '',
-        name: '',
-        aname: '',
+        companyid:'',
+        name:'',
+        aname:'',
+        windcapacity:'',
+        windcapacityunit:'',
+        windquantity:'',
+        capacity:'',
+        capacityunit:'',
+        quantityjz:'',
+        quantityzc:'',
+        jrwindcapacity:'',
+        jrwindcapacityunit:'',
+        jrwindquantity:'',
+        jrcapacity:'',
+        jrcapacityunit:'',
+        jrquantityjz:'',
+        jrquantityzc:'',
       },
       rules: {
         id: [{ required: true, trigger: 'blur', message: '请输入' }],
         companyid: [{ required: true, trigger: 'blur', message: '请输入' }],
         name: [{ required: true, trigger: 'blur', message: '请输入' }],
         aname: [{ required: true, trigger: 'blur', message: '请输入' }],
+        windcapacity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        windcapacityunit: [{ required: true, trigger: 'blur', message: '请输入' }],
+        windquantity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        capacity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        capacityunit: [{ required: true, trigger: 'blur', message: '请输入' }],
+        quantityjz: [{ required: true, trigger: 'blur', message: '请输入' }],
+        quantityzc: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrwindcapacity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrwindcapacityunit: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrwindquantity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrcapacity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrcapacityunit: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrquantityjz: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrquantityzc: [{ required: true, trigger: 'blur', message: '请输入' }],
       },
       title: '',
       dialogFormVisible: false,

src/views/stationConfiguration/area/index.vue

@@ -37,17 +37,17 @@
         <el-table-column width="100" show-overflow-tooltip label="名称" prop="name" align="center" sortable fixed="left"></el-table-column>
         <el-table-column width="150" show-overflow-tooltip label="别名" prop="aname" align="center" sortable></el-table-column>
         <el-table-column width="150" show-overflow-tooltip label="风电装机容量" prop="windcapacity" align="center" sortable></el-table-column>
-        <el-table-column width="150" show-overflow-tooltip label="风电容量单位" prop="windcapacityUnit" align="center" sortable></el-table-column>
+        <el-table-column width="150" show-overflow-tooltip label="风电容量单位" prop="windcapacityunit" align="center" sortable></el-table-column>
         <el-table-column width="150" show-overflow-tooltip label="风电装机数量" prop="windquantity" align="center" sortable></el-table-column>
         <el-table-column width="150" show-overflow-tooltip label="光伏装机容量" prop="capacity" align="center" sortable></el-table-column>
-        <el-table-column width="170" show-overflow-tooltip label="光伏容量单位" prop="capacityUnit" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="光伏容量单位" prop="capacityunit" align="center" sortable></el-table-column>
         <el-table-column width="170" show-overflow-tooltip label="光伏装机数量集中" prop="quantityjz" align="center" sortable></el-table-column>
         <el-table-column width="170" show-overflow-tooltip label="光伏装机数量组串" prop="quantityzc" align="center" sortable></el-table-column>
         <el-table-column width="170" show-overflow-tooltip label="接入风电装机容量2" prop="jrwindcapacity" align="center" sortable></el-table-column>
-        <el-table-column width="170" show-overflow-tooltip label="接入风电容量单位2" prop="jrwindcapacityUnit" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入风电容量单位2" prop="jrwindcapacityunit" align="center" sortable></el-table-column>
         <el-table-column width="170" show-overflow-tooltip label="接入风电装机数量2" prop="jrwindquantity" align="center" sortable></el-table-column>
         <el-table-column width="170" show-overflow-tooltip label="接入光伏装机容量2" prop="jrcapacity" align="center" sortable></el-table-column>
-        <el-table-column width="170" show-overflow-tooltip label="接入光伏容量单位2" prop="jrcapacityUnit" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入光伏容量单位2" prop="jrcapacityunit" align="center" sortable></el-table-column>
         <el-table-column width="190" show-overflow-tooltip label="接入光伏装机数量集中" prop="jrquantityjz" align="center" sortable></el-table-column>
         <el-table-column width="190" show-overflow-tooltip label="接入光伏装机数量组串" prop="jrquantityzc" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="操作" width="180px" fixed="right">

src/views/stationConfiguration/company/components/TableEdit.vue

@@ -1,15 +1,74 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
+  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="900px" @close="close">
     <el-form ref="form" :model="form" :rules="rules">
-      <el-form-item label="id" prop="id">
-        <el-input class="inputs" v-model.trim="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>
-      </el-form-item>
-      <el-form-item label="公司名称" prop="name">
-        <el-input class="inputs" v-model.trim="form.name" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item label="rid" prop="rid">
-        <el-input class="inputs" v-model.trim="form.rid" autocomplete="off"></el-input>
-      </el-form-item>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item :disabled="!idAdd?true:false" label="id" prop="id"><el-input class="inputs" v-model.trim="form.id" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item   label="公司名称" prop="name"><el-input class="inputs" v-model.trim="form.name" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item  label="别名" prop="aname"><el-input class="inputs" v-model.trim="form.aname" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item  label="风电装机容量" prop="windcapacity"><el-input class="inputs" v-model.trim="form.windcapacity" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item  label="风电容量单位" prop="windcapacityUnit"><el-input class="inputs" v-model.trim="form.windcapacityunit" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item  label="风电装机数量" prop="windquantity"><el-input class="inputs" v-model.trim="form.windquantity" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item  label="光伏装机容量" prop="capacity"><el-input class="inputs" v-model.trim="form.capacity" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item  label="光伏容量单位" prop="capacityUnit"><el-input class="inputs" v-model.trim="form.capacityunit" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item  label="光伏装机数量集中" prop="quantityjz"><el-input class="inputs" v-model.trim="form.quantityjz" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item  label="光伏装机数量组串" prop="quantityzc"><el-input class="inputs" v-model.trim="form.quantityzc" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item  label="接入风电装机容量2" prop="jrwindcapacity"><el-input class="inputs" v-model.trim="form.jrwindcapacity" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item  label="接入风电容量单位2" prop="jrwindcapacityUnit"><el-input class="inputs" v-model.trim="form.jrwindcapacityunit" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item  label="接入风电装机数量2" prop="jrwindquantity"><el-input class="inputs" v-model.trim="form.jrwindquantity" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item  label="接入光伏装机容量2" prop="jrcapacity"><el-input class="inputs" v-model.trim="form.jrcapacity" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item  label="接入光伏容量单位2" prop="jrcapacityUnit"><el-input class="inputs" v-model.trim="form.jrcapacityunit" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item  label="接入光伏装机数量集中" prop="jrquantityjz"><el-input class="inputs" v-model.trim="form.jrquantityjz" autocomplete="off"></el-input></el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12"><el-form-item  label="接入光伏装机数量组串" prop="jrquantityzc"><el-input class="inputs" v-model.trim="form.jrquantityzc" autocomplete="off"></el-input></el-form-item></el-col>
+      <el-col :span="12"></el-col>
+    </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="close">取 消</el-button>
@@ -34,12 +93,40 @@ export default {
       form: {
         id: '',
         name: '',
-        rid: '',
+        aname: '',
+        windcapacity: '',
+        windcapacityunit: '',
+        windquantity: '',
+        capacity: '',
+        capacityunit: '',
+        quantityjz: '',
+        quantityzc: '',
+        jrwindcapacity: '',
+        jrwindcapacityunit: '',
+        jrwindquantity: '',
+        jrcapacity: '',
+        jrcapacityunit: '',
+        jrquantityjz: '',
+        jrquantityzc: '',
       },
       rules: {
         id: [{ required: true, trigger: 'blur', message: '请输入' }],
         name: [{ required: true, trigger: 'blur', message: '请输入' }],
-        rid: [{ required: true, trigger: 'blur', message: '请输入' }],
+        aname: [{ required: true, trigger: 'blur', message: '请输入' }],
+        windcapacity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        windcapacityunit: [{ required: true, trigger: 'blur', message: '请输入' }],
+        windquantity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        capacity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        capacityunit: [{ required: true, trigger: 'blur', message: '请输入' }],
+        quantityjz: [{ required: true, trigger: 'blur', message: '请输入' }],
+        quantityzc: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrwindcapacity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrwindcapacityunit: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrwindquantity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrcapacity: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrcapacityunit: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrquantityjz: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrquantityzc: [{ required: true, trigger: 'blur', message: '请输入' }],
       },
       title: '',
       dialogFormVisible: false,

src/views/stationConfiguration/company/index.vue

@@ -32,17 +32,17 @@
       <el-table-column width="120" show-overflow-tooltip label="公司名称" prop="name" align="center" sortable fixed="left"></el-table-column>
       <el-table-column width="120" show-overflow-tooltip label="别名" prop="aname" align="center" sortable></el-table-column>
       <el-table-column width="130" show-overflow-tooltip label="风电装机容量" prop="windcapacity" align="center" sortable></el-table-column>
-      <el-table-column width="130" show-overflow-tooltip label="风电容量单位" prop="windcapacityUnit" align="center" sortable></el-table-column>
+      <el-table-column width="130" show-overflow-tooltip label="风电容量单位" prop="windcapacityunit" align="center" sortable></el-table-column>
       <el-table-column width="130" show-overflow-tooltip label="风电装机数量" prop="windquantity" align="center" sortable></el-table-column>
       <el-table-column width="130" show-overflow-tooltip label="光伏装机容量" prop="capacity" align="center" sortable></el-table-column>
-      <el-table-column width="130" show-overflow-tooltip label="光伏容量单位" prop="capacityUnit" align="center" sortable></el-table-column>
+      <el-table-column width="130" show-overflow-tooltip label="光伏容量单位" prop="capacityunit" align="center" sortable></el-table-column>
       <el-table-column width="170" show-overflow-tooltip label="光伏装机数量集中" prop="quantityjz" align="center" sortable></el-table-column>
       <el-table-column width="170" show-overflow-tooltip label="光伏装机数量组串" prop="quantityzc" align="center" sortable></el-table-column>
       <el-table-column width="170" show-overflow-tooltip label="接入风电装机容量2" prop="jrwindcapacity" align="center" sortable></el-table-column>
-      <el-table-column width="170" show-overflow-tooltip label="接入风电容量单位2" prop="jrwindcapacityUnit" align="center" sortable></el-table-column>
+      <el-table-column width="170" show-overflow-tooltip label="接入风电容量单位2" prop="jrwindcapacityunit" align="center" sortable></el-table-column>
       <el-table-column width="170" show-overflow-tooltip label="接入风电装机数量2" prop="jrwindquantity" align="center" sortable></el-table-column>
       <el-table-column width="170" show-overflow-tooltip label="接入光伏装机容量2" prop="jrcapacity" align="center" sortable></el-table-column>
-      <el-table-column width="170" show-overflow-tooltip label="接入光伏容量单位2" prop="jrcapacityUnit" align="center" sortable></el-table-column>
+      <el-table-column width="170" show-overflow-tooltip label="接入光伏容量单位2" prop="jrcapacityunit" align="center" sortable></el-table-column>
       <el-table-column width="170" show-overflow-tooltip label="接入光伏装机数量集中" prop="jrquantityjz" align="center" sortable></el-table-column>
       <el-table-column width="170" show-overflow-tooltip label="接入光伏装机数量组串" prop="jrquantityzc" align="center" sortable></el-table-column>
       <el-table-column show-overflow-tooltip label="操作" width="100px" fixed="right">