fix：树接口问题排查 , 导入导出添加字段

src/views/realDatabaseConfig/components/TableEdit.vue

@@ -10,7 +10,7 @@
 				</el-form-item>
 			</div>
 			<div class="lists">
-				<el-form-item label="服务名历史" prop="namehist" width="150">
+				<el-form-item label="服务名历史" prop="namehist">
 					<el-input class="inputs" v-model="form.namehist" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="服务名配置" prop="namecmcfg">

src/views/stationConfiguration/area/index.vue

@@ -37,13 +37,19 @@
         <el-table-column width="150" show-overflow-tooltip label="公司编号" prop="companyid" align="center" sortable fixed="left"></el-table-column>
         <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="120" show-overflow-tooltip label="顺序" prop="ordernum" 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="windquantity" 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="190" show-overflow-tooltip label="风电场站数量" prop="windnumber" 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="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="190" show-overflow-tooltip label="光伏场站数量" prop="number" align="center" sortable ></el-table-column>
+        <!--  -->
         <el-table-column width="170" show-overflow-tooltip label="接入风电装机容量" prop="jrwindcapacity" align="center" sortable></el-table-column>
         <el-table-column width="170" show-overflow-tooltip label="接入风电容量单位" prop="jrwindcapacityunit" align="center" sortable></el-table-column>
         <el-table-column width="170" show-overflow-tooltip label="接入风电装机数量" prop="jrwindquantity" align="center" sortable></el-table-column>
@@ -51,6 +57,8 @@
         <el-table-column width="170" show-overflow-tooltip label="接入光伏容量单位" 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 width="190" show-overflow-tooltip label="接入风电场站数量" prop="jrwindnumber" align="center" sortable ></el-table-column>
+        <el-table-column width="190" show-overflow-tooltip label="接入光伏场站数量" prop="jrnumber" align="center" sortable ></el-table-column>
         <el-table-column show-overflow-tooltip label="操作" width="180px" fixed="right">
           <template #default="{ row }">
             <el-button type="text" @click="handleEdit(row)">编辑</el-button>
@@ -169,6 +177,11 @@ export default {
               jrcapacityunit: '',
               jrquantityjz: '',
               jrquantityzc: '',
+              ordernum: '',
+              windnumber: '',
+              number: '',
+              jrwindnumber: '',
+              jrnumber: '',
             }
           ]
           // 导出
@@ -192,7 +205,12 @@ export default {
               jrcapacity: item.jrcapacity,
               jrcapacityunit: item.jrcapacityunit,
               jrquantityjz: item.jrquantityjz,
-              jrquantityzc: item.jrquantityzc
+              jrquantityzc: item.jrquantityzc,
+              ordernum: item.ordernum,
+              windnumber: item.windnumber,
+              number: item.number,
+              jrwindnumber: item.jrwindnumber,
+              jrnumber: item.jrnumber,
             })
           })
           this.exportExcel = exportExcel

src/views/stationConfiguration/company/index.vue

@@ -38,16 +38,22 @@
       <el-table-column show-overflow-tooltip label="编码" prop="id" align="center" sortable fixed="left"></el-table-column>
       <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="120" show-overflow-tooltip label="顺序" prop="ordernum" 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="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="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>
       <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="190" show-overflow-tooltip label="光伏场站数量" prop="number" 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="jrnumber" align="center" sortable></el-table-column>
       <el-table-column width="170" show-overflow-tooltip label="接入风电装机容量" prop="jrwindcapacity" align="center" sortable></el-table-column>
       <el-table-column width="170" show-overflow-tooltip label="接入风电容量单位" prop="jrwindcapacityunit" align="center" sortable></el-table-column>
@@ -56,6 +62,8 @@
       <el-table-column width="170" show-overflow-tooltip label="接入光伏容量单位" 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 width="190" show-overflow-tooltip label="接入风电场站数量" prop="jrwindnumber" align="center" sortable ></el-table-column>
+      <el-table-column width="190" show-overflow-tooltip label="接入光伏场站数量" prop="jrnumber" 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>
@@ -169,7 +177,12 @@ export default {
               jrcapacity: "",
               jrcapacityunit: "",
               jrquantityjz: "",
-              jrquantityzc: ""
+              jrquantityzc: "",
+              ordernum: "",
+              windnumber: "",
+              number: "",
+              jrwindnumber: "",
+              jrnumber: "",
             }
           ]
           let exportExcel = []
@@ -195,7 +208,12 @@ export default {
               jrcapacity: item.jrcapacity,
               jrcapacityunit: item.jrcapacityunit,
               jrquantityjz: item.jrquantityjz,
-              jrquantityzc: item.jrquantityzc
+              jrquantityzc: item.jrquantityzc,
+              ordernum: item.ordernum,
+              windnumber: item.windnumber,
+              number: item.number,
+              jrwindnumber: item.jrwindnumber,
+              jrnumber: item.jrnumber,
             })
           })
           this.exportExcel = exportExcel

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

@@ -20,10 +20,6 @@
       </div>
       <div class="lists">
         <el-form-item label="风场编号" prop="windpowerstationid">
-          <!-- <el-select v-model="form.windpowerstationid" placeholder="请选择" clearable>
-            <el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select> -->
           <el-cascader 
             @change="windpowerstationidChange"
             placeholder="请选择"
@@ -39,7 +35,6 @@
       </div>
       <div class="lists">
         <el-form-item label="线路编号" prop="lineid">
-          <!-- <el-input class="inputs" v-model.trim="form.lineid" autocomplete="off"></el-input> -->
           <el-cascader 
             placeholder="请选择"
             v-model="form.lineid"