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

1366 Commits

Author SHA1 Message Date
fan
01cf337b63 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 19:49:59 +08:00
fan
21510d9464 创建章节修改 2019-10-22 19:49:37 +08:00
program-walker
6fa2b2e636 登陆逻辑修改 2019-10-22 19:47:36 +08:00
fan
5c5c2412fd 章节下添加创建章节 2019-10-22 19:23:01 +08:00
fan
ff37fe128e 问题调整 2019-10-22 18:49:46 +08:00
fan
4bd232bd67 地图系统结构调整 2019-10-22 18:34:05 +08:00
fan
4f14075072 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 18:20:10 +08:00
joylink_cuiweidong
2bd13ad075 实训tree 样式调整 2019-10-22 18:19:18 +08:00
fan
9134be8c19 问题调整 2019-10-22 18:18:21 +08:00
fan
6760cdc7e3 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 17:24:51 +08:00
fan
0cafd0c7f3 设计平台课程系统调整 2019-10-22 17:24:41 +08:00
joylink_cuiweidong
bddddedbf2 Merge branch 'dev' into test 
# Conflicts:
#	src/utils/baseUrl.js
 2019-10-22 16:13:13 +08:00
joylink_cuiweidong
2282f27239 设计系统运行图样式调整 2019-10-22 16:10:39 +08:00
fan
6f314ba150 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 16:06:20 +08:00
fan
0e23a62b39 调整代码 2019-10-22 16:05:58 +08:00
joylink_cuiweidong
c08064faa0 Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test 2019-10-22 15:14:54 +08:00
joylink_cuiweidong
b26ab2fc15 删除地图系统接口调整以及西铁院系统tree接口调整 2019-10-22 15:13:58 +08:00
joylink_cuiweidong
df4113ff29 代码结构整理 
修改 退出系统仍然自动登录的bug
子系统生成接口调整
 2019-10-22 14:43:27 +08:00
fan
e89211a873 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 14:28:41 +08:00
fan
a49b195090 调整代码 2019-10-22 14:28:22 +08:00
zyy
a61f917f4a desc: 调整站台扣车状态显示 2019-10-22 14:07:20 +08:00
zyy
ac0fafebc0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-22 13:41:29 +08:00
zyy
0c6de0e011 desc: 修改代码 2019-10-22 13:41:23 +08:00
fan
b7a16a9074 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 13:40:55 +08:00
fan
515a9a60ae 代码调整 2019-10-22 13:40:42 +08:00
joylink_cuiweidong
7785b9a9af 设计平台 系统管理 子系统 修改接口以及国际化 2019-10-22 11:20:43 +08:00
joylink_cuiweidong
c04abcc67a 设计平台 系统管理 子系统 创建子系统接口调整 2019-10-22 09:36:37 +08:00
joylink_cuiweidong
9fcdda5d60 设计平台 系统管理 子系统 创建子系统接口 2019-10-21 18:03:13 +08:00
joylink_cuiweidong
343372d83a 设计平台地图三维路径调整 2019-10-21 16:12:03 +08:00
fan
04bebc8201 Merge remote-tracking branch 'origin/dev' into test 2019-10-21 16:08:07 +08:00
fan
81edd3c5c2 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-21 16:07:28 +08:00
fan
b68dd99bde 仿真路由调整 2019-10-21 16:07:15 +08:00
joylink_cuiweidong
1a046c2b7f 设计平台系统管理子系统生成页面调整 2019-10-21 15:50:15 +08:00
joylink_cuiweidong
c9ad0a8be5 自动登录页面处理 2019-10-21 14:14:22 +08:00
fan
36b0b048bd 仿真路由调整 2019-10-21 14:09:03 +08:00
fan
7e7fc2256c Merge remote-tracking branch 'origin/dev' into test 2019-10-21 13:17:30 +08:00
fan
4b41c9fd27 考试路由调整 2019-10-21 13:16:49 +08:00
fan
be2bbc67cd 接口参数调整 2019-10-21 11:15:15 +08:00
fan
9ed65095cc 接口参数调整 2019-10-21 10:50:31 +08:00
fan
9d072c4a6c 产品分化调整 2019-10-21 10:02:49 +08:00
fan
34a8cbf270 接口调整 2019-10-21 08:59:27 +08:00
fan
77d024c08c Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/designPlatform/demonList.vue
 2019-10-21 08:58:17 +08:00
