Commit Graph

Select branches

Hide Pull Requests

dev

guangxi

master

tangshan

tianjin

zhuzhou

上海一张图

Mono Color

• afe20a612a [修改]重点单位管理完整度信息查询清空问题 chenjingyu 2021-01-26 15:12:51 +0800
• c50e55e6e7 修正选中集合返回 徐振升 2021-01-26 11:57:21 +0800
• 37ab4607d8 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-01-26 11:22:02 +0800
• 58f75315d0 [完善] 自定义底图预案完善 陈鹏飞 2021-01-26 11:21:50 +0800
• f1b0693332 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-01-26 11:16:11 +0800
• 51e1f579ed [新增]新增数据采集页面gis点聚合显示 邵佳豪 2021-01-26 11:16:02 +0800
• deca37772c [删除] 作战部署删除 基本信息模块 陈鹏飞 2021-01-26 11:02:05 +0800
• c63b8a965d [合并代码] 陈鹏飞 2021-01-25 13:52:22 +0800
• b5e615c006 [完善] 采集工具,编制工具按原型图修改 陈鹏飞 2021-01-25 13:46:22 +0800
• 34177788a2 设置图例显示隐藏 徐振升 2021-01-25 12:02:24 +0800
• 1e6c995175 Merge branch 'dev' 徐振升 2021-01-25 11:52:37 +0800
• 45ffea9758 1.0.12.20210125b dev 徐振升 2021-01-25 11:47:35 +0800
• e6c0c6c8b8 删除debug.log 徐振升 2021-01-25 09:11:03 +0800
• dd3dc17622 axSelection,axMessageSystem 徐振升 2021-01-23 18:27:53 +0800
• 30655ddfda Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-01-23 17:25:51 +0800
• 82a7aa3340 [新增]完善消防力量采集 完成联动力量信息采集功能 修复编织工及消防要素icon点击bug 完善gis管理水源和单位标点查看 邵佳豪 2021-01-23 17:25:25 +0800
• 3b2199f683 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-23 14:31:42 +0800
• e2df63a0f3 [新增]批量审核功能 chenjingyu 2021-01-23 14:31:34 +0800
• 9ec8ef05d4 1.0.11.20210122 徐振升 2021-01-22 15:32:09 +0800
• 20b54cf5d0 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-01-22 10:30:51 +0800
• 389227474a [完善] 编制工具UI修改 陈鹏飞 2021-01-22 10:30:41 +0800
• ae374266bd 加载无关联信息处置预案 徐振升 2021-01-22 10:03:44 +0800
• 8e0f0d4ce7 [新建]预案录入分页功能完成 chenjingyu 2021-01-21 16:37:30 +0800
• acf2470e4a Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-21 10:55:32 +0800
• 6f44bd6882 [新建]审核记录功能真实数据 chenjingyu 2021-01-21 10:55:27 +0800
• 6791edcd6c Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-01-21 10:01:31 +0800
• 8b71d276b8 [完善]完善消防力量采集 邵佳豪 2021-01-21 10:01:26 +0800
• cf5c312f4b Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-21 09:13:04 +0800
• 36a65b860a [新建]查看审核结果功能 chenjingyu 2021-01-21 09:12:58 +0800
• 9226dd9aa3 1.0.10.20210118b 徐振升 2021-01-19 17:11:15 +0800
• 349f29529f [修改]修改打包编译内存预算 邵佳豪 2021-01-19 15:42:48 +0800
• a12c15b4db Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-01-19 15:34:09 +0800
• 0dc8f985b6 [新增]消防力量采集基础功能完成 邵佳豪 2021-01-19 15:34:04 +0800
• dbfae5749a Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-19 15:26:15 +0800
• 1308691653 [新增]待审核功能 chenjingyu 2021-01-19 15:26:10 +0800
• 9d8e729a24 [完善] 周边水源完善 陈鹏飞 2021-01-19 14:59:14 +0800
• 4f37b272ce [完善] 引入路线规划,周边水源模块 陈鹏飞 2021-01-19 11:36:49 +0800
• 063ee215ed [完善] H5工具保存添加遮罩层, 广西版本BUG迁移上海版本H5工具修正 陈鹏飞 2021-01-19 10:07:55 +0800
• c9524c0629 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-01-18 14:19:56 +0800
• bb024c6ae7 [新增]完善消防力量详情保存 邵佳豪 2021-01-18 14:19:46 +0800
• c163259b79 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-18 11:13:25 +0800
• 529c7e4bf9 [新增]全景图功能 chenjingyu 2021-01-18 11:12:14 +0800
• 5786ca80d8 [合并]合并代码 邵佳豪 2021-01-15 17:32:47 +0800
• c734929e0d [新增]数据采集完成水源采集,消防力量采集进行中 邵佳豪 2021-01-15 17:31:41 +0800
• b2fa1215d8 [删除] 删除除H5工具之外 总平图模块功能 陈鹏飞 2021-01-13 14:34:52 +0800
• dd38481e0a [回退] GIS版本回退 陈鹏飞 2021-01-13 10:41:06 +0800
• 487fcf793a Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-01-13 09:50:13 +0800
• b352c5a1f1 [回退] GIS模块版本回退 陈鹏飞 2021-01-13 09:49:36 +0800
• d88e5efa47 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-01-11 15:45:59 +0800
• e170e86d46 [完善] GIS模块完善 陈鹏飞 2021-01-11 15:45:50 +0800
• c334148747 [修改]三四五级预案查看预案跳转 chenjingyu 2021-01-11 14:55:32 +0800
• 476f010b67 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-11 14:48:03 +0800
• 0e3d3b6476 [修改]一到五级预案录入功能实现 chenjingyu 2021-01-11 14:47:54 +0800
• a341797393 [修正] 广西BUG→上海同步BUG修正 [完善] 所有页面高度完善 陈鹏飞 2021-01-11 14:31:31 +0800
• a894797f5c 1.0.4.20210109b 徐振升 2021-01-09 11:55:27 +0800
• 60b221e568 更新版本1.0.3.20210109b 徐振升 2021-01-09 10:23:42 +0800
• 54de159a2e 更新版本：1.0.2.20210108_beta 徐振升 2021-01-08 17:47:04 +0800
• feb63ee208 [新增]水源采集页面ui + 组织机构增加下属机关 + 用户管理增加下属机关 邵佳豪 2021-01-08 17:03:33 +0800
• f407fe5327 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 徐振升 2021-01-08 10:19:47 +0800
• 47143497e1 更新版本到1.0.1.20210108_beta 徐振升 2021-01-08 10:19:26 +0800
• e1609cd55f Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-08 09:57:58 +0800
• 599bea074e [修改]各级预案查询条件修改 chenjingyu 2021-01-08 09:54:54 +0800
• 18b350e37a 新增安信图例 版本1.0.0.20210107_beta 徐振升 2021-01-08 08:57:51 +0800
• 8527958db3 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-01-07 11:10:12 +0800
• 5b93296b62 [新增]创建数据采集文件 邵佳豪 2021-01-07 11:10:06 +0800
• 4948a6bbe1 [完善]预案类型查询更改为多类型查询 邵佳豪 2021-01-07 09:16:25 +0800
• 2510b7ecdc [修改]菜单分级 chenjingyu 2021-01-06 10:50:29 +0800
• 222d55520a Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-01-04 15:21:19 +0800
• dc6a6c919c [修改]统计分析跳转逻辑修改 chenjingyu 2021-01-04 15:21:12 +0800
• 3281a54ad2 [完善]完善演示细节 邵佳豪 2020-12-29 21:27:31 +0800
• 6e0d70443a Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2020-12-29 18:04:40 +0800
• 88019cd240 [完善]完善保存到已有节点 邵佳豪 2020-12-29 18:04:32 +0800
• f4e1a2c74d 完善注释 徐振升 2020-12-29 15:29:03 +0800
• fd72584bc1 防止建筑数据与楼层数据不匹配的情况下，覆盖所有当前层数据，目前暂未发现这种问题 徐振升 2020-12-29 15:24:33 +0800
• 02162fde3c [完善]增加更新用于统计的数据 邵佳豪 2020-12-29 15:01:07 +0800
• a5a0f88f64 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2020-12-29 14:17:51 +0800
• f53b5acae7 [修正]修正进入重点单位不能查看tabbar的分数 邵佳豪 2020-12-29 14:17:47 +0800
• 4d8abf3b47 [修改]改名换接口 chenjingyu 2020-12-29 11:42:40 +0800
• 550bc55f24 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2020-12-29 09:34:54 +0800
• 317ffeb821 [修改]维护审核查看预案改为审核预案 chenjingyu 2020-12-29 09:34:47 +0800
• 04256b5e2f [完善]修改弹出框名称 邵佳豪 2020-12-28 16:24:55 +0800
• c928ecab58 [修改]公告隐藏 chenjingyu 2020-12-28 16:22:05 +0800
• b876bbc962 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2020-12-28 16:16:14 +0800
• 772d50c439 [新建]预案审核模块新建 chenjingyu 2020-12-28 16:16:07 +0800
• ae61834cf8 [完善]完善样式 邵佳豪 2020-12-28 16:13:47 +0800
• 17cb00bb7d [完善]更新采集工具文件 邵佳豪 2020-12-28 15:43:51 +0800
• 32504a6f56 [更新]更新编制工具文件 邵佳豪 2020-12-28 15:38:30 +0800
• 0220562174 更新版本 徐振升 2020-12-28 15:29:10 +0800
• 9bc04a400e [修改]修改导航logo 邵佳豪 2020-12-28 14:22:30 +0800
• a0b0212fcd [完善]新增单位进入时报错 邵佳豪 2020-12-28 13:10:14 +0800
• d69dd80dc0 [完善]增加石油化工模板判别范围 邵佳豪 2020-12-28 13:05:26 +0800
• 96eae73e9d [完善]1.点击导航按钮路线规划赋默认值 2.基本信息文件增加化工生产类判断 邵佳豪 2020-12-28 12:35:03 +0800
• 30012d2de2 [修改]修改反向代理端口 邵佳豪 2020-12-28 10:51:05 +0800
• 64d9fce268 [完善]单位位置标注增加搜索功能 邵佳豪 2020-12-28 10:48:48 +0800
• 3cae86cbf3 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2020-12-26 17:28:34 +0800
• ddeb2aabc7 [完善]单位地图增加搜索功能 邵佳豪 2020-12-26 17:28:25 +0800
• ec9edb3eb5 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2020-12-26 15:21:49 +0800
• 3470e1dad9 [新建]预案审核模块审核记录和待审核 chenjingyu 2020-12-26 15:21:42 +0800
• 8ca675e6a8 [新增]新增修改重点单位名称按钮 邵佳豪 2020-12-26 15:16:11 +0800
• b7d39aa1cf [修改]更新登录logo 邵佳豪 2020-12-25 17:26:12 +0800