feat：气象站,场站,公司,集团.线路,计划电量开发维护,接口联调,部署,测试

src/api/realtimeDatabaseConfiguration.js

@@ -49,7 +49,7 @@ const addManufacturer = (pairs) => {
 }
 const deleteManufacturer = (data) => {
   return request({
-    url: `/pro-econ-manufacturer/ids=${data.id}`,
+    url: `/pro-econ-manufacturer/${data.id}`,
     method: 'delete',
   })
 }
@@ -411,7 +411,41 @@ const sttreeMantreels = (data) => {
     method: 'get',
   })
 }
+// GET
+// /pro-basic-weather-station/List
+// 气象站-列表
+// DELETE
+// /pro-basic-weather-station/remove-weather-station/{ids}
+// 气象站-删除
+// POST
+// /pro-basic-weather-station/save
+// 气象站-新增or修改
+// GET
+// /pro-basic-weather-station/weather/{id}
+// 气象站-根据主键查询
+const weatherStationList = (data) => {
+  return request({
+    url: `/pro-basic-weather-station/List?name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+    method: 'get',
+  })
+}
+const addWeatherStation = (pairs) => {
+  return request({
+    url: `/pro-basic-weather-station/save`,
+    method: 'post',
+    data: pairs,
+  })
+}
+const deleteWeatherStation = (data) => {
+  return request({
+    url: `/pro-basic-weather-station/remove-weather-station/${data.id}`,
+    method: 'delete',
+  })
+}
 export default {
+  weatherStationList,
+  addWeatherStation,
+  deleteWeatherStation,
   sttreeMantreels,
   stopTypeList,
   addStopType,

src/api/station.js

@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+// 期次树
+const sttreeProjecttrees = (data) => {
+  return request({
+    url: `/sttree/projecttrees`,
+    method: 'get',
+  })
+}
 const groupList = (data) => {
   return request({
     url: `/pro-basic-energy-group/List?id=${data.id}&name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
@@ -185,7 +192,7 @@ const addEquipmentmodel = (pairs) => {
 }
 const deleteEquipmentmodel = (data) => {
   return request({
-    url: `/pro-econ-equipmentmodel/ids=${data.id}`,
+    url: `/pro-econ-equipmentmodel/${data.id}`,
     method: 'delete',
   })
 }
@@ -283,4 +290,5 @@ export default {
   getStationPersis,
   getAdmList,
   standardpoint,
+  sttreeProjecttrees,
 }

src/router/index.js

@@ -200,13 +200,13 @@ export const asyncRoutes = [
         component: () => import('@/views/stationConfiguration/stopType/index'),
         meta: { title: '停机类型' },
       },
-      // {
-      //   path: 'admlist',
-      //   name: 'admlist',
-      //   component: () =>
-      //     import('@/views/stationConfiguration/admlist/index'),
-      //   meta: { title: '装机量管理' },
-      // },
+      {
+        path: 'weatherStation',
+        name: 'weatherStation',
+        component: () =>
+          import('@/views/stationConfiguration/weatherStation/index'),
+        meta: { title: '气象站' },
+      },
     ],
   },
   // {

src/views/index/components/TableEdit.vue

@@ -105,7 +105,6 @@ export default {
 				if (valid) {
           this.form.year = new Date(this.form.dateVal).getFullYear()
           this.form.month = new Date(this.form.dateVal).getMonth() + 1
-          console.log(this.windpowerstationId);
           if(Array.isArray(this.form.windpowerstationId)){
             this.form.windpowerstationId = this.form.windpowerstationId[this.form.windpowerstationId.length -1]
           }

src/views/meterpoint/index.vue

@@ -110,7 +110,8 @@ export default {
 			api.windpowerstationList({
 				id: '',
 				name: '',
-				companyid: '',
+				companyId: '',
+        groupId: "",
 				pageNum: 1,
 				pageSize: 1000,
 			}).then(res => {

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

@@ -7,8 +7,32 @@
         <el-col :span="12"><el-form-item label="名称" prop="name"><el-input placeholder="请输入" class="inputs" v-model.trim="form.name"></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"></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"></el-input></el-form-item></el-col>
-        <el-col :span="12"><el-form-item label="区域编号" prop="regionId"><el-input placeholder="请输入" class="inputs" v-model.trim="form.regionId"></el-input></el-form-item></el-col>
-        <el-col :span="12"><el-form-item label="集团编号" prop="groupId"><el-input placeholder="请输入" class="inputs" v-model.trim="form.groupId"></el-input></el-form-item></el-col>
+        <!-- <el-col :span="12"><el-form-item label="区域编号" prop="regionId"><el-input placeholder="请输入" class="inputs" v-model.trim="form.regionId"></el-input></el-form-item></el-col> -->
+        <!-- <el-col :span="12"><el-form-item label="集团编号" prop="groupId"><el-input placeholder="请输入" class="inputs" v-model.trim="form.groupId"></el-input></el-form-item></el-col> -->
+        <el-col :span="12">
+          <el-form-item label="区域编号" prop="regionId">
+            <el-select style="width:200px" v-model="form.regionId" placeholder="请选择">
+              <el-option
+                v-for="item in regionIdOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="集团编号" prop="groupId">
+            <el-select style="width:200px" v-model="form.groupId" placeholder="请选择">
+              <el-option
+                v-for="item in groupIdOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="12"><el-form-item label="是否可用" prop="isAble"><el-input placeholder="请输入" class="inputs" v-model.trim="form.isAble"></el-input></el-form-item></el-col>
       </el-row>
       <!-- 风电 -->
@@ -49,6 +73,8 @@
 
 <script>
 import api from '@/api/station'
+import apis from '@/api/table'
+
 import axios from "axios";
 export default {
   name: 'TableEdit',
@@ -60,6 +86,9 @@ export default {
   },
   data() {
     return {
+      groupIdOptions: [],
+      regionIdOptions: [],
+      companyIdOptions: [],
       form: {
         id: "",
         nemCode: "",
@@ -125,8 +154,22 @@ export default {
       idAdd: true,
     }
   },
-  created() { },
+  created() { 
+    this.optionsData()
+  },
   methods: {
+    optionsData(){
+      apis.regiontreels({ tag: 1 }).then(res => {
+        if (res.data) {
+          this.regionIdOptions = res.data
+        }
+      })
+      apis.newtreeTreels({ tag: 1 }).then(res => {
+        if (res.data) {
+          this.groupIdOptions = res.data
+        }
+      })
+    },
     showEdit(row) {
       if (!row) {
         this.title = '添加'

src/views/stationConfiguration/company/index.vue

@@ -31,40 +31,6 @@
         <ExportExcel :exportList="templateExcel" :useType="'template'" partsName="公司模板"></ExportExcel>
       </vab-query-form-right-panel>
     </vab-query-form>
-    <!-- 
-      	id	编号	VARCHAR2	50			编号
-        nemCode	编码	VARCHAR2	50	✓		编码
-        name	名称	VARCHAR2	50	✓		名称
-        aname	别名	VARCHAR2	50	✓		别名
-        windCapacity	风电装机容量	NUMBER	18,2	✓		风电装机容量
-        windCapacity_unit	风电容量单位	VARCHAR2	50	✓		风电容量单位
-        windQuantity_hs	风电装机数量海上	INTEGER		✓		风电装机数量海上
-        windQuantity_ld	风电装机数量陆地	INTEGER		✓		风电装机数量陆地
-        capacity	光伏装机容量	NUMBER	18,2	✓		光伏装机容量
-        capacityUnit	光伏容量单位	VARCHAR2	50	✓		光伏容量单位
-        quantityJz	光伏装机数量集中	INTEGER		✓		光伏装机数量集中
-        quantityZc	光伏装机数量组串	INTEGER		✓		光伏装机数量组串
-        jrwindCapacity	接入风电装机容量	NUMBER	18,2	✓		接入风电装机容量
-        jrwindCapacity_unit	接入风电容量单位	VARCHAR2	50	✓		接入风电容量单位
-        jrwindQuantity_hs	接入风电装机数量海上	INTEGER		✓		接入风电装机数量海上
-        jrwindQuantity_ld	接入风电装机数量陆地	INTEGER		✓		接入风电装机数量陆地
-        jrCapacity	接入光伏装机容量	NUMBER	18,2	✓		接入光伏装机容量
-        jrCapacity_unit	接入光伏容量单位	VARCHAR2	50	✓		接入光伏容量单位
-        jrquantityJz	接入光伏装机数量集中	INTEGER		✓		接入光伏装机数量集中
-        jrquantityZc	接入光伏装机数量组串	INTEGER		✓		接入光伏装机数量组串
-        orderNum	顺序	INTEGER		✓		顺序
-        windNumber	风电场站数量	INTEGER		✓		风电场站数量
-        number	光伏场站数量	INTEGER		✓		光伏场站数量
-        jrWindNumber	接入风电场站数量	INTEGER		✓		接入风电场站数量
-        jrNumber	接入光伏场站数量	INTEGER		✓		接入光伏场站数量
-        regionId	区域编号	VARCHAR2	50	✓		区域编号
-        groupId	集团编号	VARCHAR2	50	✓		集团编号
-        isAble	是否可用	INTEGER		✓		是否可用
-        spare1	备用1	VARCHAR2	50	✓		备用1
-        spare2	备用2	VARCHAR2	50	✓		备用2
-        spare3	备用3	VARCHAR2	50	✓		备用3
-        spare4	备用4	VARCHAR2	50	✓		备用4
-     -->
     <el-table ref="tableSort" v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText"
       header-cell-class-name="table_header_style" border :height="height" @selection-change="setSelectRows">
       <el-table-column show-overflow-tooltip type="selection" width="55" align="center"></el-table-column>
@@ -73,8 +39,8 @@
       <el-table-column show-overflow-tooltip label="名称" prop="name" align="center" sortable></el-table-column>
       <el-table-column show-overflow-tooltip label="别名" prop="aname" align="center" sortable></el-table-column>
       <el-table-column show-overflow-tooltip label="顺序" prop="orderNum" align="center" sortable></el-table-column>
-      <el-table-column show-overflow-tooltip label="区域编号" prop="regionId" align="center" sortable></el-table-column>
-      <el-table-column show-overflow-tooltip label="集团编号" prop="groupId" align="center" sortable></el-table-column>
+      <el-table-column show-overflow-tooltip :formatter="regionIdFormatter" label="区域编号" prop="regionId" align="center" sortable></el-table-column>
+      <el-table-column show-overflow-tooltip :formatter="groupIdFormatter" label="集团编号" prop="groupId" align="center" sortable></el-table-column>
       <el-table-column show-overflow-tooltip label="是否可用" prop="isAble" align="center" sortable></el-table-column>
       <el-table-column show-overflow-tooltip label="风电装机容量" prop="windCapacity" align="center" sortable width="150"></el-table-column>
       <el-table-column show-overflow-tooltip label="风电容量单位" prop="windCapacityUnit" align="center" sortable  width="150"></el-table-column>
@@ -127,6 +93,7 @@ export default {
   },
   data() {
     return {
+      groupIdOptions: [],
       regionIdOptions:[],
       fuzzyQuery: '',
       listLoading: true,
@@ -155,9 +122,16 @@ export default {
   },
   methods: {
     regionIdFormatter(row){
-      for (const key in this.regionIdOptions) {
-        if (row.regionId === key.nemCode) {
-          return 
+      for (const iterator of this.regionIdOptions) {
+        if(row.regionId == iterator.id){
+          return iterator.name
+        }
+      }
+    },
+    groupIdFormatter(row){
+      for (const iterator of this.groupIdOptions) {
+        if(row.groupId == iterator.id){
+          return iterator.name
         }
       }
     },
@@ -166,6 +140,16 @@ export default {
       this.fetchData()
     },
     getTree() {
+      apis.regiontreels({ tag: 1 }).then(res => {
+        if (res.data) {
+          this.regionIdOptions = res.data
+        }
+      })
+      apis.newtreeTreels({ tag: 1 }).then(res => {
+        if (res.data) {
+          this.groupIdOptions = res.data
+        }
+      })
       apis.newtreeTreels({ tag: 1 }).then(res => {
         if (res.data) {
           this.options = res.data

src/views/stationConfiguration/equipmentPoint/index.vue

@@ -4,7 +4,7 @@
 			<div class="title">
 				<div class="left">
 					<div class="left-item">
-						<div style="width: 70px;">编码：</div>
+						<div style="width: 70px;">名称：</div>
 						<el-input v-model="fuzzyQuery_name" placeholder="请输入" clearable />
 					</div>
 					<el-button icon="el-icon-search" type="primary" native-type="submit" @click="searchFetchData">

src/views/stationConfiguration/line/index.vue

@@ -11,7 +11,6 @@
               <el-cascader 
                 v-model="search.projectId" 
                 :options="options" 
-                style="width: 200px" 
                 :props="{ checkStrictly: true, label: 'name', value: 'id' , children:'children',}" 
                 clearable />
             </el-form-item>
@@ -42,7 +41,7 @@
         <el-table-column show-overflow-tooltip label="线路名称" prop="name" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="别称" prop="aname" align="center" sortable></el-table-column>
         <!-- :formatter="nameEcho"  -->
-        <el-table-column show-overflow-tooltip label="期次" prop="projectId" align="center" sortable></el-table-column>
+        <el-table-column :formatter="projectIdFormatter" show-overflow-tooltip label="期次" prop="projectId" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="装机容量" prop="capacity" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="装机单位" prop="capacityUnit" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="装机数量" prop="quantity" align="center" sortable></el-table-column>
@@ -81,6 +80,7 @@ export default {
   },
   data() {
     return {
+      projectIdAll:[],
       search: {
         name:"",
         projectId:"",
@@ -111,9 +111,15 @@ export default {
     this.getTree()
   },
   methods: {
+    projectIdFormatter(row){
+      for (const iterator of this.projectIdAll) {
+        if(row.projectId === iterator.id) {
+          return iterator.name
+        }
+      }
+    },
     handleQuery() {
       this.queryForm.pageNo = 1
-      console.log( this.search.projectId , " this.search.projectId");
       this.fetchData()
     },
     nameEcho(row){
@@ -129,9 +135,16 @@ export default {
       return str
     },
     getTree() {
-      apis.newtreeTreels({tag:3}).then(res => {
+      api.sttreeProjecttrees().then(res => {
         if (res.data) {
           this.options = res.data
+          res.data.forEach(element => {
+            if(element.children) {
+              element.children.forEach(item => {
+                this.projectIdAll.push(item)
+              });
+            }
+          });
           this.deepTreeData = recursionTree(res.data)
         }
       })

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

@@ -3,7 +3,7 @@
 		<el-form ref="form" :model="form" :rules="rules" label-width="150px">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="编码" prop="id">
+          <el-form-item label="编号" prop="id">
             <el-input class="inputs" v-model="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>
           </el-form-item>
         </el-col>

src/views/stationConfiguration/projectstudy/index.vue

@@ -4,7 +4,7 @@
 			<div class="title">
 				<div class="left">
 					<div class="left-item">
-						<div style="width: 70px;">型号：</div>
+						<div style="width: 100px;">工程编号：</div>
 						<el-input v-model="fuzzyQuery_name" placeholder="请输入" clearable />
 					</div>
 					<el-button icon="el-icon-search" type="primary" native-type="submit" @click="searchFetchData">

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

@@ -1,6 +1,7 @@
 <template>
   <el-dialog :title="title" :visible.sync="dialogFormVisible" width="900px" @close="close" top="2%">
-    <el-form ref="form" :model="form" :rules="rules" label-width="170px">
+    <!--  :rules="rules" -->
+    <el-form ref="form" :model="form" label-width="170px">
       <el-row>
         <el-col :span="12"><el-form-item label="编号" prop="id"><el-input placeholder="请输入" class="inputs" v-model.trim="form.id"></el-input></el-form-item></el-col>
         <el-col :span="12"><el-form-item label="编码" prop="nemCode"><el-input placeholder="请输入" class="inputs" v-model.trim="form.nemCode"></el-input></el-form-item></el-col>
@@ -33,7 +34,6 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="区域编号" prop="regionId">
-            <!-- <el-input placeholder="请输入" class="inputs" v-model.trim="form.regionId"></el-input> -->
             <el-select style="width:200px" v-model="form.regionId" placeholder="请选择">
               <el-option
                 v-for="item in regionIdOptions"
@@ -46,7 +46,6 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="集团编号" prop="groupId">
-            <!-- <el-input placeholder="请输入" class="inputs" v-model.trim="form.groupId"></el-input> -->
             <el-select style="width:200px" v-model="form.groupId" placeholder="请选择">
               <el-option
                 v-for="item in groupIdOptions"
@@ -62,8 +61,18 @@
         <el-col :span="12"><el-form-item label="在建容量" prop="conCapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.conCapacity"></el-input></el-form-item></el-col>
         <el-col :span="12"><el-form-item label="并网容量" prop="gridCapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.gridCapacity"></el-input></el-form-item></el-col>
         <el-col :span="12"><el-form-item label="吊装容量" prop="hoiCapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.hoiCapacity"></el-input></el-form-item></el-col>
-        <el-col :span="12"><el-form-item label="首批并网时间" prop="firstGridTime"><el-input placeholder="请输入" class="inputs" v-model.trim="form.firstGridTime"></el-input></el-form-item></el-col>
-        <el-col :span="12"><el-form-item label="整场投运时间" prop="wholeGridTime"><el-input placeholder="请输入" class="inputs" v-model.trim="form.wholeGridTime"></el-input></el-form-item></el-col>
+        <!-- <el-col :span="12"><el-form-item label="首批并网时间" prop="firstGridTime"><el-input placeholder="请输入" class="inputs" v-model.trim="form.firstGridTime"></el-input></el-form-item></el-col> -->
+        <el-col :span="12">
+          <el-form-item label="首批并网时间" prop="firstGridTime">
+            <el-date-picker value-format="yyyy-MM-dd" key="100" style="width:200px" @input="changeDate" v-model="form.firstGridTime" type="month" placeholder="选择月"></el-date-picker>
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="12"><el-form-item label="整场投运时间" prop="wholeGridTime"><el-input placeholder="请输入" class="inputs" v-model.trim="form.wholeGridTime"></el-input></el-form-item></el-col> -->
+        <el-col :span="12">
+          <el-form-item label="整场投运时间" prop="wholeGridTime">
+            <el-date-picker value-format="yyyy-MM-dd" key="100" style="width:200px" @input="changeDate" v-model="form.wholeGridTime" type="month" placeholder="选择月"></el-date-picker>
+          </el-form-item>
+        </el-col>
         <el-col :span="12"><el-form-item label="测风塔数量" prop="anemoNumber"><el-input placeholder="请输入" class="inputs" v-model.trim="form.anemoNumber"></el-input></el-form-item></el-col>
         <el-col :span="12"><el-form-item label="升压站数量" prop="stationNumber"><el-input placeholder="请输入" class="inputs" v-model.trim="form.stationNumber"></el-input></el-form-item></el-col>
       </el-row>
@@ -82,8 +91,8 @@
       <!-- 光伏 -->
       <el-divider><span>光伏信息</span></el-divider>
       <el-row>
-        <el-col :span="12"><el-form-item label="光伏装机容量" prop="capacity2"><el-input placeholder="请输入" class="inputs" v-model.trim="form.capacity2"></el-input></el-form-item></el-col>
-        <el-col :span="12"><el-form-item label="光伏容量单位" prop="capacityUnit2"><el-input placeholder="请输入" class="inputs" v-model.trim="form.capacityUnit2"></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"></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"></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"></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"></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"></el-input></el-form-item></el-col>
@@ -127,8 +136,8 @@ export default {
         windCapacityUnit: "",
         windQuantityHs: "",
         windQuantityLd: "",
-        capacity2: "",
-        capacityUnit2: "",
+        capacity: "",
+        capacityUnit: "",
         quantityJz: "",
         quantityZc: "",
         jrwindCapacity: "",
@@ -173,8 +182,8 @@ export default {
         windCapacityUnit: [{ required: true, trigger: 'blur', message: '请输入' }],
         windQuantityHs: [{ required: true, trigger: 'blur', message: '请输入' }],
         windQuantityLd: [{ required: true, trigger: 'blur', message: '请输入' }],
-        capacity2: [{ required: true, trigger: 'blur', message: '请输入' }],
-        capacityUnit2: [{ 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: '请输入' }],
@@ -216,6 +225,9 @@ export default {
   },
   created() { this.optionsData()},
   methods: {
+    changeDate() {
+      this.$forceUpdate()
+    },
     optionsData(){
       api.companys({id:"",name:"", pageNum: 1,pageSize: 1000,}).then(res => {
         if (res.data) {

src/views/stationConfiguration/station/index.vue

@@ -44,8 +44,8 @@
         <el-table-column show-overflow-tooltip width="150" label="风电容量单位" prop="windCapacityUnit" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip width="170" label="风电装机数量海上" prop="windQuantityHs" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip width="170" label="风电装机数量陆地" prop="windQuantityLd" align="center" sortable></el-table-column>
-        <el-table-column show-overflow-tooltip width="150" label="光伏装机容量" prop="capacity2" align="center" sortable></el-table-column>
-        <el-table-column show-overflow-tooltip width="150" label="光伏容量单位" prop="capacityUnit2" align="center" sortable></el-table-column>
+        <el-table-column show-overflow-tooltip width="150" label="光伏装机容量" prop="capacity" align="center" sortable></el-table-column>
+        <el-table-column show-overflow-tooltip width="150" label="光伏容量单位" prop="capacityUnit" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip width="150" label="光伏装机数量集中" prop="quantityJz" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip width="150" label="光伏装机数量组串" prop="quantityZc" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip width="150" label="接入风电装机容量" prop="jrwindCapacity" align="center" sortable></el-table-column>
@@ -236,8 +236,8 @@ export default {
               windCapacityUnit: "",
               windQuantityHs: "",
               windQuantityLd: "",
-              capacity2: "",
-              capacityUnit2: "",
+              capacity: "",
+              capacityUnit: "",
               quantityJz: "",
               quantityZc: "",
               jrwindCapacity: "",

src/views/stationConfiguration/statusDictionaries/index.vue

@@ -4,7 +4,7 @@
 			<div class="title">
 				<div class="left">
 					<div class="left-item">
-						<div style="width: 70px;">编码：</div>
+						<div style="width: 70px;">名称：</div>
 						<el-input v-model="fuzzyQuery_name" placeholder="请输入" clearable />
 					</div>
 					<el-button icon="el-icon-search" type="primary" native-type="submit" @click="searchFetchData">

src/views/stationConfiguration/stopType/index.vue

@@ -4,7 +4,7 @@
 			<div class="title">
 				<div class="left">
 					<div class="left-item">
-						<div style="width: 70px;">编码：</div>
+						<div style="width: 70px;">名称：</div>
 						<el-input v-model="fuzzyQuery_name" placeholder="请输入" clearable />
 					</div>
 					<el-button icon="el-icon-search" type="primary" native-type="submit" @click="searchFetchData">

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

@@ -0,0 +1,129 @@
+<template>
+	<el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
+		<el-form ref="form" :model="form" :rules="rules" label-width="150px">
+      <el-row>
+        <el-col :span="12"><el-form-item label="编码" prop="nemCode"><el-input class="inputs" v-model="form.nemCode" 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="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="form.aname" 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="form.capacity" autocomplete="off"></el-input></el-form-item></el-col>
+        <el-col :span="12">
+          <el-form-item label="风场编号" prop="windpowerstationId">
+            <el-select v-model="form.windpowerstationId" placeholder="请选择" clearable style="width:200px">
+              <el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12"><el-form-item label="顺序" prop="orderNum"><el-input class="inputs" v-model="form.orderNum" autocomplete="off"></el-input></el-form-item></el-col>
+        <el-col :span="12"><el-form-item label="是否可用" prop="isAble"><el-input class="inputs" v-model="form.isAble" 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>
+			<el-button type="primary" @click="save">确 定</el-button>
+		</div>
+	</el-dialog>
+</template>
+
+<script>
+import api from '@/api/realtimeDatabaseConfiguration'
+import dayjs from "dayjs";
+export default {
+	name: 'TableEdit',
+	props: {
+		options: {
+			type: Array,
+			default: []
+		},
+		stationList: {
+			type: Array,
+			default: []
+		},
+	},
+	data() {
+		return {
+			form: {
+				nemCode: "",
+        name: "",
+        aname: "",
+        capacity: "",
+        windpowerstationId: "",
+        orderNum: "",
+        isAble: "",
+			},
+			rules: {
+				nemCode: [{ required: true, trigger: 'blur', message: '请输入' }],
+				name: [{ required: true, trigger: 'blur', message: '请输入' }],
+				aname: [{ required: true, trigger: 'blur', message: '请输入' }],
+				capacity: [{ required: true, trigger: 'blur', message: '请输入' }],
+				windpowerstationId: [{ required: true, trigger: 'blur', message: '请输入' }],
+				orderNum: [{ required: true, trigger: 'blur', message: '请输入' }],
+				isAble: [{ required: true, trigger: 'blur', message: '请输入' }],
+			},
+			title: '',
+			dialogFormVisible: false,
+			idAdd: true,
+		}
+	},
+	created() { },
+	methods: {
+    changeDate() {
+      this.$forceUpdate()
+    },
+		showEdit(row) {
+			if (!row) {
+				this.title = '添加'
+				this.idAdd = true
+			} else {
+				this.title = '编辑'
+				this.idAdd = false
+				this.form = Object.assign({}, row)
+			}
+			this.dialogFormVisible = true
+		},
+		close() {
+			this.$refs['form'].resetFields()
+			this.form = this.$options.data().form
+			this.dialogFormVisible = false
+			this.$emit('fetch-data')
+		},
+		save() {
+			this.$refs['form'].validate(async (valid) => {
+				if (valid) {
+					api.addWeatherStation(this.form).then(res => {
+						if (res.data) {
+							this.$message({
+								type: 'success',
+								message: '添加成功!'
+							});
+							this.$emit('save-success');
+							this.dialogFormVisible = false
+						}
+					})
+				} else {
+					return false
+				}
+			})
+		},
+		handleChange() {
+		},
+		onBlur(val, param) {
+			if (typeof (this.form[param]) !== 'number') {
+				this.form[param] = val.replace(/[^0-9]/ig, "")
+			}
+		},
+	},
+}
+</script>
+<style lang="less" scoped>
+.inputs {
+	width: 200px;
+}
+
+.lists {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+}
+</style>

src/views/stationConfiguration/weatherStation/index.vue

@@ -0,0 +1,233 @@
+<template>
+	<div class="table-container">
+		<vab-query-form>
+			<div class="title">
+				<div class="left">
+					<div class="left-item">
+						<div style="width: 70px;">名称：</div>
+						<el-input v-model="fuzzyQuery_name" placeholder="请输入" clearable />
+					</div>
+					<el-button icon="el-icon-search" type="primary" native-type="submit" @click="searchFetchData">
+						查询
+					</el-button>
+				</div>
+				<div class="right">
+					<el-button icon="el-icon-plus" type="primary" @click="handleAdd">
+						添加
+					</el-button>
+					<el-button icon="el-icon-delete" type="danger" @click="handleDelete">
+						删除
+					</el-button>
+					<UploadExcel style="margin-left: 10px;" @getResult="getMyExcelData"></UploadExcel>
+					<ExportExcel :exportList="exportExcel" :useType="'export'" partsName="气象站"></ExportExcel>
+					<ExportExcel :exportList="templateExcel" :useType="'template'" partsName="气象站模板"></ExportExcel>
+				</div>
+			</div>
+			<el-table header-cell-class-name="table_header_style" border ref="tableSort" v-loading="listLoading" :data="list"
+				:element-loading-text="elementLoadingText" :height="height" @selection-change="setSelectRows">
+				<el-table-column show-overflow-tooltip type="selection" align="center" width="40"></el-table-column>
+				<el-table-column show-overflow-tooltip label="编码" prop="nemCode" align="center" sortable></el-table-column>
+				<el-table-column show-overflow-tooltip label="名称" prop="name" align="center" sortable></el-table-column>
+				<el-table-column show-overflow-tooltip label="别名" prop="aname" align="center" sortable></el-table-column>
+				<el-table-column show-overflow-tooltip label="容量" prop="capacity" align="center" sortable></el-table-column>
+				<el-table-column show-overflow-tooltip :formatter="windpowerstationIdFormatter" label="风场编号" prop="windpowerstationId" align="center" sortable></el-table-column>
+				<el-table-column show-overflow-tooltip label="顺序" prop="orderNum" align="center" sortable></el-table-column>
+				<el-table-column show-overflow-tooltip label="是否可用" prop="isAble" 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>
+						<el-button type="text" @click="handleDelete(row)">删除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination :background="background" :current-page="queryForm.pageNo" :layout="layout"
+				:page-size="queryForm.pageSize" :total="total" @current-change="handleCurrentChange"
+				@size-change="handleSizeChange"></el-pagination>
+			<table-edit ref="edit" :options="options" :stationList="stationList" @save-success="fetchData"></table-edit>
+		</vab-query-form>
+	</div>
+</template>
+<script>
+import UploadExcel from '@/components/UploadExcel/index'
+import ExportExcel from '@/components/ExportExcel/index'
+import api from '@/api/realtimeDatabaseConfiguration'
+import stationApi from '@/api/station'
+import TableEdit from './components/TableEdit'
+export default {
+	components: {
+		UploadExcel,
+		ExportExcel,
+		TableEdit,
+	},
+	data() {
+		return {
+			fuzzyQuery_name: '',
+			listLoading: true,
+			list: [],
+			options: [],
+			exportExcel: [],
+			templateExcel: [],
+			elementLoadingText: '正在加载...',
+			selectRows: '',
+			layout: 'total, sizes, prev, pager, next, jumper',
+			total: 0,
+			background: true,
+			exportList: [],
+			queryForm: {
+				pageNo: 1,
+				pageSize: 20,
+			},
+			stationList: [],
+			selectValue: ''
+		};
+	},
+	computed: {
+		height() {
+			return this.$baseTableHeight() + 50
+		},
+	},
+	created() {
+		this.getStation()
+		this.fetchData()
+	},
+	methods: {
+    windpowerstationIdFormatter(row){
+      for (const iterator of this.stationList) {
+        if(row.windpowerstationId == iterator.id){
+          return iterator.name
+        }
+      }
+    },
+		getMyExcelData(val) {
+			val.forEach(item => {
+				api.addWeatherStation(item).then(res => {
+					if (res.code == 200) {
+						this.$message({
+							type: 'success',
+							message: '添加成功!'
+						});
+						this.fetchData()
+					}
+				})
+			})
+		},
+		getStation() {
+			stationApi.windpowerstationList({
+				id: '',
+				name: '',
+				companyId: '',
+				groupId: '',
+				pageNum: 1,
+				pageSize: 1000,
+			}).then(res => {
+				if (res.data) {
+					this.listLoading = false
+					this.stationList = res.data.records
+				}
+			})
+		},
+    searchFetchData(){
+      this.queryForm.pageNo = 1
+      this.fetchData()
+    },
+		fetchData() {
+			api.weatherStationList({
+				name: this.fuzzyQuery_name,
+				pageNum: this.queryForm.pageNo,
+				pageSize: this.queryForm.pageSize,
+			}).then(res => {
+				if (res.data) {
+					this.listLoading = false
+					this.total = res.data.total
+					this.list = res.data.records
+					this.templateExcel = [
+						{
+							nemCode: "",
+							name: "",
+							aname: "",
+							capacity: "",
+							windpowerstationId: "",
+							orderNum: "",
+							isAble: "",
+						}
+					]
+					// 导出
+					let exportExcel = []
+					res.data.records.forEach(item => {
+						exportExcel.push({
+							nemCode: item.nemCode,
+							name: item.name,
+							aname: item.aname,
+							capacity: item.capacity,
+							windpowerstationId: item.windpowerstationId,
+							orderNum: item.orderNum,
+							isAble: item.isAble,
+						})
+					})
+					this.exportExcel = exportExcel
+				}
+			})
+		},
+		handleSizeChange(val) {
+			this.queryForm.pageSize = val
+			this.fetchData()
+		},
+		handleCurrentChange(val) {
+			this.queryForm.pageNo = val
+			this.fetchData()
+		},
+		handleAdd() {
+			this.$refs['edit'].showEdit()
+		},
+		handleEdit(row) {
+			this.$refs['edit'].showEdit(row)
+		},
+		handleDelete(row) {
+			if (row.id || this.selectRows.length > 0) {
+				this.$baseConfirm('你确定要删除吗', null, async () => {
+					let ids = ''
+					if (this.selectRows.length > 0) {
+						ids = this.selectRows.map((item) => item.id).join()
+					}
+					api.deleteWeatherStation({
+						id: row.id || ids
+					}).then(res => {
+						if (res.data) {
+							this.$baseMessage('删除成功', 'success')
+							this.fetchData()
+						}
+					})
+				})
+			} else {
+				this.$baseMessage('未选中任何行', 'error')
+				return false
+			}
+		},
+		setSelectRows(val) {
+			this.selectRows = val
+		},
+	},
+}
+</script>
+<style lang="less" scoped>
+.title {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 20px;
+}
+
+.left {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+
+	.left-item {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-right: 10px;
+	}
+}
+</style>