9.0 KiB
9.0 KiB
commit b4ff7f9710b2d079e293b5ed97d57986b5e8892f (HEAD, origin/master)
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 18:02:14 2023 +0800
火情合并修改socket添加心跳机制
commit aa538b054fc5abe2420d59f28e568d2311e3c171
Merge: 820c0fa c35f690
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 16:50:25 2023 +0800
Merge branch 'master' of http://123.132.248.154:10000/xujingliang/Lin_Ye_Fang_Huo
commit 820c0fa1b54460b2db19b82a4ae9af9d0a009909
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 16:50:13 2023 +0800
数据图层被遮挡问题
commit c35f690e8f1a04b793ca48839dfb8cd6b324a66d
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 16:48:37 2023 +0800
功能完善,备份
commit 81e29740212bbf49627c158032d2b62cb587ac06
Merge: 0bc0dd3 7d77775
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 14:43:17 2023 +0800
修改
commit 0bc0dd306df46e748dee4f2de9818ac437c4a25c
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 14:36:11 2023 +0800
关闭时删除水源寻图图层
commit 7d777751dae099a1bb7a37cd75ce1015277b54cd
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 14:32:21 2023 +0800
合并代码，解决冲突
commit 5b53dd83106f208a37aa5d3679507a36b6a2adff
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 13:54:32 2023 +0800
13.54
commit 33086836967a0d5010144d9069431a98b94be664
Merge: 6b788a7 37b4d08
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 13:53:20 2023 +0800
13.53
commit 6b788a7361a44582031361e03b15366a9148073f
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 13:42:26 2023 +0800
13.42
commit f9934c86b2bcb2ed0812a25ae55ae2a9a31ca7df
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 13:28:41 2023 +0800
13.28
commit 583184a5d03dda75b66e2adc294fe6939c0371ae
Merge: b256ac2 5a951e4
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 12:23:09 2023 +0800
合并代码
commit 5a951e4ae9053b4b76d7058c8261207863b81cb8
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 10:35:20 2023 +0800
人员弹窗优化
commit 2c131f137ee0b49e8a00beb030b750ecd8507341
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 18:12:47 2023 +0800
youhua
commit b256ac291568e1cd1d2ac2bb21f15e9fedb657f3
Author: helloxujingliang <3225043@qq.com>
Date: Tue Aug 15 16:29:02 2023 +0800
代码合并
commit 2b8a121cff24dce321a7183d5b6b5dce84ac592f
Author: helloxujingliang <3225043@qq.com>
Date: Tue Aug 15 16:03:44 2023 +0800
Bug修改
commit 9b8d20150504612f7b82424dd521219dba835720
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 15:58:10 2023 +0800
弹窗层级调整
commit 9578b77652d1e430a46c9fe0e4910a0806acf040
Merge: ea8abdb 3718fd3
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 15:54:08 2023 +0800
wanshan
commit ea8abdb7fc1f429cfabdf11f4e8dd85e57171f6a
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 15:13:23 2023 +0800
优化完善
commit d6eed188f7aaa187bddab63762cba6814f6b5a21
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 14:58:03 2023 +0800
优化完善
commit a5bc3bbc0c7c92346e5ab9a0f5a6dd6ca3a66f87
Author: helloxujingliang <3225043@qq.com>
Date: Tue Aug 15 11:44:45 2023 +0800
代码修改
commit 3718fd3f9ab2dbb068bdbe7742a617e84139e1fb
Author: 刘妍 <1455167345@qq.com>
Date: Tue Aug 15 11:25:23 2023 +0800
下发任务点增加图标展示
commit 09bdbc6f2d98f1e3f4b39efe858b06802f9a51c3
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 08:44:30 2023 +0800
删除首页原图上标绘
commit 2550fbe0260fed53185f71493685528776e774ce
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 17:40:20 2023 +0800
弹窗位置调整
commit bb211d4af6a7599c6458edf10cdec71cc0c0ac1e
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 16:02:50 2023 +0800
完善
commit 837123ee2d8ea231fdb09ee7351c4963e56c6b71
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 15:09:49 2023 +0800
物资弹窗完善
commit 78754cd01106f942e513d4e5fdf94a98c43c6156
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 14:56:29 2023 +0800
添加socket图标
commit 03a80870a4b17c563f14055b7bf689ce59e56895
Author: helloxujingliang <3225043@qq.com>
Date: Mon Aug 14 14:38:09 2023 +0800
视频通话
commit 0535b2c7ae5c6c333199e1049a89e8fa1dc5c768
Merge: 2bd56b4 5a348fe
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 14:29:03 2023 +0800
右键功能完善，socket等
commit 5a348fef89cd897dc6a27797c9112dddab9a9c15
Author: 刘妍 <1455167345@qq.com>
Date: Mon Aug 14 13:54:08 2023 +0800
下发任务
commit 2bd56b408dacc0d936bae936d56ad75f05f4e060
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 13:50:19 2023 +0800
标注socket等
commit 8319510c6824855cff206e87f1c2a7013c0ef9ad
Author: 刘妍 <1455167345@qq.com>
Date: Mon Aug 14 12:21:00 2023 +0800
Revert "任务下发"
This reverts commit cb97f2981bcd5dce0230ec39f7aef9931e60c0f7.
# Conflicts:
# src/views/home/index.vue
# src/views/home/widget/taskDelivery.vue
commit 646529d073a3cc1f6197beff02cf79c43979b07e
Author: 刘妍 <1455167345@qq.com>
Date: Mon Aug 14 12:13:07 2023 +0800
Revert "Revert "Signed-off-by: 刘妍 <1455167345@qq.com>""
This reverts commit 1114d97ce1deb2ec3bf7e8038220bfd26b863745.
commit 72193d03b96be3f6dd9f9c373acc5dce85246996
Author: 刘妍 <1455167345@qq.com>
Date: Mon Aug 14 09:37:17 2023 +0800
任务下发
commit cb97f2981bcd5dce0230ec39f7aef9931e60c0f7
Author: 刘妍 <1455167345@qq.com>
Date: Mon Aug 14 09:36:35 2023 +0800
任务下发
commit 927d705b250c8f7ef197a8d534fc7c4c753a0bdb
Author: zzq <15064940501@163.com>
Date: Sat Aug 12 16:55:41 2023 +0800
右键添加火点标注等
commit 94233f3cf2886a3b65b40fd30a702199924bcde1
Merge: 1aac170 a3bdb41
Author: zzq <15064940501@163.com>
Date: Fri Aug 11 17:08:39 2023 +0800
wanshan
commit 1aac17005ec730188b26ba714c461b694a214cff
Author: zzq <15064940501@163.com>
Date: Fri Aug 11 16:56:07 2023 +0800
功能完善
commit a3bdb41d3356064cc666ce4dacb773c0acd74d1b
Author: helloxujingliang <3225043@qq.com>
Date: Fri Aug 11 16:30:37 2023 +0800
代码合并，功能修改
commit 1ccfe7ab44031c7f85dab6642765fc2d13d517b9
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 17:42:33 2023 +0800
合并到master
commit 37b4d0887305c411ebef6c65ce033f8c6076f0bf (origin/dev, dev)
Merge: 344dd78 ef9d79f
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 17:35:10 2023 +0800
dev
commit 344dd7888ed004a917ee0dfa207f6af8ed58678e
Merge: da4bc23 1cb45fe
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 17:33:31 2023 +0800
dev
commit 1cb45fe535872e8fd486f04bda30ab1ba43b29aa
Merge: 7895ea0 db204fe
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 17:31:13 2023 +0800
hebing
commit da4bc2367ebd537ec7e49866373c95268ee35248
Merge: 7895ea0 db204fe
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 17:29:01 2023 +0800
合并
commit 7895ea0a13f1ffe9e49ef2cb538ae09132940967
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 13:58:10 2023 +0800
代码合并
commit 2a37575f8ff4c7b4c6583c6a32d8f174344df43c
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 9 14:18:05 2023 +0800
222
commit ef9d79f6e014554ccf41b120f6fc72d374b9389f
Author: zzq <15064940501@163.com>
Date: Thu Aug 10 09:20:06 2023 +0800
wanshan
commit 4b089966e7e5d73c79384562747ca7cbd9d09fbd
Author: zzq <15064940501@163.com>
Date: Wed Aug 9 17:11:17 2023 +0800
新建分支
commit db204fe98ead24f5ba150023a2da0b2e70e01a80
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 9 14:18:05 2023 +0800
海康视频监控
commit 0ef27266dc69a8424ed959bc23623718af169e26
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 9 10:53:00 2023 +0800
火点合并优化
commit 6e1b7c1da9f6cb0287a2dcf7c0e67daf02e88ee6
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 9 09:25:45 2023 +0800
添加了线索合并功能
commit 2bacd60abccdb29d8ae1123896896d668f4a1ff5
Author: helloxujingliang <3225043@qq.com>
Date: Tue Aug 1 08:45:20 2023 +0800
代码合并
commit 933d3d001ddc16ed7a3730abe55dbd5e1f976ae2
Author: helloxujingliang <3225043@qq.com>
Date: Tue Aug 1 08:33:01 2023 +0800
代码整合
commit 55e4f2369004924c5bb1aef770eb665bd0b66efa
Author: helloxujingliang <3225043@qq.com>
Date: Tue Jul 18 09:04:15 2023 +0800
工具开发
commit d92cd9f569d90e6b4ae905f73a7f3234d857b138
Author: helloxujingliang <3225043@qq.com>
Date: Sat Jul 8 15:37:34 2023 +0800
创建项目
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 18:02:14 2023 +0800
火情合并修改socket添加心跳机制
commit aa538b054fc5abe2420d59f28e568d2311e3c171
Merge: 820c0fa c35f690
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 16:50:25 2023 +0800
Merge branch 'master' of http://123.132.248.154:10000/xujingliang/Lin_Ye_Fang_Huo
commit 820c0fa1b54460b2db19b82a4ae9af9d0a009909
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 16:50:13 2023 +0800
数据图层被遮挡问题
commit c35f690e8f1a04b793ca48839dfb8cd6b324a66d
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 16:48:37 2023 +0800
功能完善,备份
commit 81e29740212bbf49627c158032d2b62cb587ac06
Merge: 0bc0dd3 7d77775
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 14:43:17 2023 +0800
修改
commit 0bc0dd306df46e748dee4f2de9818ac437c4a25c
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 14:36:11 2023 +0800
关闭时删除水源寻图图层
commit 7d777751dae099a1bb7a37cd75ce1015277b54cd
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 14:32:21 2023 +0800
合并代码，解决冲突
commit 5b53dd83106f208a37aa5d3679507a36b6a2adff
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 13:54:32 2023 +0800
13.54
commit 33086836967a0d5010144d9069431a98b94be664
Merge: 6b788a7 37b4d08
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 13:53:20 2023 +0800
13.53
commit 6b788a7361a44582031361e03b15366a9148073f
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 13:42:26 2023 +0800
13.42
commit f9934c86b2bcb2ed0812a25ae55ae2a9a31ca7df
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 13:28:41 2023 +0800
13.28
commit 583184a5d03dda75b66e2adc294fe6939c0371ae
Merge: b256ac2 5a951e4
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 16 12:23:09 2023 +0800
合并代码
commit 5a951e4ae9053b4b76d7058c8261207863b81cb8
Author: zzq <15064940501@163.com>
Date: Wed Aug 16 10:35:20 2023 +0800
人员弹窗优化
commit 2c131f137ee0b49e8a00beb030b750ecd8507341
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 18:12:47 2023 +0800
youhua
commit b256ac291568e1cd1d2ac2bb21f15e9fedb657f3
Author: helloxujingliang <3225043@qq.com>
Date: Tue Aug 15 16:29:02 2023 +0800
代码合并
commit 2b8a121cff24dce321a7183d5b6b5dce84ac592f
Author: helloxujingliang <3225043@qq.com>
Date: Tue Aug 15 16:03:44 2023 +0800
Bug修改
commit 9b8d20150504612f7b82424dd521219dba835720
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 15:58:10 2023 +0800
弹窗层级调整
commit 9578b77652d1e430a46c9fe0e4910a0806acf040
Merge: ea8abdb 3718fd3
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 15:54:08 2023 +0800
wanshan
commit ea8abdb7fc1f429cfabdf11f4e8dd85e57171f6a
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 15:13:23 2023 +0800
优化完善
commit d6eed188f7aaa187bddab63762cba6814f6b5a21
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 14:58:03 2023 +0800
优化完善
commit a5bc3bbc0c7c92346e5ab9a0f5a6dd6ca3a66f87
Author: helloxujingliang <3225043@qq.com>
Date: Tue Aug 15 11:44:45 2023 +0800
代码修改
commit 3718fd3f9ab2dbb068bdbe7742a617e84139e1fb
Author: 刘妍 <1455167345@qq.com>
Date: Tue Aug 15 11:25:23 2023 +0800
下发任务点增加图标展示
commit 09bdbc6f2d98f1e3f4b39efe858b06802f9a51c3
Author: zzq <15064940501@163.com>
Date: Tue Aug 15 08:44:30 2023 +0800
删除首页原图上标绘
commit 2550fbe0260fed53185f71493685528776e774ce
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 17:40:20 2023 +0800
弹窗位置调整
commit bb211d4af6a7599c6458edf10cdec71cc0c0ac1e
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 16:02:50 2023 +0800
完善
commit 837123ee2d8ea231fdb09ee7351c4963e56c6b71
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 15:09:49 2023 +0800
物资弹窗完善
commit 78754cd01106f942e513d4e5fdf94a98c43c6156
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 14:56:29 2023 +0800
添加socket图标
commit 03a80870a4b17c563f14055b7bf689ce59e56895
Author: helloxujingliang <3225043@qq.com>
Date: Mon Aug 14 14:38:09 2023 +0800
视频通话
commit 0535b2c7ae5c6c333199e1049a89e8fa1dc5c768
Merge: 2bd56b4 5a348fe
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 14:29:03 2023 +0800
右键功能完善，socket等
commit 5a348fef89cd897dc6a27797c9112dddab9a9c15
Author: 刘妍 <1455167345@qq.com>
Date: Mon Aug 14 13:54:08 2023 +0800
下发任务
commit 2bd56b408dacc0d936bae936d56ad75f05f4e060
Author: zzq <15064940501@163.com>
Date: Mon Aug 14 13:50:19 2023 +0800
标注socket等
commit 8319510c6824855cff206e87f1c2a7013c0ef9ad
Author: 刘妍 <1455167345@qq.com>
Date: Mon Aug 14 12:21:00 2023 +0800
Revert "任务下发"
This reverts commit cb97f2981bcd5dce0230ec39f7aef9931e60c0f7.
# Conflicts:
# src/views/home/index.vue
# src/views/home/widget/taskDelivery.vue
commit 646529d073a3cc1f6197beff02cf79c43979b07e
Author: 刘妍 <1455167345@qq.com>
Date: Mon Aug 14 12:13:07 2023 +0800
Revert "Revert "Signed-off-by: 刘妍 <1455167345@qq.com>""
This reverts commit 1114d97ce1deb2ec3bf7e8038220bfd26b863745.
commit 72193d03b96be3f6dd9f9c373acc5dce85246996
Author: 刘妍 <1455167345@qq.com>
Date: Mon Aug 14 09:37:17 2023 +0800
任务下发
commit cb97f2981bcd5dce0230ec39f7aef9931e60c0f7
Author: 刘妍 <1455167345@qq.com>
Date: Mon Aug 14 09:36:35 2023 +0800
任务下发
commit 927d705b250c8f7ef197a8d534fc7c4c753a0bdb
Author: zzq <15064940501@163.com>
Date: Sat Aug 12 16:55:41 2023 +0800
右键添加火点标注等
commit 94233f3cf2886a3b65b40fd30a702199924bcde1
Merge: 1aac170 a3bdb41
Author: zzq <15064940501@163.com>
Date: Fri Aug 11 17:08:39 2023 +0800
wanshan
commit 1aac17005ec730188b26ba714c461b694a214cff
Author: zzq <15064940501@163.com>
Date: Fri Aug 11 16:56:07 2023 +0800
功能完善
commit a3bdb41d3356064cc666ce4dacb773c0acd74d1b
Author: helloxujingliang <3225043@qq.com>
Date: Fri Aug 11 16:30:37 2023 +0800
代码合并，功能修改
commit 1ccfe7ab44031c7f85dab6642765fc2d13d517b9
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 17:42:33 2023 +0800
合并到master
commit 37b4d0887305c411ebef6c65ce033f8c6076f0bf (origin/dev, dev)
Merge: 344dd78 ef9d79f
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 17:35:10 2023 +0800
dev
commit 344dd7888ed004a917ee0dfa207f6af8ed58678e
Merge: da4bc23 1cb45fe
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 17:33:31 2023 +0800
dev
commit 1cb45fe535872e8fd486f04bda30ab1ba43b29aa
Merge: 7895ea0 db204fe
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 17:31:13 2023 +0800
hebing
commit da4bc2367ebd537ec7e49866373c95268ee35248
Merge: 7895ea0 db204fe
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 17:29:01 2023 +0800
合并
commit 7895ea0a13f1ffe9e49ef2cb538ae09132940967
Author: helloxujingliang <3225043@qq.com>
Date: Thu Aug 10 13:58:10 2023 +0800
代码合并
commit 2a37575f8ff4c7b4c6583c6a32d8f174344df43c
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 9 14:18:05 2023 +0800
222
commit ef9d79f6e014554ccf41b120f6fc72d374b9389f
Author: zzq <15064940501@163.com>
Date: Thu Aug 10 09:20:06 2023 +0800
wanshan
commit 4b089966e7e5d73c79384562747ca7cbd9d09fbd
Author: zzq <15064940501@163.com>
Date: Wed Aug 9 17:11:17 2023 +0800
新建分支
commit db204fe98ead24f5ba150023a2da0b2e70e01a80
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 9 14:18:05 2023 +0800
海康视频监控
commit 0ef27266dc69a8424ed959bc23623718af169e26
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 9 10:53:00 2023 +0800
火点合并优化
commit 6e1b7c1da9f6cb0287a2dcf7c0e67daf02e88ee6
Author: helloxujingliang <3225043@qq.com>
Date: Wed Aug 9 09:25:45 2023 +0800
添加了线索合并功能
commit 2bacd60abccdb29d8ae1123896896d668f4a1ff5
Author: helloxujingliang <3225043@qq.com>
Date: Tue Aug 1 08:45:20 2023 +0800
代码合并
commit 933d3d001ddc16ed7a3730abe55dbd5e1f976ae2
Author: helloxujingliang <3225043@qq.com>
Date: Tue Aug 1 08:33:01 2023 +0800
代码整合
commit 55e4f2369004924c5bb1aef770eb665bd0b66efa
Author: helloxujingliang <3225043@qq.com>
Date: Tue Jul 18 09:04:15 2023 +0800
工具开发
commit d92cd9f569d90e6b4ae905f73a7f3234d857b138
Author: helloxujingliang <3225043@qq.com>
Date: Sat Jul 8 15:37:34 2023 +0800
创建项目