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

672 Commits

Author SHA1 Message Date
joylink_cuiweidong
2978438390 北京一号线 信号机操作代码调整 2020-02-25 15:08:48 +08:00
joylink_fanyuhong
3197641b97 仿真调整 2020-02-25 10:36:18 +08:00
joylink_fanyuhong
aa0f770630 仿真调整 2020-02-24 17:04:39 +08:00
joylink_fanyuhong
a33a9bbe42 道岔转动调整 2020-02-21 15:49:30 +08:00
joylink_fanyuhong
10d3bb3e49 新建列车调整 2020-02-20 10:19:49 +08:00
joylink_fanyuhong
680d87e623 列车状态显示 2020-02-19 16:33:59 +08:00
joylink_fanyuhong
00dd268918 列车调整 2020-02-19 11:47:38 +08:00
joylink_fanyuhong
412e6bd582 列车调整 2020-02-18 19:24:52 +08:00
zyy
11e03c4fe3 调整道岔绘图 2020-02-18 18:39:12 +08:00
joylink_fanyuhong
c14043f93b 自动进路调整 2020-02-18 14:45:32 +08:00
zyy
73b51bd385 调整站台显示问题 2020-02-17 17:50:15 +08:00
joylink_fanyuhong
2cd2f93c20 状态调整 2020-02-14 18:07:54 +08:00
joylink_fanyuhong
07b5e172dd 状态调整 2020-02-14 10:58:57 +08:00
joylink_fanyuhong
97df29eb8c 状态调整 2020-02-13 17:16:55 +08:00
joylink_fanyuhong
62c9f31d63 状态调整 2020-02-13 16:20:02 +08:00
zyy
f82c4a195e 调整创建运行图表单数据 2020-02-13 12:35:44 +08:00
joylink_fanyuhong
4c1b03e3d7 操作调整 2020-02-12 18:37:24 +08:00
joylink_fanyuhong
4275b4dc4a 操作调整 2020-02-12 15:14:14 +08:00
zyy
d348c640f9 添加宁波，北京线路进路获取 2020-02-11 17:33:33 +08:00
joylink_fanyuhong
50a4f8ab0b 成都三号线调整 2020-02-10 19:10:43 +08:00
zyy
2d5074d6d1 增加进路数据状态维护 2020-01-19 11:22:48 +08:00
zyy
1779f856be 新增iscs系统 2020-01-17 17:48:08 +08:00
zyy
2d5a42d363 调整根路径 2020-01-17 15:33:30 +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
fan
582fc354db 快速入口增加参数projectCode 2020-01-17 14:20:31 +08:00
fan
269cef7673 仿真接口调整 2020-01-17 11:31:53 +08:00
fan
69b11f98e8 iscs调整 2020-01-17 10:49:06 +08:00
fan
019ca66662 Merge remote-tracking branch 'origin/dev_iscs' into dev 2020-01-16 18:16:23 +08:00
zyy
27257482ab 调整线路配置项，增加 ISCS 绘图元素 2020-01-16 18:02:57 +08:00
fan
09a8b6b630 FAS子系统测试PSD 2020-01-16 13:28:29 +08:00
fan
22c0b570a3 调整重连时间 2020-01-15 15:58:30 +08:00
joylink_cuiweidong
4315cdade3 socket弹出层处理 2020-01-15 14:32:17 +08:00
joylink_cuiweidong
e0824e33a0 房间的订阅代码调整 2020-01-15 13:20:48 +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
7b7d332035 修改重连时间 2020-01-14 17:26:41 +08:00
fan
75334d11fa 删除公共topic 2020-01-14 17:14:45 +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
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
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
walkersxq
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
fan
237d821f33 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-24 16:46:49 +08:00
fan
2c729abb01 网页title和图标调整 2019-10-24 16:46:34 +08:00
zyy
68560f0d37 desc: 增加修改个人信息弹窗 2019-10-24 15:31:29 +08:00
joylink_cuiweidong
5e798387d7 Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	src/utils/baseUrl.js
 2019-10-23 17:44:41 +08:00
