合并冲突

web/public/config/columnList.js

@@ -114,6 +114,46 @@ export const columnList = [
       }
     ]
   },
+  {
+    page: 'permission',
+    columns: [
+      {
+        title: '权限ID',
+        dataIndex: 'permission_id',
+        key: 'permission_id',
+        ellipsis: true,
+        // filterable: true,
+        fixed: 'left'
+      },
+      {
+        title: '权限名称',
+        dataIndex: 'name',
+        key: 'name'
+        // filterable: true
+      },
+      {
+        title: '权限描述',
+        dataIndex: 'describe',
+        key: 'describe',
+        ellipsis: true
+        // filterable: true
+      },
+
+      {
+        title: '是否启用',
+        dataIndex: 'is_open',
+        key: 'is_open',
+        scopedSlots: { customRender: 'is_open' }
+      }
+
+      // {
+      //   title: '操作',
+      //   dataIndex: 'operate',
+      //   key: 'operate',
+      //   scopedSlots: { customRender: 'action' }
+      // }
+    ]
+  },
   {
     page: 'station',
     columns: [
@@ -140,16 +180,12 @@ export const columnList = [
       {
         title: '场站经度',
         dataIndex: 'lon',
-        width: 50,
         key: 'lon'
-        // filterable: true
       },
       {
         title: '场站纬度',
         dataIndex: 'lat',
-        width: 50,
         key: 'lat'
-        // filterable: true
       },
       {
         title: '储能容量',
@@ -165,10 +201,9 @@ export const columnList = [
         // filterable: true
       },
       {
-        title: '场站类别',
+        title: '储能容量',
         dataIndex: 'capacity',
-        key: 'capacity',
-        scopedSlots: { customRender: 'capacity' }
+        key: 'capacity'
       },
       {
         title: '场站状态',
@@ -375,6 +410,50 @@ export const columnList = [
         scopedSlots: { customRender: 'action' }
       }
     ]
+  },
+  {
+    page: 'serviceApi',
+    columns: [
+      {
+        title: '接口ID',
+        dataIndex: 'api_id',
+        key: 'api_id',
+        ellipsis: true,
+        // filterable: true,
+        fixed: 'left'
+      },
+      {
+        title: '接口名称',
+        dataIndex: 'name',
+        key: 'name'
+        // filterable: true
+      },
+      {
+        title: '接口描述',
+        dataIndex: 'describe',
+        key: 'describe'
+        // filterable: true
+      },
+      {
+        title: '接口参数',
+        dataIndex: 'params',
+        key: 'params'
+      },
+
+      {
+        title: '是否启用',
+        dataIndex: 'is_open',
+        key: 'is_open',
+        scopedSlots: { customRender: 'is_open' }
+      },
+
+      {
+        title: '操作',
+        dataIndex: 'operate',
+        key: 'operate',
+        scopedSlots: { customRender: 'action' }
+      }
+    ]
   }
 ]
 
@@ -457,8 +536,54 @@ export const roleOptions = [
         value: '',
         key: 'permission',
         type: 'slot',
-        slotName: 'permission',
-        className: 'item-l'
+        slotName: 'treetable',
+        className: 'item-l',
+        tableData: [],
+        selectTableData: [],
+        columns: [
+          {
+            title: '名称',
+            dataIndex: 'name',
+            key: 'name',
+            ellipsis: true,
+            filterable: true,
+            fixed: 'left'
+          },
+          {
+            title: '页面路径',
+            dataIndex: 'route',
+            key: 'route'
+            // filterable: true
+          },
+          {
+            title: '是否允许新增操作',
+            dataIndex: 'is_add',
+            key: 'is_add',
+            align: 'center',
+            scopedSlots: { customRender: 'is_add' }
+          },
+          {
+            title: '是否允许删除操作',
+            dataIndex: 'is_del',
+            key: 'is_del',
+            align: 'center',
+            scopedSlots: { customRender: 'is_del' }
+          },
+          {
+            title: '是否允许编辑操作',
+            dataIndex: 'is_edit',
+            key: 'is_edit',
+            align: 'center',
+            scopedSlots: { customRender: 'is_edit' }
+          },
+          {
+            title: '是否允许查看操作',
+            dataIndex: 'is_view',
+            key: 'is_view',
+            align: 'center',
+            scopedSlots: { customRender: 'isQuery' }
+          }
+        ]
       },
       {
         // 0:禁用; 1:启用
@@ -756,6 +881,51 @@ export const alarmlogOptions = [
     ruleForm: {}
   }
 ]
+export const serviceApiOptions = [
+  {
+    title: '基础信息',
+    icon: 'icon-xinxi',
+    list: [
+      {
+        label: '接口名称',
+        value: '',
+        key: 'name',
+        type: 'input'
+      },
+      {
+        label: '接口参数',
+        value: '',
+        key: 'params',
+        type: 'input'
+      },
+      {
+        label: '接口描述',
+        value: '',
+        key: 'describe',
+        type: 'textarea'
+      },
+
+      {
+        label: '是否启用',
+        value: '',
+        key: 'is_open',
+        type: 'switch',
+        className: 'item-l',
+        list: [
+          {
+            label: '禁用',
+            value: '0'
+          },
+          {
+            label: '启用',
+            value: '1'
+          }
+        ]
+      }
+    ],
+    ruleForm: {}
+  }
+]
 
 export const userFormRules = {
   account: [
@@ -821,3 +991,13 @@ export const deviceFormRules = {
     }
   ]
 }
+
+export const serviceApiFormRules = {
+  name: [
+    {
+      trigger: 'blur',
+      required: true,
+      message: '请输入接口名称'
+    }
+  ]
+}