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

1250 Commits

Author SHA1 Message Date
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