sunzhenyu
ebf11ca7b0 url 2019-10-23 16:36:57 +08:00
sunzhenyu
9267c3a14b pull 2019-10-23 16:36:18 +08:00
sunzhenyu
aa02794959 修改列车速度，自动驾驶路径判断修改 2019-10-23 16:35:56 +08:00
fan
16b2dbda05 综合演练真实设备调整 2019-10-23 16:33:23 +08:00
fan
dff5d96d4d Merge remote-tracking branch 'origin/dev' into test 2019-10-23 16:19:22 +08:00
fan
3119f4f308 设计平台课程设计调整 2019-10-23 15:01:25 +08:00
joylink_cuiweidong
51bf37e9c7 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-10-23 13:36:19 +08:00
fan
f8b149fa5a 同一个标签切换平台404问题 2019-10-23 10:43:29 +08:00
fan
cf5f902a45 代码调整 2019-10-23 10:18:28 +08:00
joylink_cuiweidong
e854c32390 Merge branch 'dev' into test 2019-10-22 20:10:05 +08:00
fan
332fa22b81 登录配置调整 2019-10-22 20:04:55 +08:00
fan
9134be8c19 问题调整 2019-10-22 18:18:21 +08:00
fan
0cafd0c7f3 设计平台课程系统调整 2019-10-22 17:24:41 +08:00
joylink_cuiweidong
bddddedbf2 Merge branch 'dev' into test 
# Conflicts:
#	src/utils/baseUrl.js
 2019-10-22 16:13:13 +08:00
zyy
0eb05638a0 desc: 调整列车识别号初始化 2019-10-22 15:42:07 +08:00
fan
a49b195090 调整代码 2019-10-22 14:28:22 +08:00
zyy
0c6de0e011 desc: 修改代码 2019-10-22 13:41:23 +08:00
fan
902b1a494b 接口调整 2019-10-18 18:36:45 +08:00
zyy
82aff22132 desc: 修改代码 2019-10-18 11:25:26 +08:00
sunzhenyu
4a8e5a9cb2 url 2019-10-18 10:06:04 +08:00
sunzhenyu
f78d9865a2 Merge branch '3dtest' into test 2019-10-17 18:56:56 +08:00
sunzhenyu
7d98ea5f18 pull 2019-10-17 18:49:19 +08:00
fan
11190ef66f 代码整合调整 2019-10-17 10:13:08 +08:00
fan
ece8f0cf21 Merge remote-tracking branch 'origin/dev_product' into dev_merger 
# Conflicts:
#	src/router/index.js
#	src/scripts/ConstDic.js
 2019-10-17 09:36:32 +08:00
fan
5ba5ca7ea7 Merge remote-tracking branch 'origin/dev_product' into dev 
# Conflicts:
#	src/components/QueryListPage/QueryForm.vue
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/en/scriptRecord.js
#	src/i18n/langs/zh/lesson.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/scriptRecord.js
#	src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
#	src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
#	src/permission.js
#	src/router/index.js
#	src/utils/baseUrl.js
#	src/views/demonstration/detail/index.vue
#	src/views/display/tipExamList.vue
#	src/views/lesson/lessoncategory/edit/lesson/publish.vue
#	src/views/lesson/taskmanage/createTask.vue
#	src/views/lesson/trainingRule/list.vue
#	src/views/login/index.vue
#	src/views/planMonitor/editTool/statusBar.vue
#	src/views/scriptManage/home.vue
#	src/views/teach/category/tree.vue
#	src/views/trainRoom/index.vue
 2019-10-17 09:16:40 +08:00
