Merge branch 'devChenXinLei'

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

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
+  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close" top="2%">
     <el-form ref="form" :model="form" :rules="rules" label-width="170px">
       <el-row>
         <el-col :span="12">
@@ -14,6 +14,10 @@
         <el-col :span="12">
           <el-form-item   label="别名" prop="aname"><el-input placeholder="请输入" class="inputs" v-model.trim="form.aname" autocomplete="off"></el-input></el-form-item>
         </el-col>
+      </el-row>
+        <!-- 风电 -->
+      <el-divider><span>风电信息</span></el-divider>
+      <el-row>
         <el-col :span="12">
           <el-form-item   label="风电装机容量" prop="windcapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.windcapacity" autocomplete="off"></el-input></el-form-item>
         </el-col>
@@ -24,25 +28,29 @@
           <el-form-item   label="风电装机数量" prop="windquantity"><el-input placeholder="请输入" 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 placeholder="请输入" class="inputs" v-model.trim="form.capacity" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="接入风电装机容量" prop="jrwindcapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindcapacity" autocomplete="off"></el-input></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item   label="光伏容量单位" prop="capacityunit"><el-input placeholder="请输入" class="inputs" v-model.trim="form.capacityunit" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="接入风电容量单位" prop="jrwindcapacityunit"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindcapacityunit" autocomplete="off"></el-input></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item   label="光伏装机数量集中" prop="quantityjz"><el-input placeholder="请输入" class="inputs" v-model.trim="form.quantityjz" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="接入风电装机数量" prop="jrwindquantity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindquantity" autocomplete="off"></el-input></el-form-item>
         </el-col>
+      </el-row>
+        <!-- 光伏 -->
+      <el-divider><span>光伏信息</span></el-divider>
+      <el-row>
         <el-col :span="12">
-          <el-form-item   label="光伏装机数量组串" prop="quantityzc"><el-input placeholder="请输入" class="inputs" v-model.trim="form.quantityzc" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="光伏装机容量" prop="capacity"><el-input placeholder="请输入" 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="jrwindcapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindcapacity" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="光伏容量单位" prop="capacityunit"><el-input placeholder="请输入" 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="jrwindcapacityunit"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindcapacityunit" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="光伏装机数量集中" prop="quantityjz"><el-input placeholder="请输入" 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="jrwindquantity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindquantity" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="光伏装机数量组串" prop="quantityzc"><el-input placeholder="请输入" class="inputs" v-model.trim="form.quantityzc" autocomplete="off"></el-input></el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item   label="接入光伏装机容量" prop="jrcapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrcapacity" autocomplete="off"></el-input></el-form-item>

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

@@ -1,94 +1,77 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="900px" @close="close">
+  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="900px" @close="close" top="2%">
     <el-form ref="form" :model="form" :rules="rules" label-width="170px">
-    <el-row>
-      <el-col :span="12">
-        <el-form-item :disabled="!idAdd?true:false" label="编码" prop="id"><el-input placeholder="请输入" 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 placeholder="请输入" 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 placeholder="请输入" 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 placeholder="请输入" 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 placeholder="请输入" 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 placeholder="请输入" 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 placeholder="请输入" 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 placeholder="请输入" 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 placeholder="请输入" 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 placeholder="请输入" 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="接入风电装机容量" prop="jrwindcapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindcapacity" autocomplete="off"></el-input></el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item  label="接入风电容量单位" prop="jrwindcapacityUnit"><el-input placeholder="请输入" 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="接入风电装机数量" prop="jrwindquantity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindquantity" autocomplete="off"></el-input></el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item  label="接入光伏装机容量" prop="jrcapacity"><el-input placeholder="请输入" 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="接入光伏容量单位" prop="jrcapacityUnit"><el-input placeholder="请输入" 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 placeholder="请输入" 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="windnumber"><el-input placeholder="请输入" class="inputs" v-model.trim="form.windnumber" autocomplete="off"></el-input></el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item  label="光伏场站数量" prop="number"><el-input placeholder="请输入" class="inputs" v-model.trim="form.number" autocomplete="off"></el-input></el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-form-item  label="接入风电场站数" prop="jrwindnumber"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindnumber" autocomplete="off"></el-input></el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item  label="接入光伏场站数" prop="jrnumber"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrnumber" autocomplete="off"></el-input></el-form-item>
-      </el-col>
-    </el-row>
-            <!-- "windnumber": 风电场站数量,
-        "number": 光伏场站数量,
-        "jrwindnumber": 接入风电场站数,
-        "jrnumber": 接入光伏场站数, -->
-    <el-row>
-      <el-col :span="12"><el-form-item  label="接入光伏装机数量组串" prop="jrquantityzc"><el-input placeholder="请输入" 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-row>
+        <el-col :span="12">
+          <el-form-item :disabled="!idAdd?true:false" label="编码" prop="id"><el-input placeholder="请输入" 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 placeholder="请输入" 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 placeholder="请输入" class="inputs" v-model.trim="form.aname" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+      </el-row>
+      <!-- 风电 -->
+      <el-divider><span>风电信息</span></el-divider>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item  label="风电装机容量" prop="windcapacity"><el-input placeholder="请输入" 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="windnumber"><el-input placeholder="请输入" class="inputs" v-model.trim="form.windnumber" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="风电容量单位" prop="windcapacityUnit"><el-input placeholder="请输入" 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 placeholder="请输入" 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="jrwindcapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindcapacity" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="接入风电容量单位" prop="jrwindcapacityUnit"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindcapacityunit" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="接入风电装机数量" prop="jrwindquantity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindquantity" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="接入风电场站数" prop="jrwindnumber"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindnumber" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+      </el-row>
+      <!-- 光伏 -->
+      <el-divider><span>光伏信息</span></el-divider>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item  label="光伏容量单位" prop="capacityUnit"><el-input placeholder="请输入" 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="capacity"><el-input placeholder="请输入" 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="quantityjz"><el-input placeholder="请输入" 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 placeholder="请输入" class="inputs" v-model.trim="form.quantityzc" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="接入光伏装机容量" prop="jrcapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrcapacity" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="接入光伏容量单位" prop="jrcapacityUnit"><el-input placeholder="请输入" 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 placeholder="请输入" 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="number"><el-input placeholder="请输入" class="inputs" v-model.trim="form.number" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="接入光伏场站数" prop="jrnumber"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrnumber" autocomplete="off"></el-input></el-form-item>
+        </el-col>
+        <el-col :span="12"><el-form-item  label="接入光伏装机数量组串" prop="jrquantityzc"><el-input placeholder="请输入" 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>