joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
4,005 Commits 20 Branches 0 Tags 448 MiB
0adcf6dac1
Commit Graph

2382 Commits

Author SHA1 Message Date
zyy
a033690502 调整综合监控文件位置及加载方式 2020-01-20 09:20:09 +08:00
fan
b2cd2dd4ca Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 09:06:15 +08:00
fan
0f93d8f203 iscs系统调整 2020-01-20 09:05:52 +08:00
joylink_cuiweidong
10e2c426e9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 18:56:48 +08:00
joylink_cuiweidong
8d948c82b1 iscs系统 乘客信息页面调整 2020-01-19 18:56:36 +08:00
zyy
1e78cb64f8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 18:36:23 +08:00
zyy
f42c48a0c4 调整iscs为新的系统 2020-01-19 18:36:17 +08:00
joylink_cuiweidong
caed94f56d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 18:35:02 +08:00
joylink_cuiweidong
2d30c5f0e7 iscs 组件代码调整 2020-01-19 18:34:28 +08:00
sunzhenyu
6e4b547d4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-01-19 18:09:44 +08:00
sunzhenyu
ceb9b06c2f 修改重复创建三维行车bug，去除继电器网格，新数据测试 2020-01-19 18:09:34 +08:00
fan
7048991824 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 17:34:25 +08:00
fan
155f8abb96 新版绘图停车点偏移量调整+国际化调整 2020-01-19 17:34:03 +08:00
fan
53a89cc970 iscs调整 2020-01-19 15:29:05 +08:00
joylink_cuiweidong
0d3a095a81 iscs 绘图组件代码调整 2020-01-19 14:56:22 +08:00
fan
40cca79ce8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:23:17 +08:00
fan
e858a6d25b iscs调整 2020-01-19 14:22:37 +08:00
zyy
9d0c88633d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:21:28 +08:00
zyy
323eda0e07 调整iscs样式 2020-01-19 14:21:22 +08:00
joylink_cuiweidong
8b47257b6e iscs 组件代码调整 2020-01-19 14:15:09 +08:00
joylink_cuiweidong
0247dce3aa Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:09:31 +08:00
joylink_cuiweidong
1d56688732 iscs 各组件生成uid方法修改 2020-01-19 14:09:15 +08:00
fan
0f50e1b00a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:03:51 +08:00
fan
df39d836dc iscs调整 2020-01-19 14:03:32 +08:00
joylink_cuiweidong
d8086e1311 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/utils/parser.js
 2020-01-19 13:52:24 +08:00
joylink_cuiweidong
d957ea049b iscs 生成uid代码调整 2020-01-19 13:49:55 +08:00
fan
cd5ed00747 Merge remote-tracking branch 'origin/dev' into test 2020-01-19 13:17:01 +08:00
zyy
298dddf718 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 11:22:58 +08:00
zyy
2d5074d6d1 增加进路数据状态维护 2020-01-19 11:22:48 +08:00
fan
d9c15d961e 连接真实设备按钮仅车站值班员可见 2020-01-19 11:17:51 +08:00
fan
ea74886ba3 调整打开新页面时sessionStorage复制导致的路由处理错误 2020-01-19 10:26:40 +08:00
fan
15ca63be84 iscs调整 2020-01-19 10:05:55 +08:00
fan
d744d7a69e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/deviceRender.js
#	src/iscs/constant/deviceType.js
#	src/iscs/shape/factory.js
#	src/iscs/utils/parser.js
 2020-01-17 18:49:15 +08:00
