joylink_cuiweidong
|
eed312e72f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/jointTrainingNew/index.vue
|
2020-05-19 14:03:44 +08:00 |
|
fan
|
9580d4b966
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 17:59:52 +08:00 |
|
fan
|
86d59db177
|
调整路由处理
|
2020-05-18 17:59:38 +08:00 |
|
zyy
|
3069cf2112
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 17:08:32 +08:00 |
|
zyy
|
b8bf51fc82
|
优化地图绘制
|
2020-05-18 17:08:21 +08:00 |
|
fan
|
c8d7347e61
|
课程问题调整
|
2020-05-18 15:47:55 +08:00 |
|
fan
|
135b328dd1
|
故障操作调整
|
2020-05-18 14:49:16 +08:00 |
|
zyy
|
9591cbd268
|
调整竞赛系统登陆权限
|
2020-05-18 13:08:45 +08:00 |
|
fan
|
d47a986fcc
|
故障操作&贵州状态班级展示
|
2020-05-15 18:48:10 +08:00 |
|
fan
|
027fe43467
|
删除日志，信号机调整
|
2020-05-14 17:24:35 +08:00 |
|
fan
|
126278ee01
|
状态表示道岔故障调整
|
2020-05-14 16:53:58 +08:00 |
|
fan
|
abec4b2b4c
|
西安二号线添加是否灭灯显示(CTC级)
|
2020-05-14 16:45:48 +08:00 |
|
fan
|
48b931897c
|
调整考试列表实训类型
|
2020-05-14 14:39:38 +08:00 |
|
fan
|
01456de62a
|
学生管理问题调整
|
2020-05-14 11:27:01 +08:00 |
|
joylink_cuiweidong
|
4631590df0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:06:15 +08:00 |
|
joylink_cuiweidong
|
2b8757a074
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 18:05:48 +08:00 |
|
zyy
|
cd229f7f81
|
调整地图大屏编辑，宁波线路道岔操作
|
2020-05-13 15:31:12 +08:00 |
|
fan
|
92eaa38aef
|
贵州装备班级相关&绘图逻辑区段调整
|
2020-05-12 19:07:48 +08:00 |
|
fan
|
a90adb9575
|
联锁关系生成过渡和结果展示调整
|
2020-05-11 15:51:33 +08:00 |
|
fan
|
56ed2a4f8c
|
调整更新坐标&联锁配置项
|
2020-05-11 14:45:07 +08:00 |
|
joylink_zyy
|
5e142ae5b3
|
调整路径
|
2020-05-10 21:42:27 +08:00 |
|
joylink_zyy
|
fa70eb85ca
|
注释iscs事件
|
2020-05-10 15:58:08 +08:00 |
|
fan
|
29881aab0b
|
添加地图数据维护中提示&存在仿真管理添加类型
|
2020-05-09 19:24:12 +08:00 |
|
fan
|
276620a25e
|
西安二信号机调整
|
2020-04-30 17:40:25 +08:00 |
|
fan
|
15104970bc
|
西安二信号机调整&线路配置添加参数
|
2020-04-30 16:19:33 +08:00 |
|
fan
|
e348262118
|
西安二号线信号机操作调整
|
2020-04-30 13:19:33 +08:00 |
|
fan
|
5682ab67b0
|
信号机批量设置联锁站&区段添加所属车站属性
|
2020-04-30 10:54:06 +08:00 |
|
fan
|
77124d842e
|
设备联锁关系数据校验&生成联锁功能
|
2020-04-30 10:12:11 +08:00 |
|
fan
|
f3ab2337e8
|
西安二号线信号封锁调整（未完）
|
2020-04-30 08:54:17 +08:00 |
|
fan
|
35d13ae529
|
区段绘图数据调整roadType不为''
|
2020-04-29 17:53:35 +08:00 |
|
fan
|
1c8929cb08
|
绘图区段添加firstTurnBack&线路配置添加generateCycle&西安二操作调整
|
2020-04-29 17:25:30 +08:00 |
|
fan
|
af5567d598
|
西安二操作问题调整
|
2020-04-28 10:27:07 +08:00 |
|
fan
|
e39a7eadb9
|
西安二号线操作调整&&绘图数据调整
|
2020-04-27 19:02:07 +08:00 |
|
fan
|
4378cc56cb
|
西安二号线站台操作调整
|
2020-04-26 18:49:20 +08:00 |
|
fan
|
a1d0c3e7d0
|
西安二号线绘图调整
|
2020-04-26 17:16:20 +08:00 |
|
joylink_cuiweidong
|
d0abd7fb56
|
socket 断线重连修改
解决被登出 socket 一直请求的问题
|
2020-04-24 15:34:09 +08:00 |
|
zyy
|
2210965709
|
调整系统关于vue报错误
|
2020-04-24 14:17:15 +08:00 |
|
zyy
|
7536022d33
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-24 11:25:41 +08:00 |
|
zyy
|
7997ac6fe0
|
调整发布地图接口流程
|
2020-04-24 11:25:30 +08:00 |
|
fan
|
9c07e3968d
|
代码调整
|
2020-04-23 18:35:27 +08:00 |
|
fan
|
ca4dc2e2cf
|
撤销拦截错误，仅拦截500
|
2020-04-23 15:18:33 +08:00 |
|
fan
|
97a9ae9f5c
|
接口报错调整
|
2020-04-23 10:03:07 +08:00 |
|
fan
|
69574ccb0d
|
接口报错调整
|
2020-04-23 09:34:54 +08:00 |
|
joylink_cuiweidong
|
511d5e48d4
|
综合演练仿真 聊天 socket 订阅
|
2020-04-22 18:17:27 +08:00 |
|
fan
|
8c122f93d4
|
运行图加载调整&绘图设备道岔故障&佛山区段颜色
|
2020-04-22 17:12:29 +08:00 |
|
fan
|
c3ca6de6d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 14:32:00 +08:00 |
|
fan
|
e51824dc80
|
紧急停车位置调整&绘图站间分隔&车站批量调整
|
2020-04-22 14:30:37 +08:00 |
|
zyy
|
7baea26e4d
|
拦截错误并提示
|
2020-04-22 13:57:19 +08:00 |
|
fan
|
adfe7f0f05
|
派班工作站&运行图加载调整
|
2020-04-22 09:42:46 +08:00 |
|
fan
|
05c857aeb6
|
西安二号线运行图导入过滤TBKE&TWQN
|
2020-04-22 09:07:58 +08:00 |
|
fan
|
0e1d3dc811
|
运行图加载调整
|
2020-04-21 18:43:54 +08:00 |
|
fan
|
46113e89a7
|
运行图加载
|
2020-04-21 17:08:43 +08:00 |
|
fan
|
2f4b765d97
|
运行图加载调整&交路数据调整
|
2020-04-21 15:08:27 +08:00 |
|
fan
|
7c55c19933
|
交路区段区别显示&故障状态组调整
|
2020-04-20 17:10:50 +08:00 |
|
fan
|
f375b97631
|
派班工作站调整
|
2020-04-20 15:38:30 +08:00 |
|
fan
|
ed26ff34d9
|
地图高级数据停站时间
|
2020-04-20 09:57:00 +08:00 |
|
zyy
|
b628df2d85
|
调整对象拷贝方式
|
2020-04-17 13:30:58 +08:00 |
|
fan
|
9e048bb56e
|
删除sock测试和日志
|
2020-04-17 09:23:11 +08:00 |
|
fan
|
4231966cac
|
取消cdn加载&调整快速入口进入房间
|
2020-04-17 09:13:40 +08:00 |
|
fan
|
d69e155e91
|
贵州装备添加联锁角色&&项目配置规整（未完）
|
2020-04-16 15:52:56 +08:00 |
|
fan
|
1bfe76c291
|
添加西安地铁页面&&项目配置规整（未完）
|
2020-04-16 13:47:40 +08:00 |
|
fan
|
8e5a79626a
|
西安二号线调整
|
2020-04-16 09:01:52 +08:00 |
|
fan
|
a1869a531f
|
集中站分隔调整&线路管理配置调整
|
2020-04-15 14:13:08 +08:00 |
|
fan
|
e9ee5112d4
|
佛山皮肤调整
|
2020-04-15 09:33:21 +08:00 |
|
zyy
|
cc984c8eb0
|
调整佛山线路，成都一号线运行图 方向信息
|
2020-04-14 10:27:33 +08:00 |
|
zyy
|
feca56f94b
|
调整字段名称显示，调整佛山线路标注字段
|
2020-04-14 09:48:54 +08:00 |
|
zyy
|
df92090509
|
增加配置中侧防数据，调整接口
|
2020-04-13 17:03:48 +08:00 |
|
zyy
|
057b627c0d
|
调整区段计算
|
2020-04-10 16:19:37 +08:00 |
|
zyy
|
76851cdff2
|
调整区段字段显隐控制条件
|
2020-04-10 10:17:34 +08:00 |
|
fan
|
991fa86ede
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 18:23:35 +08:00 |
|
fan
|
7e0834b13a
|
代码哈尔滨实训数据&本地导入导出
|
2020-04-09 18:22:10 +08:00 |
|
zyy
|
8026e14da8
|
调整道岔重置，调整宁波定义
|
2020-04-09 17:03:22 +08:00 |
|
zyy
|
b6d03d24a8
|
调整区段绘制方式
|
2020-04-09 13:45:01 +08:00 |
|
fan
|
d3bd167c70
|
实训管理调整
|
2020-04-07 16:41:08 +08:00 |
|
fan
|
e49f32d6b2
|
宁波实训跳转集中站
|
2020-04-02 16:28:07 +08:00 |
|
fan
|
523a1f9cd6
|
宁波实训跳转集中站
|
2020-04-02 16:22:53 +08:00 |
|
zyy
|
864cbd0420
|
调整代码
|
2020-04-02 11:20:35 +08:00 |
|
zyy
|
8117a31c80
|
调整代码
|
2020-04-02 10:51:47 +08:00 |
|
fan
|
225a739f60
|
打包本地项目不进行cdn加载
|
2020-04-01 13:47:29 +08:00 |
|
zyy
|
1873898adc
|
调整回车内容不修改
|
2020-03-31 14:41:17 +08:00 |
|
fan
|
a3b6c3b59c
|
创建线下用户
|
2020-03-30 20:28:20 +08:00 |
|
zyy
|
38ada8ccb2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 17:54:01 +08:00 |
|
zyy
|
919639ad03
|
调整哈尔滨现地操作步骤流程完善
|
2020-03-30 17:53:44 +08:00 |
|
fan
|
2db44747ee
|
生成线下用户
|
2020-03-30 17:41:27 +08:00 |
|
fan
|
338a9e9683
|
生成线下用户
|
2020-03-30 16:52:53 +08:00 |
|
fan
|
643c12335c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_stand
# Conflicts:
# src/utils/baseUrl.js
|
2020-03-30 14:26:27 +08:00 |
|
zyy
|
0321340863
|
调整步骤运行数据
|
2020-03-30 10:28:08 +08:00 |
|
fan
|
8f69177fe1
|
暂存
|
2020-03-30 09:47:26 +08:00 |
|
zyy
|
47519b7040
|
调整道岔生成默认状态，调整道岔皮肤配置
|
2020-03-27 18:19:40 +08:00 |
|
joylink_cuiweidong
|
93dc9a6983
|
新版剧本编制接口调整
|
2020-03-27 17:29:01 +08:00 |
|
fan
|
f34de4f001
|
实训调整
|
2020-03-26 18:42:01 +08:00 |
|
fan
|
457b78bd7e
|
操作调整
|
2020-03-20 15:00:31 +08:00 |
|
fan
|
80fda91dba
|
自动折返&引导总锁调整
|
2020-03-20 14:12:02 +08:00 |
|
zyy
|
f78d9e80fe
|
调整哈尔滨道岔现地操作
|
2020-03-19 17:18:46 +08:00 |
|
zyy
|
1d46deb12a
|
调整区段绘画逻辑
|
2020-03-19 14:03:54 +08:00 |
|
joylink_cuiweidong
|
07af51b757
|
对返回的信号机接近区段数据处理
|
2020-03-18 17:02:07 +08:00 |
|
fan
|
aa93cfc250
|
调整现地操作
|
2020-03-16 17:54:30 +08:00 |
|
fan
|
0377ef014b
|
合并代码
|
2020-03-16 17:16:59 +08:00 |
|
zyy
|
1745bfbcf1
|
ibp盘绘制更新保存流程调整完成
|
2020-03-16 14:47:59 +08:00 |
|
joylink_zyy
|
0e570584bc
|
调整ibp绘制地图
|
2020-03-13 21:17:20 +08:00 |
|
zyy
|
ce21ff9d91
|
调整接口
|
2020-03-13 19:01:59 +08:00 |
|
fan
|
264310f28e
|
调整成都三显示
|
2020-03-13 15:06:14 +08:00 |
|
fan
|
6c52c3b56f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-13 13:25:54 +08:00 |
|
zyy
|
31d50d95e2
|
增加仿真系统 iscs工作站
|
2020-03-13 13:23:04 +08:00 |
|
fan
|
7753c53ee0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/shape/Train/index.js
|
2020-03-13 13:08:18 +08:00 |
|
fan
|
4a2c539553
|
哈尔滨现地显示
|
2020-03-13 13:01:58 +08:00 |
|
zyy
|
cb4c615345
|
调整哈尔滨综合监控绘图宽度，高度显示， 综合监控名称动态显示
|
2020-03-12 18:36:05 +08:00 |
|
fan
|
ef60af34c0
|
绘图预览切换现地行调显示
|
2020-03-11 15:10:08 +08:00 |
|
fan
|
50bb1ad59e
|
绘图高级数据调整
|
2020-03-10 18:56:03 +08:00 |
|
fan
|
6980bb099f
|
调整公共绘图元素显示条件
|
2020-03-10 10:21:33 +08:00 |
|
fan
|
f6a43ed6aa
|
宁波一调整道岔正反操为联动操作
|
2020-03-10 10:08:28 +08:00 |
|
fan
|
75218e87ce
|
自动折返按钮调整
|
2020-03-09 18:47:50 +08:00 |
|
fan
|
d45950fa68
|
自动折返调整
|
2020-03-09 18:35:01 +08:00 |
|
fan
|
96a9c73c29
|
列车位置调整
|
2020-03-09 18:25:25 +08:00 |
|
fan
|
7f4e6fb13c
|
初始化按计划行车状态and其他调整
|
2020-03-09 17:38:15 +08:00 |
|
fan
|
2b971cdf12
|
初始化按计划行车状态and其他调整
|
2020-03-09 14:23:44 +08:00 |
|
joylink_fanyuhong
|
3f62d23960
|
调整列车
|
2020-03-06 11:31:09 +08:00 |
|
joylink_fanyuhong
|
56a5d0f018
|
调整显示条件
|
2020-03-06 11:26:52 +08:00 |
|
joylink_fanyuhong
|
217864dbd4
|
站台功能按钮
|
2020-03-06 10:05:21 +08:00 |
|
joylink_fanyuhong
|
67aef69fe5
|
获取数据时替换列车code位groupNumber
|
2020-03-05 18:24:06 +08:00 |
|
joylink_fanyuhong
|
8d58125e1f
|
自动进路和引导总锁
|
2020-03-05 16:39:49 +08:00 |
|
zyy
|
467a9cf982
|
调整宁波线路现地操作
|
2020-03-04 14:14:59 +08:00 |
|
joylink_fanyuhong
|
e60fde1a5a
|
地图排序
|
2020-03-03 14:24:25 +08:00 |
|
zyy
|
79820a9725
|
调整宁波线显示数据，哈尔滨道岔逻辑判断显示
|
2020-03-02 16:16:17 +08:00 |
|
joylink_cuiweidong
|
32b16077f3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-28 13:10:48 +08:00 |
|
joylink_fanyuhong
|
d5539a986b
|
按计划行车接口报错提示
(cherry picked from commit 1abad25)
|
2020-02-28 11:28:13 +08:00 |
|
joylink_fanyuhong
|
543b3c1259
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 22:10:08 +08:00 |
|
joylink_fanyuhong
|
41bc739eab
|
运行图预览
|
2020-02-27 22:09:51 +08:00 |
|
zyy
|
60024d9e06
|
调整根路径
|
2020-02-27 21:39:30 +08:00 |
|
joylink_cuiweidong
|
4d4c10f2d5
|
哈尔滨线路 信号机操作代码调整
|
2020-02-27 20:37:35 +08:00 |
|
joylink_fanyuhong
|
bd7069f6f4
|
调整运行图预览尺寸
|
2020-02-27 18:51:48 +08:00 |
|
zyy
|
4e6f107896
|
调整宁波一道岔操作
|
2020-02-27 15:44:51 +08:00 |
|
joylink_zyy
|
d9e7900f44
|
调整道岔绘图图形
|
2020-02-26 22:10:48 +08:00 |
|
joylink_cuiweidong
|
3dddd5bff9
|
代码调整
|
2020-02-26 15:39:25 +08:00 |
|
joylink_cuiweidong
|
2978438390
|
北京一号线 信号机操作代码调整
|
2020-02-25 15:08:48 +08:00 |
|
joylink_fanyuhong
|
3197641b97
|
仿真调整
|
2020-02-25 10:36:18 +08:00 |
|
joylink_fanyuhong
|
aa0f770630
|
仿真调整
|
2020-02-24 17:04:39 +08:00 |
|
joylink_fanyuhong
|
a33a9bbe42
|
道岔转动调整
|
2020-02-21 15:49:30 +08:00 |
|
joylink_fanyuhong
|
10d3bb3e49
|
新建列车调整
|
2020-02-20 10:19:49 +08:00 |
|
joylink_fanyuhong
|
680d87e623
|
列车状态显示
|
2020-02-19 16:33:59 +08:00 |
|
joylink_fanyuhong
|
00dd268918
|
列车调整
|
2020-02-19 11:47:38 +08:00 |
|
joylink_fanyuhong
|
412e6bd582
|
列车调整
|
2020-02-18 19:24:52 +08:00 |
|
zyy
|
11e03c4fe3
|
调整道岔绘图
|
2020-02-18 18:39:12 +08:00 |
|
joylink_fanyuhong
|
c14043f93b
|
自动进路调整
|
2020-02-18 14:45:32 +08:00 |
|
zyy
|
73b51bd385
|
调整站台显示问题
|
2020-02-17 17:50:15 +08:00 |
|
joylink_fanyuhong
|
2cd2f93c20
|
状态调整
|
2020-02-14 18:07:54 +08:00 |
|
joylink_fanyuhong
|
07b5e172dd
|
状态调整
|
2020-02-14 10:58:57 +08:00 |
|
joylink_fanyuhong
|
97df29eb8c
|
状态调整
|
2020-02-13 17:16:55 +08:00 |
|
joylink_fanyuhong
|
62c9f31d63
|
状态调整
|
2020-02-13 16:20:02 +08:00 |
|
zyy
|
f82c4a195e
|
调整创建运行图表单数据
|
2020-02-13 12:35:44 +08:00 |
|
joylink_fanyuhong
|
4c1b03e3d7
|
操作调整
|
2020-02-12 18:37:24 +08:00 |
|
joylink_fanyuhong
|
4275b4dc4a
|
操作调整
|
2020-02-12 15:14:14 +08:00 |
|
zyy
|
d348c640f9
|
添加宁波，北京线路进路获取
|
2020-02-11 17:33:33 +08:00 |
|
joylink_fanyuhong
|
50a4f8ab0b
|
成都三号线调整
|
2020-02-10 19:10:43 +08:00 |
|
zyy
|
2d5074d6d1
|
增加进路数据状态维护
|
2020-01-19 11:22:48 +08:00 |
|
zyy
|
1779f856be
|
新增iscs系统
|
2020-01-17 17:48:08 +08:00 |
|
zyy
|
2d5a42d363
|
调整根路径
|
2020-01-17 15:33:30 +08:00 |
|
zyy
|
3ec7d0a7e5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 15:32:08 +08:00 |
|
zyy
|
e4b20395c4
|
增加iscs系统，调整成都一号线运行图导入
|
2020-01-17 15:31:58 +08:00 |
|
fan
|
582fc354db
|
快速入口增加参数projectCode
|
2020-01-17 14:20:31 +08:00 |
|
fan
|
269cef7673
|
仿真接口调整
|
2020-01-17 11:31:53 +08:00 |
|
fan
|
69b11f98e8
|
iscs调整
|
2020-01-17 10:49:06 +08:00 |
|
fan
|
019ca66662
|
Merge remote-tracking branch 'origin/dev_iscs' into dev
|
2020-01-16 18:16:23 +08:00 |
|
zyy
|
27257482ab
|
调整线路配置项，增加 ISCS 绘图元素
|
2020-01-16 18:02:57 +08:00 |
|
fan
|
09a8b6b630
|
FAS子系统测试PSD
|
2020-01-16 13:28:29 +08:00 |
|
fan
|
22c0b570a3
|
调整重连时间
|
2020-01-15 15:58:30 +08:00 |
|
joylink_cuiweidong
|
4315cdade3
|
socket弹出层处理
|
2020-01-15 14:32:17 +08:00 |
|
joylink_cuiweidong
|
e0824e33a0
|
房间的订阅代码调整
|
2020-01-15 13:20:48 +08:00 |
|
joylink_cuiweidong
|
388690c181
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-14 18:19:14 +08:00 |
|
joylink_cuiweidong
|
2f120b8c19
|
sock代码调整
|
2020-01-14 18:18:54 +08:00 |
|
fan
|
7b7d332035
|
修改重连时间
|
2020-01-14 17:26:41 +08:00 |
|
fan
|
75334d11fa
|
删除公共topic
|
2020-01-14 17:14:45 +08:00 |
|
joylink_cuiweidong
|
a38e824548
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-14 16:49:03 +08:00 |
|
joylink_cuiweidong
|
59cfe5f3b7
|
sock断线和重连的弹出框调整
|
2020-01-14 16:48:49 +08:00 |
|
zyy
|
e2e5cec0a3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-14 15:32:48 +08:00 |
|
zyy
|
27d34a91ff
|
调整打包配置
|
2020-01-14 15:32:41 +08:00 |
|
joylink_cuiweidong
|
e59dcdcf01
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/utils/sock.js
|
2020-01-14 15:21:18 +08:00 |
|
joylink_cuiweidong
|
82b5bba847
|
解决连接关闭后xhr_streaming无限循环的问题
|
2020-01-14 15:19:31 +08:00 |
|
fan
|
2c0458a558
|
socket
|
2020-01-14 15:13:56 +08:00 |
|
fan
|
63cd08ccf6
|
socket
|
2020-01-14 14:03:56 +08:00 |
|
zyy
|
1fab892047
|
新增扣车请求参数
|
2020-01-13 17:07:06 +08:00 |
|
zyy
|
5217a334d5
|
调整宁波一号线站台状态显示
|
2020-01-13 16:52:00 +08:00 |
|
zyy
|
dcead8d707
|
增加点击事件取消选中状态为全局混入，删除多余线路utils配置
|
2020-01-13 14:40:24 +08:00 |
|
fan
|
4e136ca8b3
|
成都一号线样式调整
|
2020-01-10 18:51:57 +08:00 |
|
zyy
|
a7b97dd7cc
|
调整宁波一号线请求参数
|
2020-01-10 14:41:20 +08:00 |
|
fan
|
2b4aa891eb
|
成都一号线右键菜单调整
|
2020-01-09 09:02:02 +08:00 |
|
zyy
|
5a3b415202
|
删除运行图工具栏
|
2020-01-07 14:49:51 +08:00 |
|
zyy
|
5eb56d0a96
|
调整旧版地图右键菜单操作
|
2020-01-07 10:52:44 +08:00 |
|
zyy
|
0330e08f89
|
调整车站状态显示，调整右键菜单显示，设置默认状态
|
2020-01-07 09:23:04 +08:00 |
|
zyy
|
3d8fcd305a
|
调整宁波一号线右键菜单流程
|
2020-01-06 14:42:28 +08:00 |
|
zyy
|
308f82c14e
|
提交请求进路接口
|
2020-01-03 15:52:51 +08:00 |
|
zyy
|
c13963f793
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-03 15:50:32 +08:00 |
|
zyy
|
4f2fb97477
|
调整宁波线右键菜单显示
|
2020-01-03 15:50:26 +08:00 |
|
fan
|
e022b00a00
|
项目设备综合演练调整
|
2020-01-03 11:18:18 +08:00 |
|
zyy
|
496a00c8fe
|
调整道岔区段坐标点bug
|
2020-01-02 14:30:03 +08:00 |
|
fan
|
24ef3fd71d
|
添加贵州装备制造职业学院项目
|
2019-12-30 18:06:40 +08:00 |
|
zyy
|
ce44ec4429
|
调整宁波线 样式，显示宁波线右键操作
|
2019-12-30 13:24:40 +08:00 |
|
fan
|
c7078dcdb9
|
新版地图包加载仿真
|
2019-12-30 09:00:16 +08:00 |
|
zyy
|
6e3424e355
|
调整实训平台新旧地图显示逻辑
|
2019-12-26 11:01:54 +08:00 |
|
zyy
|
74f0b12e3c
|
修改运行图显示，调整进路列表展示
|
2019-12-25 18:45:48 +08:00 |
|
zyy
|
bfe6c5a537
|
调整线路配置项流程，对接字段
|
2019-12-20 14:02:11 +08:00 |
|
zyy
|
6a82d745d9
|
调整高级数据生成code规范
|
2019-12-20 13:48:37 +08:00 |
|
fan
|
143f35a222
|
进路物理区段列表连续高亮
|
2019-12-19 16:21:00 +08:00 |
|
fan
|
fbbee9324a
|
延续保护预览
|
2019-12-19 14:05:16 +08:00 |
|
fan
|
05a4ca76dc
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-12-19 10:13:55 +08:00 |
|
zyy
|
c295f97819
|
调整车站显示坐标，信号机批量操作，调整逻辑代码
|
2019-12-18 16:20:30 +08:00 |
|
fan
|
7cf546efe6
|
参数调整
|
2019-12-18 13:05:29 +08:00 |
|
zyy
|
97dc97d8db
|
Merge branch 'dev' into test
|
2019-12-18 10:14:33 +08:00 |
|
zyy
|
399093bc72
|
调整站台计算坐标
|
2019-12-18 09:49:44 +08:00 |
|
sunzhenyu
|
a9a62b924f
|
添加继电器界面动画，修改继电器显示模式
|
2019-12-13 09:14:28 +08:00 |
|
zyy
|
b2dd3d7285
|
调整站台生成逻辑，调整uid检测方式
|
2019-12-11 17:07:29 +08:00 |
|
zyy
|
9e50f2eacf
|
Merge branch 'dev' into test
|
2019-12-11 09:08:28 +08:00 |
|
fan
|
6afb5f35a8
|
高级延续保护调整
|
2019-12-10 16:50:38 +08:00 |
|
joylink_cuiweidong
|
a15cb8d43c
|
获取发布地图接口修改（添加drawWay参数）
|
2019-12-09 17:38:08 +08:00 |
|
zyy
|
2bac1022b4
|
修改生成规则，调整新版地图右键操作
|
2019-12-09 10:50:21 +08:00 |
|
fan
|
e281045268
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-12-06 18:11:05 +08:00 |
|
zyy
|
dc381e2a63
|
desc: 新增屏蔽门绘制以及紧急停车按钮生成流程
|
2019-12-06 18:03:13 +08:00 |
|
zyy
|
824b4ca414
|
修改命名规则
|
2019-12-06 13:03:45 +08:00 |
|
sunzhenyu
|
70c0e78179
|
baseurl
|
2019-12-03 13:51:50 +08:00 |
|
zyy
|
d0a986e8bf
|
新版地图保存
|
2019-12-02 14:09:50 +08:00 |
|
zyy
|
5793355e20
|
修改道岔生成逻辑
|
2019-12-02 13:05:25 +08:00 |
|
joylink_cuiweidong
|
8de6fa219a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-28 09:33:12 +08:00 |
|
lVAL
|
5852ca6ebf
|
修改代码
|
2019-11-26 09:44:37 +08:00 |
|
joylink_cuiweidong
|
5d7739c947
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-26 09:23:29 +08:00 |
|
joylink_cuiweidong
|
c3642d67eb
|
代码调整
|
2019-11-26 09:21:26 +08:00 |
|
lVAL
|
aee030f01d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/router/index.js
# src/scripts/plugin/MenuContextHandler.js
|
2019-11-25 18:25:17 +08:00 |
|
zyy
|
1d82ce738f
|
desc: 修改考试规则定义，调整更新商品更新样式
|
2019-11-25 10:44:48 +08:00 |
|
zyy
|
0880801c1f
|
desc: 增加检测地图名称唯一性
|
2019-11-22 16:50:30 +08:00 |
|
|
|
1165524548
|
修改测试打包环境和websocket日志
|
2019-11-22 02:11:24 +08:00 |
|
zyy
|
fa3d0cb099
|
desc: 调整代码书写逻辑
|
2019-11-20 16:31:41 +08:00 |
|
zyy
|
00877ac164
|
修改代码 调整绘图逻辑
|
2019-11-19 16:39:24 +08:00 |
|
ival
|
ed7acb5abe
|
修改目录大小写
|
2019-11-19 13:11:52 +08:00 |
|
zyy
|
4144621be8
|
desc: 修改代码
|
2019-11-19 13:00:36 +08:00 |
|
ival
|
5a4f6f5999
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-18 14:44:13 +08:00 |
|
ival
|
50e9a242e7
|
修改代码
|
2019-11-18 14:44:01 +08:00 |
|
zyy
|
7938876d85
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/scripts/GlobalPlugin.js
|
2019-11-18 14:30:25 +08:00 |
|
zyy
|
8d05730dc4
|
desc: 修改代码
|
2019-11-18 14:29:43 +08:00 |
|
ival
|
cb8e55e546
|
修改代码
|
2019-11-15 16:36:23 +08:00 |
|
ival
|
d599e561f6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/store/modules/exam.js
# src/utils/baseUrl.js
# src/views/display/menuExam.vue
|
2019-11-15 16:34:54 +08:00 |
|
ival
|
b3f9777062
|
修改代码
|
2019-11-15 16:32:23 +08:00 |
|
zyy
|
9bfad2fdeb
|
desc: 修改代码
|
2019-11-15 16:31:48 +08:00 |
|
ival
|
a60b41398b
|
修改代码
|
2019-11-15 16:29:11 +08:00 |
|
zyy
|
e6b81355a4
|
删除多余文件
|
2019-11-14 15:51:42 +08:00 |
|
ival
|
e41d007264
|
注释掉变动，提交
|
2019-11-14 15:10:29 +08:00 |
|
ival
|
0bcf2b796e
|
修改
|
2019-11-14 14:05:05 +08:00 |
|
ival
|
c5c813753c
|
修改代码
|
2019-11-14 13:59:33 +08:00 |
|
ival
|
3fefbe2a47
|
修改代码
|
2019-11-13 10:15:54 +08:00 |
|
ival
|
8eb4ac80a6
|
修改刷新问题
|
2019-11-12 17:27:30 +08:00 |
|
ival
|
0b47562cca
|
修改代码
|
2019-11-12 14:16:11 +08:00 |
|
ival
|
89239b7fe1
|
修改代码
|
2019-11-12 13:44:10 +08:00 |
|
