Commit Graph

  • f7156770ac 调度运用模块接口对接完成 hejunjie 2024-03-14 18:23:18 +0800
  • 17c3b76243 fix: 合并 panyuyi 2024-03-14 18:21:59 +0800
  • 8983c63e23 fix: 注释代码 panyuyi 2024-03-14 18:19:59 +0800
  • f0eff64ea2 fix: 完成水闸监督检查模块 panyuyi 2024-03-14 18:19:37 +0800
  • 399f7b9529 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-14 08:14:37 +0000
  • 19833fef3a feat: 提交本地文件代理配置 hxh 2024-03-14 16:11:34 +0800
  • c535c95380 fix: 屏蔽查询条件、修复日期选择失效等 hxh 2024-03-14 16:00:57 +0800
  • b55d72a784 fix: 修复水闸水雨情查询条件 hxh 2024-03-14 15:33:45 +0800
  • 4800edb5d9 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-14 07:13:12 +0000
  • 20357e6249 fix: 修复水闸水雨情查询条件问题 hxh 2024-03-14 15:12:17 +0800
  • 7282d7bf93 fix: 补充地图渲染相关的资源文件 chenhaojie 2024-03-14 11:24:45 +0800
  • 95262165c9 cicd: 修改ng hxh 2024-03-14 11:08:16 +0800
  • c100d214e0 cicd: 添加代理地址 hxh 2024-03-14 10:14:32 +0800
  • bd258b545e 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-14 09:42:39 +0800
  • fcbd1a536f fix: 移除Cesium源码的影响 chenhaojie 2024-03-14 09:41:42 +0800
  • 1c706dec39 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-13 11:49:52 +0000
  • 6c1fdbea12 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-13 19:49:05 +0800
  • 6eaa4ab3dd fix: 完善查询具体堤防/水闸逻辑 hxh 2024-03-13 19:48:59 +0800
  • eb1809a431 修改冲突 hejunjie 2024-03-13 19:11:53 +0800
  • aa5cda1e4c 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-13 19:04:53 +0800
  • 44dcff6d97 水闸动态检测接口完成 hejunjie 2024-03-13 19:04:30 +0800
  • 9fc0ab877a Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-13 10:22:56 +0000
  • fdc73a2728 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-13 18:22:07 +0800
  • cc3d466634 fix: 修复dikeCode传参问题 hxh 2024-03-13 18:21:15 +0800
  • d29fa4d500 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-13 10:16:56 +0000
  • 95de5cbfe4 fix: 联调工程问题模块 panyuyi 2024-03-13 18:16:14 +0800
  • f1045c4125 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-13 01:41:30 +0000
  • cc182e8370 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-12 19:44:23 +0800
  • 4e3b20b8ea fix: 修复周期对应时间格式错误 hxh 2024-03-12 19:44:18 +0800
  • 2902f7b8be Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-12 10:37:58 +0000
  • 3617a4964d 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-12 18:36:48 +0800
  • 2a53cc4096 fix: 完成监督检查任务管理模块,开发监督检查工程管理模块 panyuyi 2024-03-12 18:35:34 +0800
  • 4cb5a82906 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-12 18:34:52 +0800
  • 53b4f732d3 fix: 图层管理增加样式选择; yantingyu 2024-03-12 18:34:36 +0800
  • 5e4ddc9b6e fix: 堤害防治只有在普查时才显示周期 hxh 2024-03-12 18:27:15 +0800
  • 9b6b083338 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-12 18:08:40 +0800
  • a7f68448e2 fix: 修复堤害动物防治记录保存数据问题 hxh 2024-03-12 18:08:35 +0800
  • b1f6d35509 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-12 17:36:47 +0800
  • b26cc05a8c feat(水利工程场景): 对接地图模块的相关地图事件 chenhaojie 2024-03-12 17:31:20 +0800
  • e29eb99743 fix: 图层管理页面改为路由跳转 yantingyu 2024-03-12 15:28:14 +0800
  • a3f2621020 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-12 14:03:53 +0800
  • d87fd30adb fix(水利工程): 调整水利工程相关的接口和页面 chenhaojie 2024-03-12 14:02:51 +0800
  • 2fbb22cea3 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-12 11:42:02 +0800
  • b1b98833f4 fix: 编辑后无法新增 yantingyu 2024-03-12 11:41:51 +0800
  • b0a3c57296 fix: 解决冲突 chenhaojie 2024-03-12 11:29:18 +0800
  • 189eba13fc fix(水利场景配置): 对接相关的接口 chenhaojie 2024-03-12 11:26:53 +0800
  • bfc75e1875 Merge branch 'release-sy-v1.0.0' into 'dev' 黄星淮 2024-03-11 11:20:43 +0000
  • 46c598f244 fix: 图层管理 编辑回显 yantingyu 2024-03-11 18:41:22 +0800
  • 4ee27ffbce fix: 图层管理 yantingyu 2024-03-11 17:23:18 +0800
  • e3a58a8205 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-09 16:46:45 +0800
  • def4ca164c fix: 修复 panyuyi 2024-03-09 16:46:19 +0800
  • b89df72326 fix: 修改代理 yantingyu 2024-03-09 16:43:33 +0800
  • e979dc20bd fix: 图层目录适配新接口 yantingyu 2024-03-09 16:37:02 +0800
  • f6a0e282f1 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-09 16:33:18 +0800
  • 1cd62a4855 fix: 合并冲突 panyuyi 2024-03-09 16:33:11 +0800
  • 3558254c0a 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-09 14:53:42 +0800
  • c0dd85a28f fix: 配置水利运行场景详情的路由 chenhaojie 2024-03-09 14:53:11 +0800
  • 40095649c5 fix: 删除多余代码 panyuyi 2024-03-09 14:44:32 +0800
  • 95a39360d7 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-09 14:42:40 +0800
  • ba7735d9dc fix: 修改水雨情逻辑 panyuyi 2024-03-09 14:42:20 +0800
  • 764ff63329 fix: 去除调试节点 chenhaojie 2024-03-09 14:22:31 +0800
  • 0f3295cb22 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-09 14:21:18 +0800
  • 915bbba494 fix: 增加详情模块的图层配置 chenhaojie 2024-03-09 14:20:01 +0800
  • cea1ab3adb fix: 图层目录管理 yantingyu 2024-03-09 11:59:25 +0800
  • 352d15cf80 fix: 图层目录管理 yantingyu 2024-03-09 11:57:05 +0800
  • 3327f9ce18 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-08 15:46:39 +0800
  • a8d9a306ae fix: mock图层目录数据并完善其交互 chenhaojie 2024-03-08 15:45:27 +0800
  • c631b1080b Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-08 06:13:49 +0000
  • d3e0e32f7f 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-08 14:12:39 +0800
  • 03e5ef5769 fix: 添加dikeCode panyuyi 2024-03-08 14:12:30 +0800
  • 3172659d0c fix: 添加dikeCode panyuyi 2024-03-08 14:10:30 +0800
  • 7160581c13 修改登记按钮 xzt 2024-03-08 14:05:09 +0800
  • 43eac1ff16 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-07 18:15:35 +0800
  • b87920c8a4 fix: 增加水利工程详情模块 chenhaojie 2024-03-07 18:15:12 +0800
  • 7f4cb54287 feat: 增加详情的地图模块 chenhaojie 2024-03-07 18:14:48 +0800
  • fac5ebf905 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-07 02:42:05 +0000
  • 0966b70c33 fix: 删除死数据 panyuyi 2024-03-07 10:41:28 +0800
  • afbecb4234 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-07 10:39:31 +0800
  • e2f1a3b67b fix: 修复页码问题 panyuyi 2024-03-07 10:39:21 +0800
  • 449ad18003 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-07 10:35:33 +0800
  • 7990556620 fix: 去除多余路由 chenhaojie 2024-03-07 10:35:01 +0800
  • 51a7b216b7 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-07 02:23:29 +0000
  • 32251add93 fix: 修复bug panyuyi 2024-03-07 10:22:34 +0800
  • 733c23f37c Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-06 12:35:53 +0000
  • 7a35e55e30 fix: 修改代理 panyuyi 2024-03-06 20:28:22 +0800
  • 598206b5c2 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-06 12:22:30 +0000
  • 2854c62581 Merge branch 'master' into release-sy-v1.0.0 panyuyi 2024-03-06 20:21:41 +0800
  • 190e54fb62 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-06 20:21:18 +0800
  • 1cea950698 fix: 修改巡查等 panyuyi 2024-03-06 20:20:58 +0800
  • 9850c96168 fix: 调整水利工程表单样式 chenhaojie 2024-03-06 18:16:28 +0800
  • 4e7c17ee17 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-06 17:44:45 +0800
  • 84e40dc748 feat: 增加智能监管-水利工程运行场景配置 chenhaojie 2024-03-06 17:43:59 +0800
  • 986f4f7ff4 标准化建设 xzt 2024-03-06 16:32:33 +0800
  • 526e6b4640 Merge branch 'release-sy-v1.0.0' into 'dev' 潘裕艺 2024-03-06 07:53:51 +0000
  • cb70e763c9 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-06 15:52:41 +0800
  • 89c1ba660a fix: 修改巡查 panyuyi 2024-03-06 15:52:31 +0800
  • 2c59603d90 fix: 调整智能监管的目录结构 chenhaojie 2024-03-06 15:29:36 +0800
  • 75a5d84d3e 标准化建设 xzt 2024-03-06 13:52:42 +0800
  • be6a862f65 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-06 13:44:22 +0800
  • 99a4c34a1f feat: 新增智能监管模块分类 chenhaojie 2024-03-06 13:43:57 +0800