joylink_cuiweidong
|
f8f921a543
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 16:03:29 +08:00 |
|
joylink_cuiweidong
|
d5ad3ab59d
|
地图绘制代码调整
|
2020-07-24 16:02:55 +08:00 |
|
fan
|
75164e9a5f
|
调整综合仿真现地行调切换显示
|
2020-07-24 15:28:45 +08:00 |
|
fan
|
fd4acc0a82
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 14:21:22 +08:00 |
|
fan
|
d4da17ae09
|
调整哈尔滨成都一故障样式&哈尔滨现地切换显示
|
2020-07-24 14:20:38 +08:00 |
|
zyy
|
b69cc2c4ab
|
调整哈尔滨线路设备管理，判断设备管理显示逻辑
|
2020-07-24 14:11:03 +08:00 |
|
zyy
|
584f65d285
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 11:01:33 +08:00 |
|
zyy
|
fe08980f2f
|
调整判断
|
2020-07-24 11:01:22 +08:00 |
|
joylink_cuiweidong
|
ed8795a3a7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 10:35:22 +08:00 |
|
joylink_cuiweidong
|
196a611d70
|
仿真聊天代码调整
|
2020-07-24 10:35:05 +08:00 |
|
fan
|
33a8eba1c7
|
调整实训行为记录
|
2020-07-24 10:14:59 +08:00 |
|
fan
|
5d413dba8c
|
调整订阅
|
2020-07-23 19:25:40 +08:00 |
|
zyy
|
e7ee0344b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/index.vue
|
2020-07-23 18:07:46 +08:00 |
|
zyy
|
fb0f961b17
|
删除多余线路逻辑
|
2020-07-23 18:04:13 +08:00 |
|
joylink_cuiweidong
|
5a35fa4f29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/index.vue
|
2020-07-23 17:57:36 +08:00 |
|
joylink_cuiweidong
|
986ce16d78
|
仿真系统聊天代码调整
|
2020-07-23 17:51:37 +08:00 |
|
zyy
|
2434de38bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 17:09:43 +08:00 |
|
zyy
|
9ec64f1eeb
|
调整加载方式及判断
|
2020-07-23 17:09:29 +08:00 |
|
fan
|
91faa164ea
|
删除断点
|
2020-07-23 16:55:23 +08:00 |
|
fan
|
9d7c11dca6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:07:44 +08:00 |
|
fan
|
e561f77c12
|
代码调整&socket重连前进行初始化
|
2020-07-23 16:07:27 +08:00 |
|
joylink_cuiweidong
|
d8484da992
|
运行图选中计划线 线条加粗 调整
|
2020-07-23 14:46:26 +08:00 |
|
zyy
|
d313348a41
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 10:33:12 +08:00 |
|
zyy
|
e9b8e6e1b9
|
调整哈尔滨线路屏蔽门样式
|
2020-07-23 10:32:58 +08:00 |
|
joylink_cuiweidong
|
ece0ac79a3
|
剧本预览代码调整
|
2020-07-23 10:29:53 +08:00 |
|
joylink_cuiweidong
|
a85a543a39
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 17:20:47 +08:00 |
|
joylink_cuiweidong
|
597822430e
|
剧本预览代码调整
|
2020-07-22 17:20:24 +08:00 |
|
fan
|
0a5999bcd0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 14:59:11 +08:00 |
|
fan
|
7a783cf032
|
项目设备大屏调整
|
2020-07-22 14:59:00 +08:00 |
|
zyy
|
081f0e6178
|
调整大屏默认宽度
|
2020-07-22 14:26:51 +08:00 |
|
fan
|
8c7a78a545
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 14:20:12 +08:00 |
|
fan
|
02774eeb1e
|
调整综合演练大屏跳出&限制新窗口预登出
|
2020-07-22 14:19:58 +08:00 |
|
joylink_cuiweidong
|
9ba8764130
|
代码调整
|
2020-07-22 14:03:40 +08:00 |
|
joylink_cuiweidong
|
fbe928749b
|
剧本预览代码调整
|
2020-07-22 13:55:12 +08:00 |
|
fan
|
7bd43dd7d4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 13:31:10 +08:00 |
|
fan
|
507fdd2593
|
综合仿真页面调整&删除连接真实设备
|
2020-07-22 13:30:56 +08:00 |
|
zyy
|
31b6241bf7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 13:16:21 +08:00 |
|
zyy
|
b9a412943e
|
调整哈尔滨聊天窗口位置
|
2020-07-22 13:16:04 +08:00 |
|
joylink_cuiweidong
|
191816db09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 09:46:00 +08:00 |
|
fan
|
63cecaef46
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 09:05:45 +08:00 |
|
fan
|
c617cf27c6
|
heb项目取消综合仿真生成二维码按钮
|
2020-07-22 09:04:45 +08:00 |
|
joylink_cuiweidong
|
f3d2982bd2
|
剧本预览代码调整
|
2020-07-21 19:27:32 +08:00 |
|
program-walker
|
96a32e1e37
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/layout/components/Title.vue
# src/scripts/ProjectConfig.js
# src/views/lesson/lessoncategory/edit/chapter/list.vue
# src/views/lesson/trainingRule/list.vue
# src/views/login/index.vue
# src/views/publish/examRule/draft/examFrom.vue
# src/views/publish/examRule/draft/index.vue
# src/views/publish/examRule/index.vue
# src/views/studentManage/index.vue
|
2020-07-21 19:19:54 +08:00 |
|
sunzhenyu
|
a292a4a6d2
|
修改三维无用注释
|
2020-07-21 17:30:36 +08:00 |
|
fan
|
64466ff7d6
|
综合演练初始化清除activeTrainList
|
2020-07-21 15:54:35 +08:00 |
|
fan
|
450eded4ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 15:39:09 +08:00 |
|
fan
|
d518ae9907
|
成员列表报错调整
|
2020-07-21 15:38:47 +08:00 |
|
joylink_cuiweidong
|
1038063860
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 15:23:23 +08:00 |
|
joylink_cuiweidong
|
54b838a46b
|
剧本预览代码调整
聊天会话代码优化
|
2020-07-21 15:15:28 +08:00 |
|
sunzhenyu
|
5c18430ff2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 15:10:08 +08:00 |
|
fan
|
dcc36af6cc
|
成员列表报错调整
|
2020-07-21 15:09:43 +08:00 |
|
sunzhenyu
|
8ce7e33c5e
|
删除三维无用console，修改cctv寻路obj路径
|
2020-07-21 14:59:17 +08:00 |
|
fan
|
b51b8680c2
|
会话调整
|
2020-07-21 14:56:46 +08:00 |
|
fan
|
ebeda7eb0d
|
会话调整
|
2020-07-21 13:57:45 +08:00 |
|
fan
|
1ea1583874
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 13:51:29 +08:00 |
|
fan
|
9ffd832562
|
会话调整
|
2020-07-21 13:51:13 +08:00 |
|
zyy
|
7498e7c844
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 13:38:13 +08:00 |
|
zyy
|
4bb41700bc
|
列车提示信息调整，哈尔滨线路操作
|
2020-07-21 13:37:59 +08:00 |
|
fan
|
337a2c127d
|
会话调整
|
2020-07-21 13:36:03 +08:00 |
|
fan
|
39afe867a4
|
会话调整
|
2020-07-21 13:32:43 +08:00 |
|
fan
|
acd929239b
|
会话调整
|
2020-07-21 13:22:58 +08:00 |
|
joylink_cuiweidong
|
d270f3ba59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 10:49:30 +08:00 |
|
joylink_cuiweidong
|
57ffa85451
|
剧本预览代码调整
|
2020-07-21 10:49:01 +08:00 |
|
fan
|
48d44ea15e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 10:03:25 +08:00 |
|
fan
|
5a716b335f
|
ibp设备配置调整
|
2020-07-21 10:03:13 +08:00 |
|
fan
|
0c08e93ba1
|
websocket调整&ibp设备配置调整
|
2020-07-21 10:01:19 +08:00 |
|
sunzhenyu
|
24794006f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 17:32:28 +08:00 |
|
sunzhenyu
|
ac0efbd97b
|
修改三维编辑器模型配置，修改三维的沙盘,驾驶,cctv,单体设备,通号维修模型加载，贴图加载的问题
|
2020-07-20 17:32:16 +08:00 |
|
fan
|
88253207d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 17:19:21 +08:00 |
|
fan
|
a1895d4e7f
|
参数名称修改
|
2020-07-20 17:19:05 +08:00 |
|
joylink_cuiweidong
|
aba0055974
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 17:14:15 +08:00 |
|
joylink_cuiweidong
|
95a9d18ccd
|
地图绘图代码调整
|
2020-07-20 17:13:56 +08:00 |
|
fan
|
ceb0d0803d
|
参数名称修改
|
2020-07-20 17:04:36 +08:00 |
|
fan
|
7b92d4775a
|
设备配置调整
|
2020-07-20 17:00:59 +08:00 |
|
fan
|
3d357ba515
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 16:54:19 +08:00 |
|
fan
|
60ca3e7376
|
设备配置调整
|
2020-07-20 16:54:10 +08:00 |
|
joylink_cuiweidong
|
b1821d8274
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 16:46:55 +08:00 |
|
joylink_cuiweidong
|
f809d514a1
|
地图绘制代码调整
|
2020-07-20 16:46:38 +08:00 |
|
fan
|
a5961f5651
|
设备配置title调整
|
2020-07-20 16:04:43 +08:00 |
|
fan
|
0403b249a1
|
设备配置调整
|
2020-07-20 16:00:27 +08:00 |
|
fan
|
072fe55b4f
|
heb取消无法登录提示
|
2020-07-20 15:22:20 +08:00 |
|
fan
|
1fb660d9e7
|
heb取消无法登录提示
|
2020-07-20 15:20:48 +08:00 |
|
fan
|
025b1595c3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 15:19:33 +08:00 |
|
fan
|
00608f2cb2
|
heb取消无法登录提示&会话、设备代码调整
|
2020-07-20 15:19:11 +08:00 |
|
joylink_cuiweidong
|
e2e66074af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 15:11:17 +08:00 |
|
joylink_cuiweidong
|
2dc14c9374
|
地图绘制代码调整
|
2020-07-20 15:10:57 +08:00 |
|
fan
|
01174384ff
|
设备配置添加显示条件
|
2020-07-20 14:00:47 +08:00 |
|
fan
|
29c89cf4a7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 13:39:11 +08:00 |
|
fan
|
23885760f3
|
会话调整
|
2020-07-20 13:38:54 +08:00 |
|
zyy
|
b071b00d21
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/system/commandDictionary/copyParam.vue
|
2020-07-20 13:31:02 +08:00 |
|
fan
|
00a98a5b14
|
merger
|
2020-07-20 13:29:32 +08:00 |
|
zyy
|
9e90adf9e9
|
调整指令复制接口
|
2020-07-20 13:29:22 +08:00 |
|
fan
|
6f20f4db18
|
会话调整
|
2020-07-20 13:18:38 +08:00 |
|
fan
|
18344338c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 11:18:34 +08:00 |
|
fan
|
05cf1251b9
|
psl添加关联屏蔽门属性
|
2020-07-20 11:18:19 +08:00 |
|
fan
|
826b4da854
|
公共会话切换
|
2020-07-20 10:48:53 +08:00 |
|
zyy
|
493a87cf38
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 10:47:41 +08:00 |
|
zyy
|
7bd6013565
|
增加指令字典 复制操作
|
2020-07-20 10:47:27 +08:00 |
|
joylink_cuiweidong
|
39eace3b40
|
剧本预览代码调整
|
2020-07-20 10:28:31 +08:00 |
|
zyy
|
3673eb1015
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-07-20 09:24:02 +08:00 |
|
zyy
|
02157c45a0
|
修改生成联锁数据提示信息
|
2020-07-20 09:23:08 +08:00 |
|
fan
|
ba90420115
|
merger
|
2020-07-17 19:08:42 +08:00 |
|
fan
|
3038d5571f
|
会话调整
|
2020-07-17 19:07:34 +08:00 |
|
zyy
|
e0f7175923
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 18:28:56 +08:00 |
|
zyy
|
04f1205e56
|
调整上行是否向右地图字段
|
2020-07-17 18:28:38 +08:00 |
|
fan
|
f954e3cf53
|
设备配置调整
|
2020-07-17 17:20:32 +08:00 |
|
joylink_cuiweidong
|
f0d0b6db79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 17:19:26 +08:00 |
|
joylink_cuiweidong
|
451b5343e0
|
剧本编制代码调整
|
2020-07-17 17:18:48 +08:00 |
|
fan
|
3e1e36c921
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 16:35:34 +08:00 |
|
fan
|
fefd4b53b6
|
会话调整&设备配置调整
|
2020-07-17 16:35:24 +08:00 |
|
joylink_cuiweidong
|
a5ce9e4a88
|
地图绘制代码调整
|
2020-07-17 15:45:44 +08:00 |
|
fan
|
7368cd14ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 14:32:43 +08:00 |
|
fan
|
c537063f8a
|
设备配置调整
|
2020-07-17 14:32:33 +08:00 |
|
joylink_cuiweidong
|
7449689d2c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 14:09:08 +08:00 |
|
joylink_cuiweidong
|
1e91cb616d
|
地图绘图代码调整
|
2020-07-17 14:08:14 +08:00 |
|
fan
|
3aa8807e63
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 13:05:30 +08:00 |
|
fan
|
b49aa386dd
|
设备配置调整
|
2020-07-17 13:05:18 +08:00 |
|
joylink_cuiweidong
|
56089e1a55
|
地图绘图代码优化
|
2020-07-17 11:14:50 +08:00 |
|
fan
|
fb4864496a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 19:11:35 +08:00 |
|
fan
|
0a50c69b2c
|
设备配置调整
|
2020-07-16 19:11:20 +08:00 |
|
joylink_cuiweidong
|
98d55deb64
|
地图绘制代码调整
|
2020-07-16 17:49:36 +08:00 |
|
joylink_cuiweidong
|
7ff599d49f
|
地图绘制布局调整（去掉scrollBar）
|
2020-07-16 16:18:13 +08:00 |
|
joylink_cuiweidong
|
f6e4e3c324
|
地图绘图样式调整
|
2020-07-16 14:41:21 +08:00 |
|
joylink_cuiweidong
|
8a34f47dbc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 13:34:11 +08:00 |
|
joylink_cuiweidong
|
2e91788a78
|
退出登陆 关闭socket连接调整
|
2020-07-16 13:33:45 +08:00 |
|
fan
|
0451bf1ab2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 13:31:36 +08:00 |
|
fan
|
c761e07ba2
|
设备配置调整
|
2020-07-16 13:31:05 +08:00 |
|
joylink_cuiweidong
|
a5df03f7c7
|
退出登陆 断开socket连接
|
2020-07-16 13:22:33 +08:00 |
|
joylink_cuiweidong
|
d2ae5169d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 10:51:16 +08:00 |
|
joylink_cuiweidong
|
ea429f36a9
|
地图绘图样式调整
|
2020-07-16 10:50:59 +08:00 |
|
zyy
|
7b400d83b5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 09:38:35 +08:00 |
|
zyy
|
f61ab58d0f
|
调整设备管理字段显示
|
2020-07-16 09:38:20 +08:00 |
|
joylink_cuiweidong
|
ae083cb20d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 19:05:45 +08:00 |
|
joylink_cuiweidong
|
cce290e73c
|
剧本预览代码调整
|
2020-07-15 19:05:32 +08:00 |
|
fan
|
24197cba1a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 18:36:58 +08:00 |
|
fan
|
6ed2916b2c
|
贵州学生管理分数计算精度统一
|
2020-07-15 18:36:46 +08:00 |
|
joylink_cuiweidong
|
2558f7ce98
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 18:09:27 +08:00 |
|
joylink_cuiweidong
|
94d02dc0f8
|
剧本编制样式调整
|
2020-07-15 18:08:49 +08:00 |
|
fan
|
531edc0d46
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 16:12:07 +08:00 |
|
fan
|
803941e838
|
设备管理道岔配置调整
|
2020-07-15 16:11:58 +08:00 |
|
joylink_cuiweidong
|
4fc77ee04b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 16:09:34 +08:00 |
|
joylink_cuiweidong
|
adde89a41d
|
剧本编制代码调整
|
2020-07-15 16:09:15 +08:00 |
|
fan
|
5c0285969c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 14:26:03 +08:00 |
|
zyy
|
a1cbcff9ea
|
调整道岔绘图，右键操作
|
2020-07-15 13:31:07 +08:00 |
|
fan
|
897407dde6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 10:11:36 +08:00 |
|
fan
|
fac190e91d
|
代码调整
|
2020-07-15 10:11:25 +08:00 |
|
joylink_cuiweidong
|
1d6868ee54
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 18:22:31 +08:00 |
|
joylink_cuiweidong
|
f9f58a70c4
|
剧本预览代码调整
绘图高级页面代码调整
|
2020-07-14 18:21:40 +08:00 |
|
zyy
|
b2f9e388aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 18:14:53 +08:00 |
|
zyy
|
172623c0f1
|
调整宁波线路道岔失表显示
|
2020-07-14 18:14:39 +08:00 |
|
fan
|
9efc0d4bfb
|
成员管理高度调整
|
2020-07-14 17:30:35 +08:00 |
|
fan
|
75fdf24d84
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 17:21:47 +08:00 |
|
fan
|
286d38db5c
|
会话调整
|
2020-07-14 17:21:39 +08:00 |
|
zyy
|
112b6a8ce3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 17:17:06 +08:00 |
|
zyy
|
fbf4cd7652
|
调整组件间传递事件
|
2020-07-14 17:16:49 +08:00 |
|
joylink_cuiweidong
|
28261153df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 16:52:52 +08:00 |
|
joylink_cuiweidong
|
8d41a5d730
|
剧本发布暂时去掉了审核
socket断线重连代码调整
|
2020-07-14 16:51:22 +08:00 |
|
fan
|
15f095a406
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 16:40:18 +08:00 |
|
fan
|
05284736d3
|
登录校验二维码登录调整
|
2020-07-14 16:40:09 +08:00 |
|
zyy
|
77b02b947e
|
调整设备连接流程
|
2020-07-14 16:07:43 +08:00 |
|
fan
|
22f70897c4
|
北信坤成页面调整
|
2020-07-14 16:04:55 +08:00 |
|
zyy
|
c2d158da5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 15:35:19 +08:00 |
|
zyy
|
952de95f4c
|
调整列车列表样式
|
2020-07-14 15:35:03 +08:00 |
|
fan
|
135fe2d917
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 15:32:29 +08:00 |
|
fan
|
0db415d5ca
|
北信坤成页面调整&&综合演练会话调整
|
2020-07-14 15:32:18 +08:00 |
|
sunzhenyu
|
9352cac2b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 15:03:38 +08:00 |
|
sunzhenyu
|
54a773aa84
|
修改录制三维驾驶托管模块
|
2020-07-14 15:03:31 +08:00 |
|
joylink_cuiweidong
|
66070d2157
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 14:48:41 +08:00 |
|
joylink_cuiweidong
|
a96ace44d1
|
剧本预览代码调整
|
2020-07-14 14:48:26 +08:00 |
|
zyy
|
b231f2b96f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 14:30:52 +08:00 |
|
zyy
|
dfc478b8d4
|
调整哈尔滨综合演练按钮位置，调整角色设置样式
|
2020-07-14 14:30:37 +08:00 |
|
joylink_cuiweidong
|
a752c1e636
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 14:28:14 +08:00 |
|
joylink_cuiweidong
|
99b622ef24
|
地图绘图代码调整
|
2020-07-14 14:27:35 +08:00 |
|
zyy
|
cb4e2bec19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 13:28:08 +08:00 |
|
zyy
|
8fb216dbae
|
增加项目中设备管理页面
|
2020-07-14 13:27:00 +08:00 |
|
joylink_cuiweidong
|
a462e540fb
|
socket 退出登陆 断开连接
绘图代码调整
|
2020-07-14 11:01:22 +08:00 |
|
sunzhenyu
|
006fd8f0a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 09:25:11 +08:00 |
|
sunzhenyu
|
f1cab6fba3
|
test
|
2020-07-14 09:24:58 +08:00 |
|
fan
|
440eeed75f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 18:40:53 +08:00 |
|
fan
|
7cdc3c5878
|
贵州导入班级报错提示&哈尔滨指令调整
|
2020-07-13 18:40:41 +08:00 |
|
zyy
|
1b61866b37
|
删除样式
|
2020-07-13 17:28:32 +08:00 |
|
zyy
|
06fecf9aad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 17:27:49 +08:00 |
|
zyy
|
1c15fdbdd9
|
增加所有线路列车故障模式
|
2020-07-13 17:27:33 +08:00 |
|
joylink_cuiweidong
|
3898f66e78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 17:02:11 +08:00 |
|
joylink_cuiweidong
|
d9ed44b218
|
剧本预览代码调整
新版地图绘制代码优化
|
2020-07-13 17:01:34 +08:00 |
|
fan
|
40402a9a8e
|
试卷规则bug修复&哈尔滨操作调整
|
2020-07-13 16:48:23 +08:00 |
|
fan
|
1b3a491d52
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:35:07 +08:00 |
|
fan
|
0ca0153c60
|
旧地图综合演练调整
|
2020-07-13 14:34:56 +08:00 |
|
zyy
|
ee9cf9f54d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:30:16 +08:00 |
|
zyy
|
6817323fe1
|
调整宁波列车故障右键
|
2020-07-13 14:30:01 +08:00 |
|
fan
|
938e789173
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 13:01:44 +08:00 |
|
fan
|
a5649cc6e8
|
哈尔滨操作调整
|
2020-07-13 13:01:28 +08:00 |
|
joylink_cuiweidong
|
1add21a740
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 10:16:07 +08:00 |
|
joylink_cuiweidong
|
57125367fc
|
剧本编制与剧本预览代码调整
|
2020-07-13 10:15:44 +08:00 |
|
zyy
|
fccbc9ecd0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 18:42:05 +08:00 |
|
zyy
|
f205ddf0fc
|
删除多余配置
|
2020-07-10 18:41:29 +08:00 |
|
fan
|
32f4657f4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 18:30:46 +08:00 |
|
fan
|
b10f08df67
|
设备登录调整&成员管理调整
|
2020-07-10 18:30:37 +08:00 |
|
sunzhenyu
|
9cc69e471b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 18:13:18 +08:00 |
|
sunzhenyu
|
e95d97136a
|
三维编辑器存读数据测试
|
2020-07-10 18:13:09 +08:00 |
|
joylink_cuiweidong
|
9627e85bf0
|
剧本编制 会话消息代码调整
|
2020-07-10 18:06:55 +08:00 |
|
joylink_cuiweidong
|
bf7ae6684e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 17:33:55 +08:00 |
|
joylink_cuiweidong
|
fe3ca3af2f
|
剧本编制代码调整
|
2020-07-10 17:33:37 +08:00 |
|
zyy
|
e6e0bb6d51
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 17:23:31 +08:00 |
|
zyy
|
1c98da6c11
|
调整路由配置
|
2020-07-10 17:23:17 +08:00 |
|
sunzhenyu
|
4dfe9d661b
|
修改录制三维驾驶托管逻辑
|
2020-07-10 17:15:57 +08:00 |
|
sunzhenyu
|
135d40ba49
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 17:15:13 +08:00 |
|
joylink_cuiweidong
|
5deef9fe6b
|
剧本编制代码调整
|
2020-07-10 17:14:30 +08:00 |
|
sunzhenyu
|
8831528b9a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 16:42:21 +08:00 |
|
sunzhenyu
|
eada9df066
|
修改录制三维状态
|
2020-07-10 16:42:12 +08:00 |
|
joylink_cuiweidong
|
2b5b21c1cf
|
剧本编制 角色列表代码调整
|
2020-07-10 16:40:42 +08:00 |
|
joylink_cuiweidong
|
6d3cd29a48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 15:34:35 +08:00 |
|
joylink_cuiweidong
|
4bd986b7eb
|
剧本编制代码调整
|
2020-07-10 15:34:19 +08:00 |
|
sunzhenyu
|
b1f2f173b2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 14:48:01 +08:00 |
|
sunzhenyu
|
8b3b151b95
|
修改三维驾驶录制获取驾驶员托管状态接口
|
2020-07-10 14:47:52 +08:00 |
|
joylink_cuiweidong
|
c432c8ffcb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 14:46:38 +08:00 |
|
joylink_cuiweidong
|
54a5a29f26
|
剧本预览代码调整
|
2020-07-10 14:46:18 +08:00 |
|
fan
|
31c8e8828f
|
通号打开三维界面
|
2020-07-10 14:39:47 +08:00 |
|
sunzhenyu
|
9ff6b5f574
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 11:32:37 +08:00 |
|
sunzhenyu
|
8f8192a8f7
|
修改综合演练三维退出重定向
|
2020-07-10 11:32:26 +08:00 |
|
zyy
|
9def448e4a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:56:16 +08:00 |
|
zyy
|
6cc8b3beaa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/jointTrainingNew/index.vue
|
2020-07-10 10:55:48 +08:00 |
|
joylink_cuiweidong
|
4c307cc848
|
剧本编制代码调整
|
2020-07-10 10:53:44 +08:00 |
|
zyy
|
348b07afa4
|
调整大屏系统列车显示问题
|
2020-07-10 10:52:31 +08:00 |
|
joylink_cuiweidong
|
40fe41a8ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:36:35 +08:00 |
|
joylink_cuiweidong
|
e13fcb02e5
|
故障设置代码调整
|
2020-07-10 10:36:10 +08:00 |
|
sunzhenyu
|
3a25657440
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:28:01 +08:00 |
|
sunzhenyu
|
3e84301b42
|
修改综合演练切换带三维界面的处理
|
2020-07-10 10:27:49 +08:00 |
|
fan
|
0d5be61a17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:00:51 +08:00 |
|
fan
|
ac3da3ef00
|
成员管理总数在线人数调整
|
2020-07-10 10:00:20 +08:00 |
|
sunzhenyu
|
ca83846790
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 09:17:15 +08:00 |
|
sunzhenyu
|
ccd14e903d
|
三维编辑器修改
|
2020-07-10 09:17:00 +08:00 |
|
sunleking
|
07d9f8603d
|
修改hideibp隐藏三维界面
|
2020-07-09 21:44:11 +08:00 |
|
zyy
|
ab2d2b004e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 18:52:25 +08:00 |
|
zyy
|
7b6148919c
|
调整综合监控默认进入第一个界面
|
2020-07-09 18:52:13 +08:00 |
|
fan
|
cb1e54b410
|
教研==》教员
|
2020-07-09 18:27:31 +08:00 |
|
fan
|
4098cba048
|
heb替换hyd
|
2020-07-09 18:04:11 +08:00 |
|
fan
|
3061b83c6a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 17:45:02 +08:00 |
|
fan
|
3301d2bebf
|
哈尔滨打包调整
|
2020-07-09 17:44:48 +08:00 |
|
joylink_cuiweidong
|
0c9cd52c9a
|
剧本编制代码调整
|
2020-07-09 17:39:43 +08:00 |
|
fan
|
82c0cf200d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 17:38:27 +08:00 |
|
fan
|
81de72cab0
|
哈尔滨打包调整
|
2020-07-09 17:38:16 +08:00 |
|
sunzhenyu
|
41a0ac6ebd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 17:23:19 +08:00 |
|
joylink_cuiweidong
|
5532bc5eba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 16:54:51 +08:00 |
|
joylink_cuiweidong
|
3aa0d55ea3
|
剧本编制代码调整
|
2020-07-09 16:54:31 +08:00 |
|
sunzhenyu
|
f424184363
|
修改录制界面三维驾驶初始车辆显示
|
2020-07-09 16:39:58 +08:00 |
|
sunzhenyu
|
df3b8eebd7
|
修改综合演练三维驾驶退出
|
2020-07-09 16:03:33 +08:00 |
|
sunzhenyu
|
93e0b71ab4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 15:46:19 +08:00 |
|
sunzhenyu
|
27d4c93775
|
修改三维编辑器
|
2020-07-09 15:46:12 +08:00 |
|
joylink_cuiweidong
|
ffab9631ce
|
代码调整
|
2020-07-09 15:45:32 +08:00 |
|
joylink_cuiweidong
|
84485c6f1d
|
剧本编制代码调整
|
2020-07-09 15:44:12 +08:00 |
|
joylink_cuiweidong
|
b7d0f11b9c
|
去掉断点
|
2020-07-09 15:16:12 +08:00 |
|
joylink_cuiweidong
|
15c6a151c9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 15:09:35 +08:00 |
|
joylink_cuiweidong
|
763d04d630
|
剧本编制 切换角色 过滤掉不在线的司机
|
2020-07-09 15:09:18 +08:00 |
|
fan
|
8af4eb6187
|
设备登录调整
|
2020-07-09 15:06:15 +08:00 |
|
fan
|
404c56e874
|
过滤司机角色调整
|
2020-07-09 13:05:50 +08:00 |
|
fan
|
577cc3c887
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 11:07:33 +08:00 |
|
fan
|
e658fb7889
|
哈尔滨项目调整
|
2020-07-09 11:07:04 +08:00 |
|
joylink_cuiweidong
|
9e71ca967f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 10:51:14 +08:00 |
|
joylink_cuiweidong
|
c315f9121a
|
剧本编制代码调整
|
2020-07-09 10:50:56 +08:00 |
|
fan
|
6bfe538bfc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 10:25:16 +08:00 |
|
fan
|
b14a730bab
|
哈尔滨项目调整
|
2020-07-09 10:25:04 +08:00 |
|
joylink_cuiweidong
|
0c95382b7e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 10:18:16 +08:00 |
|
joylink_cuiweidong
|
96ff4c49f6
|
剧本编制代码调整
|
2020-07-09 10:17:55 +08:00 |
|
fan
|
b07991b21f
|
登录页面调整
|
2020-07-09 09:38:51 +08:00 |
|
joylink_cuiweidong
|
3cd9d9416b
|
剧本代码调整
|
2020-07-08 18:56:32 +08:00 |
|
joylink_cuiweidong
|
dac800a86f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 18:36:07 +08:00 |
|
joylink_cuiweidong
|
b1005fd2ac
|
剧本编制代码调整
|
2020-07-08 18:35:46 +08:00 |
|
zyy
|
3693994526
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 18:35:25 +08:00 |
|
zyy
|
c4ffc859ce
|
调整大屏配置逻辑，登陆权限流程
|
2020-07-08 18:35:12 +08:00 |
|
fan
|
37d88998ab
|
清除会话@成员
|
2020-07-08 18:22:14 +08:00 |
|
fan
|
62430ea87b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 17:36:43 +08:00 |
|
fan
|
050fc8141c
|
设备登录调整
|
2020-07-08 17:36:32 +08:00 |
|
sunzhenyu
|
eff2657d08
|
修改综合演练屏蔽门直接显示
|
2020-07-08 17:24:38 +08:00 |
|
fan
|
3196304f1c
|
调整虚拟屏蔽门登录跳转路径
|
2020-07-08 16:43:18 +08:00 |
|
fan
|
5edd9f536e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 16:30:06 +08:00 |
|
fan
|
5b1aad5fc7
|
调整虚拟屏蔽门配置
|
2020-07-08 16:29:40 +08:00 |
|
zyy
|
6ff8019898
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 15:49:41 +08:00 |
|
zyy
|
fd89fe974e
|
调整列车驾驶设备
|
2020-07-08 15:49:16 +08:00 |
|
fan
|
e8d54bc1d0
|
合并代码
|
2020-07-08 15:42:23 +08:00 |
|
fan
|
714113c819
|
设备登录调整
|
2020-07-08 15:40:55 +08:00 |
|
zyy
|
7c8d1319f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 14:40:18 +08:00 |
|
zyy
|
753172433c
|
调整实训流程
|
2020-07-08 14:40:04 +08:00 |
|
sunzhenyu
|
0f39cbd2e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 14:07:32 +08:00 |
|
fan
|
49cd6213c9
|
调整cctv登录路径
|
2020-07-08 14:05:46 +08:00 |
|
sunzhenyu
|
2cbe94a16d
|
修改cctv无贴图配置
|
2020-07-08 14:04:14 +08:00 |
|
fan
|
3ba4ebe807
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 13:49:23 +08:00 |
|
fan
|
db5c516813
|
成员参数调整
|
2020-07-08 13:49:14 +08:00 |
|
sunzhenyu
|
7d8f4e6de2
|
修改三维设备在设备管理中显示样式
|
2020-07-08 13:28:06 +08:00 |
|
sunzhenyu
|
37a323ff23
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 13:19:49 +08:00 |
|
sunzhenyu
|
3161e256b8
|
修改设备界面query
|
2020-07-08 13:19:40 +08:00 |
|
fan
|
4a5923f263
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 13:11:36 +08:00 |
|
fan
|
1076eb2215
|
设备登录调整
|
2020-07-08 13:11:22 +08:00 |
|
joylink_cuiweidong
|
fe3ee372e9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 13:05:53 +08:00 |
|
joylink_cuiweidong
|
fc97643116
|
剧本编制代码调整
|
2020-07-08 13:05:09 +08:00 |
|
fan
|
b3ce617230
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 11:09:36 +08:00 |
|
fan
|
413307d6a5
|
操作类型调整
|
2020-07-08 11:09:26 +08:00 |
|
zyy
|
b58a4afdda
|
调整列车过滤
|
2020-07-08 10:56:14 +08:00 |
|
fan
|
0847988f81
|
试卷管理问题调整
|
2020-07-08 10:43:56 +08:00 |
|
zyy
|
6a14aaeace
|
调整大屏退出流程
|
2020-07-08 10:41:28 +08:00 |
|
zyy
|
6c1e78be50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 10:33:31 +08:00 |
|
zyy
|
6112d720be
|
调整贵州项目大屏配置
|
2020-07-08 10:33:15 +08:00 |
|
fan
|
d863e88a70
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 10:31:56 +08:00 |
|
fan
|
de617cde50
|
设备登录调整&试卷管理调整
|
2020-07-08 10:31:33 +08:00 |
|
sunzhenyu
|
73d1af19d0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 10:21:24 +08:00 |
|
sunzhenyu
|
9c0df60188
|
三维编辑器修改，三维cctv仿真结束登出
|
2020-07-08 10:21:14 +08:00 |
|
joylink_cuiweidong
|
eb6aca6114
|
剧本录制接口调整
|
2020-07-08 09:39:25 +08:00 |
|
joylink_cuiweidong
|
2121bcbb76
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 09:22:10 +08:00 |
|
joylink_cuiweidong
|
30b1163017
|
故障代码调整
设备代码调整
|
2020-07-08 09:21:54 +08:00 |
|
fan
|
4d30e317c6
|
合并代码
|
2020-07-07 19:02:16 +08:00 |
|
fan
|
086e56c1a7
|
设备登录调整
|
2020-07-07 19:00:48 +08:00 |
|
zyy
|
9416ae6729
|
调整判断
|
2020-07-07 18:49:14 +08:00 |
|
zyy
|
2c362db7c1
|
调整贵州项目试卷关联关系
|
2020-07-07 18:48:12 +08:00 |
|
zyy
|
db230c2622
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 18:33:59 +08:00 |
|
zyy
|
3c34494608
|
调整试卷班级关系
|
2020-07-07 18:33:43 +08:00 |
|
joylink_cuiweidong
|
f4f5173ea3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/system/deviceManage/editConfig.vue
|
2020-07-07 18:26:56 +08:00 |
|
joylink_cuiweidong
|
ac9a39f94c
|
设备管理代码调整
|
2020-07-07 18:25:05 +08:00 |
|
fan
|
85210dbf18
|
设备登录调整
|
2020-07-07 18:22:54 +08:00 |
|
fan
|
a543aa79d1
|
设备登录调整
|
2020-07-07 17:45:26 +08:00 |
|
zyy
|
e710e5eb34
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 17:37:59 +08:00 |
|
zyy
|
6b0d31dbbc
|
调整配置项
|
2020-07-07 17:37:45 +08:00 |
|
joylink_cuiweidong
|
00a4a8c184
|
自动设置故障（zc故障）代码调整
|
2020-07-07 17:08:01 +08:00 |
|
joylink_cuiweidong
|
e0eb8f30dc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 16:30:23 +08:00 |
|
joylink_cuiweidong
|
e2af1335a3
|
修改枚举
|
2020-07-07 16:30:06 +08:00 |
|
zyy
|
2d9bfeee2e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 16:17:44 +08:00 |
|
zyy
|
bb500d4c29
|
调整贵州装备试卷关系，样式
|
2020-07-07 16:17:29 +08:00 |
|
joylink_cuiweidong
|
b1bca0a1df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 16:09:29 +08:00 |
|
joylink_cuiweidong
|
3480ebb7b0
|
设备管理代码调整
|
2020-07-07 16:09:14 +08:00 |
|
fan
|
ed92adad02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 16:08:03 +08:00 |
|
fan
|
9dd81d0fd1
|
实训类型调整
|
2020-07-07 16:07:48 +08:00 |
|
joylink_cuiweidong
|
02d486c1af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 15:43:46 +08:00 |
|
joylink_cuiweidong
|
c345a60997
|
项目登陆路径调整（变成 design/login?project=xxx）
|
2020-07-07 15:42:56 +08:00 |
|
fan
|
a902265f0e
|
调整贵装备学生管理浮点数问题
|
2020-07-07 15:09:45 +08:00 |
|
fan
|
f83a60bd88
|
聊天室调整
|
2020-07-07 14:58:10 +08:00 |
|
fan
|
aced111815
|
聊天室调整
|
2020-07-07 14:11:04 +08:00 |
|
joylink_fanyuhong
|
24daf6aea1
|
聊天室调整
|
2020-07-07 13:15:20 +08:00 |
|
fan
|
0fd852cc5a
|
聊天室调整
|
2020-07-07 10:54:57 +08:00 |
|
fan
|
421e591f52
|
Merge remote-tracking branch 'origin/test_device_login' into test
# Conflicts:
# src/layout/components/Title.vue
# src/views/demonstration/detail/index.vue
|
2020-07-07 09:47:21 +08:00 |
|
fan
|
a9b3f614c8
|
聊天室调整
|
2020-07-07 09:39:27 +08:00 |
|
zyy
|
67edc61d0e
|
调整大屏分屏预览页面
|
2020-07-06 18:16:49 +08:00 |
|
fan
|
87d8dd9ea7
|
聊天室调整
|
2020-07-06 18:14:03 +08:00 |
|
fan
|
9883d0ed3c
|
聊天室调整
|
2020-07-06 18:00:44 +08:00 |
|
zyy
|
6be93b39ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-06 17:02:31 +08:00 |
|
zyy
|
2c5c30216f
|
调整大屏预览流程，增加大屏分屏配置
|
2020-07-06 17:02:13 +08:00 |
|
joylink_cuiweidong
|
75244ca959
|
任何创建者 创建试卷 有试用选项
|
2020-07-06 13:31:49 +08:00 |
|
fan
|
75e838b96f
|
聊天室调整
|
2020-07-03 18:42:29 +08:00 |
|
joylink_cuiweidong
|
ebf86de377
|
故障操作代码调整
|
2020-07-03 18:39:24 +08:00 |
|
joylink_cuiweidong
|
147f2570ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 17:13:44 +08:00 |
|
joylink_cuiweidong
|
654b79fc27
|
故障操作代码调整
|
2020-07-03 17:13:24 +08:00 |
|
sunzhenyu
|
8213999c4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 16:35:50 +08:00 |
|
joylink_cuiweidong
|
3ae8582f05
|
剧本接口调整（预览与 删除剧本开始执行接口）
|
2020-07-03 16:29:40 +08:00 |
|
sunzhenyu
|
2282376acf
|
修改通号三维bug
|
2020-07-03 16:29:07 +08:00 |
|
zyy
|
ab94e1f981
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 15:19:12 +08:00 |
|
zyy
|
8a5845749e
|
调整绘图流程逻辑 删除多余配置
|
2020-07-03 15:18:58 +08:00 |
|
sunzhenyu
|
92d39f28ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 13:49:13 +08:00 |
|
sunzhenyu
|
0b08bfae9f
|
综合演练三维通号增加设备间，三维编辑器资源管理链接配置
|
2020-07-03 13:49:05 +08:00 |
|
zyy
|
84937e8c5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 11:12:10 +08:00 |
|
zyy
|
f91fc75528
|
调整西安线路进路状态
|
2020-07-03 11:11:57 +08:00 |
|
fan
|
671dff4016
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 10:37:41 +08:00 |
|
fan
|
189c649a89
|
调整因缓存路由导致的项目进入其他地图页面错误
|
2020-07-03 10:37:33 +08:00 |
|
joylink_cuiweidong
|
92c10db690
|
剧本录制代码调整
|
2020-07-03 09:46:26 +08:00 |
|
zyy
|
fa5097cd8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-02 18:47:57 +08:00 |
|
zyy
|
3b39a9a04b
|
调整区段字段，控制权操作
|
2020-07-02 18:47:39 +08:00 |
|
fan
|
872122e92b
|
综合演练仿真调整
|
2020-07-02 17:57:48 +08:00 |
|
joylink_cuiweidong
|
ac4c0baecf
|
西安三号线 仿真右侧列车列表代码调整
修改故障枚举
修改退出聊天会话接口
|
2020-07-02 17:44:20 +08:00 |
|
sunzhenyu
|
b4d6bbbc03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-02 15:33:42 +08:00 |
|
sunzhenyu
|
c34aa9d223
|
增加三维资源模型上传页面
|
2020-07-02 15:33:35 +08:00 |
|
joylink_cuiweidong
|
146d6c2d0b
|
成都三号线站台操作代码调整
|
2020-07-02 13:28:36 +08:00 |
|
joylink_cuiweidong
|
50c7363791
|
故障操作代码调整
|
2020-07-02 10:10:16 +08:00 |
|
fan
|
13a4ee614c
|
综合演练仿真调整
|
2020-07-01 18:52:29 +08:00 |
|
zyy
|
649704d3ee
|
增加实训类型
|
2020-07-01 18:49:35 +08:00 |
|
zyy
|
64d415dbb3
|
调整地图绘图数据模型
|
2020-07-01 18:08:42 +08:00 |
|
zyy
|
3c6d5b903d
|
调整联锁配置，调整数据模型
|
2020-07-01 14:52:27 +08:00 |
|
joylink_cuiweidong
|
e5fff7388b
|
地图绘制 显示条件（showCondition）调整
|
2020-07-01 13:18:43 +08:00 |
|
sunzhenyu
|
9d855f5910
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-01 12:11:30 +08:00 |
|
sunzhenyu
|
49cd3fee81
|
修改通号设备故障名称显示
|
2020-07-01 12:11:19 +08:00 |
|
joylink_cuiweidong
|
4f866bf257
|
故障操作代码调整
|
2020-07-01 11:27:09 +08:00 |
|
joylink_cuiweidong
|
ff1e707112
|
故障代码调整
|
2020-07-01 09:32:36 +08:00 |
|
joylink_cuiweidong
|
c0e3c99dc8
|
故障代码调整
|
2020-07-01 09:32:01 +08:00 |
|
joylink_cuiweidong
|
79534ffa5e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 19:17:45 +08:00 |
|
joylink_cuiweidong
|
1c6eb510c9
|
故障代码调整
|
2020-06-30 19:17:29 +08:00 |
|
fan
|
ce180b1448
|
综合演练仿真调整
|
2020-06-30 18:35:57 +08:00 |
|
zyy
|
58a9b27939
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 15:44:48 +08:00 |
|
zyy
|
b43009ab06
|
调整权限分配时间限制
|
2020-06-30 15:44:31 +08:00 |
|
joylink_cuiweidong
|
b934ee7edb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 14:41:56 +08:00 |
|
fan
|
6a0433f12f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 14:43:20 +08:00 |
|
fan
|
755eab6301
|
调整考试系统获取数据为空时未清除原有数据
|
2020-06-30 14:42:56 +08:00 |
|
joylink_cuiweidong
|
619adde869
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 14:41:40 +08:00 |
|
joylink_cuiweidong
|
bb6c5319c7
|
故障管理页面代码调整
|
2020-06-30 14:41:22 +08:00 |
|
fan
|
8f4cecec0c
|
综合演练调整
|
2020-06-30 14:27:32 +08:00 |
|
zyy
|
9748ca2f63
|
调整成都三号线操作定义，位置提示
|
2020-06-30 13:32:50 +08:00 |
|
zyy
|
82415903f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 11:19:58 +08:00 |
|
zyy
|
7df86adff1
|
调整表单赋值拷贝
|
2020-06-30 11:19:33 +08:00 |
|
joylink_cuiweidong
|
f6982eb966
|
解决 实训平台邀请综合演练 设计平台弹出邀请弹窗的问题
仿真代码调整
|
2020-06-29 17:33:19 +08:00 |
|
joylink_cuiweidong
|
ccb976f078
|
仿真代码调整
|
2020-06-29 15:55:31 +08:00 |
|
fan
|
a689103abe
|
综合演练调整
|
2020-06-29 13:11:27 +08:00 |
|
fan
|
103ae24b64
|
仿真成员管理
|
2020-06-29 09:12:30 +08:00 |
|
joylink_cuiweidong
|
237aece890
|
代码调整
|
2020-06-28 18:34:32 +08:00 |
|
zyy
|
2ddd8f12d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 16:04:18 +08:00 |
|
zyy
|
7873917d43
|
调整数据模型过滤空置，调整成都3号线实操
|
2020-06-28 16:03:59 +08:00 |
|
joylink_cuiweidong
|
36883d9587
|
iscs 转换函数代码调整
ibp盘绘制代码调整
|
2020-06-28 15:27:10 +08:00 |
|
fan
|
4f248c3b19
|
综合演练界面调整&项目配置整理
|
2020-06-28 14:27:28 +08:00 |
|
joylink_cuiweidong
|
d76dfe293e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 13:44:22 +08:00 |
|
joylink_cuiweidong
|
24c975184c
|
设计平台 课程设计代码优化
|
2020-06-28 13:44:04 +08:00 |
|
zyy
|
e3ee44aae7
|
调整道岔失表状态，成都3号线实操定义
|
2020-06-28 13:27:10 +08:00 |
|
fan
|
80524d254d
|
项目配置调整
|
2020-06-28 10:33:35 +08:00 |
|
fan
|
d7a5b555a2
|
设备登录调整
|
2020-06-24 18:40:48 +08:00 |
|
zyy
|
c570e418e1
|
调整佛山操作定义，调整个人信息
|
2020-06-24 17:37:09 +08:00 |
|
fan
|
599afaaeae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 15:02:23 +08:00 |
|
fan
|
86c7e44876
|
iscs调整
|
2020-06-24 15:02:09 +08:00 |
|
zyy
|
45cac99681
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:06:45 +08:00 |
|
zyy
|
3b330a0932
|
调整佛山线路实训定义，删除区段定义
|
2020-06-24 14:06:17 +08:00 |
|
fan
|
9a620f8629
|
西安三道岔设置故障&iscs调整（未完）
|
2020-06-24 13:27:58 +08:00 |
|
fan
|
45b88d3a46
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 10:00:24 +08:00 |
|
fan
|
8c476d0dcc
|
新建课程参数丢失问题调整
|
2020-06-24 10:00:13 +08:00 |
|
fan
|
0128576386
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 09:25:04 +08:00 |
|
fan
|
d5cd233e98
|
调整故障操作
|
2020-06-24 09:24:54 +08:00 |
|
joylink_cuiweidong
|
45a0f35901
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 09:24:36 +08:00 |
|
joylink_cuiweidong
|
0f7cdb2b8e
|
剧本编制代码调整
|
2020-06-24 09:24:08 +08:00 |
|
joylink_cuiweidong
|
b85362460e
|
剧本代码调整
|
2020-06-23 18:59:20 +08:00 |
|
fan
|
0ae6ec9237
|
调整登录状态检测&删除冗余配置
|
2020-06-23 16:21:54 +08:00 |
|
fan
|
e67f98e9a0
|
合并代码
|
2020-06-23 15:26:26 +08:00 |
|
fan
|
a2664eb5dc
|
登录调整&综合演练调整&菜单调整
|
2020-06-23 15:18:44 +08:00 |
|
joylink_cuiweidong
|
f1004dd52a
|
剧本编制代码调整
|
2020-06-23 15:15:46 +08:00 |
|
joylink_cuiweidong
|
df475ab28a
|
剧本编制修改会话代码调整
|
2020-06-23 14:17:35 +08:00 |
|
joylink_cuiweidong
|
677ebcaa7f
|
剧本编制修改会话代码调整
|
2020-06-23 10:57:35 +08:00 |
|
joylink_cuiweidong
|
68624ba8ac
|
剧本编制修改会话代码调整
|
2020-06-23 10:27:18 +08:00 |
|
sunzhenyu
|
869ddc78b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 10:08:01 +08:00 |
|
sunzhenyu
|
01351fb34a
|
test
|
2020-06-23 10:07:52 +08:00 |
|
zyy
|
88211cee8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 09:27:10 +08:00 |
|
zyy
|
4e36c7b456
|
调整默认配置
|
2020-06-23 09:26:58 +08:00 |
|
joylink_cuiweidong
|
d789a30333
|
剧本编制代码调整
|
2020-06-22 18:37:09 +08:00 |
|
joylink_cuiweidong
|
d3d17f7bf6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-22 14:30:14 +08:00 |
|
joylink_cuiweidong
|
5580a79344
|
仿真右侧列车列表调整
福州线操作代码调整
|
2020-06-22 14:29:55 +08:00 |
|
zyy
|
e934860885
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-22 13:49:59 +08:00 |
|
zyy
|
58ab773ec9
|
删除多余配置
|
2020-06-22 13:49:42 +08:00 |
|
fan
|
5cfec3e09f
|
课程创建角色可以直接发布课程&&sockjs恢复版本
|
2020-06-22 10:49:41 +08:00 |
|
fan
|
ab6b0036d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-22 09:49:58 +08:00 |
|
fan
|
0f519c8a89
|
贵装备导入学生信息后刷新班级列表
|
2020-06-22 09:49:45 +08:00 |
|
joylink_cuiweidong
|
9cb46f16b7
|
剧本添加动作类型Drive
|
2020-06-19 19:08:33 +08:00 |
|
joylink_cuiweidong
|
ba05a22eb9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 18:59:13 +08:00 |
|
joylink_cuiweidong
|
32f4ead036
|
剧本代码调整
|
2020-06-19 18:58:55 +08:00 |
|
fan
|
2f996e10e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 18:39:51 +08:00 |
|
fan
|
4d3a1eed73
|
项目设备管理调整
|
2020-06-19 18:39:41 +08:00 |
|
zyy
|
06bbc69389
|
删除老版本绘图
|
2020-06-19 18:19:45 +08:00 |
|
fan
|
df983b2cb9
|
项目设备管理调整
|
2020-06-19 18:02:50 +08:00 |
|
joylink_cuiweidong
|
9138fab486
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 13:01:35 +08:00 |
|
joylink_cuiweidong
|
100c651068
|
剧本代码调整
|
2020-06-19 11:30:12 +08:00 |
|
sunzhenyu
|
4a831d4aa7
|
merge baseurl
|
2020-06-19 11:26:40 +08:00 |
|
sunzhenyu
|
45c96bd76f
|
修改三维驾驶录制界面中托管按钮
|
2020-06-19 11:23:47 +08:00 |
|
fan
|
3a4641f06f
|
合并代码
|
2020-06-19 10:24:11 +08:00 |
|
fan
|
f0ae68d94a
|
登录接口调整
|
2020-06-19 10:23:13 +08:00 |
|
joylink_cuiweidong
|
090d2bdfc1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 10:07:54 +08:00 |
|
joylink_cuiweidong
|
ad756eee10
|
剧本编制代码调整
|
2020-06-19 10:06:58 +08:00 |
|
sunzhenyu
|
3e21c2827c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 09:56:53 +08:00 |
|
sunzhenyu
|
2a50dd1be2
|
修改三维驾驶刷新重连列车bug
|
2020-06-19 09:56:40 +08:00 |
|
joylink_cuiweidong
|
f2a3867ed8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:50:34 +08:00 |
|
joylink_cuiweidong
|
d9f6d515fd
|
剧本添加司机的指令操作
|
2020-06-18 18:49:19 +08:00 |
|
sunzhenyu
|
03716c5ed3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:40:56 +08:00 |
|
sunzhenyu
|
8b2c0cc00a
|
修改三维驾驶通信接口改post
|
2020-06-18 18:40:47 +08:00 |
|
joylink_cuiweidong
|
04b9f6062a
|
去掉断点
|
2020-06-18 14:38:33 +08:00 |
|
joylink_cuiweidong
|
7b9fe40dbd
|
剧本代码调整
|
2020-06-18 14:36:23 +08:00 |
|
joylink_cuiweidong
|
4c99069752
|
剧本代码调整
|
2020-06-18 14:19:13 +08:00 |
|
joylink_cuiweidong
|
426aed9ef1
|
剧本代码调整
|
2020-06-18 09:20:42 +08:00 |
|
joylink_cuiweidong
|
eefbf70002
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 18:36:45 +08:00 |
|
joylink_cuiweidong
|
0983307bc7
|
剧本代码调整
|
2020-06-17 18:36:22 +08:00 |
|
sunzhenyu
|
47d77d6925
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 18:17:00 +08:00 |
|
sunzhenyu
|
b70feae183
|
增加三维驾驶超速报警和牵引状态mmi显示，增加剧本设计中三维驾驶
|
2020-06-17 18:16:49 +08:00 |
|
joylink_cuiweidong
|
068fc65f3d
|
剧本代码调整
|
2020-06-17 15:33:04 +08:00 |
|
joylink_cuiweidong
|
556d7fa109
|
仿真右侧列车显示代码调整
|
2020-06-17 15:31:15 +08:00 |
|
joylink_cuiweidong
|
283206e55d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 14:19:07 +08:00 |
|
joylink_cuiweidong
|
b78f90034a
|
剧本录制代码调整
|
2020-06-17 14:18:46 +08:00 |
|
sunzhenyu
|
3ec20a75c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 13:32:29 +08:00 |
|
sunzhenyu
|
71a0faa648
|
三维cctv站台名站台标方向添加
|
2020-06-17 13:32:14 +08:00 |
|
zyy
|
18c4d36606
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 10:30:11 +08:00 |
|
zyy
|
b530818a7e
|
调整综合检控 cctv 流程
|
2020-06-17 10:29:56 +08:00 |
|
joylink_cuiweidong
|
9da1e3bbac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 09:57:13 +08:00 |
|
joylink_cuiweidong
|
584654daec
|
剧本代码调整
|
2020-06-17 09:56:51 +08:00 |
|
zyy
|
88ac5afa45
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 09:16:16 +08:00 |
|
zyy
|
17158401de
|
调整综合监控导航栏
|
2020-06-17 09:16:03 +08:00 |
|
fan
|
6cc44b5528
|
合并代码
|
2020-06-16 18:38:21 +08:00 |
|
fan
|
3b171130f9
|
福州列车显示调整&表单组件button增加loading
|
2020-06-16 18:36:18 +08:00 |
|
sunzhenyu
|
e7a9b8f737
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 18:18:56 +08:00 |
|
sunzhenyu
|
e415dc28c0
|
修改三维驾驶mmi车门显示和控制面板关门灯
|
2020-06-16 18:18:47 +08:00 |
|
zyy
|
73338a7eaa
|
增加宁波线路车站折返逻辑
|
2020-06-16 17:49:55 +08:00 |
|
zyy
|
6d7c75e5f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 16:39:20 +08:00 |
|
zyy
|
7f242ba443
|
调整综合监控绘图元素， 调整按图折返配置
|
2020-06-16 16:39:07 +08:00 |
|
fan
|
a6ff101a6e
|
竞业达页面调整
|
2020-06-16 15:10:39 +08:00 |
|
zyy
|
10502988a4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 14:45:50 +08:00 |
|
zyy
|
dfdbddad2b
|
调整综合监控数据，调整地图绘制功能按钮显示状态逻辑判断
|
2020-06-16 14:45:34 +08:00 |
|
sunzhenyu
|
33343f6447
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 13:17:30 +08:00 |
|
sunzhenyu
|
a2c2a963a4
|
增加三维驾驶关车门亮灯，修改三维道岔转辙机动画速度，修改三维仿真驾驶中车站模型增加图片资源
|
2020-06-16 13:17:11 +08:00 |
|
fan
|
35b6d9093a
|
地图绘制信号机添加属性noOverlap是否无延续保护
|
2020-06-16 09:50:39 +08:00 |
|
fan
|
271ef9dc11
|
添加通用配置项noParkingSM，parkingSM
|
2020-06-15 18:37:48 +08:00 |
|
zyy
|
28cc15fd10
|
调整综合监控数据，调整系统右键菜单样式
|
2020-06-15 17:16:26 +08:00 |
|
zyy
|
0f33f9d876
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-15 16:13:51 +08:00 |
|
zyy
|
428967e843
|
调整地图绘制右键菜单样式，调整道岔触发居中，绘制综合监控数据
|
2020-06-15 16:13:28 +08:00 |
|
fan
|
c4ce6ae0f9
|
线路管理添加配置项-ctcOverlapOnlyTurnBackStationLock
|
2020-06-15 14:33:38 +08:00 |
|
fan
|
a381bfdcd8
|
退出计划调整为初始化，并不限制点击
|
2020-06-15 13:34:24 +08:00 |
|
fan
|
3f978a2aa8
|
竞业达页面调整
|
2020-06-15 13:03:24 +08:00 |
|
fan
|
42d9e058a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-15 10:05:38 +08:00 |
|
fan
|
a732b9c19b
|
添加竞业达登录页面
|
2020-06-15 10:05:27 +08:00 |
|
zyy
|
1132043e13
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 18:31:11 +08:00 |
|
zyy
|
5622cc5216
|
调整公共地图右键菜单样式
|
2020-06-12 18:30:50 +08:00 |
|
joylink_cuiweidong
|
3248f3badf
|
剧本代码调整
|
2020-06-12 18:29:14 +08:00 |
|
joylink_cuiweidong
|
3944f743c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 17:44:43 +08:00 |
|
joylink_cuiweidong
|
de8bbcf2bb
|
剧本代码调整
|
2020-06-12 17:44:18 +08:00 |
|
zyy
|
a166d492f1
|
调整字段名称，删除注释
|
2020-06-12 17:16:08 +08:00 |
|
zyy
|
66260cf3ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 17:12:28 +08:00 |
|
zyy
|
5a01bbfbcf
|
调整综合监控加载数据流程
|
2020-06-12 17:12:13 +08:00 |
|
joylink_cuiweidong
|
29b0937253
|
剧本代码调整
|
2020-06-12 16:28:52 +08:00 |
|
joylink_cuiweidong
|
a7ca270be0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 16:12:47 +08:00 |
|
joylink_cuiweidong
|
6d5ba33e1f
|
剧本代码调整
|
2020-06-12 16:12:33 +08:00 |
|
zyy
|
64a7e0e1ab
|
调整综合监控元素点击事件， 调整右键菜单样式
|
2020-06-12 15:34:53 +08:00 |
|
joylink_cuiweidong
|
c4b325c63d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 11:31:50 +08:00 |
|
joylink_cuiweidong
|
d942ae7916
|
剧本代码调整
|
2020-06-12 11:31:30 +08:00 |
|
zyy
|
f7c6f6ee64
|
调整区段配置
|
2020-06-12 09:55:53 +08:00 |
|
joylink_cuiweidong
|
9126397070
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 18:33:49 +08:00 |
|
joylink_cuiweidong
|
b341735a8c
|
剧本代码调整
|
2020-06-11 18:32:26 +08:00 |
|
zyy
|
6402e6312b
|
调整逻辑区段 名称偏移量
|
2020-06-11 17:53:35 +08:00 |
|
zyy
|
547c7efe5a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:39:46 +08:00 |
|
zyy
|
9c0d69e81e
|
删除逻辑对应车次窗
|
2020-06-11 17:39:33 +08:00 |
|
fan
|
434d7fdbbe
|
信号机批量设置灯位类型
|
2020-06-11 17:28:15 +08:00 |
|
fan
|
0f1ae1e8a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:06:49 +08:00 |
|
fan
|
fb570eb522
|
sics调整
|
2020-06-11 17:06:37 +08:00 |
|
zyy
|
ffd5fc79bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 14:48:54 +08:00 |
|
zyy
|
24acb1ba86
|
调整配置，增加综合监控数据
|
2020-06-11 14:48:40 +08:00 |
|
joylink_cuiweidong
|
f03880e59e
|
仿真聊天代码调整
|
2020-06-11 13:43:58 +08:00 |
|
joylink_cuiweidong
|
285749f3eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 13:29:31 +08:00 |
|
joylink_cuiweidong
|
dda8f39adf
|
新版地图右键操作 弹窗代码调整
|
2020-06-11 13:29:06 +08:00 |
|
fan
|
d16cd89fe4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 11:26:48 +08:00 |
|
fan
|
7d7583a7e2
|
时间表管理&添加通用配置项
|
2020-06-11 11:26:41 +08:00 |
|
sunzhenyu
|
4cdda87372
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 10:48:15 +08:00 |
|
sunzhenyu
|
52437f157f
|
修改三维驾驶换端车门动画变化bug
|
2020-06-11 10:48:04 +08:00 |
|
joylink_cuiweidong
|
3e6da59b3b
|
代码调整
|
2020-06-11 09:44:56 +08:00 |
|
joylink_cuiweidong
|
cb3663722f
|
代码调整
|
2020-06-11 09:43:02 +08:00 |
|
joylink_cuiweidong
|
8f2e7f974e
|
代码调整
|
2020-06-10 18:38:50 +08:00 |
|
joylink_cuiweidong
|
7a7b442a89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 18:03:10 +08:00 |
|
joylink_cuiweidong
|
95715a9f12
|
代码调整
|
2020-06-10 18:02:46 +08:00 |
|
zyy
|
e688625887
|
调整大屏高度计算
|
2020-06-10 17:59:51 +08:00 |
|
zyy
|
ce87a96db3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/map.js
|
2020-06-10 17:04:12 +08:00 |
|
zyy
|
75e9db45fa
|
调整右键菜单
|
2020-06-10 17:02:39 +08:00 |
|
fan
|
9b489d088b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 16:57:04 +08:00 |
|
fan
|
139066d66f
|
综合演练非管理员同步计时&综合演练切大屏&iscs机电时间表管理
|
2020-06-10 16:56:52 +08:00 |
|
sunzhenyu
|
4cec1efc09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 16:30:58 +08:00 |
|
sunzhenyu
|
365cd7de44
|
增加列车开关门操作
|
2020-06-10 16:30:23 +08:00 |
|
joylink_cuiweidong
|
c953d98ffa
|
佛山线路 现地信号机 操作调整
|
2020-06-10 14:37:43 +08:00 |
|
joylink_cuiweidong
|
4118eb7a32
|
线路配置添加参数 列车控制模式/级别
|
2020-06-10 13:42:06 +08:00 |
|
joylink_cuiweidong
|
c73769f90d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 13:24:27 +08:00 |
|
joylink_cuiweidong
|
b169bb1e20
|
佛山有轨电车指令代码调整
|
2020-06-10 13:24:12 +08:00 |
|
fan
|
1d56ae8249
|
合并代码
|
2020-06-09 18:33:17 +08:00 |
|
fan
|
fa8c31b2d4
|
iscs 照明系统模式表&时间表
|
2020-06-09 18:31:21 +08:00 |
|
zyy
|
d360dc26b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 17:48:28 +08:00 |
|
zyy
|
015dd9e113
|
调整综合监控数据，调整绘图
|
2020-06-09 17:48:08 +08:00 |
|
fan
|
c119d5130f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 14:39:43 +08:00 |
|
fan
|
4b67f81cf0
|
iscs 小系统模式表
|
2020-06-09 14:39:32 +08:00 |
|
joylink_cuiweidong
|
6b551b04fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 13:34:48 +08:00 |
|
joylink_cuiweidong
|
83e8a6658a
|
线路配置添加字段（道岔正/反操是否联动，道岔单解/锁是否联动，是否强制取消进路/在接近区段占用时是否依旧强制执行取消进路）
|
2020-06-09 13:34:32 +08:00 |
|
zyy
|
f43d964d29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-06-09 13:26:01 +08:00 |
|
zyy
|
8c52fcc8ef
|
调整iscs 鼠标事件流程
|
2020-06-09 13:24:18 +08:00 |
|
fan
|
0902d10f4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 18:41:00 +08:00 |
|
fan
|
de2defc461
|
iscs 小系统模式表&交互
|
2020-06-08 18:40:48 +08:00 |
|
sunzhenyu
|
a18a7bccc6
|
merge jointtrainningnew/index.vue
|
2020-06-08 18:26:30 +08:00 |
|
sunzhenyu
|
b33f4c17b2
|
merge pull
|
2020-06-08 18:24:09 +08:00 |
|
sunzhenyu
|
6cae01f373
|
增加三维驾驶换端操作，修改三维cctv中前往站台找不到路径点bug，增加综合演练车站cctv
|
2020-06-08 18:22:12 +08:00 |
|
joylink_cuiweidong
|
404a23e35e
|
iscs 小系统代码调整
|
2020-06-08 17:59:28 +08:00 |
|
joylink_cuiweidong
|
98ed49715a
|
综合演练仿真会话自动播放调整
|
2020-06-08 13:55:26 +08:00 |
|
joylink_cuiweidong
|
6f59f03acd
|
裁判系统 获取参赛者的历史对话
|
2020-06-08 11:28:40 +08:00 |
|
fan
|
1170ed5f0c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:59:42 +08:00 |
|
fan
|
fc0772a11c
|
iscs调整&站后折返显示调整
|
2020-06-05 18:59:35 +08:00 |
|
sunzhenyu
|
4f6e4ff2fc
|
修改三维驾驶列车排序，修改三维驾驶面板图标刷新，完善三维cctv的乘客上下车，优化ai逻辑，修改进出站闸机逻辑。修改三维编辑器站台内外侧属性赋值。修改通号三维设备初次加载面板bug
|
2020-06-05 18:56:42 +08:00 |
|
joylink_cuiweidong
|
99346c4b02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:48:26 +08:00 |
|
joylink_cuiweidong
|
38b7580f79
|
佛山线路 道岔在单锁的状态时，使用道岔单解的功能，未起到双确认调整
停站时间没有具体停站多少时间调整
|
2020-06-05 18:48:07 +08:00 |
|
zyy
|
c86bb0bff3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:04:42 +08:00 |
|
zyy
|
768c62333c
|
调整站台操作，增加综合监控调节
|
2020-06-05 18:04:27 +08:00 |
|
joylink_cuiweidong
|
4d918cc6a7
|
裁判平台回放代码调整
|
2020-06-05 15:54:03 +08:00 |
|
joylink_cuiweidong
|
cf0a078635
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:53:43 +08:00 |
|
joylink_cuiweidong
|
7c76ba9021
|
裁判系统回放代码调整
|
2020-06-05 14:53:18 +08:00 |
|
zyy
|
465da976d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:52:20 +08:00 |
|
fan
|
e98dab8d56
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:46:47 +08:00 |
|
fan
|
7d8a8f8fb6
|
实操竞赛计时调整&iscs调整
|
2020-06-05 14:46:37 +08:00 |
|
joylink_cuiweidong
|
6f0cc20a42
|
新版剧本修改对话代码调整
|
2020-06-05 14:12:22 +08:00 |
|
joylink_cuiweidong
|
767e5cc48a
|
裁判系统代码调整
|
2020-06-05 13:41:47 +08:00 |
|
zyy
|
fbf26cfafc
|
调整综合监控绘图元素，保存绘图数据
|
2020-06-05 13:24:38 +08:00 |
|
joylink_cuiweidong
|
ea6d74d3c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 13:06:40 +08:00 |
|
joylink_cuiweidong
|
7f72ed4048
|
裁判系统代码调整
|
2020-06-05 13:05:33 +08:00 |
|
zyy
|
8bd88fe20b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:32:56 +08:00 |
|
zyy
|
f4fca9a083
|
调整策略右键弹出窗口，增加综合监控元素配置
|
2020-06-05 10:32:32 +08:00 |
|
joylink_cuiweidong
|
e3b2726d8b
|
裁判系统查看理论考试结果页面调整
|
2020-06-05 10:31:58 +08:00 |
|
zyy
|
3b137ffae9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:14:23 +08:00 |
|
zyy
|
30d76e763e
|
调整折返按钮 状态返回处理
|
2020-06-05 10:14:12 +08:00 |
|
fan
|
c7d07ebd9d
|
合并代码
|
2020-06-05 09:39:48 +08:00 |
|
fan
|
6dfbe18485
|
实操竞赛比赛计时&题目展示&结果展示
|
2020-06-05 09:38:14 +08:00 |
|
joylink_cuiweidong
|
74b6e66aff
|
裁判系统回放代码调整
|
2020-06-05 09:35:00 +08:00 |
|
joylink_cuiweidong
|
46afe1aa96
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 19:20:18 +08:00 |
|
joylink_cuiweidong
|
7764f89797
|
裁判系统代码调整
|
2020-06-04 19:19:58 +08:00 |
|
zyy
|
a4df31fcc3
|
调整字段显示
|
2020-06-04 18:24:39 +08:00 |
|
zyy
|
24f089be32
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 17:59:08 +08:00 |
|
zyy
|
4a03d8613b
|
调整车站折返策略
|
2020-06-04 17:58:42 +08:00 |
|
joylink_cuiweidong
|
78d8da26b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 17:52:12 +08:00 |
|
joylink_cuiweidong
|
d560d11ef5
|
裁判系统 回放页面调整
|
2020-06-04 17:51:30 +08:00 |
|
zyy
|
5a9a837e02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
# src/utils/baseUrl.js
# src/views/iscs/iscsDraw/iscsBasOperate/index.vue
|
2020-06-04 17:32:45 +08:00 |
|
zyy
|
9be9c9a313
|
增加西安 三号线设置折返策略元素
|
2020-06-04 17:29:18 +08:00 |
|
joylink_cuiweidong
|
8ea4e49e0a
|
代码调整
|
2020-06-04 16:38:28 +08:00 |
|
joylink_cuiweidong
|
d28aa00c78
|
裁判系统 代码调整
|
2020-06-04 15:49:23 +08:00 |
|
joylink_cuiweidong
|
2ee3ecd2b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 15:11:21 +08:00 |
|
joylink_cuiweidong
|
59487c992d
|
裁判系统代码调整
|
2020-06-04 15:10:54 +08:00 |
|
fan
|
7f08ae9e71
|
调整教学时切换题group为刷新的问题&自排全开全关=》自排单开单关
|
2020-06-04 14:21:19 +08:00 |
|
fan
|
d7c55ab346
|
调整实训考试本地缓存时间超出考试时间时剩余时间显示问题
|
2020-06-04 13:31:02 +08:00 |
|
fan
|
1d5210db45
|
调整课程新建时路由参数drawWay丢失的问题
|
2020-06-04 13:20:32 +08:00 |
|
fan
|
70a3e96d64
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 11:17:58 +08:00 |
|
fan
|
5ad0464fcd
|
iscs调整
|
2020-06-04 11:17:43 +08:00 |
|
joylink_cuiweidong
|
0cf0caef1d
|
裁判系统代码调整
佛山左下角信息窗口调整
|
2020-06-04 11:12:55 +08:00 |
|
joylink_cuiweidong
|
aa5a00b401
|
竞赛裁判平台代码调整
|
2020-06-04 10:22:02 +08:00 |
|
fan
|
bf07ea8e0a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 18:36:05 +08:00 |
|
fan
|
ae53e208bb
|
实操竞赛结果调整
|
2020-06-03 18:35:43 +08:00 |
|
fan
|
f4d402322a
|
实操竞赛结果调整
|
2020-06-03 18:35:10 +08:00 |
|
sunzhenyu
|
afc9392bd6
|
merge
|
2020-06-03 18:33:22 +08:00 |
|
sunzhenyu
|
7562b932fe
|
修改驾驶按钮逻辑，三维cctv增加列车进出站
|
2020-06-03 18:32:46 +08:00 |
|
joylink_cuiweidong
|
efc8d80899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 18:24:14 +08:00 |
|
joylink_cuiweidong
|
7946d9f6e7
|
仿真聊天代码调整
|
2020-06-03 18:23:48 +08:00 |
|
fan
|
44bb0f0f29
|
实操竞赛调整
|
2020-06-03 18:17:52 +08:00 |
|
joylink_cuiweidong
|
156a746a07
|
综合演练仿真聊天 请求会话成员代码调整 退出会话代码调整
|
2020-06-03 16:44:38 +08:00 |
|
joylink_cuiweidong
|
49c61f8c8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 16:20:13 +08:00 |
|
joylink_cuiweidong
|
d8d896fc5f
|
综合演练结束仿真，其他成员不退出仿真 调整
|
2020-06-03 16:19:49 +08:00 |
|
fan
|
046a09f8b5
|
调整实操竞赛&星期显示
|
2020-06-03 16:18:40 +08:00 |
|
fan
|
6ac7b9b932
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 15:29:06 +08:00 |
|
fan
|
0f5185702b
|
合并代码
|
2020-06-03 15:28:57 +08:00 |
|
zyy
|
ce5318386e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 14:47:38 +08:00 |
|
zyy
|
31fab488c0
|
调整区段保存流程
|
2020-06-03 14:47:26 +08:00 |
|
fan
|
f6997d3bd9
|
合并代码
|
2020-06-03 14:30:14 +08:00 |
|
fan
|
8bf9f77e0b
|
西安三号线控制权调整&iscs调整
|
2020-06-03 14:27:54 +08:00 |
|
joylink_cuiweidong
|
9c2831bd3d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 13:31:27 +08:00 |
|
joylink_cuiweidong
|
b2f4138699
|
代码调整
|
2020-06-03 13:31:09 +08:00 |
|
zyy
|
a98495f43f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 13:19:11 +08:00 |
|
zyy
|
a57ae39ebf
|
调整区段修改逻辑
|
2020-06-03 13:18:52 +08:00 |
|
joylink_cuiweidong
|
00705cd006
|
综合演练仿真聊天 退出群聊代码调整
|
2020-06-03 11:20:46 +08:00 |
|
joylink_cuiweidong
|
3c6b950744
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 10:44:43 +08:00 |
|
joylink_cuiweidong
|
c3736a02c8
|
北京/佛山/哈尔滨 现地 左下角 聊天信息窗口遮盖问题处理
|
2020-06-03 10:43:41 +08:00 |
|
zyy
|
d592e381ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 10:12:50 +08:00 |
|
zyy
|
631fba04bb
|
调整道岔佛山线路显示， 综合监控元素添加
|
2020-06-03 10:12:36 +08:00 |
|
joylink_cuiweidong
|
7549203f97
|
综合演练仿真会话代码调整
|
2020-06-02 19:26:36 +08:00 |
|
joylink_cuiweidong
|
34016219dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 18:30:38 +08:00 |
|
joylink_cuiweidong
|
4c38334d2c
|
西安三号线 按计划行车/添加列车 列车列表代码调整
|
2020-06-02 18:30:12 +08:00 |
|
zyy
|
4f4be3b33a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-06-02 18:11:52 +08:00 |
|
zyy
|
ad3694c7f5
|
调整综合监控模型，调整信号机自动触发显示，综合监控数据保存
|
2020-06-02 18:05:35 +08:00 |
|
fan
|
6977e93e5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 17:51:08 +08:00 |
|
fan
|
c1d88ab3e9
|
iscs调整&列车调整
|
2020-06-02 17:50:56 +08:00 |
|
sunzhenyu
|
620839876d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 17:00:26 +08:00 |
|
sunzhenyu
|
9ca15d9146
|
修改三维cctv视角
|
2020-06-02 16:58:45 +08:00 |
|
sunzhenyu
|
f4d41eb0de
|
修改通号模型信息显示功能
|
2020-06-02 16:57:38 +08:00 |
|
zyy
|
a1978bd266
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/iscs/iscsDraw/iscsCommonElem/button.vue
|
2020-06-02 16:17:53 +08:00 |
|
zyy
|
de49bba2ad
|
调整信号机流程 综合监控操作
|
2020-06-02 16:17:00 +08:00 |
|
fan
|
c3d4d475c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 16:12:45 +08:00 |
|
fan
|
e473199e24
|
iscs调整
|
2020-06-02 16:12:34 +08:00 |
|
joylink_cuiweidong
|
dea961be7b
|
实现平台 子系统产品说明调整
|
2020-06-02 15:31:16 +08:00 |
|
joylink_cuiweidong
|
979a9e78b2
|
仿真聊天代码调整
竞赛 实操代码调整
|
2020-06-02 15:00:48 +08:00 |
|
joylink_cuiweidong
|
063cb07991
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 13:44:06 +08:00 |
|
joylink_cuiweidong
|
ff9842f43b
|
ISCS 绘图机电小系统代码调整
|
2020-06-02 13:43:42 +08:00 |
|
fan
|
013596a502
|
iscs调整
|
2020-06-02 10:21:33 +08:00 |
|
joylink_cuiweidong
|
7e83cc9505
|
代码调整
|
2020-06-01 18:58:38 +08:00 |
|
joylink_cuiweidong
|
61ca059900
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 18:53:54 +08:00 |
|
joylink_cuiweidong
|
2bc47186cf
|
竞赛实操代码调整
|
2020-06-01 18:52:37 +08:00 |
|
fan
|
e72538f66b
|
合并代码
|
2020-06-01 18:35:01 +08:00 |
|
fan
|
d93e40ab48
|
iscs调整
|
2020-06-01 18:33:17 +08:00 |
|
zyy
|
101014d9b1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-06-01 18:23:49 +08:00 |
|
zyy
|
dfe10ea585
|
增加综合监控绘图 复制粘贴 元素功能
|
2020-06-01 18:21:36 +08:00 |
|
joylink_cuiweidong
|
8eefd599b5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 17:38:44 +08:00 |
|
joylink_cuiweidong
|
8dabdd150d
|
iscs 小系统代码调整
综合演练聊天代码调整
|
2020-06-01 17:32:33 +08:00 |
|
sunzhenyu
|
dfa91c5234
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 15:43:48 +08:00 |
|
sunzhenyu
|
041528ebaa
|
修改三维cctv中路径
|
2020-06-01 15:43:40 +08:00 |
|
zyy
|
3e62782fc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 13:36:41 +08:00 |
|
zyy
|
16392a3b1f
|
调整仿真运行图加载高亮显示
|
2020-06-01 13:36:26 +08:00 |
|
sunzhenyu
|
6ea1c7250d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 12:30:44 +08:00 |
|
sunzhenyu
|
e7224548b8
|
修改旧数据三维通信bug，cctv三维逻辑修改
|
2020-06-01 12:29:30 +08:00 |
|
joylink_cuiweidong
|
d46a2cb784
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 11:33:37 +08:00 |
|
joylink_cuiweidong
|
ee9714a705
|
综合演练仿真聊天代码调整
|
2020-06-01 11:33:22 +08:00 |
|
fan
|
ab9bf51298
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 11:32:30 +08:00 |
|
fan
|
0e4b16182b
|
调整裁判系统0分显示
|
2020-06-01 11:32:21 +08:00 |
|
joylink_cuiweidong
|
3012601bf6
|
综合演练仿真 聊天代码调整
|
2020-06-01 11:28:04 +08:00 |
|
joylink_cuiweidong
|
46d5e09f7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 11:22:08 +08:00 |
|
joylink_cuiweidong
|
799227f8c4
|
仿真页面刷新 时间代码调整
|
2020-06-01 11:21:10 +08:00 |
|
fan
|
119af19522
|
调整二次按计划行车报错
|
2020-06-01 10:57:19 +08:00 |
|
fan
|
c2c543503d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 10:32:13 +08:00 |
|
fan
|
76990e129e
|
iscs调整
|
2020-06-01 10:32:02 +08:00 |
|
zyy
|
6705d59a26
|
增加竞赛平台裁判查看理论结果页面
|
2020-06-01 10:11:09 +08:00 |
|
zyy
|
64ac5beec9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 18:26:27 +08:00 |
|
zyy
|
106d217e63
|
调整导入运行图判断
|
2020-05-29 18:26:12 +08:00 |
|
fan
|
c395fcbcff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 18:25:01 +08:00 |
|
fan
|
fb40db0ad8
|
裁判搜索条件调整
|
2020-05-29 18:24:51 +08:00 |
|
joylink_cuiweidong
|
ba23dbe2b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 18:16:43 +08:00 |
|
joylink_cuiweidong
|
8b23874ea5
|
综合演练仿真聊天代码调整
|
2020-05-29 18:15:51 +08:00 |
|
zyy
|
8b3f4de3b7
|
调整裁判修改分数
|
2020-05-29 17:58:50 +08:00 |
|
fan
|
0d27ba3d6f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 17:55:33 +08:00 |
|
fan
|
eff6615407
|
西安一三号线道岔失表表示灯状态&裁判分数展示调整
|
2020-05-29 17:55:22 +08:00 |
|
zyy
|
007802267a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 17:50:02 +08:00 |
|
zyy
|
29f027077d
|
调整考试结果页面接口对接
|
2020-05-29 17:49:26 +08:00 |
|
fan
|
68675f7759
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 17:32:29 +08:00 |
|
joylink_cuiweidong
|
9477a7ddc2
|
综合演练仿真聊天代码调整
|
2020-05-29 17:28:40 +08:00 |
|
fan
|
a4924383fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:58:11 +08:00 |
|
fan
|
31dd88b426
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:57:31 +08:00 |
|
fan
|
95e4f4c938
|
西安一三号线道岔失表调整&iscs调整
|
2020-05-29 16:57:21 +08:00 |
|
joylink_cuiweidong
|
42cd8a3aec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:56:23 +08:00 |
|
joylink_cuiweidong
|
933db5fb50
|
综合演练 仿真聊天 代码调整
|
2020-05-29 16:56:02 +08:00 |
|
zyy
|
243a5763bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:55:53 +08:00 |
|
zyy
|
16ebf3e013
|
调整竞赛结果流程，列车放大流程
|
2020-05-29 16:55:25 +08:00 |
|
joylink_cuiweidong
|
6fe1a0c22b
|
新版地图绘图 高级数据交路代码调整
|
2020-05-29 16:23:38 +08:00 |
|
joylink_cuiweidong
|
2fd42c22f9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 14:05:03 +08:00 |
|
joylink_cuiweidong
|
7449b6b2a3
|
综合演练 仿真聊天代码调整
|
2020-05-29 14:03:43 +08:00 |
|
fan
|
e0b5f1d249
|
提示调整
|
2020-05-29 13:02:44 +08:00 |
|
fan
|
2abe815c87
|
理论考试缓存调整
|
2020-05-29 11:18:44 +08:00 |
|
fan
|
f21751fcd3
|
哈尔滨title调整&理论考试缓存调整
|
2020-05-29 11:08:38 +08:00 |
|
joylink_cuiweidong
|
edcefeab07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 09:17:16 +08:00 |
|
joylink_cuiweidong
|
8c99f4a3ce
|
西安一/三号线的侧边栏 代码调整
|
2020-05-29 09:16:35 +08:00 |
|
zyy
|
3aeb6f85bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:48:50 +08:00 |
|
zyy
|
88be776582
|
调整样式
|
2020-05-28 18:48:28 +08:00 |
|
joylink_cuiweidong
|
cf6dadf46b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:39:11 +08:00 |
|
joylink_cuiweidong
|
65569da4cd
|
西安一/三号线的侧边栏 代码调整
|
2020-05-28 18:38:49 +08:00 |
|
zyy
|
79e76bbfb1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:34:47 +08:00 |
|
zyy
|
e63a299a77
|
校验裁判打分最大分值
|
2020-05-28 18:34:34 +08:00 |
|
fan
|
2a1ce3543f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:29:03 +08:00 |
|
fan
|
fffd6f0be7
|
调整运行图加载lineCode获取
|
2020-05-28 18:28:46 +08:00 |
|
zyy
|
474dcc2d74
|
新增车站字段
|
2020-05-28 18:17:15 +08:00 |
|
zyy
|
f1a66f8f73
|
调整站台轨关联站台也会修改
|
2020-05-28 18:08:20 +08:00 |
|
fan
|
5e97623b06
|
逻辑区段始终点偏移量设置调整
|
2020-05-28 17:47:52 +08:00 |
|
zyy
|
84afa25fe3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 17:09:51 +08:00 |
|
zyy
|
e569702907
|
增加裁判平台修改分数
|
2020-05-28 17:09:22 +08:00 |
|
fan
|
601aed6f5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 16:41:04 +08:00 |
|
fan
|
80d016a2b5
|
公共菜单调整
|
2020-05-28 16:40:52 +08:00 |
|
joylink_cuiweidong
|
8822e8b3c7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jsxt/competition/theory/quiz/index.vue
|
2020-05-28 15:31:11 +08:00 |
|
joylink_cuiweidong
|
c502d755f9
|
竞赛平台代码调整
|
2020-05-28 15:28:18 +08:00 |
|
fan
|
76ba1caf8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 15:04:07 +08:00 |
|
fan
|
c300fe2f5f
|
理论考试倒计时
|
2020-05-28 15:03:58 +08:00 |
|
zyy
|
6ae66333e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 15:02:53 +08:00 |
|
zyy
|
55f57e2135
|
调整保存字段
|
2020-05-28 15:02:15 +08:00 |
|
zyy
|
6eefedb434
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 14:39:21 +08:00 |
|
zyy
|
df4dc3eea9
|
调整供电线路保存，福州皮肤配置文件调整
|
2020-05-28 14:39:06 +08:00 |
|
sunzhenyu
|
bfe172ff30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 13:39:50 +08:00 |
|
sunzhenyu
|
fe5bfa50e0
|
三维cctv修改
|
2020-05-28 13:39:41 +08:00 |
|
joylink_cuiweidong
|
0939eecf59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 13:22:20 +08:00 |
|
joylink_cuiweidong
|
27981666b1
|
仿真聊天代码调整
|
2020-05-28 13:21:51 +08:00 |
|
fan
|
e5d4a31dce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 11:28:06 +08:00 |
|
fan
|
d301e9d9f4
|
整理公共菜单
|
2020-05-28 11:27:53 +08:00 |
|
joylink_cuiweidong
|
062cdc69dd
|
综合演练聊天代码调整
|
2020-05-28 10:35:16 +08:00 |
|
joylink_cuiweidong
|
a302ab24c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 10:16:33 +08:00 |
|
joylink_cuiweidong
|
a471120ea0
|
综合演练 聊天代码调整
|
2020-05-28 10:16:13 +08:00 |
|
fan
|
bf1bbbe948
|
调整取消进路指令&调整导出试卷参数&公共菜单
|
2020-05-28 09:54:47 +08:00 |
|
joylink_cuiweidong
|
9fb51bd047
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 19:03:54 +08:00 |
|
joylink_cuiweidong
|
4afcef1ce2
|
综合演练 聊天 创建群聊代码调整
|
2020-05-27 19:02:39 +08:00 |
|
zyy
|
4fe1330990
|
调整试卷加载
|
2020-05-27 19:02:34 +08:00 |
|
zyy
|
07679a37e7
|
调整理论流程结果页面
|
2020-05-27 18:30:14 +08:00 |
|
zyy
|
32d94e6b38
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/competitionManage/generatePaper.vue
|
2020-05-27 18:10:39 +08:00 |
|
zyy
|
707fa4ba43
|
调整理论竞赛流程
|
2020-05-27 18:09:21 +08:00 |
|
fan
|
cfed64b4d5
|
调整合并代码错误
|
2020-05-27 17:37:32 +08:00 |
|
fan
|
cacaa155b0
|
合并代码
|
2020-05-27 17:32:20 +08:00 |
|
fan
|
18735986e6
|
修改列车识别号禁用人工车类型&生成试卷
|
2020-05-27 17:30:39 +08:00 |
|
zyy
|
7fbc759595
|
调整总分显示
|
2020-05-27 17:27:50 +08:00 |
|
fan
|
ff3d4329d6
|
调整生成试卷
|
2020-05-27 16:36:55 +08:00 |
|
fan
|
6ebfffd36b
|
调整table移出bug
|
2020-05-27 15:38:40 +08:00 |
|
fan
|
643c5e0b9e
|
添加分值初始化和校验
|
2020-05-27 15:31:47 +08:00 |
|
fan
|
6a1215621d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 14:57:34 +08:00 |
|
fan
|
bb009011c3
|
修改列车识别号调整
|
2020-05-27 14:57:25 +08:00 |
|
joylink_cuiweidong
|
47e02a0ce8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 14:45:54 +08:00 |
|
joylink_cuiweidong
|
53c8c13405
|
竞赛系统 实操题目录制代码调整
|
2020-05-27 14:45:32 +08:00 |
|
zyy
|
3a68650a89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 14:14:00 +08:00 |
|
zyy
|
160587e333
|
调整试题流程
|
2020-05-27 14:13:47 +08:00 |
|
fan
|
23c49b965d
|
生成试卷调整
|
2020-05-27 13:51:27 +08:00 |
|
fan
|
04bf8a9dda
|
生成试卷实操调整
|
2020-05-27 11:28:29 +08:00 |
|
fan
|
8cc1dd66d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 11:25:50 +08:00 |
|
fan
|
a44fe915b8
|
生成试卷实操调整
|
2020-05-27 11:25:39 +08:00 |
|
joylink_cuiweidong
|
eaa18f3539
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 11:20:33 +08:00 |
|
joylink_cuiweidong
|
61b0d22d53
|
竞赛系统 实操列表代码调整
|
2020-05-27 11:20:14 +08:00 |
|
fan
|
31f516abb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 11:07:14 +08:00 |
|
fan
|
eb7dd84c48
|
生成试卷实操调整
|
2020-05-27 11:07:04 +08:00 |
|
joylink_cuiweidong
|
60c90f24e8
|
竞赛代码调整
|
2020-05-27 10:49:53 +08:00 |
|
zyy
|
64256f5982
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 10:36:51 +08:00 |
|
zyy
|
b7d4eb7bda
|
调整区段绘图元素层级，调整字段显示
|
2020-05-27 10:36:40 +08:00 |
|
fan
|
accfc78a65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 10:33:51 +08:00 |
|
fan
|
d492634c98
|
生成试题理论调整
|
2020-05-27 10:33:26 +08:00 |
|
joylink_cuiweidong
|
9051a15605
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 09:57:21 +08:00 |
|
joylink_cuiweidong
|
5beb834384
|
竞赛系统 实操试题删除修改代码调整
|
2020-05-27 09:56:59 +08:00 |
|
zyy
|
e9f35e6804
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 09:09:49 +08:00 |
|
zyy
|
0a54a5988e
|
调整理论列表
|
2020-05-27 09:09:29 +08:00 |
|
fan
|
1aeb7e0d33
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:44:24 +08:00 |
|
fan
|
8e2537a9d0
|
生成试题调整
|
2020-05-26 18:43:59 +08:00 |
|
zyy
|
ee16508b02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:30:43 +08:00 |
|
zyy
|
94dddea3bd
|
调整字段显示
|
2020-05-26 18:30:17 +08:00 |
|
joylink_cuiweidong
|
0ada88bafc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:28:34 +08:00 |
|
joylink_cuiweidong
|
f91a46552b
|
实操列表添加修改代码调整
|
2020-05-26 18:28:18 +08:00 |
|
zyy
|
438ccb2404
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:12:57 +08:00 |
|
zyy
|
92b144ddeb
|
调整理论考试接口调整，字段
|
2020-05-26 18:12:42 +08:00 |
|
joylink_cuiweidong
|
4fb37b3c7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 17:56:17 +08:00 |
|
joylink_cuiweidong
|
d8cfcbd595
|
添加实操列表页面和实操创建页面
|
2020-05-26 17:55:11 +08:00 |
|
fan
|
eea3557635
|
生成试题调整
|
2020-05-26 17:35:55 +08:00 |
|
fan
|
31a82432d1
|
生成试题
|
2020-05-26 17:33:19 +08:00 |
|
zyy
|
6354b60a58
|
调整字段
|
2020-05-26 16:01:41 +08:00 |
|
zyy
|
04ed45e498
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 15:59:23 +08:00 |
|
zyy
|
d161492fed
|
添加题库管理流程
|
2020-05-26 15:59:11 +08:00 |
|
joylink_cuiweidong
|
2336fe7fbe
|
代码调整
|
2020-05-26 13:33:12 +08:00 |
|
joylink_cuiweidong
|
187024b5b7
|
代码调整
|
2020-05-26 13:10:29 +08:00 |
|
joylink_cuiweidong
|
6886ea3190
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 13:04:21 +08:00 |
|
joylink_cuiweidong
|
a354264097
|
竞赛代码调整
|
2020-05-26 13:03:37 +08:00 |
|
zyy
|
b413c2f0f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 12:12:13 +08:00 |
|
zyy
|
83343d54b8
|
调整竞赛系统逻辑
|
2020-05-26 12:11:59 +08:00 |
|
fan
|
678581f079
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 11:10:49 +08:00 |
|
fan
|
ae9cce3557
|
LCD屏控制
|
2020-05-26 11:10:37 +08:00 |
|
zyy
|
7382a0d1e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 10:30:22 +08:00 |
|
zyy
|
c1cead3475
|
调整报名系统报名提示
|
2020-05-26 10:30:11 +08:00 |
|
joylink_cuiweidong
|
630b2b16d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 10:19:13 +08:00 |
|
joylink_cuiweidong
|
681e67468f
|
竞赛代码调整
|
2020-05-26 10:18:54 +08:00 |
|
zyy
|
66ad222321
|
删除注释
|
2020-05-26 09:51:24 +08:00 |
|
zyy
|
fde7e609c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 09:43:23 +08:00 |
|
zyy
|
d10fccb624
|
调整竞赛流程
|
2020-05-26 09:43:09 +08:00 |
|
joylink_cuiweidong
|
c667b7f980
|
竞赛代码调整
|
2020-05-25 18:50:38 +08:00 |
|
joylink_cuiweidong
|
0967316106
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/chatView/chatBox.vue
|
2020-05-25 18:34:30 +08:00 |
|
joylink_cuiweidong
|
83192e2bd5
|
代码调整
|
2020-05-25 18:33:36 +08:00 |
|
joylink_cuiweidong
|
1db4c0e193
|
竞赛代码调整
|
2020-05-25 18:32:59 +08:00 |
|
zyy
|
dc33306c96
|
调整参赛人员路由判断
|
2020-05-25 18:26:05 +08:00 |
|
zyy
|
ef9dc7c25e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_01/menus/menuTrain.vue
|
2020-05-25 17:58:11 +08:00 |
|
zyy
|
f329e30049
|
调整西安一三 号线路 右键操作
|
2020-05-25 17:57:24 +08:00 |
|
fan
|
b5b228b1a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 17:08:07 +08:00 |
|
fan
|
fe45d9b1ac
|
添加扣车跳停命令提示换行符
|
2020-05-25 17:07:58 +08:00 |
|
joylink_cuiweidong
|
663f25cddc
|
竞赛代码调整
|
2020-05-25 16:56:00 +08:00 |
|
joylink_cuiweidong
|
9f1c594a4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:45:19 +08:00 |
|
joylink_cuiweidong
|
ab8ea51140
|
代码调整
|
2020-05-25 16:44:26 +08:00 |
|
zyy
|
e0c6f6a12a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:38:15 +08:00 |
|
zyy
|
f06419e963
|
调整裁判平台进入仿真操作
|
2020-05-25 16:38:03 +08:00 |
|
joylink_cuiweidong
|
3bd5572e58
|
裁判系统代码调整
|
2020-05-25 16:29:13 +08:00 |
|
joylink_cuiweidong
|
0f21696e19
|
裁判平台代码调整
|
2020-05-25 16:15:15 +08:00 |
|
joylink_cuiweidong
|
8a104a09f6
|
代码调整
|
2020-05-25 15:45:51 +08:00 |
|
joylink_cuiweidong
|
40d7d960cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 15:43:58 +08:00 |
|
joylink_cuiweidong
|
3d10668abf
|
竞赛系统代码调整
|
2020-05-25 15:43:36 +08:00 |
|
zyy
|
fb6ba36680
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 15:06:47 +08:00 |
|
zyy
|
1ae2793221
|
调整绘图界面字体皮肤配置
|
2020-05-25 15:06:34 +08:00 |
|
joylink_cuiweidong
|
b67adf1afb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 14:56:02 +08:00 |
|
joylink_cuiweidong
|
992892ee6b
|
竞赛代码调整
|
2020-05-25 14:55:42 +08:00 |
|
fan
|
76a329d9af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 14:06:26 +08:00 |
|
fan
|
8621198acf
|
调整信号机菜单显示&修改列车识别号调整
|
2020-05-25 14:06:16 +08:00 |
|
joylink_cuiweidong
|
0f863cffe1
|
竞赛系统代码调整
|
2020-05-25 13:49:44 +08:00 |
|
joylink_cuiweidong
|
af46cd3ff9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 13:49:14 +08:00 |
|
zyy
|
9d7e4f928f
|
调整竞赛系统进入仿真界面流程
|
2020-05-25 13:48:43 +08:00 |
|
joylink_cuiweidong
|
3b0d842b97
|
竞赛代码调整
|
2020-05-25 13:40:25 +08:00 |
|
zyy
|
a2e0522a30
|
调整判断状态
|
2020-05-25 10:53:01 +08:00 |
|
zyy
|
04f41456d9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jsxt/competition/examDetail.vue
# src/views/jsxt/refereeList/index.vue
|
2020-05-25 10:47:20 +08:00 |
|
zyy
|
cf8e39f765
|
调整流程
|
2020-05-25 10:45:56 +08:00 |
|
joylink_cuiweidong
|
d41f874bdc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/api/competition.js
# src/views/jsxt/refereeList/index.vue
|
2020-05-25 10:36:21 +08:00 |
|
fan
|
6012a5ce5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 10:32:27 +08:00 |
|
fan
|
58118ba06a
|
西安一三日期显示调整
|
2020-05-25 10:32:14 +08:00 |
|
joylink_cuiweidong
|
24ed5f502d
|
竞赛代码调整
|
2020-05-25 10:31:32 +08:00 |
|
zyy
|
15643b0d05
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 10:29:14 +08:00 |
|
zyy
|
f90514777a
|
调整竞赛系统登录流程，调整接口字段
|
2020-05-25 10:29:03 +08:00 |
|
joylink_cuiweidong
|
6cf41569c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 09:52:42 +08:00 |
|
joylink_cuiweidong
|
46e6dec30e
|
竞赛系统代码调整
|
2020-05-25 09:52:23 +08:00 |
|
zyy
|
f60d72aaf8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 09:40:27 +08:00 |
|
zyy
|
aa6d821fed
|
调整裁判平台人员列表字段
|
2020-05-25 09:40:14 +08:00 |
|
joylink_cuiweidong
|
b74b070367
|
竞赛系统代码调整
|
2020-05-25 09:29:34 +08:00 |
|
joylink_cuiweidong
|
0f1ff80f1c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 20:46:36 +08:00 |
|
joylink_cuiweidong
|
0f3520a8e3
|
竞赛代码调整
|
2020-05-22 20:46:03 +08:00 |
|
fan
|
d54db9bfe2
|
西安三号线调整
|
2020-05-22 20:32:19 +08:00 |
|
fan
|
4d29da9228
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 18:42:55 +08:00 |
|
fan
|
bb37c6ebbb
|
西安三号线调整
|
2020-05-22 18:41:23 +08:00 |
|
zyy
|
28791ddb74
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 18:28:13 +08:00 |
|
zyy
|
39d055ec09
|
调整车站连锁关系 右键空白处显示连锁关系
|
2020-05-22 18:28:03 +08:00 |
|
joylink_cuiweidong
|
5bbb5ddd4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 17:30:48 +08:00 |
|
joylink_cuiweidong
|
526fefceec
|
竞赛代码调整
|
2020-05-22 17:30:17 +08:00 |
|
zyy
|
e221ca9b22
|
调整报名流程字段，调整西安线路非连锁站邮件操作
|
2020-05-22 17:10:07 +08:00 |
|
zyy
|
f3cbe93987
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 16:52:24 +08:00 |
|
zyy
|
48523b2d0a
|
调整首页
|
2020-05-22 16:52:12 +08:00 |
|
fan
|
18054e5001
|
竞赛考试结果调整
|
2020-05-22 16:42:42 +08:00 |
|
fan
|
23167aa4a9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 16:34:19 +08:00 |
|
fan
|
86edffb984
|
竞赛考试结果调整
|
2020-05-22 16:34:05 +08:00 |
|
joylink_cuiweidong
|
ba42e40200
|
竞赛系统代码调整
|
2020-05-22 16:30:18 +08:00 |
|
joylink_cuiweidong
|
198b16d926
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 16:27:20 +08:00 |
|
joylink_cuiweidong
|
44f5e7a87c
|
裁判平台代码调整
|
2020-05-22 16:26:59 +08:00 |
|
sunzhenyu
|
ef3401fb44
|
Merge bra:nch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 15:56:45 +08:00 |
|
sunzhenyu
|
080d670c7d
|
综合演练三维通号原型
|
2020-05-22 15:56:40 +08:00 |
|
zyy
|
e535b1e5d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/competitionManage/index.vue
|
2020-05-22 15:45:16 +08:00 |
|
zyy
|
eaeea84c8d
|
调整报名流程，竞赛管理页面
|
2020-05-22 15:41:35 +08:00 |
|
fan
|
bcbb5ff512
|
调整竞赛报名参赛路径弹框复制
|
2020-05-22 15:31:30 +08:00 |
|
fan
|
991af46e9a
|
调整竞赛报名参赛路径弹框复制
|
2020-05-22 15:23:18 +08:00 |
|
fan
|
8e1d552d18
|
调整竞赛报名参赛路径弹框复制
|
2020-05-22 15:20:14 +08:00 |
|
fan
|
32eb7faada
|
西安线路调整
|
2020-05-22 14:47:19 +08:00 |
|
joylink_cuiweidong
|
4210599f6b
|
竞赛裁判系统代码调整
|
2020-05-22 11:07:10 +08:00 |
|
joylink_cuiweidong
|
3b81436fbb
|
竞赛裁判系统代码调整
综合演练 仿真开始 修改成员角色代码调整
|
2020-05-22 10:43:23 +08:00 |
|
joylink_cuiweidong
|
480df83efa
|
竞赛裁判系统代码调整
|
2020-05-22 09:32:48 +08:00 |
|
joylink_cuiweidong
|
16513c64d5
|
剧本编制代码调整
|
2020-05-22 09:07:39 +08:00 |
|
joylink_cuiweidong
|
9dc0995e59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/jointTrainingNew/menuDemon.vue
|
2020-05-21 17:01:36 +08:00 |
|
joylink_cuiweidong
|
3a48755817
|
竞赛裁判系统代码调整
|
2020-05-21 16:59:36 +08:00 |
|
sunzhenyu
|
2e40e63e9f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 16:49:16 +08:00 |
|
sunzhenyu
|
e0fd1ece86
|
修改车站贴图，修改驾驶提示
|
2020-05-21 16:48:59 +08:00 |
|
zyy
|
81973b6967
|
添加实操考试 结束生成分值流程
|
2020-05-21 15:18:00 +08:00 |
|
zyy
|
9918678b27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 14:59:29 +08:00 |
|
zyy
|
568ac44bf9
|
调整打包模式， 报名系统逻辑
|
2020-05-21 14:59:18 +08:00 |
|
joylink_cuiweidong
|
b382b6e0d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 10:44:22 +08:00 |
|
joylink_cuiweidong
|
cf021736b2
|
竞赛裁判系统代码调整
|
2020-05-21 10:43:32 +08:00 |
|
fan
|
19bd41b214
|
调整hydIcon路径
|
2020-05-21 10:02:13 +08:00 |
|
zyy
|
81187912f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 18:33:08 +08:00 |
|
zyy
|
af26f55e9b
|
调整裁判管理报名列表
|
2020-05-20 18:32:52 +08:00 |
|
joylink_cuiweidong
|
4132eba1ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/api/competition.js
# src/views/jsxt/refereeList/index.vue
|
2020-05-20 18:28:59 +08:00 |
|
joylink_cuiweidong
|
dc6819df4d
|
裁判平台代码调整
|
2020-05-20 18:26:04 +08:00 |
|