合并代码

web/public/config/columnList.js

@@ -290,7 +290,9 @@ export const columnList = [
         title: '操作',
         dataIndex: 'operate',
         key: 'operate',
-        scopedSlots: { customRender: 'action' }
+        scopedSlots: { customRender: 'action' },
+        fixed: 'right',
+        align: 'center'
       }
     ]
   },
@@ -352,45 +354,30 @@ export const columnList = [
     ]
   },
   {
-    page: 'log',
+    page: 'syslog',
     columns: [
       {
-        title: '用户',
-        dataIndex: 'userName',
-        width: 180
+        title: '日志ID',
+        dataIndex: 'log_id'
       },
 
       {
-        title: '日志类型',
-        dataIndex: 'type',
-        key: 'type',
-        width: 120,
+        title: '操作用户',
+        dataIndex: 'user_id',
+        key: 'user_id',
+        width: 120
+      },
 
-        scopedSlots: { customRender: 'type' }
-      },
       {
-        title: '操作类型',
-        dataIndex: 'opType',
-        key: 'opType',
-        width: 120,
-
-        scopedSlots: { customRender: 'opType' }
-      },
-      {
-        title: 'ip',
-        dataIndex: 'ip',
-        key: 'ip'
-      },
-      {
-        title: '内容',
-        dataIndex: 'msg',
-        key: 'msg',
+        title: '日志内容',
+        dataIndex: 'content',
+        key: 'content',
         ellipsis: true
       },
       {
-        title: '生成时间',
-        dataIndex: 'createTime',
-        key: 'createTime',
+        title: '记录时间',
+        dataIndex: 'create_time',
+        key: 'create_time',
         align: 'center',
         ellipsis: true,
         width: 180
@@ -408,7 +395,6 @@ export const columnList = [
         title: '操作',
         dataIndex: 'operate',
         key: 'operate',
-        width: 80,
         scopedSlots: { customRender: 'action' }
       }
     ]
@@ -769,7 +755,7 @@ export const deviceOptions = [
         label: '厂家',
         value: '',
         key: 'factory',
-        type: 'input'
+        type: 'textarea'
       },
       {
         label: '厂家电话',
@@ -873,8 +859,58 @@ export const alarmlogOptions = [
         label: '状态',
         type: 'select',
         list: [
-          { value: 0, label: '异常' },
-          { value: 1, label: '正常' }
+          { value: '0', label: '异常' },
+          { value: '1', label: '正常' }
+        ],
+        value: [],
+        key: 'status'
+      }
+    ],
+    ruleForm: {}
+  }
+]
+export const syslogOptions = [
+  {
+    title: '基础信息',
+    icon: 'icon-xinxi',
+    list: [
+      {
+        label: '日志ID',
+        value: '',
+        key: 'log_id',
+        type: 'input'
+      },
+
+      {
+        label: '操作用户ID',
+        value: '',
+        key: 'user_id',
+        type: 'input',
+        disabled: true
+      },
+
+      {
+        label: '日志内容',
+        value: '',
+        key: 'content',
+        type: 'textarea',
+        disabled: true,
+        className: 'item-l',
+        rows: 8
+      },
+      {
+        label: '记录时间',
+        value: '',
+        key: 'create_time',
+        type: 'input'
+      },
+
+      {
+        label: '状态',
+        type: 'select',
+        list: [
+          { value: '0', label: '异常' },
+          { value: '1', label: '正常' }
         ],
         value: [],
         key: 'status'