fan
902b1a494b 接口调整 2019-10-18 18:36:45 +08:00
joylink_cuiweidong
fd4df4f178 设计平台地图列表页面调整 2019-10-18 18:35:17 +08:00
ival
94288eaecc Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 18:31:29 +08:00
ival
36950a331e 修改比例 2019-10-18 18:31:14 +08:00
joylink_cuiweidong
170c7bcc9e 课程设计界面参数调整 2019-10-18 18:13:54 +08:00
ival
0864369b35 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 17:54:10 +08:00
ival
9a14de60ef 修改电子显示屏 2019-10-18 17:53:57 +08:00
joylink_cuiweidong
ecef9a4c74 设计平台地图列表接口调整 2019-10-18 17:45:08 +08:00
fan
b23bff36f0 打开实训录制按钮 2019-10-18 17:32:14 +08:00
fan
911b8a9057 接口调整 2019-10-18 17:23:25 +08:00
fan
d5063802f4 接口调整 2019-10-18 17:15:04 +08:00
joylink_cuiweidong
1b342fee6e 地图列表获取城市列表样式调整 2019-10-18 16:57:40 +08:00
ival
5e83d06250 修改计时组件样式 2019-10-18 15:35:48 +08:00
sunzhenyu
a7e7988754 修复路径判断 2019-10-18 15:29:17 +08:00
joylink_cuiweidong
3f82e45fcb 登录页面 密码隐藏显示 2019-10-18 14:36:14 +08:00
joylink_cuiweidong
c80c9d467c 剧本列表预览调整 2019-10-18 11:26:11 +08:00
joylink_cuiweidong
b96ca27907 Merge branch 'dev_product' into dev 2019-10-17 19:20:12 +08:00
joylink_cuiweidong
b14e2d18f4 剧本预览页面调整 2019-10-17 18:59:46 +08:00
sunzhenyu
f78d9865a2 Merge branch '3dtest' into test 2019-10-17 18:56:56 +08:00
zyy
140d84bf56 desc: 调整登陆页面样式 2019-10-17 18:55:46 +08:00
sunzhenyu
f847629b92 修改文字显示，行车路径，行车计算 2019-10-17 18:48:36 +08:00
zyy
7b5255c3eb desc: 调整格式化，样式 2019-10-17 18:27:49 +08:00
fan
0ebab6201f Merge remote-tracking branch 'origin/dev_product' into dev 
# Conflicts:
#	src/views/scriptManage/home.vue
 2019-10-17 18:09:02 +08:00
fan
f6e8375bf8 实训管理调整 2019-10-17 18:06:49 +08:00
joylink_cuiweidong
99b2cfc05b 剧本预览页面调整 2019-10-17 18:06:04 +08:00
fan
ab815ec493 实训管理调整 2019-10-17 17:56:25 +08:00
fan
534fa388e8 添加子系统生成页面 2019-10-17 17:11:15 +08:00
fan
fa4c7a6599 样式微调 2019-10-17 16:26:36 +08:00
fan
0fd879dd5d 样式微调 2019-10-17 16:23:14 +08:00
fan
ee62ceb0e5 产品分化调整 2019-10-17 16:04:07 +08:00
fan
6e139bcdbb Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_merger 
# Conflicts:
#	src/router/index.js
 2019-10-17 14:39:08 +08:00
zyy
6ca619b71f desc: 修改格式化 2019-10-17 14:35:10 +08:00
fan
05530e1568 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_merger 2019-10-17 14:33:19 +08:00
fan
00c4415fcc 代码整合调整 2019-10-17 14:31:59 +08:00
joylink_cuiweidong
9cd7234081 剧本列表页面调整 2019-10-17 13:54:41 +08:00
zyy
5d13162c6b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2019-10-17 11:21:01 +08:00
zyy
5d7f736873 desc: 调整考试系统英文名称 2019-10-17 11:20:09 +08:00
fan
11190ef66f 代码整合调整 2019-10-17 10:13:08 +08:00
joylink_cuiweidong
a264ab51cb 已发布地图剧本列表页面调整 2019-10-17 10:06:52 +08:00
fan
ece8f0cf21 Merge remote-tracking branch 'origin/dev_product' into dev_merger 
# Conflicts:
#	src/router/index.js
#	src/scripts/ConstDic.js
 2019-10-17 09:36:32 +08:00
