joylink_cuiweidong
|
3b81436fbb
|
竞赛裁判系统代码调整
综合演练 仿真开始 修改成员角色代码调整
|
2020-05-22 10:43:23 +08:00 |
|
joylink_cuiweidong
|
fb17b72e5e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 10:14:20 +08:00 |
|
joylink_cuiweidong
|
d0ed6ed859
|
iscs 代码调整
实训平台 缓存跳转代码调整
|
2020-05-12 10:13:27 +08:00 |
|
fan
|
795503d227
|
大屏调整
|
2020-05-11 18:15:49 +08:00 |
|
fan
|
68fdc7f2ec
|
问题调整
|
2020-05-11 17:40:52 +08:00 |
|
zyy
|
fe5f6cecc9
|
调整大屏系统界面加载宽度
|
2020-05-09 20:13:32 +08:00 |
|
joylink_cuiweidong
|
d0abd7fb56
|
socket 断线重连修改
解决被登出 socket 一直请求的问题
|
2020-04-24 15:34:09 +08:00 |
|
fan
|
f375b97631
|
派班工作站调整
|
2020-04-20 15:38:30 +08:00 |
|
fan
|
c268ee7d3c
|
项目获取房间列表添加项目code参数
|
2020-04-17 09:56:41 +08:00 |
|
fan
|
4231966cac
|
取消cdn加载&调整快速入口进入房间
|
2020-04-17 09:13:40 +08:00 |
|
fan
|
d69e155e91
|
贵州装备添加联锁角色&&项目配置规整（未完）
|
2020-04-16 15:52:56 +08:00 |
|
fan
|
7df417424e
|
调整本地项目快速入口
|
2020-04-01 09:07:42 +08:00 |
|
fan
|
bfd5b07145
|
调整本地项目综合演练
|
2020-03-31 18:50:16 +08:00 |
|
fan
|
e35149248d
|
调整本地项目
|
2020-03-31 15:11:20 +08:00 |
|
fan
|
ab4928d924
|
差异化打包调整&哈尔滨登录页
|
2020-03-30 13:07:11 +08:00 |
|
fan
|
2501a1a70a
|
综合演练问题调整
|
2020-03-23 16:00:28 +08:00 |
|
fan
|
a435040ef1
|
综合演练调整
|
2020-03-23 10:30:23 +08:00 |
|
fan
|
43ffec406d
|
综合演练调整
|
2020-03-18 09:59:54 +08:00 |
|
fan
|
cd9915668b
|
综合演练接口修改
|
2020-03-16 15:29:26 +08:00 |
|
zyy
|
e156bac9ca
|
增加公共地图ibp配置绘图 逻辑
|
2020-03-13 18:19:04 +08:00 |
|
zyy
|
31d50d95e2
|
增加仿真系统 iscs工作站
|
2020-03-13 13:23:04 +08:00 |
|
fan
|
582fc354db
|
快速入口增加参数projectCode
|
2020-01-17 14:20:31 +08:00 |
|
joylink_cuiweidong
|
5357d5c23c
|
解决 页面刷新 用户进入房间的问题
|
2020-01-16 15:08:03 +08:00 |
|
fan
|
fbc0e5b28a
|
哈尔滨盈达调整
|
2020-01-14 16:19:36 +08:00 |
|
fan
|
f2b62f281e
|
指令调整，公共地图宽度调整
|
2020-01-06 18:39:44 +08:00 |
|
fan
|
f8c7a46743
|
调整合并问题
|
2019-12-30 18:58:23 +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
|
dc9a059a7b
|
实训平台仿真权限代码调整
|
2019-12-30 18:14:52 +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
|
0486d0211b
|
prdType对应接口修改
|
2019-12-27 18:48:56 +08:00 |
|
zyy
|
6e3424e355
|
调整实训平台新旧地图显示逻辑
|
2019-12-26 11:01:54 +08:00 |
|
joylink_cuiweidong
|
cf03ac1e3d
|
综合演练的分发按钮去掉
所有的转增按钮去掉
|
2019-12-18 11:16:35 +08:00 |
|
zyy
|
03d766f5ee
|
修改实训平台购买提示
|
2019-12-05 18:12:09 +08:00 |
|
lVAL
|
899f4a4216
|
修改跳转bug
|
2019-11-25 18:21:56 +08:00 |
|
lVAL
|
a5bb60cf68
|
删除跳转页面中无用的subSystem参数
|
2019-11-25 18:12:34 +08:00 |
|
fan
|
3ad044be4f
|
打开支付跳转页面
|
2019-11-15 09:42:53 +08:00 |
|
ival
|
c5c813753c
|
修改代码
|
2019-11-14 13:59:33 +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 |
|
fan
|
92f2292592
|
暂无法购买，添加提示
|
2019-11-12 09:40:36 +08:00 |
|
joylink_cuiweidong
|
c4f79f3b1a
|
skinCode调整
|
2019-11-11 18:28:21 +08:00 |
|
ival
|
8855bb6c27
|
修改代码
|
2019-11-08 20:03:33 +08:00 |
|
joylink_cuiweidong
|
5465eb61c1
|
prdCode改成prdId
|
2019-11-07 15:54:49 +08:00 |
|
zyy
|
7ec68a75e3
|
desc: 删除多余文件， 调整路径配置
|
2019-10-31 17:30:24 +08:00 |
|
fan
|
fa1fc4c3cf
|
删除接口：/api/mapPrd/tree
|
2019-10-30 18:03:30 +08:00 |
|
joylink_cuiweidong
|
462b0cfb6c
|
样式调整
|
2019-10-29 16:23:57 +08:00 |
|
fan
|
73e9c995c2
|
综合演练房间快速入口添加线路
|
2019-10-25 17:49:44 +08:00 |
|
fan
|
ca736a93f3
|
登录过期不显示获取子系统信息失败
|
2019-10-25 13:16:07 +08:00 |
|
fan
|
bfce5a2103
|
问题调整
|
2019-10-25 12:59:24 +08:00 |
|
fan
|
36b0b048bd
|
仿真路由调整
|
2019-10-21 14:09:03 +08:00 |
|
fan
|
34a8cbf270
|
接口调整
|
2019-10-21 08:59:27 +08:00 |
|
fan
|
d5063802f4
|
接口调整
|
2019-10-18 17:15:04 +08:00 |
|
fan
|
fa4c7a6599
|
样式微调
|
2019-10-17 16:26:36 +08:00 |
|
fan
|
0fd879dd5d
|
样式微调
|
2019-10-17 16:23:14 +08:00 |
|
zyy
|
6ca619b71f
|
desc: 修改格式化
|
2019-10-17 14:35:10 +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
|
1ced811496
|
产品分化调整
|
2019-09-27 14:46:08 +08:00 |
|
fan
|
bc68f1adc9
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-26 15:43:56 +08:00 |
|
fan
|
2ce7cde8cb
|
调整icon导致x替换问题
|
2019-09-26 15:43:19 +08:00 |
|
fan
|
e7d7ad76f0
|
实训平台调整
|
2019-09-25 13:05:01 +08:00 |
|
zyy
|
b3830f2cc5
|
desc: 新增现地 自动生成课程
|
2019-09-25 10:46:35 +08:00 |
|
fan
|
522b94fcfe
|
产品分化调整
|
2019-09-25 09:18:28 +08:00 |
|
fan
|
b998eee746
|
产品分化调整
|
2019-09-24 15:03:03 +08:00 |
|
fan
|
ce7decc188
|
产品分化调整
|
2019-09-24 11:05:10 +08:00 |
|
fan
|
d063625c45
|
产品分化调整
|
2019-09-23 17:49:04 +08:00 |
|
zyy
|
11a49d1442
|
desc: 增加加载运行图模板接口，调整地图绘制优化
|
2019-09-06 14:21:01 +08:00 |
|
ival
|
3ade8f6d92
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-02 15:38:11 +08:00 |
|
ival
|
61de3c222d
|
App.vue页面增加全局尺寸混入并存放在app store，其他页面删除混入
|
2019-09-02 15:37:57 +08:00 |
|
zyy
|
6fa64dd26b
|
desc: 修改显示字段，增加loading
|
2019-09-02 11:04:23 +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
|
3da74652c5
|
增加派班计划
|
2019-08-30 09:00:36 +08:00 |
|
ival
|
30e590afc7
|
封装车次窗鼠标事件以及车次窗操作
|
2019-08-29 11:26:05 +08:00 |
|
zyy
|
2250bc970d
|
desc: 修改名称显示放到皮肤配置中
|
2019-08-23 14:24:30 +08:00 |
|
fan
|
9a480393f5
|
国际化调整+loading调整
|
2019-08-21 13:54:53 +08:00 |
|
fan
|
36a1f8e878
|
调整: 快速入口调整
|
2019-08-19 20:27:23 +08:00 |
|
fan
|
ecc4885ad0
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-19 14:09:54 +08:00 |
|
fan
|
2115c952cc
|
修改：loading调整
|
2019-08-19 14:09:37 +08:00 |
|
ival
|
9ca049157c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 14:02:32 +08:00 |
|
ival
|
d87a4fff22
|
国际化处理
|
2019-08-19 14:02:20 +08:00 |
|
fan
|
a669d093b1
|
修改：删除全局loading
|
2019-08-19 13:27:15 +08:00 |
|
ival
|
068dbdbbde
|
修改代码
|
2019-08-19 10:58:14 +08:00 |
|
ival
|
00f0fd84a3
|
修改车站公里表隐藏的问题
|
2019-08-19 09:38:11 +08:00 |
|
ival
|
0d8770e9e1
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/views/demonstration/deomonList/index.vue
|
2019-08-15 16:10:13 +08:00 |
|
ival
|
7a08dabc30
|
修改jenkinsfile-test
|
2019-08-15 16:06:08 +08:00 |
|
fan
|
0b3ad87bc3
|
创建仿真失败时关闭loading
|
2019-08-15 15:21:28 +08:00 |
|
ival
|
fd2b66e984
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/i18n/langs/zh/rules.js
# src/views/trainRoom/index.vue
|
2019-08-14 16:50:50 +08:00 |
|
zyy
|
7fdedec00f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-14 16:48:03 +08:00 |
|
zyy
|
62674f84ff
|
desc: 修改快速入口提示问题
|
2019-08-14 16:47:54 +08:00 |
|
ival
|
b1fd1f43e9
|
删除返回主页的错误
|
2019-08-14 16:46:44 +08:00 |
|
ival
|
87e35cb38d
|
同步master代码以及修改交路的问题
|
2019-08-14 16:37:17 +08:00 |
|
zyy
|
ed8b14dac2
|
desc: 修改综合演练，socket创建
|
2019-08-14 16:15:44 +08:00 |
|
ival
|
3bb449080f
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/i18n/langs/zh/tip.js
# src/jlmap3d/jl3ddrive/jl3ddrive.js
# src/views/components/pay/index.vue
# src/views/demonstration/detail/index.vue
# src/views/display/index.vue
# src/views/exam/detail/courseDetail.vue
# src/views/exam/detail/examDetail.vue
# src/views/exam/detail/questionDetail.vue
# src/views/jlmap3d/drive/jl3ddrive.vue
# src/views/jlmap3d/simulation/jl3dsimulation.vue
# src/views/jointTraining/index.vue
# src/views/map/mapdraft/mapedit/automaticoperate/preview.vue
# src/views/map/mapdraft/mapedit/mapoperate/link.vue
# src/views/map/mapdraft/mapedit/mapoperate/section.vue
# src/views/map/mapdraft/mapedit/mapoperate/signal.vue
# src/views/map/mapdraft/mapedit/mapoperate/station.vue
# src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
# src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
# src/views/map/mapdraft/mapedit/mapoperate/stoppoint.vue
# src/views/map/mapdraft/mapedit/mapoperate/switch.vue
# src/views/map/mapdraft/mapedit/pathoperate/pathRoute.vue
# src/views/map/mapdraft/mapedit/routeoperate/detail.vue
# src/views/map/mapdraft/mapedit/routeoperate/preview.vue
# src/views/map/mapdraft/mapedit/routeoperate/related.vue
# src/views/map/mapdraft/mapedit/routeoperate/route.vue
# src/views/map/mapdraft/mapmanage/operateMenu.vue
# src/views/map/product/draft.vue
# src/views/map/product/list.vue
# src/views/map/skinStyle/draft.vue
# src/views/map/skinStyle/index.vue
# src/views/planMonitor/detail.vue
# src/views/planMonitor/editTool/index.vue
# src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
# src/views/planMonitor/editTool/schedule.vue
# src/views/teach/detail/index.vue
# src/views/teach/practical/index.vue
|
2019-08-14 15:57:52 +08:00 |
|
ival
|
6343a79f81
|
修改接口
|
2019-08-14 14:01:28 +08:00 |
|
ival
|
576ac7eacb
|
修改导航配置
|
2019-08-14 10:36:55 +08:00 |
|
ival
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
fan
|
367edf0118
|
调整：代码修改
|
2019-08-09 17:38:20 +08:00 |
|
fan
|
a3b7ed0522
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2
|
2019-08-09 17:34:13 +08:00 |
|
fan
|
74f7785663
|
调整：限制仿真多次加载
|
2019-08-09 15:52:55 +08:00 |
|