joylink_cuiweidong
|
1d760d5688
|
产品分化路由修改
|
2019-10-10 13:45:51 +08:00 |
|
zyy
|
a8e491ea6e
|
desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明
|
2019-10-09 17:05:10 +08:00 |
|
zyy
|
a8302b610e
|
desc: 注释多余代码
|
2019-09-29 11:09:02 +08:00 |
|
zyy
|
01cb0a699b
|
desc: 调整权限字段限制， 配置英文版登陆页面
|
2019-09-26 17:42:25 +08:00 |
|
zyy
|
0b1ae44c19
|
desc: 调整三号线现地操作
|
2019-09-26 09:23:02 +08:00 |
|
zyy
|
df670c63c3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-25 10:46:41 +08:00 |
|
zyy
|
b3830f2cc5
|
desc: 新增现地 自动生成课程
|
2019-09-25 10:46:35 +08:00 |
|
joylink_cuiweidong
|
1e4deb2353
|
国际化调整
|
2019-09-24 17:02:29 +08:00 |
|
joylink_cuiweidong
|
9b3be49329
|
解决 地图仿真,用户删除，可以修改的bug
|
2019-09-24 16:30:55 +08:00 |
|
fan
|
bcc4ab1906
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-24 15:31:25 +08:00 |
|
fan
|
5a65547d9b
|
删除多余标点
|
2019-09-24 15:30:54 +08:00 |
|
zyy
|
8212759438
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-24 15:06:56 +08:00 |
|
zyy
|
a0ee753bfd
|
desc: 调整成都三号线自动生成课程配置，部分内容 (待调)
|
2019-09-24 15:06:45 +08:00 |
|
joylink_cuiweidong
|
1f101d5468
|
国际化调整
|
2019-09-24 14:59:58 +08:00 |
|
fan
|
d863e61b33
|
Revert "revert 01c97f45aea75ec8db5a0726c82a2e83fa14750e"
This reverts commit 6ad0eebb2e.
|
2019-09-24 13:32:28 +08:00 |
|
fan
|
6ad0eebb2e
|
revert 01c97f45ae
|
2019-09-24 13:23:50 +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 |
|
ival
|
00312b33e1
|
修改selected prop default的情况
|
2019-09-23 10:02:31 +08:00 |
|
ival
|
9c20ec9df5
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-09-23 09:54:55 +08:00 |
|
ival
|
a789f301c3
|
修改福州线国际化导致的操作问题以及eslint的问题
|
2019-09-23 09:46:39 +08:00 |
|
ival
|
39d3ee757a
|
修改代码
|
2019-09-23 09:12:36 +08:00 |
|
zyy
|
48ea44a980
|
desc: 调整权限国际化，调整琏计划导入运行图逻辑
|
2019-09-19 17:22:48 +08:00 |
|
ival
|
e224ed8bea
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-18 18:44:04 +08:00 |
|
ival
|
aa727c0f09
|
修改信号解封不能操作菜单的问题
|
2019-09-18 18:43:50 +08:00 |
|
joylink_cuiweidong
|
6b3fe88797
|
仿真国际化修改
|
2019-09-18 18:36:47 +08:00 |
|
joylink_cuiweidong
|
ffdba3dc22
|
国际化调整
|
2019-09-17 16:08:11 +08:00 |
|
joylink_cuiweidong
|
9ed649200c
|
地图绘制 模块 国际化调整
|
2019-09-17 11:29:34 +08:00 |
|
joylink_cuiweidong
|
b68b10b125
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-17 10:03:13 +08:00 |
|
joylink_cuiweidong
|
51eab16476
|
国际化调整
|
2019-09-17 09:49:24 +08:00 |
|
joylink_cuiweidong
|
7f934a428f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-16 19:09:23 +08:00 |
|
joylink_cuiweidong
|
9cefb34ce1
|
国际化调整
|
2019-09-16 19:09:11 +08:00 |
|
fan
|
bb272ae559
|
国际化调整
|
2019-09-16 19:06:18 +08:00 |
|
fan
|
a6ff9e2c08
|
国际化调整
|
2019-09-16 19:00:52 +08:00 |
|
joylink_cuiweidong
|
c1bee69b5c
|
国际化调整
|
2019-09-16 18:40:41 +08:00 |
|
zyy
|
b9534a26e6
|
Merge branch 'dev' into test
|
2019-09-16 18:16:14 +08:00 |
|
zyy
|
815c2e6db4
|
desc: 调整信号机显示位置
|
2019-09-16 17:58:01 +08:00 |
|
zyy
|
607024c551
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-16 17:31:17 +08:00 |
|
zyy
|
c5c71253df
|
desc: 调整信号机字段显示，调整创建权限逻辑
|
2019-09-16 17:31:12 +08:00 |
|
joylink_cuiweidong
|
25402786f8
|
国际化调整
|
2019-09-16 16:08:55 +08:00 |
|
joylink_cuiweidong
|
382b81b94e
|
国际化调整
|
2019-09-16 13:55:18 +08:00 |
|
joylink_cuiweidong
|
87637e89ae
|
弹出层国际化调整
|
2019-09-16 11:17:42 +08:00 |
|
joylink_cuiweidong
|
711f3195e3
|
国际化调整
|
2019-09-16 10:25:39 +08:00 |
|
fan
|
836aa798dd
|
国际化调整
|
2019-09-16 09:06:19 +08:00 |
|
fan
|
6e44740fe2
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/menu.js
# src/i18n/langs/zh/menu.js
|
2019-09-16 09:05:33 +08:00 |
|
fan
|
126fc80ea4
|
国际化调整菜单
|
2019-09-16 08:56:37 +08:00 |
|
joylink_cuiweidong
|
3f772f0cd5
|
地图右键菜单国际化
|
2019-09-12 18:37:42 +08:00 |
|
joylink_cuiweidong
|
88d96ace7d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-12 17:38:17 +08:00 |
|
joylink_cuiweidong
|
24bbeda269
|
地图右键菜单国际化
|
2019-09-12 17:38:04 +08:00 |
|
fan
|
60522271fc
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/menu.js
# src/i18n/langs/zh/menu.js
|
2019-09-12 17:34:17 +08:00 |
|
fan
|
d9b8f1e8fd
|
国际化菜单调整调整
|
2019-09-12 17:28:02 +08:00 |
|
zyy
|
c777b3dbcc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/rules.js
# src/i18n/langs/zh/rules.js
|
2019-09-12 16:31:35 +08:00 |
|
zyy
|
f48a513df0
|
desc: 调整绘图逻辑，流程，字段显示
|
2019-09-12 16:30:42 +08:00 |
|
joylink_cuiweidong
|
6d03379cb0
|
地图右键菜单国际化
|
2019-09-12 16:03:03 +08:00 |
|
joylink_cuiweidong
|
b08cddc237
|
地图菜单国际化
|
2019-09-12 15:14:13 +08:00 |
|
fan
|
41b70bc477
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-11 13:20:30 +08:00 |
|
fan
|
80ce4e19a8
|
ibp调整
|
2019-09-09 16:11:43 +08:00 |
|
fan
|
6eb3fecc4b
|
信号机调整
|
2019-09-09 10:41:14 +08:00 |
|
fan
|
6472afe009
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 18:46:54 +08:00 |
|
ival
|
1918a634b1
|
修改变量
|
2019-09-06 17:55:18 +08:00 |
|
fan
|
c3a98567a3
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:03:07 +08:00 |
|
ival
|
f774edd652
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 16:11:46 +08:00 |
|
ival
|
7c5d453c29
|
修改绘制地图同步数据逻辑
|
2019-09-06 16:11:28 +08:00 |
|
zyy
|
0cfc1dc972
|
Merge branch 'dev' into test
|
2019-09-06 15:55:06 +08:00 |
|
zyy
|
11a49d1442
|
desc: 增加加载运行图模板接口，调整地图绘制优化
|
2019-09-06 14:21:01 +08:00 |
|
ival
|
664fbb8f7f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-04 19:04:58 +08:00 |
|
ival
|
99ffd6d36c
|
删除注释
|
2019-09-04 19:03:04 +08:00 |
|
ival
|
33c4a3afc2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 19:00:38 +08:00 |
|
ival
|
02fc21e544
|
增加仿真的大屏角色以及IBP角色
|
2019-09-04 19:00:22 +08:00 |
|
zyy
|
509e5218a7
|
desc: 调整引用问题
|
2019-09-04 17:58:22 +08:00 |
|
ival
|
4e7db47748
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-04 17:16:00 +08:00 |
|
ival
|
c97996fceb
|
设置冲突列颜色
|
2019-09-03 17:35:23 +08:00 |
|
ival
|
dfcdb5628f
|
优化IBP盘代码
|
2019-09-03 15:46:16 +08:00 |
|
ival
|
ca1b07595e
|
修改IBP界面尺寸的问题
|
2019-09-03 14:04:25 +08:00 |
|
ival
|
61de3c222d
|
App.vue页面增加全局尺寸混入并存放在app store，其他页面删除混入
|
2019-09-02 15:37:57 +08:00 |
|
zyy
|
741af50a2a
|
desc: 地图绘制显示车站公里标，
|
2019-08-30 17:58:15 +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
|
1616639f6f
|
修改运行图接口
|
2019-08-29 13:52:34 +08:00 |
|
ival
|
30e590afc7
|
封装车次窗鼠标事件以及车次窗操作
|
2019-08-29 11:26:05 +08:00 |
|
ival
|
c14e0c6055
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/display/index.vue
|
2019-08-29 10:35:55 +08:00 |
|
ival
|
cc54830f01
|
修改代码格式以及操作的bug
|
2019-08-29 10:33:50 +08:00 |
|
zyy
|
791655a50a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-29 09:33:48 +08:00 |
|
zyy
|
2d906ef9be
|
desc: 调整权限列表接口对接
|
2019-08-29 09:31:58 +08:00 |
|
ival
|
c2f6cf4656
|
移除jlmap中的地图原始数据
|
2019-08-29 09:30:52 +08:00 |
|
zyy
|
498f093866
|
desc: 新增按钮类型
|
2019-08-27 18:32:26 +08:00 |
|
zyy
|
72355448a1
|
desc: 修改地图绘制显示问题
|
2019-08-27 09:36:22 +08:00 |
|
zyy
|
b9b2fd5b77
|
desc: 调整地图绘制数据逻辑， 新增发布历史列表
|
2019-08-23 18:40:02 +08:00 |
|
zyy
|
2250bc970d
|
desc: 修改名称显示放到皮肤配置中
|
2019-08-23 14:24:30 +08:00 |
|
zyy
|
6a6bb3a405
|
desc: 修改地图绘制样式，逻辑调整
|
2019-08-23 09:14:21 +08:00 |
|
zyy
|
fde4d41727
|
desc: 修改样式，地图更新坐标
|
2019-08-22 10:25:23 +08:00 |
|
zyy
|
6712d1cd5b
|
desc: 修改地图编辑样式
|
2019-08-21 17:34:08 +08:00 |
|
zyy
|
e4a5d77f20
|
desc: 支付组件国际化， 调整地图加载位置
|
2019-08-21 15:15:08 +08:00 |
|
ival
|
28c6e05c41
|
修改获取列车数据没有刷新，导致加载的问题
|
2019-08-20 09:55:49 +08:00 |
|
fan
|
c5ecf86107
|
调整: 国际化+成都三号线人工车显示
|
2019-08-19 18:31:13 +08:00 |
|
ival
|
ae500285ba
|
修改实训加载顺序错误的问题
|
2019-08-19 15:59:04 +08:00 |
|
fan
|
3fe9ffd451
|
修改：列车信息调整，人工车显示调整
|
2019-08-19 13:21:29 +08:00 |
|
zyy
|
b025c78d67
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 11:18:57 +08:00 |
|