fan
1ece7eb215 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-17 09:30:02 +08:00
fan
5ba5ca7ea7 Merge remote-tracking branch 'origin/dev_product' into dev 
# Conflicts:
#	src/components/QueryListPage/QueryForm.vue
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/en/scriptRecord.js
#	src/i18n/langs/zh/lesson.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/scriptRecord.js
#	src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
#	src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
#	src/permission.js
#	src/router/index.js
#	src/utils/baseUrl.js
#	src/views/demonstration/detail/index.vue
#	src/views/display/tipExamList.vue
#	src/views/lesson/lessoncategory/edit/lesson/publish.vue
#	src/views/lesson/taskmanage/createTask.vue
#	src/views/lesson/trainingRule/list.vue
#	src/views/login/index.vue
#	src/views/planMonitor/editTool/statusBar.vue
#	src/views/scriptManage/home.vue
#	src/views/teach/category/tree.vue
#	src/views/trainRoom/index.vue
 2019-10-17 09:16:40 +08:00
fan
25c4cf957d 西铁院项目调整 2019-10-16 17:37:03 +08:00
fan
355e06ae2e 注释plc相关接口 2019-10-16 17:03:21 +08:00
fan
54b078792c 西铁院暂存 2019-10-16 16:58:40 +08:00
joylink_cuiweidong
35eacb299c 剧本预览页面调整 2019-10-16 16:36:25 +08:00
fan
f4fc3d0b0b 暂存 2019-10-16 15:43:07 +08:00
fan
126886e1ce 西铁院暂存 2019-10-16 15:28:29 +08:00
fan
f0bf595b60 国际化添加左、右 2019-10-16 14:16:48 +08:00
fan
dd8c1e07f4 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-16 14:01:40 +08:00
fan
1caad290e5 ibp盘添加扣车关联 2019-10-16 14:00:30 +08:00
joylink_cuiweidong
df5a76ea41 剧本管理英文版英文用词修改 2019-10-16 11:20:36 +08:00
joylink_cuiweidong
571e221413 用户剧本预览页面调整 2019-10-16 09:18:26 +08:00
joylink_cuiweidong
c2479d2f68 剧本国际化调整 2019-10-15 16:46:32 +08:00
joylink_cuiweidong
a33c44dfea Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/scriptManage/scriptRecord/addAction.vue
 2019-10-15 16:30:45 +08:00
joylink_cuiweidong
089290e979 剧本国际化调整以及剧本增加语言参数 2019-10-15 16:18:25 +08:00
zyy
6faa018c71 desc: 新增剧本编辑页面可拖拽宽度 2019-10-15 15:24:41 +08:00
joylink_cuiweidong
ec16767772 剧本预览调整 2019-10-15 13:41:23 +08:00
fan
0640586712 西铁院暂存 2019-10-15 13:04:28 +08:00
fan
1ec45e2c19 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-15 11:06:16 +08:00
joylink_cuiweidong
232789ca73 产品分化路由处理 2019-10-15 11:05:30 +08:00
fan
0fc9db098c Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-15 11:04:43 +08:00
fan
729be7ec69 西铁院暂存 2019-10-15 09:39:01 +08:00
joylink_cuiweidong
aba4efe129 运行图页面调整 2019-10-14 17:03:54 +08:00
joylink_cuiweidong
bca95d4ca1 运行图增加计划和删除计划 更新运行图数据 2019-10-14 15:35:11 +08:00
joylink_cuiweidong
5e320978a9 产品分化剧本页面调整 2019-10-14 13:58:26 +08:00
fan
d6dbb01bba Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-14 13:54:45 +08:00
fan
0a1ec28511 产品分化调整 2019-10-14 13:54:19 +08:00
joylink_cuiweidong
a622effdde Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 
# Conflicts:
#	src/api/designPlatform.js
#	src/i18n/langs/en/approval.js
#	src/i18n/langs/zh/approval.js
 2019-10-14 13:12:30 +08:00
joylink_cuiweidong
c60471023f 产品分化剧本管理调整 2019-10-14 13:10:36 +08:00
fan
6d15a95b3f 产品分化运行图发布调整 2019-10-14 13:04:23 +08:00
fan
38f4dc1093 产品分化调整 2019-10-12 18:43:41 +08:00
fan
5af0c7e4c9 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-12 17:16:09 +08:00
fan
8366f9a788 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 
# Conflicts:
#	src/api/designPlatform.js
#	src/router/index.js
 2019-10-12 17:15:48 +08:00
