Commit Graph

9981 Commits

Author SHA1 Message Date
fan
9b422cd3b9 南京二号线调整(未完) 2021-05-19 16:07:52 +08:00
fan
999c0197cf 区域选择不随仿真角色变化调整 2021-05-19 15:58:52 +08:00
fan
43f523cf88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 15:46:13 +08:00
fan
6b57369b8f 车站值班员名称显示调整&暂停前端仿真计时&仿真倍速管理员可见 2021-05-19 15:45:49 +08:00
zyy
267dc4d878 删除多余配置 2021-05-19 15:20:46 +08:00
zyy
4cd675cf67 增加系统预览绘制 2021-05-19 15:07:59 +08:00
zyy
850897bd4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 10:22:53 +08:00
zyy
c281a51424 调整流程 2021-05-19 10:22:39 +08:00
joylink_cuiweidong
65daf903bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 09:44:05 +08:00
joylink_cuiweidong
17c4fdafa6 代码调整 2021-05-19 09:43:24 +08:00
fan
be74067c7e 轨道详览 2021-05-18 17:49:08 +08:00
fan
853e049cc5 哈尔滨运行图调整 2021-05-18 14:19:28 +08:00
fan
f1d41844dc 南京二列车操作报错提示 & BUG267 2021-05-18 13:47:22 +08:00
fan
5eef5240e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-18 13:36:26 +08:00
fan
df68e9a969 tro 轨道总览 2021-05-18 13:36:06 +08:00
joylink_cuiweidong
b87425f8c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-18 10:49:20 +08:00
joylink_cuiweidong
622885d3d5 删除暂时没有用的npm 模块(lodash,mock)
发布地图 地图分组代码调整
2021-05-18 10:48:58 +08:00
fan
4b83445624 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-18 10:04:20 +08:00
fan
7af49deb90 综合演练添加车站值班员 2021-05-18 10:04:03 +08:00
joylink_cuiweidong
60aeeaedea 代码调整 2021-05-17 19:15:25 +08:00
joylink_cuiweidong
1ca70a08b8 代码调整 2021-05-17 19:07:24 +08:00
joylink_cuiweidong
6a07a81233 代码调整 2021-05-17 19:06:00 +08:00
joylink_cuiweidong
5a6fcc48eb 代码调整 2021-05-17 19:00:27 +08:00
joylink_cuiweidong
c0d2b19589 代码调整 2021-05-17 18:57:20 +08:00
joylink_cuiweidong
fee03bbb41 代码调整 2021-05-17 18:42:50 +08:00
joylink_cuiweidong
aee104ce99 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 18:42:35 +08:00
joylink_cuiweidong
ada429fcde pdf上传 代码调整 2021-05-17 18:41:58 +08:00
zyy
6ba7b730a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 18:16:38 +08:00
zyy
9a2785f126 调整南京二号线 行调操作---> ibp局部控制盘、车站、轨道 2021-05-17 18:16:22 +08:00
fan
4384e36314 BUG266 南京11站:建议修改车次号输入框只能输入7个数字,车组号6个数字 2021-05-17 18:03:44 +08:00
fan
c2272313fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 17:29:41 +08:00
fan
d00f74e190 大铁线路图纸检索 2021-05-17 17:29:33 +08:00
joylink_cuiweidong
8033c42655 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 17:20:49 +08:00
joylink_cuiweidong
57feb88e6c pdf 上传 代码调整 2021-05-17 17:20:26 +08:00
fan
0a9c8665ff 代码调整 2021-05-17 16:37:56 +08:00
fan
9554643f05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 16:14:17 +08:00
fan
02eaa33fec 背投调整 2021-05-17 16:14:00 +08:00
zyy
17f25b1e0b 处理冲突文件
#    src/jmapNew/theme/nanjing_02/menus/menuBar.vue
2021-05-17 15:58:57 +08:00
zyy
050d5854d1 增加南京区段操作流程,请求暂未调整 2021-05-17 15:57:07 +08:00
fan
5c5a1db13d Bug262 福州一:紧急停车状态表示有问题 2021-05-17 15:52:26 +08:00
fan
122ca9ec6b 列车操作调整 2021-05-17 15:13:26 +08:00
fan
dfc5d50fbe ATS显示调整 2021-05-17 14:39:16 +08:00
fan
5215d8ba2c merge 2021-05-17 13:37:03 +08:00
fan
bc2fa1fbae 代码调整 2021-05-17 13:35:49 +08:00
joylink_cuiweidong
3bbfae4082 pdf上传 代码调整 2021-05-17 10:42:13 +08:00
joylink_cuiweidong
290542ee28 pdf上传代码调整 2021-05-17 09:51:06 +08:00
zyy
1dba8c2e9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2021-05-14 18:33:09 +08:00
zyy
54295fe452 增加pdf 上传 2021-05-14 18:31:46 +08:00
sunzhenyu
a8d89df500 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-14 18:09:24 +08:00
sunzhenyu
883c70bd30 增加三维课程角色选择,增加三维课程信息提示跳转部分 2021-05-14 18:09:18 +08:00