Commit Graph

Select branches

Hide Pull Requests

dev

guangxi

master

tangshan

tianjin

zhuzhou

上海一张图

Mono Color

• 93a8c0a80a Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-02-20 16:39:26 +0800
• ca8d2104a8 [修改]待审核页面毕升文档传参修改 chenjingyu 2021-02-20 16:39:17 +0800
• ba9050d3e4 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-02-20 16:10:32 +0800
• 8c6ff81ef8 [完善] 上传底图10MB完善 陈鹏飞 2021-02-20 16:10:17 +0800
• a0fb590e45 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-02-20 15:45:09 +0800
• 2509adf893 [修改]审核记录页面二三维预案显示格式 chenjingyu 2021-02-20 15:45:03 +0800
• 4883079c5a Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-02-20 15:38:41 +0800
• 7d4fa61654 [完善]录入预案跳转单位信息bug 邵佳豪 2021-02-20 15:38:34 +0800
• fe0f6764a0 1.2.2 徐振升 2021-02-20 09:30:08 +0800
• c7e62c5796 [完善] 去除面积必填项, 上传底图10MB限制, 新增底图宽高功能 陈鹏飞 2021-02-19 15:55:06 +0800
• b73dcdfd44 [合并]合并代码 邵佳豪 2021-02-07 16:21:08 +0800
• e5db8fd919 [新增]待审核联动力量页面 邵佳豪 2021-02-07 16:19:36 +0800
• c2be918872 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-02-07 16:15:42 +0800
• 7ec54e3257 [修改]初审机构字段修改 chenjingyu 2021-02-07 16:15:38 +0800
• a94d046f79 版本更新 徐振升 2021-02-07 10:34:56 +0800
• 7e42bc93ed [修正] 调整底图大小后会对计算适应缩放产生错误的计算 徐振升 2021-02-07 10:10:35 +0800
• daf71a3636 [新增]预案公开功能添加 chenjingyu 2021-02-06 17:09:45 +0800
• 221712f23b [修改]待审核三维预案调用接口更新 chenjingyu 2021-02-06 13:55:04 +0800
• 0bcdf40c32 [修改]二维预案新建传参添加编制级别 chenjingyu 2021-02-06 11:11:00 +0800
• f9c9949418 [修改]待终审id问题修改 chenjingyu 2021-02-06 10:59:13 +0800
• d19d42e720 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-02-06 10:17:41 +0800
• 9cf4b28f1c [修改]待审核和审核记录表格参数levle修改 chenjingyu 2021-02-06 10:17:36 +0800
• 8db3f6b5ea Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-02-06 10:09:13 +0800
• 8930ee8a87 [完善]完善消防力量审核页面 邵佳豪 2021-02-06 10:09:07 +0800
• 5f660e0608 [修改]应急预案和类型预案属性名修复 chenjingyu 2021-02-06 09:35:17 +0800
• da7eafcefb [修改]类型管理新建限制 chenjingyu 2021-02-06 09:09:20 +0800
• 87d183ac83 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-02-06 09:07:25 +0800
• 9f62d443d9 [修改]一到五级预案新建权限添加 chenjingyu 2021-02-06 09:07:18 +0800
• dadc40d0bd Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 徐振升 2021-02-05 17:26:18 +0800
• 97f9382f56 1.0.18 徐振升 2021-02-05 17:26:13 +0800
• 335e6fc7c0 [新增]新增适应缩放和重置缩放按钮 邵佳豪 2021-02-05 10:53:21 +0800
• de39b332ca [合并]合并代码 邵佳豪 2021-02-05 10:30:46 +0800
• 8d34c05d17 [新增]增加审核页面水源采集和消防力量采集部分 邵佳豪 2021-02-05 10:22:11 +0800
• 61fdae7eab Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-02-05 09:49:14 +0800
• 66a1d0a88c [修改]待审核页面三维预案弹窗查看 chenjingyu 2021-02-05 09:49:06 +0800
• 229fcfa994 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 徐振升 2021-02-04 17:21:11 +0800
• 8b6ea63cc6 版本更新1.0.17 徐振升 2021-02-04 17:20:59 +0800
• 8d3a26fb8d [修改]预案管理模块毕升文档回存问题 chenjingyu 2021-02-04 10:55:30 +0800
• a9291400fc Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-02-03 17:11:34 +0800
• aa93ff2a75 [新建]待审核页面基本信息审核界面 chenjingyu 2021-02-03 17:11:27 +0800
• 77559c8f12 版本号 徐振升 2021-02-03 16:23:19 +0800
• 653f3cd5ee Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 徐振升 2021-02-03 16:22:32 +0800
• 81f6e20b21 创建图标后添加相机更新 徐振升 2021-02-03 16:22:17 +0800
• 4f40025281 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-02-02 16:07:32 +0800
• 3381a71581 [修正]多选状态下未选择对象时会发送选择发生变化消息 徐振升 2021-02-02 16:07:05 +0800
• e855cb43de Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-02-02 16:02:02 +0800
• 5fa3d3ccc8 [新建]审核记录查看全景图 chenjingyu 2021-02-02 16:01:41 +0800
• 2b29e59709 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 徐振升 2021-02-02 10:41:18 +0800
• 5a5b60fa45 增加默认参数 徐振升 2021-02-02 10:41:02 +0800
• 6a585da7f3 [完善]删除多余文件 邵佳豪 2021-02-02 10:31:53 +0800
• eb64b8e707 [优化]框选现在不再局限于背景图，而是整个可视区。 徐振升 2021-02-02 10:11:15 +0800
• dd8667c65a 完善 徐振升 2021-02-01 14:50:01 +0800
• 861a789033 版本号 徐振升 2021-02-01 14:47:47 +0800
• 022114ed5f 完善网格，新增2d相机替换缩放控制 徐振升 2021-02-01 14:27:49 +0800
• 67ca9c9d2b 关联类添加 徐振升 2021-01-29 17:43:44 +0800
• 1a699c74f2 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 徐振升 2021-01-29 17:14:54 +0800
• 088b9031dd Grid2D 徐振升 2021-01-29 17:14:38 +0800
• 0f606ae461 [修改]创建单位后不显示分数bug 邵佳豪 2021-01-29 16:11:14 +0800
• af8d51eb96 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-29 15:54:44 +0800
• 13647ee381 [修改]放开在线编辑 chenjingyu 2021-01-29 15:54:39 +0800
• 12ecb7cb3a Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-01-29 15:39:37 +0800
• 70829bf4b2 [新增]增加下载帮助文档链接 邵佳豪 2021-01-29 15:39:33 +0800
• 42e2c516b5 [修正] 修正底图不更新BUG 陈鹏飞 2021-01-29 15:34:29 +0800
• be205ab1ca Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-01-29 15:09:32 +0800
• 6ba066e79d [完善] 自定义处置预案底图分块上传 陈鹏飞 2021-01-29 15:09:23 +0800
• e32e940c0d 修正imageAngle = undefind 的时候不显示的的问题 徐振升 2021-01-29 14:10:58 +0800
• 315cbba541 [完善] 多选, 自定义处置预案底图角度 完善 陈鹏飞 2021-01-29 12:22:07 +0800
• 09edcf4f6c Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-01-29 11:36:26 +0800
• 3ef4a31df6 [完善] 修正底图限制10MB 陈鹏飞 2021-01-29 11:36:16 +0800
• 38cabc485d 新增多选开启关闭方法 徐振升 2021-01-29 11:32:32 +0800
• b99492318f [完善]删除多余文件 邵佳豪 2021-01-29 09:23:17 +0800
• c313da23b2 [完善]正确引入CryptoJS 邵佳豪 2021-01-28 17:26:23 +0800
• 9d7d7810be Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-01-28 16:44:52 +0800
• a502ec29e0 [修改]去除default-passive-events引入 邵佳豪 2021-01-28 16:44:38 +0800
• 65f7a399fb Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-01-28 16:35:42 +0800
• fa56e68a6e [完善] 功能分区, 行车路线完善 陈鹏飞 2021-01-28 16:35:30 +0800
• 0e14291321 [完善]去除被动监听事件警告,清除打印信息 邵佳豪 2021-01-28 16:22:30 +0800
• 801f9b1474 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-01-28 16:02:29 +0800
• cb419fcabe [修改]修改路线查询bug 邵佳豪 2021-01-28 16:02:25 +0800
• c57c435514 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-28 15:02:38 +0800
• bb2d9e5ada [新增]审核页面在线预览 chenjingyu 2021-01-28 15:02:31 +0800
• fb8dcf45d9 [完善]采集页面增加关闭按钮 邵佳豪 2021-01-28 14:50:55 +0800
• 3f848c4b7b Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-28 11:15:40 +0800
• 99f35f90bd Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-28 11:14:29 +0800
• 32575f18a7 [新增]在线预览 chenjingyu 2021-01-28 11:14:23 +0800
• dc5f3e8e87 [完善]完善单位信息tab中周边水源页面 完善登录成功后跳转页面 邵佳豪 2021-01-28 11:14:04 +0800
• 51992d89c6 [新增]修改字体为思源黑体 邵佳豪 2021-01-27 16:41:54 +0800
• 08843a8784 [新增]作战部署增加限制基本信息素材不能复制粘贴 邵佳豪 2021-01-27 14:12:35 +0800
• f58390d26b Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 徐振升 2021-01-27 13:02:47 +0800
• dc57d61303 完善允许编辑 徐振升 2021-01-27 13:02:36 +0800
• 358af31743 [合并代码] 陈鹏飞 2021-01-27 10:44:25 +0800
• 48d0fcc44f [完善] 模式切换完善 陈鹏飞 2021-01-27 10:42:33 +0800
• 295ced4f70 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-01-27 10:40:01 +0800
• b1c64d506e [新增]取消框选后隐藏素材属性 邵佳豪 2021-01-27 10:39:48 +0800
• aff13df0ef [合并代码] 陈鹏飞 2021-01-27 10:19:37 +0800
• 0893958222 [完善] 查看/编辑模式切换 陈鹏飞 2021-01-27 10:12:55 +0800
• 3c68dbc190 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-01-27 09:53:17 +0800
• 5964aa16f7 [完善]清除打印信息 邵佳豪 2021-01-27 09:53:11 +0800
• 812aae1383 [新增]新增框选多个素材后修改共同拥有属性 邵佳豪 2021-01-27 09:52:46 +0800
• a8cd48b5a9 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-26 15:12:59 +0800