Commit Graph

10964 Commits

Author SHA1 Message Date
joylink_cuiweidong
06b954eca0 接发车状态 辅助灯状态 区间灯状态 具体颜色前端判断 2022-04-29 11:34:09 +08:00
joylink_cuiweidong
20c5f0ebfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-28 14:46:20 +08:00
joylink_cuiweidong
59be3f8fcc 改方按钮 加参数pressDown 1按下、0弹起 2022-04-28 14:46:08 +08:00
fan
c14c484152 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-28 13:34:36 +08:00
fan
7c2cddd441 大铁线路调整26 关联信号机调整 2022-04-28 13:34:17 +08:00
joylink_cuiweidong
a7e9638d4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-28 11:24:51 +08:00
joylink_cuiweidong
55b435c805 代码调整 2022-04-28 11:24:11 +08:00
fan
7e8fdaf1a3 大铁线路调整25 2022-04-28 10:40:18 +08:00
fan
48fcadb40e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-28 10:36:03 +08:00
fan
af2ffa23f3 大铁线路调整24 指示灯关联联锁数据调整 2022-04-28 10:35:41 +08:00
joylink_cuiweidong
6a51b9e626 大铁 接发车状态 区间占用状态 辅助状态 代码调整 2022-04-27 17:51:28 +08:00
fan
89642964bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/datie_02/menus/menuButton.vue
2022-04-27 17:37:08 +08:00
fan
1c04fd0bd6 大铁线路调整23 2022-04-27 17:35:36 +08:00
joylink_cuiweidong
ce1d6527ed 代码调整 2022-04-27 16:57:03 +08:00
joylink_cuiweidong
6fb7296348 代码调整 2022-04-25 10:22:00 +08:00
fan
e65abe322a 大铁线路调整22 2022-04-24 17:40:55 +08:00
fan
0c57bdac50 大铁线路调整21 2022-04-24 17:06:21 +08:00
fan
9ed6c38a4e 大铁线路调整20 2022-04-24 15:20:12 +08:00
fan
b8a27f74aa 大铁线路调整19 2022-04-24 14:05:08 +08:00
fan
216166c572 大铁线路调整18 2022-04-24 14:03:48 +08:00
fan
279522f544 大铁线路调整17 precess调整 2022-04-24 13:17:57 +08:00
fan
6d5276d95f 大铁线路调整16 2022-04-24 11:26:49 +08:00
fan
e24b992ab9 大铁线路调整15 2022-04-24 11:14:44 +08:00
fan
a32a230ed8 大铁线路调整14 2022-04-24 11:04:04 +08:00
fan
cd326ea8f6 大铁线路调整13 - 修改接发车箭头大小 2022-04-24 09:18:18 +08:00
fan
3202fc1b40 大铁线路调整12 2022-04-22 19:13:44 +08:00
fan
e155975b43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-22 17:56:01 +08:00
fan
93a3deb20c 大铁线路调整11 2022-04-22 17:55:42 +08:00
joylink_cuiweidong
3772012be2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-22 17:23:27 +08:00
joylink_cuiweidong
cc08d0f51b 代码调整 2022-04-22 17:23:12 +08:00
fan
3e5ad8b05f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-22 16:34:55 +08:00
fan
3420059adf 大铁线路调整10 2022-04-22 16:34:34 +08:00
joylink_cuiweidong
6115eaa54e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-22 15:50:40 +08:00
joylink_cuiweidong
aad698880e 代码调整 2022-04-22 15:50:27 +08:00
fan
82aaeee2cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-22 15:34:18 +08:00
fan
daff80c19e 大铁线路调整9 2022-04-22 15:33:57 +08:00
joylink_cuiweidong
0d6be6e129 添加改方指令 2022-04-22 15:23:50 +08:00
joylink_cuiweidong
de4f4d2aa6 区段占用,辅助状态,接发车箭头 状态代码调整 2022-04-22 15:08:36 +08:00
fan
5e30c99d2c 大铁线路调整8 2022-04-22 14:40:31 +08:00
fan
140f6306ed 大铁线路调整7 2022-04-21 16:13:33 +08:00
fan
c5d60323e2 大铁线路调整6 联锁数据调整 2022-04-21 15:10:43 +08:00
fan
a90fbd6f67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-21 10:02:32 +08:00
fan
a045d2c776 大铁线路调整5 2022-04-21 10:02:13 +08:00
joylink_cuiweidong
e191d0354d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-19 19:18:38 +08:00
joylink_cuiweidong
a7f24b860b 代码调整 2022-04-19 19:18:31 +08:00
fan
c0bbf35455 大铁线路调整4 2022-04-19 17:55:27 +08:00
fan
e07e06a3bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-19 16:14:41 +08:00
fan
0099c51a9d 大铁线路调整3 2022-04-19 16:14:17 +08:00
joylink_cuiweidong
4d694c459c 代码调整 2022-04-19 14:07:27 +08:00
joylink_cuiweidong
46fa576fa4 代码调整 2022-04-19 14:03:06 +08:00
joylink_cuiweidong
3b839937ac 代码调整 2022-04-19 13:45:00 +08:00
joylink_cuiweidong
4b86b7ac03 代码调整 2022-04-18 18:54:21 +08:00
joylink_cuiweidong
0312ebd77c 代码调整 2022-04-18 18:43:39 +08:00
joylink_cuiweidong
63ecb61501 代码调整 2022-04-18 17:13:54 +08:00
joylink_cuiweidong
377c1d34b6 代码调整 2022-04-18 17:10:12 +08:00
joylink_cuiweidong
955311e03c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-18 16:20:23 +08:00
joylink_cuiweidong
dfec35ff2c 代码调整 2022-04-18 15:41:37 +08:00
fan
1dcb5fe1dc 大铁线路调整2
(cherry picked from commit 6ed22109af)
2022-04-18 15:02:14 +08:00
fan
2f82b1729b 大铁线路调整
(cherry picked from commit 7fbe309f70)
2022-04-18 15:01:47 +08:00
joylink_cuiweidong
3c109157c7 成绩统计代码调整 2022-04-18 14:40:05 +08:00
joylink_cuiweidong
5793ba270d 学生统计信息代码调整 2022-04-18 09:28:37 +08:00
joylink_cuiweidong
9b094a9814 代码调整 2022-04-15 18:45:08 +08:00
joylink_cuiweidong
e3da35b4df 代码调整 2022-04-15 15:26:12 +08:00
joylink_cuiweidong
75314eb114 学生统计页面添加 2022-04-15 14:46:24 +08:00
joylink_cuiweidong
e3b0189705 成绩统计 代码调整 2022-04-15 13:12:45 +08:00
joylink_cuiweidong
643467f9d2 学生单次考试成绩 页面添加 2022-04-15 13:10:29 +08:00
fan
adc9f3816e 佛山非通信车占用颜色调整 2022-03-25 13:53:43 +08:00
fan
92d192cfe5 联系方式调整 2022-03-15 10:04:39 +08:00
“sunzy”
f459c01246 增加三位课程页面滚动条 2022-01-24 09:55:52 +08:00
“sunzy”
6723006d27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-01-21 17:36:42 +08:00
“sunzy”
9ffd5d774b baseurl 2022-01-21 17:36:38 +08:00
“sunzy”
8cb833d38c 修改三位课程例子事件,修改第一人称视角初始方向,增加徐州课程 2022-01-21 17:36:03 +08:00
joylink_fanyuhong
e9638e2524 提示调整 2022-01-21 13:55:37 +08:00
joylink_fanyuhong
31b5e1631b iscs调整
(cherry picked from commit 38b1beeef5)
2022-01-20 19:08:05 +08:00
joylink_fanyuhong
4b3376ec27 iscs调整 2022-01-19 17:56:27 +08:00
joylink_fanyuhong
1945434421 iscs调整 2022-01-19 17:41:46 +08:00
joylink_fanyuhong
732c9de068 iscs调整 2022-01-19 17:35:52 +08:00
joylink_fanyuhong
12c3572807 iscs调整 2022-01-19 17:23:25 +08:00
joylink_fanyuhong
9b8fdc0c7e iscs调整 2022-01-19 14:31:18 +08:00
joylink_fanyuhong
77040e93f4 iscs调整 2022-01-19 14:03:07 +08:00
joylink_fanyuhong
8d3a20cc01 iscs调整 2022-01-19 11:21:58 +08:00
joylink_fanyuhong
bcf3188046 iscs调整 2022-01-19 10:09:51 +08:00
joylink_fanyuhong
be904acb58 iscs调整 2022-01-19 10:09:12 +08:00
joylink_fanyuhong
39a2a21b95 iscs调整 2022-01-18 17:42:58 +08:00
joylink_fanyuhong
f1c77eca34 iscs调整 2022-01-18 16:50:24 +08:00
joylink_fanyuhong
cca82978c7 iscs调整 2022-01-18 16:43:26 +08:00
joylink_fanyuhong
3e15722d05 iscs调整 2022-01-18 15:51:24 +08:00
joylink_fanyuhong
a3d388ec96 iscs调整 2022-01-18 14:43:51 +08:00
joylink_fanyuhong
5b8681a9ff iscs调整 2022-01-17 16:23:22 +08:00
joylink_fanyuhong
a1696e7f06 iscs调整 2022-01-17 15:08:34 +08:00
joylink_fanyuhong
8194c24f4d iscs调整 2022-01-17 14:43:17 +08:00
joylink_fanyuhong
e8fb8abcf2 iscs调整 2022-01-17 14:19:03 +08:00
joylink_fanyuhong
02a499a26c iscs调整 2022-01-14 17:23:25 +08:00
joylink_fanyuhong
7372eb5897 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-01-13 16:14:28 +08:00
joylink_fanyuhong
b084600199 福州ISCS显示调整&音频资源管理&ISCS设备管理&ISCS资源管理 2022-01-13 16:08:23 +08:00
“sunzy”
e3f5ff363b 修改三维课程bug 2022-01-12 11:11:25 +08:00
“sunzy”
fbcef50f40 修改徐州三维课程排序,修改课程模式获取 2022-01-12 11:08:27 +08:00
“sunzy”
6acf6c7bbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-01-10 18:13:14 +08:00
“sunzy”
b34d46bd15 修改三位课程播放器动画,增加课程 2022-01-10 18:13:06 +08:00
joylink_fanyuhong
a6a9522cd4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-01-10 14:35:55 +08:00
joylink_fanyuhong
79bd987a38 网页加载显示调整 2022-01-10 14:35:46 +08:00
“sunzy”
4affc37803 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-01-07 17:40:57 +08:00
“sunzy”
9974d6bc8a 修改徐州三维课程界面,三位课程播放器增加粒子效果 2022-01-07 17:40:51 +08:00
joylink_fanyuhong
62f22d0c73 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-01-05 13:53:39 +08:00
joylink_fanyuhong
29a12d4980 url调整 2022-01-05 13:53:12 +08:00
“sunzy”
a08dc3c847 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-31 10:19:21 +08:00
“sunzy”
92a4fba1e3 修改三位课程界面 2021-12-31 10:19:17 +08:00
joylink_fanyuhong
3834766080 域名项目 增加 TEST 测试 2021-12-31 10:13:02 +08:00
joylink_fanyuhong
838c32df01 merge 2021-12-31 10:04:58 +08:00
joylink_fanyuhong
9dcb9669aa 单位二维码生成调整 2021-12-31 10:03:18 +08:00
“sunzy”
d9b7ef8a6f 修改三位课程页面 2021-12-30 23:53:16 +08:00
“sunzy”
f2f2878a99 修改配置地址 2021-12-30 19:36:26 +08:00
“sunzy”
23d5c662dd 修改三维课程地址配置 2021-12-30 19:30:52 +08:00
“sunzy”
706d911c84 merge 2021-12-30 17:22:23 +08:00
“sunzy”
ff7187f58f merge 2021-12-30 17:21:40 +08:00
“sunzy”
f9375c0726 修改三位沙盘驾驶位置更新,修改三位课程页面 2021-12-30 17:19:59 +08:00
joylink_fanyuhong
a7c56b3592 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-30 09:35:11 +08:00
joylink_fanyuhong
5816fbf205 baseUrl 调整 2021-12-30 09:34:50 +08:00
joylink_fanyuhong
c4e9ab2341 扬州工业展示修改 2021-12-29 14:01:28 +08:00
joylink_fanyuhong
3c2563e3d1 暂提 2021-12-29 13:44:05 +08:00
joylink_fanyuhong
68b9524cce zanti 2021-12-29 10:20:23 +08:00
joylink_fanyuhong
ba80caeb82 域名管理调整 2021-12-29 09:14:09 +08:00
joylink_fanyuhong
b3fb8bff0a 试卷管理调整--增加校验和重新生成 2021-12-28 09:37:14 +08:00
joylink_fanyuhong
d7886eeb3f 试卷管理调整--规则置灰调整 2021-12-23 13:53:57 +08:00
joylink_fanyuhong
d24cee6377 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-23 10:07:52 +08:00
joylink_fanyuhong
321fe3c076 试卷管理调整---新 2021-12-23 10:07:29 +08:00
“sunzy”
090c57aa5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-22 19:16:07 +08:00
“sunzy”
66def8c0ca 修改上传模型配置,修改三位课程联控成员 2021-12-22 19:16:03 +08:00
joylink_fanyuhong
f906fe891f 试卷管理调整new11 2021-12-22 17:23:34 +08:00
joylink_fanyuhong
e15460322b 试卷管理调整new 2021-12-22 16:25:51 +08:00
joylink_fanyuhong
c4af4ee996 试卷管理调整 2021-12-22 13:34:52 +08:00
“sunzy”
72034ece10 merge 2021-12-20 12:38:59 +08:00
“sunzy”
9029407378 “修改oss配置” 2021-12-20 12:38:28 +08:00
joylink_fanyuhong
151251a693 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-20 11:19:10 +08:00
joylink_fanyuhong
48e49334eb Merge branch 'master' into test 2021-12-20 11:17:34 +08:00
“sunzy”
8b0f62ca39 修改徐州三位沙盘模型配置 2021-12-20 10:46:20 +08:00
“sunzy”
99305b1f48 修改徐州三位沙盘模型配置 2021-12-20 10:39:24 +08:00
fan
88939d83ec 备案号调整 2021-12-17 13:55:38 +08:00
fan
294ac516f1 草稿课程编辑添加实训调整&编辑运行图loading调整 2021-12-17 13:34:03 +08:00
fan
acd799b1d6 南京二号线道岔区段锁闭显示调整 2021-12-17 10:24:48 +08:00
fan
4b4b98003c Merge remote-tracking branch 'origin/test' 2021-12-16 18:10:04 +08:00
fan
27de47bc18 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-16 17:45:19 +08:00
fan
68153921b0 道岔故障灯闪烁判断逻辑调整 2021-12-16 17:44:50 +08:00
sunzhenyu
7fa204b700 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-14 17:26:16 +08:00
sunzhenyu
72eebe0388 增加三维沙盘第一人称漫游,修改三维沙盘天气 2021-12-14 17:26:10 +08:00
fan
d9aaf08f3b 添加线路配置:站台折返策略不生效standTbStrategyIsInvalid,根据服务号更新车次计划updateTripPlanByServiceNumber;删除西安三 zc故障 2021-12-14 15:08:30 +08:00
fan
53dc950093 调整西安一三号线 折返显示颜色 2021-12-14 14:25:10 +08:00
fan
cf397fa9a0 取消登录进入 全屏 2021-12-14 10:06:01 +08:00
fan
c98fd9e0e0 批量设置停车点偏移量增加停车轨设置 2021-12-13 18:06:29 +08:00
fan
31767eea23 列车显示详情:最高ATP模式&最高信号系统控制 2021-12-10 17:52:40 +08:00
fan
fe5450fb08 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-10 17:20:40 +08:00
fan
25ba9a047e 列车详情显示调整 2021-12-10 17:20:10 +08:00
joylink_cuiweidong
d8902f3db9 运行图编制 代码调整 2021-12-10 15:41:16 +08:00
joylink_cuiweidong
4bd0afbb44 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-10 14:17:27 +08:00
joylink_cuiweidong
cc431582e7 运行图编制 修改任务 代码调整 2021-12-10 14:16:25 +08:00
fan
04c57cda86 列车详情显示调整 2021-12-10 13:36:59 +08:00
fan
f2ceea6567 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-10 10:17:43 +08:00
fan
cfdae77620 project错误 提示调整 2021-12-10 10:17:22 +08:00
sunzhenyu
a28d49e40c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-09 18:10:48 +08:00
sunzhenyu
37b23d54b0 修改三维沙盘天气 2021-12-09 18:10:42 +08:00
joylink_cuiweidong
bc89210894 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-09 17:57:41 +08:00
joylink_cuiweidong
a97f83ef45 运行图代码调整 2021-12-09 17:56:54 +08:00
fan
66b72b101f 增加江苏安全技术职业学院登录页面 2021-12-09 17:54:19 +08:00
fan
afeec55025 延续保护 增加 保护区段ctc 2021-12-09 16:53:40 +08:00
fan
7b854e717e 显示配置车次窗设备修正=》判断调整 2021-12-09 14:57:55 +08:00
fan
27a56355dd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-09 13:48:41 +08:00
fan
17e7467edf 显示配置增加车次窗设备修正&加载备用车close时清除数据 2021-12-09 13:48:15 +08:00
joylink_cuiweidong
8b86a8ddeb 运行图编制 添加计划/修改计划号码 代码调整 2021-12-09 13:23:24 +08:00
joylink_cuiweidong
3ee1dd21e5 运行图编制 新增计划 根据配置文件 设置服务号长度 2021-12-09 10:57:28 +08:00
fan
0bbf9667fb merge 2021-12-08 15:43:19 +08:00
fan
fd03433df2 node-sass版本调整 2021-12-08 15:40:38 +08:00
sunzhenyu
32b785280e merge 2021-12-08 15:11:48 +08:00
sunzhenyu
2d6be9aa56 baseurl 2021-12-08 15:11:25 +08:00
sunzhenyu
1ef4810214 修改开发模式下三维模型存储配置,添加沙盘天气图标 2021-12-08 15:09:54 +08:00
fan
e942f94c25 增加线路配置:tripNumberIsUnique:运行图中车次号是否唯一 2021-12-08 14:53:14 +08:00
fan
8c3c7e0f75 车辆翻转 运行时显示调整 2021-12-08 13:18:16 +08:00
fan
5a5dd046eb 仿真右侧列车显示过滤&加载备用车置灰已上线车辆 2021-12-07 14:10:07 +08:00
9631685998 Merge remote-tracking branch 'origin/test' 2021-12-06 21:19:18 +08:00
fan
2e0ba39171 车头翻转=》 停车状态时调整车头翻转显示 2021-12-06 13:09:17 +08:00
fan
830a630155 停车轨左右停车偏移放开 2021-12-03 17:50:37 +08:00
fan
84c4dd8ca1 批量翻转车头&车辆段仿真开放按计划行车和故障操作 2021-12-03 17:44:02 +08:00
fan
5ca3ca93ab 车辆段调整=》区段增加parkingTrack&列车增加stationCode&联锁配置项增加handleDepot 2021-12-03 13:25:20 +08:00
fan
573a489fea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-02 10:27:24 +08:00
fan
c4226ad607 道岔显示调整 2021-12-02 10:26:53 +08:00
sunzhenyu
8923a888c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-02 10:00:49 +08:00
sunzhenyu
fd10d6532f 修改三维驾驶设备柜 2021-12-02 10:00:41 +08:00
fan
80dbc39850 请求服务调整 2021-12-01 14:17:17 +08:00
fan
2f84cd6482 三方登录调整 2021-12-01 14:06:28 +08:00
fan
cca12938a4 Merge remote-tracking branch 'origin/test_baseUrl' into test 2021-12-01 13:11:26 +08:00
fan
cc9f59de13 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-01 13:11:00 +08:00
fan
46509c1e62 延时解锁字段调整 2021-12-01 13:10:36 +08:00
fan
7cc99b0a08 请求服务器域名调整&增减管理界面 2021-11-30 16:27:35 +08:00
sunzhenyu
1be02437ea 修改徐州三维演示icon 2021-11-30 16:24:31 +08:00
sunzhenyu
a541853b8f merge 2021-11-30 16:23:24 +08:00
sunzhenyu
8bf9d272d5 merge 2021-11-30 16:22:43 +08:00
sunzhenyu
87631b1fdb 修改徐州三维演示Icon 2021-11-30 16:22:06 +08:00
fan
068e0df43c 请求服务器域名调整 2021-11-30 11:13:25 +08:00
fan
c33502b31a 岔芯列车占用显示逻辑调整 2021-11-30 09:36:17 +08:00
yuan
fdae91c6d7 标准线增加PSL盘 2021-11-29 18:15:13 +08:00
fan
e3da721faf baseUrl 2021-11-29 16:31:18 +08:00
fan
4aac8ad03d Revert "Revert "道岔短闪(4次恢复)=》 短闪(转动后恢复)""
This reverts commit b69d36a9
2021-11-29 15:26:53 +08:00
fan
49e9353673 项目登录 增加三方登录配置 2021-11-29 15:26:36 +08:00
fan
6811cbcb75 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-29 14:41:12 +08:00
fan
690989cf75 南京二号线道岔问题调整 2021-11-29 14:41:03 +08:00
yuan
6380c3d11b 标准线增加PSL盘 2021-11-29 14:12:35 +08:00
fan
054db072cf Merge remote-tracking branch 'origin/test' 2021-11-29 13:38:44 +08:00
fan
b69d36a963 Revert "道岔短闪(4次恢复)=》 短闪(转动后恢复)"
This reverts commit f44bcfab
2021-11-29 13:37:35 +08:00
fan
7d4ef8048b 扬州工业项目登录参数调整 2021-11-29 13:20:10 +08:00
fan
6014c6253e 扬州工业项目登录参数调整 2021-11-29 13:15:52 +08:00
fan
4c9d9b6705 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-26 17:38:32 +08:00
fan
0788172481 南京二号线问题调整 2021-11-26 17:37:22 +08:00
sunzhenyu
fc0393ff08 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-26 17:24:05 +08:00
sunzhenyu
7d734bc554 修改展示线路三维车站加载,修改徐州三维课程 2021-11-26 17:23:56 +08:00
fan
f44bcfabcb 道岔短闪(4次恢复)=》 短闪(转动后恢复) 2021-11-26 09:30:22 +08:00
fan
27914f3334 南京二 岔心操作调整 2021-11-25 17:53:13 +08:00
fan
07025e79e5 岔芯=》岔心&南京二岔芯实训增加强行消限、预复位&南二日记报错处理 2021-11-25 16:37:44 +08:00
fan
04ed7005e1 挤岔恢复实训提示调整&岔心灰显、故障锁闭显示调整 2021-11-25 15:44:53 +08:00
fan
909bb2d9a0 南京二号线生成进路实训配置调整 2021-11-25 14:25:33 +08:00
fan
2ecb963027 调整实训中传输信号机的替代问题 2021-11-25 14:16:37 +08:00
fan
2286a66766 调低区段故障锁闭优先级 2021-11-25 13:55:18 +08:00
fan
eee7c9fae4 南京二号线设置车站中心增加偏移 2021-11-25 13:48:50 +08:00
a09ec3dd13 Merge remote-tracking branch 'origin/test' 2021-11-25 12:11:19 +08:00
fan
a5e0e4b671 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-25 10:47:32 +08:00
fan
034bb7e185 南京二号线列车右键操作不出列监 2021-11-25 10:47:12 +08:00
fan
d39a551142 南京二连续扣车参数调整&&南京二troDetail禁止拖动&&增加南京二行调故障按钮 2021-11-25 10:41:43 +08:00
joylink_cuiweidong
22a23ba70a 南京二号线 计轴受扰 区段编号 红闪 2021-11-24 17:47:13 +08:00
joylink_cuiweidong
776a19406e 南京二号线
区段 添加 无数据故障
区段故障 修改 红光带/通信车占用/橙光带 为 紫光带故障/红光带故障/计轴受扰
2021-11-24 15:55:50 +08:00
joylink_cuiweidong
8fcc22cb6f 屏蔽门开关影响 车站颜色灰显 bug 调整 2021-11-24 15:13:36 +08:00
joylink_cuiweidong
99e846b593 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-24 13:58:33 +08:00
joylink_cuiweidong
68d85d3dc6 ATP重启 由故障 变为操作 2021-11-24 13:58:14 +08:00
fan
064c7c74f6 南京二实训调整 2021-11-23 18:09:26 +08:00
fan
79591e1339 南京二实训调整 2021-11-23 17:53:34 +08:00
fan
c65049a84d 重启联锁机后禁止大部分操作&信号机故障编号闪和机头闪显示调整 2021-11-23 16:34:50 +08:00
fan
cdb907819f 南京二故障显示调整& 实训调整 2021-11-23 15:21:08 +08:00
fan
15cf2838da 南京二故障显示调整& 实训调整 2021-11-23 14:04:11 +08:00
fan
c59d1c4103 终止站停 上下合并 2021-11-22 16:27:32 +08:00
fan
a0e6c1c70a 南二虚拟传输信号机显示调整 2021-11-22 16:17:01 +08:00
fan
b4107c89de 调整南京二实训调整&南二虚拟信号机显示调整 2021-11-22 16:02:54 +08:00
fan
5412bb8ff0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-22 14:09:42 +08:00
fan
a617144386 调整南京二实训配置 2021-11-22 14:08:47 +08:00
d2217734e0 Merge remote-tracking branch 'origin/test' 2021-11-19 21:04:03 +08:00
sunzhenyu
94de3ba762 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-19 15:05:23 +08:00
sunzhenyu
343d71fdab 增加徐州三维课程案例 2021-11-19 15:05:16 +08:00
joylink_cuiweidong
a0cdca405a 代码调整 2021-11-15 18:13:35 +08:00
joylink_cuiweidong
b2a5e3723c 指令字典 添加 指令 2021-11-15 17:29:10 +08:00
fan
35ee7a245b 进路自排开自排关问题调整 2021-11-15 13:22:50 +08:00
fan
dd83568d04 地图绘制设置运行等级激活起始区段调整 2021-11-15 09:50:37 +08:00
fan
ab87adabb3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-15 09:41:17 +08:00
fan
99088c9c4f 地图绘制设置运行等级报错调整 2021-11-15 09:41:00 +08:00
36630fd2ce Merge branch 'test' 2021-11-13 20:46:59 +08:00