joylink_cuiweidong
12eed3629a 运行图 发布审核流程调整 2019-10-12 17:15:25 +08:00
fan
722596cdf4 产品分化调整 2019-10-12 17:14:03 +08:00
joylink_cuiweidong
af2c431511 运行图剧本 审核流程调整 2019-10-12 16:47:54 +08:00
sunzhenyu
b32b03bc81 修改link为主轨迹运行 2019-10-12 16:36:51 +08:00
zyy
842f29e5d9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/jointTraining/index.vue
 2019-10-12 13:35:56 +08:00
zyy
99edd29aea desc: 调整格式化问题， 调整列车详情国际化 2019-10-12 13:25:47 +08:00
joylink_cuiweidong
6adc8cdd5b 剧本国际化调整 2019-10-12 13:04:56 +08:00
joylink_cuiweidong
bf66b2c9e0 剧本发布申请页面调整 2019-10-12 11:11:34 +08:00
fan
a24603aedf 综合仿真页面跳转调整 2019-10-12 11:03:15 +08:00
zyy
e03aefd80d desc: 调整字段 2019-10-11 19:10:27 +08:00
zyy
ef3f909a2d desc: 调整字段显示 2019-10-11 19:02:12 +08:00
zyy
3b8da62bf2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-11 18:40:37 +08:00
zyy
5e8089cacd desc: 修改权限字段 2019-10-11 18:40:32 +08:00
fan
862f251adb Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-11 17:45:36 +08:00
fan
3326f1c917 ibp调整 2019-10-11 17:17:05 +08:00
zyy
1e3486efc6 desc: 增加权限分发列表【设置失效】功能 2019-10-11 16:09:15 +08:00
zyy
aa0199754a desc: 调整创建权限流程，创建字段修改 2019-10-11 15:27:14 +08:00
fan
a4ccfee26d Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 
# Conflicts:
#	src/router/index.js
 2019-10-11 08:57:38 +08:00
fan
5a21420a18 课程发布审批流程暂存 2019-10-11 08:55:02 +08:00
zyy
f7cf33a5e2 desc: 调整登陆页面样式 2019-10-10 18:05:26 +08:00
joylink_cuiweidong
2a4bb6dba2 剧本发布申请页面 2019-10-10 17:37:07 +08:00
joylink_cuiweidong
e31bd2730f Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 2019-10-10 16:18:43 +08:00
joylink_cuiweidong
17ed79b2dd 产品分化课程设计页面调整 
刷新页面菜单栏选中状态调整
 2019-10-10 16:18:31 +08:00
fan
f2d614d5af Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-10 16:12:47 +08:00
fan
977a6d8b47 产品分化调整 2019-10-10 16:07:13 +08:00
joylink_cuiweidong
059a4134d5 产品分化路由调整以及剧本发布样式调整 2019-10-10 14:08:23 +08:00
fan
758eccd074 产品分化调整 2019-10-10 13:56:33 +08:00
fan
95a6103575 产品分化调整 2019-10-10 13:16:00 +08:00
fan
c9f9aa6869 产品分化调整 2019-10-10 13:02:43 +08:00
fan
3381424f0d 产品分化调整 2019-10-10 09:33:56 +08:00
zyy
a8e491ea6e desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明 2019-10-09 17:05:10 +08:00
fan
e27a189952 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-09 15:14:21 +08:00
fan
417c78ec72 产品分化调整优化 2019-10-09 15:14:00 +08:00
joylink_cuiweidong
28ca25b822 处理设计平台菜单栏显示的问题 2019-10-09 14:56:32 +08:00
joylink_cuiweidong
bb9cfc965d 产品分化 实训平台加载剧本接口修改 2019-10-09 14:01:02 +08:00
joylink_cuiweidong
62621b77a0 产品分化 设计平台页面调整 2019-10-09 11:28:11 +08:00
joylink_cuiweidong
b7cb2a36db 产品分化 剧本接口调整 2019-10-09 10:14:30 +08:00
joylink_cuiweidong
2d1f13299e 产品分化运行图接口调整 2019-10-08 18:35:02 +08:00
joylink_cuiweidong
ec4e78548f 产品分化页面调整 2019-10-08 16:09:18 +08:00
zyy
88c1212af0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-08 16:08:19 +08:00
zyy
df43ef4cc3 desc: 调整登陆界面显示 2019-10-08 16:08:13 +08:00
joylink_cuiweidong
672c075ada ibp 车站名称以及上下行车站名称修改 2019-10-08 15:51:19 +08:00
joylink_cuiweidong
db971bf591 产品分化运行图修改 2019-10-08 14:12:53 +08:00
fan
ca413e3331 设计平台运行图调整 2019-09-30 18:11:31 +08:00
fan
641345e801 设计平台调整 2019-09-30 17:56:16 +08:00
fan
588c886f3b Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-30 16:20:51 +08:00
fan
5075e999b9 设计平台调整 2019-09-30 16:20:31 +08:00
joylink_cuiweidong
cad6eeb98e 产品分化 删除地图调整 2019-09-30 16:00:52 +08:00
joylink_cuiweidong
e9638517d8 产品分化 运行图列表调整 2019-09-30 15:18:34 +08:00
joylink_cuiweidong
4fb174f185 产品分化 创建运行图调整 2019-09-30 14:17:20 +08:00
fan
2be7de7527 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 
# Conflicts:
#	src/api/designPlatform.js
 2019-09-30 13:26:13 +08:00
