fix：公司管理添加四个字段 / 场站管理添加一个字段

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

@@ -66,6 +66,26 @@
       </el-col>
     </el-row>
     <el-row>
+      <el-col :span="12">
+        <el-form-item  label="风电场站数量" prop="windnumber"><el-input 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 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 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 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 class="inputs" v-model.trim="form.jrquantityzc" autocomplete="off"></el-input></el-form-item></el-col>
       <el-col :span="12"></el-col>
     </el-row>
@@ -108,6 +128,10 @@ export default {
         jrcapacityunit: '',
         jrquantityjz: '',
         jrquantityzc: '',
+        windnumber: '',
+        number: '',
+        jrwindnumber: '',
+        jrnumber: '',
       },
       rules: {
         id: [{ required: true, trigger: 'blur', message: '请输入' }],
@@ -127,6 +151,10 @@ export default {
         jrcapacityunit: [{ required: true, trigger: 'blur', message: '请输入' }],
         jrquantityjz: [{ required: true, trigger: 'blur', message: '请输入' }],
         jrquantityzc: [{ required: true, trigger: 'blur', message: '请输入' }],
+        windnumber: [{ required: true, trigger: 'blur', message: '请输入' }],
+        number: [{ 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

@@ -34,17 +34,21 @@
       <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="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="150" show-overflow-tooltip label="接入风电场站数" prop="jrwindnumber" 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>
       <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="150" show-overflow-tooltip label="接入光伏场站数" prop="jrnumber" 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="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="接入光伏装机数量集中" 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 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="100px" fixed="right">
         <template #default="{ row }">
           <el-button type="text" @click="handleEdit(row)">编辑</el-button>

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

@@ -13,6 +13,7 @@
         <el-form-item label="别称" prop="aname">
           <el-input class="inputs" v-model.trim="form.aname" autocomplete="off"></el-input>
         </el-form-item>
+
         <el-form-item label="编码" prop="code">
           <el-input class="inputs" v-model="form.code" autocomplete="off"></el-input>
         </el-form-item>
@@ -82,9 +83,14 @@
           </el-input>
         </el-form-item>
       </div>
-      <el-form-item label="海拔高度" prop="height">
-        <el-input class="inputs" v-model.trim="form.height" autocomplete="off"></el-input>
-      </el-form-item>
+      <div class="lists">
+        <el-form-item label="海拔高度" prop="height">
+          <el-input class="inputs" v-model.trim="form.height" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="区域编号" prop="regionid">
+          <el-input class="inputs" v-model="form.regionid" autocomplete="off"></el-input>
+        </el-form-item>
+      </div>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="close">取 消</el-button>
@@ -112,6 +118,7 @@ export default {
       form: {
         id: '',
         name: '',
+        regionid: '',
         aname: '',
         code: '',
         address: '',
@@ -133,6 +140,7 @@ export default {
       rules: {
         id: [{ required: true, trigger: 'blur', message: '请输入' }],
         name: [{ required: true, trigger: 'blur', message: '请输入' }],
+        regionid: [{ required: true, trigger: 'blur', message: '请输入' }],
         aname: [{ required: true, trigger: 'blur', message: '请输入' }],
         code: [{ required: true, trigger: 'blur', message: '请输入' }],
         address: [{ required: true, trigger: 'blur', message: '请输入' }],

src/views/stationConfiguration/station/index.vue

@@ -39,6 +39,8 @@
         </el-table-column>
         <el-table-column show-overflow-tooltip label="别名" prop="aname" align="center" sortable width="160">
         </el-table-column>
+        <el-table-column show-overflow-tooltip label="区域编号" prop="regionid" align="center" sortable width="160">
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="编码" prop="code" align="center" sortable width="100">
         </el-table-column>
         <el-table-column show-overflow-tooltip label="地址" prop="address" align="center" sortable width="180">