fan
87e62a6631 iscs综合监控 2020-01-17 18:45:28 +08:00
zyy
0bee3cc61d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-17 17:48:15 +08:00
zyy
1779f856be 新增iscs系统 2020-01-17 17:48:08 +08:00
joylink_cuiweidong
0bb7b11271 iscs bas 状态管理代码调整 生成uid代码调整 组件代码调整 2020-01-17 17:27:11 +08:00
joylink_cuiweidong
7987f6bd12 iscs bas 组件 uid 代码修改 2020-01-17 15:42:20 +08:00
zyy
3ec7d0a7e5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-17 15:32:08 +08:00
zyy
e4b20395c4 增加iscs系统，调整成都一号线运行图导入 2020-01-17 15:31:58 +08:00
joylink_cuiweidong
22419fa6c9 iscs bas 组件代码调整 2020-01-17 15:15:58 +08:00
fan
95e5c9f603 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-17 14:20:49 +08:00
fan
582fc354db 快速入口增加参数projectCode 2020-01-17 14:20:31 +08:00
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
45fafdd0ee iscs 排风机 冷水机组绘图代码调整 2020-01-17 11:07:44 +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
sunzhenyu
ca46f1238b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-01-16 17:04:24 +08:00
sunzhenyu
d32820e1b4 修改三维背景bug，修改继电器模型和显示，继电器地址，修改三维地图站台偏差 2020-01-16 17:04:16 +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
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
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
fan
e8039732ab iscs调整 2020-01-14 18:17:51 +08:00
fan
9d42d1aba1 哈尔滨盈达科技调整 2020-01-14 17:00:17 +08:00
fan
9688838869 哈尔滨盈达科技调整 2020-01-14 16:58:23 +08:00
fan
1c869ebd67 哈尔滨盈达科技调整 2020-01-14 16:56:06 +08:00
fan
8d597eccfd 哈尔滨盈达科技调整 2020-01-14 16:53:46 +08:00
fan
d2f741866f 登录页面添加备案号 2020-01-14 16:44:20 +08:00
fan
e9499916f5 登录页面添加备案号 2020-01-14 16:39:26 +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
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
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
9d42feb47e 增加绘图图层 全选 2020-01-13 17:31:58 +08:00
joylink_cuiweidong
557b1cbfeb 新版绘图 生成道岔计轴区段代码调整 2020-01-13 16:46:10 +08:00
fan
b1bb638af3 修复：路由改变未在地图数据改变前及时清除定时器导致的地图数据污染保存的问题 2020-01-13 16:30:38 +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
e8b616b705 成都一号线菜单调整 2020-01-09 18:21:04 +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
zyy
d79641e0e4 调整指令字典中条件参数 2020-01-08 17:21:17 +08:00
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
fan
b84f86916f Merge remote-tracking branch 'origin/dev' into test 2020-01-08 09:42:36 +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
9944bdef33 设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数 2020-01-07 09:27:49 +08:00
sunzhenyu
f1f21006fe 修改继电器通信，修改新数据三维化部分操作 2020-01-07 09:27:41 +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
2554ed1135 代码调整 2020-01-06 14:43:08 +08:00
fan
68a7171495 国际化调整 2020-01-06 11:25:07 +08:00
fan
79aaba36da 连接真实设备添加连接状态 2020-01-03 18:42:08 +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
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
28e0617c87 删除注释，信号机流程完成 2020-01-03 16:01:57 +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
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
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
fan
21c18e8de4 获取每日运行图接口 2020-01-02 09:22:44 +08:00
zyy
8b2158294e 调整指令参数 2019-12-31 18:50:43 +08:00
zyy
00a7517e52 修改指令发送流程及配置文件 2019-12-31 17:10:52 +08:00
fan
ce5c87608a 调整考试提交返回再次进入时未获取到mapId的问题&&题目框自动收取的问题 2019-12-31 16:57:35 +08:00
fan
7dde1958f5 皮肤实例化调整 2019-12-31 15:36:49 +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
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
joylink_cuiweidong
dc9a059a7b 实训平台仿真权限代码调整 2019-12-30 18:14:52 +08:00
fan
24ef3fd71d 添加贵州装备制造职业学院项目 2019-12-30 18:06:40 +08:00
joylink_cuiweidong
cbac3d2b9d 权限分发管理，创建权限 打包 接口调整 2019-12-30 17:13:21 +08:00
zyy
4a06c92ea1 修改鼠标静止隐藏移动显示逻辑 2019-12-30 14:06:42 +08:00
joylink_cuiweidong
23d14d6c8e 实训平台 教学详情和仿真详情 合计改为权限总数 2019-12-30 09:58:43 +08:00
joylink_cuiweidong
0c9843f233 代码调整 2019-12-30 09:36:35 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00
joylink_cuiweidong
40bc4840e7 prdType 接口调整 2019-12-27 19:36:29 +08:00
joylink_cuiweidong
0486d0211b prdType对应接口修改 2019-12-27 18:48:56 +08:00
fan
e5997a5856 修复： 信号机接近区段检索后台无数据是清空之前的数据 2019-12-27 17:32:22 +08:00
joylink_cuiweidong
eefaf8aad9 实训平台教学 和 设计平台教学管理 prdtype对应接口调整 2019-12-27 17:09:56 +08:00
fan
a285d28cb3 整理代码 2019-12-27 15:23:42 +08:00
joylink_cuiweidong
59f4a8d253 仿真里面的prdtype调整 2019-12-27 14:20:29 +08:00
joylink_cuiweidong
493aab5409 删除与产品相关的接口 
修改仿真的prdtype接口代码
 2019-12-27 14:04:34 +08:00
