Commit Graph

819 Commits

Author SHA1 Message Date
dong
31682d9f28 添加路由拦截 2023-09-14 14:26:08 +08:00
dong
1f32be8ce1 登录和注册界面调整 2023-09-14 13:54:48 +08:00
joylink_zhaoerwei
0686831059 微调 2023-09-14 13:38:25 +08:00
joylink_zhaoerwei
a1c73423f2 报警列表增加查询 2023-09-14 10:56:08 +08:00
joylink_zhaoerwei
238edf7869 音乐替换-范围管理和决策信息管理优化添加查询条件 2023-09-14 10:32:22 +08:00
dong
65b70debed 添加报警统计 2023-09-13 16:28:41 +08:00
joylink_zhaoerwei
7d18f8dca7 报警界面和ATS界面分离+跳转逻辑修改 2023-09-12 13:12:49 +08:00
dong
b615906e8c 路由调整 2023-09-12 10:22:26 +08:00
dong
d965af29d9 路由调整 2023-09-12 10:11:10 +08:00
dong
7229abfc62 logo调整 2023-09-11 18:01:08 +08:00
dong
b54e3a77fc logo图片调整 2023-09-11 17:49:25 +08:00
dong
c153582c3a 代码调整 2023-09-11 17:19:41 +08:00
dong
6a80bd0473 更换logo图片 2023-09-11 16:54:34 +08:00
Yuan
30f645bf0a Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-09-05 16:30:47 +08:00
Yuan
67c8eb8dfb bugfix 2023-09-05 16:30:41 +08:00
joylink_zhaoerwei
f2e16f8312 隐藏状态属性--抽屉 2023-09-05 16:15:00 +08:00
dong
dba7d34f1a 添加socket订阅 2023-09-05 10:57:30 +08:00
Yuan
c0ebe15789 rangeConfigApp 2023-09-04 10:32:39 +08:00
Yuan
8f27d88af4 lineApp 2023-09-01 18:01:01 +08:00
Yuan
1ec8e86ee8 框架同步 2023-09-01 17:15:33 +08:00
Yuan
7f292426c8 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-09-01 17:14:13 +08:00
Yuan
bad9c90983 lineNetApp 2023-09-01 17:14:08 +08:00
fan
f8e6f60e6f Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-09-01 16:34:54 +08:00
fan
cc077e3f21 框架代码同步 2023-09-01 16:34:46 +08:00
Yuan
f63ec5b12c Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-09-01 14:31:45 +08:00
Yuan
eb07afb452 lineApp 2023-09-01 14:30:45 +08:00
joylink_zhaoerwei
dee86e132f 隐藏滚动条 2023-09-01 13:55:18 +08:00
joylink_zhaoerwei
32cfc5f329 图形绘制的引入修改 2023-09-01 10:02:58 +08:00
joylink_zhaoerwei
a2c0bceb2d 绘制调整 2023-09-01 09:49:16 +08:00
joylink_zhaoerwei
73379f4bd3 同步框架代码 2023-08-31 17:46:38 +08:00
Yuan
d96778aa7a graphics框架更新 2023-08-31 15:58:31 +08:00
Yuan
f980c4f557 graphics框架更新 2023-08-31 15:58:15 +08:00
dong
97fa9307b7 代码调整 2023-08-30 17:52:59 +08:00
dong
c0d55ccee6 报警故障阈值配置新增项 2023-08-30 17:43:59 +08:00
joylink_zhaoerwei
be5408aedc 故障音乐map调整 2023-08-29 15:36:13 +08:00
joylink_zhaoerwei
ed3eb1ea9a 增加故障提示音 2023-08-29 13:04:16 +08:00
joylink_zhaoerwei
0f83f9e004 微调 2023-08-28 16:58:15 +08:00
joylink_zhaoerwei
ae23f7de71 微调 2023-08-28 15:37:14 +08:00
joylink_zhaoerwei
e35637524d 模拟故障增加故障设备 2023-08-28 15:22:03 +08:00
joylink_zhaoerwei
041052113a 决策信息故障选择后指定范围配置 2023-08-28 10:32:43 +08:00
Yuan
e402fc8f6a 删除无用的import 2023-08-28 10:11:02 +08:00
joylink_zhaoerwei
debdde142e 增加全线蓝显 2023-08-28 09:48:11 +08:00
Yuan
0ab592a01d 范围配置app销毁 2023-08-25 18:18:17 +08:00
Yuan
6f2c573411 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-25 17:28:50 +08:00
Yuan
b5795f19e0 范围管理拆分App 2023-08-25 17:27:25 +08:00
dong
7d6e9c6161 代码调整 2023-08-25 14:50:11 +08:00
joylink_zhaoerwei
1535755414 临时用 2023-08-25 13:11:46 +08:00
joylink_zhaoerwei
da829d4d54 新建提交后表单不校验 2023-08-25 09:31:55 +08:00
joylink_zhaoerwei
e388069ff1 微调 2023-08-25 08:59:18 +08:00
joylink_zhaoerwei
3fbc2f20f0 bug修复 2023-08-24 18:24:49 +08:00
tiger_zhou
6df6aa6b3a 告警参数变更 2023-08-24 17:49:40 +08:00
joylink_zhaoerwei
030bea1293 protobuf同步 2023-08-24 16:53:06 +08:00
joylink_zhaoerwei
4e72128bbd 增加字段 2023-08-24 16:14:21 +08:00
joylink_zhaoerwei
13e7d78f1b 增加故障类型 2023-08-24 15:37:37 +08:00
dong
1b0582979f 代码调整 2023-08-24 14:00:52 +08:00
dong
31c520359c 列车找不到所在设备时删除列车 2023-08-24 13:59:10 +08:00
dong
cc45d794e9 代码调整 2023-08-24 13:29:24 +08:00
dong
4915d0c9ce 代码调整 2023-08-24 13:14:49 +08:00
dong
264d1a696c 报警故障阈值配置调整 2023-08-24 13:11:59 +08:00
joylink_zhaoerwei
057554d224 决策信息隐藏时间 2023-08-24 10:06:01 +08:00
joylink_zhaoerwei
007e340ae2 微调 2023-08-23 18:04:27 +08:00
joylink_zhaoerwei
283e576442 微调 2023-08-23 17:16:40 +08:00
joylink_zhaoerwei
91c6290513 列表高度自适应 2023-08-23 17:07:18 +08:00
joylink_zhaoerwei
9901c2334f 类型修改,去any 2023-08-23 16:54:15 +08:00
joylink_zhaoerwei
e46997271a 增加删除选择的图形 2023-08-23 16:25:49 +08:00
joylink_zhaoerwei
3036016928 范围配置和决策信息修改 2023-08-23 15:56:50 +08:00
Yuan
c3d4c7cc12 范围列表调整 2023-08-23 15:45:43 +08:00
Yuan
1ce48a45d0 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-23 14:52:30 +08:00
Yuan
49d5f6c0ac 删除提示 2023-08-23 14:52:27 +08:00
joylink_zhaoerwei
fa213a9225 范围配置字段修改 2023-08-23 14:45:03 +08:00
joylink_zhaoerwei
3ab1ee41a1 编辑按钮bug修复 2023-08-23 13:26:53 +08:00
joylink_zhaoerwei
104656affb 框选方式修改 2023-08-23 11:23:45 +08:00
Yuan
b2b8eb6c4f 范围删除 2023-08-23 10:47:05 +08:00
joylink_zhaoerwei
ad7a6db096 微调 2023-08-23 09:56:47 +08:00
Yuan
f81690be14 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-23 09:50:38 +08:00
Yuan
4293d4e8e0 列表数据去除data 2023-08-23 09:50:35 +08:00
joylink_zhaoerwei
06f453a686 范围配置编辑 2023-08-23 09:44:23 +08:00
Yuan
c881d48145 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-23 09:18:17 +08:00
Yuan
5d5527f692 范围列表 2023-08-23 09:17:50 +08:00
dong
2af63042f5 添加报警故障阈值配置 2023-08-22 16:47:12 +08:00
joylink_zhaoerwei
e388576562 编辑范围配置 2023-08-22 15:45:35 +08:00
Yuan
6768738344 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-22 15:22:54 +08:00
Yuan
513debd156 范围列表也 2023-08-22 15:22:26 +08:00
joylink_zhaoerwei
70c6cf571a 微调 2023-08-22 15:21:00 +08:00
joylink_zhaoerwei
efd57e13bd 微调 2023-08-22 14:28:59 +08:00
Yuan
b678b64db8 范围配置入口调整 2023-08-22 13:51:55 +08:00
joylink_zhaoerwei
456a8f9aa8 微调 2023-08-22 13:49:45 +08:00
Yuan
5bb9b1dea2 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-22 13:41:50 +08:00
Yuan
94a4fb6726 范围配置入口 2023-08-22 13:41:46 +08:00
joylink_zhaoerwei
4b53e3c714 区域配置 2023-08-22 13:21:22 +08:00
Yuan
c31551eaf7 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-22 10:27:41 +08:00
Yuan
6925e761dc 范围配置列表 2023-08-22 10:27:35 +08:00
joylink_zhaoerwei
9ceb537427 微调 2023-08-21 17:58:46 +08:00
joylink_zhaoerwei
268c28c6ac 设备范围配置 2023-08-21 17:25:27 +08:00
Yuan
3ea2ce9dae 消息同步 2023-08-21 10:13:58 +08:00
joylink_zhaoerwei
a0fbbf9f69 关闭多个打开的弹框 2023-08-18 13:38:30 +08:00
Yuan
519db50c87 代码同步 2023-08-18 13:14:14 +08:00
Yuan
a0eb49b73b Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-18 13:12:53 +08:00
Yuan
96749d8811 道岔和区段关系显示调整 2023-08-18 13:12:50 +08:00
joylink_zhaoerwei
9ea0fdd522 微调 2023-08-18 10:35:54 +08:00
dong
11bc0ba046 代码调整 2023-08-18 10:24:30 +08:00
dong
68a96b32c2 代码调整 2023-08-18 10:06:43 +08:00
joylink_zhaoerwei
bba26fcdf1 测试音乐路径 2023-08-18 09:59:57 +08:00
joylink_zhaoerwei
4db27e9e3c 音乐路径修改 2023-08-18 09:54:27 +08:00
joylink_zhaoerwei
ebbdff239d 微调 2023-08-18 09:01:40 +08:00
joylink_zhaoerwei
0c8163e7b5 光带修改 2023-08-17 18:19:05 +08:00
dong
b35b8892f6 代码调整 2023-08-17 18:04:54 +08:00
joylink_zhaoerwei
6e76faf9f7 微调 2023-08-17 17:06:43 +08:00
joylink_zhaoerwei
795d6a2199 字段调整--红光带变光带 2023-08-17 16:41:40 +08:00
joylink_zhaoerwei
01b8113a73 动态播放音乐及弹框 2023-08-17 15:27:48 +08:00
joylink_zhaoerwei
52155b6939 增加模拟故障种类 2023-08-17 11:20:10 +08:00
joylink_zhaoerwei
7d68bcb16a 报警信息确认处理 2023-08-17 11:06:34 +08:00
dong
b0b9dc11b8 添加未处理报警角标 2023-08-17 11:02:40 +08:00
Yuan
72fdc9997c Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-17 10:10:40 +08:00
dong
54999a9339 路由调整 2023-08-17 10:09:39 +08:00
Yuan
a3f49f67ff Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-17 09:40:07 +08:00
Yuan
9877c7db05 类型 2023-08-17 09:40:04 +08:00
joylink_zhaoerwei
d3e12f5846 微调 2023-08-16 18:00:38 +08:00
joylink_zhaoerwei
b38872c13b 调到具体故障设备 2023-08-16 17:44:16 +08:00
joylink_zhaoerwei
8aefbb12e5 代码备用--报警弹框和列表 2023-08-16 16:18:15 +08:00
Yuan
9f74f659ad 区段增加转换轨字段 2023-08-16 16:12:20 +08:00
Yuan
38e85d3dfd Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-16 15:52:47 +08:00
Yuan
87d3fee04e 删除注释 2023-08-16 15:52:43 +08:00
fan
bbee8cc5e1 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-08-16 14:02:32 +08:00
fan
15c3ae9a16 蓝显调整 2023-08-16 14:02:23 +08:00
joylink_zhaoerwei
5082d847bf 微调 2023-08-14 13:22:22 +08:00
joylink_zhaoerwei
cde1cc2334 车站状态数据 2023-08-14 10:55:42 +08:00
fan
ca7d76b979 同步框架代码 2023-08-11 14:41:33 +08:00
fan
32a2c702b5 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-08-10 11:12:06 +08:00
fan
b2521653c8 列车显示调整 2023-08-10 11:11:58 +08:00
Yuan
8b2a40ef92 道岔失表不显示红框 2023-08-10 10:17:23 +08:00
fan
4f115f4f58 信号机碰撞检测调整 2023-08-08 14:47:01 +08:00
fan
4d82d8d4f2 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-08-07 10:32:52 +08:00
fan
fbf4eb56d3 信号机多次创建问题调整 2023-08-07 10:32:46 +08:00
joylink_zhaoerwei
e22b1f4d1f 车次窗去掉碰撞检测 2023-08-07 10:15:35 +08:00
joylink_zhaoerwei
2dd92f7b0c 车次窗、矩形的碰撞检测修改 2023-08-07 09:46:33 +08:00
fan
d684043743 列车计算车次窗调整 2023-08-04 15:55:15 +08:00
Yuan
5fb9bb0e3c 道岔物理区段构建与子道岔的关系 2023-08-04 15:49:34 +08:00
joylink_zhaoerwei
fa4b5e2b7d 车次窗关联道岔物理区段 2023-08-04 15:18:14 +08:00
fan
6983c0feda 同步框架代码 2023-08-04 13:47:22 +08:00
fan
0a2ecc0bb3 线网销毁 2023-08-03 17:58:07 +08:00
fan
49e810e4ed baseUrl调整 2023-08-03 14:22:04 +08:00
fan
9a303f7c2c Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-08-03 14:21:25 +08:00
fan
fc770634ee ncc问题调整 2023-08-03 14:21:18 +08:00
Yuan
f114be9a98 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-03 10:11:30 +08:00
Yuan
f0ee9b3080 道岔物理区段禁用右键端点编辑菜单 2023-08-03 10:11:26 +08:00
fan
a737745fd2 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-08-03 10:06:58 +08:00
fan
b6b1630a91 西安ncc状态同步调整 2023-08-03 10:06:52 +08:00
Yuan
4656f3147d 物理区段目的地码显示 2023-08-03 09:26:45 +08:00
fan
d14f0a0e8b Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-08-02 16:13:57 +08:00
fan
5a6848b005 框架代码同步 2023-08-02 16:13:51 +08:00
joylink_zhaoerwei
8d78f32e72 微调 2023-08-02 14:26:48 +08:00
Yuan
988eafd521 道岔限速显示修改 2023-08-02 09:25:48 +08:00
Yuan
9d9806beac 道岔限速显示调整 2023-08-01 17:30:14 +08:00
Yuan
8e7120b5dd Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-01 16:35:57 +08:00
Yuan
059c905951 道岔区段限速 2023-08-01 16:35:53 +08:00
fan
c4ed2bde5d Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-08-01 16:27:04 +08:00
fan
bfd937da72 运行线调整 2023-08-01 16:26:57 +08:00
joylink_zhaoerwei
870169a870 线网画布微调 2023-08-01 14:03:23 +08:00
joylink_zhaoerwei
6a5bed588f 线路图监控画布调整 2023-08-01 13:19:56 +08:00
joylink_zhaoerwei
5085de4d6d 类型报错修改 2023-08-01 10:15:57 +08:00
joylink_zhaoerwei
b130ee33d7 微调 2023-08-01 09:33:05 +08:00
Yuan
e7c755348b 框架同步 2023-07-31 17:04:18 +08:00
Yuan
d9af13bb46 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-31 16:46:00 +08:00
Yuan
b6ec60b242 道岔切除 2023-07-31 16:45:55 +08:00
joylink_zhaoerwei
dbde11026c 站台车站状态调整方式更改 2023-07-31 16:37:45 +08:00
Yuan
9490392177 区段限速 2023-07-31 16:33:06 +08:00
Yuan
53f6d882ab 区段和道岔故障锁闭显示白光带 2023-07-31 14:35:23 +08:00
Yuan
3447055aa5 橙光带对应actInvalid 2023-07-31 14:03:02 +08:00
Yuan
14bd3b7b65 道岔颜色根据正反位显示 && 道岔和区段增加overlap状态显示 2023-07-31 13:49:38 +08:00
Yuan
86cc8754fb 白屏暂时修复 2023-07-31 11:30:05 +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