Commit Graph

433 Commits

Author SHA1 Message Date
joylink_cuiweidong
4e133ff643 Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
# Conflicts:
#	src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue
2021-03-05 17:56:54 +08:00
joylink_cuiweidong
43c8c577ae 代码调整 2021-03-05 17:50:22 +08:00
ival
a565e1f204 修改编辑运行图路基问题 2021-03-05 16:44:32 +08:00
ival
b9014f4118 问题:运行图到站停站数据计算 2021-03-05 16:07:51 +08:00
ival
f3532e980d Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj 2021-03-05 15:39:17 +08:00
ival
96ad7becf2 修改 增加任务逻辑 2021-03-05 15:39:08 +08:00
joylink_cuiweidong
c785523699 运行图 代码调整 2021-03-05 13:06:06 +08:00
joylink_cuiweidong
e9997a2f7f Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj 2021-03-05 09:40:33 +08:00
joylink_cuiweidong
f1b72f8103 代码调整 2021-03-05 09:40:14 +08:00
ival
f171db029c 调整:新版TJ 运行图界面样式 2021-03-04 18:31:59 +08:00
ival
6baf23149f Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj 2021-03-04 18:22:42 +08:00
ival
20f3acdc1f 问题:同级编辑工具模板 2021-03-04 18:22:32 +08:00
joylink_cuiweidong
45054de1f9 Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj 2021-03-04 16:36:42 +08:00
joylink_cuiweidong
66af660f18 其他参数的配置页面 折返数据 代码调整 2021-03-04 16:36:18 +08:00
ival
2fe27a3c47 问题:运行图编辑问题
1:交路设置 ,转换轨<——>折返轨    或者   折返轨 <——>折返轨
2:高亮问题处理
2021-03-04 13:45:25 +08:00
ival
4e4d602400 修改同济大学运行图bar 2021-03-04 09:20:27 +08:00
ival
aaae6db62e 任务:同济大学运行图界面
进路:完成menu的创建
2021-03-02 18:21:55 +08:00
ival
a75c603f21 线路:成都3
问题:取消引导或进路没有生成实训的问题
2021-03-02 15:28:07 +08:00
ival
f034dcd163 运行图新版代码 2021-03-01 18:40:58 +08:00
fan
f0cd6ff07c 问题调整 2021-02-23 18:17:15 +08:00
lVAL
f482a4cf71 问题:仿真系统添加“运行图编制工作站”的路由和操作 2021-02-18 13:37:54 +08:00
joylink_cuiweidong
f1106b7dc0 运行图编制 菜单顺序 调整 2021-01-29 14:40:09 +08:00
joylink_cuiweidong
2e50989ac8 运行图添加任务 报错提示调整
运行图编制 折返时间 最少是2分钟
2021-01-28 15:21:06 +08:00
joylink_cuiweidong
c9a8d09e67 福州一号线 运行图绘图 折返点计算调整 2021-01-28 13:38:10 +08:00
joylink_cuiweidong
44cd7b3c01 运行图编制 代码调整 2021-01-26 11:28:29 +08:00
joylink_cuiweidong
c8986b3a4e 运行图 绘图 生成计划 增加计划 代码调整 2021-01-26 11:25:06 +08:00
joylink_cuiweidong
7d0a4269e6 运行图绘制代码调整
南京二号线 运行图转换函数代码调整
2021-01-26 11:10:18 +08:00
joylink_cuiweidong
f118e0ed46 运行图编制 代码调整 2021-01-25 18:06:11 +08:00
joylink_cuiweidong
db35ba370e 运行图编制代码调整 2021-01-25 17:45:39 +08:00
joylink_cuiweidong
068c3331e4 运行图绘制代码调整 2021-01-25 17:05:05 +08:00
joylink_cuiweidong
ec89eca2ad 运行图编制工具 修改站间运行时间那里加个更新距离的功能
bug144 运行图设计:生成计划的服务号不能输入0,修改
2021-01-25 15:31:18 +08:00
lVAL
47d9e6573d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 09:52:24 +08:00
lVAL
ede7335ab1 修改 交路选择起始信号机和终止信号机操作的bug问题 2021-01-13 09:51:59 +08:00
joylink_cuiweidong
b04792f529 运行图编辑 新增计划代码bug 调整 2021-01-12 17:38:30 +08:00
joylink_cuiweidong
1508578f74 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-30 16:10:13 +08:00
joylink_cuiweidong
ca74569775 iscs 代码调整
运行图 编制 输入服务号 限制为数字类型
2020-12-30 16:09:51 +08:00
lVAL
b315e03a3e 修改“修改运行图名称失败”的bug 2020-12-30 15:14:56 +08:00
joylink_cuiweidong
1499c69a80 bug[23,22,17] 修改 2020-12-29 18:37:33 +08:00
fan
16206cd003 bug: 1 & 紧急停车调整 & bug: 10 2020-12-28 15:01:25 +08:00
fan
4611c4b74b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-24 15:33:17 +08:00
fan
48e37e44f8 indexedDb调整 2020-12-24 15:33:06 +08:00
joylink_cuiweidong
7705afc316 运行图绘制代码调整 2020-12-23 18:57:49 +08:00
joylink_cuiweidong
0e340e53f3 运行图编制代码调整 2020-12-23 17:49:51 +08:00
fan
ff8811cd75 新建运行图报错调整 2020-12-23 16:08:35 +08:00
fan
63917fd931 运行图调整 2020-12-23 09:40:57 +08:00
joylink_cuiweidong
bfeed11be8 运行图 编制代码调整 2020-12-22 18:50:47 +08:00
fan
8b2cd16fe9 运行图调整 2020-12-22 17:27:04 +08:00
joylink_cuiweidong
fa7380f8ad 运行图代码调整 2020-12-18 17:51:54 +08:00
joylink_cuiweidong
a3e8c7cecc 南京一号线 线路 样式调整 2020-12-18 16:12:39 +08:00
joylink_cuiweidong
98603f09a8 代码调整 2020-12-16 18:22:37 +08:00
joylink_cuiweidong
90f0b4e918 运行图编制代码调整 2020-12-16 14:51:59 +08:00
joylink_cuiweidong
d8c6a8657b 哈尔滨运行图编制代码调整 2020-12-11 20:17:18 +08:00
joylink_cuiweidong
afa359d22a 运行图绘制代码调整 2020-12-11 13:15:07 +08:00
joylink_cuiweidong
082f18e5eb 运行图编制代码调整 2020-12-10 18:43:17 +08:00
joylink_cuiweidong
fd267160b1 信号机绘图代码调整(解决设置信号机归属联锁站bug)
运行图编制代码调整
2020-12-10 18:02:59 +08:00
joylink_cuiweidong
acf23ef747 运行图编制代码调整 2020-12-10 17:26:18 +08:00
joylink_cuiweidong
3f7eccdc2f 运行图编制代码调整 2020-12-10 13:53:34 +08:00
joylink_cuiweidong
0bfc5cb330 运行图编制代码调整 2020-12-09 18:28:25 +08:00
joylink_cuiweidong
c16e9a528f 运行图编制代码调整 2020-12-09 17:13:35 +08:00
joylink_cuiweidong
5e78f3ac64 运行图编制代码调整 2020-12-09 17:03:22 +08:00
zyy
85cc4ee3d5 过滤报错提示 2020-12-04 17:22:58 +08:00
zyy
7054f6c1e6 增加运行图编辑 2020-12-04 17:10:03 +08:00
zyy
dfbeb6b604 删除多余配置 2020-12-03 14:01:15 +08:00
zyy
de081382fa 增加运行图交路设置 2020-12-02 09:31:23 +08:00
joylink_cuiweidong
1010df5613 北交大 客流站场仿真界面 代码调整 2020-11-20 14:21:57 +08:00
joylink_cuiweidong
99e7abd361 运行图编制代码调整 2020-11-19 17:02:55 +08:00
joylink_cuiweidong
3052bf2843 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-19 13:48:30 +08:00
joylink_cuiweidong
954cb25ab0 北京交大项目 添加客流视图(未处理状态) 2020-11-19 13:48:11 +08:00
lVAL
516920d24c 修改文本样式 2020-11-18 17:01:15 +08:00
lVAL
fd5467a741 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-18 15:42:13 +08:00
lVAL
a3651cde07 优化 AUSTool 配置 2020-11-18 15:41:37 +08:00
joylink_cuiweidong
88ac007ebd 运行图代码调整 2020-11-18 13:22:53 +08:00
joylink_cuiweidong
0e7f27c1db 运行图 测试代码调整 2020-11-13 14:14:18 +08:00
joylink_cuiweidong
e5e7111965 运行图绘制代码调整 2020-11-12 19:04:57 +08:00
joylink_cuiweidong
cc514e7ee1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 16:40:21 +08:00
joylink_cuiweidong
e2eae2945b 运行图编制代码调整 2020-11-11 16:40:07 +08:00
lVAL
74919a6b81 data2json 过滤 列车数据 的两行错误数据 2020-11-11 16:13:48 +08:00
lVAL
15194a5e8f 增加打印信息 2020-11-11 16:00:47 +08:00
lVAL
b1702506cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 15:55:17 +08:00
lVAL
f4b0ad47ed 修改 data2json 中输出格式的问题 2020-11-11 15:55:05 +08:00
joylink_cuiweidong
72ca1a24b2 运行图编制代码调整 2020-11-11 14:36:11 +08:00
joylink_cuiweidong
dee6c30f2f 运行图编制代码调整 2020-11-11 11:22:26 +08:00
joylink_cuiweidong
23a59be2c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-10 18:41:19 +08:00
joylink_cuiweidong
4d5d8f1fdc 哈尔滨仿真 运行图编辑代码调整 2020-11-10 18:41:02 +08:00
lVAL
34fa80f4f8 解析excel数据,上传系统 2020-11-10 18:25:13 +08:00
lVAL
5aefda5ef0 修改设计平台,table样式,增加padding:50px 2020-11-06 09:26:41 +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
lVAL
1adc1101fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 11:13:24 +08:00
lVAL
1af1e3bd6f 修改AUSTool 编辑区域后,删除bug。
修改AUSTool 删除计划组,没有group的错误
2020-10-30 11:12:06 +08:00
zyy
d5230997cc Merge branch 'test' into test-runPlan 2020-10-29 18:22:13 +08:00
lVAL
0e0f76e8cb 修改x轴移动时不流畅的问题 2020-10-29 17:13:37 +08:00
lVAL
2723ea6bd7 修改字母大小写 2020-10-29 16:59:32 +08:00
lVAL
8b582e2a71 修改AUSTool默认时间范围 2020-10-29 16:54:07 +08:00
lVAL
fcdf632123 修改AUSTool边缘移动Area的bug 2020-10-29 16:22:20 +08:00
lVAL
2109641365 优化拖动的问题 2020-10-29 15:49:01 +08:00
lVAL
be9c54ee34 修改AUSTool的bug 2020-10-29 14:37:51 +08:00
zyy
74be1ba604 调整运行图加载 2020-10-29 11:07:55 +08:00
lVAL
6b688c4dc3 优化代码 2020-10-29 09:06:58 +08:00
lVAL
9f9ba1d554 优化代码样式 2020-10-29 09:02:07 +08:00
lVAL
11b23996eb 修改样式 2020-10-28 18:04:38 +08:00
lVAL
57c5862ab0 增加AUSTool 只读和编辑功能,以及修改部分操作BUG 2020-10-28 17:43:44 +08:00
lVAL
7fe5e4992b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/rpTools.js
#	src/views/planMonitor/editToolAUS/tool/index.vue
2020-10-28 15:04:51 +08:00
lVAL
5f48a7743e 增加AUS线路编辑功能,以及调整增加运行图组后的接口 2020-10-28 15:01:14 +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
lVAL
f9bab3da35 增加AUSline页面 2020-10-27 18:32:54 +08:00
lVAL
519b7903ee 调整 导出的时间间隔 2020-10-27 17:00:30 +08:00
lVAL
68ae07676c 修改代码 2020-10-27 16:36:09 +08:00
lVAL
7e438dbf1f 增加运行图导出功能 2020-10-27 16:31:58 +08:00
lVAL
480f4daa1c 修改AUSTool删除提示为英文 2020-10-26 17:14:32 +08:00
lVAL
baea2091ed 恢复AUSTool坐标转换限制 2020-10-26 17:11:17 +08:00
lVAL
17ec2297a9 优化 施工区域拖动 跳动的问题 2020-10-26 17:04:19 +08:00
lVAL
fa8126ec34 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 11:17:53 +08:00
lVAL
1bea58747a 优化代码 2020-10-26 11:17:45 +08:00
fan
1a6835c3cf merge 2020-10-26 11:09:48 +08:00
fan
7e91cb2b3c 删除旧版地图drawWay参数使用 2020-10-26 11:07:49 +08:00
lVAL
6111f07118 优化代码 2020-10-26 10:53:48 +08:00
lVAL
74ebd8153e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:11:30 +08:00
lVAL
8869608082 修改配置参数 2020-10-23 18:11:19 +08:00
fan
4f0f85c60c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:06:05 +08:00
fan
e2dbbb5f0b 删除旧版仿真 2020-10-23 18:05:55 +08:00
lVAL
a7764ce7c4 修改代码 2020-10-23 17:54:16 +08:00
lVAL
0516f856ef 优化代码 2020-10-23 17:48:31 +08:00
lVAL
5bc8be961d 优化代码 2020-10-23 16:15:39 +08:00
lVAL
a870debe70 优化拖动的问题 2020-10-23 10:15:36 +08:00
lVAL
b34e347ab1 修改代码 2020-10-23 09:21:42 +08:00
lVAL
6489d67e67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 09:03:14 +08:00
lVAL
b49c1c29d1 修改运行时间校验错误的问题 2020-10-23 09:03:05 +08:00
joylink_cuiweidong
f8e1c29642 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:30:51 +08:00
joylink_cuiweidong
683f73c005 运行图 展示界面 车次号调整 2020-10-22 18:30:02 +08:00
lVAL
fdeaabb699 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:20:40 +08:00
lVAL
439e9194c6 修改AUSTool功能 2020-10-22 18:20:29 +08:00
joylink_cuiweidong
50620f9447 代码调整 2020-10-22 17:34:49 +08:00
joylink_cuiweidong
9af669f708 运行图绘制代码调整 2020-10-22 17:30:56 +08:00
lVAL
a7011888b4 修改文件大小写 2020-10-22 16:49:58 +08:00
lVAL
5184721b62 删除错误带小写文件 2020-10-22 16:49:29 +08:00
lVAL
08e3d6aa90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:34:27 +08:00
lVAL
77d83cfaf7 增加,AUSTool施工区域编辑功能 2020-10-22 16:34:15 +08:00
joylink_cuiweidong
6c32b53fb4 Merge remote-tracking branch 'remotes/origin/test_runplan' into test
# Conflicts:
#	src/router/index_Common.js
2020-10-22 13:49:35 +08:00
joylink_cuiweidong
c7d99e7913 运行图编辑代码调整 2020-10-22 13:34:08 +08:00
lVAL
ba6e29943b 增加修改折返时间的功能 2020-10-22 11:13:29 +08:00
lVAL
457dd7381a 修改AUSTool 2020-10-22 10:28:38 +08:00
joylink_cuiweidong
3d1c5dacd4 运行图 增加任务 添加了 起始终到车站的筛选 2020-10-22 09:53:29 +08:00
joylink_cuiweidong
4eb69d03a6 运行图代码调整 2020-10-21 18:40:02 +08:00
lVAL
c1050d16ab 修改AUSTool 功能 2020-10-21 18:36:52 +08:00
joylink_cuiweidong
c684dd5149 运行图代码调整 2020-10-21 17:39:52 +08:00