fan
|
2f4b765d97
|
运行图加载调整&交路数据调整
|
2020-04-21 15:08:27 +08:00 |
|
joylink_cuiweidong
|
3da6d9c538
|
删除没有用的接口
|
2020-04-21 10:07:26 +08:00 |
|
joylink_cuiweidong
|
9f6fe40894
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 18:13:50 +08:00 |
|
joylink_cuiweidong
|
ad583bf418
|
综合演练 发送语音功能代码调整
|
2020-04-20 18:12:16 +08:00 |
|
fan
|
f375b97631
|
派班工作站调整
|
2020-04-20 15:38:30 +08:00 |
|
fan
|
ed26ff34d9
|
地图高级数据停站时间
|
2020-04-20 09:57:00 +08:00 |
|
joylink_cuiweidong
|
e88bdf8e0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 14:51:52 +08:00 |
|
joylink_cuiweidong
|
fc2d9c1ff7
|
草稿地图的导入和导出代码调整
北京一号线站台实训操作代码调整
|
2020-04-16 14:50:40 +08:00 |
|
zyy
|
40021e34f4
|
调整侧防流程
|
2020-04-16 10:52:11 +08:00 |
|
zyy
|
df92090509
|
增加配置中侧防数据，调整接口
|
2020-04-13 17:03:48 +08:00 |
|
fan
|
7e0834b13a
|
代码哈尔滨实训数据&本地导入导出
|
2020-04-09 18:22:10 +08:00 |
|
joylink_cuiweidong
|
c942d4e840
|
实训一键生成代码调整
|
2020-04-09 09:23:09 +08:00 |
|
zyy
|
635b593b56
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 18:23:48 +08:00 |
|
zyy
|
f12f84f97b
|
调整实训一键生成，调整宁波线路实训定义
|
2020-04-07 18:22:26 +08:00 |
|
fan
|
88b4bcf2bb
|
指令接口调整
|
2020-04-07 16:44:36 +08:00 |
|
fan
|
d3bd167c70
|
实训管理调整
|
2020-04-07 16:41:08 +08:00 |
|
fan
|
335132c9b9
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-31 16:55:58 +08:00 |
|
zyy
|
d0739816da
|
调整步骤发送数据
|
2020-03-31 16:03:34 +08:00 |
|
fan
|
63c73ab78c
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/views/jlmap3d/simulation/jl3dsimulation.vue
|
2020-03-31 11:14:33 +08:00 |
|
joylink_cuiweidong
|
0d5645a027
|
新版剧本接口代码调整
|
2020-03-30 16:56:38 +08:00 |
|
fan
|
b229e9c08a
|
生成线下用户
|
2020-03-30 15:28:13 +08:00 |
|
joylink_cuiweidong
|
93dc9a6983
|
新版剧本编制接口调整
|
2020-03-27 17:29:01 +08:00 |
|
fan
|
fb8d0b6615
|
Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
# src/views/designPlatform/demonList.vue
|
2020-03-27 13:55:00 +08:00 |
|
joylink_cuiweidong
|
966bed109b
|
新版剧本代码调整
|
2020-03-27 11:31:40 +08:00 |
|
fan
|
3c1d038a81
|
实训仿真调整
|
2020-03-27 10:51:49 +08:00 |
|
fan
|
f34de4f001
|
实训调整
|
2020-03-26 18:42:01 +08:00 |
|
zyy
|
d5c9799189
|
删除路径单元模块 新增设置站间运行等级
|
2020-03-25 13:45:58 +08:00 |
|
fan
|
9ff1d7e30c
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/store/modules/socket.js
|
2020-03-24 10:13:01 +08:00 |
|
fan
|
39420c1432
|
存在仿真管理调整
|
2020-03-24 09:23:24 +08:00 |
|
fan
|
88ca3a568e
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-20 18:51:36 +08:00 |
|
fan
|
1e8d304249
|
Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
# src/scripts/cmdPlugin/CommandEnum.js
# src/utils/baseUrl.js
|
2020-03-20 15:16:08 +08:00 |
|
fan
|
73d763b700
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-18 19:06:23 +08:00 |
|
sunzhenyu
|
2e0b0913d6
|
修改设计平台三维数据发布
|
2020-03-16 18:47:55 +08:00 |
|
zyy
|
933f0c1bba
|
调整综合演练ibp获取数据
|
2020-03-16 16:06:50 +08:00 |
|
fan
|
4ab462ed5d
|
合并代码
|
2020-03-16 15:32:00 +08:00 |
|
fan
|
cd9915668b
|
综合演练接口修改
|
2020-03-16 15:29:26 +08:00 |
|
zyy
|
1745bfbcf1
|
ibp盘绘制更新保存流程调整完成
|
2020-03-16 14:47:59 +08:00 |
|
zyy
|
5dbd676ccf
|
调整代码
|
2020-03-13 19:04:28 +08:00 |
|
zyy
|
ce21ff9d91
|
调整接口
|
2020-03-13 19:01:59 +08:00 |
|
zyy
|
e156bac9ca
|
增加公共地图ibp配置绘图 逻辑
|
2020-03-13 18:19:04 +08:00 |
|
zyy
|
31d50d95e2
|
增加仿真系统 iscs工作站
|
2020-03-13 13:23:04 +08:00 |
|
joylink_fanyuhong
|
e60fde1a5a
|
地图排序
|
2020-03-03 14:24:25 +08:00 |
|
joylink_fanyuhong
|
aa0f770630
|
仿真调整
|
2020-02-24 17:04:39 +08:00 |
|
zyy
|
f82c4a195e
|
调整创建运行图表单数据
|
2020-02-13 12:35:44 +08:00 |
|
joylink_fanyuhong
|
147796dca1
|
操作调整
|
2020-02-13 11:19:06 +08:00 |
|
fan
|
3011285293
|
发布地图管理调整
|
2020-01-20 09:54:59 +08:00 |
|
fan
|
582fc354db
|
快速入口增加参数projectCode
|
2020-01-17 14:20:31 +08:00 |
|
fan
|
269cef7673
|
仿真接口调整
|
2020-01-17 11:31:53 +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
|
308f82c14e
|
提交请求进路接口
|
2020-01-03 15:52:51 +08:00 |
|
fan
|
e022b00a00
|
项目设备综合演练调整
|
2020-01-03 11:18:18 +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 |
|
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 |
|
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
|
cbac3d2b9d
|
权限分发管理，创建权限 打包 接口调整
|
2019-12-30 17:13:21 +08:00 |
|
fan
|
15f7aa656e
|
新版地图包加载仿真
|
2019-12-30 09:57:54 +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
|
eefaf8aad9
|
实训平台教学 和 设计平台教学管理 prdtype对应接口调整
|
2019-12-27 17:09:56 +08:00 |
|
joylink_cuiweidong
|
493aab5409
|
删除与产品相关的接口
修改仿真的prdtype接口代码
|
2019-12-27 14:04:34 +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 |
|
zyy
|
bfe6c5a537
|
调整线路配置项流程，对接字段
|
2019-12-20 14:02:11 +08:00 |
|
zyy
|
3101af9948
|
增加线路皮肤配置，调整联锁站台显示列表
|
2019-12-19 18:04:28 +08:00 |
|
fan
|
cc014d4ccc
|
自动折返设置优先级
|
2019-12-11 18:25:03 +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 |
|
joylink_cuiweidong
|
98c7e1105f
|
自动信号接口修改
|
2019-12-10 18:01:52 +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 |
|
joylink_cuiweidong
|
fed85fe78e
|
订单列表代码调整
|
2019-12-10 10:44:18 +08:00 |
|
joylink_cuiweidong
|
9199d7bc64
|
权限分发代码调整
|
2019-12-10 10:27:29 +08:00 |
|
joylink_cuiweidong
|
b7fd5b7475
|
订单管理列表页面代码调整
|
2019-12-09 16:52:01 +08:00 |
|
zyy
|
94f3bce874
|
desc: 修改创建权限逻辑
|
2019-12-03 17:51:39 +08:00 |
|
zyy
|
c089ce1187
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 14:42:07 +08:00 |
|
zyy
|
68d0f374aa
|
desc: 调整道岔生成逻辑
|
2019-12-03 14:42:00 +08:00 |
|
fan
|
5ca78f0ba7
|
调整绘图相关-(信号机调整，草稿地图列表接口调整)
|
2019-12-03 13:36:02 +08:00 |
|
zyy
|
d0a986e8bf
|
新版地图保存
|
2019-12-02 14:09:50 +08:00 |
|
zyy
|
0f9ce4c521
|
desc: 修改权限
|
2019-11-29 16:32:24 +08:00 |
|
lVAL
|
5852ca6ebf
|
修改代码
|
2019-11-26 09:44:37 +08:00 |
|
zyy
|
0880801c1f
|
desc: 增加检测地图名称唯一性
|
2019-11-22 16:50:30 +08:00 |
|
zyy
|
44f9da4383
|
desc: 调整绘图进路数据，调整权限修改逻辑，调整设置link中心点BUG
|
2019-11-22 15:28:02 +08:00 |
|
ival
|
0186f25a2b
|
Merge branch 'dev' into test
# Conflicts:
# src/api/jlmap3d/load3ddata.js
# src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
|
2019-11-19 11:00:13 +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
|
8d05730dc4
|
desc: 修改代码
|
2019-11-18 14:29:43 +08:00 |
|
fan
|
1c75c8f0ef
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
# src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js
|
2019-11-15 16:42:32 +08:00 |
|
zyy
|
9bfad2fdeb
|
desc: 修改代码
|
2019-11-15 16:31:48 +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 |
|
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
|
b690e1baed
|
无用的接口删除
|
2019-11-12 17:06:12 +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 |
|
joylink_cuiweidong
|
e4dffd17af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-11 18:45:09 +08:00 |
|
fan
|
90a45dc5bd
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-11 18:42:34 +08:00 |
|
fan
|
c35cef4800
|
样式调整
|
2019-11-11 18:42:14 +08:00 |
|
joylink_cuiweidong
|
9851ac01a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-11 17:39:23 +08:00 |
|
joylink_cuiweidong
|
16b0aab0e5
|
运行图skinCode修改
|
2019-11-11 17:38:43 +08:00 |
|
ival
|
4816ca97b8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/views/display/designIndex.vue
# src/views/display/index.vue
|
2019-11-08 18:20:56 +08:00 |
|
fan
|
75a871265e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 16:22:32 +08:00 |
|
fan
|
e677b24f6d
|
调整查询地图列表接口
|
2019-11-08 16:22:05 +08:00 |
|
joylink_cuiweidong
|
95ae0de627
|
skinCode调整
|
2019-11-08 16:12:23 +08:00 |
|
fan
|
06f6b920e9
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-08 14:00:09 +08:00 |
|
fan
|
b4ba9cb3b8
|
代码修改
|
2019-11-08 13:41:22 +08:00 |
|
joylink_cuiweidong
|
2f1cc475a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/i18n/langs/en/map.js
# src/utils/baseUrl.js
|
2019-11-08 09:41:33 +08:00 |
|
joylink_cuiweidong
|
6102c29116
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-07 15:55:02 +08:00 |
|
joylink_cuiweidong
|
5465eb61c1
|
prdCode改成prdId
|
2019-11-07 15:54:49 +08:00 |
|
zyy
|
42a5f7076a
|
desc: 调整区段绘图逻辑优化
|
2019-11-07 15:20:39 +08:00 |
|
joylink_cuiweidong
|
5cb7fe51b9
|
skinCode处理
|
2019-11-07 10:25:34 +08:00 |
|
joylink_cuiweidong
|
521a50ccb6
|
代码调整
|
2019-11-06 18:38:28 +08:00 |
|
joylink_cuiweidong
|
8d4964a304
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/i18n/langs/zh/router.js
|
2019-11-05 16:59:25 +08:00 |
|
fan
|
1b3fc52f98
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-05 16:40:55 +08:00 |
|
fan
|
ce7ca4b9d8
|
添加系统通知功能
|
2019-11-05 16:40:36 +08:00 |
|
joylink_cuiweidong
|
1a13c9ad2c
|
权限分发接口调整
|
2019-11-05 13:20:27 +08:00 |
|
fan
|
347e49f55c
|
调整接口
|
2019-11-04 13:29:51 +08:00 |
|
zyy
|
6d6e851449
|
Merge branch 'dev' into test
|
2019-11-01 13:51:26 +08:00 |
|
joylink_cuiweidong
|
444d60ce2a
|
接口调整
|
2019-11-01 10:28:15 +08:00 |
|
fan
|
cf39a8fa89
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/router/index.js
|
2019-10-31 17:49:20 +08:00 |
|
joylink_cuiweidong
|
ad97697406
|
接口调整
|
2019-10-31 15:56:07 +08:00 |
|
fan
|
dceba96db0
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/views/jlmap3d/drive/jl3ddrive.vue
|
2019-10-31 14:00:42 +08:00 |
|
sunzhenyu
|
3d9a458d42
|
修改三维数据接口,修改渲染范围
|
2019-10-31 13:26:40 +08:00 |
|
zyy
|
a87372ea2c
|
desc: 发布高度调整
|
2019-10-31 13:24:45 +08:00 |
|
fan
|
ea219e6310
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/publish/publishMap/index.vue
# src/views/publish/publishMap/project.vue
|
2019-10-31 10:36:30 +08:00 |
|
fan
|
900abcbe36
|
添加复制地图和调整实训平台树节点key
|
2019-10-31 10:32:46 +08:00 |
|
joylink_cuiweidong
|
de76904dfc
|
接口调整
|
2019-10-30 19:36:29 +08:00 |
|
fan
|
0311e5ee4f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 18:18:32 +08:00 |
|
fan
|
1242c7e3d7
|
修改接口：/api/runPlan/template/{id}/copyAs/{skinCode} 改为 /api/runPlan/template/{id}/copyAs/{mapId}
|
2019-10-30 18:18:09 +08:00 |
|
joylink_cuiweidong
|
2df4c5f8cb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 18:07:45 +08:00 |
|
joylink_cuiweidong
|
ce0230150b
|
接口调整
|
2019-10-30 18:07:09 +08:00 |
|
fan
|
e5c832aa00
|
修改接口：/api/mapPrd/{skinStyle}/list 改为 /api/mapPrd/{mapId}/list
|
2019-10-30 17:41:29 +08:00 |
|
fan
|
36c33ed416
|
修改接口：/api/runPlan/template/skin/{mapId} 改为 /api/runPlan/template/{mapId}/list
|
2019-10-30 17:21:32 +08:00 |
|
fan
|
0f778f94c6
|
所有 /api/mapSkin 开始的接口路径都改为 /api/realLine
|
2019-10-30 17:00:50 +08:00 |
|
fan
|
f2e4885f78
|
删除接口：/api/runPlan/draft/tree
|
2019-10-30 16:58:44 +08:00 |
|
fan
|
6d0edb2370
|
合并代码
|
2019-10-30 16:57:01 +08:00 |
|
fan
|
4918c78204
|
删除接口：/api/runPlan/draft/station/{skinCode}/bySkin
|
2019-10-30 16:50:35 +08:00 |
|
joylink_cuiweidong
|
de1b8d579e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/map/runplan/index.vue
|
2019-10-30 14:04:22 +08:00 |
|
joylink_cuiweidong
|
c80d2ed536
|
接口调整
多余文件删除
|
2019-10-30 14:00:50 +08:00 |
|
zyy
|
443051edc3
|
desc: 调整代码
|
2019-10-30 13:58:34 +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 |
|
fan
|
f1ccb7438d
|
代码调整
|
2019-10-29 15:40:47 +08:00 |
|
fan
|
041d926b80
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/router/index.js
# src/utils/baseUrl.js
|
2019-10-29 14:16:49 +08:00 |
|
fan
|
973168970c
|
西铁院项目调整
|
2019-10-29 14:14:14 +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 |
|
joylink_cuiweidong
|
9bd9e7fd8a
|
代码调整
|
2019-10-28 10:36:20 +08:00 |
|
joylink_cuiweidong
|
7ed9387731
|
更新发布课程信息
地图预览bug调整
|
2019-10-28 10:29:17 +08:00 |
|
joylink_cuiweidong
|
0f39f495af
|
发布地图管理页面添加更新城市
|
2019-10-25 17:50:55 +08:00 |
|
zyy
|
68560f0d37
|
desc: 增加修改个人信息弹窗
|
2019-10-24 15:31:29 +08:00 |
|
zyy
|
dd89b94e64
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/layout/components/Logout.vue
|
2019-10-24 09:47:57 +08:00 |
|
zyy
|
f24259c76d
|
desc: 个人信息修改
|
2019-10-24 09:46:58 +08:00 |
|
fan
|
8710a6231a
|
综合演练房间调整
|
2019-10-23 16:13:36 +08:00 |
|
joylink_cuiweidong
|
b26ab2fc15
|
删除地图系统接口调整以及西铁院系统tree接口调整
|
2019-10-22 15:13:58 +08:00 |
|
fan
|
b7a16a9074
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 13:40:55 +08:00 |
|
fan
|
515a9a60ae
|
代码调整
|
2019-10-22 13:40:42 +08:00 |
|
joylink_cuiweidong
|
7785b9a9af
|
设计平台 系统管理 子系统 修改接口以及国际化
|
2019-10-22 11:20:43 +08:00 |
|
joylink_cuiweidong
|
c04abcc67a
|
设计平台 系统管理 子系统 创建子系统接口调整
|
2019-10-22 09:36:37 +08:00 |
|
joylink_cuiweidong
|
1a046c2b7f
|
设计平台系统管理子系统生成页面调整
|
2019-10-21 15:50:15 +08:00 |
|
joylink_cuiweidong
|
c9ad0a8be5
|
自动登录页面处理
|
2019-10-21 14:14:22 +08:00 |
|
fan
|
34a8cbf270
|
接口调整
|
2019-10-21 08:59:27 +08:00 |
|
fan
|
77d024c08c
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/designPlatform/demonList.vue
|
2019-10-21 08:58:17 +08:00 |
|
fan
|
902b1a494b
|
接口调整
|
2019-10-18 18:36:45 +08:00 |
|
joylink_cuiweidong
|
fd4df4f178
|
设计平台地图列表页面调整
|
2019-10-18 18:35:17 +08:00 |
|
fan
|
911b8a9057
|
接口调整
|
2019-10-18 17:23:25 +08:00 |
|
fan
|
d5063802f4
|
接口调整
|
2019-10-18 17:15:04 +08:00 |
|
joylink_cuiweidong
|
1b342fee6e
|
地图列表获取城市列表样式调整
|
2019-10-18 16:57:40 +08:00 |
|
fan
|
0ebab6201f
|
Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
# src/views/scriptManage/home.vue
|
2019-10-17 18:09:02 +08:00 |
|
joylink_cuiweidong
|
99b2cfc05b
|
剧本预览页面调整
|
2019-10-17 18:06:04 +08:00 |
|
fan
|
534fa388e8
|
添加子系统生成页面
|
2019-10-17 17:11:15 +08:00 |
|
joylink_cuiweidong
|
a264ab51cb
|
已发布地图剧本列表页面调整
|
2019-10-17 10:06:52 +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
|
1ece7eb215
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-17 09:30:02 +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 |
|
joylink_cuiweidong
|
35eacb299c
|
剧本预览页面调整
|
2019-10-16 16:36:25 +08:00 |
|
fan
|
1caad290e5
|
ibp盘添加扣车关联
|
2019-10-16 14:00:30 +08:00 |
|
fan
|
0640586712
|
西铁院暂存
|
2019-10-15 13:04:28 +08:00 |
|
fan
|
0fc9db098c
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-15 11:04:43 +08:00 |
|
fan
|
729be7ec69
|
西铁院暂存
|
2019-10-15 09:39:01 +08:00 |
|
joylink_cuiweidong
|
5e320978a9
|
产品分化剧本页面调整
|
2019-10-14 13:58:26 +08:00 |
|
joylink_cuiweidong
|
a622effdde
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/api/designPlatform.js
# src/i18n/langs/en/approval.js
# src/i18n/langs/zh/approval.js
|
2019-10-14 13:12:30 +08:00 |
|
joylink_cuiweidong
|
c60471023f
|
产品分化剧本管理调整
|
2019-10-14 13:10:36 +08:00 |
|
fan
|
6d15a95b3f
|
产品分化运行图发布调整
|
2019-10-14 13:04:23 +08:00 |
|
fan
|
8366f9a788
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/api/designPlatform.js
# src/router/index.js
|
2019-10-12 17:15:48 +08:00 |
|
fan
|
722596cdf4
|
产品分化调整
|
2019-10-12 17:14:03 +08:00 |
|
joylink_cuiweidong
|
af2c431511
|
运行图剧本 审核流程调整
|
2019-10-12 16:47:54 +08:00 |
|
zyy
|
1e3486efc6
|
desc: 增加权限分发列表【设置失效】功能
|
2019-10-11 16:09:15 +08:00 |
|
fan
|
a4ccfee26d
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-10-11 08:57:38 +08:00 |
|
fan
|
5a21420a18
|
课程发布审批流程暂存
|
2019-10-11 08:55:02 +08:00 |
|
joylink_cuiweidong
|
2a4bb6dba2
|
剧本发布申请页面
|
2019-10-10 17:37:07 +08:00 |
|
fan
|
977a6d8b47
|
产品分化调整
|
2019-10-10 16:07:13 +08:00 |
|
joylink_cuiweidong
|
bb9cfc965d
|
产品分化 实训平台加载剧本接口修改
|
2019-10-09 14:01:02 +08:00 |
|
joylink_cuiweidong
|
b7cb2a36db
|
产品分化 剧本接口调整
|
2019-10-09 10:14:30 +08:00 |
|
joylink_cuiweidong
|
2d1f13299e
|
产品分化运行图接口调整
|
2019-10-08 18:35:02 +08:00 |
|
joylink_cuiweidong
|
db971bf591
|
产品分化运行图修改
|
2019-10-08 14:12:53 +08:00 |
|
joylink_cuiweidong
|
873fbcd686
|
超时登出处理
|
2019-10-08 09:51:13 +08:00 |
|
joylink_cuiweidong
|
35faeb8583
|
产品分化 设计平台 剧本修改
|
2019-09-30 18:13:24 +08:00 |
|
joylink_cuiweidong
|
a46f94f85e
|
产品分化 设计系统调整
|
2019-09-30 17:31:40 +08:00 |
|
fan
|
2be7de7527
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/api/designPlatform.js
|
2019-09-30 13:26:13 +08:00 |
|
fan
|
5d27847379
|
设计平台系统调整
|
2019-09-30 13:24:47 +08:00 |
|
joylink_cuiweidong
|
c7b5188d74
|
产品分化 设计平台调整
|
2019-09-30 10:46:29 +08:00 |
|
joylink_cuiweidong
|
8d4bf59c34
|
产品分化调整
|
2019-09-29 15:57:19 +08:00 |
|
fan
|
6c8a8574da
|
暂时提交
|
2019-09-29 14:27:58 +08:00 |
|
joylink_cuiweidong
|
2a9f7b38df
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-09-27 18:20:10 +08:00 |
|
joylink_cuiweidong
|
1e95cae5e5
|
产品分化 设计系统界面调整
|
2019-09-27 18:16:27 +08:00 |
|
fan
|
1ced811496
|
产品分化调整
|
2019-09-27 14:46:08 +08:00 |
|
zyy
|
f334814012
|
desc: 增加琏计划心跳接口
|
2019-09-27 10:53:48 +08:00 |
|
zyy
|
01cb0a699b
|
desc: 调整权限字段限制， 配置英文版登陆页面
|
2019-09-26 17:42:25 +08:00 |
|
fan
|
1fb0cf3e94
|
产品分化调整
|
2019-09-26 15:08:53 +08:00 |
|
zyy
|
1d26a9f1fb
|
desc: 新增创建权限流程
|
2019-09-18 18:39:55 +08:00 |
|
zyy
|
c5c71253df
|
desc: 调整信号机字段显示，调整创建权限逻辑
|
2019-09-16 17:31:12 +08:00 |
|
zyy
|
11a49d1442
|
desc: 增加加载运行图模板接口，调整地图绘制优化
|
2019-09-06 14:21:01 +08:00 |
|
zyy
|
921ef7c03d
|
desc: 调整接口请求次数
|
2019-09-04 19:06:55 +08:00 |
|
zyy
|
118ed1296c
|
desc: 增加琏计划运行图修改
|
2019-09-04 16:32:41 +08:00 |
|
zyy
|
a037937627
|
desc: 调整运行图生成逻辑
|
2019-09-04 14:47:52 +08:00 |
|
ival
|
0879aef961
|
增加派班计划loading
|
2019-09-03 18:37:00 +08:00 |
|
ival
|
c97996fceb
|
设置冲突列颜色
|
2019-09-03 17:35:23 +08:00 |
|
zyy
|
27f05bdd0d
|
desc: 增加缓存列表
|
2019-09-03 15:22:50 +08:00 |
|
zyy
|
7fbadc2bd3
|
desc: 修改权限编辑
|
2019-09-03 14:38:05 +08:00 |
|
zyy
|
d53661e6ed
|
desc: 增加权限一键生成接口,调整显示位置，字段内容
|
2019-09-02 18:43:05 +08:00 |
|
zyy
|
d38b3761b8
|
desc: 对接权限编辑接口，修改显示字段内容
|
2019-09-02 17:05:53 +08:00 |
|
ival
|
9b9be66ea0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 17:12:52 +08:00 |
|
ival
|
36facbb67d
|
修改重新生成排班计划的页面
|
2019-08-30 17:12:39 +08:00 |
|
zyy
|
22beeffc53
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
# src/views/screenMonitor/list/demonList.vue
|
2019-08-30 17:03:51 +08:00 |
|
zyy
|
0398179e0d
|
desc: 用户权限流程修改，接口对接
|
2019-08-30 17:00:18 +08:00 |
|
ival
|
546957e926
|
增加排版计划处理
|
2019-08-30 15:46:08 +08:00 |
|
ival
|
3da74652c5
|
增加派班计划
|
2019-08-30 09:00:36 +08:00 |
|
ival
|
fd03ed6d59
|
修改每日运行图查询接口
|
2019-08-29 14:48:26 +08:00 |
|
ival
|
1616639f6f
|
修改运行图接口
|
2019-08-29 13:52:34 +08:00 |
|
zyy
|
2d906ef9be
|
desc: 调整权限列表接口对接
|
2019-08-29 09:31:58 +08:00 |
|
zyy
|
b9b2fd5b77
|
desc: 调整地图绘制数据逻辑， 新增发布历史列表
|
2019-08-23 18:40:02 +08:00 |
|
joylink_cuiweidong
|
aab5bcc995
|
剧本录制添加成员角色
|
2019-08-21 18:45:16 +08:00 |
|
joylink_cuiweidong
|
7f2c741818
|
剧本列表页面 样式调整
|
2019-08-20 17:54:40 +08:00 |
|
joylink_cuiweidong
|
146be45957
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 18:25:58 +08:00 |
|
joylink_cuiweidong
|
4dbe34cf4f
|
剧本编制模块修改
|
2019-08-19 18:24:06 +08:00 |
|
ival
|
ae500285ba
|
修改实训加载顺序错误的问题
|
2019-08-19 15:59:04 +08:00 |
|
ival
|
94f3659cf3
|
修改国际化
|
2019-08-19 15:19:33 +08:00 |
|
joylink_cuiweidong
|
ecefa16f5e
|
剧本编制修改
|
2019-08-16 17:15:20 +08:00 |
|
fan
|
d16ecfd83c
|
修改：剧本调整
|
2019-08-16 14:15:43 +08:00 |
|
joylink_cuiweidong
|
b73baebbb8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 13:50:51 +08:00 |
|
joylink_cuiweidong
|
2598087dac
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/i18n/langs/en/map.js
# src/i18n/langs/en/tip.js
# src/i18n/langs/zh/map.js
# src/i18n/langs/zh/rules.js
# src/i18n/langs/zh/tip.js
# src/utils/baseUrl.js
# src/views/map/mapdraft/mapedit/routingoperate/detail.vue
# src/views/map/mapdraft/mapedit/routingoperate/route.vue
# src/views/map/mapdraft/mapedit/switchoperate/detail.vue
|
2019-08-16 13:45:49 +08:00 |
|
fan
|
50e9549260
|
剧本接口调整
|
2019-08-16 13:43:46 +08:00 |
|
joylink_cuiweidong
|
f722a0bc27
|
录制剧本模块修改
|
2019-08-16 09:25:12 +08:00 |
|
ival
|
561c86ab72
|
首页数据统计
|
2019-08-15 18:04:23 +08:00 |
|
ival
|
d4ba56d31d
|
修该查询进路的接口
|
2019-08-15 14:28:31 +08:00 |
|
joylink_cuiweidong
|
2e53745790
|
剧本管理模块
|
2019-08-15 14:06:53 +08:00 |
|
ival
|
87e35cb38d
|
同步master代码以及修改交路的问题
|
2019-08-14 16:37:17 +08:00 |
|
ival
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
ival
|
b84f1fe553
|
运行图修改接口
|
2019-08-13 17:46:59 +08:00 |
|
ival
|
db109f2a9e
|
调整地图进路相关的接口
|
2019-08-13 16:59:38 +08:00 |
|
joylink_cuiweidong
|
e105327af6
|
加载剧本调整
|
2019-08-12 20:04:53 +08:00 |
|
joylink_cuiweidong
|
19d26919fc
|
处理录制剧本时地图不加载的问题
|
2019-08-12 17:35:55 +08:00 |
|
ival
|
66c599c0da
|
修改格式问题
|
2019-08-08 14:32:32 +08:00 |
|
joylink_cuiweidong
|
b166dbd769
|
剧本 任务录制模块提交
|
2019-08-08 10:31:46 +08:00 |
|
zyy
|
4cf032df11
|
desc: 增加区段折返箭头代码
|
2019-08-02 14:31:29 +08:00 |
|
zyy
|
ff9e69585d
|
desc: 调整剧本加载，删除城市注释
|
2019-08-01 15:19:24 +08:00 |
|
ival
|
9f5130a4f2
|
代码移植
|
2019-07-26 13:32:43 +08:00 |
|
zyy
|
75e3162d68
|
修改代码
|
2019-07-25 10:30:30 +08:00 |
|
ival
|
d8e5fe8f2b
|
修改代码
|
2019-07-10 16:29:07 +08:00 |
|
ival
|
3780ebefad
|
增加nclient工程
|
2019-07-02 16:29:52 +08:00 |
|