Commit Graph

713 Commits

Author SHA1 Message Date
fan
e3e62f85f9 佛山目的地码显示长度调整&联锁配置添加参数generateFls 2020-08-06 15:02:22 +08:00
zyy
aa63af422b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/signal/index.vue
2020-08-06 11:18:48 +08:00
zyy
7ddbe10832 增加信号机批量操作 2020-08-06 11:15:46 +08:00
joylink_cuiweidong
1a844d20e7 地图绘制信号机添加字段(不生成进路的信号机终端) 2020-08-06 10:55:38 +08:00
joylink_cuiweidong
4a8d6fabe3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 13:04:12 +08:00
joylink_cuiweidong
96f6d5030b 哈尔滨一号线 自动触发进路 绘图代码调整 2020-08-05 13:03:53 +08:00
fan
1314ae64b6 调整参数名=》 是否自动折返始端 2020-08-05 11:23:48 +08:00
fan
6214acf235 信号机添加参数routeEnd&融屏测试 2020-08-05 10:57:58 +08:00
zyy
ee7ca07731 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 17:31:20 +08:00
zyy
6dbac54d1f 调整地图绘制相关流程 2020-08-04 17:31:07 +08:00
joylink_cuiweidong
01701479fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 14:02:54 +08:00
joylink_cuiweidong
af0068c972 地图绘制代码调整
剧本录制代码调整
2020-08-04 14:02:10 +08:00
zyy
3f0123a472 调整地图绘制区段修改逻辑 2020-08-04 13:00:42 +08:00
zyy
402a4f48b8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 10:49:33 +08:00
zyy
a8cb84176e 调整大屏逻辑 2020-08-04 10:49:22 +08:00
joylink_cuiweidong
da39b8a1b4 哈尔滨一号线 教研机 切换 通号 层级调整 2020-08-03 19:21:56 +08:00
zyy
4954e5e344 删除注释 2020-08-03 17:42:42 +08:00
zyy
d98e933e79 调整地图绘制样式 2020-08-03 17:30:01 +08:00
zyy
8422889940 调整大屏列表逻辑 2020-08-03 15:31:53 +08:00
zyy
60986fbfeb 大屏修改 2020-08-03 15:22:46 +08:00
zyy
a6feabd406 调整地图绘制逻辑 2020-07-30 15:10:10 +08:00
joylink_cuiweidong
7ad5e06a07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue
2020-07-29 13:59:48 +08:00
zyy
c3e7f8227a 调整区段字段显示,调整功能按钮样式 2020-07-29 13:23:25 +08:00
joylink_cuiweidong
66b9d7f85a 剧本录制代码调整 2020-07-28 13:56:36 +08:00
joylink_cuiweidong
e5af672515 地图绘图代码调整 2020-07-28 13:03:03 +08:00
joylink_cuiweidong
f88f1093ad 地图绘制 键盘删除 代码调整 2020-07-28 10:46:00 +08:00
joylink_cuiweidong
fb099da4df 地图绘制代码调整 2020-07-28 10:34:02 +08:00
joylink_cuiweidong
07d9049744 地图绘图代码调整 2020-07-28 09:12:09 +08:00
joylink_cuiweidong
a53df52c35 地图绘图代码调整 2020-07-27 17:36:27 +08:00
joylink_cuiweidong
3562b19d8a 地图绘图代码调整(表单使用公用组件) 2020-07-27 16:11:29 +08:00
joylink_cuiweidong
5ee257e9e2 地图绘图代码调整 2020-07-24 18:22:54 +08:00
joylink_cuiweidong
2affbbd5e4 地图绘制代码调整 2020-07-24 17:51:55 +08:00
joylink_cuiweidong
d5ad3ab59d 地图绘制代码调整 2020-07-24 16:02:55 +08:00
zyy
9ec64f1eeb 调整加载方式及判断 2020-07-23 17:09:29 +08:00
joylink_cuiweidong
95a9d18ccd 地图绘图代码调整 2020-07-20 17:13:56 +08:00
joylink_cuiweidong
f809d514a1 地图绘制代码调整 2020-07-20 16:46:38 +08:00
joylink_cuiweidong
2dc14c9374 地图绘制代码调整 2020-07-20 15:10:57 +08:00
zyy
02157c45a0 修改生成联锁数据提示信息 2020-07-20 09:23:08 +08:00
zyy
e0f7175923 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 18:28:56 +08:00
zyy
04f1205e56 调整上行是否向右地图字段 2020-07-17 18:28:38 +08:00
joylink_cuiweidong
451b5343e0 剧本编制代码调整 2020-07-17 17:18:48 +08:00
joylink_cuiweidong
a5ce9e4a88 地图绘制代码调整 2020-07-17 15:45:44 +08:00
joylink_cuiweidong
1e91cb616d 地图绘图代码调整 2020-07-17 14:08:14 +08:00
joylink_cuiweidong
56089e1a55 地图绘图代码优化 2020-07-17 11:14:50 +08:00
joylink_cuiweidong
98d55deb64 地图绘制代码调整 2020-07-16 17:49:36 +08:00
joylink_cuiweidong
7ff599d49f 地图绘制布局调整(去掉scrollBar) 2020-07-16 16:18:13 +08:00
joylink_cuiweidong
f6e4e3c324 地图绘图样式调整 2020-07-16 14:41:21 +08:00
joylink_cuiweidong
ea429f36a9 地图绘图样式调整 2020-07-16 10:50:59 +08:00
joylink_cuiweidong
adde89a41d 剧本编制代码调整 2020-07-15 16:09:15 +08:00
joylink_cuiweidong
1d6868ee54 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:22:31 +08:00
joylink_cuiweidong
f9f58a70c4 剧本预览代码调整
绘图高级页面代码调整
2020-07-14 18:21:40 +08:00
zyy
fbf4cd7652 调整组件间传递事件 2020-07-14 17:16:49 +08:00
joylink_cuiweidong
99b622ef24 地图绘图代码调整 2020-07-14 14:27:35 +08:00
joylink_cuiweidong
a462e540fb socket 退出登陆 断开连接
绘图代码调整
2020-07-14 11:01:22 +08:00
joylink_cuiweidong
d9ed44b218 剧本预览代码调整
新版地图绘制代码优化
2020-07-13 17:01:34 +08:00
zyy
f205ddf0fc 删除多余配置 2020-07-10 18:41:29 +08:00
zyy
c4ffc859ce 调整大屏配置逻辑,登陆权限流程 2020-07-08 18:35:12 +08:00
zyy
2c5c30216f 调整大屏预览流程,增加大屏分屏配置 2020-07-06 17:02:13 +08:00
zyy
8a5845749e 调整绘图流程逻辑 删除多余配置 2020-07-03 15:18:58 +08:00
zyy
f91fc75528 调整西安线路进路状态 2020-07-03 11:11:57 +08:00
zyy
3b39a9a04b 调整区段字段,控制权操作 2020-07-02 18:47:39 +08:00
zyy
64d415dbb3 调整地图绘图数据模型 2020-07-01 18:08:42 +08:00
zyy
3c6d5b903d 调整联锁配置,调整数据模型 2020-07-01 14:52:27 +08:00
joylink_cuiweidong
e5fff7388b 地图绘制 显示条件(showCondition)调整 2020-07-01 13:18:43 +08:00
zyy
7df86adff1 调整表单赋值拷贝 2020-06-30 11:19:33 +08:00
zyy
7873917d43 调整数据模型过滤空置,调整成都3号线实操 2020-06-28 16:03:59 +08:00
zyy
3b330a0932 调整佛山线路实训定义,删除区段定义 2020-06-24 14:06:17 +08:00
zyy
4e36c7b456 调整默认配置 2020-06-23 09:26:58 +08:00
zyy
58ab773ec9 删除多余配置 2020-06-22 13:49:42 +08:00
fan
35b6d9093a 地图绘制信号机添加属性noOverlap是否无延续保护 2020-06-16 09:50:39 +08:00
zyy
428967e843 调整地图绘制右键菜单样式,调整道岔触发居中,绘制综合监控数据 2020-06-15 16:13:28 +08:00
zyy
f7c6f6ee64 调整区段配置 2020-06-12 09:55:53 +08:00
zyy
6402e6312b 调整逻辑区段 名称偏移量 2020-06-11 17:53:35 +08:00
zyy
547c7efe5a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-11 17:39:46 +08:00
zyy
9c0d69e81e 删除逻辑对应车次窗 2020-06-11 17:39:33 +08:00
fan
434d7fdbbe 信号机批量设置灯位类型 2020-06-11 17:28:15 +08:00
zyy
30d76e763e 调整折返按钮 状态返回处理 2020-06-05 10:14:12 +08:00
zyy
a4df31fcc3 调整字段显示 2020-06-04 18:24:39 +08:00
zyy
4a03d8613b 调整车站折返策略 2020-06-04 17:58:42 +08:00
zyy
9be9c9a313 增加西安 三号线设置折返策略元素 2020-06-04 17:29:18 +08:00
zyy
31fab488c0 调整区段保存流程 2020-06-03 14:47:26 +08:00
zyy
a57ae39ebf 调整区段修改逻辑 2020-06-03 13:18:52 +08:00
joylink_cuiweidong
6fe1a0c22b 新版地图绘图 高级数据交路代码调整 2020-05-29 16:23:38 +08:00
fan
2a1ce3543f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 18:29:03 +08:00
zyy
474dcc2d74 新增车站字段 2020-05-28 18:17:15 +08:00
zyy
f1a66f8f73 调整站台轨关联站台也会修改 2020-05-28 18:08:20 +08:00
fan
5e97623b06 逻辑区段始终点偏移量设置调整 2020-05-28 17:47:52 +08:00
zyy
55f57e2135 调整保存字段 2020-05-28 15:02:15 +08:00
zyy
df4dc3eea9 调整供电线路保存,福州皮肤配置文件调整 2020-05-28 14:39:06 +08:00
zyy
1ae2793221 调整绘图界面字体皮肤配置 2020-05-25 15:06:34 +08:00
zyy
39d055ec09 调整车站连锁关系 右键空白处显示连锁关系 2020-05-22 18:28:03 +08:00
zyy
e221ca9b22 调整报名流程字段,调整西安线路非连锁站邮件操作 2020-05-22 17:10:07 +08:00
fan
45422c8cd2 信号机批量设置引导信号&虚拟信号机旋转 2020-05-19 15:44:01 +08:00
fan
6afafc9371 调整绘图批量设置信号机类型&竞赛考试详情 2020-05-19 11:20:09 +08:00
zyy
b8bf51fc82 优化地图绘制 2020-05-18 17:08:21 +08:00
zyy
6fdf3b74aa 调整车次窗撤销操作问题 2020-05-18 13:34:46 +08:00
zyy
9591cbd268 调整竞赛系统登陆权限 2020-05-18 13:08:45 +08:00
zyy
7992a2e11e 调整格式 2020-05-15 16:55:00 +08:00
fan
e4b14d96e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 15:58:19 +08:00
fan
dff3a090a5 调整右键跳转车站 2020-05-15 15:58:08 +08:00