Commit Graph

  • fe9b3a0038 Merge pull request 'fix : 修复bug' (#326) from dengjie into dev odjbin 2024-03-14 09:49:33 +00:00
  • 3062cf263d fix : 修复bug odjbin 2024-03-14 17:49:16 +08:00
  • e020ae5b66 Merge pull request 'master' (#325) from master into dev clay 2024-03-14 06:51:54 +00:00
  • bd2a105d98 Merge pull request 'fix : 风机控制状态' (#324) from clay into master clay 2024-03-14 06:51:33 +00:00
  • 1e5ce6ede2 fix : 风机控制状态 clay 2024-03-14 14:51:02 +08:00
  • bb15068777 Merge pull request 'fix : 修复日期选择动态5天范围' (#323) from dengjie into dev odjbin 2024-03-13 13:28:14 +00:00
  • e1d0f45280 fix : 修复日期选择动态5天范围 odjbin 2024-03-13 21:27:56 +08:00
  • 2643874276 Merge pull request 'liaojie' (#322) from liaojie into dev liaojie 2024-03-13 12:51:06 +00:00
  • 340189408f 更新1.浏览器不点击2.删除风压3.浏览器模型只能左右移动4.鼠标hover显示设备名称 Hcat 2024-03-13 20:50:20 +08:00
  • a8bd594f1d 更新1.浏览器不点击2.删除风压3.浏览器模型只能左右移动4.鼠标hover显示设备名称 Hcat 2024-03-13 20:40:13 +08:00
  • 9f29b78049 更新1.浏览器不点击2.删除风压3.浏览器模型只能左右移动4.鼠标hover显示设备名称 Hcat 2024-03-13 19:58:51 +08:00
  • 8253a42847 Merge pull request 'fix : 修复图表全屏bug' (#320) from dengjie into dev odjbin 2024-03-13 09:56:06 +00:00
  • ccafd4e438 fix : 修复图表全屏bug odjbin 2024-03-13 17:55:43 +08:00
  • 32bcde86a4 Merge pull request 'feat : 新增图表多日期选择功能' (#319) from dengjie into dev odjbin 2024-03-13 09:20:51 +00:00
  • d915fd378c feat : 新增图表多日期选择功能 odjbin 2024-03-13 17:20:20 +08:00
  • 21601c251a Merge pull request 'dev' (#318) from dev into master odjbin 2024-03-13 03:21:55 +00:00
  • 8fd3022d54 Merge pull request 'feat : 新增历史数据导出csv文件' (#317) from dengjie into dev odjbin 2024-03-13 03:21:40 +00:00
  • 499de290ab feat : 新增历史数据导出csv文件 odjbin 2024-03-13 11:21:18 +08:00
  • 7df3f5251f Merge pull request 'feat : 传感器区域新增显示范围' (#316) from dengjie into dev odjbin 2024-03-12 14:06:16 +00:00
  • 6d8a048364 feat : 传感器区域新增显示范围 odjbin 2024-03-12 22:05:53 +08:00
  • cb3828ec19 Merge pull request 'feat : 所有图表新增全屏功能' (#315) from dengjie into dev odjbin 2024-03-12 13:13:38 +00:00
  • c28d46043a feat : 所有图表新增全屏功能 odjbin 2024-03-12 21:13:01 +08:00
  • df5cde4ee7 Merge pull request 'fix : 修复设备修改判空提示' (#314) from dengjie into dev odjbin 2024-03-12 07:49:03 +00:00
  • 69bb871934 fix : 修复设备修改判空提示 odjbin 2024-03-12 15:48:35 +08:00
  • 41bf8ec484 Merge pull request 'fix : 修复echarts全屏bug' (#313) from dengjie into dev odjbin 2024-03-12 03:31:49 +00:00
  • ef6b8c79dc fix : 修复echarts全屏bug odjbin 2024-03-12 11:31:01 +08:00
  • d06a49d6d2 Merge pull request 'fix : 修复细节' (#312) from dengjie into dev odjbin 2024-03-11 15:57:15 +00:00
  • 36b7442046 fix : 修复细节 odjbin 2024-03-11 23:56:51 +08:00
  • dcd33016f7 Merge pull request 'feat : 新增echarts全屏模式及设备新增最大/小范围框' (#311) from dengjie into dev odjbin 2024-03-11 15:48:28 +00:00
  • ab678cb27f feat : 新增echarts全屏模式及设备新增最大/小范围框 odjbin 2024-03-11 23:47:49 +08:00
  • 8b073bc98f Merge pull request 'fix : 修复数据loading加载' (#310) from dengjie into dev odjbin 2024-03-05 15:49:18 +00:00
  • d16779bd3f fix : 修复数据loading加载 odjbin 2024-03-05 23:49:02 +08:00
  • a1d352a9a2 Merge pull request 'dev' (#309) from dev into master odjbin 2024-03-05 15:00:15 +00:00
  • 90c6d410c0 Merge pull request 'dengjie' (#308) from dengjie into dev odjbin 2024-03-05 14:59:56 +00:00
  • 3b42035892 fix : 修复数据loading加载 odjbin 2024-03-05 22:59:09 +08:00
  • 4ec7558a31 Merge remote-tracking branch 'origin/dev' into dev odjbin 2024-03-05 21:48:22 +08:00
  • f0a2c1b52e Merge pull request 'fix : 修复数据loading加载' (#307) from dengjie into dev odjbin 2024-03-05 13:48:21 +00:00
  • 204d687336 fix : 修复数据loading加载 odjbin 2024-03-05 21:47:53 +08:00
  • dcfd4dbd60 Merge pull request 'fix : 风压细节优化' (#306) from dengjie into dev odjbin 2024-03-04 14:48:29 +00:00
  • c242691a65 fix : 风压细节优化 odjbin 2024-03-04 22:48:09 +08:00
  • b417c186e8 Merge pull request 'fix : 细节优化' (#305) from dengjie into dev odjbin 2024-03-04 12:48:56 +00:00
  • 8f5812335a fix : 细节优化 odjbin 2024-03-04 20:48:03 +08:00
  • b9138ee462 Merge pull request 'dev' (#304) from dev into master odjbin 2024-03-04 12:30:25 +00:00
  • 62a71e5806 Merge pull request 'fix : 细节优化' (#303) from dengjie into dev odjbin 2024-03-04 12:29:44 +00:00
  • 02d39e74fa fix : 细节优化 odjbin 2024-03-04 20:28:59 +08:00
  • 2488d73a54 Merge pull request 'fix : 细节优化' (#302) from dengjie into dev odjbin 2024-03-04 09:57:18 +00:00
  • 534c492562 fix : 细节优化 odjbin 2024-03-04 17:56:50 +08:00
  • bdd4fd02f4 Merge pull request 'fix : 细节优化' (#301) from dengjie into dev odjbin 2024-03-04 09:49:39 +00:00
  • 07739421e8 fix : 细节优化 odjbin 2024-03-04 17:29:06 +08:00
  • d0cd0a19ea Merge pull request 'fix : 细节优化' (#300) from dengjie into dev odjbin 2024-03-04 09:08:14 +00:00
  • c64c0fc8e4 fix : 细节优化 odjbin 2024-03-04 17:07:45 +08:00
  • da030d3f8e Merge pull request 'fix : 报警信息框loading' (#299) from dengjie into dev odjbin 2024-03-04 08:31:41 +00:00
  • 3130942037 fix : 报警信息框loading odjbin 2024-03-04 16:31:00 +08:00
  • 11b11a32e7 Merge pull request 'fix : 样式修改' (#298) from dengjie into dev odjbin 2024-03-04 07:48:24 +00:00
  • 0bae6752ac fix : 样式修改 odjbin 2024-03-04 15:47:47 +08:00
  • 271c102314 Merge pull request 'fix : 不同浏览器匹配样式修改' (#297) from dengjie into dev odjbin 2024-03-04 07:18:38 +00:00
  • 89161ea797 fix : 不同浏览器匹配样式修改 odjbin 2024-03-04 15:18:07 +08:00
  • bcccbcb0ad Merge pull request 'fix : 修复时间频率单位' (#296) from dengjie into dev odjbin 2024-03-04 03:22:42 +00:00
  • 4fd53e8875 fix : 修复时间频率单位 odjbin 2024-03-04 11:22:05 +08:00
  • 8d0232e02a Merge pull request 'fix : select框样式修改' (#295) from dengjie into dev odjbin 2024-03-03 16:30:03 +00:00
  • 3bbfc5f34b fix : select框样式修改 odjbin 2024-03-04 00:25:59 +08:00
  • 9dd32c349f Merge pull request 'fix : select框样式修改' (#294) from dengjie into dev odjbin 2024-03-03 16:20:10 +00:00
  • 44c7766bce fix : select框样式修改 odjbin 2024-03-04 00:19:48 +08:00
  • 0c787d04e6 Merge pull request 'fix : select框样式修改' (#293) from dengjie into dev odjbin 2024-03-03 16:10:50 +00:00
  • 272d859e28 fix : select框样式修改 odjbin 2024-03-04 00:10:27 +08:00
  • fe93dc3abb Merge pull request 'feat : 新增报警信息功能' (#292) from dengjie into dev odjbin 2024-03-03 15:34:39 +00:00
  • 5a6f7a4535 feat : 新增报警信息功能 odjbin 2024-03-03 23:34:18 +08:00
  • 3110fa8a51 Merge pull request 'feat : 新增报警信息功能' (#291) from dengjie into dev odjbin 2024-03-03 15:07:33 +00:00
  • b827f2ff2b feat : 新增报警信息功能 odjbin 2024-03-03 23:07:03 +08:00
  • 554b67d61f Merge pull request '廖杰:完成风机功能+预览模式路牌修复' (#290) from liaojie into dev liaojie 2024-03-02 14:45:53 +00:00
  • eef5cf50d8 廖杰:完成风机功能+预览模式路牌修复 Hcat 2024-03-02 22:44:11 +08:00
  • 6c5de35283 Merge pull request '廖杰:修复编辑模式下删除时设备不存在' (#289) from liaojie into dev liaojie 2024-03-01 14:42:18 +00:00
  • 8a9c613733 Merge branch 'dev' into liaojie liaojie 2024-03-01 14:41:37 +00:00
  • 5b1c692339 廖杰:修复编辑模式下删除时设备不存在 Hcat 2024-03-01 22:40:56 +08:00
  • 226415ff34 Merge pull request '廖杰:修复预览模式的隧道切换bug和编辑模式的添加bug' (#288) from liaojie into dev liaojie 2024-03-01 13:52:07 +00:00
  • fd47f10974 廖杰:修复预览模式的隧道切换bug和编辑模式的添加bug Hcat 2024-03-01 21:50:26 +08:00
  • 934b11a274 Merge pull request 'fix : 修改风机状态bug' (#287) from dengjie into dev odjbin 2024-03-01 08:26:01 +00:00
  • 7932db5002 fix : 修改风机状态bug odjbin 2024-03-01 16:25:38 +08:00
  • 67dab895f7 Merge pull request 'fix : 修改风机状态bug' (#286) from dengjie into dev odjbin 2024-03-01 08:05:17 +00:00
  • 8e81ca403a fix : 修改风机状态bug odjbin 2024-03-01 16:04:42 +08:00
  • 47cfa89257 Merge pull request 'feat : 隧道管理新增/修改框添加新字段输入框' (#285) from dengjie into dev odjbin 2024-02-29 15:26:55 +00:00
  • b2a31c28de feat : 隧道管理新增/修改框添加新字段输入框 odjbin 2024-02-29 23:26:32 +08:00
  • 182182de1c Merge pull request '廖杰:更新了隧道简称,和昨天的编辑模式bug' (#284) from liaojie into dev liaojie 2024-02-29 14:42:05 +00:00
  • 556a865abd Merge pull request 'feat : 站点管理新增上传图纸按钮,隧道管理新增图纸导航模式' (#283) from dengjie into dev odjbin 2024-02-29 13:58:54 +00:00
  • d11401fd12 feat : 站点管理新增上传图纸按钮,隧道管理新增图纸导航模式 odjbin 2024-02-29 21:58:30 +08:00
  • 29672ce74a 廖杰:更新了隧道简称,和昨天的编辑模式bug Hcat 2024-02-29 21:58:06 +08:00
  • 47d23d37d7 Merge pull request 'feat : 隧道管理新增施工长度输入框' (#282) from dengjie into dev odjbin 2024-02-28 15:52:24 +00:00
  • 76bdc87c50 feat : 隧道管理新增施工长度输入框 odjbin 2024-02-28 23:52:05 +08:00
  • 5b8b6cbf27 Merge pull request 'feat : 对接用电量/省电量数据及新增用电量echarts图表模块' (#281) from dengjie into dev odjbin 2024-02-28 14:19:18 +00:00
  • 9afde77c00 feat : 对接用电量/省电量数据及新增用电量echarts图表模块 odjbin 2024-02-28 22:18:55 +08:00
  • 0fb3c3b827 Merge pull request 'liaojie' (#280) from liaojie into dev liaojie 2024-02-28 13:29:43 +00:00
  • 3d706c10ca 廖杰:预览模式当风机离线(不在online下)会显示红色 Hcat 2024-02-28 21:27:36 +08:00
  • 70364c8e10 廖杰:预览模式当风机离线(不在online下)会显示红色 Hcat 2024-02-28 21:23:57 +08:00
  • 5e24845abb 解决冲突 Hcat 2024-02-28 19:35:33 +08:00
  • 197914da01 Merge pull request 'fix : 修改bug' (#279) from dengjie into dev odjbin 2024-02-28 10:22:26 +00:00
  • a8b5e2c26f fix : 修改bug odjbin 2024-02-28 18:22:07 +08:00
  • 7a75b40897 Merge pull request 'dev' (#278) from dev into master odjbin 2024-02-28 10:09:38 +00:00
  • 17a95a9294 Merge pull request 'feat : 新增echarts中指定日期展示及细节优化' (#277) from dengjie into dev odjbin 2024-02-28 10:09:14 +00:00
  • ea4f72780f feat : 新增echarts中指定日期展示及细节优化 odjbin 2024-02-28 18:08:44 +08:00
  • 1ed195b4b5 完成一半 Hcat 2024-02-28 00:35:54 +08:00