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
|
6fa64dd26b
|
desc: 修改显示字段，增加loading
|
2019-09-02 11:04:23 +08:00 |
|
zyy
|
6c617d3e4a
|
desc: 修改获取商品字段
|
2019-08-30 19:19:48 +08:00 |
|
ival
|
36facbb67d
|
修改重新生成排班计划的页面
|
2019-08-30 17:12:39 +08:00 |
|
ival
|
d3ff24c4f8
|
设置时间组件为可清空组件
|
2019-08-30 16:41:55 +08:00 |
|
ival
|
1dabf22fd6
|
修改数据显示
|
2019-08-30 16:35:13 +08:00 |
|
ival
|
546957e926
|
增加排版计划处理
|
2019-08-30 15:46:08 +08:00 |
|
ival
|
3da74652c5
|
增加派班计划
|
2019-08-30 09:00:36 +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
|
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 |
|
zyy
|
2d906ef9be
|
desc: 调整权限列表接口对接
|
2019-08-29 09:31:58 +08:00 |
|
fan
|
be04a992c0
|
关闭ibp盘开关
|
2019-08-29 09:30:09 +08:00 |
|
fan
|
94f803072f
|
ibp盘提交
|
2019-08-29 09:25:06 +08:00 |
|
fan
|
12b6535254
|
调整代码： 关闭ibp入口
|
2019-08-27 17:07:32 +08:00 |
|
fan
|
75a6b2ee58
|
合并
|
2019-08-27 15:22:55 +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
|
2250bc970d
|
desc: 修改名称显示放到皮肤配置中
|
2019-08-23 14:24:30 +08:00 |
|
fan
|
0ca2235549
|
加载剧本是先清除地图状态
|
2019-08-22 14:12:16 +08:00 |
|
fan
|
d068a74a6e
|
加载剧本前列车视图
|
2019-08-22 10:12:35 +08:00 |
|
fan
|
7334d282dd
|
调整: 剧本过滤角色调整
|
2019-08-20 18:57:14 +08:00 |
|
ival
|
474b1fff18
|
修改仿真暂停字段归属文件
|
2019-08-20 18:44:02 +08:00 |
|
ival
|
de0fd028ed
|
设置时间暂停
|
2019-08-20 18:35:42 +08:00 |
|
joylink_cuiweidong
|
8172457cda
|
剧本编制模块样式调整
|
2019-08-20 15:55:32 +08:00 |
|
joylink_cuiweidong
|
2727309402
|
剧本录制样式修改
|
2019-08-20 15:41:54 +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 |
|
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
|
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
|
c718ea2f41
|
修改综合演练加入房间未加载地图的问题
|
2019-08-20 10:23:59 +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
|
3e0282784b
|
调整: 加载剧本button 文字调整
|
2019-08-19 19:32:08 +08:00 |
|
joylink_cuiweidong
|
146be45957
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 18:25:58 +08:00 |
|
joylink_cuiweidong
|
4dbe34cf4f
|
剧本编制模块修改
|
2019-08-19 18:24:06 +08:00 |
|
ival
|
ae500285ba
|
修改实训加载顺序错误的问题
|
2019-08-19 15:59:04 +08:00 |
|
ival
|
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 |
|
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
|
d083482b10
|
修改代码
|
2019-08-19 10:31:11 +08:00 |
|
joylink_cuiweidong
|
f7736543a5
|
修改剧本动作的样式
|
2019-08-16 20:06:14 +08:00 |
|