Commit Graph

1629 Commits

Author SHA1 Message Date
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
zyy
9087a33937 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 18:20:24 +08:00
zyy
74a2bbb1c6 desc: 调整成都三号现地,行调实训操作 2019-10-18 18:20:17 +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
ival
ef6977249b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 15:18:04 +08:00
ival
03c2317503 拆分指令 2019-10-18 15:17:33 +08:00
joylink_cuiweidong
3f82e45fcb 登录页面 密码隐藏显示 2019-10-18 14:36:14 +08:00
joylink_cuiweidong
d89b692b80 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 11:27:10 +08:00
joylink_cuiweidong
c80c9d467c 剧本列表预览调整 2019-10-18 11:26:11 +08:00
zyy
f92f306dc2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 11:25:33 +08:00
zyy
82aff22132 desc: 修改代码 2019-10-18 11:25:26 +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
zyy
140d84bf56 desc: 调整登陆页面样式 2019-10-17 18:55:46 +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
zyy
0ef17b7a86 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-17 17:56:31 +08:00
fan
ab815ec493 实训管理调整 2019-10-17 17:56:25 +08:00
zyy
b006de669d desc: 调整信号机自排开,自排关,流程 2019-10-17 17:56:24 +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
3fef2c1c9d 代码调整 2019-10-17 14:51:37 +08:00
fan
6924577078 代码调整 2019-10-17 14:39:37 +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
4d4f9e4020 代码整合调整 2019-10-17 14:32:29 +08:00
fan
00c4415fcc 代码整合调整 2019-10-17 14:31:59 +08:00
joylink_cuiweidong
9cd7234081 剧本列表页面调整 2019-10-17 13:54:41 +08:00