Commit Graph

9730 Commits

Author SHA1 Message Date
ival
b678416593 修改 隐藏 2021-03-16 09:52:45 +08:00
ival
72281db3a8 隐藏 生成仅环路计划 2021-03-16 09:28:00 +08:00
ival
c11568348f 优化代码 2021-03-15 21:15:03 +08:00
ival
c44c2a0e0c 暂存文件 2021-03-15 19:23:33 +08:00
ival
13f3302cfc 修改新版运行图显示的问题 2021-03-15 17:32:12 +08:00
ival
d5d9b91cb4 创建运行图 出库数据,环路数据,进库数据页面操作时,过滤显示的问题 2021-03-15 17:31:47 +08:00
ival
1cc4cebb27 任务:运行图编辑工具
问题:优化生成计划的操作以及menubar的页面描述
2021-03-15 14:34:24 +08:00
sunzhenyu
ab6acbc7d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-15 10:56:45 +08:00
sunzhenyu
b2b669df66 修改三维客流 2021-03-15 10:56:37 +08:00
ival
fa73c7c365 修改进路 控制显示的条件 2021-03-15 10:43:08 +08:00
ival
b400f78fe5 线路:新版运行图编辑功能部分接口和界面调整 2021-03-15 09:59:52 +08:00
37e98a7d57 89版本问题 2021-03-13 00:20:59 +08:00
b92c8cafdc Revert "清除chrome89版本 windowopen 的noopener参数打不开的问题"
This reverts commit 2e442e6e8c.

# Conflicts:
#	src/views/newMap/displayNew/menuSchema.vue
#	src/views/newMap/jlmapNew/index.vue
2021-03-13 00:15:32 +08:00
sunleking
7fa30c1a30 merge 2021-03-13 00:13:08 +08:00
sunleking
608d8b03f5 merge 2021-03-13 00:11:48 +08:00
sunleking
2e442e6e8c 清除chrome89版本 windowopen 的noopener参数打不开的问题 2021-03-13 00:10:55 +08:00
fan
e97a5a88a1 教学管理暂提 2021-03-12 18:44:43 +08:00
ival
a2103b0486 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 18:23:43 +08:00
ival
fa2c7c8297 线路:同济大学版本运行图功能样式调整 2021-03-12 18:23:32 +08:00
joylink_cuiweidong
80b67e7f94 运行图 代码调整 2021-03-12 17:18:02 +08:00
joylink_cuiweidong
40f6314b85 运行图编制 代码调整 2021-03-12 16:37:32 +08:00
joylink_cuiweidong
c3fec625e2 运行图编制 代码调整 2021-03-12 16:16:51 +08:00
joylink_cuiweidong
905e59c869 运行图编制 生成仅环路计划 代码调整 2021-03-12 16:00:23 +08:00
joylink_cuiweidong
8c05faab0a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 13:45:47 +08:00
joylink_cuiweidong
866b661c4f 南京二号线 岔心 绘图 代码调整 2021-03-12 13:45:14 +08:00
ival
150eeaaaba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 11:31:21 +08:00
ival
ef0915ea98 线路:宁波3
问题:调整实训流程
2021-03-12 11:31:11 +08:00
joylink_cuiweidong
83781ac67d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 10:43:17 +08:00
joylink_cuiweidong
6cac5cdf51 运行图编制 导入公共进路代码调整 2021-03-12 10:42:55 +08:00
ival
62c0bd160f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 18:31:01 +08:00
ival
50c206cad3 调整宁波3道岔封锁实训 2021-03-11 18:30:43 +08:00
fan
757c5d62df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 18:11:27 +08:00
fan
330e15c993 南京二号线menuBar放开 2021-03-11 18:11:08 +08:00
fan
32e7155fb0 教学管理暂提 2021-03-11 18:09:26 +08:00
sunzhenyu
1de6eda1a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 17:11:03 +08:00
sunzhenyu
9434928436 新版三维车站客流管理代码修改(未实装) 2021-03-11 17:10:50 +08:00
ival
8481e2d927 删除宁波3 无用文件 2021-03-11 15:35:41 +08:00
ival
1a1745d49c 增加宁波3 状态逻辑判断 2021-03-11 15:33:43 +08:00
ival
13c1cc6819 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 15:27:38 +08:00
ival
0f0b95cafb 增加 宁波3 menuBar operation定义
修改加载当日运行图界面没有显示运行图名称的问题
2021-03-11 15:27:30 +08:00
joylink_cuiweidong
29a4dfac76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 15:01:28 +08:00
joylink_cuiweidong
05ff67f546 南京二号线 岔心 通信车占用状态/非通信车占用状态 代码调整 2021-03-11 15:00:52 +08:00
ival
6c19a3ad2c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 13:44:50 +08:00
ival
414bd05d0c 优化实训过程中,点击空白menuBar被关掉的问题 2021-03-11 13:44:40 +08:00
fan
b620e0f3a3 iscs报错修改 2021-03-11 10:58:03 +08:00
ival
4d8f116f4d 优化 2021-03-11 09:27:46 +08:00
ival
dc8c74632d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 09:22:41 +08:00
ival
3fff0da60d 修改 数据库名称 为后端baseUrl的域名关键字 2021-03-11 09:22:30 +08:00
fan
8631b66be9 岔芯预复位报错调整 2021-03-11 09:17:57 +08:00
fan
659054f1fa 岔芯添加parentCode 2021-03-10 19:03:04 +08:00