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 |
|
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 |
|