fan
5d27847379 设计平台系统调整 2019-09-30 13:24:47 +08:00
joylink_cuiweidong
c7b5188d74 产品分化 设计平台调整 2019-09-30 10:46:29 +08:00
zyy
25cb199850 desc: 调整登陆页面样式 2019-09-29 19:20:10 +08:00
joylink_cuiweidong
2e1f6739eb 产品分化调整 2019-09-29 16:54:11 +08:00
sunzhenyu
2551a4d595 Merge branch 'dev' into 3dtest 2019-09-29 16:13:21 +08:00
zyy
64a601c967 desc: 调整登陆页面样式 2019-09-29 16:09:40 +08:00
joylink_cuiweidong
53a9dc5feb Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 2019-09-29 15:57:33 +08:00
joylink_cuiweidong
8d4bf59c34 产品分化调整 2019-09-29 15:57:19 +08:00
fan
c9570a4631 暂时提交 2019-09-29 15:55:01 +08:00
fan
dae0ceff57 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-29 15:38:38 +08:00
joylink_cuiweidong
0aa02cc85c 产品分化 地图右键操作调整 2019-09-29 15:25:23 +08:00
fan
7c69943277 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-29 14:28:05 +08:00
fan
6c8a8574da 暂时提交 2019-09-29 14:27:58 +08:00
joylink_cuiweidong
a502d0a118 产品分化 设计平台页面调整以及接口调整 2019-09-29 14:21:06 +08:00
fan
a88cbe11d6 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-29 13:40:15 +08:00
fan
56878d56ec storage存储关联用户 2019-09-29 13:40:01 +08:00
joylink_cuiweidong
2a9f7b38df Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 
# Conflicts:
#	src/router/index.js
 2019-09-27 18:20:10 +08:00
joylink_cuiweidong
1e95cae5e5 产品分化 设计系统界面调整 2019-09-27 18:16:27 +08:00
fan
fd99f913de 城市轨道实训平台调整 2019-09-27 18:02:32 +08:00
zyy
f74ce907b8 desc: 调整获取二维码登陆接口 2019-09-27 15:29:25 +08:00
fan
f9bdaaac4f Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 
# Conflicts:
#	src/router/index.js
 2019-09-27 14:48:50 +08:00
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
zyy
f334814012 desc: 增加琏计划心跳接口 2019-09-27 10:53:48 +08:00
joylink_cuiweidong
58b429f852 地图设计右键操作添加 2019-09-27 10:16:11 +08:00
zyy
f712c93622 desc: 调整权限分发 组织结构配置 2019-09-27 10:06:46 +08:00
zyy
5c973ba468 desc: 调整英文版登陆窗口， 登陆样式调整 2019-09-26 18:40:38 +08:00
joylink_cuiweidong
9d41af74bd 产品分化 导入地图按钮名称修改 2019-09-26 17:46:27 +08:00
zyy
91a93da574 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-26 17:42:32 +08:00
zyy
01cb0a699b desc: 调整权限字段限制， 配置英文版登陆页面 2019-09-26 17:42:25 +08:00
joylink_cuiweidong
5e3e4b77e1 产品分化调整 2019-09-26 17:41:58 +08:00
fan
b69433d8c4 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-26 16:14:15 +08:00
fan
31721a4738 产品分化调整 2019-09-26 16:14:07 +08:00
joylink_cuiweidong
1c73b2dba9 Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 2019-09-26 15:51:34 +08:00
joylink_cuiweidong
3f516ae26b 产品分化 地图绘制按钮调整 2019-09-26 15:51:22 +08:00
fan
bc68f1adc9 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-26 15:43:56 +08:00
fan
2ce7cde8cb 调整icon导致x替换问题 2019-09-26 15:43:19 +08:00
fan
613f1f3b95 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 
# Conflicts:
#	src/router/index.js
 2019-09-26 15:13:47 +08:00
