Commit Graph

  • fcd6b2e4fe fix: 注释代理 panyuyi 2024-03-28 09:23:47 +0800
  • 346abc02a5 Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0 panyuyi 2024-03-28 09:23:06 +0800
  • 6bea99acd5 fix: 修复bug panyuyi 2024-03-28 09:22:43 +0800
  • 558b6fae15 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-27 12:39:58 +0000
  • 4c3f9a9d15 Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0 chenhaojie 2024-03-27 18:24:51 +0800
  • 09a2ccd671 fix: 解决图层编辑弹框逻辑 chenhaojie 2024-03-27 18:24:02 +0800
  • a879b609e3 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-27 09:54:50 +0000
  • 50ec8f2018 fix: 修复bug panyuyi 2024-03-27 17:53:39 +0800
  • 489afbef40 fix: 修复file为null问题 panyuyi 2024-03-27 09:49:41 +0800
  • 06de6d0c3c Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-27 01:34:32 +0000
  • f34a29b71d fix: 修复bug panyuyi 2024-03-27 09:33:18 +0800
  • 80ff7734e8 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-26 10:03:24 +0000
  • 0752fce886 fix: 修复bug panyuyi 2024-03-26 17:53:54 +0800
  • 1ee975795c fix: 修复动物防治bug panyuyi 2024-03-26 17:48:07 +0800
  • ee9183bc37 fix: 合并代码 panyuyi 2024-03-26 13:49:42 +0800
  • ccde6322ff Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0 panyuyi 2024-03-26 13:46:18 +0800
  • fc46c447f4 fix: 修复害堤动物确认操作bug panyuyi 2024-03-26 13:46:04 +0800
  • 6e462e9794 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-25 08:35:49 +0000
  • a20702a38f Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0 hxh 2024-03-25 16:35:07 +0800
  • 0625e72be5 feat: 添加按钮权限 hxh 2024-03-25 16:35:01 +0800
  • fe0caf0eb0 fix: 解决图层字段配置回显错误的问题 chenhaojie 2024-03-25 14:12:07 +0800
  • d466115d13 chore: 调整代理 chenhaojie 2024-03-25 11:29:49 +0800
  • 5f6c32778b Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-23 12:05:43 +0000
  • 2b9be2a75b fix: 修复角色配置页面逻辑 hxh 2024-03-23 20:04:00 +0800
  • 577b090193 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-23 06:32:32 +0000
  • b6d4d916cb fix: 修复巡查默认值填充 hxh 2024-03-23 14:31:56 +0800
  • 9616b8cc66 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-23 03:01:03 +0000
  • c4af26b39d fix: 被引用的巡查项设置不可编辑 hxh 2024-03-23 10:59:55 +0800
  • eac9fc1117 fix: 修复巡查计划删除逻辑 hxh 2024-03-22 20:02:54 +0800
  • 739d5fcd56 fix: 巡检名称长度限制 hxh 2024-03-22 19:53:27 +0800
  • 054000f43b Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-22 11:44:50 +0000
  • 395864fe63 Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0 hxh 2024-03-22 19:40:52 +0800
  • 83ada77d38 fix: 修复巡检计划检索bug hxh 2024-03-22 19:40:48 +0800
  • be651933b2 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-22 10:42:42 +0000
  • 17cf874e15 fix: 解决图层字段解析问题 chenhaojie 2024-03-22 18:21:59 +0800
  • f6ea1ceb30 Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0 chenhaojie 2024-03-22 18:13:10 +0800
  • 71894fadcf fix: 增加资源目录管理对服务字段配置的支持 chenhaojie 2024-03-22 18:12:33 +0800
  • f330cdb7c1 Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0 panyuyi 2024-03-22 17:25:40 +0800
  • ef12c24bd1 fix: 修复监督检查和病险bug panyuyi 2024-03-22 17:25:19 +0800
  • 1ddb15ea59 Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0 yantingyu 2024-03-22 14:12:57 +0800
  • 3cc7008f16 fix: 【水闸、堤防-水雨情智能分析】折线图显示部分,鼠标移入后出现点位偏移 yantingyu 2024-03-22 14:12:45 +0800
  • e50c7cfdf1 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-22 05:58:58 +0000
  • 7d312600fa Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0 hxh 2024-03-22 13:58:02 +0800
  • 83e988aad1 fix: 修复退出跳转地址 hxh 2024-03-22 13:57:57 +0800
  • 3330a6b8a1 Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0 chenhaojie 2024-03-22 11:43:13 +0800
  • 6b22256b99 feat: 拓展图层资源配置的扩展字段设置 chenhaojie 2024-03-22 11:42:41 +0800
  • 35299abee6 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-22 03:38:01 +0000
  • b34c6cae6c fix: 巡检新增默认值修改 hxh 2024-03-22 11:37:21 +0800
  • e77d8a24d8 fix: 修复巡视检查新增问题 hxh 2024-03-22 11:28:20 +0800
  • 180ec5ea25 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-21 10:03:24 +0000
  • e7db1745b2 fix: 联调病险工程模块 panyuyi 2024-03-21 18:02:38 +0800
  • ad68171c51 Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0 panyuyi 2024-03-20 18:00:09 +0800
  • 1ee22da5de fix: 对接病险 panyuyi 2024-03-20 17:59:48 +0800
  • 3b775e5c1d Merge branch 'release-sy-v1.0.0' into 'dev' 何俊杰 2024-03-19 08:25:46 +0000
  • 010a4a6999 Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0 hejunjie 2024-03-19 16:10:57 +0800
  • faba871286 修改动态监测字典使用类型 hejunjie 2024-03-19 16:10:30 +0800
  • 9cfb882b34 fix: 去除多余的文件引入 chenhaojie 2024-03-19 14:46:03 +0800
  • eada298044 Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0 chenhaojie 2024-03-19 14:39:45 +0800
  • 57c1405dfa fix: 调整超图rest服务的对接模式 chenhaojie 2024-03-19 14:39:20 +0800
  • e5e3cd6a68 Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0 panyuyi 2024-03-18 18:02:59 +0800
  • 575d3b5152 fix: 修改巡查 panyuyi 2024-03-18 18:02:25 +0800
  • 8d4a19ae36 修改动态监测历史记录 hejunjie 2024-03-18 17:14:09 +0800
  • d78b1bea40 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-18 02:58:47 +0000
  • 996c432b76 fix: 修复样式问题 panyuyi 2024-03-18 10:58:08 +0800
  • 412689f3dc fix: 修复弹窗关闭问题 panyuyi 2024-03-18 10:55:26 +0800
  • 0fa9d597fe Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-18 02:45:45 +0000
  • 176398800e Merge branch 'master' into release-sy-v1.0.0 panyuyi 2024-03-18 10:44:35 +0800
  • c6d8339230 fix: 合并表格 panyuyi 2024-03-18 10:43:56 +0800
  • 45d3ea2309 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-18 01:18:44 +0000
  • 12ab2a8643 fix: 大小写问题 panyuyi 2024-03-18 09:16:00 +0800
  • 06594f8030 fix: 文件夹大小写问题 panyuyi 2024-03-18 09:10:51 +0800
  • cb3cf86bb2 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-16 09:57:00 +0000
  • 2769b1010e fix: 修改接口 panyuyi 2024-03-16 17:55:08 +0800
  • ad6840a857 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-16 09:51:01 +0000
  • d0f24621b2 fix: 修改bug panyuyi 2024-03-16 17:50:13 +0800
  • 5bd8c2c6bb Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-16 09:18:47 +0000
  • c1b6646052 fix: 提交代码 panyuyi 2024-03-16 17:18:09 +0800
  • 5231700c65 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-16 08:48:53 +0000
  • aff019298b Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0 panyuyi 2024-03-16 16:47:24 +0800
  • 73528d30dc fix: 修改依赖 panyuyi 2024-03-16 16:46:54 +0800
  • afc73432a8 Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0 chenhaojie 2024-03-16 16:40:08 +0800
  • fec49ce814 feat: 增加对超图rest map服务图层类型的支持 chenhaojie 2024-03-16 16:39:26 +0800
  • 1b1a38e6ab cicd: 修改dockerfile hxh 2024-03-16 16:20:53 +0800
  • 5922fd29bd Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-16 07:46:04 +0000
  • 02e4d645b1 fix: 注释代理 panyuyi 2024-03-16 15:43:24 +0800
  • b78f40841b Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-16 07:33:45 +0000
  • 66fcfadbfa fix: 删除vue-echarts panyuyi 2024-03-16 15:20:19 +0800
  • 7058cac5d4 Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0 panyuyi 2024-03-16 15:13:36 +0800
  • 2d0910a62b fix: 修改水闸和堤防检查监督逻辑 panyuyi 2024-03-16 15:13:24 +0800
  • 2b7f607fb0 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-16 06:02:43 +0000
  • 53515ed166 Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0 yantingyu 2024-03-16 14:01:53 +0800
  • 075ecfecfa fix: 「水雨情测报」-- 雨水情况分析 yantingyu 2024-03-16 14:01:33 +0800
  • 5c7a58903c fix: 合并 panyuyi 2024-03-15 18:07:02 +0800
  • 1fe55ff4e1 fix: 修改表格合并 panyuyi 2024-03-15 18:05:19 +0800
  • d827672171 Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0 hejunjie 2024-03-15 16:55:28 +0800
  • 4c3a471580 堤防动态监测完成 hejunjie 2024-03-15 16:55:04 +0800
  • 740d63df41 fix: 联调堤防监督检查模块 panyuyi 2024-03-15 15:04:02 +0800
  • ba8bb4d72c Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-15 01:49:46 +0000
  • d4fac3bbe0 Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0 yantingyu 2024-03-14 18:24:11 +0800
  • 813c9009fb fix: 水闸雨水情报智能分析 yantingyu 2024-03-14 18:23:20 +0800