joylink_cuiweidong
|
72ca1a24b2
|
运行图编制代码调整
|
2020-11-11 14:36:11 +08:00 |
|
joylink_cuiweidong
|
dee6c30f2f
|
运行图编制代码调整
|
2020-11-11 11:22:26 +08:00 |
|
joylink_cuiweidong
|
582aa76b4d
|
运行图编辑代码调整
|
2020-11-05 15:24:41 +08:00 |
|
joylink_cuiweidong
|
9dc3911d6d
|
运行图编制代码调整
|
2020-11-04 17:05:23 +08:00 |
|
joylink_cuiweidong
|
0f3c1e9ab8
|
运行图代码调整
|
2020-11-04 10:46:55 +08:00 |
|
zyy
|
74be1ba604
|
调整运行图加载
|
2020-10-29 11:07:55 +08:00 |
|
zyy
|
316249fbd6
|
调整多余配置路径
|
2020-10-28 13:51:26 +08:00 |
|
joylink_cuiweidong
|
433e839e75
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
2020-10-28 10:36:18 +08:00 |
|
zyy
|
791e02aaf7
|
调整接口删除多余配置
|
2020-10-28 10:22:46 +08:00 |
|
joylink_cuiweidong
|
0577561295
|
代码调整
|
2020-10-28 10:10:46 +08:00 |
|
fan
|
7e91cb2b3c
|
删除旧版地图drawWay参数使用
|
2020-10-26 11:07:49 +08:00 |
|
fan
|
e2dbbb5f0b
|
删除旧版仿真
|
2020-10-23 18:05:55 +08:00 |
|
joylink_cuiweidong
|
683f73c005
|
运行图 展示界面 车次号调整
|
2020-10-22 18:30:02 +08:00 |
|
joylink_cuiweidong
|
50620f9447
|
代码调整
|
2020-10-22 17:34:49 +08:00 |
|
joylink_cuiweidong
|
9af669f708
|
运行图绘制代码调整
|
2020-10-22 17:30:56 +08:00 |
|
joylink_cuiweidong
|
c7d99e7913
|
运行图编辑代码调整
|
2020-10-22 13:34:08 +08:00 |
|
joylink_cuiweidong
|
3d1c5dacd4
|
运行图 增加任务 添加了 起始终到车站的筛选
|
2020-10-22 09:53:29 +08:00 |
|
joylink_cuiweidong
|
4eb69d03a6
|
运行图代码调整
|
2020-10-21 18:40:02 +08:00 |
|
joylink_cuiweidong
|
c684dd5149
|
运行图代码调整
|
2020-10-21 17:39:52 +08:00 |
|
joylink_cuiweidong
|
8fd587ac13
|
运行图代码调整
|
2020-10-21 17:19:47 +08:00 |
|
joylink_cuiweidong
|
14f54eeb85
|
运行图代码调整
|
2020-10-21 16:12:19 +08:00 |
|
joylink_cuiweidong
|
103c306313
|
运行图代码调整
|
2020-10-21 15:16:30 +08:00 |
|
joylink_cuiweidong
|
cc196d9696
|
运行图添加 修改计划号 和 修改任务车次号
|
2020-10-21 14:03:25 +08:00 |
|
joylink_cuiweidong
|
181a1491da
|
运行图代码调整
|
2020-10-21 11:07:10 +08:00 |
|
joylink_cuiweidong
|
ab4f13d5f0
|
运行图代码调整
|
2020-10-20 20:25:45 +08:00 |
|
joylink_cuiweidong
|
9783691cf2
|
代码调整
|
2020-10-20 18:10:26 +08:00 |
|
joylink_cuiweidong
|
fe0e1c3e32
|
运行图编制工具代码调整
|
2020-10-20 17:21:02 +08:00 |
|
joylink_cuiweidong
|
5ff38125a2
|
代码调整
|
2020-10-20 09:10:53 +08:00 |
|
joylink_cuiweidong
|
2f3be6bb18
|
运行图 服务号两位校验变成2~3位
运行图 增加任务 停战时间事件代码调整
修改任务代码调整
|
2020-10-19 18:41:15 +08:00 |
|
joylink_cuiweidong
|
7e94880364
|
运行图代码调整
|
2020-10-19 15:08:30 +08:00 |
|
joylink_cuiweidong
|
6b65c641a7
|
运行图代码调整
|
2020-10-19 10:25:36 +08:00 |
|
joylink_cuiweidong
|
9f7e37393b
|
新版运行图代码调整
|
2020-10-19 10:10:29 +08:00 |
|
joylink_cuiweidong
|
913b1c9b71
|
新版运行图代码调整（未完成）
|
2020-10-16 19:04:44 +08:00 |
|
zyy
|
8a3287ca22
|
删除多余代码注释
|
2020-08-27 13:13:15 +08:00 |
|
fan
|
6008dfc143
|
运行图调整
|
2020-08-17 18:12:51 +08:00 |
|
fan
|
44e05a0875
|
哈尔滨设备编辑运行图
|
2020-08-14 18:30:04 +08:00 |
|
fan
|
150f047552
|
设备登录添加实训考试运行图编辑
|
2020-08-14 10:55:32 +08:00 |
|
zyy
|
106d217e63
|
调整导入运行图判断
|
2020-05-29 18:26:12 +08:00 |
|
zyy
|
7baea26e4d
|
拦截错误并提示
|
2020-04-22 13:57:19 +08:00 |
|
zyy
|
66b8c03fef
|
调整站间运行时间计算
|
2020-04-16 17:58:59 +08:00 |
|
zyy
|
cc984c8eb0
|
调整佛山线路，成都一号线运行图 方向信息
|
2020-04-14 10:27:33 +08:00 |
|
zyy
|
feca56f94b
|
调整字段名称显示，调整佛山线路标注字段
|
2020-04-14 09:48:54 +08:00 |
|
fan
|
ab4928d924
|
差异化打包调整&哈尔滨登录页
|
2020-03-30 13:07:11 +08:00 |
|
zyy
|
3afa12711e
|
新增哈尔滨线路底部栏 操作
|
2020-03-18 18:47:37 +08:00 |
|
zyy
|
3f5d74426e
|
更新数据
|
2020-02-14 11:22:35 +08:00 |
|
zyy
|
9c48c653d0
|
调整请求参数
|
2020-02-13 13:59:10 +08:00 |
|
zyy
|
0d91bc7c49
|
调整时间格式
|
2020-02-13 13:42:19 +08:00 |
|
zyy
|
f82c4a195e
|
调整创建运行图表单数据
|
2020-02-13 12:35:44 +08:00 |
|
zyy
|
42c11d0b7c
|
修改创建运行图表单
|
2020-02-13 12:14:39 +08:00 |
|
zyy
|
e884f3adc6
|
新增创建运行图表单
|
2020-02-10 16:27:43 +08:00 |
|
zyy
|
5a3b415202
|
删除运行图工具栏
|
2020-01-07 14:49:51 +08:00 |
|
joylink_cuiweidong
|
cad56a82e9
|
Merge branch 'dev_prd' into dev
# Conflicts:
# src/views/demonstration/detail/index.vue
|
2019-12-30 18:45:05 +08:00 |
|
joylink_cuiweidong
|
8e82ceab27
|
权限打包页面接口调整（/api/lesson）
|
2019-12-26 13:12:23 +08:00 |
|
zyy
|
74f0b12e3c
|
修改运行图显示，调整进路列表展示
|
2019-12-25 18:45:48 +08:00 |
|
zyy
|
26d06cae27
|
调整运行图导入判断，删除进路数据字段
|
2019-12-23 13:24:00 +08:00 |
|
zyy
|
6ec990a1b2
|
解析宁波一号线运行图
|
2019-12-23 09:15:25 +08:00 |
|
joylink_cuiweidong
|
5ac012fc79
|
运行图代码调整
|
2019-11-21 09:34:55 +08:00 |
|
joylink_cuiweidong
|
f68cb84648
|
代码调整
|
2019-11-18 15:42:05 +08:00 |
|
joylink_cuiweidong
|
98b32d1eae
|
代码修改
|
2019-11-18 15:07:22 +08:00 |
|
joylink_cuiweidong
|
a1ff86bd05
|
代码调整
|
2019-11-18 14:01:06 +08:00 |
|
joylink_cuiweidong
|
744bd60d9e
|
代码调整
|
2019-11-18 12:28:08 +08:00 |
|
joylink_cuiweidong
|
a6797dbe85
|
运行图设计样式调整
|
2019-11-15 15:45:40 +08:00 |
|
joylink_cuiweidong
|
62599dd838
|
运行图设计点击车次号高亮调整
|
2019-11-15 14:33:03 +08:00 |
|
zyy
|
cb7d7de930
|
desc: 修改代码
|
2019-11-14 18:53:52 +08:00 |
|
zyy
|
63d89a71b1
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/planMonitor/editTool/schedule.vue
|
2019-11-14 17:06:53 +08:00 |
|
zyy
|
b189b64650
|
修改element版本 调整高度样式
|
2019-11-14 17:06:00 +08:00 |
|
joylink_cuiweidong
|
950ca18082
|
代码调整
|
2019-11-14 17:03:44 +08:00 |
|
joylink_cuiweidong
|
fe23a03e69
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/store/modules/permission.js
|
2019-11-14 15:59:32 +08:00 |
|
joylink_cuiweidong
|
595747be2a
|
代码调整
|
2019-11-14 15:54:58 +08:00 |
|
joylink_cuiweidong
|
6fcba825f2
|
运行图设计代码调整
|
2019-11-14 10:50:11 +08:00 |
|
zyy
|
0cb102186f
|
desc: 修改echarts加载方式
|
2019-11-12 17:20:23 +08:00 |
|
joylink_cuiweidong
|
e8c8e491f5
|
skinCode调整
|
2019-11-11 15:54:04 +08:00 |
|
joylink_cuiweidong
|
b923fa2a6b
|
代码调整
|
2019-11-08 15:17:04 +08:00 |
|
zyy
|
4483ee9253
|
desc: 导入运行图增加提示
|
2019-11-08 14:56:39 +08:00 |
|
joylink_cuiweidong
|
11226b84ab
|
运行图设计代码调整
|
2019-11-08 14:35:58 +08:00 |
|
joylink_cuiweidong
|
713f411ffc
|
运行图设计调整
|
2019-11-08 13:47:51 +08:00 |
|
fan
|
c203f7b839
|
skinCode 调整
|
2019-11-08 10:08:28 +08:00 |
|
fan
|
1bd3debbde
|
西铁院登录页样式调整，测试问题调整
|
2019-11-04 18:41:58 +08:00 |
|
zyy
|
7ec68a75e3
|
desc: 删除多余文件， 调整路径配置
|
2019-10-31 17:30:24 +08:00 |
|
fan
|
3dff70d821
|
运行图调整
|
2019-10-30 19:04:21 +08:00 |
|
fan
|
36c33ed416
|
修改接口：/api/runPlan/template/skin/{mapId} 改为 /api/runPlan/template/{mapId}/list
|
2019-10-30 17:21:32 +08:00 |
|
fan
|
6d0edb2370
|
合并代码
|
2019-10-30 16:57:01 +08:00 |
|
fan
|
4918c78204
|
删除接口：/api/runPlan/draft/station/{skinCode}/bySkin
|
2019-10-30 16:50:35 +08:00 |
|
joylink_cuiweidong
|
c80d2ed536
|
接口调整
多余文件删除
|
2019-10-30 14:00:50 +08:00 |
|
fan
|
2107549d72
|
更换接口：/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details
|
2019-10-30 13:07:07 +08:00 |
|
fan
|
78f9d58321
|
登录token存储修改
|
2019-10-25 18:30:23 +08:00 |
|
fan
|
d5b6f172e9
|
Merge remote-tracking branch 'origin/test' into dev
|
2019-10-25 17:09:02 +08:00 |
|
fan
|
12d25d1643
|
运行图测试运行调整，西铁院登录页路由调整
|
2019-10-25 16:45:17 +08:00 |
|
joylink_cuiweidong
|
6df1eecfc3
|
代码调整
|
2019-10-25 16:33:35 +08:00 |
|
sunzhenyu
|
7d98ea5f18
|
pull
|
2019-10-17 18:49:19 +08:00 |
|
fan
|
11190ef66f
|
代码整合调整
|
2019-10-17 10:13:08 +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
|
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
|
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
|
bb9cfc965d
|
产品分化 实训平台加载剧本接口修改
|
2019-10-09 14:01:02 +08:00 |
|
joylink_cuiweidong
|
2d1f13299e
|
产品分化运行图接口调整
|
2019-10-08 18:35:02 +08:00 |
|
joylink_cuiweidong
|
db971bf591
|
产品分化运行图修改
|
2019-10-08 14:12:53 +08:00 |
|
fan
|
ca413e3331
|
设计平台运行图调整
|
2019-09-30 18:11:31 +08:00 |
|
joylink_cuiweidong
|
e9638517d8
|
产品分化 运行图列表调整
|
2019-09-30 15:18:34 +08:00 |
|
joylink_cuiweidong
|
4fb174f185
|
产品分化 创建运行图调整
|
2019-09-30 14:17:20 +08:00 |
|
zyy
|
f334814012
|
desc: 增加琏计划心跳接口
|
2019-09-27 10:53:48 +08:00 |
|
zyy
|
01c97f45ae
|
desc: 调整琏计划导入excel, 样式， 流程
|
2019-09-23 13:37:11 +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
|
cf8f562a48
|
国际化调整
|
2019-09-19 14:14:49 +08:00 |
|
sunzhenyu
|
183f972884
|
pull
|
2019-09-17 13:16:49 +08:00 |
|
sunzhenyu
|
b8afc684a3
|
pull
|
2019-09-17 10:51:38 +08:00 |
|
zyy
|
ba21d7af9d
|
desc: 修改权限打包字段， 修改地图绘制区段逻辑
|
2019-09-06 17:21:54 +08:00 |
|
zyy
|
509e5218a7
|
desc: 调整引用问题
|
2019-09-04 17:58:22 +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
|
a037937627
|
desc: 调整运行图生成逻辑
|
2019-09-04 14:47:52 +08:00 |
|
zyy
|
b96701aceb
|
desc: 调整运行图加载
|
2019-09-04 11:28:24 +08:00 |
|
sunzhenyu
|
3d977cc124
|
pull
|
2019-09-03 16:50:15 +08:00 |
|
ival
|
61de3c222d
|
App.vue页面增加全局尺寸混入并存放在app store，其他页面删除混入
|
2019-09-02 15:37:57 +08:00 |
|
sunzhenyu
|
d7efef41e4
|
pull
|
2019-08-29 17:16:33 +08:00 |
|
ival
|
adc6828060
|
修改跳转路由后，页面不加载的问题
|
2019-08-20 10:34:41 +08:00 |
|
zyy
|
e08a400b06
|
desc: 修改琏计划运行图创建加载
|
2019-08-16 17:13:12 +08:00 |
|
zyy
|
b84b6ea500
|
desc: 修改地图编辑页面逻辑
|
2019-08-16 15:12:03 +08:00 |
|
ival
|
87e35cb38d
|
同步master代码以及修改交路的问题
|
2019-08-14 16:37:17 +08:00 |
|
ival
|
3bb449080f
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/i18n/langs/zh/tip.js
# src/jlmap3d/jl3ddrive/jl3ddrive.js
# src/views/components/pay/index.vue
# src/views/demonstration/detail/index.vue
# src/views/display/index.vue
# src/views/exam/detail/courseDetail.vue
# src/views/exam/detail/examDetail.vue
# src/views/exam/detail/questionDetail.vue
# src/views/jlmap3d/drive/jl3ddrive.vue
# src/views/jlmap3d/simulation/jl3dsimulation.vue
# src/views/jointTraining/index.vue
# src/views/map/mapdraft/mapedit/automaticoperate/preview.vue
# src/views/map/mapdraft/mapedit/mapoperate/link.vue
# src/views/map/mapdraft/mapedit/mapoperate/section.vue
# src/views/map/mapdraft/mapedit/mapoperate/signal.vue
# src/views/map/mapdraft/mapedit/mapoperate/station.vue
# src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
# src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
# src/views/map/mapdraft/mapedit/mapoperate/stoppoint.vue
# src/views/map/mapdraft/mapedit/mapoperate/switch.vue
# src/views/map/mapdraft/mapedit/pathoperate/pathRoute.vue
# src/views/map/mapdraft/mapedit/routeoperate/detail.vue
# src/views/map/mapdraft/mapedit/routeoperate/preview.vue
# src/views/map/mapdraft/mapedit/routeoperate/related.vue
# src/views/map/mapdraft/mapedit/routeoperate/route.vue
# src/views/map/mapdraft/mapmanage/operateMenu.vue
# src/views/map/product/draft.vue
# src/views/map/product/list.vue
# src/views/map/skinStyle/draft.vue
# src/views/map/skinStyle/index.vue
# src/views/planMonitor/detail.vue
# src/views/planMonitor/editTool/index.vue
# src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
# src/views/planMonitor/editTool/schedule.vue
# src/views/teach/detail/index.vue
# src/views/teach/practical/index.vue
|
2019-08-14 15:57:52 +08:00 |
|
ival
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
zyy
|
9049d793cc
|
desc: 修改琏计划界面样式，修改界面交互
|
2019-08-13 15:54:26 +08:00 |
|
ival
|
763cff0a7c
|
修改页面不刷新的问题
|
2019-08-09 18:29:08 +08:00 |
|
ival
|
6fad38621b
|
修改运行图编辑因为家在地图数据而报错的问题
|
2019-08-09 16:57:07 +08:00 |
|
ival
|
dbc3cbf482
|
修改运行图编辑工具报错bug
|
2019-08-08 13:36:53 +08:00 |
|
zyy
|
a010f71252
|
调整运行图加载， eventbus代码调整
|
2019-08-02 10:58:28 +08:00 |
|
zyy
|
04e13a7a73
|
调整代码
|
2019-08-02 10:36:17 +08:00 |
|
ival
|
276f68e7bc
|
修改优化代码
|
2019-07-30 16:47:11 +08:00 |
|
ival
|
ce82f25422
|
修改代码
|
2019-07-30 09:48:14 +08:00 |
|
ival
|
05c90f1079
|
修改代码
|
2019-07-29 16:03:14 +08:00 |
|
ival
|
9f5130a4f2
|
代码移植
|
2019-07-26 13:32:43 +08:00 |
|