Commit Graph

276 Commits

Author SHA1 Message Date
zyy
1fab892047 新增扣车请求参数 2020-01-13 17:07:06 +08:00
zyy
5217a334d5 调整宁波一号线站台状态显示 2020-01-13 16:52:00 +08:00
zyy
dcead8d707 增加点击事件取消选中状态为全局混入,删除多余线路utils配置 2020-01-13 14:40:24 +08:00
fan
4e136ca8b3 成都一号线样式调整 2020-01-10 18:51:57 +08:00
zyy
a7b97dd7cc 调整宁波一号线请求参数 2020-01-10 14:41:20 +08:00
fan
2b4aa891eb 成都一号线右键菜单调整 2020-01-09 09:02:02 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00
zyy
5eb56d0a96 调整旧版地图右键菜单操作 2020-01-07 10:52:44 +08:00
zyy
0330e08f89 调整车站状态显示,调整右键菜单显示,设置默认状态 2020-01-07 09:23:04 +08:00
zyy
3d8fcd305a 调整宁波一号线右键菜单流程 2020-01-06 14:42:28 +08:00
zyy
308f82c14e 提交请求进路接口 2020-01-03 15:52:51 +08:00
zyy
c13963f793 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-03 15:50:32 +08:00
zyy
4f2fb97477 调整宁波线右键菜单显示 2020-01-03 15:50:26 +08:00
fan
e022b00a00 项目设备综合演练调整 2020-01-03 11:18:18 +08:00
zyy
496a00c8fe 调整道岔区段坐标点bug 2020-01-02 14:30:03 +08:00
fan
24ef3fd71d 添加贵州装备制造职业学院项目 2019-12-30 18:06:40 +08:00
zyy
ce44ec4429 调整宁波线 样式,显示宁波线右键操作 2019-12-30 13:24:40 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00
zyy
6e3424e355 调整实训平台新旧地图显示逻辑 2019-12-26 11:01:54 +08:00
zyy
74f0b12e3c 修改运行图显示,调整进路列表展示 2019-12-25 18:45:48 +08:00
zyy
bfe6c5a537 调整线路配置项流程,对接字段 2019-12-20 14:02:11 +08:00
zyy
6a82d745d9 调整高级数据生成code规范 2019-12-20 13:48:37 +08:00
fan
143f35a222 进路物理区段列表连续高亮 2019-12-19 16:21:00 +08:00
fan
fbbee9324a 延续保护预览 2019-12-19 14:05:16 +08:00
fan
05a4ca76dc Merge remote-tracking branch 'origin/dev' into test 2019-12-19 10:13:55 +08:00
zyy
c295f97819 调整车站显示坐标,信号机批量操作,调整逻辑代码 2019-12-18 16:20:30 +08:00
fan
7cf546efe6 参数调整 2019-12-18 13:05:29 +08:00
zyy
97dc97d8db Merge branch 'dev' into test 2019-12-18 10:14:33 +08:00
zyy
399093bc72 调整站台计算坐标 2019-12-18 09:49:44 +08:00
sunzhenyu
a9a62b924f 添加继电器界面动画,修改继电器显示模式 2019-12-13 09:14:28 +08:00
zyy
b2dd3d7285 调整站台生成逻辑,调整uid检测方式 2019-12-11 17:07:29 +08:00
zyy
9e50f2eacf Merge branch 'dev' into test 2019-12-11 09:08:28 +08:00
fan
6afb5f35a8 高级延续保护调整 2019-12-10 16:50:38 +08:00
joylink_cuiweidong
a15cb8d43c 获取发布地图接口修改(添加drawWay参数) 2019-12-09 17:38:08 +08:00
zyy
2bac1022b4 修改生成规则,调整新版地图右键操作 2019-12-09 10:50:21 +08:00
fan
e281045268 Merge remote-tracking branch 'origin/dev' into test 2019-12-06 18:11:05 +08:00
zyy
dc381e2a63 desc: 新增屏蔽门绘制以及紧急停车按钮生成流程 2019-12-06 18:03:13 +08:00
zyy
824b4ca414 修改命名规则 2019-12-06 13:03:45 +08:00
sunzhenyu
70c0e78179 baseurl 2019-12-03 13:51:50 +08:00
zyy
d0a986e8bf 新版地图保存 2019-12-02 14:09:50 +08:00
zyy
5793355e20 修改道岔生成逻辑 2019-12-02 13:05:25 +08:00
joylink_cuiweidong
8de6fa219a Merge remote-tracking branch 'remotes/origin/dev' into test 2019-11-28 09:33:12 +08:00
lVAL
5852ca6ebf 修改代码 2019-11-26 09:44:37 +08:00
joylink_cuiweidong
5d7739c947 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-11-26 09:23:29 +08:00
joylink_cuiweidong
c3642d67eb 代码调整 2019-11-26 09:21:26 +08:00
lVAL
aee030f01d Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	src/router/index.js
#	src/scripts/plugin/MenuContextHandler.js
2019-11-25 18:25:17 +08:00
zyy
1d82ce738f desc: 修改考试规则定义,调整更新商品更新样式 2019-11-25 10:44:48 +08:00
zyy
0880801c1f desc: 增加检测地图名称唯一性 2019-11-22 16:50:30 +08:00
1165524548 修改测试打包环境和websocket日志 2019-11-22 02:11:24 +08:00
zyy
fa3d0cb099 desc: 调整代码书写逻辑 2019-11-20 16:31:41 +08:00
zyy
00877ac164 修改代码 调整绘图逻辑 2019-11-19 16:39:24 +08:00
ival
ed7acb5abe 修改目录大小写 2019-11-19 13:11:52 +08:00
zyy
4144621be8 desc: 修改代码 2019-11-19 13:00:36 +08:00
ival
5a4f6f5999 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-18 14:44:13 +08:00
ival
50e9a242e7 修改代码 2019-11-18 14:44:01 +08:00
zyy
7938876d85 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/scripts/GlobalPlugin.js
2019-11-18 14:30:25 +08:00
zyy
8d05730dc4 desc: 修改代码 2019-11-18 14:29:43 +08:00
ival
cb8e55e546 修改代码 2019-11-15 16:36:23 +08:00
ival
d599e561f6 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/store/modules/exam.js
#	src/utils/baseUrl.js
#	src/views/display/menuExam.vue
2019-11-15 16:34:54 +08:00
ival
b3f9777062 修改代码 2019-11-15 16:32:23 +08:00
zyy
9bfad2fdeb desc: 修改代码 2019-11-15 16:31:48 +08:00
ival
a60b41398b 修改代码 2019-11-15 16:29:11 +08:00
zyy
e6b81355a4 删除多余文件 2019-11-14 15:51:42 +08:00
ival
e41d007264 注释掉变动,提交 2019-11-14 15:10:29 +08:00
ival
0bcf2b796e 修改 2019-11-14 14:05:05 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
ival
3fefbe2a47 修改代码 2019-11-13 10:15:54 +08:00
ival
8eb4ac80a6 修改刷新问题 2019-11-12 17:27:30 +08:00
ival
0b47562cca 修改代码 2019-11-12 14:16:11 +08:00
ival
89239b7fe1 修改代码 2019-11-12 13:44:10 +08:00
ival
87f0b2a69d 修改代码 2019-11-11 17:03:21 +08:00
ival
058e8cdcd5 修改 2019-11-08 19:34:12 +08:00
ival
1e1400ac68 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/utils/baseUrl.js
2019-11-08 19:33:05 +08:00
ival
b049ff3be2 修改代码 2019-11-08 19:32:21 +08:00
fan
daec7d5e4d bug 调整 2019-11-08 18:43:46 +08:00
ival
6049c04a74 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/utils/baseUrl.js
2019-11-08 18:16:43 +08:00
fan
2d04c6aa6a 订阅topic 区分平台--调整 2019-11-08 18:15:57 +08:00
ival
0776d08053 修改仿真房间代码 2019-11-08 18:15:52 +08:00
fan
2974f613f3 订阅topic 区分平台--调整 2019-11-08 18:15:23 +08:00
fan
f75f992776 订阅topic 区分平台 2019-11-08 17:52:30 +08:00
fan
e677b24f6d 调整查询地图列表接口 2019-11-08 16:22:05 +08:00
zyy
796ef7087f desc: 修改代码 2019-11-06 18:49:55 +08:00
fan
ce7ca4b9d8 添加系统通知功能 2019-11-05 16:40:36 +08:00
fan
1bd3debbde 西铁院登录页样式调整,测试问题调整 2019-11-04 18:41:58 +08:00
zyy
dc8524e52a desc: 调整试题高度 2019-10-31 14:47:05 +08:00
fan
3996f03e55 实训首页样式调整和复制地图调整 2019-10-31 13:57:17 +08:00
fan
6d37627e3d 发布地图管理调整 2019-10-31 09:09:43 +08:00
fan
00dcbdf7bd 任务管理调整 2019-10-30 19:36:26 +08:00
fan
fa1fc4c3cf 删除接口:/api/mapPrd/tree 2019-10-30 18:03:30 +08:00
fan
375773cceb 更换接口:/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details 2019-10-30 13:56:43 +08:00
fan
b6f11064da Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-30 13:07:27 +08:00
fan
2107549d72 更换接口:/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details 2019-10-30 13:07:07 +08:00
fan
0489cf2fd3 删除接口:/api/map/{skinCode}/train 2019-10-30 11:18:41 +08:00
zyy
6aa05c217f desc: 修改代码 2019-10-30 10:15:18 +08:00
zyy
c08e2afaaa desc: 调整高度样式 2019-10-29 13:15:57 +08:00
joylink_cuiweidong
b9111b8219 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/designPlatform/mapPreview.vue
2019-10-28 19:14:49 +08:00
zyy
285b80ffb7 desc: 调整检测高度问题 2019-10-28 11:07:33 +08:00
zyy
700ae4ad84 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-25 18:20:32 +08:00
zyy
18ad9e1faa desc: 调整个人信息 2019-10-25 18:20:24 +08:00
fan
0c5fb4c6f4 Merge remote-tracking branch 'origin/dev' into test 2019-10-25 14:43:00 +08:00