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 |
|
jade
|
fee605ebb8
|
Merge remote-tracking branch 'origin/test' into test
|
2019-08-28 08:58:52 +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 |
|
program-walker
|
0706adb6ea
|
Merge remote-tracking branch 'origin/test'
|
2019-08-27 18:25:39 +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
|
c6cbc3be66
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-08-27 11:21:51 +08:00 |
|
ival
|
0e55c3c53e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-08-27 10:30:23 +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
|
5fd2efcb75
|
Merge branch 'test'
|
2019-08-27 09:47:05 +08:00 |
|
zyy
|
aaf4d92ad8
|
Merge branch 'dev' into test
|
2019-08-27 09:46:54 +08:00 |
|
zyy
|
e34d3abff4
|
desc: 修改主页扫码显示逻辑
|
2019-08-27 09:46:44 +08:00 |
|
zyy
|
1d2576e1a8
|
Merge branch 'test'
|
2019-08-27 09:37:56 +08:00 |
|
zyy
|
a0292849e2
|
Merge branch 'dev' into test
|
2019-08-27 09:37:09 +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 |
|