ival
|
0cd99f16f1
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/publish/publishMap/index.vue
|
2019-09-16 14:31:56 +08:00 |
|
ival
|
b52bb52888
|
修改地图导出以及登录失败错误信息提示
|
2019-09-16 14:29:43 +08:00 |
|
joylink_cuiweidong
|
382b81b94e
|
国际化调整
|
2019-09-16 13:55:18 +08:00 |
|
joylink_cuiweidong
|
87637e89ae
|
弹出层国际化调整
|
2019-09-16 11:17:42 +08:00 |
|
joylink_cuiweidong
|
711f3195e3
|
国际化调整
|
2019-09-16 10:25:39 +08:00 |
|
fan
|
836aa798dd
|
国际化调整
|
2019-09-16 09:06:19 +08:00 |
|
fan
|
6e44740fe2
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/menu.js
# src/i18n/langs/zh/menu.js
|
2019-09-16 09:05:33 +08:00 |
|
fan
|
126fc80ea4
|
国际化调整菜单
|
2019-09-16 08:56:37 +08:00 |
|
joylink_cuiweidong
|
3f772f0cd5
|
地图右键菜单国际化
|
2019-09-12 18:37:42 +08:00 |
|
joylink_cuiweidong
|
88d96ace7d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-12 17:38:17 +08:00 |
|
joylink_cuiweidong
|
24bbeda269
|
地图右键菜单国际化
|
2019-09-12 17:38:04 +08:00 |
|
fan
|
a362e629c7
|
国际化调整
|
2019-09-12 17:34:40 +08:00 |
|
fan
|
60522271fc
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/menu.js
# src/i18n/langs/zh/menu.js
|
2019-09-12 17:34:17 +08:00 |
|
fan
|
d9b8f1e8fd
|
国际化菜单调整调整
|
2019-09-12 17:28:02 +08:00 |
|
zyy
|
c777b3dbcc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/rules.js
# src/i18n/langs/zh/rules.js
|
2019-09-12 16:31:35 +08:00 |
|
zyy
|
f48a513df0
|
desc: 调整绘图逻辑，流程，字段显示
|
2019-09-12 16:30:42 +08:00 |
|
joylink_cuiweidong
|
6d03379cb0
|
地图右键菜单国际化
|
2019-09-12 16:03:03 +08:00 |
|
joylink_cuiweidong
|
b08cddc237
|
地图菜单国际化
|
2019-09-12 15:14:13 +08:00 |
|
joylink_cuiweidong
|
71a0f2d921
|
仿真国际化
|
2019-09-12 13:35:25 +08:00 |
|
fan
|
cf45174dad
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-12 13:22:40 +08:00 |
|
fan
|
2dffe78baf
|
国际化调整
|
2019-09-12 13:22:30 +08:00 |
|
joylink_cuiweidong
|
22a77b63fd
|
仿真 国际化调整
|
2019-09-12 09:37:40 +08:00 |
|
fan
|
63fb67b4cc
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-12 09:26:13 +08:00 |
|
fan
|
7a284fea4a
|
国际化调整
|
2019-09-12 09:25:33 +08:00 |
|
sunzhenyu
|
33442d2969
|
自动化test
|
2019-09-11 18:12:52 +08:00 |
|
fan
|
b06f4d1ad4
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-11 17:12:00 +08:00 |
|
fan
|
436cd0418f
|
国际化调整
|
2019-09-11 17:11:51 +08:00 |
|
fan
|
1afb81bba5
|
权限打包调整
|
2019-09-11 17:09:51 +08:00 |
|
joylink_cuiweidong
|
76335c8d12
|
仿真购买 国际化调整
|
2019-09-11 16:23:14 +08:00 |
|
joylink_cuiweidong
|
1830952064
|
仿真 国际化调整
|
2019-09-11 15:33:00 +08:00 |
|
fan
|
6b80ac2452
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-11 15:26:57 +08:00 |
|
fan
|
0c11453197
|
权限打包搜索条件调整
|
2019-09-11 15:26:40 +08:00 |
|
joylink_cuiweidong
|
37f1631585
|
仿真国际化调整
|
2019-09-11 14:35:26 +08:00 |
|
fan
|
fd4c2de338
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/index.js
|
2019-09-11 14:31:32 +08:00 |
|
fan
|
d1c146f9da
|
权限回收调整
|
2019-09-11 14:28:22 +08:00 |
|
joylink_cuiweidong
|
ef5d425942
|
考试 仿真国际化调整
|
2019-09-11 13:40:46 +08:00 |
|
fan
|
41b70bc477
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-11 13:20:30 +08:00 |
|
fan
|
9c5f1f7633
|
国际化调整
|
2019-09-11 13:20:03 +08:00 |
|
joylink_cuiweidong
|
b13638803a
|
教学 仿真 国际化调整
|
2019-09-11 11:32:31 +08:00 |
|
joylink_cuiweidong
|
5c184755e2
|
教学仿真 国际化调整
|
2019-09-11 11:30:44 +08:00 |
|
joylink_cuiweidong
|
d31f4e8493
|
教学和考试的仿真 国际化调整
|
2019-09-11 11:02:18 +08:00 |
|
fan
|
fa4ccafc58
|
权限分发调整
|
2019-09-11 10:42:15 +08:00 |
|
fan
|
5c2e2cebe8
|
权限分发调整
|
2019-09-11 10:35:34 +08:00 |
|
joylink_cuiweidong
|
1ced2a4911
|
国际化调整
|
2019-09-11 09:34:12 +08:00 |
|
fan
|
7bb4ac4a06
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-11 09:26:38 +08:00 |
|
fan
|
3e1bd3fcd7
|
国际化考试系统大屏统计系统
|
2019-09-11 09:25:16 +08:00 |
|
joylink_cuiweidong
|
e1378c0961
|
国际化调整
|
2019-09-10 19:08:48 +08:00 |
|
joylink_cuiweidong
|
875d5d6c64
|
国际化调整
|
2019-09-10 17:32:41 +08:00 |
|
joylink_cuiweidong
|
4b8a3acca8
|
国际化调整以及ibp盘调整
|
2019-09-10 16:14:54 +08:00 |
|
fan
|
c96260215c
|
ibp调整代码
|
2019-09-10 14:27:53 +08:00 |
|