kkkkk

ipfcst/ipfcst-console/src/main/frontend/views/console/electricField/index.vue

@@ -36,8 +36,20 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="场站状态：" prop="stationStatusEnum" label-width="180px">
-                  <el-input v-model="form.stationStatusEnum.message" placeholder="运维中" maxlength="32" readonly />
+                <el-form-item label="上报省调：" label-width="180px" prop="provinceEnum">
+                  <el-select
+                    v-model="form.provinceEnum"
+                    placeholder="请选择"
+                    filterable
+                    style="width: 100%"
+                  >
+                    <el-option
+                      v-for="item in this.provinceTypeList"
+                      :key="item.key"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -69,7 +81,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item
-                  label="装机容量(MW)："
+                  label="总装机容量(MW)："
                   prop="capacity"
                   label-width="180px"
                   style="min-width: 110px"
@@ -81,7 +93,30 @@
 
             <el-row style="gutter:30" class="row-bg el-row-two" justify="space-between">
               <el-col :span="12">
-                <el-form-item label="场站类型：" label-width="180px" prop="electricFieldTypeEnum">
+                <el-form-item
+                  label="光伏装机容量(MW)："
+                  prop="backupE"
+                  label-width="180px"
+                  style="min-width: 110px"
+                >
+                  <el-input v-model="form.backupE" placeholder="必填项" maxlength="85" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="风电装机容量(MW)："
+                  prop="backupF"
+                  label-width="180px"
+                  style="min-width: 110px"
+                >
+                  <el-input v-model="form.backupF" placeholder="必填项" maxlength="85" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row style="gutter:30" class="row-bg el-row-two" justify="space-between">
+              <el-col :span="12">
+                <el-form-item label="场站类型：" label-width="180px" prop="electricFieldTypeEnum" style="display:none">
                   <el-select
                     v-model="form.electricFieldTypeEnum"
                     placeholder="请选择"
@@ -98,20 +133,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="上报省调：" label-width="180px" prop="provinceEnum">
-                  <el-select
-                    v-model="form.provinceEnum"
-                    placeholder="请选择"
-                    filterable
-                    style="width: 100%"
-                  >
-                    <el-option
-                      v-for="item in this.provinceTypeList"
-                      :key="item.key"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
+                <el-form-item label="场站状态111：" prop="stationStatusEnum" label-width="180px" style="display:none">
+                  <el-input v-model="form.stationStatusEnum.message" placeholder="运维中" maxlength="32" readonly />
                 </el-form-item>
               </el-col>
 
@@ -191,7 +214,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="合同结束日期：" prop="backupC" label-width="180px" >
+                <el-form-item label="合同结束日期：" prop="backupC" label-width="180px" style="display:none">
                   <!--<el-date-picker-->
                     <!--style="width: 100%" -->
                     <!--v-model="form.contractEndTime"-->
@@ -269,6 +292,16 @@ export default {
           { required: true, message: '请填写场站名称' }
           // {message: '输入过长', max: 50}
         ],
+        backupE: [
+          { required: true, message: '请正确填写光伏装机容量' },
+          { pattern: /^\d+(\.\d{0,2})?$/, message: '只能输入正数数字或带两位小数的数字' }
+          // {message: '输入过长', max: 10}
+        ],
+        backupF: [
+          { required: true, message: '请正确填写风电装机容量' },
+          { pattern: /^\d+(\.\d{0,2})?$/, message: '只能输入正数数字或带两位小数的数字' }
+          // {message: '输入过长', max: 10}
+        ],
         capacity: [
           { required: true, message: '请正确填写装机容量' },
           { pattern: /^\d+(\.\d{0,2})?$/, message: '只能输入正数数字或带两位小数的数字' }