joylink_cuiweidong
25ff5bdb6b 删除仿真里的回放 2019-12-27 11:30:49 +08:00
joylink_cuiweidong
1ad20fe522 删除实训平台 权限 权限打包 2019-12-27 11:11:38 +08:00
joylink_cuiweidong
f985a93c9e 设计平台 课程设计 实训管理 prdtype 接口调整 2019-12-27 10:47:07 +08:00
joylink_cuiweidong
e67d1fb279 删除maprd有关的接口 2019-12-27 10:24:14 +08:00
joylink_cuiweidong
d15eca77ea 删除系统管理产品编辑 
删除发布内容管理产品状态
 2019-12-27 10:04:09 +08:00
joylink_cuiweidong
9b3c41dbfb 设计平台，课程 创建章节 获取实训列表接口修改 2019-12-27 09:47:07 +08:00
fan
d29bc62dda Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-27 09:41:02 +08:00
fan
573bf83ea8 整理代码 2019-12-27 09:40:52 +08:00
joylink_cuiweidong
11de837332 设计平台课程设计实训管理 生成实训/删除实训/修改实训 调整 2019-12-26 19:58:34 +08:00
joylink_cuiweidong
044068d4a8 删除实训平台地图权限页面 打包详情按钮 
删除设计平台商品管理页面 添加按钮
 2019-12-26 19:15:48 +08:00
joylink_cuiweidong
d157dc0a88 删除权限管理的权限打包按钮 
删除权限分发管理的权限打包按钮
 2019-12-26 18:07:43 +08:00
zyy
72ecdae535 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 18:07:29 +08:00
zyy
82cbae08ec 调整新旧地图加载方式 2019-12-26 18:07:23 +08:00
fan
dafd6d42cd Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 16:54:38 +08:00
fan
2a11b8d697 信号机增加名字旋转标识，区段关联关系增加校验，进路列表增加编码展示列 2019-12-26 16:54:24 +08:00
zyy
6c37fe6bdf 调整点击计轴区段显示高亮，调整区段高亮颜色 2019-12-26 16:38:44 +08:00
joylink_cuiweidong
cd5e923c52 用户实训统计，用户仿真统计 产品类型修改 2019-12-26 16:32:03 +08:00
zyy
9123a794f0 道岔显示关联区段 2019-12-26 16:06:33 +08:00
fan
45e78f4b67 区段赋值前，清除所有数据 2019-12-26 15:38:33 +08:00
fan
78b28f118b 信号机参数名调整，旋转限制调整 2019-12-26 15:14:17 +08:00
fan
1540119022 Merge remote-tracking branch 'origin/dev' into test 2019-12-26 14:07:28 +08:00
fan
65475abf6f 进路赋值前清除延续保护表单 2019-12-26 14:06:42 +08:00
joylink_cuiweidong
8e82ceab27 权限打包页面接口调整（/api/lesson） 2019-12-26 13:12:23 +08:00
fan
d327e50a44 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 11:04:57 +08:00
fan
8431ff8cc4 增加非空校验 2019-12-26 11:04:21 +08:00
zyy
8d5fce7250 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 11:02:00 +08:00
zyy
6e3424e355 调整实训平台新旧地图显示逻辑 2019-12-26 11:01:54 +08:00
fan
6ff30c5b63 增加非空校验 2019-12-26 10:47:40 +08:00
fan
d79d2af32c 区段赋值时清除逻辑区段code列表 2019-12-26 10:44:08 +08:00
sunzhenyu
f9e32dc904 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-26 10:41:16 +08:00
sunzhenyu
76379f12cc 继电器通信，修改继电器逻辑，继电器模型动画更替，修改设备信号灯逻辑，修改设备道岔初始化bug 2019-12-26 10:41:07 +08:00
joylink_cuiweidong
4a30ced825 创建课程时，所属产品变为产品类型 2019-12-25 19:40:49 +08:00
joylink_cuiweidong
b70daac9bf 定制-产品名称改为产品类型 
展示页面产品名称改为产品类型
 2019-12-25 19:28:03 +08:00
joylink_cuiweidong
cb1ca75eb7 用户仿真统计 
新增-产品名称改为产品类型
前端维护一个产品类型枚举
 2019-12-25 18:56:25 +08:00