fan
1fb0cf3e94 产品分化调整 2019-09-26 15:08:53 +08:00
joylink_cuiweidong
6664d33ed2 产品分化剧本设计调整 2019-09-26 13:21:15 +08:00
joylink_cuiweidong
293cee8d2f 剧本管理bug修改 2019-09-26 11:07:30 +08:00
joylink_cuiweidong
5964baeea1 国际化调整 2019-09-26 10:59:38 +08:00
joylink_cuiweidong
0bb8e6ba0b 产品分化剧本修改 2019-09-26 10:54:07 +08:00
zyy
bf085f5de6 Merge branch 'master' into dev 2019-09-26 10:06:27 +08:00
zyy
7ae79fd7e4 desc: 调整二维码字段 2019-09-26 10:03:20 +08:00
zyy
488ec91f23 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-26 09:23:09 +08:00
zyy
0b1ae44c19 desc: 调整三号线现地操作 2019-09-26 09:23:02 +08:00
joylink_cuiweidong
bde4904b2a 产品分化调整 2019-09-26 09:07:19 +08:00
fan
0fac6ce22e 产品分化调整 2019-09-25 18:56:30 +08:00
joylink_cuiweidong
1f27473d44 Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 2019-09-25 15:34:40 +08:00
joylink_cuiweidong
edcfd5f738 产品分化调整 2019-09-25 15:34:29 +08:00
fan
37dd77bc55 上下拖拽尺寸调整 2019-09-25 15:32:44 +08:00
sunzhenyu
f5c362ff0b Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-09-25 14:55:34 +08:00
sunzhenyu
4faceb5bd0 修改样式 2019-09-25 14:55:29 +08:00
fan
6e14ba3382 设计平台调整 2019-09-25 14:52:21 +08:00
sunzhenyu
af17dbece4 新数据存读 2019-09-25 14:49:25 +08:00
fan
5f7fe163d5 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-25 13:05:10 +08:00
fan
e7d7ad76f0 实训平台调整 2019-09-25 13:05:01 +08:00
joylink_cuiweidong
2c32dbc655 产品分化菜单栏调整 2019-09-25 11:21:31 +08:00
zyy
b3830f2cc5 desc: 新增现地 自动生成课程 2019-09-25 10:46:35 +08:00
fan
a73ae082a8 elementUI图标替换英文X 2019-09-25 09:39:04 +08:00
fan
575ca24299 产品分化调整：添加测试路由跳转 2019-09-25 09:32:48 +08:00
fan
155229e205 产品分化调整：注释测试路由跳转 2019-09-25 09:29:00 +08:00
fan
522b94fcfe 产品分化调整 2019-09-25 09:18:28 +08:00
fan
8daaffc854 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 
# Conflicts:
#	src/views/login/index.vue
 2019-09-24 15:56:49 +08:00
fan
7e72a54f8c 控制只在第一次进入时变全屏 2019-09-24 15:54:59 +08:00
zyy
8212759438 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-24 15:06:56 +08:00
zyy
a0ee753bfd desc: 调整成都三号线自动生成课程配置，部分内容 (待调) 2019-09-24 15:06:45 +08:00
fan
b998eee746 产品分化调整 2019-09-24 15:03:03 +08:00
joylink_cuiweidong
27d7431b9e 国际化调整 2019-09-24 14:09:26 +08:00
joylink_cuiweidong
0d1a4982ee 解决 支付产品名称没有拿到的问题 2019-09-24 13:44:35 +08:00
fan
d863e61b33 Revert "revert 01c97f45aea75ec8db5a0726c82a2e83fa14750e" 
This reverts commit 6ad0eebb2e.
 2019-09-24 13:32:28 +08:00
