zyy
|
d4b352d4ba
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 14:15:21 +08:00 |
|
zyy
|
b9de20f22a
|
iscs绘制元素
|
2020-01-17 14:15:14 +08:00 |
|
joylink_cuiweidong
|
d7b43924bb
|
iscs bas 组件代码调整
|
2020-01-17 14:10:40 +08:00 |
|
joylink_cuiweidong
|
9d0b565142
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 13:37:22 +08:00 |
|
joylink_cuiweidong
|
219e24cbcd
|
iscs bas 组件 添加
|
2020-01-17 13:37:08 +08:00 |
|
fan
|
02a6954ffd
|
仿真接口报错提示调整
|
2020-01-17 13:17:12 +08:00 |
|
fan
|
22657aa935
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 11:32:11 +08:00 |
|
fan
|
269cef7673
|
仿真接口调整
|
2020-01-17 11:31:53 +08:00 |
|
joylink_cuiweidong
|
589e7202fa
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 11:08:39 +08:00 |
|
joylink_cuiweidong
|
45fafdd0ee
|
iscs 排风机 冷水机组绘图代码调整
|
2020-01-17 11:07:44 +08:00 |
|
fan
|
69b11f98e8
|
iscs调整
|
2020-01-17 10:49:06 +08:00 |
|
fan
|
fb08f43afd
|
Merge remote-tracking branch 'origin/dev_iscs' into dev
|
2020-01-16 18:23:20 +08:00 |
|
fan
|
019ca66662
|
Merge remote-tracking branch 'origin/dev_iscs' into dev
|
2020-01-16 18:16:23 +08:00 |
|
joylink_cuiweidong
|
91c722f288
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceRender.js
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
|
2020-01-16 18:11:40 +08:00 |
|
fan
|
8676bef502
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceRender.js
|
2020-01-16 18:07:18 +08:00 |
|
joylink_cuiweidong
|
eb99102c6c
|
iscs 冷水机组，冷却塔组件布局
|
2020-01-16 18:07:02 +08:00 |
|
fan
|
027518132a
|
psd子系统
|
2020-01-16 18:06:00 +08:00 |
|
zyy
|
4c140a7c2a
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 18:03:06 +08:00 |
|
zyy
|
27257482ab
|
调整线路配置项，增加 ISCS 绘图元素
|
2020-01-16 18:02:57 +08:00 |
|
fan
|
dba419a524
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 16:25:47 +08:00 |
|
fan
|
3b26366935
|
Psd子系统
|
2020-01-16 16:25:33 +08:00 |
|
joylink_cuiweidong
|
1cd35488e8
|
房间socket代码修改
|
2020-01-16 16:15:58 +08:00 |
|
joylink_cuiweidong
|
5357d5c23c
|
解决 页面刷新 用户进入房间的问题
|
2020-01-16 15:08:03 +08:00 |
|
zyy
|
4a67f2b096
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
# src/views/system/iscsDraw/iscsOperate/index.vue
|
2020-01-16 14:54:24 +08:00 |
|
zyy
|
714c55ec8b
|
增加iscs绘制
|
2020-01-16 14:52:45 +08:00 |
|
joylink_cuiweidong
|
4103f1db8b
|
iscs 冷水机组 组件
|
2020-01-16 13:41:10 +08:00 |
|
fan
|
09a8b6b630
|
FAS子系统测试PSD
|
2020-01-16 13:28:29 +08:00 |
|
joylink_cuiweidong
|
e4bf88ddf5
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
|
2020-01-16 13:20:01 +08:00 |
|
joylink_cuiweidong
|
394c5b776c
|
iscs 冷冻泵/冷却泵添加
|
2020-01-16 13:15:52 +08:00 |
|
fan
|
9b26c70100
|
FAS子系统测试PSD
|
2020-01-16 13:03:44 +08:00 |
|
fan
|
69850add99
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 09:23:48 +08:00 |
|
fan
|
de7176ac5e
|
FAS子系统测试
|
2020-01-16 09:23:37 +08:00 |
|
joylink_cuiweidong
|
02b2ce19f1
|
iscs bas代码调整
|
2020-01-15 17:56:31 +08:00 |
|
fan
|
22c0b570a3
|
调整重连时间
|
2020-01-15 15:58:30 +08:00 |
|
fan
|
e87ebe22aa
|
删除debugger
|
2020-01-15 15:45:17 +08:00 |
|
fan
|
bf1497164c
|
iscs调整(批量拖动)
|
2020-01-15 14:33:21 +08:00 |
|
joylink_cuiweidong
|
4315cdade3
|
socket弹出层处理
|
2020-01-15 14:32:17 +08:00 |
|
fan
|
699d548b84
|
iscs调整
|
2020-01-15 14:26:25 +08:00 |
|
fan
|
308e0960b0
|
iscs调整
|
2020-01-15 14:04:33 +08:00 |
|
fan
|
f13f7c9964
|
iscs调整
|
2020-01-15 14:03:25 +08:00 |
|
fan
|
31f6277107
|
iscs调整
|
2020-01-15 13:33:11 +08:00 |
|
fan
|
a03b002beb
|
iscs调整
|
2020-01-15 13:27:07 +08:00 |
|
joylink_cuiweidong
|
e0824e33a0
|
房间的订阅代码调整
|
2020-01-15 13:20:48 +08:00 |
|
fan
|
f9bca1759d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-15 10:31:24 +08:00 |
|
fan
|
e80c0cd07f
|
延续保护解锁区段不可修改
|
2020-01-15 10:30:59 +08:00 |
|
zyy
|
77791a00ad
|
调整车次窗表单样式，调整事件阻止
|
2020-01-15 10:29:30 +08:00 |
|
fan
|
9233728346
|
iscs调整
|
2020-01-15 10:11:26 +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
|
e8039732ab
|
iscs调整
|
2020-01-14 18:17:51 +08:00 |
|
fan
|
7b7d332035
|
修改重连时间
|
2020-01-14 17:26:41 +08:00 |
|
fan
|
75334d11fa
|
删除公共topic
|
2020-01-14 17:14:45 +08:00 |
|
fan
|
9688838869
|
哈尔滨盈达科技调整
|
2020-01-14 16:58:23 +08:00 |
|
fan
|
05906492c5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-14 16:54:03 +08:00 |
|
fan
|
8d597eccfd
|
哈尔滨盈达科技调整
|
2020-01-14 16:53:46 +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 |
|
fan
|
e9499916f5
|
登录页面添加备案号
|
2020-01-14 16:39:26 +08:00 |
|
fan
|
0b6663cb1d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-14 16:34:20 +08:00 |
|
fan
|
a5fda7476b
|
Merge remote-tracking branch 'origin/test' into dev
|
2020-01-14 16:32:47 +08:00 |
|
fan
|
0ba7385e9f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-14 16:21:35 +08:00 |
|
fan
|
ca9b991fe6
|
哈尔滨盈达调整
|
2020-01-14 16:21:14 +08:00 |
|
fan
|
fbc0e5b28a
|
哈尔滨盈达调整
|
2020-01-14 16:19:36 +08:00 |
|
sunzhenyu
|
31d2381e13
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-14 16:09:30 +08:00 |
|
sunzhenyu
|
e19e44835f
|
修改背景自适应，修改三维地图编辑逻辑存读以及三维沙盘加载
|
2020-01-14 16:09:08 +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
|
8569ee4635
|
Merge branch 'dev' into test
|
2020-01-14 09:58:12 +08:00 |
|
fan
|
e4ccfa40d2
|
iscs 绘图
|
2020-01-14 09:55:57 +08:00 |
|
fan
|
365f36edef
|
iscs 绘图
|
2020-01-14 09:06:03 +08:00 |
|
zyy
|
5d84791c47
|
修正道岔显示
|
2020-01-13 17:44:53 +08:00 |
|
zyy
|
9d42feb47e
|
增加绘图图层 全选
|
2020-01-13 17:31:58 +08:00 |
|
zyy
|
1fab892047
|
新增扣车请求参数
|
2020-01-13 17:07:06 +08:00 |
|
zyy
|
c98dc7ba67
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 16:52:10 +08:00 |
|
zyy
|
5217a334d5
|
调整宁波一号线站台状态显示
|
2020-01-13 16:52:00 +08:00 |
|
joylink_cuiweidong
|
753bd88ab2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 16:46:44 +08:00 |
|
joylink_cuiweidong
|
557b1cbfeb
|
新版绘图 生成道岔计轴区段代码调整
|
2020-01-13 16:46:10 +08:00 |
|
fan
|
376362d6c9
|
删除日志
|
2020-01-13 16:45:47 +08:00 |
|
fan
|
7d579300b0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 16:31:01 +08:00 |
|
fan
|
b1bb638af3
|
修复：路由改变未在地图数据改变前及时清除定时器导致的地图数据污染保存的问题
|
2020-01-13 16:30:38 +08:00 |
|
fan
|
8c43ac0b07
|
iscs
|
2020-01-13 15:25:10 +08:00 |
|
zyy
|
c5733e20c7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 14:40:31 +08:00 |
|
zyy
|
dcead8d707
|
增加点击事件取消选中状态为全局混入，删除多余线路utils配置
|
2020-01-13 14:40:24 +08:00 |
|
fan
|
f9930a084d
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-13 13:57:01 +08:00 |
|
fan
|
d81a87caa2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 13:56:22 +08:00 |
|
fan
|
a6476ea5d9
|
添加登录页哈尔滨盈达科技
|
2020-01-13 13:56:03 +08:00 |
|
joylink_cuiweidong
|
6802f2621a
|
新版地图绘制键盘delete删除元素代码调整
|
2020-01-13 13:48:45 +08:00 |
|
zyy
|
d295fb72a5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 13:45:50 +08:00 |
|
zyy
|
6feb0ec9c0
|
新版地图: 调整默认状态，站台状态配置完成。其他元素暂未配置
|
2020-01-13 13:45:39 +08:00 |
|
fan
|
a3c6d2973b
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-13 13:38:15 +08:00 |
|
fan
|
2dc52d75f6
|
添加登录页哈尔滨盈达科技
|
2020-01-13 13:37:52 +08:00 |
|
fan
|
dba81ee41d
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-13 13:35:13 +08:00 |
|
fan
|
73c1171b54
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 13:33:44 +08:00 |
|
fan
|
662e38a22c
|
添加登录页哈尔滨盈达科技
|
2020-01-13 13:33:35 +08:00 |
|
joylink_cuiweidong
|
50ad3bb036
|
新版绘图道岔代码拆分
|
2020-01-13 11:25:51 +08:00 |
|
fan
|
d22008a6f7
|
成都一号线样式调整
|
2020-01-13 10:15:28 +08:00 |
|
fan
|
67ea835805
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-10 18:52:36 +08:00 |
|
fan
|
4e136ca8b3
|
成都一号线样式调整
|
2020-01-10 18:51:57 +08:00 |
|
zyy
|
28bac5e7bc
|
调整svg加载路径
|
2020-01-10 17:25:14 +08:00 |
|
zyy
|
d3d64c7c91
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-10 17:11:41 +08:00 |
|
zyy
|
5d6a994cbc
|
删除宁波批量扣车反向操作
|
2020-01-10 17:11:35 +08:00 |
|
fan
|
d77559211c
|
成都一、三号线z站台参数调整
|
2020-01-10 15:15:00 +08:00 |
|
fan
|
9f14f4bbda
|
成都一号线菜单调整
|
2020-01-10 14:51:55 +08:00 |
|
fan
|
1254ba912c
|
成都一号线菜单调整
|
2020-01-10 14:50:04 +08:00 |
|
zyy
|
a7b97dd7cc
|
调整宁波一号线请求参数
|
2020-01-10 14:41:20 +08:00 |
|
zyy
|
19edd695be
|
删除多余输出
|
2020-01-10 11:28:43 +08:00 |
|
zyy
|
fa643db9db
|
调整成都一号线 请求堆栈 取消请求流程
|
2020-01-10 11:27:43 +08:00 |
|
zyy
|
2b56d3f636
|
修改样式
|
2020-01-10 10:29:52 +08:00 |
|
zyy
|
021f3bc148
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-10 09:32:38 +08:00 |
|
zyy
|
bd0518acc7
|
调整成都一号线操作堆样式流程
|
2020-01-10 09:32:32 +08:00 |
|
fan
|
06c6ec66e5
|
成都一号线菜单样式调整
|
2020-01-09 18:49:58 +08:00 |
|
fan
|
e8b616b705
|
成都一号线菜单调整
|
2020-01-09 18:21:04 +08:00 |
|
fan
|
68180d0c83
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-09 17:48:46 +08:00 |
|
fan
|
a4ebf22bab
|
成都一号线菜单调整
|
2020-01-09 17:48:25 +08:00 |
|
zyy
|
41329739dc
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-09 16:24:10 +08:00 |
|
zyy
|
a4e3e30c78
|
增加成都一号线请求堆栈
|
2020-01-09 16:24:01 +08:00 |
|
fan
|
7f54b99883
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-09 13:03:02 +08:00 |
|
fan
|
ab64e6858e
|
成都一号线marbar菜单调整
|
2020-01-09 13:02:40 +08:00 |
|
sunzhenyu
|
c191afd2b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-09 11:19:10 +08:00 |
|
sunzhenyu
|
0fdc84330c
|
修改三维自动section逻辑
|
2020-01-09 11:19:02 +08:00 |
|
zyy
|
ed3df55457
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-09 09:54:40 +08:00 |
|
zyy
|
197d75342c
|
调整宁波一号线批量扣车逻辑
|
2020-01-09 09:54:34 +08:00 |
|
fan
|
6e90989ece
|
成都一号线右键菜单调整
|
2020-01-09 09:28:20 +08:00 |
|
fan
|
09b27a8d62
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-09 09:02:22 +08:00 |
|
fan
|
2b4aa891eb
|
成都一号线右键菜单调整
|
2020-01-09 09:02:02 +08:00 |
|
joylink_cuiweidong
|
54a5ff38a1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 18:26:20 +08:00 |
|
joylink_cuiweidong
|
82bef6ed4d
|
北京一号线新版 右键菜单指令调整
|
2020-01-08 18:26:07 +08:00 |
|
zyy
|
2e042b9fee
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 17:50:22 +08:00 |
|
zyy
|
fa513a1e8f
|
调整宁波一号线控制权右键条件
|
2020-01-08 17:50:16 +08:00 |
|
joylink_cuiweidong
|
b45b59599d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 17:42:39 +08:00 |
|
joylink_cuiweidong
|
88d4ccf8d9
|
北京一号线新版 区段道岔指令调整
|
2020-01-08 17:42:28 +08:00 |
|
zyy
|
d79641e0e4
|
调整指令字典中条件参数
|
2020-01-08 17:21:17 +08:00 |
|
joylink_cuiweidong
|
c29033177d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 16:24:24 +08:00 |
|
joylink_cuiweidong
|
4dde67b582
|
北京一号线新版信号机操作调整
|
2020-01-08 16:23:45 +08:00 |
|
zyy
|
b345594605
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 14:59:33 +08:00 |
|
zyy
|
786a37ee2c
|
增加宁波一号线控制权转移
|
2020-01-08 14:59:27 +08:00 |
|
joylink_cuiweidong
|
387746a69b
|
北京一号线新版 站台指令操作调整
|
2020-01-08 14:49:20 +08:00 |
|
fan
|
bf49c52c3e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 09:56:44 +08:00 |
|
zyy
|
9bbc497488
|
调整宁波一号线批量扣车key
|
2020-01-08 09:48:24 +08:00 |
|
fan
|
b84f86916f
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-08 09:42:36 +08:00 |
|
fan
|
83a37a1b28
|
成都一号线右键菜单调整
|
2020-01-08 09:41:55 +08:00 |
|
zyy
|
02af288233
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-07 18:03:56 +08:00 |
|
zyy
|
2310fec6ef
|
兼容老板地图状态，调整宁波线批量扣车数据
|
2020-01-07 18:03:49 +08:00 |
|
joylink_cuiweidong
|
91d1f98f69
|
北京一号线新版站台区段车站右键菜单调整
|
2020-01-07 17:40:24 +08:00 |
|
joylink_cuiweidong
|
7fd885a1c2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/theme/beijing_01/planConvert.js
|
2020-01-07 15:22:50 +08:00 |
|
joylink_cuiweidong
|
ce98244b44
|
北京一号线新版 道岔和信号机的右键菜单代码调整
|
2020-01-07 15:19:18 +08:00 |
|
zyy
|
473b289692
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-07 14:49:58 +08:00 |
|
zyy
|
5a3b415202
|
删除运行图工具栏
|
2020-01-07 14:49:51 +08:00 |
|
fan
|
1f88b03322
|
连接真实设备-国际化提示调整
|
2020-01-07 13:50:09 +08:00 |
|
fan
|
1a2ab7018c
|
设备管理-配置编辑 提示文字修改
|
2020-01-07 13:20:47 +08:00 |
|
fan
|
9a2d5f4602
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-07 13:11:57 +08:00 |
|
fan
|
f4c8832133
|
设备管理-配置编辑 信号机配置调整
|
2020-01-07 13:11:13 +08:00 |
|
fan
|
e4678d6f1a
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-07 13:06:16 +08:00 |
|
fan
|
5dc3eb83f8
|
设备管理-配置编辑 信号机配置调整
|
2020-01-07 13:05:06 +08:00 |
|
fan
|
2d8d16c0e7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-07 10:59:38 +08:00 |
|
zyy
|
3ebebd7e13
|
Merge branch 'dev' into test
|
2020-01-07 10:53:32 +08:00 |
|
zyy
|
5eb56d0a96
|
调整旧版地图右键菜单操作
|
2020-01-07 10:52:44 +08:00 |
|
sunzhenyu
|
7acd86d332
|
修改继电器显示逻辑
|
2020-01-07 10:51:19 +08:00 |
|
sunzhenyu
|
60e1750611
|
增加继电器数量
|
2020-01-07 10:41:21 +08:00 |
|
fan
|
c09021067a
|
设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数
|
2020-01-07 09:36:19 +08:00 |
|
sunzhenyu
|
b66b80b2b1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-07 09:28:10 +08:00 |
|
fan
|
b24b27f477
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-07 09:28:13 +08:00 |
|
fan
|
9944bdef33
|
设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数
|
2020-01-07 09:27:49 +08:00 |
|
sunzhenyu
|
f1f21006fe
|
修改继电器通信，修改新数据三维化部分操作
|
2020-01-07 09:27:41 +08:00 |
|
zyy
|
ea528dacef
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-07 09:23:11 +08:00 |
|
zyy
|
0330e08f89
|
调整车站状态显示，调整右键菜单显示，设置默认状态
|
2020-01-07 09:23:04 +08:00 |
|
fan
|
2d78605468
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-07 09:20:10 +08:00 |
|
fan
|
cf34d61746
|
设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数
|
2020-01-07 09:18:06 +08:00 |
|
fan
|
f2b62f281e
|
指令调整，公共地图宽度调整
|
2020-01-06 18:39:44 +08:00 |
|
fan
|
4d912022d5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-06 14:46:22 +08:00 |
|
fan
|
287eab2431
|
代码调整
|
2020-01-06 14:46:03 +08:00 |
|
fan
|
2554ed1135
|
代码调整
|
2020-01-06 14:43:08 +08:00 |
|
zyy
|
cabf30ed49
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-06 14:42:37 +08:00 |
|
zyy
|
3d8fcd305a
|
调整宁波一号线右键菜单流程
|
2020-01-06 14:42:28 +08:00 |
|
fan
|
68a7171495
|
国际化调整
|
2020-01-06 11:25:07 +08:00 |
|
sunzhenyu
|
505e9a0da4
|
修改区段数值匹配
|
2020-01-03 19:01:34 +08:00 |
|
fan
|
79aaba36da
|
连接真实设备添加连接状态
|
2020-01-03 18:42:08 +08:00 |
|
fan
|
100b852a9c
|
修复：顶掉用户，再次登录未获取新用户信息
|
2020-01-03 18:17:40 +08:00 |
|
fan
|
cd04327fa9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-03 17:01:12 +08:00 |
|
fan
|
673df154b4
|
国际化和连接真实设备调整
|
2020-01-03 17:00:33 +08:00 |
|
sunzhenyu
|
9cd76ee143
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-03 16:56:44 +08:00 |
|
sunzhenyu
|
71cadb56e8
|
修改编辑器轨道匹配逻辑
|
2020-01-03 16:56:36 +08:00 |
|
zyy
|
9d205b7a2b
|
Merge branch 'dev' into test
|
2020-01-03 16:44:39 +08:00 |
|
zyy
|
6e0ab142f7
|
创建试卷过滤控制，避免其他错误
|
2020-01-03 16:43:07 +08:00 |
|
zyy
|
f813906f03
|
Merge branch 'dev' into test
|
2020-01-03 16:18:21 +08:00 |
|
zyy
|
ad9d14e842
|
调整站台右键显示
|
2020-01-03 16:17:40 +08:00 |
|
zyy
|
28e0617c87
|
删除注释，信号机流程完成
|
2020-01-03 16:01:57 +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
|
766a169282
|
指令调整参数
|
2020-01-03 15:03:45 +08:00 |
|
fan
|
1695bb1d21
|
恢复退出仿真
|
2020-01-03 14:57:26 +08:00 |
|
fan
|
cb0f21a183
|
网关字地址可以为0，所有数据不可为小数
|
2020-01-03 13:49:40 +08:00 |
|
fan
|
b43d04a238
|
取消真实设备接口写死
|
2020-01-03 11:32:27 +08:00 |
|
fan
|
a384a8da19
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-03 11:20:44 +08:00 |
|
fan
|
dd57e3e85c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-03 11:18:36 +08:00 |
|
fan
|
e022b00a00
|
项目设备综合演练调整
|
2020-01-03 11:18:18 +08:00 |
|
zyy
|
2c01e8ace1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-02 18:40:36 +08:00 |
|
zyy
|
59e5c5fef7
|
调整相关用户的列表 名称变昵称显示
|
2020-01-02 18:40:30 +08:00 |
|
joylink_cuiweidong
|
e1d979e89a
|
代码调整
|
2020-01-02 17:06:35 +08:00 |
|
fan
|
c8a6e0d8ec
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-02 17:01:23 +08:00 |
|
fan
|
65b766e27f
|
项目设备管理
|
2020-01-02 17:01:11 +08:00 |
|
zyy
|
0b3e3311f0
|
删除控制模式
|
2020-01-02 14:57:13 +08:00 |
|
zyy
|
496a00c8fe
|
调整道岔区段坐标点bug
|
2020-01-02 14:30:03 +08:00 |
|
zyy
|
764f7c479e
|
调整右键菜单获取
|
2020-01-02 11:08:01 +08:00 |
|
zyy
|
5db5bb40f8
|
Merge branch 'dev_cmd' into dev
|
2020-01-02 10:47:08 +08:00 |
|
zyy
|
e750406484
|
Merge branch 'dev_cmd' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_cmd
|
2020-01-02 10:46:17 +08:00 |
|
zyy
|
7c5352ce7c
|
调整宁波一号线站台操作
|
2020-01-02 10:46:09 +08:00 |
|
fan
|
8466bcb059
|
成都三指令调整
|
2020-01-02 09:49:41 +08:00 |
|
fan
|
57e38a37a5
|
成都三指令调整
|
2020-01-02 09:29:23 +08:00 |
|
fan
|
21c18e8de4
|
获取每日运行图接口
|
2020-01-02 09:22:44 +08:00 |
|
fan
|
396e901a4d
|
添加/
|
2020-01-02 09:06:03 +08:00 |
|
zyy
|
8b2158294e
|
调整指令参数
|
2019-12-31 18:50:43 +08:00 |
|
sunzhenyu
|
33966b5a33
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-31 18:21:34 +08:00 |
|
sunzhenyu
|
432aff42a3
|
修改仿真驾驶换车错位
|
2019-12-31 18:20:53 +08:00 |
|
zyy
|
cf370249eb
|
调整指令
|
2019-12-31 18:10:49 +08:00 |
|
zyy
|
760225549e
|
兼容新旧两种发送机制
|
2019-12-31 17:20:04 +08:00 |
|
zyy
|
00a7517e52
|
修改指令发送流程及配置文件
|
2019-12-31 17:10:52 +08:00 |
|
fan
|
ce5c87608a
|
调整考试提交返回再次进入时未获取到mapId的问题&&题目框自动收取的问题
|
2019-12-31 16:57:35 +08:00 |
|
zyy
|
e03a4d12e0
|
调整宁波一号线
|
2019-12-31 16:24:22 +08:00 |
|
zyy
|
3044da2ea4
|
调整福州使用新版指令方式发送
|
2019-12-31 16:11:09 +08:00 |
|
fan
|
e6421dbeb6
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-12-31 15:57:09 +08:00 |
|
fan
|
ef1f301292
|
菜单置灰调整
|
2019-12-31 15:53:55 +08:00 |
|
fan
|
7dde1958f5
|
皮肤实例化调整
|
2019-12-31 15:36:49 +08:00 |
|
sunzhenyu
|
e2e9bc7be3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-31 15:13:36 +08:00 |
|
sunzhenyu
|
465520368b
|
修改新数据读取逻辑
|
2019-12-31 15:13:29 +08:00 |
|
joylink_cuiweidong
|
48e6318a24
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-12-31 15:04:28 +08:00 |
|
joylink_cuiweidong
|
9f2ad62c8f
|
浏览器地址栏输入根目录 跳转到实训平台登陆页面
实训平台权限代码调整
|
2019-12-31 15:02:58 +08:00 |
|
joylink_cuiweidong
|
ac51cf72ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-12-31 14:38:10 +08:00 |
|
fan
|
0504a2a2a6
|
迁移cmd分支
|
2019-12-31 14:32:04 +08:00 |
|
fan
|
4ce64c614b
|
问题调整
|
2019-12-31 14:30:23 +08:00 |
|
fan
|
eb8f64af27
|
课程系统左侧栏
|
2019-12-31 13:15:28 +08:00 |
|
joylink_cuiweidong
|
8f5a029467
|
权限分发<创建权限> 购买时长和购买总价加减代码调整
|
2019-12-31 10:22:58 +08:00 |
|
fan
|
efdd241d2c
|
初始路由跳转调整
|
2019-12-31 09:12:40 +08:00 |
|
joylink_cuiweidong
|
0caa944d0d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-12-30 19:04:36 +08:00 |
|
fan
|
f8c7a46743
|
调整合并问题
|
2019-12-30 18:58:23 +08:00 |
|
joylink_cuiweidong
|
4ce7b8250a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-30 18:47:09 +08:00 |
|
joylink_cuiweidong
|
ca6ca0ecc4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-30 18:45:17 +08:00 |
|
joylink_cuiweidong
|
cad56a82e9
|
Merge branch 'dev_prd' into dev
# Conflicts:
# src/views/demonstration/detail/index.vue
|
2019-12-30 18:45:05 +08:00 |
|
fan
|
e4aa7a2ccf
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_gzb
|
2019-12-30 18:25:22 +08:00 |
|
fan
|
bd8e3c0fc3
|
添加枚举
|
2019-12-30 18:25:01 +08:00 |
|
joylink_cuiweidong
|
dc9a059a7b
|
实训平台仿真权限代码调整
|
2019-12-30 18:14:52 +08:00 |
|
zyy
|
dbca771102
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-30 18:13:44 +08:00 |
|
zyy
|
b336e1844b
|
调整宁波一号线右键菜单操作及显示流程
|
2019-12-30 18:13:38 +08:00 |
|
fan
|
24ef3fd71d
|
添加贵州装备制造职业学院项目
|
2019-12-30 18:06:40 +08:00 |
|
joylink_cuiweidong
|
cbac3d2b9d
|
权限分发管理，创建权限 打包 接口调整
|
2019-12-30 17:13:21 +08:00 |
|