zyy
1c04b8d215 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-25 18:45:53 +08:00
zyy
74f0b12e3c 修改运行图显示，调整进路列表展示 2019-12-25 18:45:48 +08:00
joylink_cuiweidong
8b27475499 站台修改对应的车站时，同时修改所属集中站 2019-12-25 17:33:57 +08:00
fan
df7f13d411 延续保护区段预览详情合并rowspan 2019-12-25 10:58:58 +08:00
fan
432b268675 延续保护区段，进路物理区段，信号机接近区段激活状态下，点击已选中的区段删除列表中的该区段 2019-12-25 10:31:42 +08:00
fan
7328b7adb6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-25 09:19:54 +08:00
fan
9331180684 调整：信号机接近区段中信号机选中变为黄色 2019-12-25 09:18:28 +08:00
zyy
f23da9be42 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
 2019-12-25 09:13:29 +08:00
zyy
741fccf609 删除多余字段 2019-12-25 09:12:22 +08:00
fan
fc4518b5a0 调整：延续保护区段和信号机接近区段可选逻辑区段 2019-12-25 08:58:50 +08:00
fan
d1cc62cd99 信号机接近区段信号机change，检索后台数据 2019-12-24 18:24:37 +08:00
fan
52eddbaa3d 调整logicSectionCodeList赋值增加校验 2019-12-24 18:05:56 +08:00
fan
6d82f466a6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-24 14:28:29 +08:00
fan
c31a9aff46 增加：进路始终端信号机为黄色 2019-12-24 14:26:07 +08:00
zyy
da217251c8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-24 13:53:48 +08:00
zyy
a39078990f 设置进路记忆最后一个关联站台，及解锁时间 2019-12-24 13:53:37 +08:00
fan
d842be60ce Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-24 13:52:22 +08:00
fan
f7ff7f7f81 增加：信号机接近区段红色高亮 2019-12-24 13:52:06 +08:00
joylink_cuiweidong
db44fe8d62 分页获取用户权限接口，前端添加昵称字段 2019-12-24 11:23:55 +08:00
joylink_cuiweidong
be784efb43 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-24 10:49:39 +08:00
joylink_cuiweidong
f25787da62 进路列表数据展示调整 2019-12-24 10:49:28 +08:00
fan
5fe33a32ec Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-24 09:31:39 +08:00
fan
77be22e9e9 调整：进路列表信号机展示由uniqueName变更为name 2019-12-24 09:31:25 +08:00
joylink_cuiweidong
b7d5edfb31 轮播页面调整 2019-12-24 09:09:30 +08:00
zyy
c1f41b4299 修改信号机构建关系逻辑，修改创建逻辑区段偏移量数据逻辑 2019-12-23 17:14:38 +08:00
zyy
72c4bd0bd0 调整信号机接近区段点击事件 2019-12-23 16:23:56 +08:00
fan
ea97fc21b9 修复：选择进路延续保护区段选中逻辑区段替换为其父区段 2019-12-23 15:21:09 +08:00
zyy
d4cf4af2df Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 14:50:06 +08:00
zyy
a31e358b41 desc: 修改宁波一号线运行图导入数据修改 2019-12-23 14:49:57 +08:00
fan
907881eb7a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 13:32:58 +08:00
fan
663d43c5d2 修复：调整延时解锁创建校验规则（仅当延续保护线路存在时，进行解锁区段解锁时间校验，否则直接放弃创建或删除延续保护） 2019-12-23 13:32:11 +08:00
zyy
e46915e686 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 13:24:09 +08:00
zyy
26d06cae27 调整运行图导入判断，删除进路数据字段 2019-12-23 13:24:00 +08:00
joylink_cuiweidong
4ab635e553 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 10:54:07 +08:00
joylink_cuiweidong
6d959b816b 修改imagecontrol 为 resource 2019-12-23 10:53:25 +08:00
zyy
d62b023d52 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 10:36:40 +08:00
zyy
6e7ad61b4a 调整新版地图，旧版地图在公共地图显示流程 2019-12-23 10:36:32 +08:00
fan
065a3ba72e 修复：调整左右关联区段list数据为计轴区段和道岔区段 2019-12-23 10:15:45 +08:00
fan
4677be1b32 修复：增加选中type类型 2019-12-23 09:44:03 +08:00
fan
35dceb2950 修复：增加非空校验 2019-12-23 09:31:04 +08:00
fan
32d188cdfc Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 09:23:58 +08:00
fan
d9bf1af2d9 修复：绘图高级绘图切换高亮显示问题 2019-12-23 09:23:29 +08:00
zyy
0826c93362 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 09:15:31 +08:00
zyy
6ec990a1b2 解析宁波一号线运行图 2019-12-23 09:15:25 +08:00
fan
a60971c54e 修复：进路物理区段选中逻辑区段时处理物理区段高亮 2019-12-20 17:15:15 +08:00
fan
0207e54914 进路延续保护区段选中红色 2019-12-20 15:44:12 +08:00
fan
6189318755 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 14:24:18 +08:00
fan
ab70d8168b 修复：进路道岔类型不显示 2019-12-20 14:23:59 +08:00
zyy
bfe6c5a537 调整线路配置项流程，对接字段 2019-12-20 14:02:11 +08:00
zyy
12bfdcfa66 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 13:48:45 +08:00
zyy
6a82d745d9 调整高级数据生成code规范 2019-12-20 13:48:37 +08:00
fan
2cbafa7950 延续保护样式调整 2019-12-20 11:22:30 +08:00
zyy
4f5fe2c9bb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 10:54:35 +08:00
zyy
73da545e67 调整信号机偏移量设置 2019-12-20 10:54:29 +08:00
fan
438aef2764 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 10:20:38 +08:00
fan
2a517c8aa5 进路调整 延续保护生成线路道岔可为空，创建延续保护必须有解锁区段，时间，线路，更新是若无解锁区段和线路则删除延续保护 2019-12-20 10:20:03 +08:00
zyy
b5cc83a0e0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 18:04:35 +08:00
zyy
3101af9948 增加线路皮肤配置，调整联锁站台显示列表 2019-12-19 18:04:28 +08:00
fan
9cd46588a9 自动信号参数名和默认值调整--0003 2019-12-19 16:43:56 +08:00
fan
6ce29006e5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 16:21:15 +08:00
fan
143f35a222 进路物理区段列表连续高亮 2019-12-19 16:21:00 +08:00
joylink_cuiweidong
882bb44fb2 根据设备code高亮 地图对应的设备 2019-12-19 15:52:36 +08:00
fan
30fc3132d3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 14:05:30 +08:00
fan
fbbee9324a 延续保护预览 2019-12-19 14:05:16 +08:00
joylink_cuiweidong
fb7618c8ee Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 13:14:40 +08:00
joylink_cuiweidong
27196e9c54 站台创建的时候绑定集中站 2019-12-19 13:14:29 +08:00
zyy
3abc93cbb8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 13:12:43 +08:00
zyy
c0c5d620cd 调整站台紧急停车创建逻辑 2019-12-19 13:12:34 +08:00
fan
05a4ca76dc Merge remote-tracking branch 'origin/dev' into test 2019-12-19 10:13:55 +08:00
fan
e300164580 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
 2019-12-19 10:12:54 +08:00
