zyy
|
9bfad2fdeb
|
desc: 修改代码
|
2019-11-15 16:31:48 +08:00 |
|
ival
|
ecc76fa5aa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-15 16:29:24 +08:00 |
|
ival
|
a60b41398b
|
修改代码
|
2019-11-15 16:29:11 +08:00 |
|
joylink_cuiweidong
|
a6797dbe85
|
运行图设计样式调整
|
2019-11-15 15:45:40 +08:00 |
|
joylink_cuiweidong
|
62599dd838
|
运行图设计点击车次号高亮调整
|
2019-11-15 14:33:03 +08:00 |
|
joylink_cuiweidong
|
1818ddaeb1
|
代码调整
|
2019-11-15 13:19:17 +08:00 |
|
joylink_cuiweidong
|
859fbe5e4e
|
修改实训平台考试系统列表按钮显示
|
2019-11-15 11:40:49 +08:00 |
|
fan
|
d2b296153a
|
权限分发管理增加搜索条件，试题列表改为试卷列表
|
2019-11-15 10:53:13 +08:00 |
|
fan
|
6e8b69869b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-15 09:43:12 +08:00 |
|
fan
|
3ad044be4f
|
打开支付跳转页面
|
2019-11-15 09:42:53 +08:00 |
|
zyy
|
1b564c2958
|
删除注释
|
2019-11-15 09:18:22 +08:00 |
|
fan
|
382a4fa344
|
调整narbar
|
2019-11-15 09:09:09 +08:00 |
|
fan
|
898e18056f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-14 18:55:07 +08:00 |
|
fan
|
a52c1443f3
|
调整narbar
|
2019-11-14 18:54:58 +08:00 |
|
zyy
|
cb7d7de930
|
desc: 修改代码
|
2019-11-14 18:53:52 +08:00 |
|
zyy
|
d782d7e151
|
修改路由状态
|
2019-11-14 17:58:21 +08:00 |
|
zyy
|
8ff33b479a
|
调整路由
|
2019-11-14 17:10:04 +08:00 |
|
zyy
|
63d89a71b1
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/planMonitor/editTool/schedule.vue
|
2019-11-14 17:06:53 +08:00 |
|
zyy
|
b189b64650
|
修改element版本 调整高度样式
|
2019-11-14 17:06:00 +08:00 |
|
joylink_cuiweidong
|
52c4d0e08d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 17:03:54 +08:00 |
|
joylink_cuiweidong
|
950ca18082
|
代码调整
|
2019-11-14 17:03:44 +08:00 |
|
ival
|
f9129558a6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 16:45:46 +08:00 |
|
ival
|
c362d64048
|
修改代码
|
2019-11-14 16:45:31 +08:00 |
|
zyy
|
94e77b6c6d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 16:31:44 +08:00 |
|
zyy
|
805fe3d971
|
修改路由配置
|
2019-11-14 16:31:31 +08:00 |
|
fan
|
f07144689b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-14 16:23:28 +08:00 |
|
fan
|
d7df05f475
|
代码调整
|
2019-11-14 16:22:39 +08:00 |
|
ival
|
6d23cedbf4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 16:18:33 +08:00 |
|
ival
|
29ceb9d376
|
修改代码
|
2019-11-14 16:18:19 +08:00 |
|
joylink_cuiweidong
|
fe23a03e69
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/store/modules/permission.js
|
2019-11-14 15:59:32 +08:00 |
|
joylink_cuiweidong
|
595747be2a
|
代码调整
|
2019-11-14 15:54:58 +08:00 |
|
zyy
|
e6b81355a4
|
删除多余文件
|
2019-11-14 15:51:42 +08:00 |
|
ival
|
3d493cd361
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 15:10:45 +08:00 |
|
ival
|
e41d007264
|
注释掉变动，提交
|
2019-11-14 15:10:29 +08:00 |
|
zyy
|
db24914ee7
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 14:10:26 +08:00 |
|
zyy
|
558f359c77
|
删除elementui 改用cdn方式加载
|
2019-11-14 14:10:20 +08:00 |
|
ival
|
0bcf2b796e
|
修改
|
2019-11-14 14:05:05 +08:00 |
|
ival
|
6ce30aaee2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
# src/permission.js
# src/views/display/demon/chartView.vue
# src/views/display/demon/chatBox.vue
# src/views/exam/detail/courseDetail.vue
|
2019-11-14 14:03:41 +08:00 |
|
ival
|
c5c813753c
|
修改代码
|
2019-11-14 13:59:33 +08:00 |
|
zyy
|
f31026608a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 13:06:31 +08:00 |
|
zyy
|
9b7b1d7bc8
|
删除不用文件
|
2019-11-14 13:06:24 +08:00 |
|
fan
|
e41d324c27
|
删除实训平台运行图编辑，修改综合演练值班员角色调整问题
|
2019-11-14 11:30:32 +08:00 |
|
fan
|
595db4f8b7
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-14 11:27:24 +08:00 |
|
fan
|
25f7b4f0c9
|
路由判断调整
|
2019-11-14 11:26:23 +08:00 |
|
joylink_cuiweidong
|
6fcba825f2
|
运行图设计代码调整
|
2019-11-14 10:50:11 +08:00 |
|
zyy
|
9a87784c59
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 09:22:06 +08:00 |
|
zyy
|
27ad7849b3
|
desc: 修改代码
|
2019-11-14 09:22:00 +08:00 |
|
fan
|
3f69644b11
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-14 09:02:32 +08:00 |
|
fan
|
38c002166d
|
分发转增日期不能选择今天之前
|
2019-11-14 09:02:18 +08:00 |
|
sunzhenyu
|
1cda6fcd49
|
修改仿真驾驶按计划行车转移镜头
|
2019-11-13 18:51:31 +08:00 |
|
sunzhenyu
|
fe180bf793
|
模拟驾驶加入退出计划，合并部分判断
|
2019-11-13 18:33:31 +08:00 |
|
joylink_cuiweidong
|
9d8a3270d8
|
权限转赠代码调整
|
2019-11-13 14:57:08 +08:00 |
|
fan
|
1cb0383aac
|
暂时注销个人权限管理页面的权限打包功能
|
2019-11-13 14:42:59 +08:00 |
|
fan
|
6bb95775b3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/layout/components/Navbar.vue
|
2019-11-13 14:31:56 +08:00 |
|
fan
|
bd2e82c0ea
|
权限分发转赠归属人查询 & 其他问题调整
|
2019-11-13 14:29:20 +08:00 |
|
joylink_cuiweidong
|
a5a2d79e64
|
综合演练ibp盘返回代码调整
|
2019-11-13 14:16:59 +08:00 |
|
joylink_cuiweidong
|
eb7b9a2edd
|
代码调整
|
2019-11-13 11:17:46 +08:00 |
|
ival
|
93546fe1fc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-13 11:10:26 +08:00 |
|
ival
|
0c3a91319d
|
修改代码
|
2019-11-13 11:10:15 +08:00 |
|
zyy
|
0a3e1963a8
|
调整版本
|
2019-11-13 10:34:19 +08:00 |
|
ival
|
559a765d27
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-13 10:16:52 +08:00 |
|
ival
|
3fefbe2a47
|
修改代码
|
2019-11-13 10:15:54 +08:00 |
|
zyy
|
71ca6e2cc4
|
修改代码
|
2019-11-13 10:15:40 +08:00 |
|
zyy
|
e9dbd6ef31
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-13 09:07:04 +08:00 |
|
zyy
|
2266f6d823
|
desc: 修改代码
|
2019-11-13 09:06:57 +08:00 |
|
sunzhenyu
|
498da8c434
|
注释
|
2019-11-12 19:04:09 +08:00 |
|
sunzhenyu
|
74c0df432f
|
修改三维行车位置发送逻辑
|
2019-11-12 19:02:54 +08:00 |
|
sunzhenyu
|
c51bb4c7c6
|
注释
|
2019-11-12 18:52:13 +08:00 |
|
joylink_cuiweidong
|
f1075d74b1
|
代码调整
|
2019-11-12 18:31:16 +08:00 |
|
sunzhenyu
|
8f7641caad
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-12 18:19:21 +08:00 |
|
sunzhenyu
|
34bc6ed463
|
修改行车逻辑，修改站台，轨迹数据结构，更替模型
|
2019-11-12 18:19:12 +08:00 |
|
joylink_cuiweidong
|
96dead378a
|
剧本录制添加行调和现地切换
|
2019-11-12 17:58:45 +08:00 |
|
ival
|
8fb45d91a0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 17:28:44 +08:00 |
|
ival
|
8eb4ac80a6
|
修改刷新问题
|
2019-11-12 17:27:30 +08:00 |
|
zyy
|
9cf4fc7c2f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/beijing_01/planSchedule/schedule.vue
# src/jmap/theme/chengdu_03/planSchedule/schedule.vue
# src/jmap/theme/fuzhou_01/planSchedule/schedule.vue
|
2019-11-12 17:26:25 +08:00 |
|
zyy
|
0cb102186f
|
desc: 修改echarts加载方式
|
2019-11-12 17:20:23 +08:00 |
|
joylink_cuiweidong
|
b690e1baed
|
无用的接口删除
|
2019-11-12 17:06:12 +08:00 |
|
joylink_cuiweidong
|
83ebe5eae9
|
设计平台轮播页面图片替换
|
2019-11-12 15:52:11 +08:00 |
|
joylink_cuiweidong
|
d2354b602f
|
具体线路下的skinCode修改
|
2019-11-12 15:39:18 +08:00 |
|
ival
|
ff6c1c67c4
|
修改房间布局错误的bug
|
2019-11-12 14:56:53 +08:00 |
|
ival
|
0b47562cca
|
修改代码
|
2019-11-12 14:16:11 +08:00 |
|
ival
|
79219792c9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:44:30 +08:00 |
|
ival
|
89239b7fe1
|
修改代码
|
2019-11-12 13:44:10 +08:00 |
|
joylink_cuiweidong
|
b1d19febe6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:40:05 +08:00 |
|
joylink_cuiweidong
|
5ce2e1a5b7
|
仿真skinCode调整
|
2019-11-12 13:39:52 +08:00 |
|
zyy
|
092603c2cc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:36:27 +08:00 |
|
zyy
|
7018b4c308
|
desc: 修改代码
|
2019-11-12 13:36:21 +08:00 |
|
fan
|
52e3bfe38a
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-12 09:40:57 +08:00 |
|
fan
|
92f2292592
|
暂无法购买，添加提示
|
2019-11-12 09:40:36 +08:00 |
|
ival
|
dfa6c7bf37
|
修改代码
|
2019-11-12 09:30:31 +08:00 |
|
ival
|
1d0a920f7c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 09:24:26 +08:00 |
|
ival
|
9e5838c647
|
删除多余指令
|
2019-11-12 09:24:11 +08:00 |
|
program-walker
|
17a29d92c9
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-11 20:05:26 +08:00 |
|
program-walker
|
6acea50779
|
注销退出监听处理
|
2019-11-11 20:04:31 +08:00 |
|
zyy
|
e9ef8efa17
|
Merge branch 'dev' into test
|
2019-11-11 19:29:31 +08:00 |
|
zyy
|
db1681b54e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 19:24:39 +08:00 |
|
zyy
|
6e29cec983
|
desc: 修改代码
|
2019-11-11 19:24:30 +08:00 |
|
fan
|
154e15b428
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-11 18:53:41 +08:00 |
|
fan
|
e069821071
|
路由跳转调整
|
2019-11-11 18:53:11 +08:00 |
|
joylink_cuiweidong
|
e4dffd17af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-11 18:45:09 +08:00 |
|