Commit Graph

Select branches

Hide Pull Requests

dev

guangxi

master

tangshan

tianjin

zhuzhou

上海一张图

Mono Color

• 354a0d1604 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-08-16 16:04:22 +0800
• 7257b46b6d [完善]修改实景图文件夹bug，linksplan预览三维预案 邵佳豪 2021-08-16 16:04:15 +0800
• c779727411 完善 绘制水带可以点击在已创建图标上进行绘制 徐振升 2021-08-16 15:45:32 +0800
• 35f0ff29b1 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-08-16 10:30:40 +0800
• 161db5f26f [完善]linksPlan页面三维预案查看 邵佳豪 2021-08-16 10:30:34 +0800
• a35b485add [新增]三维预案网址 邵佳豪 2021-08-16 10:26:58 +0800
• 5f4eb32581 编辑 三维预案 陈鹏飞 2021-08-12 17:14:29 +0800
• 09d850345e Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-08-12 15:17:17 +0800
• 5b4a9d6b00 [完善] 编辑,查看三维预案 陈鹏飞 2021-08-12 15:17:07 +0800
• e61910ed25 [新增]引入模板无数据弹窗提示 chenjingyu 2021-08-12 14:40:44 +0800
• 8101e39879 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-08-12 13:52:40 +0800
• 4d1cf01e36 [新增]在线编制预案引用功能实现 chenjingyu 2021-08-12 13:51:30 +0800
• f7cbb99652 修正 调整图标大小会一起图片偏移 徐振升 2021-08-11 09:14:24 +0800
• e0b754abb9 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-08-07 16:24:23 +0800
• 9049382a9e [修改]在线编制预案建筑信息丢失问题 chenjingyu 2021-08-07 16:24:18 +0800
• d474f09212 [完善]完善差异信息对比错误 邵佳豪 2021-08-07 14:49:35 +0800
• d2ee5efe33 [完善]消防设施固定值班电话修改为文本类型 邵佳豪 2021-08-07 11:05:52 +0800
• 4865100ba9 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-08-07 10:06:42 +0800
• 278067d3b4 [完善]修改差异显示bug 邵佳豪 2021-08-07 10:06:37 +0800
• feaccbb884 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-08-05 16:51:45 +0800
• 5a2e75d9c1 [修改]预案在线编制单位信息修改同步修改问题 chenjingyu 2021-08-05 16:51:38 +0800
• 9113bd28ce Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-08-02 15:11:55 +0800
• b8c11930eb [新增]实景图增加安全出口的显示 邵佳豪 2021-08-02 15:11:50 +0800
• 1c5af71667 [修改]预案在线编制表格固定宽度 chenjingyu 2021-07-30 15:26:15 +0800
• 0a047a17ff [修改]待审核页面在线编制文本预案预览 chenjingyu 2021-07-29 17:21:08 +0800
• f4a8b410b5 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-07-28 17:17:32 +0800
• e4164883cb [修改]预案模板管理复制功能对接后端接口 chenjingyu 2021-07-28 17:17:26 +0800
• f01ab62c51 修改已保存的图例数据PropertyValue为字符串 徐振升 2021-07-28 14:44:24 +0800
• b92f04c25b 修改PropertyValue 类型为字符串 徐振升 2021-07-28 10:44:20 +0800
• cb44fa6409 [修改]首页月度查询文字修改 chenjingyu 2021-07-27 16:29:45 +0800
• 180e8c685f [修改]canvas-share-data.service报错问题添加变量 chenjingyu 2021-07-26 16:47:14 +0800
• cc263b17c4 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-07-24 17:02:47 +0800
• 3dad410b3a [新增]待审核页面新增预案类型 chenjingyu 2021-07-24 17:02:39 +0800
• d67329fd1f Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-07-24 14:29:41 +0800
• 272ae61296 [完善]处理建筑信息差异对比 邵佳豪 2021-07-24 14:29:33 +0800
• 81dbd0405c [新增] 消防设置统计项 徐振升 2021-07-24 10:26:46 +0800
• 3ea8a5e5d9 [修改]修改对比数据报错 邵佳豪 2021-07-23 15:56:15 +0800
• cbe3571356 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-07-23 15:07:48 +0800
• 1421fbd8be [修改]修改对比数据报错 邵佳豪 2021-07-23 15:07:39 +0800
• 31d071359b Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-07-23 13:55:45 +0800
• 18aca1b1a9 [修改]重点单位提交审核参数修改 chenjingyu 2021-07-23 13:55:39 +0800
• f12a69444b [完善]完善对比数据bug 邵佳豪 2021-07-23 13:43:16 +0800
• 81347f8e99 1.5.2 修正 名称/编号初始化时不显示 徐振升 2021-07-19 10:43:33 +0800
• 4a48a78a38 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-07-19 10:27:38 +0800
• 8ddd7a754c Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 陈鹏飞 2021-07-16 16:29:09 +0800
• 4c5dec0356 保存前清空 已被删除楼层冗余数据 陈鹏飞 2021-07-16 16:28:59 +0800
• d2a3ae2018 删除楼层添加遮罩层 陈鹏飞 2021-07-16 15:57:23 +0800
• 823e6b2356 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-07-16 09:27:56 +0800
• f1c42a3f33 [新增]预案状态统计首页新增预案类型统计 chenjingyu 2021-07-16 09:27:46 +0800
• b041b7d4c0 [完善]内网文件 邵佳豪 2021-07-15 16:17:11 +0800
• 92d6dc6de4 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-07-15 16:01:18 +0800
• 6b25328241 [完善]更改单位分数接口；修改功能分区获得数据顺序bug 邵佳豪 2021-07-15 16:01:06 +0800
• 0610c3ad7e 更新版本1.5.1.20210715 [修正] 背景图旋转后图标拖动异常 徐振升 2021-07-15 14:38:20 +0800
• 27d494bb7d Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-07-15 09:40:58 +0800
• 6736d776a8 [修改]弃用毕生 邵佳豪 2021-07-15 09:37:06 +0800
• 43f4f9ac34 Merge branch '上海一张图' 陈鹏飞 2021-07-14 13:55:46 +0800
• 63c2cb2889 [新增]待审核和审核记录新增预案编制查看 chenjingyu 2021-07-09 17:02:26 +0800
• 8aef9e4298 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-07-07 14:39:52 +0800
• 10bd6a4b14 [完善]平面图增加滚动条 邵佳豪 2021-07-07 14:39:37 +0800
• 9654d89e7f Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-07-07 14:14:09 +0800
• eae02e7412 [修改]预案状态统计数量不对问题 chenjingyu 2021-07-07 14:14:02 +0800
• b57647c789 [修正] 修正功能分区初始化自动创建BUG 陈鹏飞 2021-07-06 15:56:32 +0800
• e8e11ae68b Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-07-05 16:12:09 +0800
• 7dcba20f5b [新增]单位基本信息原数据 chenjingyu 2021-07-05 16:12:04 +0800
• efe1e3c4cb Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-07-05 16:06:28 +0800
• 40ba6daf55 [完善]生成word图片处理 邵佳豪 2021-07-05 16:06:08 +0800
• a3d88ee006 [修改]在线编制属性结构改为上传图片 chenjingyu 2021-07-02 15:19:50 +0800
• 81012342e1 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-07-02 11:28:20 +0800
• b708cf8505 [修改]在线编制单位概况另一套前端布局 chenjingyu 2021-07-02 11:24:13 +0800
• ef42362bed [完善]在线编制预案增加提交功能 邵佳豪 2021-07-02 11:12:12 +0800
• 36c05e01b3 科大对接BUG修正 上海一张图 陈鹏飞 2021-07-01 15:28:35 +0800
• 1254a2a33d Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-06-30 15:41:51 +0800
• 6665cb3554 [修改]首页预案数量显示不对初值改为0 chenjingyu 2021-06-30 15:41:43 +0800
• 80ee996075 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-06-30 15:40:00 +0800
• 47e0182b04 [完善]调节图示，处置要点，水源，警示，预案附件内联样式 邵佳豪 2021-06-30 15:35:53 +0800
• 1aabceeff9 [修改]毕升去掉编辑功能 chenjingyu 2021-06-30 14:57:19 +0800
• 8ecdebf49d [新增]新增导出word插件 邵佳豪 2021-06-30 11:13:49 +0800
• 2b48811427 Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin chenjingyu 2021-06-29 17:00:55 +0800
• 56218ffae9 [新增]预案模板单位概况 chenjingyu 2021-06-29 16:57:24 +0800
• b6f8b3191b [新增]增加预览模式 邵佳豪 2021-06-29 16:45:07 +0800
• b3e28a0e7a [完善]修复消防设施输入框保存问题 邵佳豪 2021-06-29 09:29:28 +0800
• 117460e8c3 新增聚合物图层 陈鹏飞 2021-06-27 17:18:05 +0800
• 034eb48a67 聚合物初步晚上 陈鹏飞 2021-06-27 15:29:25 +0800
• 948adc50c8 首页行政区划完成 陈鹏飞 2021-06-27 09:59:51 +0800
• db0055fe62 事件监听对接科达 陈鹏飞 2021-06-26 18:52:30 +0800
• 60b2c52b11 删除测试代码 陈鹏飞 2021-06-26 12:47:34 +0800
• ff3e2fbb43 autocomplate封装完成 陈鹏飞 2021-06-26 12:30:21 +0800
• 7fbb4b87c7 demo 手写高德的搜索框逻辑.方便移植至科达 赵旭 2021-06-25 22:59:07 +0800
• f25b1565db 临时修改 陈鹏飞 2021-06-25 20:52:41 +0800
• bcf0ec6e1d 搜索框下拉整理..part 赵旭 2021-06-25 19:44:07 +0800
• dc6abd98b9 科达对接封装组件 陈鹏飞 2021-06-25 19:23:20 +0800
• 631121fb26 封装接口重新定义 陈鹏飞 2021-06-25 17:18:34 +0800
• 3c34805c33 科达封装 陈鹏飞 2021-06-25 16:34:10 +0800
• a2a7487672 [完善]去除打印信息 邵佳豪 2021-06-25 11:19:04 +0800
• 63097a89ce Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin 邵佳豪 2021-06-25 11:13:05 +0800
• ce9006c475 [完善]辅助楼层修改素材的楼层ID；修复上传地图大于10M问题 邵佳豪 2021-06-25 11:13:00 +0800
• 9f9ab862dc 地图 search 事件的包装器设计. 赵旭 2021-06-25 10:10:13 +0800
• ad1686125f 科达地图封装 陈鹏飞 2021-06-25 09:19:39 +0800
• 9f75500496 删除多余代码 陈鹏飞 2021-06-24 21:36:28 +0800
• 576566c4ea [修改]统计分析维护更新统计根据不同级别显示不同数据 chenjingyu 2021-06-24 16:55:43 +0800