Commit Graph

82 Commits

Author SHA1 Message Date
joylink_cuiweidong
a46f94f85e 产品分化 设计系统调整 2019-09-30 17:31:40 +08:00
fan
56878d56ec storage存储关联用户 2019-09-29 13:40:01 +08:00
joylink_cuiweidong
6664d33ed2 产品分化剧本设计调整 2019-09-26 13:21:15 +08:00
joylink_cuiweidong
bde4904b2a 产品分化调整 2019-09-26 09:07:19 +08:00
joylink_cuiweidong
7abd6ddeea 产品分化调整 2019-09-25 13:45:20 +08:00
joylink_cuiweidong
823eb02b90 产品分化菜单栏调整 2019-09-24 10:51:41 +08:00
joylink_cuiweidong
5ba93805c1 菜单栏调整 2019-09-23 17:47:54 +08:00
zyy
f48a513df0 desc: 调整绘图逻辑,流程,字段显示 2019-09-12 16:30:42 +08:00
ival
f774edd652 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 16:11:46 +08:00
ival
7c5d453c29 修改绘制地图同步数据逻辑 2019-09-06 16:11:28 +08:00
fan
84d2c2f014 ibp盘调整 2019-09-05 17:47:05 +08:00
fan
743fa388c4 代码调整 2019-09-04 10:56:44 +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
ival
61de3c222d App.vue页面增加全局尺寸混入并存放在app store,其他页面删除混入 2019-09-02 15:37:57 +08:00
ival
94d1103e58 设置全局尺寸变化 2019-09-02 10:38:10 +08:00
ival
03daccff77 修改登录session的问题 2019-09-02 10:11:57 +08:00
fan
8fa43ce797 ibp盘调整 2019-08-30 17:43:17 +08:00
ival
cc54830f01 修改代码格式以及操作的bug 2019-08-29 10:33:50 +08:00
ival
1aac4ee929 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-29 09:32:12 +08:00
ival
c2f6cf4656 移除jlmap中的地图原始数据 2019-08-29 09:30:52 +08:00
fan
453a909f01 ibp盘 2019-08-29 09:26:14 +08:00
fan
f0f7ac1111 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
#	src/views/ibp/ibpDraft/ibpEdit/index.vue
2019-08-28 10:02:42 +08:00
fan
6a0d41f09a 调整代码: ibp 2019-08-28 09:57:32 +08:00
zyy
01a2b42912 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-27 18:32:32 +08:00
zyy
498f093866 desc: 新增按钮类型 2019-08-27 18:32:26 +08:00
fan
b2eb2076b0 ibp 2019-08-27 14:17:36 +08:00
zyy
fde4d41727 desc: 修改样式,地图更新坐标 2019-08-22 10:25:23 +08:00
ival
1993de8548 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 15:01:13 +08:00
ival
242e082dc7 修改列车操作 2019-08-21 15:00:58 +08:00
joylink_cuiweidong
52c4106a75 背景只能保存一次 2019-08-21 14:28:34 +08:00
ival
72f1c63e22 修改设置仿真状态 2019-08-20 18:46:51 +08:00
ival
474b1fff18 修改仿真暂停字段归属文件 2019-08-20 18:44:02 +08:00
ival
0191158f87 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-20 18:35:59 +08:00
ival
de0fd028ed 设置时间暂停 2019-08-20 18:35:42 +08:00
joylink_cuiweidong
7f2c741818 剧本列表页面 样式调整 2019-08-20 17:54:40 +08:00
ival
28c6e05c41 修改获取列车数据没有刷新,导致加载的问题 2019-08-20 09:55:49 +08:00
joylink_cuiweidong
4dbe34cf4f 剧本编制模块修改 2019-08-19 18:24:06 +08:00
joylink_cuiweidong
43dfc04281 定时保存数据
剧本编制页面修改
2019-08-19 14:09:08 +08:00
ival
aae4d4d162 修改车次窗的问题 2019-08-16 14:33:36 +08:00
ival
e152829561 修改车次窗不能创建的问题 2019-08-16 14:25:20 +08:00
ival
87e35cb38d 同步master代码以及修改交路的问题 2019-08-14 16:37:17 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +08:00
joylink_cuiweidong
19d26919fc 处理录制剧本时地图不加载的问题 2019-08-12 17:35:55 +08:00
ival
dbd1193679 修改登录涟计划以及大屏等其他系统时,主系统也跳转的问题 2019-08-12 15:39:29 +08:00
ival
763cff0a7c 修改页面不刷新的问题 2019-08-09 18:29:08 +08:00
ival
6fad38621b 修改运行图编辑因为家在地图数据而报错的问题 2019-08-09 16:57:07 +08:00
joylink_cuiweidong
50c57837eb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 18:39:05 +08:00
zyy
b20686c0fa desc: 修改 订阅综合演练房间号发送判断,修改代码格式 2019-08-08 18:34:35 +08:00
joylink_cuiweidong
ee136f8867 获取剧本的地图定位并设置 2019-08-08 17:32:38 +08:00
fan
6b21fefaeb Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 13:47:39 +08:00