fan
25c4cf957d 西铁院项目调整 2019-10-16 17:37:03 +08:00
zyy
bba506b46d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-16 17:13:28 +08:00
zyy
cf49d3a50e desc: 修改国际化实训名称详情 2019-10-16 17:13:20 +08:00
joylink_cuiweidong
089290e979 剧本国际化调整以及剧本增加语言参数 2019-10-15 16:18:25 +08:00
fan
0640586712 西铁院暂存 2019-10-15 13:04:28 +08:00
joylink_cuiweidong
232789ca73 产品分化路由处理 2019-10-15 11:05:30 +08:00
fan
729be7ec69 西铁院暂存 2019-10-15 09:39:01 +08:00
sunzhenyu
1ddb55091a 修改行车逻辑 2019-10-14 18:18:11 +08:00
sunzhenyu
8b71f08de0 修改行车逻辑 2019-10-12 19:03:21 +08:00
fan
a24603aedf 综合仿真页面跳转调整 2019-10-12 11:03:15 +08:00
zyy
aa0199754a desc: 调整创建权限流程，创建字段修改 2019-10-11 15:27:14 +08:00
zyy
f7cf33a5e2 desc: 调整登陆页面样式 2019-10-10 18:05:26 +08:00
joylink_cuiweidong
059a4134d5 产品分化路由调整以及剧本发布样式调整 2019-10-10 14:08:23 +08:00
fan
3381424f0d 产品分化调整 2019-10-10 09:33:56 +08:00
zyy
a8e491ea6e desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明 2019-10-09 17:05:10 +08:00
sunzhenyu
0e251fc8cb 测试 2019-10-09 17:00:58 +08:00
sunzhenyu
2defa3c89d 仿真载入新数据 2019-10-09 14:31:11 +08:00
joylink_cuiweidong
b7cb2a36db 产品分化 剧本接口调整 2019-10-09 10:14:30 +08:00
joylink_cuiweidong
2d1f13299e 产品分化运行图接口调整 2019-10-08 18:35:02 +08:00
zyy
df43ef4cc3 desc: 调整登陆界面显示 2019-10-08 16:08:13 +08:00
joylink_cuiweidong
a46f94f85e 产品分化 设计系统调整 2019-09-30 17:31:40 +08:00
zyy
64a601c967 desc: 调整登陆页面样式 2019-09-29 16:09:40 +08:00
sunzhenyu
aace4f9337 修改列车进站和转换区段速度 2019-09-29 14:05:33 +08:00
fan
56878d56ec storage存储关联用户 2019-09-29 13:40:01 +08:00
zyy
a8302b610e desc: 注释多余代码 2019-09-29 11:09:02 +08:00
zyy
f74ce907b8 desc: 调整获取二维码登陆接口 2019-09-27 15:29:25 +08:00
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
zyy
f712c93622 desc: 调整权限分发 组织结构配置 2019-09-27 10:06:46 +08:00
zyy
01cb0a699b desc: 调整权限字段限制， 配置英文版登陆页面 2019-09-26 17:42:25 +08:00
fan
b7043ff7de Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-23 17:49:16 +08:00
fan
d063625c45 产品分化调整 2019-09-23 17:49:04 +08:00
joylink_cuiweidong
5ba93805c1 菜单栏调整 2019-09-23 17:47:54 +08:00
zyy
2d60c78a74 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue
 2019-09-23 13:37:59 +08:00
