Merge branch 'develop'

src/pages/Task/eventManage/index.js

@@ -82,14 +82,14 @@ export default function EventManage() {
     formFields: [
       {
         label: '事件标识:',
-        key: 'senderId',
-        type: 'input',
-      },
-      {
-        label: '事件名称:',
-        key: 'userinfoId',
+        key: 'eventType',
         type: 'input',
       },
+      // {
+      //   label: '事件名称:',
+      //   key: 'userinfoId',
+      //   type: 'input',
+      // },
     ],
   };
   const tableColumns = [

src/pages/Task/historyManage/index.js

@@ -55,20 +55,24 @@ function HistoryManage(props) {
       {
         label: '用户ID:',
         type: 'input',
-        key: 'promoterId',
+        key: 'userinfoId',
         reg: 'id',
       },
       {
         label: '事件标识:',
         type: 'input',
         key: 'eventType',
-        reg: 'number',
+        // reg: 'number',
       },
       {
         label: '任务状态:',
         type: 'select',
-        option: [{ value: '0', label: '未上线' }, { value: '1', label: '已上线' }],
-        key: 'isOnline',
+        option: [
+          { value: '0', label: '全部' },
+          { value: '1', label: '已完成' },
+          { value: '2', label: '未完成' },
+        ],
+        key: 'status',
       },
       {
         label: '任务时间:',
@@ -97,14 +101,14 @@ function HistoryManage(props) {
       dataIndex: 'callback',
     },
     {
-      title: '用户ID',
-      dataIndex: 'userid',
+      title: '任务时间',
+      dataIndex: 'createTime',
     },
     {
       title: '完成状态',
       dataIndex: 'isFinished',
       render: (e, text) => {
-        return text.isOnline ? <span>已上线</span> : <span>未上线</span>;
+        return text.isFinished ? <span>已完成</span> : <span>未完成</span>;
       },
     },
     {
@@ -125,32 +129,7 @@ function HistoryManage(props) {
     columnConfig: tableColumns,
     rowKey: 'id',
   };
-  const formSetting = [
-    {
-      label: '事件标识',
-      isRequired: true,
-      type: 'input',
-      key: 'eventType',
-      maxLength: 20,
-      placeholder: '2-20个字符',
-    },
-    {
-      label: '事件名称',
-      isRequired: true,
-      type: 'input',
-      key: 'eventName',
-      maxLength: 20,
-      placeholder: '2-20个字符',
-    },
-    {
-      label: '备注',
-      isRequired: true,
-      type: 'input',
-      key: 'remarks',
-      maxLength: 20,
-      placeholder: '2-20个字符',
-    },
-  ];
+  const formSetting = [];
   useEffect(() => {}, []);
   let getCheck = null;
   return (

src/pages/Task/taskmanage/index.js

@@ -106,7 +106,7 @@ export default function EventManage() {
     perWidthUnit: 240,
     formFields: [
       {
-        label: '事件:',
+        label: '事件标识:',
         key: 'eventType',
         type: 'input',
       },
@@ -124,9 +124,13 @@ export default function EventManage() {
     },
 
     {
-      title: '事件',
+      title: '事件标识',
       dataIndex: 'eventType',
     },
+    {
+      title: '事件名称',
+      dataIndex: 'eventName',
+    },
     {
       title: '回调',
       dataIndex: 'callback',
@@ -138,10 +142,7 @@ export default function EventManage() {
         return text.isOnline ? <span>已上线</span> : <span>未上线</span>;
       },
     },
-    {
-      title: '扩展数据',
-      dataIndex: 'customData',
-    },
+    
     {
       title: '延时',
       dataIndex: 'delayTime',
@@ -150,6 +151,10 @@ export default function EventManage() {
       title: '备注',
       dataIndex: 'remarks',
     },
+    {
+      title: '扩展数据',
+      dataIndex: 'customData',
+    },
     {
       title: '操作',
       dataIndex: 'time',