Commit Graph

532 Commits

Author SHA1 Message Date
fan
7158f6a3bf Revert "订阅调整"
This reverts commit 0bbe65b042.
2023-07-31 11:19:30 +08:00
fan
c3ec658ac0 Revert "同步代码"
This reverts commit b189c385ae.
2023-07-31 11:19:24 +08:00
fan
6ddf2d8937 Revert "测试发布"
This reverts commit 4a36daf843.
2023-07-31 11:19:19 +08:00
fan
a444504225 Revert "测试1"
This reverts commit eafb1b8723.
2023-07-31 11:19:14 +08:00
fan
6242bc5ba6 Revert "恢复测试内容"
This reverts commit f09fe81a91.
2023-07-31 11:19:10 +08:00
fan
f09fe81a91 恢复测试内容 2023-07-31 10:48:59 +08:00
fan
eafb1b8723 测试1 2023-07-31 10:45:34 +08:00
fan
71645514e5 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-31 10:41:58 +08:00
fan
4a36daf843 测试发布 2023-07-31 10:41:50 +08:00
Yuan
b189c385ae 同步代码 2023-07-31 10:05:26 +08:00
fan
6c9ae09ae8 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-28 16:14:36 +08:00
fan
0bbe65b042 订阅调整 2023-07-28 16:14:30 +08:00
dong
6d780d471f 代码调整 2023-07-28 11:03:16 +08:00
fan
a34b415aca Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-27 17:49:28 +08:00
fan
d67ac6aefd 关闭后重置notify 2023-07-27 17:49:19 +08:00
Yuan
8d1f666022 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-27 16:38:01 +08:00
Yuan
71a311142c 状态优先级调整 2023-07-27 16:36:06 +08:00
joylink_zhaoerwei
cc4c6b0d65 报警跳页面 2023-07-27 15:22:39 +08:00
Yuan
791857c1ba Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-27 15:05:48 +08:00
Yuan
7a4d2fe9a0 区段状态 2023-07-27 15:05:43 +08:00
joylink_zhaoerwei
ca472d7dad 删除故障清除和用户管理代码 2023-07-27 14:20:19 +08:00
fan
26c56cbb62 删除测试内容 2023-07-27 14:07:38 +08:00
fan
50a55243dc 环境变量测试1 2023-07-27 14:02:21 +08:00
fan
f0afa94099 环境变量测试 2023-07-27 14:00:18 +08:00
fan
15dce2e5b2 删除测试 2023-07-27 13:23:01 +08:00
fan
0df54816d1 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-27 13:17:37 +08:00
fan
fa29a2c741 测试环境变量 2023-07-27 13:17:15 +08:00
Yuan
cd6318d01e 道岔区段颜色 2023-07-27 10:15:21 +08:00
Yuan
9cdf1fb04b Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-26 17:07:25 +08:00
Yuan
732b3fe34d 道岔单封边框 2023-07-26 17:06:28 +08:00
joylink_zhaoerwei
af01b13ec0 微调 2023-07-26 15:14:06 +08:00
joylink_zhaoerwei
3c856dc22b 决策信息枚举增加 2023-07-26 15:07:25 +08:00
joylink_zhaoerwei
5afc6b59c2 历史报警列表 2023-07-26 14:24:25 +08:00
Yuan
fd231069ad Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-26 13:08:30 +08:00
Yuan
fdadeb7237 道岔状态显示 2023-07-26 13:07:14 +08:00
fan
264a8a39fb Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-26 11:23:08 +08:00
fan
4c938d58b9 socket断连提示位置调整 2023-07-26 11:23:03 +08:00
joylink_zhaoerwei
cd9f8c6d53 微调 2023-07-25 17:47:39 +08:00
joylink_zhaoerwei
fdc69703a6 微调 2023-07-25 17:13:46 +08:00
joylink_zhaoerwei
5439e11ae8 页面操作栏 2023-07-25 16:51:43 +08:00
fan
c8fd7b96ef Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-25 16:25:06 +08:00
fan
6521def1d1 添加通信断开链接提示 2023-07-25 16:25:01 +08:00
dong
c7f5bf8871 添加登出 2023-07-25 15:50:02 +08:00
fan
9bc7f9870d 线路监听调整 2023-07-25 15:35:43 +08:00
joylink_zhaoerwei
f4c13ea051 辅助决策字段增加 2023-07-25 10:15:02 +08:00
joylink_zhaoerwei
310c1ce638 微调 2023-07-25 09:56:11 +08:00
joylink_zhaoerwei
9dbb9e38bf 报警信息调整 2023-07-24 17:46:28 +08:00
joylink_zhaoerwei
eb3f8bde0c 车的名字字段修改 2023-07-24 16:19:05 +08:00
dong
3548f75666 分隔符调整 2023-07-24 15:44:56 +08:00
joylink_zhaoerwei
a69a0ff463 决策信息tip提示,页面交互监听 2023-07-24 10:38:41 +08:00