fan
524df9c5e9 进路-延续保护调整 2019-12-19 10:08:12 +08:00
zyy
511701b116 调整数据显示字段，调整创建站台区段属性设置 2019-12-19 10:00:29 +08:00
zyy
1e1f9a598d 修改高级数据字段显示 2019-12-18 17:52:50 +08:00
zyy
c295f97819 调整车站显示坐标，信号机批量操作，调整逻辑代码 2019-12-18 16:20:30 +08:00
joylink_cuiweidong
38c2bc4c55 zc控制代码调整 2019-12-18 15:34:51 +08:00
joylink_cuiweidong
d994ed3d7e 代码调整 2019-12-18 15:00:53 +08:00
joylink_cuiweidong
2bbfa5e860 代码调整 2019-12-18 14:50:34 +08:00
joylink_cuiweidong
19606ffd98 权限代码调整 2019-12-18 13:29:52 +08:00
zyy
26de4ee6a4 Merge branch 'dev' into test 2019-12-18 13:25:59 +08:00
zyy
0bb46ab432 高级数据调整顺序 2019-12-18 13:21:07 +08:00
zyy
0d3ba9d138 Merge branch 'dev' into test 2019-12-18 13:07:54 +08:00
fan
2d068a93ce Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-18 13:06:00 +08:00
fan
7cf546efe6 参数调整 2019-12-18 13:05:29 +08:00
zyy
0a8b0e3264 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-18 11:18:08 +08:00
zyy
436db38200 调整区段字段保存获取 2019-12-18 11:17:57 +08:00
joylink_cuiweidong
cf03ac1e3d 综合演练的分发按钮去掉 
所有的转增按钮去掉
 2019-12-18 11:16:35 +08:00