zyy
01c97f45ae desc: 调整琏计划导入excel, 样式， 流程 2019-09-23 13:37:11 +08:00
fan
517ddbcff0 国际化调整 2019-09-23 09:48:13 +08:00
zyy
48ea44a980 desc: 调整权限国际化，调整琏计划导入运行图逻辑 2019-09-19 17:22:48 +08:00
zyy
4f716b502c desc: 恢复权限创建按钮 2019-09-19 09:34:18 +08:00
ival
8b4aee040a 注释掉订单入口 2019-09-18 18:45:18 +08:00
sunzhenyu
0ae296a87f pull前准备 2019-09-18 13:21:36 +08:00
sunzhenyu
d5380f8bf2 pull 2019-09-18 13:20:38 +08:00
ival
f13685da07 修改代码 2019-09-18 10:03:58 +08:00
ival
7b0cf81d45 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2019-09-17 16:54:14 +08:00
ival
0b7b0e39c1 过滤首页订阅的地图没有name的数据 2019-09-17 16:53:29 +08:00
sunzhenyu
2cd39f6fbd baseurl 2019-09-17 13:18:19 +08:00
sunzhenyu
183f972884 pull 2019-09-17 13:16:49 +08:00
zyy
f48a513df0 desc: 调整绘图逻辑，流程，字段显示 2019-09-12 16:30:42 +08:00
zyy
7b0b0d6d0c desc: 修改绘制地图赋值 2019-09-06 15:54:05 +08:00
zyy
11a49d1442 desc: 增加加载运行图模板接口，调整地图绘制优化 2019-09-06 14:21:01 +08:00
zyy
6b9047c919 desc: 调整请求位置 2019-09-04 15:06:26 +08:00
ival
89fc3c0547 增加角色分配统计 2019-09-04 13:02:28 +08:00
ival
df839856d9 修改IBP盘角色修改 2019-09-04 10:13:26 +08:00
ival
0879aef961 增加派班计划loading 2019-09-03 18:37:00 +08:00
ival
c1af062bbd Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2019-09-03 17:36:01 +08:00
ival
c97996fceb 设置冲突列颜色 2019-09-03 17:35:23 +08:00
zyy
40b67b8cf3 desc: 调整修改权限逻辑 2019-09-03 16:13:23 +08:00
ival
c433cb5045 添加加载脚本失败后，提示后台错误 2019-09-03 14:39:50 +08:00
zyy
5591796596 desc: 调整socket重连问题 2019-09-03 13:15:47 +08:00
ival
f1ab89a131 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 11:13:00 +08:00
ival
d60c989405 增加IBP盘操作 2019-09-03 11:12:48 +08:00
zyy
0938be08f5 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 10:46:04 +08:00
zyy
870a4de01b desc: 修改socekt断连逻辑, 调整权限显示及细节，样式问题 2019-09-03 10:45:58 +08:00
ival
41111ebab2 修改IPB盘尺寸问题 2019-09-03 09:34:21 +08:00
zyy
d38b3761b8 desc: 对接权限编辑接口，修改显示字段内容 2019-09-02 17:05:53 +08:00
sunzhenyu
d7efef41e4 pull 2019-08-29 17:16:33 +08:00
joylink_cuiweidong
2e53745790 剧本管理模块 2019-08-15 14:06:53 +08:00
zyy
ed8b14dac2 desc: 修改综合演练，socket创建 2019-08-14 16:15:44 +08:00
ival
5cd6150c16 修改required未定义的问题 2019-08-12 19:02:38 +08:00
ival
6785738122 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-12 18:22:29 +08:00
ival
dc0b5301e0 增加导出部分地图数据 2019-08-12 18:22:14 +08:00
joylink_cuiweidong
19d26919fc 处理录制剧本时地图不加载的问题 2019-08-12 17:35:55 +08:00
ival
0bc9d40ad1 修改打包配置 2019-08-12 11:01:00 +08:00
ival
fc6279efdf 修改加载方式 2019-08-12 09:36:27 +08:00
ival
763cff0a7c 修改页面不刷新的问题 2019-08-09 18:29:08 +08:00
ival
bfddddf7e6 修改代码 2019-08-09 17:25:45 +08:00
ival
6fad38621b 修改运行图编辑因为家在地图数据而报错的问题 2019-08-09 16:57:07 +08:00
zyy
2443fd102c desc: 调整站台字段 2019-08-08 14:47:34 +08:00
ival
dbc3cbf482 修改运行图编辑工具报错bug 2019-08-08 13:36:53 +08:00
ival
45295404c3 1. 修改福州线，取消扣车被禁用的问题 
2. 修改i18n的获取当前语言的函数
 2019-08-08 13:23:54 +08:00
ival
c66d72a049 增加i18n国际化配置 2019-08-08 11:29:03 +08:00
zyy
98a0533b20 修改代码格式 2019-08-06 10:11:32 +08:00
ival
fb33bde94c 设置状态时，无需关注model变化，render时，model已经引用到view上 2019-08-05 17:24:20 +08:00
zyy
4cf032df11 desc: 增加区段折返箭头代码 2019-08-02 14:31:29 +08:00
zyy
a010f71252 调整运行图加载， eventbus代码调整 2019-08-02 10:58:28 +08:00
zyy
04e13a7a73 调整代码 2019-08-02 10:36:17 +08:00
zyy
ff9e69585d desc: 调整剧本加载，删除城市注释 2019-08-01 15:19:24 +08:00
zyy
5af196522e Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-31 18:46:51 +08:00
zyy
99bcfa56ac 修改代码 2019-07-31 18:46:37 +08:00
fan
0fc306714b 调整：control增加悬浮移出事件 2019-07-31 18:24:28 +08:00
ival
05c90f1079 修改代码 2019-07-29 16:03:14 +08:00
ival
c161f19b1b 修改跑车 2019-07-26 17:13:03 +08:00
ival
4dec6ac93d 调试仿真 2019-07-26 15:52:50 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00
ival
83c6fccfc9 修改代码 2019-07-25 11:07:32 +08:00
zyy
75e3162d68 修改代码 2019-07-25 10:30:30 +08:00
zyy
4a0363ddc2 调整zlevel canvas 层级 2019-07-22 09:33:11 +08:00
ival
74d599bb1f 修改指令 2019-07-05 10:18:17 +08:00
ival
3780ebefad 增加nclient工程 2019-07-02 16:29:52 +08:00