fan
6ad0eebb2e revert 01c97f45ae 2019-09-24 13:23:50 +08:00
fan
17b4d631d4 演练室样式微调 2019-09-24 13:16:14 +08:00
fan
d4ec49ea16 国际化调整 2019-09-24 12:58:41 +08:00
fan
bc3ec657d2 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-24 11:33:06 +08:00
fan
1f047ea340 Merge remote-tracking branch 'origin/test' into dev 2019-09-24 11:32:44 +08:00
fan
e95023fcf3 国际化调整 2019-09-24 11:26:28 +08:00
fan
ce7decc188 产品分化调整 2019-09-24 11:05:10 +08:00
joylink_cuiweidong
823eb02b90 产品分化菜单栏调整 2019-09-24 10:51:41 +08:00
fan
622ba7b5f2 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-23 17:53:16 +08:00
joylink_cuiweidong
fd8a1817c5 菜单栏调整 2019-09-23 17:52:44 +08:00
fan
9c3071dc4b Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-23 17:51:34 +08:00
joylink_cuiweidong
7514a7657f 菜单栏调整 2019-09-23 17:50:07 +08:00
fan
b7043ff7de Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-23 17:49:16 +08:00
fan
d063625c45 产品分化调整 2019-09-23 17:49:04 +08:00
joylink_cuiweidong
5ba93805c1 菜单栏调整 2019-09-23 17:47:54 +08:00
zyy
2d60c78a74 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue
 2019-09-23 13:37:59 +08:00
zyy
01c97f45ae desc: 调整琏计划导入excel, 样式， 流程 2019-09-23 13:37:11 +08:00
fan
517ddbcff0 国际化调整 2019-09-23 09:48:13 +08:00
fan
dc5edddde0 国际化调整 2019-09-19 18:53:28 +08:00
fan
a182d7d0b2 国际化调整 2019-09-19 18:51:57 +08:00
zyy
9371d956af desc: 调整冲突, 增加导入运行图国际化 2019-09-19 17:34:04 +08:00
zyy
b5b9f4c1ff Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/en/tip.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/tip.js
#	src/views/planMonitor/editTool/menuBar.vue
#	src/views/planMonitor/editTool/menus/createEmptyPlan.vue
#	src/views/planMonitor/editTool/menus/editPlanName.vue
#	src/views/planMonitor/editTool/menus/modifyingTask.vue
#	src/views/planMonitor/editTool/menus/openRunPlan.vue
 2019-09-19 17:28:31 +08:00
zyy
48ea44a980 desc: 调整权限国际化，调整琏计划导入运行图逻辑 2019-09-19 17:22:48 +08:00
joylink_cuiweidong
98054a93ff Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-19 17:11:11 +08:00
joylink_cuiweidong
706a9502d8 国际化调整 2019-09-19 17:11:00 +08:00
fan
9b40afa4ea Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-19 16:12:22 +08:00
fan
676fc71ee5 国际化调整 2019-09-19 16:12:05 +08:00
joylink_cuiweidong
94eeeb0916 国际化调整 2019-09-19 14:58:41 +08:00
fan
607abd877f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-19 14:15:22 +08:00
fan
cf8f562a48 国际化调整 2019-09-19 14:14:49 +08:00
joylink_cuiweidong
0e7fdb354c 国际化调整 2019-09-19 13:19:35 +08:00
zyy
4f716b502c desc: 恢复权限创建按钮 2019-09-19 09:34:18 +08:00
ival
8b4aee040a 注释掉订单入口 2019-09-18 18:45:18 +08:00
zyy
591110ddec Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/zh/orderAuthor.js
#	src/i18n/langs/zh/permission.js
#	src/views/orderauthor/permission/create/order.vue
 2019-09-18 18:41:46 +08:00
