Commit Graph

33 Commits

Author SHA1 Message Date
zyy
feca56f94b 调整字段名称显示,调整佛山线路标注字段 2020-04-14 09:48:54 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00
zyy
74f0b12e3c 修改运行图显示,调整进路列表展示 2019-12-25 18:45:48 +08:00
joylink_cuiweidong
5ac012fc79 运行图代码调整 2019-11-21 09:34:55 +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
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
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
fan
4918c78204 删除接口:/api/runPlan/draft/station/{skinCode}/bySkin 2019-10-30 16:50:35 +08:00
fan
2107549d72 更换接口:/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details 2019-10-30 13:07:07 +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
joylink_cuiweidong
2d1f13299e 产品分化运行图接口调整 2019-10-08 18:35:02 +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
fan
cf8f562a48 国际化调整 2019-09-19 14:14:49 +08:00
sunzhenyu
183f972884 pull 2019-09-17 13:16:49 +08:00
zyy
a037937627 desc: 调整运行图生成逻辑 2019-09-04 14:47:52 +08:00
zyy
b96701aceb desc: 调整运行图加载 2019-09-04 11:28:24 +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
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
ce82f25422 修改代码 2019-07-30 09:48:14 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00