Commit Graph

  • 654219e436 Merge branch 'feature-sy-v1.0.1' into release-sy-v1.0.0 ruancuihong 2024-04-26 17:03:17 +0800
  • 976639d3d9 fix: 未合并的文件 ruancuihong 2024-04-25 16:08:33 +0800
  • 704db15c2f fix: 表格滚动条消失 ruancuihong 2024-04-25 15:35:40 +0800
  • 5cc53a890c fix: 解决冲突 ruancuihong 2024-04-25 15:03:05 +0800
  • 5cf2ecf10c fix: 还原监督检查 hxh 2024-04-22 19:18:01 +0800
  • 0282527e69 Merge branch 'dev-old' into dev hxh 2024-04-22 18:33:40 +0800
  • c7640cfe90 Merge branch 'feature-sy-v1.0.1' into dev hxh 2024-04-22 17:23:37 +0800
  • b3919fe627 fix: 预警处理详情样式 hxh 2024-04-22 17:21:59 +0800
  • bd08a070d4 Merge branch 'release-sy-v1.0.0' into dev hxh 2024-04-22 17:01:48 +0800
  • 0ff2e686d8 fix: 修复Bug panyuyi 2024-04-18 11:31:09 +0800
  • f953d4f5b1 Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0 panyuyi 2024-04-18 11:26:46 +0800
  • 7c96dac979 fix: 修改需求 panyuyi 2024-04-18 11:26:33 +0800
  • 20a75a67bd fix: 预警处理详情样式 ruancuihong 2024-04-16 18:16:10 +0800
  • d639b6d2bb 解决与dev的冲突 hejunjie 2024-04-16 15:34:38 +0800
  • 4051dbf35b Merge remote-tracking branch 'origin/dev' into feature-sy-v1.0.1 hejunjie 2024-04-16 15:26:09 +0800
  • acdd774a5f Merge branch 'feature-sy-v1.0.1' of http://gitlab.datameta.com/project/water/shuili-vue into feature-sy-v1.0.1 hejunjie 2024-04-16 15:19:33 +0800
  • 02df26cf19 四预完成 hejunjie 2024-04-16 15:19:13 +0800
  • 988be767f2 fix: 数据字段更换 ruancuihong 2024-04-16 14:19:04 +0800
  • a10eb00dbf 四预完成 hejunjie 2024-04-16 10:17:57 +0800
  • 89e6e4e88e 初始信息配置完成 hejunjie 2024-04-16 09:22:26 +0800
  • a48f7cb7fd fix: 数据更换、告警处理 ruancuihong 2024-04-15 17:16:01 +0800
  • 61c459bdf6 四预完成80% hejunjie 2024-04-15 13:49:28 +0800
  • 34a2dbeeb7 feat: 预警预报详情 ruancuihong 2024-04-13 17:53:39 +0800
  • 1575e488ac Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-04-12 11:12:15 +0000
  • 8a45459fe6 fix: 设置主键显示 hxh 2024-04-12 19:11:37 +0800
  • 1929388e18 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-04-12 10:33:53 +0000
  • 0d5421934d 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-04-12 18:33:22 +0800
  • 64bf58889f fix: 屏蔽代码 hxh 2024-04-12 18:33:16 +0800
  • 2b504213f5 feat: tree组件 ruancuihong 2024-04-12 17:32:46 +0800
  • 847c39b9cc Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0 ruancuihong 2024-04-12 17:23:49 +0800
  • c040ecd692 feat: tree组件 ruancuihong 2024-04-12 17:23:14 +0800
  • d6c0851bb1 完成四预表格 hejunjie 2024-04-12 17:17:46 +0800
  • c0d4aa4d2b Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-04-12 07:57:19 +0000
  • a32e0aa100 feat: 修改菜单页面显示 hxh 2024-04-12 15:56:27 +0800
  • f12bc48479 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-04-08 08:11:12 +0000
  • 14b3a39cbf fix: 更换接口 panyuyi 2024-04-08 14:34:27 +0800
  • 4b1c7c888d Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-04-02 10:26:57 +0000
  • 922092bedc fix: 修改代理 panyuyi 2024-04-02 18:26:18 +0800
  • adfef6f29b fix: 修复bug panyuyi 2024-04-02 18:25:21 +0800
  • 48d8096569 fix: 添加文件夹 panyuyi 2024-04-02 18:20:40 +0800
  • 1b5a6dc81d fix: 删除大写文件夹 panyuyi 2024-04-02 18:19:17 +0800
  • eee9f899ab Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-04-02 07:38:08 +0000
  • 1721e86be5 Merge branch 'master' into release-sy-v1.0.0 panyuyi 2024-04-02 15:18:03 +0800
  • 50851369a5 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-04-01 09:34:45 +0800
  • 69f64b137c fix: 增加样式接口 chenhaojie 2024-04-01 09:33:59 +0800
  • dd3070062c Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-30 09:45:42 +0000
  • b30bf305f6 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-30 17:44:31 +0800
  • fdedb89404 fix: 修复样式问题 panyuyi 2024-03-30 17:44:21 +0800
  • 26bd20e312 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-30 17:36:16 +0800
  • 90ded574a1 修复调度计划二轮bug hejunjie 2024-03-30 17:36:06 +0800
  • 87f367509f Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-30 09:26:43 +0000
  • 684ac2f1ea fix: 修改bug panyuyi 2024-03-30 17:19:31 +0800
  • 4b94e6548c 按钮权限 xzt 2024-03-30 16:18:05 +0800
  • 5ebfc86ad3 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-30 08:09:33 +0000
  • 37319bbec0 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-30 15:58:29 +0800
  • 941f844739 fix: 修复害堤动物防治 panyuyi 2024-03-30 15:56:09 +0800
  • ddf05db545 去除限制字符 hejunjie 2024-03-30 15:15:45 +0800
  • 5a4bdd2666 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-30 15:10:42 +0800
  • fa3d215757 修复动态和调度第一轮bug hejunjie 2024-03-30 15:10:20 +0800
  • b43c1e7852 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-30 05:43:22 +0000
  • 6e51048ffe 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-30 13:40:34 +0800
  • 293b2b6355 fix: 修改排序功能 panyuyi 2024-03-30 13:40:21 +0800
  • fa88e340c0 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-30 11:12:50 +0800
  • 21ef2f4163 fix: 拓展超图的wfs和rest服务的基础查询功能 chenhaojie 2024-03-30 11:12:27 +0800
  • 4d4871051b fix: 修复bug panyuyi 2024-03-30 10:42:01 +0800
  • 53b64ab11e Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-30 02:09:19 +0000
  • 5ff11460f1 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-29 17:50:50 +0800
  • 17700dab13 fix: 修复bug panyuyi 2024-03-29 17:50:23 +0800
  • e6fc58fedc Merge branch 'release-sy-v1.0.0' zhuyulei 2024-03-29 17:18:09 +0800
  • 574164a701 1 zhuyulei 2024-03-29 17:13:52 +0800
  • fd27d36212 工程状况板块修改及单点登录 xzt 2024-03-29 17:07:21 +0800
  • bbbc7b74ad 工程状况板块修改 xzt 2024-03-29 15:05:52 +0800
  • 13148391cd Merge branch 'release-sy-v1.0.0' into 'dev' 曹琪 2024-03-29 06:13:39 +0000
  • 19fb63bdea 工程状况板块修改 xzt 2024-03-29 11:27:23 +0800
  • a61ce02400 fix: 调整场景配置的接口请求 chenhaojie 2024-03-29 11:15:38 +0800
  • ae9999d78c fix: 去除多余代码 chenhaojie 2024-03-29 11:04:58 +0800
  • 52442880cb fix: 修复视点定位问题 chenhaojie 2024-03-29 11:04:24 +0800
  • 945af58469 fix: 解决场景配置的地图编辑问题 chenhaojie 2024-03-29 10:43:04 +0800
  • ee440af769 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-28 09:59:34 +0000
  • e3069aaede fix: 修复bug panyuyi 2024-03-28 17:52:33 +0800
  • e798f522c6 fix: 添加核查问题描述边界值问题 panyuyi 2024-03-28 17:41:58 +0800
  • 0b54634b8c fix: 修复动物防治图片和备注限制问题 panyuyi 2024-03-28 17:38:45 +0800
  • fc5e9e687d Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-28 09:26:49 +0000
  • b1f2ad4c0b fix: 修复监督检查办法配置项删除item问题 panyuyi 2024-03-28 17:23:12 +0800
  • 56d8f77bbb fix: 修复工程上报边界值问题 panyuyi 2024-03-28 17:18:24 +0800
  • 3771af0075 fix: 修复监督检查任务配置边界值问题 panyuyi 2024-03-28 17:14:30 +0800
  • 7d69ce8200 fix: 修复监督办法命名为空能保存问题 panyuyi 2024-03-28 17:09:42 +0800
  • 5ad9c037ce fix: 修复监督检查检索问题 panyuyi 2024-03-28 17:07:31 +0800
  • 81a1a0be91 堤防换证修改 xzt 2024-03-28 15:18:39 +0800
  • a2867fd8c0 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-28 02:56:18 +0000
  • db131e1d29 fix: 修复缺陷 panyuyi 2024-03-28 10:54:50 +0800
  • f4294d016a fix: 修复病险小组添加问题 panyuyi 2024-03-28 10:43:14 +0800
  • 78669106bd fix: 修复动物防治说明长度限制问题 panyuyi 2024-03-28 10:31:47 +0800
  • d376422a8f fix: 修复病险新增任务名称限制问题 panyuyi 2024-03-28 10:29:02 +0800
  • 0a6fa52f4a fix: 修复病险任务管理列表工程等级筛选无效问题 panyuyi 2024-03-28 10:24:06 +0800
  • 63b533ebb8 fix: 修复病险任务列表搜索问题 panyuyi 2024-03-28 10:20:57 +0800
  • 2c63692f6d fix: 修复bug panyuyi 2024-03-28 10:05:52 +0800
  • cd38e2bf7e fix: 修复监督检查任务管理校验问题 panyuyi 2024-03-28 09:50:50 +0800
  • 8de85cd6f8 fix: 修复核查报告展示字段 panyuyi 2024-03-28 09:35:42 +0800
  • 71e60ca200 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-28 01:24:23 +0000