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 |
|
jade
|
f9061066cb
|
Merge remote-tracking branch 'origin/master' into test
|
2019-08-09 17:57:26 +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 |
|
jade
|
b44d7e97cf
|
Merge remote-tracking branch 'origin/master' into test
|
2019-08-09 17:10:27 +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 |
|