Commit Graph

Select branches

Hide Pull Requests

features/warning

master

testing-redux

zhp

zjl

#1

#10

#11

#12

#13

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• cebe989fe4 Merge pull request 'zjl' (#13) from zjl into features/warning features/warning juzi 2024-09-18 14:57:23 +0800
• 9b8e3734fa 1 zjl juzi 2024-09-18 14:56:01 +0800
• 904b9212b8 Merge branch 'features/warning' into zjl juzi 2024-09-18 13:21:45 +0800
• 1852bdc17f Merge pull request 'zhp' (#12) from zhp into features/warning zhp 2024-09-18 11:25:10 +0800
• e2f8d9860a Merge branch 'features/warning' into zhp zhp ‘937886381’ 2024-09-18 11:24:29 +0800
• 37c0c77078 修改 ‘937886381’ 2024-09-18 11:23:50 +0800
• 9382cb4cf5 Merge branch 'features/warning' into zjl juzi 2024-09-18 11:10:53 +0800
• 2325dc0373 Merge pull request '修改' (#11) from zhp into features/warning zhp 2024-09-18 10:59:38 +0800
• 196ad512af 修改 ‘937886381’ 2024-09-18 10:55:34 +0800
• fa03a0b329 Merge branch 'features/warning' into zjl juzi 2024-09-18 09:57:23 +0800
• 29f8e96a2a Merge pull request 'zhp' (#10) from zhp into features/warning zhp 2024-09-18 09:55:13 +0800
• aa86600a1a Merge branch 'features/warning' into zhp ‘937886381’ 2024-09-18 09:13:14 +0800
• 379de8fda0 修改 ‘937886381’ 2024-09-18 09:12:26 +0800
• fa5cae9a78 Merge branch 'features/warning' into zjl juzi 2024-09-18 08:32:31 +0800
• 50aada1223 装软件 juzi 2024-09-18 08:30:49 +0800
• 248fafdf2c Merge pull request 'zhp' (#9) from zhp into features/warning juzi 2024-09-15 13:14:52 +0800
• 9589fba7c2 Merge branch 'features/warning' into zhp ‘937886381’ 2024-09-14 17:10:30 +0800
• 0739f8cf00 修改 ‘937886381’ 2024-09-14 17:09:38 +0800
• e1f95bd009 Merge pull request 'zhp' (#8) from zhp into features/warning juzi 2024-09-14 13:21:58 +0800
• 6de0fe4753 Merge branch 'features/warning' into zhp ‘937886381’ 2024-09-14 13:19:13 +0800
• a8b5e57f38 修改 ‘937886381’ 2024-09-14 13:18:13 +0800
• a4985a5379 Merge pull request 'zhp' (#7) from zhp into features/warning juzi 2024-09-13 16:58:48 +0800
• f9dde6e159 Merge branch 'features/warning' into zhp ‘937886381’ 2024-09-13 16:53:19 +0800
• b27d70f0fc 修改 ‘937886381’ 2024-09-13 16:52:40 +0800
• fd34efc0b4 Merge pull request 'zhp' (#6) from zhp into features/warning juzi 2024-09-13 15:52:17 +0800
• 2d2d6d4c15 Merge branch 'features/warning' into zhp ‘937886381’ 2024-09-13 15:49:10 +0800
• 696d852cd2 修改 ‘937886381’ 2024-09-13 15:47:43 +0800
• 637f387f02 Merge pull request 'zhp' (#5) from zhp into features/warning juzi 2024-09-02 13:21:11 +0800
• 6a25d4e30d Merge branch 'features/warning' into zhp ‘937886381’ 2024-09-02 09:56:31 +0800
• 270ca5dce7 修改bug ‘937886381’ 2024-09-02 09:55:47 +0800
• fcb1549ee3 Merge pull request 'zhp' (#4) from zhp into features/warning juzi 2024-08-30 19:10:44 +0800
• e4e9ba11c3 修改 ‘937886381’ 2024-08-30 17:32:15 +0800
• f702e950ac 修改 ‘937886381’ 2024-08-30 17:17:45 +0800
• d7cc3deeee Merge pull request '溶液速度视频' (#3) from zjl into features/warning juzi 2024-07-22 15:29:05 +0800
• c635243357 溶液速度视频 juzi 2024-07-22 15:26:04 +0800
• 1e64a4d0e2 Merge pull request '窑炉优化' (#2) from zjl into features/warning juzi 2024-07-19 16:33:43 +0800
• a15105a9b0 窑炉优化 juzi 2024-07-19 16:31:29 +0800
• bace9fa501 Merge pull request 'zjl' (#1) from zjl into features/warning juzi 2024-07-12 15:11:34 +0800
• c6cd097433 1优化 juzi 2024-07-12 14:52:07 +0800
• 4d7af62305 窑炉优化 juzi 2024-07-12 14:12:10 +0800
• 214e9fe892 底&顶ok juzi 2024-07-10 15:39:02 +0800
• 9968280724 7.9 juzi 2024-07-09 14:50:29 +0800
• 8b4322996e update 注释 lb 2024-04-29 13:28:08 +0800
• b325c3fc05 update 报警大小 lb 2024-04-28 13:55:59 +0800
• 28c9c1906e update 烟气处理 lb 2024-04-25 10:52:46 +0800
• 7ddae1b3a4 update videos lb 2024-04-25 10:01:25 +0800
• 61477cdd30 Merge branch 'features/warning' of http://git.picaiba.com/mt-fe-group/xuchang-new into features/warning lb 2024-04-25 09:44:40 +0800
• 6e5badf01a add video lb 2024-04-25 09:44:36 +0800
• 311cdfc5f7 1' gtz 2024-04-24 17:02:20 +0800
• bc8b68e449 1 lb 2024-04-24 16:58:38 +0800
• 024f4bcf14 1 lb 2024-04-23 15:27:54 +0800
• 361aedd4ad done alarm lb 2024-04-23 15:26:55 +0800
• 60c6fdda79 1 lb 2024-04-23 11:24:31 +0800
• 15708c0eef update lb 2024-04-23 09:33:41 +0800
• 2996c061dc merge bugfix lb 2024-04-22 16:58:15 +0800
• 9894aeca50 update WarnAlert lb 2024-04-19 17:03:43 +0800
• 9f7652d9f3 update ts->js lb 2024-04-19 16:55:10 +0800
• e854b966dc add fake websocket server lb 2024-04-19 16:38:41 +0800
• dff017a5a2 update lb 2024-04-19 16:11:10 +0800
• e796a07e66 update Home Element Position lb 2024-04-16 10:28:14 +0800
• 43635ff398 add warn-alert lb 2024-04-15 15:57:37 +0800
• 19ea3287ae Merge branch 'bugfix#4.4' master lb 2024-04-15 13:51:16 +0800
• 4f6e4cbcf8 bugfix4.4 lb 2024-04-15 13:50:49 +0800
• c9ccc6ebcb fire and kiln inner lb 2024-01-26 17:25:24 +0800
• 4374260acd update lunbo lb 2024-01-26 17:19:39 +0800
• 6cf533e718 add 轮播功能 lb 2024-01-26 14:08:31 +0800
• b0e7a7ca34 update kiln inner lb 2024-01-26 11:11:26 +0800
• 0b48f68078 add refresher lb 2024-01-26 09:24:26 +0800
• c767a7fe2e update video playbackrate lb 2024-01-25 16:51:12 +0800
• 97409d61a9 1 lb 2024-01-25 16:36:12 +0800
• 0da9ba434d update video lb 2024-01-25 16:15:53 +0800
• 0bd1f8dcac update energy cost page lb 2024-01-25 15:42:25 +0800
• 6e10a5aacd update energy lb 2024-01-25 15:19:27 +0800
• 2fb3d05f8c 1 lb 2024-01-25 10:31:51 +0800
• b27a20f3cf update rightbar lb 2024-01-25 10:24:08 +0800
• be5fbe1c01 update lb 2024-01-25 09:10:00 +0800
• d6f9744ded 1 lb 2024-01-24 17:01:29 +0800
• 1ebda5cf6f 1 lb 2024-01-24 15:58:16 +0800
• b7b2ad2ee5 1 lb 2024-01-24 15:39:42 +0800
• 446234c2aa update lb 2024-01-24 14:41:24 +0800
• 909bd92ee6 update lb 2024-01-11 16:50:55 +0800
• b16ee86def bugfix 20240111 lb 2024-01-11 16:03:33 +0800
• c8d392ce51 update lb 2024-01-08 13:28:03 +0800
• d1212c8729 update lb 2024-01-04 17:03:00 +0800
• 9d3c877628 update lb 2024-01-04 16:58:43 +0800
• e1e73b341d update lb 2024-01-04 16:44:15 +0800
• ac772e2caf fix ui lb 2024-01-04 10:58:20 +0800
• 0b1d3aa4b3 fix ui lb 2024-01-03 17:00:31 +0800
• bee1aedda4 update lb 2024-01-03 15:21:43 +0800
• 678c1b86ed update lb 2024-01-03 15:09:59 +0800
• 0f56538c27 update websocket reconnect policy & fix some bugs lb 2024-01-03 15:07:43 +0800
• 6b838ce089 update 天然气历史 lb 2024-01-03 11:28:26 +0800
• e40e897882 update lb 2024-01-02 17:07:07 +0800
• 15d05c26d8 update energe layout lb 2024-01-02 17:00:35 +0800
• c9829d4f5a update faninfostretch lb 2024-01-02 16:11:37 +0800
• a32e6fb591 update lb 2024-01-02 14:33:21 +0800
• 4b043214ca update elec lb 2024-01-02 10:53:43 +0800
• 871efd2eb2 update 能耗 lb 2023-12-29 12:47:30 +0800
• 0cd25a6972 update right table lb 2023-12-29 12:33:25 +0800
• a73d61fad8 update lb 2023-12-29 11:06:07 +0800