zyy
1d26a9f1fb desc: 新增创建权限流程 2019-09-18 18:39:55 +08:00
joylink_cuiweidong
5f4412dd40 国际化调整 2019-09-18 17:28:24 +08:00
joylink_cuiweidong
9ace0842a5 发布内容管理 国际化 2019-09-18 16:04:34 +08:00
joylink_cuiweidong
ae68018734 发布内容管理 国际化 2019-09-18 13:36:57 +08:00
joylink_cuiweidong
9bc06e4f59 地图绘制国际化调整 2019-09-18 11:11:23 +08:00
ival
f13685da07 修改代码 2019-09-18 10:03:58 +08:00
ival
7b0cf81d45 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2019-09-17 16:54:14 +08:00
ival
0b7b0e39c1 过滤首页订阅的地图没有name的数据 2019-09-17 16:53:29 +08:00
joylink_cuiweidong
ffdba3dc22 国际化调整 2019-09-17 16:08:11 +08:00
joylink_cuiweidong
a116539d80 国际化调整 2019-09-17 13:54:10 +08:00
sunzhenyu
183f972884 pull 2019-09-17 13:16:49 +08:00
zyy
815c2e6db4 desc: 调整信号机显示位置 2019-09-16 17:58:01 +08:00
zyy
c5c71253df desc: 调整信号机字段显示，调整创建权限逻辑 2019-09-16 17:31:12 +08:00
zyy
7abab1ba28 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-16 16:00:09 +08:00
zyy
ab9a02e232 desc: 调整琏计划运行图样式 2019-09-16 15:59:53 +08:00
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
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
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
7a284fea4a 国际化调整 2019-09-12 09:25:33 +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
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
9c5f1f7633 国际化调整 2019-09-11 13:20:03 +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
fan
8083656e16 ibp删除钥匙孔 2019-09-10 10:26:18 +08:00
fan
0c9e367f3d ibp修改扶梯框边框宽度，调整select默认状态 2019-09-10 10:16:02 +08:00
joylink_cuiweidong
26472da421 钥匙组件代码重新封装 2019-09-09 19:03:23 +08:00
fan
a32bda33f1 ibp调整代码 2019-09-09 18:03:32 +08:00
fan
80ce4e19a8 ibp调整 2019-09-09 16:11:43 +08:00
sunzhenyu
4e1f95e900 Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-09-09 10:22:21 +08:00
fan
760aa02496 ibp调整页面 2019-09-06 18:17:54 +08:00
fan
6b96fc928d ibp删除console 2019-09-06 17:42:36 +08:00
zyy
46a3f64f4d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 17:22:03 +08:00
zyy
ba21d7af9d desc: 修改权限打包字段， 修改地图绘制区段逻辑 2019-09-06 17:21:54 +08:00
fan
ddfeeb6718 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-06 16:55:31 +08:00
fan
3faf8f3906 ibp盘调整 2019-09-06 16:54:55 +08:00
zyy
10c4083ad3 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 15:54:11 +08:00
zyy
7b0b0d6d0c desc: 修改绘制地图赋值 2019-09-06 15:54:05 +08:00
fan
327c35355f ibp盘调整 2019-09-06 15:21:21 +08:00
fan
80edc1ad20 ibp盘调整 2019-09-06 15:08:47 +08:00
fan
32dab2fa7d Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-06 14:48:47 +08:00
fan
ceccbbc825 ibp盘调整 2019-09-06 14:48:06 +08:00
zyy
1faa4e0add Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 14:21:08 +08:00
zyy
11a49d1442 desc: 增加加载运行图模板接口，调整地图绘制优化 2019-09-06 14:21:01 +08:00
fan
20acc0e667 ibp盘调整 2019-09-06 10:27:13 +08:00
fan
fa604188b0 ibp盘调整 2019-09-06 09:55:16 +08:00
fan
455202a851 ibp盘调整 2019-09-05 18:54:54 +08:00
fan
c4bf259918 销毁实例前清除ibp数据 2019-09-05 09:35:32 +08:00
fan
063b6392fc 查询剧本列表接口调整展示调整 2019-09-05 09:07:16 +08:00
zyy
935e42fa5b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 19:07:04 +08:00
zyy
921ef7c03d desc: 调整接口请求次数 2019-09-04 19:06:55 +08:00
ival
33c4a3afc2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 19:00:38 +08:00
ival
02fc21e544 增加仿真的大屏角色以及IBP角色 2019-09-04 19:00:22 +08:00
fan
e24a0e1b4d Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-04 18:48:10 +08:00
fan
8df4cfd6e1 ibp代码调整 2019-09-04 18:47:49 +08:00
zyy
0f9b0f84a5 desc: 删除多余打印 2019-09-04 18:29:47 +08:00
zyy
1d7809bc33 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 17:58:56 +08:00
zyy
509e5218a7 desc: 调整引用问题 2019-09-04 17:58:22 +08:00
sunzhenyu
ebd1b211d1 Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-09-04 17:36:15 +08:00
ival
8b56d035eb 修改按钮顺序 2019-09-04 17:19:26 +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
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
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
ival
0879aef961 增加派班计划loading 2019-09-03 18:37:00 +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
bd494599a6 desc: 修改显示权限title 2019-09-03 17:03:05 +08:00
sunzhenyu
1af9b755d7 t ：Merge branch 'test' into dev 2019-09-03 16:56:20 +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
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
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