joylink_cuiweidong
8d44dd0b19 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-18 10:20:44 +08:00
joylink_cuiweidong
d196383a06 批量设置集中站 数据过滤 2019-12-18 10:18:55 +08:00
zyy
97dc97d8db Merge branch 'dev' into test 2019-12-18 10:14:33 +08:00
joylink_cuiweidong
9c54da44f3 站台创建关联集中站 2019-12-18 10:01:58 +08:00
joylink_cuiweidong
e3fb06591c 代码修改 2019-12-17 19:22:07 +08:00
joylink_cuiweidong
b864c717fb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/station.vue
 2019-12-17 19:05:19 +08:00
joylink_cuiweidong
b4ea83eabc zc 集中站设置 2019-12-17 19:03:38 +08:00
zyy
33f140d71c 修改小站台位置 2019-12-17 18:17:33 +08:00
fan
97202631ea Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 17:27:54 +08:00
fan
88eeaff1e2 区段站台问题调整 2019-12-17 17:27:35 +08:00
zyy
ea4de2d11d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 17:09:13 +08:00
zyy
88b1d10430 调整生成道岔 区段修改字段 2019-12-17 17:09:04 +08:00
fan
6195338947 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 16:41:40 +08:00
fan
3723c8696e 区段关系校验 2019-12-17 16:41:18 +08:00
joylink_cuiweidong
cd549d57fc Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/station.vue
 2019-12-17 16:24:24 +08:00
joylink_cuiweidong
b8448aaff8 道岔设置集中站过滤 
区段设置集中站过滤
车站设置集中站和管理车站列表代码调整
 2019-12-17 16:22:07 +08:00
zyy
b05d71667e 调整列车创建 2019-12-17 15:37:11 +08:00
zyy
fce5242e06 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 14:34:18 +08:00
zyy
24fd0890dd 调整进路保存 2019-12-17 14:34:09 +08:00
fan
c501445800 折线偏移量调整 2019-12-17 14:26:56 +08:00
fan
e419fd9241 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 10:31:24 +08:00
fan
4cecc2d630 逻辑区段增加偏移量参数 2019-12-17 10:31:12 +08:00
zyy
0bb01b4e4c 调整信号机字段 2019-12-17 10:30:27 +08:00
fan
a1be3cf879 逻辑区段增加偏移量参数 2019-12-17 10:26:38 +08:00
zyy
c0e953ceeb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/signal/index.vue
#	src/views/newMap/newMapdraft/mapoperate/stationstand.vue
 2019-12-17 09:16:55 +08:00
zyy
9fe6c9739d 调整代码 2019-12-17 09:13:57 +08:00
fan
5dc6f88beb Merge remote-tracking branch 'origin/dev' into test 2019-12-16 19:24:08 +08:00
fan
1877b05cce 信号机方向属性调整 2019-12-16 18:17:43 +08:00
fan
28c57c1228 站台方向属性调整 2019-12-16 14:51:30 +08:00
fan
c79465b31a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-16 10:57:53 +08:00
fan
7d2d6fb580 站台方向属性调整 2019-12-16 10:57:40 +08:00
zyy
de30f91aed 修改代码 2019-12-13 18:50:01 +08:00
joylink_cuiweidong
61ee6415cf Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-13 18:31:23 +08:00
zyy
a6e8f1376f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
 2019-12-13 18:01:48 +08:00
zyy
70ae531eff 增加信号机构建偏移量关联关系逻辑， 调整车次窗批量修改 2019-12-13 18:00:12 +08:00
fan
b2c9e34a25 站台方向属性初始值调整 2019-12-13 17:53:34 +08:00
fan
62300d327f 站台方向属性调整 2019-12-13 17:51:00 +08:00
fan
852ac4e601 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
 2019-12-13 17:12:10 +08:00
fan
ea3217891a 逻辑区段偏移量 2019-12-13 17:06:17 +08:00
fan
bd1cbf4e40 站台调整 2019-12-13 16:28:34 +08:00
joylink_cuiweidong
36c1b6ceec 车站添加副标题 2019-12-13 16:13:10 +08:00
sunzhenyu
23400034c1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-13 15:57:51 +08:00
sunzhenyu
e8cc316e82 增加继电器部件显示 2019-12-13 15:57:38 +08:00
joylink_cuiweidong
284f7bcc7b 区段删除站台轨对应站台编码 2019-12-13 15:24:51 +08:00
joylink_cuiweidong
6715c48642 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-13 14:58:39 +08:00
joylink_cuiweidong
9123dc050a 车站添加车站编号 2019-12-13 14:58:28 +08:00
fan
13f608a2ff 高级高亮调整 2019-12-13 14:46:38 +08:00
fan
8f6a7c1253 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-13 14:19:49 +08:00
fan
fc3ab4cc21 站台屏蔽门调整 2019-12-13 14:19:38 +08:00
joylink_cuiweidong
eb3b803462 信号机所属集中站数据筛选 
进路所属联锁站数据筛选
 2019-12-13 14:02:15 +08:00
