调整设备类型新增顺序

ipfcst/ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/constant/enums/EquipmentTypeEnum.java

@@ -26,7 +26,6 @@ public enum EquipmentTypeEnum {
      * 场站也视为设备类型的一种
      */
     POWERSTATION(0, "光伏发电站"),
-    POWERSTATION2(21, "风电发电站"),
     WEATHERSTATION(1, "气象站"),
     INVERTER(2, "逆变器"),
     WINDTOWER(3, "测风塔"),
@@ -46,7 +45,8 @@ public enum EquipmentTypeEnum {
     QBB(17, "启备变"),
     LLB(18, "联络变"),
     FZ(19, "方阵"),
-    XB(20,"箱变");
+    XB(20,"箱变"),
+    POWERSTATION2(21, "风电发电站");
 
     private Integer code;
     private String message;
@@ -76,8 +76,6 @@ public enum EquipmentTypeEnum {
         switch (code) {
             case 0:
                 return POWERSTATION;
-            case 21:
-                return POWERSTATION2;
             case 1:
                 return WEATHERSTATION;
             case 2:
@@ -118,6 +116,8 @@ public enum EquipmentTypeEnum {
                 return FZ;
             case 20:
                 return XB;
+            case 21:
+                return POWERSTATION2;
         }
         return null;
     }

ipfcst/ipfcst-console/src/main/frontend/views/uploadFile/UploadFileChannel/index.vue

@@ -35,8 +35,6 @@
               <vxe-table-column field="uploadFileType" title="上报文件类型"></vxe-table-column>
               <vxe-table-column field="uploadFileCharSetEnum" title="上报文件字符集"></vxe-table-column>
               <vxe-table-column field="uploadProtocolEnum" title="上报协议"></vxe-table-column>
-              <vxe-table-column field="uploadD5000" title="上报嘉越D5000"
-                                :formatter="formateuploadD5000"></vxe-table-column>
               <vxe-table-column field="uploadObjectRemarks" title="上报对象备注"></vxe-table-column>
               <!--<vxe-table-column field="uploadObjectName" title="上报对象名称" width="15%"></vxe-table-column>
               <vxe-table-column field="objectNo" title="上报对象编号" width="8%"></vxe-table-column>
@@ -576,7 +574,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="10" :offset="1">
-                <el-form-item label="上报嘉越D5000：" prop="uploadD5000" label-width="150px">
+                <el-form-item label="上报对象备注：" prop="uploadObjectRemarks" label-width="150px" style="min-width: 110px">
+                  <el-input v-model="form.uploadObjectRemarks" placeholder="选填项" maxlength="85"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row >
+              <el-col :span="10" :offset="1">
+                <el-form-item label="上报嘉越D5000：" prop="uploadD5000" label-width="150px" :style="{'display':'none'}">
                   <el-select v-model="form.uploadD5000" placeholder="请选择" filterable style="width: 100%">
                     <el-option
                       v-for="item in uploadD5000List"
@@ -587,13 +592,6 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
-              <el-col :span="10" :offset="1">
-                <el-form-item label="上报对象备注：" prop="uploadObjectRemarks" label-width="150px" style="min-width: 110px">
-                  <el-input v-model="form.uploadObjectRemarks" placeholder="选填项" maxlength="85"/>
-                </el-form-item>
-              </el-col>
-            </el-row>
           </fieldset>
         </el-form>
         <span slot="footer" class="dialog-footer">