From eb4bfa192398604a227b719ad41fabf7dbbb1298 Mon Sep 17 00:00:00 2001 From: charlesxie <408737515@qq.com> Date: Tue, 29 Mar 2022 19:23:46 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/bamboo_engine_playground.iml | 1 + .../34cc04bf-c12f-4df1-b32b-daa25e19a58f.xml | 3125 ++++++++--------- .../__pycache__/serializers.cpython-36.pyc | Bin 7922 -> 8294 bytes applications/flow/models.py | 1 - applications/flow/serializers.py | 31 +- applications/flow/views.py | 6 + .../__pycache__/plugins.cpython-36.pyc | Bin 2188 -> 2258 bytes .../components/collections/plugins.py | 8 +- dj_flow/__pycache__/settings.cpython-36.pyc | Bin 3640 -> 3640 bytes web/src/views/job_flow_mgmt/job_flow_list.vue | 26 +- web/src/views/job_mgmt/job_dialog.vue | 239 +- web/src/views/job_mgmt/job_list.vue | 49 +- web/src/views/job_mgmt/single_job.vue | 342 +- .../job_monitor/monitor/job_flow_view.vue | 17 +- .../views/job_monitor/monitor/job_monitor.vue | 13 +- .../views/job_monitor/monitor/view_detail.vue | 36 +- 16 files changed, 1788 insertions(+), 2106 deletions(-) diff --git a/.idea/bamboo_engine_playground.iml b/.idea/bamboo_engine_playground.iml index 04562a6..0dcb129 100644 --- a/.idea/bamboo_engine_playground.iml +++ b/.idea/bamboo_engine_playground.iml @@ -14,6 +14,7 @@ + diff --git a/.idea/dataSources/34cc04bf-c12f-4df1-b32b-daa25e19a58f.xml b/.idea/dataSources/34cc04bf-c12f-4df1-b32b-daa25e19a58f.xml index 4e4cd91..5c741e4 100644 --- a/.idea/dataSources/34cc04bf-c12f-4df1-b32b-daa25e19a58f.xml +++ b/.idea/dataSources/34cc04bf-c12f-4df1-b32b-daa25e19a58f.xml @@ -1,4539 +1,4302 @@ - + - 8.0.11 + 8.0.19 InnoDB InnoDB lower/lower - + utf8_general_ci - + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + 1 utf8_general_ci - + utf8_general_ci - + utf8_general_ci - + utf8_general_ci - + utf8_general_ci - + utf8_general_ci - + utf8_general_ci - + utf8_general_ci - + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + utf8mb4_0900_ai_ci - + utf8_general_ci - + + utf8_general_ci + + + utf8_general_ci + + utf8mb4_0900_ai_ci - + utf8_general_ci - + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + utf8mb4_0900_ai_ci - + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + utf8mb4_0900_ai_ci - + utf8_general_ci - + + utf8mb4_0900_ai_ci + + utf8_general_ci - + utf8_general_ci - + utf8_general_ci - - utf8_general_ci + + utf8mb4_0900_ai_ci - + armscii8 - + armscii8 1 - + ascii - + ascii 1 - + big5 - + big5 1 - + binary 1 - + cp1250 - + cp1250 - + cp1250 - + cp1250 1 - + cp1250 - + cp1251 - + cp1251 - + cp1251 1 - + cp1251 - + cp1251 - + cp1256 - + cp1256 1 - + cp1257 - + cp1257 1 - + cp1257 - + cp850 - + cp850 1 - + cp852 - + cp852 1 - + cp866 - + cp866 1 - + cp932 - + cp932 1 - + dec8 - + dec8 1 - + eucjpms - + eucjpms 1 - + euckr - + euckr 1 - + gb18030 - + gb18030 1 - + gb18030 - + gb2312 - + gb2312 1 - + gbk - + gbk 1 - + geostd8 - + geostd8 1 - + greek - + greek 1 - + hebrew - + hebrew 1 - + hp8 - + hp8 1 - + keybcs2 - + keybcs2 1 - + koi8r - + koi8r 1 - + koi8u - + koi8u 1 - + latin1 - + latin1 - + latin1 - + latin1 - + latin1 - + latin1 - + latin1 - + latin1 1 - + latin2 - + latin2 - + latin2 - + latin2 1 - + latin2 - + latin5 - + latin5 1 - + latin7 - + latin7 - + latin7 1 - + latin7 - + macce - + macce 1 - + macroman - + macroman 1 - + sjis - + sjis 1 - + swe7 - + swe7 1 - + tis620 - + tis620 1 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 1 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ucs2 - + ujis - + ujis 1 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 1 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16 - + utf16le - + utf16le 1 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 1 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf32 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 1 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8 - + utf8mb4 1 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + utf8mb4 - + + utf8mb4 + + + utf8mb4 + + localhost + SELECT + - + localhost + SHUTDOWN,SUPER +BACKUP_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,PERSIST_RO_VARIABLES_ADMIN,SESSION_VARIABLES_ADMIN,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN +SELECT|performance_schema +SELECT|mysql.user + - + localhost + TRIGGER|sys +SELECT|sys.sys_config + - + localhost + SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,RELOAD,SHUTDOWN,PROCESS,FILE,REFERENCES,INDEX,ALTER,SHOW DATABASES,SUPER,CREATE TEMPORARY TABLES,LOCK TABLES,EXECUTE,REPLICATION SLAVE,REPLICATION CLIENT,CREATE VIEW,SHOW VIEW,CREATE ROUTINE,ALTER ROUTINE,CREATE USER,EVENT,TRIGGER,CREATE TABLESPACE,CREATE ROLE,DROP ROLE! +APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN! + - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(150)|0s 1 - normal - + name 1 btree - + 1 id 1 - + name name - + 1 - int(11)|0s + bigint|0s 1 - 1 - normal + null - + 2 - int(11)|0s + int|0s 1 - normal - + 3 - int(11)|0s + int|0s 1 - normal - + group_id permission_id 1 btree - + permission_id btree - + 1 id 1 - + group_id permission_id auth_group_permissions_group_id_permission_id_0cd325b0_uniq - + group_id auth_group id - + permission_id auth_permission id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(255)|0s 1 - normal - + 3 - int(11)|0s + int|0s 1 - normal - + 4 varchar(100)|0s 1 - normal - + content_type_id codename 1 btree - + 1 id 1 - + content_type_id codename auth_permission_content_type_id_codename_01ab375a_uniq - + content_type_id django_content_type id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(128)|0s 1 - normal - + 3 datetime(6)|0s - normal - + 4 tinyint(1)|0s 1 - normal - + 5 varchar(150)|0s 1 - normal - + 6 - varchar(30)|0s + varchar(150)|0s 1 - normal - + 7 varchar(150)|0s 1 - normal - + 8 varchar(254)|0s 1 - normal - + 9 tinyint(1)|0s 1 - normal - + 10 tinyint(1)|0s 1 - normal - + 11 datetime(6)|0s 1 - normal - + username 1 btree - + 1 id 1 - + username username - + 1 - int(11)|0s + bigint|0s 1 - 1 - normal + null - + 2 - int(11)|0s + int|0s 1 - normal - + 3 - int(11)|0s + int|0s 1 - normal - + user_id group_id 1 btree - + group_id btree - + 1 id 1 - + user_id group_id auth_user_groups_user_id_group_id_94350c0c_uniq - + user_id auth_user id - + group_id auth_group id - + 1 - int(11)|0s + bigint|0s 1 - 1 - normal + null - + 2 - int(11)|0s + int|0s 1 - normal - + 3 - int(11)|0s + int|0s 1 - normal - + user_id permission_id 1 btree - + permission_id btree - + 1 id 1 - + user_id permission_id auth_user_user_permissions_user_id_permission_id_14a6b632_uniq - + user_id auth_user id - + permission_id auth_permission id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(255)|0s 1 - normal - + 3 varchar(255)|0s 1 - normal - + 4 tinyint(1)|0s 1 - normal - + 5 varchar(64)|0s 1 - normal - + code version 1 btree - + code btree - + version btree - + 1 id 1 - + code version component_framework_componentmodel_code_version_1b8e366c_uniq - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 datetime(6)|0s 1 - normal - + 3 longtext|0s - normal - + 4 varchar(200)|0s 1 - normal - + 5 - smallint(5) unsigned|0s + smallint unsigned|0s 1 - normal - + 6 longtext|0s 1 - normal - + 7 - int(11)|0s - normal + int|0s - + 8 - int(11)|0s + int|0s 1 - normal - + content_type_id btree - + user_id btree - + 1 id 1 - + content_type_id django_content_type id - + user_id auth_user id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 datetime(6)|0s 1 - normal - + 1 id 1 - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(240)|0s 1 - normal - + 3 varchar(96)|0s 1 - normal - + 4 varchar(64)|0s 1 - normal - + 5 varchar(124)|0s 1 - normal - + 6 varchar(64)|0s 1 - normal - + 7 varchar(63)|0s 1 - normal - + 1 id 1 - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 - int(11)|0s + int|0s 1 - normal - + 3 varchar(24)|0s 1 - normal - + 1 id 1 - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(200)|0s 1 - normal - + 3 varchar(200)|0s 1 - normal - + 4 longtext|0s 1 - normal - + 5 longtext|0s 1 - normal - + 6 varchar(200)|0s - normal - + 7 varchar(200)|0s - normal - + 8 varchar(200)|0s - normal - + 9 datetime(6)|0s - normal - + 10 tinyint(1)|0s 1 - normal - + 11 datetime(6)|0s - normal - + 12 - int(10) unsigned|0s + int unsigned|0s 1 - normal - + 13 datetime(6)|0s 1 - normal - + 14 longtext|0s 1 - normal - + 15 - int(11)|0s - normal + int|0s - + 16 - int(11)|0s - normal + int|0s - + 17 - int(11)|0s - normal + int|0s - + 18 tinyint(1)|0s 1 - normal - + 19 datetime(6)|0s - normal - + 20 - int(10) unsigned|0s - normal + int unsigned|0s - + 21 longtext|0s 1 - normal - + 22 - int(11)|0s - normal + int|0s - + 23 - int(10) unsigned|0s - normal + int unsigned|0s - + name 1 btree - + crontab_id btree - + interval_id btree - + solar_id btree - + clocked_id btree - + 1 id 1 - + name name - + crontab_id django_celery_beat_crontabschedule id - + interval_id django_celery_beat_intervalschedule id - + solar_id django_celery_beat_solarschedule id - + clocked_id django_celery_beat_clockedschedule id - + 1 - smallint(6)|0s + smallint|0s 1 - normal - + 2 datetime(6)|0s 1 - normal - + 1 ident 1 - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(24)|0s 1 - normal - + 3 decimal(9,6 digit)|0s 1 - normal - + 4 decimal(9,6 digit)|0s 1 - normal - + event latitude longitude 1 btree - + 1 id 1 - + event latitude longitude django_celery_beat_solar_event_latitude_longitude_ba64999a_uniq - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(255)|0s 1 - normal - + 3 varchar(50)|0s 1 - normal - + 4 varchar(128)|0s 1 - normal - + 5 varchar(64)|0s 1 - normal - + 6 longtext|0s - normal - + 7 datetime(6)|0s 1 - normal - + 8 longtext|0s - normal - + 9 longtext|0s - normal - + 10 longtext|0s - normal - + 11 longtext|0s - normal - + 12 varchar(255)|0s - normal - + 13 varchar(100)|0s - normal - + 14 datetime(6)|0s 1 - normal - + task_id 1 btree - + status btree - + date_done btree - + task_name btree - + worker btree - + date_created btree - + 1 id 1 - + task_id task_id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(100)|0s 1 - normal - + 3 varchar(100)|0s 1 - normal - + app_label model 1 btree - + 1 id 1 - + app_label model django_content_type_app_label_model_76bd3d3b_uniq - + 1 - int(11)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(255)|0s 1 - normal - + 3 varchar(255)|0s 1 - normal - + 4 datetime(6)|0s 1 - normal - + 1 id 1 - + 1 varchar(40)|0s 1 - normal - + 2 longtext|0s 1 - normal - + 3 datetime(6)|0s 1 - normal - + expire_date btree - + 1 session_key 1 - + 1 varchar(32)|0s 1 - normal - + 2 longblob|0s 1 - normal - + 3 longblob|0s 1 - normal - + 4 longblob|0s 1 - normal - + 1 id 1 - + 1 varchar(255)|0s 1 - normal - + 2 longblob|0s 1 - normal - + 1 key 1 - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(32)|0s 1 - normal - + 3 longtext|0s 1 - normal - + 4 tinyint(1)|0s 1 - normal - + name 1 btree - + 1 id 1 - + name engine_functionswitch_name_4eaabfd5_uniq - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(32)|0s 1 - normal - + 3 datetime(6)|0s 1 - normal - + 4 datetime(6)|0s 1 - normal - + 5 - bigint(20)|0s - normal + bigint|0s - + 6 - int(11)|0s + int|0s 1 - normal - + 7 tinyint(1)|0s 1 - normal - + identifier btree - + data_id btree - + 1 id 1 - + data_id engine_historydata id - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 longblob|0s 1 - normal - + 3 longblob|0s 1 - normal - + 4 longblob|0s 1 - normal - + 1 id 1 - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(64)|0s 1 - normal - + 3 longblob|0s 1 - normal - + 1 id 1 - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(32)|0s 1 - normal - + 3 varchar(40)|0s 1 - normal - + node_id 1 btree - + 1 id 1 - + node_id node_id - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(32)|0s 1 - normal - + 3 varchar(32)|0s 1 - normal - + 4 - int(11)|0s + int|0s 1 - normal - + ancestor_id btree - + descendant_id btree - + distance btree - + 1 id 1 - + 1 varchar(32)|0s 1 - normal - + 2 varchar(32)|0s - normal - + 3 - int(11)|0s + int|0s 1 - normal - + 4 varchar(512)|0s 1 - normal - + process_id btree - + 1 id 1 - + process_id engine_pipelineprocess id - + 1 varchar(32)|0s 1 - normal - + 2 varchar(32)|0s 1 - normal - + 3 varchar(32)|0s 1 - normal - + 4 varchar(32)|0s 1 - normal - + 5 varchar(32)|0s 1 - normal - + 6 - int(11)|0s + int|0s 1 - normal - + 7 - int(11)|0s + int|0s 1 - normal - + 8 tinyint(1)|0s 1 - normal - + 9 tinyint(1)|0s 1 - normal - + 10 - bigint(20)|0s - normal + bigint|0s - + 11 tinyint(1)|0s 1 - normal - + root_pipeline_id btree - + current_node_id btree - + parent_id btree - + is_alive btree - + is_sleep btree - + snapshot_id btree - + is_frozen btree - + 1 id 1 - + snapshot_id engine_processsnapshot id - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(32)|0s 1 - normal - + 3 varchar(40)|0s 1 - normal - + process_id 1 btree - + 1 id 1 - + process_id process_id - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 longblob|0s 1 - normal - + 1 id 1 - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(64)|0s 1 - normal - + 3 varchar(40)|0s 1 - normal - + schedule_id 1 btree - + 1 id 1 - + schedule_id schedule_id - + 1 varchar(64)|0s 1 - normal - + 2 varchar(32)|0s 1 - normal - + 3 varchar(32)|0s 1 - normal - + 4 - int(11)|0s + int|0s 1 - normal - + 5 tinyint(1)|0s 1 - normal - + 6 longblob|0s 1 - normal - + 7 longblob|0s 1 - normal - + 8 tinyint(1)|0s 1 - normal - + 9 varchar(32)|0s 1 - normal - + 10 tinyint(1)|0s 1 - normal - + 11 tinyint(1)|0s 1 - normal - + activity_id btree - + version btree - + is_scheduling btree - + 1 id 1 - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(1024)|0s 1 - normal - + 3 longtext|0s 1 - normal - + 4 - int(11)|0s + int|0s 1 - normal - + 5 longtext|0s 1 - normal - + 6 longtext|0s 1 - normal - + 7 datetime(6)|0s 1 - normal - + 1 id 1 - + 1 varchar(32)|0s 1 - normal - + 2 varchar(10)|0s 1 - normal - + 3 varchar(64)|0s 1 - normal - + 4 - int(11)|0s + int|0s 1 - normal - + 5 - int(11)|0s + int|0s 1 - normal - + 6 tinyint(1)|0s 1 - normal - + 7 datetime(6)|0s 1 - normal - + 8 datetime(6)|0s - normal - + 9 datetime(6)|0s - normal - + 10 varchar(32)|0s 1 - normal - + 11 tinyint(1)|0s 1 - normal - + 12 datetime(6)|0s - normal - + created_time btree - + 1 id 1 - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(32)|0s 1 - normal - + 3 varchar(32)|0s 1 - normal - + subprocess_id btree - + 1 id 1 - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(33)|0s 1 - normal - + 3 varchar(33)|0s 1 - normal - + 4 longtext|0s 1 - normal - + 1 id 1 - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(33)|0s 1 - normal - + 3 longtext|0s 1 - normal - + pipeline_id 1 btree - + 1 id 1 - + pipeline_id pipeline_id - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(33)|0s 1 - normal - + 3 varchar(128)|0s 1 - normal - + 4 - int(11)|0s + int|0s 1 - normal - + 5 varchar(32)|0s 1 - normal - + 6 varchar(128)|0s 1 - normal - + 7 longtext|0s 1 - normal - + 8 longtext|0s 1 - normal - + pipeline_id key 1 btree - + 1 id 1 - + pipeline_id key eri_contextvalue_pipeline_id_key_df86ad76_uniq - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(33)|0s 1 - normal - + 3 longtext|0s 1 - normal - + 4 longtext|0s 1 - normal - + node_id 1 btree - + 1 id 1 - + node_id node_id - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(33)|0s 1 - normal - + 3 varchar(32)|0s 1 - normal - + 4 varchar(32)|0s 1 - normal - + 5 longtext|0s 1 - normal - + 6 longtext|0s 1 - normal - + node_id 1 btree - + 1 id 1 - + node_id node_id - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(33)|0s 1 - normal - + 3 - int(11)|0s + int|0s 1 - normal - + 4 - int(11)|0s + int|0s 1 - normal - + 5 tinyint(1)|0s 1 - normal - + 6 varchar(33)|0s 1 - normal - + 7 datetime(6)|0s 1 - normal - + 8 datetime(6)|0s 1 - normal - + 9 varchar(32)|0s 1 - normal - + 10 varchar(32)|0s 1 - normal - + 11 longtext|0s 1 - normal - + 12 longtext|0s 1 - normal - + node_id loop btree - + 1 id 1 - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(33)|0s 1 - normal - + 3 - int(11)|0s + int|0s 1 - normal - + 4 varchar(128)|0s 1 - normal - + 5 varchar(32)|0s 1 - normal - + 6 longtext|0s - normal - + 7 datetime(6)|0s 1 - normal - + 8 varchar(33)|0s 1 - normal - + node_id loop btree - + logged_at btree - + 1 id 1 - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(33)|0s 1 - normal - + 3 longtext|0s 1 - normal - + node_id btree - + 1 id 1 - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 - bigint(20)|0s + bigint|0s 1 - normal - + 3 - int(11)|0s + int|0s 1 - normal - + 4 - int(11)|0s + int|0s 1 - normal - + 5 tinyint(1)|0s 1 - normal - + 6 tinyint(1)|0s 1 - normal - + 7 tinyint(1)|0s 1 - normal - + 8 tinyint(1)|0s 1 - normal - + 9 datetime(6)|0s 1 - normal - + 10 varchar(33)|0s 1 - normal - + 11 varchar(33)|0s 1 - normal - + 12 varchar(33)|0s 1 - normal - + 13 varchar(33)|0s 1 - normal - + 14 - int(11)|0s + int|0s 1 - normal - + 15 varchar(128)|0s 1 - normal - + 16 longtext|0s 1 - normal - + parent_id btree - + last_heartbeat btree - + current_node_id btree - + root_pipeline_id btree - + suspended_by btree - + 1 id 1 - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 - int(11)|0s + int|0s 1 - normal - + 3 - bigint(20)|0s + bigint|0s 1 - normal - + 4 varchar(33)|0s 1 - normal - + 5 tinyint(1)|0s 1 - normal - + 6 tinyint(1)|0s 1 - normal - + 7 tinyint(1)|0s 1 - normal - + 8 varchar(33)|0s 1 - normal - + 9 - int(11)|0s + int|0s 1 - normal - + node_id version 1 btree - + 1 id 1 - + node_id version eri_schedule_node_id_version_41a8c75a_uniq - + 1 - bigint(20)|0s + bigint|0s 1 - 1 - normal + null - + 2 varchar(33)|0s 1 - normal - + 3 varchar(33)|0s 1 - normal - + 4 varchar(33)|0s 1 - normal - + 5 varchar(64)|0s 1 - normal - + 6 varchar(33)|0s 1 - normal - + 7 - int(11)|0s + int|0s 1 - normal - + 8 - int(11)|0s + int|0s 1 - normal - + 9 tinyint(1)|0s 1 - normal - + 10 tinyint(1)|0s 1 - normal - + 11 datetime(6)|0s 1 - normal - + 12 datetime(6)|0s - normal - + 13 datetime(6)|0s - normal - + 14 - int(11)|0s + int|0s 1 - normal - + node_id 1 btree - + root_id btree - + parent_id btree - + 1 id 1 - + node_id node_id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(255)|0s 1 - normal - + 1 id 1 - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(255)|0s 1 - normal - + 3 varchar(255)|0s 1 - normal - + 4 varchar(255)|0s - normal - + 5 tinyint(1)|0s 1 - normal - + 6 - int(11)|0s + int|0s 1 - normal - + 7 - int(11)|0s + int|0s 1 - normal - + 8 varchar(64)|0s - normal - + 9 - int(11)|0s + int|0s 1 - normal - + 10 - int(11)|0s + int|0s 1 - normal - + 11 varchar(32)|0s 1 - normal - + 12 - int(11)|0s + int|0s 1 - normal - + 13 varchar(255)|0s 1 - normal - + 14 tinyint(1)|0s 1 - normal - + 15 tinyint(1)|0s 1 - normal - + 16 json|0s 1 - normal - + 17 json|0s 1 - normal - + 18 - int(11)|0s - normal + int|0s - + 19 - int(11)|0s + int|0s 1 - normal - + uuid 1 btree - + process_id btree - + 1 id 1 - + uuid uuid - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(255)|0s 1 - normal - + 3 varchar(255)|0s 1 - normal - + 4 varchar(255)|0s - normal - + 5 tinyint(1)|0s 1 - normal - + 6 - int(11)|0s + int|0s 1 - normal - + 7 - int(11)|0s + int|0s 1 - normal - + 8 varchar(64)|0s - normal - + 9 - int(11)|0s + int|0s 1 - normal - + 10 - int(11)|0s + int|0s 1 - normal - + 11 varchar(32)|0s 1 - normal - + 12 - int(11)|0s + int|0s 1 - normal - + 13 varchar(255)|0s 1 - normal - + 14 tinyint(1)|0s 1 - normal - + 15 tinyint(1)|0s 1 - normal - + 16 json|0s 1 - normal - + 17 json|0s 1 - normal - + 18 - int(11)|0s - normal + int|0s - + 19 - int(11)|0s + int|0s 1 - normal - + uuid 1 btree - + process_run_id btree - + 1 id 1 - + uuid uuid - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(255)|0s 1 - normal - + 3 varchar(255)|0s 1 - normal - + 4 varchar(255)|0s - normal - + 5 tinyint(1)|0s 1 - normal - + 6 - int(11)|0s + int|0s 1 - normal - + 7 - int(11)|0s + int|0s 1 - normal - + 8 varchar(64)|0s - normal - + 9 - int(11)|0s + int|0s 1 - normal - + 10 - int(11)|0s + int|0s 1 - normal - + 11 varchar(32)|0s 1 - normal - + 12 - int(11)|0s + int|0s 1 - normal - + 13 varchar(255)|0s 1 - normal - + 14 tinyint(1)|0s 1 - normal - + 15 tinyint(1)|0s 1 - normal - + 16 json|0s 1 - normal - + 17 json|0s 1 - normal - + 18 varchar(1)|0s 1 - normal - + 19 - int(11)|0s + int|0s 1 - normal - + + 20 + json|0s + 1 + + + 21 + json|0s + 1 + + uuid 1 btree - + 1 id 1 - + uuid uuid - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(255)|0s 1 - normal - + 3 varchar(255)|0s - normal - + 4 varchar(32)|0s 1 - normal - + 5 - int(10) unsigned|0s + int unsigned|0s 1 - normal - + 6 json|0s 1 - normal - + 7 json|0s 1 - normal - + 8 json|0s 1 - normal - + 9 varchar(64)|0s - normal - + 10 datetime(6)|0s 1 - normal - + 11 datetime(6)|0s 1 - normal - + 12 varchar(64)|0s - normal - + 1 id 1 - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 - int(11)|0s + int|0s 1 - normal - + 3 - int(11)|0s + int|0s 1 - normal - + process_id category_id 1 btree - + category_id btree - + 1 id 1 - + process_id category_id flow_process_category_process_id_category_id_e1ab1b26_uniq - + process_id flow_process id - + category_id flow_category id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(255)|0s 1 - normal - + 3 varchar(255)|0s - normal - + 4 varchar(32)|0s 1 - normal - + 5 json|0s 1 - normal - + 6 json|0s 1 - normal - + 7 json|0s 1 - normal - + 8 varchar(64)|0s - normal - + 9 datetime(6)|0s 1 - normal - + 10 datetime(6)|0s 1 - normal - + 11 varchar(64)|0s - normal - + 12 varchar(255)|0s 1 - normal - + 13 - int(11)|0s - normal + int|0s - + process_id btree - + 1 id 1 - + 1 - int(11)|0s + bigint|0s 1 - 1 - normal + null - + + 2 + varchar(128)|0s + 1 + + + 3 + varchar(32)|0s + 1 + + + 4 + longtext|0s + + + 5 + longtext|0s + + + 6 + datetime(6)|0s + 1 + + + 7 + varchar(32)|0s + 1 + + + 8 + int|0s + 1 + + + logger_name + btree + + + level_name + btree + + + logged_at + btree + + + node_id + btree + + + 1 + id + 1 + + + 1 + int|0s + 1 + null + + 2 varchar(32)|0s 1 - normal - + 3 varchar(128)|0s 1 - normal - + 4 varchar(32)|0s 1 - normal - + 5 datetime(6)|0s 1 - normal - + 6 varchar(32)|0s 1 - normal - + 7 datetime(6)|0s - normal - + 8 datetime(6)|0s - normal - + 9 longtext|0s 1 - normal - + 10 tinyint(1)|0s 1 - normal - + 11 tinyint(1)|0s 1 - normal - + 12 tinyint(1)|0s 1 - normal - + 13 - int(11)|0s - normal + int|0s - + 14 - int(11)|0s - normal + int|0s - + 15 - int(11)|0s - normal + int|0s - + 16 - int(11)|0s - normal + int|0s - + 17 tinyint(1)|0s 1 - normal - + 18 tinyint(1)|0s 1 - normal - + instance_id 1 btree - + create_time btree - + execution_snapshot_id btree - + snapshot_id btree - + template_id btree - + tree_info_id btree - + 1 id 1 - + instance_id instance_id - + execution_snapshot_id pipeline_snapshot id - + snapshot_id pipeline_snapshot id - + template_id pipeline_pipelinetemplate id - + tree_info_id pipeline_treeinfo id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(32)|0s 1 - normal - + 3 varchar(128)|0s 1 - normal - + 4 datetime(6)|0s 1 - normal - + 5 varchar(32)|0s 1 - normal - + 6 longtext|0s - normal - + 7 varchar(32)|0s - normal - + 8 datetime(6)|0s 1 - normal - + 9 tinyint(1)|0s 1 - normal - + 10 - int(11)|0s + int|0s 1 - normal - + 11 tinyint(1)|0s 1 - normal - + template_id 1 btree - + name btree - + create_time btree - + edit_time btree - + snapshot_id btree - + 1 id 1 - + template_id template_id - + snapshot_id pipeline_snapshot id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 - varchar(32)|0s + longtext|0s 1 - normal - - 3 - datetime(6)|0s - 1 - normal - - - 4 - longblob|0s - normal - - - md5sum - btree - - - 1 - id - 1 - - - 1 - int(11)|0s - 1 - 1 - normal - - - 2 - varchar(32)|0s - 1 - normal - - - 3 - varchar(32)|0s - 1 - normal - - - template_id - btree - - - 1 - id - 1 - - - 1 - int(11)|0s - 1 - 1 - normal - - - 2 - varchar(32)|0s - 1 - normal - - - 3 - varchar(32)|0s - 1 - normal - - - 4 - varchar(32)|0s - 1 - normal - - - 5 - varchar(32)|0s - 1 - normal - - - 6 - tinyint(1)|0s - 1 - normal - - - ancestor_template_id - btree - - - descendant_template_id - btree - - - 1 - id - 1 - - - 1 - int(11)|0s - 1 - 1 - normal - - - 2 - varchar(97)|0s - 1 - normal - - + 3 varchar(64)|0s 1 - normal - + + 4 + longblob|0s + 1 + + + 1 + id + 1 + + + 1 + int|0s + 1 + null + + + 2 + varchar(32)|0s + 1 + + + 3 + datetime(6)|0s + 1 + + + 4 + longblob|0s + + + md5sum + btree + + + 1 + id + 1 + + + 1 + int|0s + 1 + null + + + 2 + varchar(32)|0s + 1 + + + 3 + varchar(32)|0s + 1 + + + template_id + btree + + + 1 + id + 1 + + + 1 + int|0s + 1 + null + + + 2 + varchar(32)|0s + 1 + + + 3 + varchar(32)|0s + 1 + + + 4 + varchar(32)|0s + 1 + + + 5 + varchar(32)|0s + 1 + + + 6 + tinyint(1)|0s + 1 + + + ancestor_template_id + btree + + + descendant_template_id + btree + + + 1 + id + 1 + + + 1 + int|0s + 1 + null + + + 2 + varchar(97)|0s + 1 + + + 3 + varchar(64)|0s + 1 + + 4 datetime(6)|0s 1 - normal - + 5 longblob|0s 1 - normal - + 6 - int(11)|0s + int|0s 1 - normal - + unique_id 1 btree - + template_id btree - + 1 id 1 - + unique_id unique_id - + template_id pipeline_pipelinetemplate id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 - int(11)|0s + int|0s 1 - normal - + 3 - int(11)|0s + int|0s 1 - normal - + templatescheme_id templaterelationship_id 1 btree - + templaterelationship_id btree - + 1 id 1 - + templatescheme_id templaterelationship_id pipeline_templatescheme__templatescheme_id_templa_dff0f4f6_uniq - + templatescheme_id pipeline_templatescheme id - + templaterelationship_id pipeline_templaterelationship id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 varchar(32)|0s 1 - normal - + 3 datetime(6)|0s 1 - normal - + 4 - int(11)|0s + int|0s 1 - normal - + 5 - int(11)|0s + int|0s 1 - normal - + md5 btree - + snapshot_id btree - + template_id btree - + 1 id 1 - + snapshot_id pipeline_snapshot id - + template_id pipeline_pipelinetemplate id - + 1 - int(11)|0s + int|0s 1 - 1 - normal + null - + 2 longblob|0s - normal - + 1 id 1 diff --git a/applications/flow/__pycache__/serializers.cpython-36.pyc b/applications/flow/__pycache__/serializers.cpython-36.pyc index 33d613a98b3530c4ed570d6a0f264c56286a8640..f9ce0350d3e4736d8f770bafd12571d64cfe82f9 100644 GIT binary patch delta 1246 zcmZux--{bn6rOuCKapjXWu>id9echPM)Gui!G6Jyx^O~Kl;t*q6Oz?S zIRj^jHVlM6kd1m>{$UpwmwD$6dDAT}o>K%9d{+^C%2#!f5$dk8Y6uN^^`t4kb(-=s zXGMNx*K`Ys;G%4}t?dZiP(?7A%HU0O);R+GG_)MrS+sB&AyTHwgh#B;V;-}9MzHIA zl6hw#Qu|t*>FX5p@co`LWfOHp8C6szGB&dCEK}$&G86T6WyD`oVwHA_JM$6)f*|Vj zM52XJH}VtB2MC~T$_tg|b{F3YIsq*rQAIcECf3u}*8OqR3r1}X$`sE8Ykefz97VmM zpUjLQSog!Q(;Hn5lKjyurH2ZUrQlJeb;XZ5Y33SELmNS1I&&Fk3(VG7mTldKN7wrI zIr(Yv!Q2`?mL3*t$nT4lxem^+qJ^|plbPIB53joeuE7-y$iE5~*awF%&b1gzPo3SA z%$bwlER=Ht%tMtRk}aoR8lt;{cEn_u4H(Kj_c{4$=@ffk-YDHLevNZaDVKhbC(Fl| zBPX_}j4APqu<+~~8wUIy+oDM$_Qj12%;=cOW3SxU?OT0Q*utFh304YcgMY|C7tX}O z4s!WXxzw2R?yzBH5q%rS5{{0@QbgV=H_xI|Mbg?ng^0esZ_zTYe!QZfI5M#%7WXsQ zi zv{{qEPMZ0ydcb~>liGoP5yNna^s3Q4znyCEmHI4ukCeAK#n{hi|9lO&sRBjXwM6ZQ j!AO2m|I;OL0xbgQT`)zidHMC?amy&Uh5HMS71X~0B(xb+ delta 947 zcmZ9LO-vI}5Xbjzx1Z2%yR@Z+7AQtx4JLw~H248VFMPxpqd`b1-4$9sT4onR%+|(` zc=I$SUVs=AZyZqK(Zr)Cy%>Uf^J3zac=O`Sf`)i_zc>5;zc=r_%cHKUf|+;@zr|W)7{{KTjHZm6c4<+PBugQL zgd#AhKES?M0bi->ewZc|3-OGY!IpF(y87SB!93nLI!bdc$03jqo!B98Mo=ACL z27x=;2u`<82KSwo8`8{YeAj-a>9iW*tYma82I0_&8Lf*l9NJ1%b%Nvs$ca9e8*w{c zO*rvt*obAN4be~?UsWbw%}T_$$Am}CBV{DLjToajNwaE1j+Is;<+*8(Xl7EQM&~BG zd|GZZydi|N`r@AC$d1nm8~IHim7{w?m!X&52B!$RaDz~**~N=HyMOu}_mCm55A5d!KR zxgl4nTD29|Z>%lXEj|_O4u9F4bWkpLN`fERgz! zhBb!!9jE?h^p*;(fD>I*rSI3g>$r>L&{?Q@U9^*HCK}{?WtZPg zE!*&%yZLS5;;;O6bcSR%Xs(x+)(jKRt0~;=Qg9%b#7|ub@s#^C-=sAMoWuKVEhY=RI0ks|gHE=EzvqeDo5C@6qPMj}L!EaO|tXSj#zhY+1i2y zlMvEEyNi~cAP$e^4!nDN=n6Wi<@yY!`V$gg)QB*j+x!TKI=Md8pOTpFqL;(O>RZB| zoCz8;01`MoGFSfqGBtp_Zi+^3%%D;RZjS_*e`D;H9RkuL{@I6x9>(c`$O?VT27z3p z`{2lz^udaC@70i{B241KNDf4)(L@-rqMp5AEG=r8;Jzup(+#5l_KEOidASy^bnr6- zDA?e_Iq1L=dN#%`9ve(F4Vuu9M>W}9MyXE=y0*^MLb!@6w9)%z-weW`7$#AAt0PC+ zZLiYvD@xY-~K4!(Lh|4AL_~8qAK=Z{L-HKJKWMl(X?Q<*h6Htt-8@Jkc+} zd1)A|c|*N#C~PXM%G_A;PwUmoHbRLr9bw{LHQ?Lwi;-+y!o;2%Mrp!DKOKnSm<7C! PNv@=2;r|niOb@)@gR_pD delta 608 zcmZvZ&ui2`6vyXHX0wyHSy~stf^E~?N*nF(?Ln{W;Qv*H3Dv03r$YgcA0~E8lzp!I9MW z1U`@j)Nm|!o7H@12SZzw%4WT^tQ4=)bWnPakK%M-v%DWwF?2T6nJ^(fbNaJ)=v)C3 ze5k`sn1>n4I5bH?9e+A_Kcp>@Eal3Y(Ucml|6-1^-~LvT#Wv1+gY6K&>4l>V4)S3?=@h9s%;NOg$!)SMlL|h9CR3O;dOC+G RJk~R}xc{FK$NDbJ{Q;Ptc2NKT diff --git a/custom_plugins/components/collections/plugins.py b/custom_plugins/components/collections/plugins.py index c64cf75..00cef0d 100644 --- a/custom_plugins/components/collections/plugins.py +++ b/custom_plugins/components/collections/plugins.py @@ -21,11 +21,15 @@ class HttpRequestService(Service): res = requests.request(inputs["method"], url=inputs["url"], headers=headers, timeout=inputs["timeout"], **req_data).content print("执行了", res) - res = json.loads(res) + try: + res = json.loads(res) + except Exception: + res = res data.outputs.outputs = res time.sleep(5) return True - except Exception: + except Exception as e: + data.outputs.outputs = str(e) return False def parse_headers(self, headers): diff --git a/dj_flow/__pycache__/settings.cpython-36.pyc b/dj_flow/__pycache__/settings.cpython-36.pyc index 8e3a4827b69d07966b8b7314aa670d859ae155ba..a161ad82d55c3067b0862d83ead6c6b8158f7568 100644 GIT binary patch delta 16 XcmdlXvqOg6n3tDp=6t7(?1p>*DEI_; delta 16 XcmdlXvqOg6n3tF9^F7&(?1p>*EH4D? diff --git a/web/src/views/job_flow_mgmt/job_flow_list.vue b/web/src/views/job_flow_mgmt/job_flow_list.vue index 69f71b5..8467992 100644 --- a/web/src/views/job_flow_mgmt/job_flow_list.vue +++ b/web/src/views/job_flow_mgmt/job_flow_list.vue @@ -117,33 +117,28 @@ overflowTooltip: true, sortable: false }, { - id: 'total_job_count', - label: '作业数量', - overflowTooltip: false, - sortable: false - }, { - id: 'type', + id: 'run_type', label: '调度方式', overflowTooltip: false, sortable: true }, { id: 'category', - label: '跑批系统', + label: '分类', overflowTooltip: false, sortable: false }, { - id: 'creator', - label: '创建人', + id: 'create_by', + label: '创建者', overflowTooltip: false, sortable: false }, { - id: 'edit_time', - label: '上次修改时间', + id: 'create_time', + label: '创建时间', overflowTooltip: true, sortable: true }, { - id: 'last_run_at', - label: '上次执行时间', + id: 'update_time', + label: '更新时间', overflowTooltip: true, sortable: true }, { @@ -156,11 +151,6 @@ label: '作业流描述', overflowTooltip: true, sortable: false - }, { - id: 'cross_day_dependence', - label: '跨日依赖', - overflowTooltip: true, - sortable: false }] return { maxTableHeight: '', diff --git a/web/src/views/job_mgmt/job_dialog.vue b/web/src/views/job_mgmt/job_dialog.vue index a8a3002..ad0d811 100644 --- a/web/src/views/job_mgmt/job_dialog.vue +++ b/web/src/views/job_mgmt/job_dialog.vue @@ -1,165 +1,72 @@ @@ -176,6 +83,28 @@ return { formLoading: false, form: {}, + disabled: true, + timeTypeList: [{ // 执行时长告警时间类型下拉列表 + value: 'hours', + label: '时' + }, + { + value: 'minutes', + label: '分' + + }, + { + value: 'seconds', + label: '秒' + } + ], + reviewList: [{ // 执行前人工复核单选列表 + label: '正常运行', + value: 0 + }, { + label: '禁止运行', + value: 1 + }], scriptTypeList: [{ key: 1, label: 'Shell(Linux)', diff --git a/web/src/views/job_mgmt/job_list.vue b/web/src/views/job_mgmt/job_list.vue index 136246d..bf902c9 100644 --- a/web/src/views/job_mgmt/job_list.vue +++ b/web/src/views/job_mgmt/job_list.vue @@ -124,55 +124,10 @@ overflowTooltip: true, sortable: false }, { - id: 'process', - label: '所属作业流', + id: 'template_type', + label: '模板类型', overflowTooltip: true, sortable: false - }, { - id: 'station', - label: 'Agent', - overflowTooltip: false, - sortable: false - }, { - id: 'ip', - label: 'IP', - overflowTooltip: false, - sortable: false - }, { - id: 'category', - label: '跑批系统', - overflowTooltip: false, - sortable: false - }, { - id: 'account', - label: '执行账号', - overflowTooltip: false, - sortable: false - }, { - id: 'script_content', - label: '脚本', - overflowTooltip: true, - sortable: false - }, { - id: 'creator', - label: '创建人', - overflowTooltip: false, - sortable: false - }, { - id: 'edit_time', - label: '上一次修改时间', - overflowTooltip: true, - sortable: true - }, { - id: 'total_run_count', - label: '执行次数', - overflowTooltip: false, - sortable: true - }, { - id: 'last_run_at', - label: '上一次执行时间', - overflowTooltip: true, - sortable: true }, { id: 'description', label: '作业描述', diff --git a/web/src/views/job_mgmt/single_job.vue b/web/src/views/job_mgmt/single_job.vue index fb82db3..1d60373 100644 --- a/web/src/views/job_mgmt/single_job.vue +++ b/web/src/views/job_mgmt/single_job.vue @@ -1,128 +1,131 @@