joylink_cuiweidong
0a2e5567a2 代码调整 2019-12-13 13:23:07 +08:00
joylink_cuiweidong
b2b9c5819b 车站增加: 是否连锁站 
区段删除关联站台字段
 2019-12-13 13:19:09 +08:00
fan
083e70dc02 站台屏蔽门调整 2019-12-13 13:10:11 +08:00
zyy
a0899720b6 Merge branch 'dev' into test 2019-12-13 10:19:44 +08:00
sunzhenyu
c89401b58a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-13 09:14:37 +08:00
sunzhenyu
a9a62b924f 添加继电器界面动画，修改继电器显示模式 2019-12-13 09:14:28 +08:00
zyy
2f639cce5e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 18:15:32 +08:00
zyy
7ef051733a 调整缩放，站台显示，坐标 2019-12-12 18:15:25 +08:00
fan
4af61e8615 drawWay参数调整 2019-12-12 16:10:44 +08:00
fan
811a430ec1 Revert "drawWay参数调整" 
This reverts commit 54be69b
 2019-12-12 16:07:32 +08:00
fan
0ef09ed480 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 15:58:39 +08:00
fan
54be69b2e6 drawWay参数调整 2019-12-12 15:58:19 +08:00
zyy
7c9d9c6373 调整站台显示样式问题，修改代码 2019-12-12 15:31:01 +08:00
fan
9a342caad7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 12:23:36 +08:00
fan
80109bb349 区段新建台调整 2019-12-12 12:23:25 +08:00
joylink_cuiweidong
eec32fea2a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 10:41:32 +08:00
joylink_cuiweidong
df31cb9138 代码调整 2019-12-12 10:40:54 +08:00
zyy
e7505d65eb Merge branch 'dev' into test 2019-12-12 10:05:51 +08:00
zyy
6fb6ae9867 调整站台，屏蔽门默认样式 2019-12-12 10:05:28 +08:00
fan
6e50f1eddf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 18:25:22 +08:00
fan
cc014d4ccc 自动折返设置优先级 2019-12-11 18:25:03 +08:00
zyy
23aec2d206 Merge branch 'dev' into test 2019-12-11 17:23:03 +08:00
zyy
159a2b4890 调整点击道岔计轴显示道岔区段 2019-12-11 17:22:01 +08:00
zyy
206496609d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 17:07:39 +08:00
zyy
b2dd3d7285 调整站台生成逻辑，调整uid检测方式 2019-12-11 17:07:29 +08:00
fan
eafb83a886 自动折返调整 2019-12-11 14:10:51 +08:00
fan
5fdbbe9295 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 13:57:06 +08:00
fan
cd15b3737c 自动折返，进路调整 2019-12-11 13:56:46 +08:00
sunzhenyu
57db66b6c2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-11 10:47:32 +08:00
sunzhenyu
5992e1a0ae 修改三维模块名称，升级threejs版本 2019-12-11 10:47:24 +08:00
joylink_cuiweidong
a358b9cdd6 代码调整 2019-12-11 09:42:33 +08:00
zyy
9e50f2eacf Merge branch 'dev' into test 2019-12-11 09:08:28 +08:00
joylink_cuiweidong
d5eef0c022 信号机接近区段页面调整 2019-12-10 18:11:11 +08:00
joylink_cuiweidong
b6e6e72d17 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 18:02:08 +08:00
joylink_cuiweidong
98c7e1105f 自动信号接口修改 2019-12-10 18:01:52 +08:00
fan
214a74a55a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 17:56:08 +08:00
fan
0bde17887f 高级延续保护调整 2019-12-10 17:55:43 +08:00
joylink_cuiweidong
f6e0221b88 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 17:11:54 +08:00
joylink_cuiweidong
424ec26538 用户权限统计代码调整 2019-12-10 17:11:14 +08:00
zyy
914af945c8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 16:57:37 +08:00
zyy
9aec1ef099 调整拖拽逻辑 2019-12-10 16:57:31 +08:00
fan
b6719793c9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 16:50:50 +08:00
fan
6afb5f35a8 高级延续保护调整 2019-12-10 16:50:38 +08:00
zyy
18892bed83 移入鼠标显示坐标 2019-12-10 16:09:45 +08:00
zyy
640b38285a 调整车站默认字体大小，皮肤调整 2019-12-10 15:44:46 +08:00
joylink_cuiweidong
00552b6494 区段批量创建代码调整 2019-12-10 11:02:13 +08:00
joylink_cuiweidong
58b3c182f1 代码调整 2019-12-10 10:52:58 +08:00
joylink_cuiweidong
fed85fe78e 订单列表代码调整 2019-12-10 10:44:18 +08:00
joylink_cuiweidong
9199d7bc64 权限分发代码调整 2019-12-10 10:27:29 +08:00
fan
2c6f19b270 合并代码 2019-12-10 10:20:32 +08:00
fan
45e4aaca8b 延续保护调整 2019-12-10 10:18:25 +08:00
zyy
18ebc91da2 调整批量创建区段 逻辑 2019-12-10 10:12:46 +08:00
zyy
4385e64b03 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 09:25:19 +08:00
zyy
ae36dc3542 新增区段创建方式 2019-12-10 09:25:13 +08:00
joylink_cuiweidong
6d26e8e217 进路添加是否先锁闭字段 2019-12-09 18:54:11 +08:00
zyy
bdebbed374 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-09 17:48:52 +08:00
zyy
5114f848b3 调整道岔计轴区段生成逻辑 2019-12-09 17:48:46 +08:00
joylink_cuiweidong
a15cb8d43c 获取发布地图接口修改（添加drawWay参数） 2019-12-09 17:38:08 +08:00
joylink_cuiweidong
b8563c839b 订单列表国际化 2019-12-09 17:25:20 +08:00
joylink_cuiweidong
b7fd5b7475 订单管理列表页面代码调整 2019-12-09 16:52:01 +08:00
joylink_cuiweidong
90c0598af7 订单管理创建订单页面代码调整 2019-12-09 15:35:57 +08:00
fan
e28595053d Revert "区段列表变更调整" 
This reverts commit 95caf15
 2019-12-09 15:20:59 +08:00
