zyy
|
4bb41700bc
|
列车提示信息调整，哈尔滨线路操作
|
2020-07-21 13:37:59 +08:00 |
|
sunzhenyu
|
a82d3e65e3
|
修改三维静态资源目录
|
2020-07-20 18:32:07 +08:00 |
|
sunzhenyu
|
bb1dd69def
|
增加哈尔滨项目静态三维资源
|
2020-07-20 18:29:48 +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 |
|