fan
|
d1c146f9da
|
权限回收调整
|
2019-09-11 14:28:22 +08:00 |
|
joylink_cuiweidong
|
ef5d425942
|
考试 仿真国际化调整
|
2019-09-11 13:40:46 +08:00 |
|
fan
|
41b70bc477
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-11 13:20:30 +08:00 |
|
fan
|
9c5f1f7633
|
国际化调整
|
2019-09-11 13:20:03 +08:00 |
|
joylink_cuiweidong
|
b13638803a
|
教学 仿真 国际化调整
|
2019-09-11 11:32:31 +08:00 |
|
joylink_cuiweidong
|
5c184755e2
|
教学仿真 国际化调整
|
2019-09-11 11:30:44 +08:00 |
|
joylink_cuiweidong
|
d31f4e8493
|
教学和考试的仿真 国际化调整
|
2019-09-11 11:02:18 +08:00 |
|
fan
|
fa4ccafc58
|
权限分发调整
|
2019-09-11 10:42:15 +08:00 |
|
fan
|
5c2e2cebe8
|
权限分发调整
|
2019-09-11 10:35:34 +08:00 |
|
joylink_cuiweidong
|
1ced2a4911
|
国际化调整
|
2019-09-11 09:34:12 +08:00 |
|
fan
|
7bb4ac4a06
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-11 09:26:38 +08:00 |
|
fan
|
3e1bd3fcd7
|
国际化考试系统大屏统计系统
|
2019-09-11 09:25:16 +08:00 |
|
joylink_cuiweidong
|
e1378c0961
|
国际化调整
|
2019-09-10 19:08:48 +08:00 |
|
joylink_cuiweidong
|
875d5d6c64
|
国际化调整
|
2019-09-10 17:32:41 +08:00 |
|
joylink_cuiweidong
|
4b8a3acca8
|
国际化调整以及ibp盘调整
|
2019-09-10 16:14:54 +08:00 |
|
fan
|
c96260215c
|
ibp调整代码
|
2019-09-10 14:27:53 +08:00 |
|
fan
|
5612cfc06e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-10 10:26:27 +08:00 |
|
fan
|
8083656e16
|
ibp删除钥匙孔
|
2019-09-10 10:26:18 +08:00 |
|
joylink_cuiweidong
|
dc44cd3198
|
钥匙组件调整
|
2019-09-10 10:20:15 +08:00 |
|
fan
|
0c9e367f3d
|
ibp修改扶梯框边框宽度，调整select默认状态
|
2019-09-10 10:16:02 +08:00 |
|
joylink_cuiweidong
|
eaaccddc20
|
通化门，后卫寨 钥匙组件数据调整
|
2019-09-10 10:10:49 +08:00 |
|
joylink_cuiweidong
|
d6ab9b00e2
|
钥匙组件数据重新调整
|
2019-09-09 19:30:12 +08:00 |
|
joylink_cuiweidong
|
26472da421
|
钥匙组件代码重新封装
|
2019-09-09 19:03:23 +08:00 |
|
fan
|
a32bda33f1
|
ibp调整代码
|
2019-09-09 18:03:32 +08:00 |
|
fan
|
7620d82d6e
|
ibp调整背景图片加载方式
|
2019-09-09 16:22:45 +08:00 |
|
fan
|
80ce4e19a8
|
ibp调整
|
2019-09-09 16:11:43 +08:00 |
|
fan
|
c661945847
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-09 10:41:27 +08:00 |
|
fan
|
6eb3fecc4b
|
信号机调整
|
2019-09-09 10:41:14 +08:00 |
|
sunzhenyu
|
4e1f95e900
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-09-09 10:22:21 +08:00 |
|
sunzhenyu
|
fd8f3e4dd0
|
修改过去不标准贴图，修改代码生成的不标准材质
|
2019-09-09 10:22:10 +08:00 |
|
fan
|
6472afe009
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 18:46:54 +08:00 |
|
fan
|
31454a72c5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 18:18:18 +08:00 |
|
fan
|
760aa02496
|
ibp调整页面
|
2019-09-06 18:17:54 +08:00 |
|
ival
|
1a516880b5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 17:55:34 +08:00 |
|
ival
|
1918a634b1
|
修改变量
|
2019-09-06 17:55:18 +08:00 |
|
fan
|
621fe61d36
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:43:09 +08:00 |
|
fan
|
6b96fc928d
|
ibp删除console
|
2019-09-06 17:42:36 +08:00 |
|
fan
|
4cd1da15c0
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:38:18 +08:00 |
|
fan
|
3ea2c656de
|
ibp调整电子钟停止
|
2019-09-06 17:37:43 +08:00 |
|
fan
|
3abd85ab67
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:25:35 +08:00 |
|
fan
|
a9ec1672ae
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 17:24:45 +08:00 |
|
fan
|
05b41d659e
|
ibp拖动鼠标样式调整
|
2019-09-06 17:24:32 +08:00 |
|
zyy
|
37e8046241
|
Merge branch 'dev' into test
|
2019-09-06 17:22:36 +08:00 |
|
zyy
|
46a3f64f4d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 17:22:03 +08:00 |
|
zyy
|
ba21d7af9d
|
desc: 修改权限打包字段， 修改地图绘制区段逻辑
|
2019-09-06 17:21:54 +08:00 |
|
fan
|
c3a98567a3
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:03:07 +08:00 |
|
fan
|
9d5c5646a2
|
ibp盘调整
|
2019-09-06 17:01:51 +08:00 |
|
fan
|
ddfeeb6718
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 16:55:31 +08:00 |
|
fan
|
3faf8f3906
|
ibp盘调整
|
2019-09-06 16:54:55 +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
|
10c4083ad3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 15:54:11 +08:00 |
|
zyy
|
7b0b0d6d0c
|
desc: 修改绘制地图赋值
|
2019-09-06 15:54:05 +08:00 |
|
fan
|
327c35355f
|
ibp盘调整
|
2019-09-06 15:21:21 +08:00 |
|
fan
|
80edc1ad20
|
ibp盘调整
|
2019-09-06 15:08:47 +08:00 |
|
fan
|
32dab2fa7d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 14:48:47 +08:00 |
|
fan
|
ceccbbc825
|
ibp盘调整
|
2019-09-06 14:48:06 +08:00 |
|
joylink_cuiweidong
|
37b72ddf7e
|
枣园站 ibp盘绘制
|
2019-09-06 14:23:31 +08:00 |
|
zyy
|
1faa4e0add
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 14:21:08 +08:00 |
|
zyy
|
11a49d1442
|
desc: 增加加载运行图模板接口，调整地图绘制优化
|
2019-09-06 14:21:01 +08:00 |
|
joylink_cuiweidong
|
d05a6583df
|
ibp盘 圆形指示灯 调整
|
2019-09-06 10:55:34 +08:00 |
|
fan
|
20acc0e667
|
ibp盘调整
|
2019-09-06 10:27:13 +08:00 |
|
fan
|
f8df75252f
|
ibp盘调整
|
2019-09-06 10:07:01 +08:00 |
|
fan
|
f5f7113c01
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 09:55:27 +08:00 |
|
fan
|
fa604188b0
|
ibp盘调整
|
2019-09-06 09:55:16 +08:00 |
|
joylink_cuiweidong
|
a3980e689e
|
修改钥匙，电话端子，提示框，线等组件的结构
|
2019-09-06 09:49:58 +08:00 |
|
fan
|
7f0d548cb4
|
ibp盘调整
|
2019-09-05 19:27:30 +08:00 |
|
fan
|
455202a851
|
ibp盘调整
|
2019-09-05 18:54:54 +08:00 |
|
fan
|
84d2c2f014
|
ibp盘调整
|
2019-09-05 17:47:05 +08:00 |
|
fan
|
4d3eda2131
|
ibp盘调整
|
2019-09-05 10:01:56 +08:00 |
|
fan
|
9ba4ce7681
|
ibp盘图片调整
|
2019-09-05 09:54:53 +08:00 |
|
fan
|
c4bf259918
|
销毁实例前清除ibp数据
|
2019-09-05 09:35:32 +08:00 |
|
fan
|
063b6392fc
|
查询剧本列表接口调整展示调整
|
2019-09-05 09:07:16 +08:00 |
|
zyy
|
2dadba36dd
|
Merge branch 'dev' into test
|
2019-09-04 19:07:43 +08:00 |
|
zyy
|
935e42fa5b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 19:07:04 +08:00 |
|
zyy
|
921ef7c03d
|
desc: 调整接口请求次数
|
2019-09-04 19:06:55 +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 |
|
joylink_cuiweidong
|
e537726127
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 18:49:29 +08:00 |
|
fan
|
fefe8bd104
|
ibp盘数据调整
|
2019-09-04 18:49:09 +08:00 |
|
joylink_cuiweidong
|
19870bb7c4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 18:49:04 +08:00 |
|
joylink_cuiweidong
|
38f7b1a6e2
|
修复 时间组件拖拽 位置数据不更新的问题
|
2019-09-04 18:48:53 +08:00 |
|
fan
|
e24a0e1b4d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-04 18:48:10 +08:00 |
|
fan
|
8df4cfd6e1
|
ibp代码调整
|
2019-09-04 18:47:49 +08:00 |
|
zyy
|
0f9b0f84a5
|
desc: 删除多余打印
|
2019-09-04 18:29:47 +08:00 |
|
zyy
|
1d7809bc33
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 17:58:56 +08:00 |
|
zyy
|
509e5218a7
|
desc: 调整引用问题
|
2019-09-04 17:58:22 +08:00 |
|
sunzhenyu
|
ebd1b211d1
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-09-04 17:36:15 +08:00 |
|
joylink_cuiweidong
|
24fae2c33c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 17:26:34 +08:00 |
|
joylink_cuiweidong
|
53e3bf3899
|
解决 拖拽电梯 位置数据不更新的问题
|
2019-09-04 17:26:20 +08:00 |
|
ival
|
ba5de09724
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-04 17:20:18 +08:00 |
|
ival
|
8b56d035eb
|
修改按钮顺序
|
2019-09-04 17:19:26 +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
|
92531836fe
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 16:58:25 +08:00 |
|
ival
|
f925043e41
|
增加大屏角色
|
2019-09-04 16:58:13 +08:00 |
|
zyy
|
118ed1296c
|
desc: 增加琏计划运行图修改
|
2019-09-04 16:32:41 +08:00 |
|
zyy
|
6b9047c919
|
desc: 调整请求位置
|
2019-09-04 15:06:26 +08:00 |
|
zyy
|
949d51923e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 14:47:58 +08:00 |
|
zyy
|
a037937627
|
desc: 调整运行图生成逻辑
|
2019-09-04 14:47:52 +08:00 |
|
fan
|
f065661cd4
|
ibp代码调整
|
2019-09-04 14:42:04 +08:00 |
|
joylink_cuiweidong
|
a169ed0e81
|
ibp电梯拖拽事件调整 touch事件添加
|
2019-09-04 13:18:16 +08:00 |
|
fan
|
2d0c7a547b
|
ibp代码调整
|
2019-09-04 13:14:37 +08:00 |
|
fan
|
4cbdf38845
|
代码调整
|
2019-09-04 13:08:51 +08:00 |
|
fan
|
d303ca087e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-04 13:07:09 +08:00 |
|
fan
|
8a9092b2b4
|
ibp代码调整
|
2019-09-04 13:06:15 +08:00 |
|
ival
|
ec51f2de2c
|
修改代码
|
2019-09-04 13:04:56 +08:00 |
|
ival
|
eb7dafd1b2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 13:02:43 +08:00 |
|
ival
|
89fc3c0547
|
增加角色分配统计
|
2019-09-04 13:02:28 +08:00 |
|
zyy
|
8e06abcad9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 11:28:36 +08:00 |
|
zyy
|
b96701aceb
|
desc: 调整运行图加载
|
2019-09-04 11:28:24 +08:00 |
|
joylink_cuiweidong
|
67f925ef7f
|
代码调整
|
2019-09-04 11:05:57 +08:00 |
|
joylink_cuiweidong
|
969fe6ac5a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/ibp/shape/background.js
|
2019-09-04 11:02:02 +08:00 |
|
joylink_cuiweidong
|
3a196ffac4
|
ibp 拖拽事件处理
|
2019-09-04 11:00:01 +08:00 |
|
fan
|
eb26f87560
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-04 10:57:14 +08:00 |
|
fan
|
743fa388c4
|
代码调整
|
2019-09-04 10:56:44 +08:00 |
|
ival
|
d7fb121c2b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 10:13:42 +08:00 |
|
ival
|
df839856d9
|
修改IBP盘角色修改
|
2019-09-04 10:13:26 +08:00 |
|
zyy
|
51274a044b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 18:59:52 +08:00 |
|
zyy
|
abec58b726
|
desc: 修改弹窗点击蒙层不取消
|
2019-09-03 18:59:46 +08:00 |
|
fan
|
cb7d08bc93
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-03 18:45:39 +08:00 |
|
fan
|
ce5d0424d5
|
ibp代码调整
|
2019-09-03 18:45:02 +08:00 |
|
sunzhenyu
|
b7bffeb467
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-09-03 18:40:37 +08:00 |
|
sunzhenyu
|
58541f0654
|
mmi显示补漏
|
2019-09-03 18:40:24 +08:00 |
|
ival
|
f12b521da4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-03 18:38:15 +08:00 |
|
ival
|
0879aef961
|
增加派班计划loading
|
2019-09-03 18:37:00 +08:00 |
|
ival
|
790ce4551a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-03 17:58:43 +08:00 |
|
ival
|
c1af062bbd
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-03 17:36:01 +08:00 |
|
ival
|
c97996fceb
|
设置冲突列颜色
|
2019-09-03 17:35:23 +08:00 |
|
zyy
|
0af24a4306
|
Merge branch 'dev' into test
|
2019-09-03 17:03:42 +08:00 |
|
zyy
|
bd494599a6
|
desc: 修改显示权限title
|
2019-09-03 17:03:05 +08:00 |
|
sunzhenyu
|
9211396f99
|
修改state
|
2019-09-03 17:01:00 +08:00 |
|
sunzhenyu
|
1af9b755d7
|
t ：Merge branch 'test' into dev
|
2019-09-03 16:56:20 +08:00 |
|
sunzhenyu
|
2ea8521928
|
a
|
2019-09-03 16:53:50 +08:00 |
|
sunzhenyu
|
6fc5f991ef
|
区分cctv和正常镜头渲染，减少通信驱动的循环体，减少循环遍历的数据中内容，修改场景背景
|
2019-09-03 16:45:56 +08:00 |
|
fan
|
dafa95baed
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-03 16:14:13 +08:00 |
|
fan
|
ae853226d7
|
ibp调整
|
2019-09-03 16:14:00 +08:00 |
|
zyy
|
0372dd202d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 16:13:29 +08:00 |
|
zyy
|
40b67b8cf3
|
desc: 调整修改权限逻辑
|
2019-09-03 16:13:23 +08:00 |
|
ival
|
b8d2f43ebd
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 15:46:31 +08:00 |
|
ival
|
dfcdb5628f
|
优化IBP盘代码
|
2019-09-03 15:46:16 +08:00 |
|
zyy
|
10ab09451b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 15:22:58 +08:00 |
|
zyy
|
27f05bdd0d
|
desc: 增加缓存列表
|
2019-09-03 15:22:50 +08:00 |
|
ival
|
6eb0ac89b8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 14:40:02 +08:00 |
|
ival
|
c433cb5045
|
添加加载脚本失败后，提示后台错误
|
2019-09-03 14:39:50 +08:00 |
|
zyy
|
8c69b7afd0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 14:38:11 +08:00 |
|
zyy
|
7fbadc2bd3
|
desc: 修改权限编辑
|
2019-09-03 14:38:05 +08:00 |
|
fan
|
d843dd042e
|
后卫寨线条长度调整
|
2019-09-03 14:10:09 +08:00 |
|
fan
|
b3b71cdf76
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-03 14:05:35 +08:00 |
|
fan
|
6d6eb54f04
|
后卫寨背景高度调整为1300
|
2019-09-03 14:05:22 +08:00 |
|
ival
|
c239e98ae8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 14:04:39 +08:00 |
|
ival
|
ca1b07595e
|
修改IBP界面尺寸的问题
|
2019-09-03 14:04:25 +08:00 |
|
fan
|
8718df9dc6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-03 13:47:38 +08:00 |
|
fan
|
cb1d6cc4ff
|
ibp调整
|
2019-09-03 13:46:59 +08:00 |
|
ival
|
c954305440
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 13:22:34 +08:00 |
|
ival
|
310b3fca21
|
精简角色分配后删除角色的操作
|
2019-09-03 13:22:16 +08:00 |
|
zyy
|
8d06b98ba1
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 13:15:53 +08:00 |
|
zyy
|
5591796596
|
desc: 调整socket重连问题
|
2019-09-03 13:15:47 +08:00 |
|
ival
|
a29bce2751
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 13:04:30 +08:00 |
|
ival
|
19634821ba
|
删除无用注释代码
|
2019-09-03 13:04:19 +08:00 |
|
zyy
|
24f21a09aa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 11:22:03 +08:00 |
|
zyy
|
82cfd670c6
|
desc: 修改弹窗显示title
|
2019-09-03 11:21:54 +08:00 |
|
ival
|
f1ab89a131
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 11:13:00 +08:00 |
|
ival
|
d60c989405
|
增加IBP盘操作
|
2019-09-03 11:12:48 +08:00 |
|
zyy
|
0938be08f5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 10:46:04 +08:00 |
|
zyy
|
870a4de01b
|
desc: 修改socekt断连逻辑, 调整权限显示及细节，样式问题
|
2019-09-03 10:45:58 +08:00 |
|
fan
|
1ee0aeb785
|
ibp布局调整
|
2019-09-03 10:10:09 +08:00 |
|
fan
|
24a7a0204a
|
代码调整
|
2019-09-03 09:54:05 +08:00 |
|
fan
|
f08d2236dd
|
ibp 监听仿真开始状态
|
2019-09-03 09:50:14 +08:00 |
|
ival
|
2e10b39892
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/ibp/index.vue
|
2019-09-03 09:36:10 +08:00 |
|
ival
|
41111ebab2
|
修改IPB盘尺寸问题
|
2019-09-03 09:34:21 +08:00 |
|
fan
|
914c9dc168
|
删除ibp按钮
|
2019-09-03 09:18:21 +08:00 |
|
fan
|
e86c1b025c
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/router/index.js
# src/views/ibp/index.vue
|
2019-09-03 09:03:00 +08:00 |
|
fan
|
cc4a60687a
|
ibp盘调整
|
2019-09-03 08:56:14 +08:00 |
|
zyy
|
d53661e6ed
|
desc: 增加权限一键生成接口,调整显示位置，字段内容
|
2019-09-02 18:43:05 +08:00 |
|
zyy
|
95e6008c50
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-02 17:34:40 +08:00 |
|
zyy
|
f73d7f4b9f
|
desc: 打包权限列表展示
|
2019-09-02 17:34:34 +08:00 |
|
ival
|
827bb6e870
|
修改支付页面和订单页面高度错误问题
|
2019-09-02 17:24:42 +08:00 |
|
ival
|
cc17426731
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-02 17:11:31 +08:00 |
|
ival
|
de2b6a52b1
|
修改主页和尺寸
|
2019-09-02 17:11:19 +08:00 |
|
zyy
|
fa91bc22d9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/orderauthor/author/draft/ruleForm.vue
|
2019-09-02 17:06:32 +08:00 |
|
zyy
|
d38b3761b8
|
desc: 对接权限编辑接口，修改显示字段内容
|
2019-09-02 17:05:53 +08:00 |
|
ival
|
417dbbe585
|
修改首页布局
|
2019-09-02 15:46:05 +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
|
0388b2a1df
|
desc: 修改权限列表显示字段内容，逻辑流程
|
2019-09-02 14:43:16 +08:00 |
|
zyy
|
4a466e6a8c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-02 11:04:30 +08:00 |
|
zyy
|
6fa64dd26b
|
desc: 修改显示字段，增加loading
|
2019-09-02 11:04:23 +08:00 |
|
ival
|
94d1103e58
|
设置全局尺寸变化
|
2019-09-02 10:38:10 +08:00 |
|
sunzhenyu
|
ad5853498f
|
pull
|
2019-09-02 10:19:45 +08:00 |
|
ival
|
327bf6f32b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-02 10:12:08 +08:00 |
|
ival
|
03daccff77
|
修改登录session的问题
|
2019-09-02 10:11:57 +08:00 |
|
fan
|
e9c7016c19
|
ibp盘调整
|
2019-09-02 09:57:15 +08:00 |
|
fan
|
6000ac9df5
|
调整代码
|
2019-09-02 09:56:25 +08:00 |
|
fan
|
8dda6d4dbe
|
ibp盘调整
|
2019-09-02 09:53:21 +08:00 |
|
zyy
|
6e60afb4e6
|
desc: 注释永久显示
|
2019-09-02 09:33:21 +08:00 |
|
ival
|
923ded894b
|
修改代码
|
2019-08-30 19:36:36 +08:00 |
|
ival
|
f428bd71f1
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-30 19:27:17 +08:00 |
|
ival
|
0031b51f55
|
增加字典详情删除时给出提示
|
2019-08-30 19:27:03 +08:00 |
|
zyy
|
d628d10cb4
|
Merge branch 'test'
|
2019-08-30 19:20:22 +08:00 |
|
zyy
|
8e2f2fa4eb
|
Merge branch 'dev' into test
|
2019-08-30 19:20:08 +08:00 |
|
zyy
|
6c617d3e4a
|
desc: 修改获取商品字段
|
2019-08-30 19:19:48 +08:00 |
|
zyy
|
d8dc80a001
|
desc: 修改权限字段显示
|
2019-08-30 19:14:10 +08:00 |
|
zyy
|
37a76de058
|
Merge branch 'test'
|
2019-08-30 19:11:02 +08:00 |
|
zyy
|
abd338fefc
|
Merge branch 'dev' into test
|
2019-08-30 19:10:34 +08:00 |
|
zyy
|
5d1c9d02bf
|
desc: 修改琏计划
|
2019-08-30 19:10:08 +08:00 |
|
ival
|
1f82f68cd1
|
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# src/jlmap3d/jl3ddrive/jl3ddrive.js
|
2019-08-30 18:47:51 +08:00 |
|
ival
|
210c460c69
|
Merge branch 'dev' into test
|
2019-08-30 18:23:19 +08:00 |
|
ival
|
55166e7aea
|
修改elementUi切换中英文不成功的问题
|
2019-08-30 18:20:07 +08:00 |
|
joylink_cuiweidong
|
86c014bbc6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 18:00:42 +08:00 |
|
joylink_cuiweidong
|
389b711edc
|
电梯组件代码优化
|
2019-08-30 17:59:38 +08:00 |
|
zyy
|
2c5bb4bea7
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 17:58:29 +08:00 |
|
zyy
|
741af50a2a
|
desc: 地图绘制显示车站公里标，
|
2019-08-30 17:58:15 +08:00 |
|
ival
|
ae84e1ba4e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-08-30 17:53:37 +08:00 |
|
fan
|
bf23362b2b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-30 17:43:50 +08:00 |
|
fan
|
8fa43ce797
|
ibp盘调整
|
2019-08-30 17:43:17 +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
|
abf1afcdf2
|
desc: 修改逻辑顺序
|
2019-08-30 17:09:31 +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
|
d3ff24c4f8
|
设置时间组件为可清空组件
|
2019-08-30 16:41:55 +08:00 |
|
ival
|
ff94ade817
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 16:35:24 +08:00 |
|
ival
|
1dabf22fd6
|
修改数据显示
|
2019-08-30 16:35:13 +08:00 |
|
fan
|
ed3f31972d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-30 16:22:21 +08:00 |
|
fan
|
0503afb4c9
|
ibp盘调整
|
2019-08-30 16:22:10 +08:00 |
|
ival
|
5574df0e9d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 15:46:23 +08:00 |
|
ival
|
546957e926
|
增加排版计划处理
|
2019-08-30 15:46:08 +08:00 |
|
fan
|
b2b28f8c9d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAlarm.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAppendageBox.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpArrow.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpButton.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpElevator.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpKey.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLamp.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLine.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue
|
2019-08-30 15:06:08 +08:00 |
|
fan
|
755754ebd3
|
ibp调整
|
2019-08-30 15:01:37 +08:00 |
|
joylink_cuiweidong
|
dec0da6c1a
|
电话端子添加到页面中
|
2019-08-30 14:15:10 +08:00 |
|
joylink_cuiweidong
|
9cea1f91a9
|
ibp盘右侧样式调整
|
2019-08-30 13:32:56 +08:00 |
|
joylink_cuiweidong
|
911d269562
|
钥匙层级调整
|
2019-08-30 11:21:34 +08:00 |
|
joylink_cuiweidong
|
e865e6de3b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/ibp/shape/alarm.js
|
2019-08-30 10:59:14 +08:00 |
|
joylink_cuiweidong
|
64c939c8be
|
钥匙组件添加到页面
|
2019-08-30 10:55:34 +08:00 |
|
fan
|
f1a762556c
|
关闭ibp入口
|
2019-08-30 10:36:03 +08:00 |
|
fan
|
240268a65f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/ibp/shape/button.js
|
2019-08-30 10:34:25 +08:00 |
|
fan
|
5350e6ad39
|
ibp盘提交
|
2019-08-30 10:31:56 +08:00 |
|
joylink_cuiweidong
|
1a479b0ed7
|
电梯组件调整
|
2019-08-30 10:14:49 +08:00 |
|
joylink_cuiweidong
|
45e626d53b
|
钥匙组件添加
|
2019-08-30 09:38:19 +08:00 |
|
ival
|
eb5f71febd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/jlmap3d/jl3ddrive/jl3ddrive.js
# src/utils/baseUrl.js
# static/model/suidao/suidao.FBX
|
2019-08-30 09:23:40 +08:00 |
|
ival
|
3da74652c5
|
增加派班计划
|
2019-08-30 09:00:36 +08:00 |
|
joylink_cuiweidong
|
c9937ffc48
|
电梯组件添加到页面中
|
2019-08-29 18:45:20 +08:00 |
|
sunzhenyu
|
6c325be953
|
修改模型地址
|
2019-08-29 17:15:13 +08:00 |
|
ival
|
fd03ed6d59
|
修改每日运行图查询接口
|
2019-08-29 14:48:26 +08:00 |
|
ival
|
dce9903175
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-29 13:52:48 +08:00 |
|
ival
|
1616639f6f
|
修改运行图接口
|
2019-08-29 13:52:34 +08:00 |
|
joylink_cuiweidong
|
225747ac57
|
电梯组件调整
|
2019-08-29 13:25:02 +08:00 |
|
joylink_cuiweidong
|
eaec6c4446
|
修复 剧本修改时候重置剧本的bug
|
2019-08-29 13:05:30 +08:00 |
|
ival
|
30e590afc7
|
封装车次窗鼠标事件以及车次窗操作
|
2019-08-29 11:26:05 +08:00 |
|
sunzhenyu
|
02fb10040c
|
修改资源地址
|
2019-08-29 11:16:22 +08:00 |
|
sunzhenyu
|
9cbee21abd
|
pull merge
|
2019-08-29 11:15:41 +08:00 |
|
sunzhenyu
|
0f462ac0c1
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-08-29 11:14:45 +08:00 |
|
sunzhenyu
|
7862af3284
|
减少列车刷新
|
2019-08-29 11:12:02 +08:00 |
|
sunzhenyu
|
164572fb02
|
更新
|
2019-08-29 11:11:15 +08:00 |
|
sunzhenyu
|
06c29a97c4
|
修改驾驶中相机对象引用错误
|
2019-08-29 11:04:10 +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
|
32cc251ef6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/display/index.vue
# src/views/display/menuDemon.vue
|
2019-08-29 09:33:42 +08:00 |
|
ival
|
1aac4ee929
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-29 09:32:12 +08:00 |
|
ival
|
faf772a2bb
|
修改
|
2019-08-29 09:32:01 +08:00 |
|
zyy
|
2d906ef9be
|
desc: 调整权限列表接口对接
|
2019-08-29 09:31:58 +08:00 |
|
ival
|
c2f6cf4656
|
移除jlmap中的地图原始数据
|
2019-08-29 09:30:52 +08:00 |
|
fan
|
be04a992c0
|
关闭ibp盘开关
|
2019-08-29 09:30:09 +08:00 |
|
fan
|
094476bdb5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-29 09:26:27 +08:00 |
|
fan
|
453a909f01
|
ibp盘
|
2019-08-29 09:26:14 +08:00 |
|
fan
|
94f803072f
|
ibp盘提交
|
2019-08-29 09:25:06 +08:00 |
|
joylink_cuiweidong
|
2cee3cb6fc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-29 09:03:09 +08:00 |
|
joylink_cuiweidong
|
73e9e0985e
|
电梯模块封装
|
2019-08-29 09:02:55 +08:00 |
|
ival
|
287f5512b5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-29 09:02:25 +08:00 |
|
ival
|
0954312cac
|
修改用户emgail国际化的问题和保存规则提示的问题
|
2019-08-29 09:02:02 +08:00 |
|
sunzhenyu
|
ddb608d7e7
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-08-28 18:21:00 +08:00 |
|
sunzhenyu
|
0a30f6b5f7
|
减少行车循环中的无用判断，修改fbx模型加载，增加双面效果
|
2019-08-28 18:20:49 +08:00 |
|
joylink_cuiweidong
|
9de6b0ff12
|
扶梯子模块封装
|
2019-08-28 16:58:53 +08:00 |
|
joylink_cuiweidong
|
0e569358b0
|
电话端子模块提交
|
2019-08-28 13:36:46 +08:00 |
|
joylink_cuiweidong
|
a960fcd1a8
|
允许联动 提示 图片调整
|
2019-08-28 13:27:42 +08:00 |
|
fan
|
3393a65f0d
|
代码调整：ibp盘
|
2019-08-28 13:22:17 +08:00 |
|
joylink_cuiweidong
|
446f8d684a
|
按钮组件调整 图片调整
|
2019-08-28 13:19:45 +08:00 |
|
ival
|
b4a189a002
|
修改router配置
|
2019-08-28 10:07:19 +08:00 |
|
fan
|
f0f7ac1111
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
# src/views/ibp/ibpDraft/ibpEdit/index.vue
|
2019-08-28 10:02:42 +08:00 |
|
fan
|
6a0d41f09a
|
调整代码： ibp
|
2019-08-28 09:57:32 +08:00 |
|
ival
|
0fa4d4c204
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-28 09:55:55 +08:00 |
|
ival
|
a3b43e1e43
|
限制平局拖动范围
|
2019-08-28 09:55:40 +08:00 |
|
jade
|
066bf6e13b
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-08-28 08:59:05 +08:00 |
|
sunzhenyu
|
539f006e1e
|
修改下行轨道初始同步位置
|
2019-08-27 18:47:25 +08:00 |
|
joylink_cuiweidong
|
feac5e0e79
|
联动允许禁止提示 组件
|
2019-08-27 18:35:10 +08:00 |
|
zyy
|
01a2b42912
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-27 18:32:32 +08:00 |
|
zyy
|
498f093866
|
desc: 新增按钮类型
|
2019-08-27 18:32:26 +08:00 |
|
sunzhenyu
|
ba1e83f821
|
修改站台数据读取
|
2019-08-27 18:17:58 +08:00 |
|
sunzhenyu
|
3e570560c6
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-08-27 18:15:29 +08:00 |
|
sunzhenyu
|
b405494785
|
修改初始坐标
|
2019-08-27 18:14:10 +08:00 |
|
joylink_cuiweidong
|
8997d318f1
|
修改 箭头组件 调整其他组件的拖拽
|
2019-08-27 17:59:03 +08:00 |
|
fan
|
12b6535254
|
调整代码： 关闭ibp入口
|
2019-08-27 17:07:32 +08:00 |
|
sunzhenyu
|
7239983b84
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-08-27 17:07:30 +08:00 |
|
sunzhenyu
|
2ceb795114
|
修改站台加载
|
2019-08-27 17:07:17 +08:00 |
|
fan
|
846b267e64
|
调整代码： ibp盘宽高显示
|
2019-08-27 16:45:43 +08:00 |
|
fan
|
8b67b34df8
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-27 16:37:41 +08:00 |
|
fan
|
044f66d9d9
|
调整代码： ibp盘
|
2019-08-27 16:37:33 +08:00 |
|
fan
|
1f2d2a1794
|
调整代码： ibp盘
|
2019-08-27 16:35:41 +08:00 |
|
joylink_cuiweidong
|
dc80bec6d8
|
报警按钮封装 以及按钮组件代码调整
|
2019-08-27 16:17:55 +08:00 |
|
fan
|
5f5e701074
|
合并代码
|
2019-08-27 15:23:14 +08:00 |
|
fan
|
75a6b2ee58
|
合并
|
2019-08-27 15:22:55 +08:00 |
|
fan
|
68898a3861
|
ibp盘
|
2019-08-27 15:19:50 +08:00 |
|
zyy
|
1908954ca8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-27 15:03:01 +08:00 |
|
zyy
|
02aa4a5b65
|
desc: 道岔创建字段补充，修改字段名称，描述
|
2019-08-27 15:02:55 +08:00 |
|
joylink_cuiweidong
|
95353c7c31
|
ibp 盘 button组件 代码优化
|
2019-08-27 14:56:07 +08:00 |
|
fan
|
7eafd16896
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-27 14:18:22 +08:00 |
|
fan
|
b2eb2076b0
|
ibp
|
2019-08-27 14:17:36 +08:00 |
|
joylink_cuiweidong
|
aeb424514f
|
ibp盘 按钮组件封装调整
|
2019-08-27 13:55:48 +08:00 |
|
ival
|
1888ae855a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-27 10:28:37 +08:00 |
|
ival
|
5fdc80855d
|
修改规则编辑的问题
|
2019-08-27 10:28:24 +08:00 |
|
zyy
|
e34d3abff4
|
desc: 修改主页扫码显示逻辑
|
2019-08-27 09:46:44 +08:00 |
|
zyy
|
33c025aefa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-27 09:36:34 +08:00 |
|
zyy
|
72355448a1
|
desc: 修改地图绘制显示问题
|
2019-08-27 09:36:22 +08:00 |
|
joylink_cuiweidong
|
4235afd00f
|
ibp盘按钮组件封装
|
2019-08-26 19:18:03 +08:00 |
|
sunzhenyu
|
f2f89d2be2
|
修改初始位置因为角度偏移问题
|
2019-08-26 18:56:46 +08:00 |
|
ival
|
a4d06b7743
|
修改试题编辑页面的bug
|
2019-08-26 15:30:36 +08:00 |
|
ival
|
9230df4ed3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-26 14:30:21 +08:00 |
|
ival
|
0255a3250e
|
增加绘图的默认状态设置
|
2019-08-26 14:30:01 +08:00 |
|
fan
|
7fd73dbf37
|
ibp盘
|
2019-08-26 11:15:40 +08:00 |
|
fan
|
bc9180d814
|
ibp盘
|
2019-08-26 10:28:28 +08:00 |
|
fan
|
7757094ce3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-26 10:13:05 +08:00 |
|
fan
|
4b7873c2d7
|
ibp盘
|
2019-08-26 10:12:39 +08:00 |
|
zyy
|
b9b2fd5b77
|
desc: 调整地图绘制数据逻辑， 新增发布历史列表
|
2019-08-23 18:40:02 +08:00 |
|
zyy
|
7cf12c2c7e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-23 14:24:36 +08:00 |
|
zyy
|
2250bc970d
|
desc: 修改名称显示放到皮肤配置中
|
2019-08-23 14:24:30 +08:00 |
|
ival
|
554db95dd6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-23 13:44:56 +08:00 |
|
ival
|
0fe2f1a043
|
1.修改代码字典首字母大写导致select选项不出来的问题
|
2019-08-23 13:44:43 +08:00 |
|
zyy
|
f30084539a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-23 09:14:27 +08:00 |
|
zyy
|
6a6bb3a405
|
desc: 修改地图绘制样式，逻辑调整
|
2019-08-23 09:14:21 +08:00 |
|
joylink_cuiweidong
|
2abda64836
|
剧本录制模块页面结构调整
|
2019-08-22 18:13:55 +08:00 |
|
fan
|
0ca2235549
|
加载剧本是先清除地图状态
|
2019-08-22 14:12:16 +08:00 |
|
program-walker
|
252ad5b593
|
修改仿真类型数据字典
|
2019-08-22 13:31:58 +08:00 |
|
zyy
|
69d4d2be72
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-22 10:25:29 +08:00 |
|
zyy
|
fde4d41727
|
desc: 修改样式，地图更新坐标
|
2019-08-22 10:25:23 +08:00 |
|
fan
|
b5a157fecd
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-22 10:12:55 +08:00 |
|
fan
|
d068a74a6e
|
加载剧本前列车视图
|
2019-08-22 10:12:35 +08:00 |
|
ival
|
52bacce3a3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-22 09:45:31 +08:00 |
|
ival
|
977b47892f
|
增加综合仿真获取系统暂停状态的代码以及增加右侧偏移量的设置
|
2019-08-22 09:45:21 +08:00 |
|
fan
|
64ca6af5d6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-22 09:15:06 +08:00 |
|
fan
|
3d5bc7c600
|
国际化调整
|
2019-08-22 09:14:26 +08:00 |
|
fan
|
b41c85b78e
|
合并代码
|
2019-08-22 09:12:29 +08:00 |
|
joylink_cuiweidong
|
1212d30677
|
调整剧本不能修改问题
|
2019-08-22 09:09:35 +08:00 |
|
fan
|
614aae8be0
|
国际化调整
|
2019-08-22 09:06:48 +08:00 |
|
program-walker
|
cdb7ca645a
|
修改剧本编制界面样式
|
2019-08-21 20:40:02 +08:00 |
|
program-walker
|
c9dfbb0749
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/views/scriptManage/scriptRecord/addRole.vue
|
2019-08-21 20:34:47 +08:00 |
|
joylink_cuiweidong
|
8318fc6349
|
剧本编制 重置剧本调整 取消剧本角色处理
|
2019-08-21 20:32:37 +08:00 |
|
program-walker
|
22f83008e8
|
修改剧本编制界面样式
|
2019-08-21 20:16:47 +08:00 |
|
joylink_cuiweidong
|
005cb8ba78
|
剧本编制 成员角色调整
|
2019-08-21 20:11:16 +08:00 |
|
zyy
|
895841164e
|
desc: 保存字段新增
|
2019-08-21 18:51:16 +08:00 |
|
zyy
|
4d6776e6f9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 18:49:46 +08:00 |
|
zyy
|
5f5fc61b68
|
desc: 修改地图更改坐标，调整绘制样式
|
2019-08-21 18:49:39 +08:00 |
|
joylink_cuiweidong
|
aab5bcc995
|
剧本录制添加成员角色
|
2019-08-21 18:45:16 +08:00 |
|
zyy
|
6d42719731
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 17:34:15 +08:00 |
|
zyy
|
6712d1cd5b
|
desc: 修改地图编辑样式
|
2019-08-21 17:34:08 +08:00 |
|
ival
|
1eea945778
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 15:34:18 +08:00 |
|
ival
|
1ade3d38ca
|
添加列车模型重复名称数据提示
|
2019-08-21 15:34:01 +08:00 |
|
zyy
|
e89eb2ecf8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/zh/tip.js
|
2019-08-21 15:15:37 +08:00 |
|
zyy
|
e4a5d77f20
|
desc: 支付组件国际化， 调整地图加载位置
|
2019-08-21 15:15:08 +08:00 |
|
ival
|
1993de8548
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 15:01:13 +08:00 |
|
ival
|
242e082dc7
|
修改列车操作
|
2019-08-21 15:00:58 +08:00 |
|
joylink_cuiweidong
|
52c4106a75
|
背景只能保存一次
|
2019-08-21 14:28:34 +08:00 |
|
fan
|
8553a9dcdc
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-21 14:20:42 +08:00 |
|
fan
|
919314e959
|
国际化调整
|
2019-08-21 14:20:32 +08:00 |
|
joylink_cuiweidong
|
1943f767c4
|
对话讲述人和接收人可以互换
|
2019-08-21 14:08:43 +08:00 |
|
fan
|
1245dc3fab
|
国际化调整
|
2019-08-21 14:05:21 +08:00 |
|
fan
|
7bb5aa785d
|
合并冲突
|
2019-08-21 14:04:22 +08:00 |
|
fan
|
9a480393f5
|
国际化调整+loading调整
|
2019-08-21 13:54:53 +08:00 |
|
ival
|
6bbfd49150
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 13:48:24 +08:00 |
|
ival
|
b5a93f7ce1
|
修改国际化
|
2019-08-21 13:48:06 +08:00 |
|
zyy
|
1132e5fb4c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/global.js
# src/i18n/langs/zh/index.js
# src/i18n/langs/zh/rules.js
# src/views/map/runplan/manage/create.vue
|
2019-08-21 13:47:40 +08:00 |
|
zyy
|
c22d97b944
|
desc: 教学系统国际化
|
2019-08-21 13:46:36 +08:00 |
|
joylink_cuiweidong
|
300ed72365
|
指令文字为红色，隐藏修改按钮
指令和对话添加后原内容不清除
|
2019-08-21 12:03:01 +08:00 |
|
ival
|
09af43a690
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 11:29:13 +08:00 |
|
ival
|
4270053326
|
修改国际化
|
2019-08-21 11:28:56 +08:00 |
|
joylink_cuiweidong
|
51dcc5e904
|
剧本编制样式调整
|
2019-08-21 10:24:55 +08:00 |
|
ival
|
63e8232f8e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 09:29:12 +08:00 |
|
ival
|
6aa82ce2d4
|
修改权限配置
|
2019-08-21 09:29:02 +08:00 |
|
fan
|
dc3f334a93
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-21 09:23:08 +08:00 |
|
fan
|
75d4337043
|
国际化调整
|
2019-08-21 09:22:39 +08:00 |
|
ival
|
5273554ba0
|
饼形图增加个数显示
|
2019-08-21 09:20:40 +08:00 |
|
ival
|
82222027c0
|
调整坐标布局
|
2019-08-21 09:18:52 +08:00 |
|
ival
|
73d5b4c4fa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 09:15:04 +08:00 |
|
ival
|
d8e7965ffd
|
修改主页表信息
|
2019-08-21 09:14:54 +08:00 |
|
fan
|
7ef9abe5a9
|
国际化调整
|
2019-08-20 18:58:55 +08:00 |
|
fan
|
7334d282dd
|
调整: 剧本过滤角色调整
|
2019-08-20 18:57:14 +08:00 |
|
ival
|
72f1c63e22
|
修改设置仿真状态
|
2019-08-20 18:46:51 +08:00 |
|
ival
|
474b1fff18
|
修改仿真暂停字段归属文件
|
2019-08-20 18:44:02 +08:00 |
|
ival
|
0191158f87
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 18:35:59 +08:00 |
|
ival
|
de0fd028ed
|
设置时间暂停
|
2019-08-20 18:35:42 +08:00 |
|
joylink_cuiweidong
|
6e6a56903f
|
剧本编制样式调整
|
2019-08-20 18:31:48 +08:00 |
|
sunzhenyu
|
0e7805121a
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-08-20 18:30:23 +08:00 |
|
sunzhenyu
|
1fb6353f98
|
增加测试版车载cctv
|
2019-08-20 18:30:17 +08:00 |
|
joylink_cuiweidong
|
7f2c741818
|
剧本列表页面 样式调整
|
2019-08-20 17:54:40 +08:00 |
|
ival
|
0afda8953a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/index.js
|
2019-08-20 17:24:25 +08:00 |
|
ival
|
433360f979
|
增加回放的国际化
|
2019-08-20 17:22:45 +08:00 |
|
fan
|
520f1ef356
|
调整: 国际化创建连计划
|
2019-08-20 17:10:08 +08:00 |
|
ival
|
402e0537bf
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 17:01:20 +08:00 |
|
ival
|
8259b24f6c
|
增加国际化配置
|
2019-08-20 17:01:09 +08:00 |
|
joylink_cuiweidong
|
8172457cda
|
剧本编制模块样式调整
|
2019-08-20 15:55:32 +08:00 |
|
joylink_cuiweidong
|
4830864424
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 15:45:15 +08:00 |
|
ival
|
d1417983cc
|
修改国际化
|
2019-08-20 15:44:16 +08:00 |
|
joylink_cuiweidong
|
c6b8ba6794
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 15:42:15 +08:00 |
|
joylink_cuiweidong
|
2727309402
|
剧本录制样式修改
|
2019-08-20 15:41:54 +08:00 |
|
ival
|
3c11c5fd47
|
增加交路目的地码
|
2019-08-20 14:17:53 +08:00 |
|
ival
|
febfddfc15
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 14:03:11 +08:00 |
|
ival
|
03eec83e9c
|
增加交路目的地码的展示
|
2019-08-20 14:02:55 +08:00 |
|
joylink_cuiweidong
|
2cf92690ec
|
剧本编制页面布局调整
|
2019-08-20 13:27:07 +08:00 |
|
joylink_cuiweidong
|
7f907cc6ba
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/display/tipScriptRecord.vue
|
2019-08-20 13:22:51 +08:00 |
|
joylink_cuiweidong
|
0db73aba5f
|
剧本编制页面结构调整
|
2019-08-20 13:21:38 +08:00 |
|
zyy
|
e376b141cf
|
desc: 国际化
|
2019-08-20 13:14:02 +08:00 |
|
ival
|
468e624383
|
修改页面布局问题
|
2019-08-20 13:03:39 +08:00 |
|
ival
|
424482dd4b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 12:47:53 +08:00 |
|
ival
|
21a0110966
|
增加录制脚本页面布局
|
2019-08-20 12:47:39 +08:00 |
|
zyy
|
3783eedeb7
|
desc: 删除多余列车模型
|
2019-08-20 11:18:59 +08:00 |
|
zyy
|
2f0519488f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue
|
2019-08-20 11:17:50 +08:00 |
|
zyy
|
74fea0b56e
|
desc: 调整地图绘制样式
|
2019-08-20 11:17:08 +08:00 |
|
ival
|
adc6828060
|
修改跳转路由后，页面不加载的问题
|
2019-08-20 10:34:41 +08:00 |
|
ival
|
c718ea2f41
|
修改综合演练加入房间未加载地图的问题
|
2019-08-20 10:23:59 +08:00 |
|
ival
|
28c6e05c41
|
修改获取列车数据没有刷新，导致加载的问题
|
2019-08-20 09:55:49 +08:00 |
|
ival
|
0926e6e2d2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 09:13:16 +08:00 |
|
ival
|
8c4efb83db
|
修改国际化导致的界面布局问题
|
2019-08-20 09:12:54 +08:00 |
|
fan
|
969bb89192
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-19 20:27:43 +08:00 |
|
fan
|
36a1f8e878
|
调整: 快速入口调整
|
2019-08-19 20:27:23 +08:00 |
|
joylink_cuiweidong
|
d71e42a84d
|
剧本编制模块表单修改
|
2019-08-19 19:42:17 +08:00 |
|
joylink_cuiweidong
|
21e32aa823
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 19:38:17 +08:00 |
|
joylink_cuiweidong
|
d7bf9a172c
|
剧本编制模块修改
|
2019-08-19 19:37:52 +08:00 |
|
fan
|
442b3fd686
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-19 19:32:23 +08:00 |
|
fan
|
3e0282784b
|
调整: 加载剧本button 文字调整
|
2019-08-19 19:32:08 +08:00 |
|
ival
|
8ca232549f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/orderauthor/order/draft.vue
|
2019-08-19 18:51:17 +08:00 |
|
ival
|
67cf6f5a29
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/orderAuthor.js
# src/i18n/langs/en/rules.js
# src/i18n/langs/zh/orderAuthor.js
# src/i18n/langs/zh/rules.js
# src/views/orderauthor/commodity/index.vue
# src/views/orderauthor/order/draft.vue
|
2019-08-19 18:49:40 +08:00 |
|
fan
|
25bdd09388
|
调整: 国际化样式调整
|
2019-08-19 18:44:50 +08:00 |
|
ival
|
68e7eaeeb6
|
修改字典菜单的国际化
|
2019-08-19 18:42:53 +08:00 |
|
fan
|
b78e6ad278
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-19 18:31:41 +08:00 |
|
fan
|
c5ecf86107
|
调整: 国际化+成都三号线人工车显示
|
2019-08-19 18:31:13 +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 |
|
fan
|
cdf021cca9
|
调整： 处理冲突
|
2019-08-19 16:39:48 +08:00 |
|
fan
|
dd11b6fed6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/rules.js
|
2019-08-19 16:39:20 +08:00 |
|
fan
|
c91a4efdcc
|
修改：国际化调整
|
2019-08-19 16:35:27 +08:00 |
|
ival
|
70e1236099
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 15:59:16 +08:00 |
|
ival
|
ae500285ba
|
修改实训加载顺序错误的问题
|
2019-08-19 15:59:04 +08:00 |
|
zyy
|
921f67938e
|
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-08-19 15:54:53 +08:00 |
|
zyy
|
a6b8d8a21a
|
desc: 删除重复的国际化标识， 国际化翻译
|
2019-08-19 15:53:14 +08:00 |
|
fan
|
30433bfcd0
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-19 15:47:07 +08:00 |
|
fan
|
d0f7bd46a9
|
修改：国际化调整
|
2019-08-19 15:46:52 +08:00 |
|
ival
|
2d8f94f47a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 15:19:50 +08:00 |
|
ival
|
94f3659cf3
|
修改国际化
|
2019-08-19 15:19:33 +08:00 |
|
zyy
|
91b2674de4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 15:06:53 +08:00 |
|
zyy
|
fdfa413567
|
desc: 调整国际化翻译
|
2019-08-19 15:06:47 +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 |
|
joylink_cuiweidong
|
43dfc04281
|
定时保存数据
剧本编制页面修改
|
2019-08-19 14:09:08 +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 |
|
zyy
|
7a7690e898
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 14:01:51 +08:00 |
|
zyy
|
fd5ab1f30d
|
desc: 地图绘制 逻辑修改
|
2019-08-19 14:01:45 +08:00 |
|
fan
|
a669d093b1
|
修改：删除全局loading
|
2019-08-19 13:27:15 +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 |
|
zyy
|
138dfe5e06
|
desc: 修改地图绘制图层配置， 调整道岔时间显示
|
2019-08-19 11:18:46 +08:00 |
|
ival
|
4da9dc977b
|
修改右键菜单，文字颜色
|
2019-08-19 11:16:29 +08:00 |
|
ival
|
068dbdbbde
|
修改代码
|
2019-08-19 10:58:14 +08:00 |
|
ival
|
d083482b10
|
修改代码
|
2019-08-19 10:31:11 +08:00 |
|
ival
|
00f0fd84a3
|
修改车站公里表隐藏的问题
|
2019-08-19 09:38:11 +08:00 |
|
ival
|
54425befb2
|
界面调整
|
2019-08-19 09:15:25 +08:00 |
|
ival
|
44aa6442f0
|
权限条形图分类
|
2019-08-18 21:12:38 +08:00 |
|
joylink_cuiweidong
|
f7736543a5
|
修改剧本动作的样式
|
2019-08-16 20:06:14 +08:00 |
|
joylink_cuiweidong
|
08d00d3f93
|
修改 动作列表展现
|
2019-08-16 19:33:40 +08:00 |
|
fan
|
8f1755162b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 19:28:09 +08:00 |
|
fan
|
5f3237dbc3
|
修改：代码调整
|
2019-08-16 19:27:01 +08:00 |
|
ival
|
e0a7a5d0fc
|
修改权限配置
|
2019-08-16 19:09:44 +08:00 |
|
ival
|
01c9ac1c20
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 18:59:30 +08:00 |
|
ival
|
c99394ea51
|
修改主页配置
|
2019-08-16 18:59:19 +08:00 |
|
sunzhenyu
|
d5aa08dd72
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-08-16 18:38:44 +08:00 |
|
sunzhenyu
|
ab23d7932a
|
修改mmi接收操作模拟器消息
|
2019-08-16 18:38:35 +08:00 |
|
zyy
|
049ed8f0dd
|
desc: 调整样式
|
2019-08-16 18:23:36 +08:00 |
|
ival
|
9648263a88
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
2019-08-16 18:18:38 +08:00 |
|
ival
|
b0aade5fa2
|
修改首页显示
|
2019-08-16 18:16:19 +08:00 |
|
zyy
|
382e63c6c9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 18:02:56 +08:00 |
|
zyy
|
bb1a98507b
|
desc: 地图编辑区分绘图数据，地图数据
|
2019-08-16 18:02:50 +08:00 |
|
fan
|
04baa2756e
|
修改：代码调整
|
2019-08-16 17:50:57 +08:00 |
|
fan
|
eb75c2bc3d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 17:16:10 +08:00 |
|
fan
|
8e401afe36
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 17:15:36 +08:00 |
|
fan
|
3143251d33
|
修改：配置调整
|
2019-08-16 17:15:25 +08:00 |
|
joylink_cuiweidong
|
ecefa16f5e
|
剧本编制修改
|
2019-08-16 17:15:20 +08:00 |
|
zyy
|
50e847ec57
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 17:13:18 +08:00 |
|
zyy
|
e08a400b06
|
desc: 修改琏计划运行图创建加载
|
2019-08-16 17:13:12 +08:00 |
|
ival
|
6065853adc
|
删除测试代码
|
2019-08-16 16:57:14 +08:00 |
|
ival
|
483f7ac12b
|
修改主页界面
|
2019-08-16 16:55:16 +08:00 |
|
ival
|
25e3cb19a4
|
删除运行图创建
|
2019-08-16 16:42:26 +08:00 |
|
ival
|
b2d6faa7ba
|
修改导入没有loading的问题
|
2019-08-16 16:40:02 +08:00 |
|
zyy
|
75da1291ce
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 16:34:14 +08:00 |
|
zyy
|
25493993d9
|
desc: 修改路由监听
|
2019-08-16 16:33:59 +08:00 |
|
ival
|
850b0cf248
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 16:28:22 +08:00 |
|
ival
|
8e431bade1
|
修改地图导入导出
|
2019-08-16 16:28:11 +08:00 |
|
zyy
|
e6f83a7998
|
desc: 修改地图绘制点击事件
|
2019-08-16 16:27:38 +08:00 |
|
zyy
|
7b22ab377e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 16:19:14 +08:00 |
|
zyy
|
44d021a6ec
|
desc: 修改地图绘制加载问题
|
2019-08-16 16:19:08 +08:00 |
|
fan
|
49f8ebe630
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 16:01:33 +08:00 |
|
fan
|
f5152e5807
|
修改：根据包围盒去计算识别号位置
|
2019-08-16 16:00:49 +08:00 |
|
ival
|
216b8ceab1
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 15:41:45 +08:00 |
|
ival
|
7596e980f4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 15:41:30 +08:00 |
|
fan
|
84f388b2d8
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 15:41:27 +08:00 |
|
ival
|
836c6d383a
|
修改格式，以及修改综合演练设置车站的stationCode为deviceCode
|
2019-08-16 15:41:20 +08:00 |
|
fan
|
7833208222
|
修改：列车识别号宽高比调整
|
2019-08-16 15:41:03 +08:00 |
|
zyy
|
cf84618fd4
|
desc: 修改地图点击事件问题
|
2019-08-16 15:24:41 +08:00 |
|
zyy
|
2e7715ea0a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/map/mapdraft/mapedit/index.vue
# src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
|
2019-08-16 15:13:58 +08:00 |
|
zyy
|
b84b6ea500
|
desc: 修改地图编辑页面逻辑
|
2019-08-16 15:12:03 +08:00 |
|
fan
|
df1994ecfb
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 15:03:11 +08:00 |
|
fan
|
5f2fc257f5
|
修改：剧本调整
|
2019-08-16 15:02:34 +08:00 |
|
ival
|
37390ff549
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 14:40:52 +08:00 |
|
ival
|
5612c9b1e4
|
修改主页参数
|
2019-08-16 14:40:42 +08:00 |
|
joylink_cuiweidong
|
14901a50f2
|
修改 创建剧本的跳转逻辑
编制剧本的表单重置
|
2019-08-16 14:37:42 +08:00 |
|
ival
|
aae4d4d162
|
修改车次窗的问题
|
2019-08-16 14:33:36 +08:00 |
|
ival
|
c154ab28fe
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-08-16 14:25:56 +08:00 |
|
ival
|
e152829561
|
修改车次窗不能创建的问题
|
2019-08-16 14:25: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
|
05db53a606
|
修改echarts配置
|
2019-08-15 18:44:06 +08:00 |
|
ival
|
561c86ab72
|
首页数据统计
|
2019-08-15 18:04:23 +08:00 |
|
ival
|
1720e5e19d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-15 16:19:23 +08:00 |
|
ival
|
4917108e3e
|
修改绘图card被撑开的问题
|
2019-08-15 16:19:03 +08:00 |
|
zyy
|
300d1f9638
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-15 16:11:16 +08:00 |
|
zyy
|
ecc9806d61
|
desc: 修改地图配置
|
2019-08-15 16:11:09 +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 |
|
ival
|
11658a283e
|
修改主页
|
2019-08-15 15:53:11 +08:00 |
|
fan
|
0b3ad87bc3
|
创建仿真失败时关闭loading
|
2019-08-15 15:21:28 +08:00 |
|
ival
|
4519d753e3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-15 14:28:47 +08:00 |
|
ival
|
d4ba56d31d
|
修该查询进路的接口
|
2019-08-15 14:28:31 +08:00 |
|
joylink_cuiweidong
|
2e53745790
|
剧本管理模块
|
2019-08-15 14:06:53 +08:00 |
|
fan
|
9787c8aaeb
|
调整：国际化
|
2019-08-15 10:47:59 +08:00 |
|
fan
|
1b42eec5e3
|
调整：国际化
|
2019-08-15 10:37:47 +08:00 |
|
fan
|
951fdd9719
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/zh/map.js
# src/i18n/langs/zh/tip.js
# src/views/map/product/draft.vue
# src/views/map/product/list.vue
# src/views/map/skinStyle/draft.vue
# src/views/map/skinStyle/index.vue
|
2019-08-15 10:34:31 +08:00 |
|
zyy
|
7cabec1c1f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-15 10:26:37 +08:00 |
|
zyy
|
fad339f977
|
desc: 调整地图绘制国际化
|
2019-08-15 10:26:29 +08:00 |
|
fan
|
414000331e
|
调整：国际化
|
2019-08-15 09:45:31 +08:00 |
|
joylink_cuiweidong
|
ca7b21e61e
|
修改剧本管理界面
|
2019-08-15 09:04:17 +08:00 |
|
ival
|
68c8757dad
|
修改配置
|
2019-08-15 08:58:21 +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
|
eef2fed8a2
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-14 16:15:50 +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
|
6ea6c8a2e9
|
修改代码
|
2019-08-14 15:28:15 +08:00 |
|
ival
|
230d118d30
|
修改name错误的问题
|
2019-08-14 15:25:01 +08:00 |
|
ival
|
4886587d2d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/map/mapdraft/mapedit/routeoperate/detail.vue
|
2019-08-14 15:21:06 +08:00 |
|
ival
|
72d3a5f475
|
修改进路查询方式
|
2019-08-14 15:19:11 +08:00 |
|
zyy
|
c304af4811
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-14 15:03:47 +08:00 |
|
zyy
|
3dd56879a4
|
desc: 修改国际化，调整角色显示
|
2019-08-14 15:03:41 +08:00 |
|
ival
|
4a224b630f
|
增加首先显示
|
2019-08-14 14:52:21 +08:00 |
|
ival
|
6343a79f81
|
修改接口
|
2019-08-14 14:01:28 +08:00 |
|
ival
|
72c1f1d4ca
|
修改搜索
|
2019-08-14 13:48:06 +08:00 |
|
ival
|
c61a673513
|
修改添加
|
2019-08-14 13:42:35 +08:00 |
|
ival
|
ed05cb123e
|
修改类车添加功能
|
2019-08-14 13:38:28 +08:00 |
|
ival
|
576ac7eacb
|
修改导航配置
|
2019-08-14 10:36:55 +08:00 |
|
ival
|
25479392ff
|
修改配置
|
2019-08-14 10:12:51 +08:00 |
|
ival
|
d8480207aa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-14 09:35:52 +08:00 |
|
ival
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
ival
|
4e88c02363
|
修改目录结构
|
2019-08-14 09:33:24 +08:00 |
|
zyy
|
9a4e982c08
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-13 18:43:40 +08:00 |
|
zyy
|
aa63be299b
|
desc: 增加地图编辑 国际化
|
2019-08-13 18:43:34 +08:00 |
|
fan
|
8c799d7ee6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-13 18:32:48 +08:00 |
|
fan
|
3a0202a1e9
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-13 18:27:09 +08:00 |
|
ival
|
e0d76d03c5
|
修改运行图右键菜单
|
2019-08-13 18:26:36 +08:00 |
|
ival
|
45417f0072
|
修改代码
|
2019-08-13 18:14:19 +08:00 |
|
fan
|
2ab09d664f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-13 18:12:14 +08:00 |
|
fan
|
a3ecc1dfc6
|
调整：国际化
|
2019-08-13 18:11:58 +08:00 |
|
ival
|
b84f1fe553
|
运行图修改接口
|
2019-08-13 17:46:59 +08:00 |
|
ival
|
fc4cf549b2
|
切换系统语言
|
2019-08-13 17:33:46 +08:00 |
|
ival
|
db109f2a9e
|
调整地图进路相关的接口
|
2019-08-13 16:59:38 +08:00 |
|
sunzhenyu
|
49c3c19c83
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-13 16:23:52 +08:00 |
|
sunzhenyu
|
39002937e1
|
调整文件结构
|
2019-08-13 16:23:46 +08:00 |
|
zyy
|
c817cdea7a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-13 15:54:32 +08:00 |
|
zyy
|
9049d793cc
|
desc: 修改琏计划界面样式，修改界面交互
|
2019-08-13 15:54:26 +08:00 |
|
ival
|
cf66728bc7
|
修改切换route报错的问题
|
2019-08-13 13:34:39 +08:00 |
|
ival
|
346459e43a
|
修改配置
|
2019-08-13 11:15:39 +08:00 |
|
ival
|
d14d3b3221
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/error.js
# src/i18n/langs/en/global.js
# src/i18n/langs/zh/error.js
# src/i18n/langs/zh/global.js
|
2019-08-13 11:13:27 +08:00 |
|
ival
|
0eaa4dbe1f
|
修改国际化配置
|
2019-08-13 11:10:55 +08:00 |
|
sunzhenyu
|
8749644fa8
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-13 09:49:46 +08:00 |
|
fan
|
819c46789b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-13 09:20:59 +08:00 |
|
fan
|
8725104c7b
|
调整：国际化
|
2019-08-13 09:20:49 +08:00 |
|
ival
|
61fe3c2b2d
|
调整回放界面布局
|
2019-08-13 09:09:10 +08:00 |
|
fan
|
e0b7994b80
|
Merge branch 'master_loading2' into dev
# Conflicts:
# src/i18n/langs/en/tip.js
# src/i18n/langs/zh/tip.js
|
2019-08-13 09:02:46 +08:00 |
|
fan
|
e1c6d00a18
|
Merge branch 'master' into dev
|
2019-08-12 20:17:53 +08:00 |
|
fan
|
e1bd3c8b22
|
剧本调整
|
2019-08-12 20:11:23 +08:00 |
|
joylink_cuiweidong
|
e105327af6
|
加载剧本调整
|
2019-08-12 20:04:53 +08:00 |
|
joylink_cuiweidong
|
45d0cb0a12
|
加载剧本列表数据显示修改
|
2019-08-12 19:30:50 +08:00 |
|
ival
|
5cd6150c16
|
修改required未定义的问题
|
2019-08-12 19:02:38 +08:00 |
|
fan
|
13d7e5df8b
|
调整：国际化
|
2019-08-12 18:54:32 +08:00 |
|
sunzhenyu
|
74527e79fe
|
修改三维view文件结构
|
2019-08-12 18:37:43 +08:00 |
|
ival
|
a779d6ad29
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
2019-08-12 18:30:33 +08:00 |
|
ival
|
6785738122
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 18:22:29 +08:00 |
|
ival
|
dc0b5301e0
|
增加导出部分地图数据
|
2019-08-12 18:22:14 +08:00 |
|
joylink_cuiweidong
|
19d26919fc
|
处理录制剧本时地图不加载的问题
|
2019-08-12 17:35:55 +08:00 |
|
ival
|
bce66f2f22
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 15:39:44 +08:00 |
|
ival
|
dbd1193679
|
修改登录涟计划以及大屏等其他系统时，主系统也跳转的问题
|
2019-08-12 15:39:29 +08:00 |
|
zyy
|
e7d1f478be
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 15:19:33 +08:00 |
|
zyy
|
fcb6076d64
|
desc: 增加地图编辑国际化
|
2019-08-12 15:19:26 +08:00 |
|
joylink_cuiweidong
|
1b01141b88
|
修改剧本编辑 字段名称
|
2019-08-12 14:21:32 +08:00 |
|
sunzhenyu
|
2cbf0f0452
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-12 14:12:16 +08:00 |
|
sunzhenyu
|
da5bc03838
|
修改错误引用
|
2019-08-12 14:12:12 +08:00 |
|
ival
|
9c51afb419
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 14:10:57 +08:00 |
|
ival
|
be91b4f1c6
|
修改语言
|
2019-08-12 14:10:46 +08:00 |
|
fan
|
df1697e137
|
调整：代码修改
|
2019-08-12 14:08:16 +08:00 |
|
ival
|
0289ddf5d1
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 14:05:12 +08:00 |
|
ival
|
ffd23c3adb
|
修改配置
|
2019-08-12 14:04:57 +08:00 |
|
sunzhenyu
|
46d776a642
|
pull
|
2019-08-12 13:43:40 +08:00 |
|
sunzhenyu
|
de7ee56d77
|
删除不用资源
|
2019-08-12 13:42:53 +08:00 |
|
fan
|
6f7d87b72c
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2
|
2019-08-12 13:40:55 +08:00 |
|
fan
|
0b5cfcc9a7
|
调整：代码修改
|
2019-08-12 13:40:34 +08:00 |
|
joylink_cuiweidong
|
47b2be3a8b
|
剧本创建修改查询接口调整
|
2019-08-12 11:31:43 +08:00 |
|
ival
|
914b5d4e0e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 11:01:13 +08:00 |
|
ival
|
0bc9d40ad1
|
修改打包配置
|
2019-08-12 11:01:00 +08:00 |
|
fan
|
9623c98994
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2
|
2019-08-12 10:59:28 +08:00 |
|
fan
|
a9d00b042e
|
调整：代码修改
|
2019-08-12 10:57:38 +08:00 |
|
ival
|
98e6755aba
|
修改解析错误的问题
|
2019-08-12 10:41:24 +08:00 |
|
ival
|
21778c7f7c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 10:19:11 +08:00 |
|
ival
|
52e9b1f79f
|
增加国际化配置
|
2019-08-12 10:18:59 +08:00 |
|
fan
|
358b3cf6d0
|
调整：代码修改
|
2019-08-12 10:14:19 +08:00 |
|
ival
|
94e16353f3
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 09:36:43 +08:00 |
|
ival
|
fc6279efdf
|
修改加载方式
|
2019-08-12 09:36:27 +08:00 |
|
joylink_cuiweidong
|
f1b3906973
|
任务目标模块国际化
|
2019-08-09 19:00:37 +08:00 |
|
ival
|
6d960f82e2
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-09 18:29:26 +08:00 |
|
ival
|
763cff0a7c
|
修改页面不刷新的问题
|
2019-08-09 18:29:08 +08:00 |
|
joylink_cuiweidong
|
ddd282f5ca
|
国际化修改
|
2019-08-09 18:24:13 +08:00 |
|
joylink_cuiweidong
|
b82393366c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/index.js
|
2019-08-09 18:20:34 +08:00 |
|
zyy
|
ff44562b2c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-09 17:41:20 +08:00 |
|
zyy
|
7cde547775
|
desc: 增加英文文件内容
|
2019-08-09 17:40:53 +08:00 |
|
fan
|
367edf0118
|
调整：代码修改
|
2019-08-09 17:38:20 +08:00 |
|
fan
|
19eb3314c8
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2
|
2019-08-09 17:37:24 +08:00 |
|
zyy
|
ca0cdeb7f9
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/i18n/langs/zh/index.js
|
2019-08-09 17:37:12 +08:00 |
|
zyy
|
374bf96525
|
desc: 增加规则，提示信息国际化
|
2019-08-09 17:36: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 |
|
joylink_cuiweidong
|
6951bf9f3a
|
页面样式修改
国际化添加
|
2019-08-09 17:26:33 +08:00 |
|
ival
|
bfddddf7e6
|
修改代码
|
2019-08-09 17:25:45 +08:00 |
|
ival
|
b208926795
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-09 16:57:28 +08:00 |
|
ival
|
6fad38621b
|
修改运行图编辑因为家在地图数据而报错的问题
|
2019-08-09 16:57:07 +08:00 |
|
fan
|
74f7785663
|
调整：限制仿真多次加载
|
2019-08-09 15:52:55 +08:00 |
|
zyy
|
fdd28f3c45
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/index.js
|
2019-08-09 15:41:39 +08:00 |
|
zyy
|
de5ca5225a
|
desc: 配置地图国际化语言
|
2019-08-09 15:40:33 +08:00 |
|
ival
|
378be47db0
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
2019-08-09 15:24:05 +08:00 |
|
ival
|
e466d49036
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-09 15:23:14 +08:00 |
|
ival
|
32a75526ee
|
修改导入
|
2019-08-09 15:23:01 +08:00 |
|
fan
|
40b71c5a4d
|
调整：代码修改
|
2019-08-09 15:17:19 +08:00 |
|
ival
|
05aa351a85
|
修改代码
|
2019-08-09 15:13:16 +08:00 |
|
ival
|
be0b7f7a2f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-09 15:10:28 +08:00 |
|
ival
|
7af324ab1e
|
国际化配置
|
2019-08-09 15:10:13 +08:00 |
|
joylink_cuiweidong
|
fe38c3dfb1
|
代码调整
|
2019-08-09 10:33:11 +08:00 |
|
ival
|
2db20932e1
|
精简配置
|
2019-08-09 10:10:26 +08:00 |
|
ival
|
66a13e6ede
|
修改运行图
|
2019-08-09 09:33:35 +08:00 |
|
ival
|
b89d99f2a5
|
修改i18n语言层次
|
2019-08-09 09:31:09 +08:00 |
|
joylink_cuiweidong
|
bf9a92d6b7
|
代码调整
|
2019-08-08 18:41:44 +08:00 |
|
joylink_cuiweidong
|
50c57837eb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 18:39:05 +08:00 |
|
zyy
|
a288a21456
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 18:34:41 +08:00 |
|
zyy
|
b20686c0fa
|
desc: 修改 订阅综合演练房间号发送判断，修改代码格式
|
2019-08-08 18:34:35 +08:00 |
|
ival
|
c89c781735
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 18:09:52 +08:00 |
|
ival
|
4f9478d495
|
修改代码格式
|
2019-08-08 18:09:10 +08:00 |
|
fan
|
62d9b6fc5d
|
调整：title修改
|
2019-08-08 18:00:30 +08:00 |
|
joylink_cuiweidong
|
7abbadd603
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 17:33:18 +08:00 |
|
joylink_cuiweidong
|
ee136f8867
|
获取剧本的地图定位并设置
|
2019-08-08 17:32:38 +08:00 |
|
fan
|
212fce48bb
|
调整：代码调整
|
2019-08-08 17:26:50 +08:00 |
|
fan
|
a504f3cd90
|
调整：剧本加载页面位置跳转
|
2019-08-08 17:06:18 +08:00 |
|
joylink_cuiweidong
|
73a7780118
|
更新定位
|
2019-08-08 16:56:34 +08:00 |
|
zyy
|
399006e31f
|
desc: 修改传入select默认值
|
2019-08-08 16:54:49 +08:00 |
|
zyy
|
40ab6b247b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/beijing_01/menus/index.vue
|
2019-08-08 16:48:06 +08:00 |
|
zyy
|
6c5469ec90
|
修改代码格式
|
2019-08-08 16:47:34 +08:00 |
|
fan
|
6c7c08483f
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 16:45:37 +08:00 |
|
fan
|
aac75df8f7
|
调整：控制模式模式跳转disable状态调整
|
2019-08-08 16:45:22 +08:00 |
|
ival
|
01b871fa77
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 16:37:31 +08:00 |
|
ival
|
3adc1aafb1
|
修改界面菜单栏加载后出发 缩放按钮重新调整位置
删除代码中的无用代码
|
2019-08-08 16:37:15 +08:00 |
|
fan
|
b7679a6337
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 16:26:54 +08:00 |
|
fan
|
e379696f46
|
调整：位置跳转测试
|
2019-08-08 16:26:34 +08:00 |
|
zyy
|
a250833772
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 16:03:15 +08:00 |
|
zyy
|
ff101dd603
|
删除debugger
|
2019-08-08 16:02:58 +08:00 |
|
fan
|
503991a758
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 15:59:17 +08:00 |
|
fan
|
4a36ed4d3e
|
调整：修改修改列车识别号操作
|
2019-08-08 15:59:07 +08:00 |
|
zyy
|
4068555199
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 15:57:42 +08:00 |
|
zyy
|
c3f600b015
|
优化代码
|
2019-08-08 15:57:36 +08:00 |
|
joylink_cuiweidong
|
66c0939e6c
|
代码调整
|
2019-08-08 15:48:43 +08:00 |
|
zyy
|
b67a37bc33
|
desc: 修改查询问题
|
2019-08-08 15:27:30 +08:00 |
|
zyy
|
837ba489b6
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 14:47:39 +08:00 |
|
zyy
|
2443fd102c
|
desc: 调整站台字段
|
2019-08-08 14:47:34 +08:00 |
|
fan
|
33844220d3
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 14:37:39 +08:00 |
|
fan
|
289bffb435
|
调整：代码迁移(暂时注释掉位置跳转)
|
2019-08-08 14:36:57 +08:00 |
|
ival
|
842c7f9df2
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 14:32:47 +08:00 |
|
ival
|
66c599c0da
|
修改格式问题
|
2019-08-08 14:32:32 +08:00 |
|
sunzhenyu
|
f95b9eb1b7
|
merge
|
2019-08-08 14:20:00 +08:00 |
|
sunzhenyu
|
2aa7bfd759
|
修改js挂载
|
2019-08-08 14:19:03 +08:00 |
|
zyy
|
debecfba5a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 14:08:09 +08:00 |
|
zyy
|
ea67901aa1
|
修改格式
|
2019-08-08 14:08:02 +08:00 |
|
fan
|
6b21fefaeb
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 13:47:39 +08:00 |
|
fan
|
bcf73c78c2
|
调整：代码迁移+列车调整
|
2019-08-08 13:47:30 +08:00 |
|
ival
|
dbc3cbf482
|
修改运行图编辑工具报错bug
|
2019-08-08 13:36:53 +08:00 |
|
ival
|
45295404c3
|
1. 修改福州线，取消扣车被禁用的问题
2. 修改i18n的获取当前语言的函数
|
2019-08-08 13:23:54 +08:00 |
|
ival
|
7a41260bae
|
增加国际化配置
|
2019-08-08 11:33:06 +08:00 |
|
ival
|
b15a7feb23
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/main.js
|
2019-08-08 11:31:36 +08:00 |
|
ival
|
c66d72a049
|
增加i18n国际化配置
|
2019-08-08 11:29:03 +08:00 |
|
zyy
|
577aaab9b9
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 11:11:38 +08:00 |
|
zyy
|
0a010eca04
|
修改格式
|
2019-08-08 11:11:32 +08:00 |
|
sunzhenyu
|
b326cbf73f
|
push
|
2019-08-08 10:53:19 +08:00 |
|
sunzhenyu
|
6da9552dc7
|
pull
|
2019-08-08 10:52:43 +08:00 |
|
sunzhenyu
|
9f9236361a
|
修改threejs挂载
|
2019-08-08 10:52:06 +08:00 |
|
joylink_cuiweidong
|
b166dbd769
|
剧本 任务录制模块提交
|
2019-08-08 10:31:46 +08:00 |
|
zyy
|
d014007d25
|
desc: 修改仿真系统，教学系统，考试系统默认首页设置
|
2019-08-08 10:16:14 +08:00 |
|
zyy
|
af61917dbf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/factory.js
|
2019-08-08 09:48:14 +08:00 |
|
zyy
|
f231ffd6f1
|
desc: 增加成都四号线地图配置
|
2019-08-08 09:47:39 +08:00 |
|
ival
|
9ffce4d702
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 09:37:46 +08:00 |
|
ival
|
c855925ae3
|
修改配置
|
2019-08-08 09:37:35 +08:00 |
|
fan
|
05e4fd73bb
|
调整：列车调整
|
2019-08-08 09:35:28 +08:00 |
|
zyy
|
fe9b59e2de
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-07 16:23:11 +08:00 |
|
zyy
|
d70953a130
|
desc: 增加成都四号线模型， 修改地图删除逻辑
|
2019-08-07 16:23:04 +08:00 |
|
ival
|
0cbe7901c7
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-07 15:32:50 +08:00 |
|
ival
|
7feea79e44
|
成都三号线运行图解析
|
2019-08-07 15:32:35 +08:00 |
|
sunzhenyu
|
e86be938f3
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-07 11:29:03 +08:00 |
|
sunzhenyu
|
5899fe1347
|
修改界面自适应
|
2019-08-07 11:28:46 +08:00 |
|
zyy
|
83faa429fe
|
修改列车详情显示问题
|
2019-08-07 11:22:33 +08:00 |
|
zyy
|
f492d38c47
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-07 10:24:21 +08:00 |
|
zyy
|
e3a8d5c525
|
desc: 修改代码
|
2019-08-07 10:24:13 +08:00 |
|
ival
|
3751748979
|
修改lz zc 等鼠标事件统一接口处理
|
2019-08-07 09:16:55 +08:00 |
|
ival
|
a02a948f17
|
修改bug
|
2019-08-06 18:42:18 +08:00 |
|
ival
|
165362dfcb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-06 17:46:55 +08:00 |
|
ival
|
b6baa2e420
|
修改 设置设备名称的设置方法
|
2019-08-06 17:46:41 +08:00 |
|
sunzhenyu
|
7edaf938c7
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-06 17:28:17 +08:00 |
|
zyy
|
888756dc35
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Section/EMouse.js
|
2019-08-06 17:02:32 +08:00 |
|
zyy
|
37c13f6672
|
调整代码格式，福州线状态处理
|
2019-08-06 17:02:04 +08:00 |
|
ival
|
167e483b10
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-06 17:00:36 +08:00 |
|
ival
|
f85139b4ae
|
修改鼠标关联操作
|
2019-08-06 17:00:24 +08:00 |
|
sunzhenyu
|
c27aed050f
|
挂载threejs，添加静态文件插件
|
2019-08-06 14:10:21 +08:00 |
|
zyy
|
e4364c600e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-06 13:56:48 +08:00 |
|
zyy
|
8fe358896e
|
desc: 修改车次窗菜单BUG
|
2019-08-06 13:56:42 +08:00 |
|
ival
|
86c5a5f58f
|
抽离车次窗配置
|
2019-08-06 13:19:30 +08:00 |
|
ival
|
7573e30a31
|
修改皮肤配置
|
2019-08-06 13:09:11 +08:00 |
|
ival
|
d4b995675d
|
提出字体粗细配置
|
2019-08-06 13:02:55 +08:00 |
|
zyy
|
e71c68f7bc
|
修改signal 状态管理
|
2019-08-06 10:54:22 +08:00 |
|
zyy
|
71381ff174
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-06 10:11:43 +08:00 |
|
zyy
|
98a0533b20
|
修改代码格式
|
2019-08-06 10:11:32 +08:00 |
|
ival
|
ea0a3b9d16
|
修改默认选中状态，无未选中
|
2019-08-06 09:32:55 +08:00 |
|
ival
|
2ee8e24897
|
增加鼠标操作
|
2019-08-06 09:27:12 +08:00 |
|
ival
|
3ae415d6e9
|
修改背景线，鼠标特效
|
2019-08-05 18:42:37 +08:00 |
|
ival
|
530a1c473e
|
修改 代码接口名称
|
2019-08-05 17:46:41 +08:00 |
|
ival
|
44481b2cbb
|
修改代码bug
|
2019-08-05 17:36:16 +08:00 |
|
ival
|
fb33bde94c
|
设置状态时，无需关注model变化，render时，model已经引用到view上
|
2019-08-05 17:24:20 +08:00 |
|
ival
|
78e7e344aa
|
修改操作问题
|
2019-08-05 17:09:16 +08:00 |
|
ival
|
79bd163d8f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 16:55:47 +08:00 |
|
ival
|
d2887ee34e
|
调整道岔名称的y轴设置
|
2019-08-05 16:55:36 +08:00 |
|
zyy
|
d7a80d3bc3
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 16:43:59 +08:00 |
|
zyy
|
87177a347b
|
desc: 修改代码
|
2019-08-05 16:43:52 +08:00 |
|
ival
|
b8fb7fc210
|
修改代码
|
2019-08-05 16:21:43 +08:00 |
|
ival
|
1e5ad7e522
|
修改bug
|
2019-08-05 16:17:46 +08:00 |
|
ival
|
efa91ae5a0
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 16:14:53 +08:00 |
|
ival
|
7c526a94c6
|
修改代码
|
2019-08-05 16:14:40 +08:00 |
|
fan
|
6bc62094ba
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
|
2019-08-05 15:20:04 +08:00 |
|
fan
|
dbc16a1172
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
# Conflicts:
# src/jmap/config/skinStyle/chengdu_03.js
|
2019-08-05 15:19:32 +08:00 |
|
fan
|
a55ab7b57e
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
# Conflicts:
# src/jmap/config/skinStyle/chengdu_03.js
|
2019-08-05 15:18:40 +08:00 |
|
fan
|
fd8b2402ad
|
调整：列车成都线调整
|
2019-08-05 15:13:49 +08:00 |
|
ival
|
9792a2547a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 15:13:41 +08:00 |
|
ival
|
6f73920532
|
增加信号机变现变化处理
|
2019-08-05 15:13:31 +08:00 |
|
zyy
|
386f79128a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 15:12:13 +08:00 |
|
zyy
|
d45c154fe0
|
修改代码
|
2019-08-05 15:12:06 +08:00 |
|
ival
|
555664aaeb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 15:01:03 +08:00 |
|
ival
|
042e6c0e59
|
修改区段名称的问题
|
2019-08-05 15:00:51 +08:00 |
|
fan
|
824c6ed834
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
|
2019-08-05 13:36:14 +08:00 |
|
fan
|
15d0ea03e5
|
调整：列车调整
|
2019-08-05 13:36:00 +08:00 |
|
zyy
|
6b5c1790c6
|
修改代码
|
2019-08-05 10:36:41 +08:00 |
|
zyy
|
f37f441d33
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/skinStyle/bejing_01.js
# src/jmap/config/skinStyle/fuzhou_01.js
|
2019-08-05 10:36:28 +08:00 |
|
zyy
|
5134feec56
|
desc: 修改代码
|
2019-08-05 10:33:31 +08:00 |
|
ival
|
5e8f1899ff
|
修改代码
|
2019-08-05 09:59:08 +08:00 |
|
ival
|
dd9c8220b1
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 09:58:45 +08:00 |
|
ival
|
711534599f
|
修改代码
|
2019-08-05 09:58:33 +08:00 |
|
fan
|
072495709a
|
调整：列车配置项结构调整
|
2019-08-05 09:36:15 +08:00 |
|
fan
|
ee16c35aaa
|
调整：standControl调整
|
2019-08-05 08:42:45 +08:00 |
|
ival
|
1e6a5510ac
|
修改格式
|
2019-08-02 18:09:25 +08:00 |
|
ival
|
ad6e98da39
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-02 18:05:17 +08:00 |
|
ival
|
77db948f68
|
修改皮肤配置
|
2019-08-02 18:05:08 +08:00 |
|
fan
|
9c51e10ec1
|
调整：皮肤调整
|
2019-08-02 17:57:14 +08:00 |
|
fan
|
e385704360
|
调整：代码修改
|
2019-08-02 17:41:12 +08:00 |
|
fan
|
7dec924ac4
|
调整：代码修改
|
2019-08-02 17:38:21 +08:00 |
|
fan
|
ce5600c173
|
调整：代码修改
|
2019-08-02 17:22:23 +08:00 |
|
fan
|
b7e021d737
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/skinStyle/chengdu_03.js
|
2019-08-02 17:14:21 +08:00 |
|
fan
|
af0fd392d1
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/skinStyle/chengdu_03.js
|
2019-08-02 17:14:02 +08:00 |
|
fan
|
44a1d197cb
|
调整：代码调整
|
2019-08-02 17:06:37 +08:00 |
|
ival
|
803dd3f823
|
修改皮肤配置
|
2019-08-02 17:02:43 +08:00 |
|
fan
|
33c71a20f6
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-02 16:31:49 +08:00 |
|
ival
|
347db0d6eb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-02 14:55:02 +08:00 |
|
ival
|
e64a26f621
|
修改eventBus大小问题
|
2019-08-02 14:54:51 +08:00 |
|
fan
|
3ad9becbd8
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-02 14:38:27 +08:00 |
|
fan
|
02ba15964c
|
调整：代码调整
|
2019-08-02 14:38:05 +08:00 |
|
zyy
|
0b93d7ef16
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/utils/baseUrl.js
# src/views/map/runplan/manage/operateMenu.vue
|
2019-08-02 14:32:42 +08:00 |
|
zyy
|
4cf032df11
|
desc: 增加区段折返箭头代码
|
2019-08-02 14:31:29 +08:00 |
|
fan
|
0abe6e61e6
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-02 14:29:43 +08:00 |
|
ival
|
b1db745ed6
|
修改 zc不显示
|
2019-08-02 14:29:18 +08:00 |
|
fan
|
92bdbf7a99
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-02 14:26:58 +08:00 |
|
fan
|
d68daaa837
|
调整：代码调整
|
2019-08-02 14:26:50 +08:00 |
|
ival
|
543b05f848
|
修改配置
|
2019-08-02 14:23:37 +08:00 |
|
ival
|
dd5218dae5
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jlmap/index.vue
# src/views/map/runplan/manage/operateMenu.vue
|
2019-08-02 14:19:06 +08:00 |
|
ival
|
60aa181598
|
修改皮肤配置
|
2019-08-02 14:17:43 +08:00 |
|
zyy
|
4ff4d812a9
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-02 10:58:34 +08:00 |
|
zyy
|
a010f71252
|
调整运行图加载， eventbus代码调整
|
2019-08-02 10:58:28 +08:00 |
|
fan
|
7162f5ce42
|
调整：stationControl调整
|
2019-08-02 10:39:59 +08:00 |
|
zyy
|
04e13a7a73
|
调整代码
|
2019-08-02 10:36:17 +08:00 |
|
zyy
|
ff9e69585d
|
desc: 调整剧本加载，删除城市注释
|
2019-08-01 15:19:24 +08:00 |
|
fan
|
4be4c87327
|
调整：福州control调整
|
2019-08-01 09:57:29 +08:00 |
|
fan
|
cba988e5d3
|
调整：仿真管理地图列表页调整
|
2019-08-01 08:50:24 +08:00 |
|
zyy
|
7bba3d49d6
|
desc: 修改代码
|
2019-07-31 19:09:45 +08:00 |
|
zyy
|
5af196522e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-31 18:46:51 +08:00 |
|
zyy
|
99bcfa56ac
|
修改代码
|
2019-07-31 18:46:37 +08:00 |
|
fan
|
0d379faf11
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/LcControl/index.js
# src/jmap/shape/LimitControl/index.js
# src/jmap/shape/StationControl/index.js
# src/jmap/shape/ZcControl/index.js
|
2019-07-31 18:39:08 +08:00 |
|
fan
|
a03798a748
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/LcControl/index.js
# src/jmap/shape/LimitControl/index.js
# src/jmap/shape/StationControl/index.js
# src/jmap/shape/ZcControl/index.js
|
2019-07-31 18:38:29 +08:00 |
|
fan
|
0fc306714b
|
调整：control增加悬浮移出事件
|
2019-07-31 18:24:28 +08:00 |
|
zyy
|
cfbb21b9bb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Section/index.js
# src/jmap/shape/Switch/index.js
|
2019-07-31 18:20:39 +08:00 |
|
zyy
|
1a44bfb002
|
修改代码
|
2019-07-31 18:19:15 +08:00 |
|
ival
|
871a9fbbe2
|
修改代码
|
2019-07-31 15:54:20 +08:00 |
|
ival
|
3042cf229d
|
修改代码
|
2019-07-31 14:59:38 +08:00 |
|
fan
|
1d18028d41
|
调整：福州列车从左往右不显示
|
2019-07-31 13:56:44 +08:00 |
|
ival
|
5270c0bc2a
|
删除无用代码，增加信号机和站台鼠标代码
|
2019-07-31 11:06:14 +08:00 |
|
ival
|
0157f32fc0
|
修改加载代码
|
2019-07-31 09:13:37 +08:00 |
|
zyy
|
851c0a4a6a
|
desc: 修改代码
|
2019-07-30 18:45:32 +08:00 |
|
zyy
|
deccfc537a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-30 18:03:04 +08:00 |
|
zyy
|
09285fb326
|
修改代码
|
2019-07-30 18:02:58 +08:00 |
|
fan
|
2919ae5a15
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-07-30 17:27:39 +08:00 |
|
fan
|
dd4d83f02b
|
调整：代码调整
|
2019-07-30 17:27:29 +08:00 |
|
ival
|
b00bb22a8c
|
修改菜单状态控制
|
2019-07-30 16:57:08 +08:00 |
|
ival
|
7a71fc42ae
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-30 16:47:22 +08:00 |
|
ival
|
276f68e7bc
|
修改优化代码
|
2019-07-30 16:47:11 +08:00 |
|
zyy
|
82c49c97e2
|
调整代码
|
2019-07-30 15:52:30 +08:00 |
|
zyy
|
2099c6f8ba
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/map.js
|
2019-07-30 13:30:33 +08:00 |
|
zyy
|
d65f7fb334
|
desc: 修改代码
|
2019-07-30 13:29:54 +08:00 |
|
ival
|
66b2406d91
|
修改回拉设置bug
|
2019-07-30 12:44:51 +08:00 |
|
ival
|
9152b6a55e
|
增加 Line 和 Text 设备移植，以及调试代码
|
2019-07-30 12:37:31 +08:00 |
|
ival
|
5b4cbba9eb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-30 09:48:23 +08:00 |
|
ival
|
ce82f25422
|
修改代码
|
2019-07-30 09:48:14 +08:00 |
|
fan
|
d580c31e58
|
调整：table页form表头不生效
|
2019-07-30 09:45:52 +08:00 |
|
ival
|
0742f9b633
|
修改操作
|
2019-07-30 09:35:00 +08:00 |
|
ival
|
a59d579d57
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Signal/index.js
|
2019-07-30 09:19:18 +08:00 |
|
ival
|
ca433c2eb6
|
修改设备结构
|
2019-07-30 09:18:24 +08:00 |
|
fan
|
4b69c12542
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-07-29 18:15:11 +08:00 |
|
fan
|
42caa08fc2
|
调整：跑图调整
|
2019-07-29 18:11:33 +08:00 |
|
ival
|
33e6b6ab43
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/store/modules/map.js
|
2019-07-29 17:57:55 +08:00 |
|
ival
|
c4a6b076da
|
修改菜单处理
|
2019-07-29 17:57:00 +08:00 |
|
zyy
|
5517f5a467
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-29 17:10:37 +08:00 |
|
zyy
|
264eea1d78
|
修改 车站 道岔地图绘制 配置
|
2019-07-29 17:10:30 +08:00 |
|
ival
|
cdccd7b41f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-29 16:03:27 +08:00 |
|
ival
|
05c90f1079
|
修改代码
|
2019-07-29 16:03:14 +08:00 |
|
zyy
|
4da098c1fd
|
desc: 调整绘图数据
|
2019-07-29 15:49:28 +08:00 |
|
zyy
|
c05db4daed
|
调整格式
|
2019-07-29 15:30:11 +08:00 |
|
zyy
|
d5e5f3b644
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-29 15:24:04 +08:00 |
|
zyy
|
00dc541830
|
调整配置代码
|
2019-07-29 15:23:55 +08:00 |
|
ival
|
9693c2a2f9
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-29 13:45:53 +08:00 |
|
ival
|
69ed6c5eea
|
处理菜单
|
2019-07-29 13:45:38 +08:00 |
|
fan
|
1eb577a2ed
|
调整：代码修改
|
2019-07-29 13:38:02 +08:00 |
|
fan
|
b50fd1aae3
|
调整：代码修改
|
2019-07-29 13:29:30 +08:00 |
|
ival
|
ca01e0aeb7
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Section/index.js
# src/jmap/shape/Switch/index.js
|
2019-07-29 11:20:20 +08:00 |
|
ival
|
33442905be
|
修改道岔状态变化
|
2019-07-29 11:18:50 +08:00 |
|
zyy
|
9e8e5afe41
|
修改配置文件代码
|
2019-07-29 10:59:02 +08:00 |
|
zyy
|
c2400c07e1
|
desc: 增加区段配置
|
2019-07-29 10:20:18 +08:00 |
|
ival
|
10cd98fe6f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-29 09:27:49 +08:00 |
|
ival
|
21fd4ec516
|
修改区段状态变化
|
2019-07-29 09:27:33 +08:00 |
|
fan
|
9241e91364
|
调整：列车问题调整
|
2019-07-29 08:46:29 +08:00 |
|
ival
|
a74053360d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-26 18:54:52 +08:00 |
|
ival
|
02bd1e9d40
|
调试跑车
|
2019-07-26 18:54:42 +08:00 |
|
zyy
|
a9127022fd
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-26 18:53:51 +08:00 |
|
zyy
|
06c5c60364
|
desc: 增加section配置
|
2019-07-26 18:53:44 +08:00 |
|
ival
|
ed01ac7180
|
修改代码
|
2019-07-26 17:39:05 +08:00 |
|
ival
|
8f2712e3d8
|
修改代码
|
2019-07-26 17:35:58 +08:00 |
|
ival
|
ab86340524
|
修改列车跑车计算
|
2019-07-26 17:18:27 +08:00 |
|
ival
|
c161f19b1b
|
修改跑车
|
2019-07-26 17:13:03 +08:00 |
|
zyy
|
7be6ca66fc
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/map/mapdraft/mapedit/mapoperate/link.vue
|
2019-07-26 16:01:18 +08:00 |
|
zyy
|
1305046304
|
修改代码
|
2019-07-26 15:59:31 +08:00 |
|
ival
|
95d944b671
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/TrainWindow/index.js
|
2019-07-26 15:53:57 +08:00 |
|
ival
|
4dec6ac93d
|
调试仿真
|
2019-07-26 15:52:50 +08:00 |
|
fan
|
7a4fabcb69
|
调整：列车调整
|
2019-07-26 15:45:30 +08:00 |
|
ival
|
2192b1eea4
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-26 13:32:56 +08:00 |
|
ival
|
9f5130a4f2
|
代码移植
|
2019-07-26 13:32:43 +08:00 |
|
zyy
|
797f31f142
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jlmap/index.vue
|
2019-07-26 12:18:40 +08:00 |
|
zyy
|
e04e0f1c67
|
desc: 修改代码
|
2019-07-26 12:17:53 +08:00 |
|
fan
|
fd4c9b8b91
|
调整：修改代码
|
2019-07-26 10:57:54 +08:00 |
|
ival
|
75be303baf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-26 10:39:06 +08:00 |
|
ival
|
2a0aea6bfe
|
修改页面点击事件
|
2019-07-26 10:38:57 +08:00 |
|
fan
|
bca25edfff
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-07-26 09:49:12 +08:00 |
|
fan
|
c17d600851
|
调整：修改代码
|
2019-07-26 09:38:45 +08:00 |
|
ival
|
a6ab80a816
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 18:25:16 +08:00 |
|
ival
|
58911eef1a
|
修改代码
|
2019-07-25 18:25:04 +08:00 |
|
fan
|
8a165e0bc6
|
调整：esLint调整
|
2019-07-25 17:59:51 +08:00 |
|
ival
|
06f45dd0cb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 15:53:55 +08:00 |
|
ival
|
1873c3301f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/batong.js
# src/jmap/theme/bejing.js
# src/jmap/theme/chengdu.js
# src/jmap/theme/fuzhou.js
|
2019-07-25 15:53:42 +08:00 |
|
zyy
|
601d0e2d91
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 15:48:58 +08:00 |
|
zyy
|
e32ab592a4
|
desc: 修改代码
|
2019-07-25 15:48:51 +08:00 |
|
ival
|
eefa6cb62d
|
123123
|
2019-07-25 15:44:53 +08:00 |
|
ival
|
f28f5fc1cd
|
修改代码
|
2019-07-25 15:44:23 +08:00 |
|
fan
|
33b37f9e89
|
调整：代码修改
|
2019-07-25 15:42:40 +08:00 |
|
fan
|
0d878bcc6a
|
调整：esLint调整
|
2019-07-25 14:57:23 +08:00 |
|
fan
|
41493fff28
|
调整：esLint+车次窗
|
2019-07-25 14:48:55 +08:00 |
|
ival
|
9acdab0b5b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 14:20:03 +08:00 |
|
ival
|
5d6a7fd637
|
修改代码
|
2019-07-25 14:19:55 +08:00 |
|
zyy
|
3afd5f8e61
|
修改代码
|
2019-07-25 14:03:26 +08:00 |
|
zyy
|
61564dfdbf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jlmap/index.vue
|
2019-07-25 13:35:58 +08:00 |
|
zyy
|
d22823bccc
|
修改代码
|
2019-07-25 13:26:20 +08:00 |
|
ival
|
1828c5d27b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 13:24:48 +08:00 |
|
ival
|
a95bf7c338
|
修改代码
|
2019-07-25 13:24:40 +08:00 |
|
zyy
|
e14460f1ef
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 11:08:23 +08:00 |
|
zyy
|
40425777c2
|
修改代码
|
2019-07-25 11:08:16 +08:00 |
|
ival
|
83c6fccfc9
|
修改代码
|
2019-07-25 11:07:32 +08:00 |
|
ival
|
a3c6e75448
|
修改代码
|
2019-07-25 10:58:17 +08:00 |
|
zyy
|
cf0cabadaf
|
调整代码
|
2019-07-25 10:55:31 +08:00 |
|
ival
|
8b46424116
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/router/index.js
# src/store/index.js
# src/store/modules/config.js
# src/views/components/progressBar/index.vue
# src/views/jlmap/index.vue
# src/views/jlmap/zoom/zoom.vue
# src/views/mapsystem/common/index.vue
# src/views/mapsystem/index.vue
|
2019-07-25 10:35:10 +08:00 |
|
ival
|
b11ba5369e
|
移植jlmap
|
2019-07-25 10:32:29 +08:00 |
|
zyy
|
987030db35
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/bejing.js
|
2019-07-25 10:31:20 +08:00 |
|
zyy
|
75e3162d68
|
修改代码
|
2019-07-25 10:30:30 +08:00 |
|
fan
|
83bcfceb7d
|
调整：列车皮肤调整
|
2019-07-25 08:59:25 +08:00 |
|
fan
|
0b9ca8cade
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/jmap/config/defaultSkin.js
# src/jmap/shape/Train/index.js
# src/jmap/theme/bejing.js
|
2019-07-25 08:56:56 +08:00 |
|
fan
|
557f98f4b4
|
调整：列车抽象
|
2019-07-25 08:50:07 +08:00 |
|
zyy
|
42ae0b4a0d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-24 14:33:56 +08:00 |
|
zyy
|
59933cf4b9
|
修改代码
|
2019-07-24 14:33:50 +08:00 |
|
ival
|
dfd337e93f
|
修改字体设置
|
2019-07-24 13:50:37 +08:00 |
|
ival
|
2b8afd0010
|
修改代码
|
2019-07-24 13:02:19 +08:00 |
|
ival
|
2d43350ff6
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-24 11:24:30 +08:00 |
|
ival
|
e8dad49c5f
|
修改代码
|
2019-07-24 11:24:13 +08:00 |
|
zyy
|
886c51259d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-24 11:12:21 +08:00 |
|
zyy
|
e06411df1c
|
desc: 修改section代码
|
2019-07-24 11:12:15 +08:00 |
|
ival
|
8a4239a865
|
修改代码
|
2019-07-24 10:13:01 +08:00 |
|
ival
|
7609233eb5
|
修改代码
|
2019-07-24 10:02:07 +08:00 |
|
ival
|
aa89b91153
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-24 09:23:21 +08:00 |
|
ival
|
540dc4e346
|
修改代码
|
2019-07-24 09:23:08 +08:00 |
|
zyy
|
627a7d86c8
|
修改代码
|
2019-07-24 09:21:10 +08:00 |
|
ival
|
bdf42ae492
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Signal/ESigLamp.js
# src/jmap/shape/Signal/index.js
|
2019-07-24 09:10:45 +08:00 |
|
ival
|
68d83c2a88
|
修改代码
|
2019-07-23 18:49:54 +08:00 |
|
zyy
|
d26085b8a5
|
修改代码
|
2019-07-23 18:33:30 +08:00 |
|
ival
|
a5528542cc
|
修改代码
|
2019-07-23 18:30:08 +08:00 |
|
ival
|
b2da416325
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Signal/ESigAuto.js
# src/jmap/shape/Signal/ESigButton.js
# src/jmap/shape/Signal/ESigLmap.js
# src/jmap/shape/Signal/ESigPost.js
# src/jmap/shape/Signal/ESigRoute.js
# src/jmap/shape/Signal/index.js
# src/jmap/theme/fuzhou.js
|
2019-07-23 18:24:05 +08:00 |
|
ival
|
b9132cb29f
|
修改
|
2019-07-23 18:22:05 +08:00 |
|
ival
|
1bab212c05
|
修改代码
|
2019-07-23 18:21:49 +08:00 |
|
zyy
|
b938022cbf
|
Merge branch 'dev'
|
2019-07-23 18:15:25 +08:00 |
|
zyy
|
2604b12120
|
修改代码
|
2019-07-23 18:13:50 +08:00 |
|
zyy
|
9115574bc0
|
修改代码
|
2019-07-23 18:10:42 +08:00 |
|
ival
|
e334901490
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/shape/Signal/index.js
|
2019-07-23 18:07:18 +08:00 |
|
ival
|
39af264196
|
修改代码
|
2019-07-23 18:06:13 +08:00 |
|
zyy
|
ffe150a351
|
修改代码
|
2019-07-23 18:05:26 +08:00 |
|
zyy
|
b2482467fe
|
修改代码
|
2019-07-23 13:40:55 +08:00 |
|
zyy
|
af6e9fe3c9
|
修改代码
|
2019-07-22 17:27:09 +08:00 |
|
zyy
|
23117a8f1f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/batong.js
|
2019-07-22 17:20:31 +08:00 |
|
zyy
|
9c743e8bee
|
desc: 修改代码
|
2019-07-22 17:20:01 +08:00 |
|
ival
|
ee29e51779
|
修改代码
|
2019-07-22 17:16:27 +08:00 |
|
ival
|
bc9f244d5f
|
增加代码
|
2019-07-22 15:49:15 +08:00 |
|
ival
|
d7ed4c73ce
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Switch/ESwCore.js
# src/jmap/shape/Switch/index.js
|
2019-07-22 15:46:28 +08:00 |
|
ival
|
2ca2c0f193
|
修改代码
|
2019-07-22 15:43:42 +08:00 |
|
zyy
|
dd32206ef0
|
修改道岔代码
|
2019-07-22 15:32:25 +08:00 |
|
zyy
|
e9b66e1cea
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-22 13:41:34 +08:00 |
|
zyy
|
274a48c33b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Switch/index.js
|
2019-07-22 13:41:12 +08:00 |
|
ival
|
fdc15d109e
|
增加文件
|
2019-07-22 13:40:15 +08:00 |
|
zyy
|
fc75783d94
|
修改代码
|
2019-07-22 13:40:14 +08:00 |
|
zyy
|
70599404bd
|
desc: 修改代码
|
2019-07-22 13:39:33 +08:00 |
|
ival
|
3dd126da3a
|
修改代码
|
2019-07-22 13:39:03 +08:00 |
|
zyy
|
e5748b0a6c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-22 09:33:19 +08:00 |
|
zyy
|
4a0363ddc2
|
调整zlevel canvas 层级
|
2019-07-22 09:33:11 +08:00 |
|
ival
|
042ad9fe6b
|
修改代码
|
2019-07-22 09:14:56 +08:00 |
|
ival
|
62391acfd8
|
修改事件绑定
|
2019-07-21 21:22:49 +08:00 |
|
ival
|
7848448a95
|
修正代码
|
2019-07-21 20:20:41 +08:00 |
|
ival
|
389b9b13ed
|
修改代码
|
2019-07-21 18:59:42 +08:00 |
|
ival
|
23232fcf78
|
修改代码
|
2019-07-19 18:32:19 +08:00 |
|
ival
|
15ab35d5b9
|
修改代码
|
2019-07-19 18:05:43 +08:00 |
|
ival
|
fa02c97851
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/transformHandle.js
|
2019-07-19 18:02:22 +08:00 |
|
ival
|
a1a2b1d21e
|
修改代码
|
2019-07-19 18:01:42 +08:00 |
|
zyy
|
7e7723e9ef
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-19 17:53:15 +08:00 |
|
zyy
|
f42a3e2afc
|
修改代码
|
2019-07-19 17:53:06 +08:00 |
|
ival
|
80ef1f9ee3
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-19 17:51:50 +08:00 |
|
ival
|
8f3e466cf5
|
修改代码
|
2019-07-19 17:51:40 +08:00 |
|
zyy
|
046e603fe7
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-19 15:18:05 +08:00 |
|
zyy
|
058e688602
|
修改代码
|
2019-07-19 15:17:58 +08:00 |
|
ival
|
65e93a0a8e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-19 15:16:02 +08:00 |
|
ival
|
561ab7521b
|
修改代码
|
2019-07-19 15:15:51 +08:00 |
|
zyy
|
c912074739
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/map.js
# src/jmap/shape/Signal/index.js
# src/views/jmap/index.vue
|
2019-07-19 14:31:45 +08:00 |
|
zyy
|
d99d1b9ecc
|
修改代码
|
2019-07-19 14:30:26 +08:00 |
|
ival
|
452c9fe7d7
|
修改代码
|
2019-07-19 13:54:23 +08:00 |
|
ival
|
9bdd8e15c5
|
修改代码
|
2019-07-19 11:11:34 +08:00 |
|
ival
|
fcd9f7dad4
|
修改代码
|
2019-07-19 09:40:22 +08:00 |
|
ival
|
e3341dcd04
|
修改代码
|
2019-07-19 09:23:56 +08:00 |
|
ival
|
8f534ce10a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-18 18:27:48 +08:00 |
|
zyy
|
d8f0c74cbf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/map.js
|
2019-07-18 18:27:10 +08:00 |
|
ival
|
c4cad61cb6
|
修改
|
2019-07-18 18:26:56 +08:00 |
|
zyy
|
a72feee896
|
修改代码
|
2019-07-18 18:25:57 +08:00 |
|
ival
|
ed840d2359
|
修改代码
|
2019-07-18 18:24:40 +08:00 |
|
ival
|
3a0e467221
|
修改代码
|
2019-07-18 17:21:18 +08:00 |
|
ival
|
257945d203
|
修改代码
|
2019-07-18 17:07:09 +08:00 |
|
ival
|
eb86ca65a5
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-18 17:02:07 +08:00 |
|
ival
|
892d8a5e9d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jmap/index.vue
|
2019-07-18 17:01:21 +08:00 |
|
zyy
|
2138dab1a6
|
修改代码
|
2019-07-18 16:11:48 +08:00 |
|
ival
|
e1219c9908
|
修改代码
|
2019-07-18 15:28:19 +08:00 |
|
zyy
|
e82c7fb5af
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-18 10:17:49 +08:00 |
|
zyy
|
c51ca002ed
|
desc: 修改代码
|
2019-07-18 10:17:42 +08:00 |
|
ival
|
4692405b68
|
修改代码
|
2019-07-18 10:16:53 +08:00 |
|
ival
|
57dd676c4a
|
修改代码
|
2019-07-18 10:08:26 +08:00 |
|
ival
|
47171b872e
|
修改代码
|
2019-07-18 10:05:16 +08:00 |
|
ival
|
6774d555bf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/fuzhou.js
|
2019-07-18 08:57:09 +08:00 |
|
ival
|
dcd977e161
|
修改
|
2019-07-18 08:56:17 +08:00 |
|
zyy
|
02cef2dc8c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-17 18:18:42 +08:00 |
|
zyy
|
bc9e02144e
|
desc: 修改代码
|
2019-07-17 18:18:28 +08:00 |
|
ival
|
73e847aa55
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-17 18:17:02 +08:00 |
|
ival
|
74bc2653d1
|
修改代码
|
2019-07-17 18:16:52 +08:00 |
|
zyy
|
ea23e6c817
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/bejing.js
|
2019-07-17 15:54:31 +08:00 |
|
zyy
|
c5c5a4c9f9
|
desc: 修改代码
|
2019-07-17 15:54:01 +08:00 |
|
ival
|
cac49ad418
|
修改代码
|
2019-07-17 15:53:13 +08:00 |
|
ival
|
f2651e5844
|
修改代码
|
2019-07-17 12:17:41 +08:00 |
|
ival
|
38d5cc1b2e
|
修改代码
|
2019-07-17 11:19:08 +08:00 |
|
ival
|
22c1b93a40
|
111
|
2019-07-17 09:17:49 +08:00 |
|
ival
|
098b4c860e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-17 09:12:16 +08:00 |
|
ival
|
9b3d3a97c8
|
修改代码
|
2019-07-17 09:12:05 +08:00 |
|
zyy
|
f8adc05375
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/element/ETextName.js
|
2019-07-17 09:09:00 +08:00 |
|
zyy
|
ddbf5edeb2
|
desc: 增加单个绘图元素
|
2019-07-17 09:08:23 +08:00 |
|
ival
|
0f669bfcbd
|
修改
|
2019-07-16 18:44:40 +08:00 |
|
ival
|
82fbb5240f
|
修改代码
|
2019-07-16 18:37:49 +08:00 |
|
ival
|
37310e6a3c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Section.js
# src/jmap/shape/factory.js
|
2019-07-16 16:31:04 +08:00 |
|
ival
|
25e6c8ceb8
|
修改代码
|
2019-07-16 16:29:31 +08:00 |
|
zyy
|
896438f51e
|
desc: 调整道岔显示位置
|
2019-07-16 16:19:01 +08:00 |
|
zyy
|
cecc0edf27
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-16 16:04:02 +08:00 |
|
zyy
|
f348e05074
|
desc: 分离区段单个元素
|
2019-07-16 16:03:56 +08:00 |
|
ival
|
dd21cc3294
|
修改代码
|
2019-07-16 13:43:37 +08:00 |
|
ival
|
ab934855d8
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/TrainWindow.js
|
2019-07-16 13:37:14 +08:00 |
|
ival
|
3f8c852087
|
修改代码
|
2019-07-16 13:35:39 +08:00 |
|
zyy
|
4d9884f425
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/shape/factory.js
|
2019-07-16 13:34:46 +08:00 |
|
zyy
|
301e0f7245
|
no message
|
2019-07-16 13:34:03 +08:00 |
|
ival
|
27fc58a23e
|
修改代码
|
2019-07-16 12:01:43 +08:00 |
|
ival
|
14d84a29c4
|
修改代码
|
2019-07-16 09:44:31 +08:00 |
|
ival
|
7a2cfbf752
|
修改缩进
|
2019-07-16 09:12:15 +08:00 |
|
ival
|
d3aed039bc
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-15 18:31:25 +08:00 |
|
ival
|
88e69b6093
|
修改代码
|
2019-07-15 18:31:13 +08:00 |
|
fan
|
d77ad0cf47
|
代码调整
|
2019-07-15 18:06:10 +08:00 |
|
fan
|
29456ac043
|
暂时注释掉列车鼠标事件
|
2019-07-15 18:02:10 +08:00 |
|
zyy
|
d50dc24121
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-15 16:04:10 +08:00 |
|
zyy
|
f1c1a9f90d
|
删除注释
|
2019-07-15 16:03:54 +08:00 |
|
fan
|
1b392a3832
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/config/deviceType.js
# src/jmap/shape/factory.js
# src/jmap/utils/parser.js
|
2019-07-15 16:03:23 +08:00 |
|
fan
|
4bc9a36974
|
Merge remote-tracking branch 'origin/master'
|
2019-07-15 16:01:38 +08:00 |
|
fan
|
b35470c513
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/config/deviceType.js
# src/jmap/shape/factory.js
# src/jmap/utils/parser.js
|
2019-07-15 16:01:19 +08:00 |
|
ival
|
5372284ff8
|
修改代码
|
2019-07-15 15:58:09 +08:00 |
|
ival
|
d95554b0a8
|
修改代码
|
2019-07-15 15:56:41 +08:00 |
|
ival
|
175417026c
|
1223
|
2019-07-15 15:56:03 +08:00 |
|
ival
|
0ea864e96d
|
12312
|
2019-07-15 15:54:47 +08:00 |
|
ival
|
a2c9c69037
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/StationControl.js
# src/jmap/shape/station.js
|
2019-07-15 15:52:34 +08:00 |
|
ival
|
b7c982bad6
|
修改代码
|
2019-07-15 15:51:39 +08:00 |
|
zyy
|
493f9da4d1
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/factory.js
|
2019-07-15 15:47:29 +08:00 |
|
zyy
|
95c5753c5f
|
desc: 增加zcList
|
2019-07-15 15:47:03 +08:00 |
|
ival
|
d54f3df88c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-15 15:33:28 +08:00 |
|
ival
|
86b35a411e
|
增加代码
|
2019-07-15 15:33:18 +08:00 |
|
zyy
|
46b3b843cd
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceRender.js
# src/jmap/config/deviceType.js
# src/jmap/shape/Signal.js
# src/jmap/shape/factory.js
# src/jmap/shape/section.js
# src/jmap/utils/parser.js
|
2019-07-15 15:32:32 +08:00 |
|
fan
|
db47956046
|
站台、车次窗、列车迁移
|
2019-07-15 15:30:59 +08:00 |
|
zyy
|
cf389a7381
|
desc: 增加lc,limiit,image 图层
|
2019-07-15 15:25:49 +08:00 |
|
ival
|
c89f2dec49
|
修改代码
|
2019-07-15 14:45:18 +08:00 |
|
ival
|
ecc5329924
|
修改代码
|
2019-07-15 14:14:44 +08:00 |
|
ival
|
10faac5e81
|
修改代码
|
2019-07-15 14:01:57 +08:00 |
|
ival
|
6a9939ab6c
|
增加设备配置
|
2019-07-15 13:01:03 +08:00 |
|
zyy
|
1a3c9ca500
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/map.js
# src/jmap/shape/factory.js
# src/jmap/utils/parser.js
# src/views/jmap/index.vue
|
2019-07-15 10:58:31 +08:00 |
|
zyy
|
fec5d79341
|
desc: 增加section皮肤，图形渲染
|
2019-07-15 10:07:04 +08:00 |
|
ival
|
dcdf45f0b3
|
修改代码
|
2019-07-15 10:06:07 +08:00 |
|
ival
|
9aa0121c62
|
修改代码
|
2019-07-15 09:38:35 +08:00 |
|
ival
|
359b902dfc
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jmap/index.vue
|
2019-07-15 09:02:47 +08:00 |
|
ival
|
ed56f48f74
|
修改代码
|
2019-07-15 09:02:04 +08:00 |
|
zyy
|
ff58614606
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/utils/parser.js
# src/views/jmap/index.vue
|
2019-07-15 09:00:37 +08:00 |
|
zyy
|
18fb4818f0
|
desc: 增加皮肤配置流程
|
2019-07-15 08:58:54 +08:00 |
|
ival
|
c67737c5c9
|
修改代码
|
2019-07-13 23:45:49 +08:00 |
|
zyy
|
c81094877d
|
desc: 增加注释
|
2019-07-11 17:58:58 +08:00 |
|
ival
|
d8e5fe8f2b
|
修改代码
|
2019-07-10 16:29:07 +08:00 |
|
ival
|
76fef48d87
|
修改代码
|
2019-07-10 16:04:17 +08:00 |
|
ival
|
d13bf6876b
|
修改参数
|
2019-07-10 13:24:03 +08:00 |
|
ival
|
548714dbca
|
修改
|
2019-07-10 13:19:21 +08:00 |
|
ival
|
816c070595
|
修改变量命名
|
2019-07-10 13:17:12 +08:00 |
|
ival
|
d5d449c9c5
|
增加鼠标事件以及回调事件
|
2019-07-10 12:02:02 +08:00 |
|
ival
|
0360b10a79
|
增加鼠标处理
|
2019-07-09 19:04:45 +08:00 |
|
ival
|
7441b41a51
|
添加操作
|
2019-07-09 09:24:54 +08:00 |
|
ival
|
2796ef8342
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/transformController.js
# src/views/jmap/index.vue
|
2019-07-08 09:40:07 +08:00 |
|
ival
|
266ea1a44a
|
修正格式
|
2019-07-08 09:38:39 +08:00 |
|
ival
|
a0dcff598b
|
修改代理代码
|
2019-07-07 22:56:09 +08:00 |
|
ival
|
4e6d971797
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-05 10:18:28 +08:00 |
|
ival
|
74d599bb1f
|
修改指令
|
2019-07-05 10:18:17 +08:00 |
|
ival
|
e816f72d83
|
修改代码
|
2019-07-05 00:40:53 +08:00 |
|
ival
|
eb305c146b
|
修改代码
|
2019-07-04 18:39:30 +08:00 |
|
zyy
|
9fbba9b5a0
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/map.js
# src/jmap/painter.js
# src/jmap/proxyHandle.js
|
2019-07-04 11:00:52 +08:00 |
|
zyy
|
d4191832fb
|
desc: 修改eslint 配置 保存
|
2019-07-04 10:59:40 +08:00 |
|
ival
|
73278b68d3
|
修改结构
|
2019-07-04 09:20:51 +08:00 |
|
ival
|
06003c8068
|
修改代码
|
2019-07-03 18:41:00 +08:00 |
|
ival
|
544c9cacef
|
修改代码
|
2019-07-03 14:29:09 +08:00 |
|
ival
|
3780ebefad
|
增加nclient工程
|
2019-07-02 16:29:52 +08:00 |
|