合并冲突

web/public/config/columnList.js

@@ -213,6 +213,11 @@ export const columnList = [
         key: 'status',
         scopedSlots: { customRender: 'status' }
       },
+      {
+        title: '投运时间',
+        dataIndex: 'operation_date',
+        key: 'operation_date'
+      },
       {
         title: '场站运行模式',
         dataIndex: 'work_mode',
@@ -225,10 +230,11 @@ export const columnList = [
         key: 'policy_id',
         scopedSlots: { customRender: 'policy_id' }
       },
-
       {
         title: '操作',
         dataIndex: 'operate',
+        fixed: 'right',
+
         key: 'operate',
         scopedSlots: { customRender: 'action' }
       }
@@ -668,21 +674,9 @@ export const stationOptions = [
         label: '场站运行模式',
         value: undefined,
         key: 'work_mode',
-        type: 'select',
-        list: [
-          {
-            label: '最优经济化',
-            value: '1'
-          },
-          {
-            label: '支撑电网稳定',
-            value: '2'
-          },
-          {
-            label: '自定义',
-            value: '3'
-          }
-        ]
+        type: 'slot',
+        slotName: 'work_mode',
+        list: []
       },
       {
         // 0：未启用，1：启用
@@ -690,7 +684,7 @@ export const stationOptions = [
         label: '场站运行策略',
         value: undefined,
         key: 'policy_id',
-        type: 'select',
+        type: 'unshow',
         list: [
           {
             label: '削峰套利',