Commit Graph

Select branches

Hide Pull Requests

dev

guangxi

master

tangshan

tianjin

zhuzhou

上海一张图

Mono Color

• e3dcf1ceec Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-22 15:08:14 +0800
• 15727a778b [修改]新增单位统计首页跳转最后一级页面传参修改 chenjingyu 2021-03-22 15:07:24 +0800
• c2f832b451 [完善]完善优化问题 邵佳豪 2021-03-22 15:05:33 +0800
• 048df4268c Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-20 17:27:49 +0800
• 79e81008e6 [修改]统计分析建筑信息模块增加首页跳转 chenjingyu 2021-03-20 17:27:41 +0800
• 921d166636 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-20 15:51:50 +0800
• 088f3299cb [完善]修改测试出的bug 邵佳豪 2021-03-20 15:51:38 +0800
• 8486681601 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-03-20 14:08:37 +0800
• 388e0e55bd [修正] 修正GIS路线函数执行顺序BUG 陈鹏飞 2021-03-20 14:08:01 +0800
• 4ba0cebd54 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-20 09:13:06 +0800
• 1efe169171 [新增]完成维护更新页面 邵佳豪 2021-03-20 09:12:53 +0800
• 360ed6ead9 [修改]重点单位删除审核流程修改 chenjingyu 2021-03-19 17:12:05 +0800
• 1fd95dfd29 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-18 09:17:18 +0800
• 3e99e0e634 [修改]建筑类型统计第一层传参修改 chenjingyu 2021-03-18 09:17:10 +0800
• ce536d3e73 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-17 17:17:07 +0800
• b7e92c44c9 [完善]完善采集页面新增后跳到第一页 邵佳豪 2021-03-17 17:17:03 +0800
• 585cd513d6 [修改]添加拒绝审批意见传参 chenjingyu 2021-03-17 16:55:27 +0800
• 16ee42f9f2 [新增]采集页面增加审批意见提示 邵佳豪 2021-03-17 15:33:44 +0800
• 9adf9c585f [完善]完善待审核页面的审批意见功能 邵佳豪 2021-03-17 15:24:45 +0800
• 4864f5761e Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-17 14:48:19 +0800
• 44bda8715b Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-17 14:44:19 +0800
• 3c18ca7a98 [修改]修改建筑类型小图标 邵佳豪 2021-03-17 14:44:18 +0800
• 13ad14cda9 [新建]审批意见弹窗 chenjingyu 2021-03-17 14:44:03 +0800
• c1ec2a6eed Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-17 10:35:12 +0800
• 4290f65be2 [新增]增加增援预案界面 邵佳豪 2021-03-17 10:35:06 +0800
• e1f4c5793b Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-17 10:34:10 +0800
• 98aa2ee674 [新增]预案状态分析新增查看预案 chenjingyu 2021-03-17 10:34:01 +0800
• 13de70dd54 [完善] 修正编译报错 陈鹏飞 2021-03-16 15:16:18 +0800
• 13fde86963 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-03-16 15:13:02 +0800
• 8d7b7d46fc [完善] 完善消防设施统计样式, 得分提示样式 陈鹏飞 2021-03-16 15:12:55 +0800
• 7e5c9c75a8 [完善] 上传底图增加遮罩层 陈鹏飞 2021-03-16 11:35:16 +0800
• d9a16a6e73 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-15 17:17:52 +0800
• ca33e32222 [完善]完善bug 邵佳豪 2021-03-15 17:17:44 +0800
• 2b0a3a8476 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-15 17:06:25 +0800
• 6796b8332c [修改]待审核基本信息消防设施没有信息问题 chenjingyu 2021-03-15 17:06:18 +0800
• a716853d91 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-15 15:56:05 +0800
• eca726a97f [完善]单位待审核去掉平面图保存键 邵佳豪 2021-03-15 15:55:59 +0800
• 5e69d29f5f Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-15 10:10:47 +0800
• 75478ac259 [修改]综合分析区间查询弹窗隐藏 chenjingyu 2021-03-15 10:10:42 +0800
• 4b32c26ecc [合并]合并代码 邵佳豪 2021-03-15 10:07:25 +0800
• 393fb32382 [新增]人车素材所属单位 ，采集审核记录 邵佳豪 2021-03-15 10:06:41 +0800
• 0abf9bb167 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-03-15 09:17:58 +0800
• 6d9c3ccc3b [完善] 消防设施统计完善 陈鹏飞 2021-03-15 09:17:41 +0800
• 59364345cb [增加]综合分析对接后端接口 chenjingyu 2021-03-13 17:15:23 +0800
• c883ff8f19 await chenjingyu 2021-03-12 17:26:05 +0800
• 2c5f98eb65 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-11 17:29:51 +0800
• eedf099e18 [新增]建筑类型统计对接接口 chenjingyu 2021-03-11 17:29:43 +0800
• 9a3f913e10 [完善] 完整度得分提示 陈鹏飞 2021-03-11 11:07:37 +0800
• 64d48b92af Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-03-11 09:46:35 +0800
• 90dc4cefe5 [完善] 新增消防设施一键显隐功能 陈鹏飞 2021-03-11 09:46:24 +0800
• 24a83c7390 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-10 17:28:07 +0800
• f59af3f1bc [修改]待审核弹窗点取消左侧列表勾选问题 chenjingyu 2021-03-10 17:27:57 +0800
• b710a872c9 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-03-08 16:11:12 +0800
• 2c1aeee4df [完善] 新增素材库模糊搜索功能 陈鹏飞 2021-03-08 16:11:04 +0800
• 012f8c72d7 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-08 15:02:43 +0800
• ef955232c0 [新增]新增消防力量审核功能 邵佳豪 2021-03-08 15:02:36 +0800
• fe2941cc30 [修改]待审核左侧列表尺寸问题 chenjingyu 2021-03-06 17:09:45 +0800
• b067ccf5f6 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-06 16:57:08 +0800
• 17899ee33a [修改]待审核和审核记录页面显示不全问题 chenjingyu 2021-03-06 16:57:02 +0800
• 2a8b31392b Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-06 16:41:25 +0800
• 379c1bb2c7 [新增]新增联动力量审核功能 邵佳豪 2021-03-06 16:41:20 +0800
• c0d44e9d60 [新增]综合分析中队跳转查看重点单位信息 chenjingyu 2021-03-06 14:21:33 +0800
• e4491d114c [修改]审批结果初审不显示问题 chenjingyu 2021-03-06 09:28:21 +0800
• 0f82750121 [修改]建筑类型统计页面显示不出来问题 chenjingyu 2021-03-05 16:04:30 +0800
• f4d4f41418 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-05 15:43:20 +0800
• 6fbc3cc29b [修改]待审核页面添加公司名称 chenjingyu 2021-03-05 15:43:13 +0800
• 9d96ad28dc [完善]保存基本信息更新分数 邵佳豪 2021-03-05 10:22:44 +0800
• 15faab0770 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-05 08:54:59 +0800
• a79cb271b5 [新增]完成水源审核，修复单位基本信息bug，限制上传图片格式 邵佳豪 2021-03-05 08:54:53 +0800
• a8798658ec [完善] 图例BUG修正, 存储companyId 陈鹏飞 2021-03-04 15:08:46 +0800
• 535d69e938 [完善] 合并代码 陈鹏飞 2021-03-04 09:45:51 +0800
• 4ed8006671 [完善] 标注图例完善, 四周毗邻完善, 消防设施完善, 天气继承完善, 保存已有节点完善 陈鹏飞 2021-03-04 09:42:05 +0800
• 32763677b9 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-03 15:17:28 +0800
• e634be6810 [新增]重点单位审核结果查看 chenjingyu 2021-03-03 15:07:37 +0800
• 22cf6d7b2a Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-03 10:05:41 +0800
• 525fa30f75 [新增]单位基本信息模块替换为最新版本 邵佳豪 2021-03-03 10:05:31 +0800
• 4d43533f13 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 徐振升 2021-03-03 09:48:10 +0800
• 54fbd7b673 1.4.1rc 徐振升 2021-03-03 09:47:54 +0800
• 8207a876ad [新增]水源同意审核和拒绝审核功能 邵佳豪 2021-03-02 16:16:46 +0800
• 3d2983a529 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-02 15:41:21 +0800
• 3ca9bca1ab [新增]新增待审核页面中水源的显示 邵佳豪 2021-03-02 15:41:16 +0800
• 9135b2e97a Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-02 15:13:58 +0800
• bf09688da5 [新增]重点单位批量审核功能 chenjingyu 2021-03-02 15:11:51 +0800
• 73354ea137 [新增]平面图素材使用鼠标调节大小后更新属性宽高值 邵佳豪 2021-03-02 11:33:39 +0800
• 5b11a566f6 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-02 11:20:57 +0800
• aaf470cb14 [新增]审核页面水源审核的显示 邵佳豪 2021-03-02 11:20:43 +0800
• 770b1da2d2 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 徐振升 2021-03-02 11:00:53 +0800
• 8282624de9 1.4.0 徐振升 2021-03-02 11:00:35 +0800
• 5870ab3ada Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-03-02 10:43:05 +0800
• 00b4ea43bf [新增]增加水源采集提交审核按钮 邵佳豪 2021-03-02 10:42:18 +0800
• 875300d2f7 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-03-02 10:39:57 +0800
• 0e753e40b1 [新增]单位重点信息单个审核 chenjingyu 2021-03-02 10:39:50 +0800
• 9d2539ec47 绘制左上角调整大小 徐振升 2021-03-01 17:46:14 +0800
• 80892fe9c7 暂存 重新拉取项目 徐振升 2021-03-01 11:14:11 +0800
• 5cc32ac599 箭头素材 徐振升 2021-03-01 11:13:44 +0800
• 969233e2bf 属性转字符串 徐振升 2021-03-01 10:58:03 +0800
• 5721d29ef2 1.3.0 新增 多点连线、多边形等按住shift绘制垂直线段 徐振升 2021-02-25 16:46:14 +0800
• 764c32e0c7 [完善] 新增显隐图例功能 陈鹏飞 2021-02-25 15:09:02 +0800
• 714da1862f [新增]采集工具增加多选按钮 邵佳豪 2021-02-25 14:50:48 +0800
• 223fd3e55c [修改]信息完整度查询输入范围修改 chenjingyu 2021-02-24 16:18:22 +0800