joylink_cuiweidong
|
1b342fee6e
|
地图列表获取城市列表样式调整
|
2019-10-18 16:57:40 +08:00 |
|
sunzhenyu
|
5c79ab8216
|
去掉辅助线
|
2019-10-18 15:43:00 +08:00 |
|
ival
|
5e83d06250
|
修改计时组件样式
|
2019-10-18 15:35:48 +08:00 |
|
sunzhenyu
|
45c2954f53
|
注释
|
2019-10-18 15:30:26 +08:00 |
|
sunzhenyu
|
a7e7988754
|
修复路径判断
|
2019-10-18 15:29:17 +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 |
|
sunzhenyu
|
4a8e5a9cb2
|
url
|
2019-10-18 10:06:04 +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 |
|
sunzhenyu
|
9bd43b2ee2
|
修改模型路径
|
2019-10-17 18:56:25 +08:00 |
|
zyy
|
140d84bf56
|
desc: 调整登陆页面样式
|
2019-10-17 18:55:46 +08:00 |
|
sunzhenyu
|
0e6b902d71
|
pull
|
2019-10-17 18:49:47 +08:00 |
|
sunzhenyu
|
7d98ea5f18
|
pull
|
2019-10-17 18:49:19 +08:00 |
|
sunzhenyu
|
f847629b92
|
修改文字显示，行车路径，行车计算
|
2019-10-17 18:48:36 +08:00 |
|
zyy
|
7b5255c3eb
|
desc: 调整格式化，样式
|
2019-10-17 18:27:49 +08:00 |
|
fan
|
31beb32ae0
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-17 18:09:54 +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 |
|
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
|
a9721b05eb
|
ibp调整
|
2019-10-17 10:16:23 +08:00 |
|
fan
|
11190ef66f
|
代码整合调整
|
2019-10-17 10:13:08 +08:00 |
|
joylink_cuiweidong
|
a264ab51cb
|
已发布地图剧本列表页面调整
|
2019-10-17 10:06:52 +08:00 |
|
fan
|
0118f94e6c
|
整合产品分化
|
2019-10-17 09:46:48 +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 |
|