joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
1,023 Commits 20 Branches 0 Tags 448 MiB
f065661cd4
Commit Graph

603 Commits

Author SHA1 Message Date
fan
1ee0aeb785 ibp布局调整 2019-09-03 10:10:09 +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
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
6c617d3e4a desc: 修改获取商品字段 2019-08-30 19:19:48 +08:00
zyy
d8dc80a001 desc: 修改权限字段显示 2019-08-30 19:14:10 +08:00
zyy
5d1c9d02bf desc: 修改琏计划 2019-08-30 19:10:08 +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
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
ival
3da74652c5 增加派班计划 2019-08-30 09:00:36 +08:00
joylink_cuiweidong
c9937ffc48 电梯组件添加到页面中 2019-08-29 18:45:20 +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
eaec6c4446 修复 剧本修改时候重置剧本的bug 2019-08-29 13:05:30 +08:00
ival
30e590afc7 封装车次窗鼠标事件以及车次窗操作 2019-08-29 11:26:05 +08:00
ival
c14e0c6055 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/display/index.vue
 2019-08-29 10:35:55 +08:00
ival
cc54830f01 修改代码格式以及操作的bug 2019-08-29 10:33:50 +08:00
zyy
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
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
ival
0954312cac 修改用户emgail国际化的问题和保存规则提示的问题 2019-08-29 09:02:02 +08:00
fan
3393a65f0d 代码调整：ibp盘 2019-08-28 13:22:17 +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
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
fan
12b6535254 调整代码： 关闭ibp入口 2019-08-27 17:07:32 +08:00
fan
846b267e64 调整代码： ibp盘宽高显示 2019-08-27 16:45:43 +08:00
fan
044f66d9d9 调整代码： ibp盘 2019-08-27 16:37:33 +08:00
fan
1f2d2a1794 调整代码： ibp盘 2019-08-27 16:35:41 +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
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
ival
5fdc80855d 修改规则编辑的问题 2019-08-27 10:28:24 +08:00
zyy
72355448a1 desc: 修改地图绘制显示问题 2019-08-27 09:36:22 +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
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