fix：公司/区域新增修改字段

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

@@ -14,6 +14,7 @@
         <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="ordernum"><el-input placeholder="请输入" class="inputs" v-model.trim="form.ordernum" autocomplete="off"></el-input></el-form-item></el-col>
       </el-row>
         <!-- 风电 -->
       <el-divider><span>风电信息</span></el-divider>
@@ -36,6 +37,8 @@
         <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="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="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>
@@ -64,6 +67,8 @@
         <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-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-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -104,6 +109,11 @@ export default {
         jrcapacityunit:'',
         jrquantityjz:'',
         jrquantityzc:'',
+        ordernum: '',
+        number: '',
+        windnumber: '',
+        jrwindnumber: '',
+        jrnumber: '',
       },
       rules: {
         id: [{ required: true, trigger: 'blur', message: '请输入' }],
@@ -124,6 +134,11 @@ export default {
         jrcapacityunit: [{ required: true, trigger: 'blur', message: '请输入' }],
         jrquantityjz: [{ required: true, trigger: 'blur', message: '请输入' }],
         jrquantityzc: [{ required: true, trigger: 'blur', message: '请输入' }],
+        ordernum: [{ required: true, trigger: 'blur', message: '请输入' }],
+        number: [{ required: true, trigger: 'blur', message: '请输入' }],
+        windnumber: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrwindnumber: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrnumber: [{ required: true, trigger: 'blur', message: '请输入' }],
       },
       title: '',
       dialogFormVisible: false,

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

@@ -11,6 +11,8 @@
         <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="ordernum"><el-input placeholder="请输入" class="inputs" v-model.trim="form.ordernum" autocomplete="off"></el-input></el-form-item></el-col>
+
       </el-row>
       <!-- 风电 -->
       <el-divider><span>风电信息</span></el-divider>
@@ -39,6 +41,8 @@
         <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="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="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>
@@ -71,6 +75,8 @@
           <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-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-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -115,6 +121,11 @@ export default {
         number: '',
         jrwindnumber: '',
         jrnumber: '',
+        ordernum: '',
+        number: '',
+        windnumber: '',
+        jrwindnumber: '',
+        jrnumber: '',
       },
       rules: {
         id: [{ required: true, trigger: 'blur', message: '请输入' }],
@@ -138,6 +149,11 @@ export default {
         number: [{ required: true, trigger: 'blur', message: '请输入' }],
         jrwindnumber: [{ required: true, trigger: 'blur', message: '请输入' }],
         jrnumber: [{ required: true, trigger: 'blur', message: '请输入' }],
+        ordernum: [{ required: true, trigger: 'blur', message: '请输入' }],
+        number: [{ required: true, trigger: 'blur', message: '请输入' }],
+        windnumber: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrwindnumber: [{ required: true, trigger: 'blur', message: '请输入' }],
+        jrnumber: [{ required: true, trigger: 'blur', message: '请输入' }],
       },
       title: '',
       dialogFormVisible: false,

src/views/stationConfiguration/company/index.vue

@@ -44,7 +44,6 @@
       <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="150" show-overflow-tooltip label="风电场站数量" prop="windnumber" align="center" sortable></el-table-column>
-      <el-table-column width="190" show-overflow-tooltip label="风电场站数量" prop="windnumber" align="center" sortable ></el-table-column>
       <!--  -->
       <el-table-column width="150" show-overflow-tooltip label="光伏场站数量" prop="number" align="center" sortable></el-table-column>
       <el-table-column width="130" show-overflow-tooltip label="光伏装机容量" prop="capacity" align="center" sortable></el-table-column>