Просмотр исходного кода

场站基本信息添加装机容量

zy 1 год назад
Родитель
Сommit
296c9a5f6f

+ 3 - 0
neim-biz/src/main/java/com/jiayue/biz/domain/StationBasicInfo.java

@@ -22,4 +22,7 @@ public class StationBasicInfo {
     private String longitude;
     //纬度
     private String latitude;
+     //装机容量
+    private String capacity;
+
 }

+ 2 - 0
neim-biz/src/main/java/com/jiayue/biz/dto/StationInfoDto.java

@@ -23,4 +23,6 @@ public class StationInfoDto {
     private String latitude;
     //关联设备
     private String equipment;
+    //装机容量
+    private String capacity;
 }

+ 2 - 0
neim-biz/src/main/java/com/jiayue/biz/service/impl/StationInfoServiceImpl.java

@@ -66,6 +66,7 @@ public class StationInfoServiceImpl implements StationInfoService {
                 stationInfoDto.setAbbreviation(stationInfo.getStationBasicInfo().getAbbreviation());
                 stationInfoDto.setLatitude(stationInfo.getStationBasicInfo().getLatitude());
                 stationInfoDto.setLongitude(stationInfo.getStationBasicInfo().getLongitude());
+                stationInfoDto.setCapacity(stationInfo.getStationBasicInfo().getCapacity());
             }
             if (stationInfo.getEquipment() != null) {
                 StringBuilder builder = new StringBuilder();
@@ -181,6 +182,7 @@ public class StationInfoServiceImpl implements StationInfoService {
         stationBasicInfo.setLatitude(stationInfoDto.getLatitude());
         stationBasicInfo.setLongitude(stationInfoDto.getLongitude());
         stationBasicInfo.setStationType(stationInfoDto.getStationType());
+        stationBasicInfo.setCapacity(stationInfoDto.getCapacity());
         return stationBasicInfo;
 
     }

+ 10 - 2
neim-ui/src/views/dataQuery/electrucStation/index.vue

@@ -23,6 +23,7 @@
         <el-table-column label="场站经度" align="center" prop="longitude"/>
         <el-table-column label="场站纬度" align="center" prop="latitude"/>
         <el-table-column label="场站类型" align="center" prop="stationType" :formatter="formatStatus"/>
+        <el-table-column label="装机容量(MW)" align="center" prop="capacity"/>
         <el-table-column label="关联设备" align="center" prop="equipment" :formatter="formatEquipment">
           <!--          <template slot-scope="scope">-->
           <!--            <span>{{ formatEquipment(scope.row.equipment) }}</span>-->
@@ -107,7 +108,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-
+        <el-row :gutter="20" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="装机容量(MW)" prop="capacity">
+              <el-input v-model="form.capacity" placeholder="请输入装机容量"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="关联设备" prop="equipment" v-if="eType === '风'">
           <el-select v-model="form.equipment" placeholder="请选择" style="width: 100%" multiple clearable>
             <el-option
@@ -351,7 +358,8 @@ export default {
         longitude: row.longitude,
         latitude: row.latitude,
         stationType: row.stationType,
-        equipment: a
+        equipment: a,
+        capacity: row.capacity
       };
       this.eType = this.form.stationType
       this.open = true;

+ 7 - 1
neim-ui/src/views/largeScreenPage/components/wdCharts.vue

@@ -99,7 +99,13 @@ export default {
         {number: [110], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
         {number: [120], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
         {number: [140], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
-        {number: [150], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}}],
+        {number: [150], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
+        {number: [160], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
+        {number: [170], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
+        {number: [180], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
+        {number: [190], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
+        {number: [200], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}}
+      ],
       wdCharts: null,
       windPowerChart: null,
       timer: null,

+ 7 - 1
neim-ui/src/views/largeScreenPage/components/wdPowerCharts.vue

@@ -69,7 +69,13 @@ export default {
         {number: [110], content: '{nt}', textAlign: 'center',style: {fontSize: 25, fontFamily:'timeFont'}},
         {number: [120], content: '{nt}', textAlign: 'center',style: {fontSize: 25, fontFamily:'timeFont'}},
         {number: [140], content: '{nt}', textAlign: 'center',style: {fontSize: 25, fontFamily:'timeFont'}},
-        {number: [150], content: '{nt}', textAlign: 'center',style: {fontSize: 25, fontFamily:'timeFont'}}],
+        {number: [150], content: '{nt}', textAlign: 'center',style: {fontSize: 25, fontFamily:'timeFont'}},
+        {number: [160], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
+        {number: [170], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
+        {number: [180], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
+        {number: [190], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}},
+        {number: [200], content: '{nt}', textAlign: 'center',style: {fontFamily:'timeFont'}}
+      ],
       windPowerChart: null,
       timer: null,
     }