fan
586d7a23e5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-09 15:05:25 +08:00
fan
95caf1509e 区段列表变更调整 2019-12-09 15:05:15 +08:00
joylink_cuiweidong
b6bb17f064 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-09 14:51:32 +08:00
joylink_cuiweidong
97eeda5eeb 订单创建代码调整 2019-12-09 14:51:01 +08:00
zyy
01501ce364 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-09 14:33:30 +08:00
zyy
f596016097 增加区段与车次窗关联关系 2019-12-09 14:33:23 +08:00
fan
96f237d581 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-09 11:00:42 +08:00
fan
28e9abe13a ibp绘图部分设备添加操作表示关联设备 2019-12-09 11:00:25 +08:00
lVAL
0b590e922c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-09 10:52:19 +08:00
lVAL
eeb69eac26 修改，两个房主相互邀请时，跳转房间路径bug的问题 2019-12-09 10:52:08 +08:00
zyy
6bd0e07e58 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-09 10:50:28 +08:00
zyy
2bac1022b4 修改生成规则，调整新版地图右键操作 2019-12-09 10:50:21 +08:00
fan
d8b0577c77 删除打印日志 2019-12-06 18:13:42 +08:00
fan
e281045268 Merge remote-tracking branch 'origin/dev' into test 2019-12-06 18:11:05 +08:00
fan
0f56e5b7eb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 18:09:40 +08:00
fan
a6872d7e1e 绘图调整-（逻辑区段添加均为0或均不为0校验） 2019-12-06 18:09:31 +08:00
sunzhenyu
00d74d6d63 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-06 18:04:22 +08:00
sunzhenyu
a6c9db1904 修改仿真驾驶添加模型错误，修改沙盘漫游动画轨迹，修改沙盘图标显示，清除不使用的天空盒文件 2019-12-06 18:04:15 +08:00
zyy
35688adcd0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 18:03:18 +08:00
zyy
dc381e2a63 desc: 新增屏蔽门绘制以及紧急停车按钮生成流程 2019-12-06 18:03:13 +08:00
fan
eb741b4be3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 17:55:00 +08:00
fan
ac3b2d85fd ibp 添加屏蔽门操作 2019-12-06 17:54:38 +08:00
joylink_cuiweidong
53626c8a12 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-06 15:54:29 +08:00