joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
9,981 Commits 20 Branches 0 Tags 448 MiB
9b422cd3b9
Commit Graph

9735 Commits

Author SHA1 Message Date
fan
dd2722180d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-06 09:44:08 +08:00
fan
924e6154a3 南京十一站屏蔽门开启影响站停时间显示调整 2021-04-06 09:43:45 +08:00
sunzhenyu
fb00e1418e 修改三维课程存读 2021-04-02 18:05:19 +08:00
sunzhenyu
a9745eb709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-02 15:49:32 +08:00
sunzhenyu
1cab2116d6 三维课程代码，修改课程组件间逻辑，修改课程数据结构。(未实装) 2021-04-02 15:49:24 +08:00
fan
4a037c0e77 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-02 09:58:56 +08:00
fan
fc861b1c70 组织管理调整 2021-04-02 09:58:45 +08:00
joylink_cuiweidong
f8bebd192e 南京二号线 封锁岔心 状态代码跳转 2021-04-01 17:31:19 +08:00
fan
baf424cfad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 16:37:25 +08:00
fan
a5b3f9cf04 组织管理调整 2021-04-01 16:28:30 +08:00
joylink_cuiweidong
81ecf0ac20 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 10:59:05 +08:00
joylink_cuiweidong
fcf7d1b8ee 运行图代码调整 2021-04-01 10:58:41 +08:00
fan
f1824ad324 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 09:59:11 +08:00
fan
f327889bca 组织管理调整 2021-04-01 09:59:01 +08:00
joylink_cuiweidong
45c51157a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 09:42:12 +08:00
joylink_cuiweidong
618d975d68 运行图编制 代码调整 2021-04-01 09:41:14 +08:00
fan
0253e6e590 组织管理调整 2021-03-31 18:27:29 +08:00
fan
887edee9e6 考试系统按钮位置调整 2021-03-31 09:35:51 +08:00
fan
30bf7487ae 试卷编辑调整 2021-03-31 09:31:50 +08:00
fan
076c7192ec 教学管理调整 2021-03-30 18:07:45 +08:00
fan
1d50b1582d BUG：208、209、210 2021-03-30 15:51:15 +08:00
fan
28d092401e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 15:23:48 +08:00
fan
d42579479b 教学管理问题调整 2021-03-30 15:23:37 +08:00
joylink_cuiweidong
0c407dbfa9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 14:59:09 +08:00
joylink_cuiweidong
b78454781b 运行图编制 添加任务/修改任务 代码调整 2021-03-30 14:58:51 +08:00
fan
51bce2825e 教学管理问题调整 2021-03-30 14:49:47 +08:00
fan
0968bcfa9e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 14:31:43 +08:00
fan
d8462bb404 教学管理问题调整 2021-03-30 14:31:25 +08:00
joylink_cuiweidong
4713f1d30f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 11:26:45 +08:00
joylink_cuiweidong
0fb623ef59 运行图编制 折返数据解析 代码调整 2021-03-30 11:26:25 +08:00
fan
692c9f0c03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 10:41:48 +08:00
fan
894dc96ea5 教学管理问题调整 2021-03-30 10:41:27 +08:00
joylink_cuiweidong
770bdff791 代码调整 2021-03-30 09:59:51 +08:00
joylink_cuiweidong
65595cbe85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 09:57:35 +08:00
joylink_cuiweidong
09b2923126 iscs 代码调整 2021-03-30 09:57:05 +08:00
fan
def94fee3e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 18:05:30 +08:00
fan
d0f756ed2f BUG202\200:成绩查询页面点击重置报错;删除课程的提示需要修改 2021-03-29 18:05:22 +08:00
joylink_cuiweidong
14b98e0e3e 代码调整 2021-03-29 17:34:57 +08:00
joylink_cuiweidong
7521b8f2db iscs 代码调整 2021-03-29 17:33:31 +08:00
fan
c4ae02df0d BUG196:进入其他用户创建的班级的学生管理界面，建议删除导入模板下载 2021-03-29 17:08:45 +08:00
fan
ac56715942 课程详情调整 2021-03-29 17:07:14 +08:00
fan
1395beacb8 考试调整 2021-03-29 16:17:52 +08:00
fan
577fc1444f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 15:01:56 +08:00
fan
64a673419b 考试调整 2021-03-29 15:01:43 +08:00
ival
3440c5ddc0 增加 圆 2021-03-29 15:00:02 +08:00
ival
a1fd2ed090 修改 福州door设备图层问题 2021-03-29 14:57:18 +08:00
joylink_cuiweidong
3c61302df1 代码调整 2021-03-29 13:13:35 +08:00
ival
99dd5f5877 删除 test分支的iscs_new的代码 2021-03-29 13:13:06 +08:00
ival
7456a19b3e 增加 门禁iscs背景图，以及iscs_new的部分代码 2021-03-29 13:09:51 +08:00
ival
45027796e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 11:32:00 +08:00
ival
7ffff137b5 修改 删除生成计划的 滚动 2021-03-29 11:31:47 +08:00
fan
5090b14819 merge 2021-03-29 11:10:57 +08:00
fan
57f3b563fd 考试调整 2021-03-29 11:04:57 +08:00
fan
d3b4a73595 留言板调整 2021-03-29 11:04:18 +08:00
ival
3e3ca007e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 11:00:44 +08:00
ival
2a66a7b2c6 修改代码 2021-03-29 11:00:24 +08:00
joylink_cuiweidong
0a796d4218 运行图编制 代码调整 2021-03-29 10:09:33 +08:00
joylink_cuiweidong
ea85ed29ae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-26 16:09:44 +08:00
ival
83c630bfc7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2021-03-26 16:09:05 +08:00
joylink_cuiweidong
c22b59733a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-26 16:08:43 +08:00
ival
6f0eca2503 修改 iscs加载的问题 2021-03-26 16:08:39 +08:00
joylink_cuiweidong
ce79c12b7d 代码调整 2021-03-26 16:08:21 +08:00
fan
ab49d70a61 教学管理返回按钮调整 2021-03-26 13:31:12 +08:00
fan
c519f74189 教学管理问题调整 2021-03-26 13:09:56 +08:00
fan
a70597a267 教学管理问题调整 2021-03-25 20:01:21 +08:00
fan
0607e63d37 教学管理问题调整 2021-03-25 19:46:02 +08:00
fan
a267b1b64f 教学管理问题调整 2021-03-25 18:34:41 +08:00
fan
81d30804bb 教学管理问题调整 2021-03-25 17:38:46 +08:00
fan
c0add0cf1a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 16:08:53 +08:00
fan
bffb689e72 教学管理调整 2021-03-25 16:08:44 +08:00
joylink_cuiweidong
04ec5432d9 运行图编制代码调整 2021-03-25 15:18:58 +08:00
joylink_cuiweidong
c541e62be4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 15:07:34 +08:00
joylink_cuiweidong
f8d7ad88bb 运行图编制 代码调整 2021-03-25 15:07:14 +08:00
fan
c1580ca6ea 应用处班级添加提示文字 2021-03-25 15:00:30 +08:00
fan
6ea5a3e3aa url 2021-03-25 14:11:57 +08:00
ival
d6e24e40fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 14:10:24 +08:00
ival
ba51c50417 修改代码 2021-03-25 14:10:18 +08:00
fan
19421566de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 14:09:38 +08:00
fan
159aec918f 教学管理调整 2021-03-25 14:09:03 +08:00
joylink_cuiweidong
8a8cc8e04c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 13:39:51 +08:00
joylink_cuiweidong
ccc4970a1a 运行图编制 生成计划 获取交路代码调整 2021-03-25 13:39:28 +08:00
ival
988f879d46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
 2021-03-25 13:20:26 +08:00
ival
85f73964d3 调整iscs站厅子图顺序 2021-03-25 13:19:28 +08:00
fan
0d57d977a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 13:07:34 +08:00
ival
ee7453d5cd 修改 站厅子图列表 2021-03-25 13:08:03 +08:00
fan
5106ae8d14 meger 2021-03-25 13:07:02 +08:00
fan
7dc0535ecf 教学管理调整 2021-03-25 13:05:30 +08:00
fan
a3d6dc727f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 13:03:27 +08:00
fan
1c85c5a502 教学管理调整 2021-03-25 13:03:12 +08:00
ival
d8d3b64dcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 11:31:40 +08:00
ival
1ba979c02c 增加 iscs站厅资源 2021-03-25 11:31:31 +08:00
joylink_cuiweidong
7619d9097e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 10:38:55 +08:00
joylink_cuiweidong
ca3f01104e 运行图编制 代码调整 2021-03-25 10:38:36 +08:00
ival
74b260782d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 09:22:17 +08:00
ival
1eef45efe4 注释代码 2021-03-25 09:22:07 +08:00
joylink_cuiweidong
9984b13759 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 09:15:37 +08:00
joylink_cuiweidong
76fccbc643 运行图编制 生成计划 代码调整 2021-03-25 09:15:07 +08:00
fan
caafa7578b iscs添加设备图片 2021-03-24 15:00:45 +08:00
fan
022b946592 iscs添加背景图片 2021-03-24 14:12:35 +08:00
fan
b93daf1f8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-24 13:50:26 +08:00
fan
6cca650a98 教学管理调整 2021-03-24 13:49:59 +08:00
ival
dd1fb890ad 修改 运行图 修改接口 2021-03-24 13:30:26 +08:00
ival
fd5716925b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-24 11:09:16 +08:00
ival
833117dc45 1.修改 运行图 接口 
2.增加 iscs 资源
 2021-03-24 11:09:02 +08:00
joylink_cuiweidong
213e654abc iscs 代码调整 2021-03-23 18:20:06 +08:00
joylink_cuiweidong
d62d6ba815 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/iscs/iscsSystem/stationConfig/index.vue
 2021-03-23 18:19:47 +08:00
joylink_cuiweidong
6db9593a40 iscs 代码调整 2021-03-23 18:17:54 +08:00
fan
aed6392c88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-23 17:52:42 +08:00
fan
ebb618e053 iscs自动售检票 2021-03-23 17:52:32 +08:00
joylink_cuiweidong
5c5366e46a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 17:52:11 +08:00
joylink_cuiweidong
9c31d4963c iscs 代码调整 2021-03-23 17:51:36 +08:00
ival
04444b2b12 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 17:35:50 +08:00
ival
27e938c102 修改 复制iscs图形 生成codebug的问题 2021-03-23 17:35:42 +08:00
fan
7a3677cf8f 调整感温光纤探测系统高度 2021-03-23 17:24:48 +08:00
fan
2f4cd5569a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-23 17:14:17 +08:00
joylink_cuiweidong
0796a12dd7 iscs 代码调整 2021-03-23 17:12:19 +08:00
fan
65dfe7d570 url调整 2021-03-23 17:12:18 +08:00
joylink_cuiweidong
f749aa6709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 16:42:21 +08:00
joylink_cuiweidong
cbedee3c3b iscs 代码调整 2021-03-23 16:42:06 +08:00
joylink_cuiweidong
9398ccfa7c iSCS 代码调整 2021-03-23 16:41:40 +08:00
fan
c146dacecb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-23 15:55:38 +08:00
fan
7a5e1bf701 评价规则调整 2021-03-23 15:55:23 +08:00
ival
160cbaf2bf 增加 iscs 火灾 展厅和站台 背景图 2021-03-23 15:29:42 +08:00
fan
c6cfa2d816 merge 2021-03-23 11:08:11 +08:00
fan
e38b236aed 教学管理暂提 2021-03-23 11:06:14 +08:00
ival
09ec3247ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 10:42:01 +08:00
ival
fcc8cbf988 修改iscs 2021-03-23 10:41:47 +08:00
joylink_cuiweidong
393f3fe68a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 10:37:14 +08:00
joylink_cuiweidong
43e0379926 运行图编制 生成计划 界面调整 2021-03-23 10:36:56 +08:00
ival
050141025a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-22 18:40:41 +08:00
ival
a63b8e0179 增加iscs图样 2021-03-22 18:40:29 +08:00
joylink_cuiweidong
ba18a549fb 运行图编制 生成计划代码调整 2021-03-22 17:39:12 +08:00
joylink_cuiweidong
b383815100 地图绘制 交路预览 显示代码调整 2021-03-22 16:04:33 +08:00
joylink_cuiweidong
7e80c71fef 代码调整 2021-03-22 15:49:14 +08:00
joylink_cuiweidong
74c5764087 代码调整 2021-03-22 15:30:10 +08:00
joylink_cuiweidong
7ac00f45dc 运行图编制 代码调整 2021-03-22 15:12:34 +08:00
joylink_cuiweidong
42b59cc752 代码调整 2021-03-22 14:51:34 +08:00
joylink_cuiweidong
9b4309d0c1 代码调整 2021-03-22 14:38:19 +08:00
joylink_cuiweidong
2dae1bc8d8 代码调整 2021-03-22 14:30:21 +08:00
joylink_cuiweidong
26b72f9228 代码调整 2021-03-22 13:20:51 +08:00
joylink_cuiweidong
e945d654eb 代码调整 2021-03-22 13:16:07 +08:00
sunzhenyu
2ce3d41cad mergetest 2021-03-19 18:14:58 +08:00
sunzhenyu
d22f9d62de 新三维客流逻辑基本完成(未实装) 2021-03-19 18:14:21 +08:00
fan
82fe1f3dc9 权重藐视调整 2021-03-19 17:34:37 +08:00
fan
6e6e6ac31d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-19 17:20:30 +08:00
fan
f3aed3f16e 评价规则创建调整 2021-03-19 17:20:22 +08:00
ival
c2a9a73f28 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-19 17:14:22 +08:00
ival
7625666431 调整成都01，显示车站为等间距 2021-03-19 17:14:14 +08:00
fan
268ae6ad88 评价结果展示调整 2021-03-19 16:47:06 +08:00
fan
061df7a389 评价规则管理宽度调整 2021-03-19 16:27:44 +08:00
fan
5732f85453 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-19 16:17:23 +08:00
fan
36e9d7c6bd 课程管理调整 2021-03-19 16:17:01 +08:00
ival
ffb4dbbba3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-19 16:11:55 +08:00
ival
9dabd1604f 注释同济运行图中不用模块 2021-03-19 16:11:45 +08:00
fan
efee6ddfc4 merge 2021-03-19 15:55:05 +08:00
fan
44b2c5d0f8 教学管理调整 2021-03-19 15:49:05 +08:00
joylink_cuiweidong
3230f15415 代码调整 2021-03-19 14:50:52 +08:00
joylink_cuiweidong
5e271d3320 运行图代码调整 2021-03-19 14:49:33 +08:00
joylink_cuiweidong
8acee05b38 运行图代码调整 2021-03-19 13:38:53 +08:00
joylink_cuiweidong
82f8db41d1 运行图 代码调整 2021-03-19 13:23:58 +08:00
joylink_cuiweidong
70260cfbe3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-19 11:19:00 +08:00
joylink_cuiweidong
5fdf48b7ab 运行图 代码调整 2021-03-19 11:18:37 +08:00
ival
d7e068c79d 修改引入文件路径问题 2021-03-19 11:02:40 +08:00
ival
12f6bae8e5 解决冲突 2021-03-19 10:52:57 +08:00
ival
1b2abcffb3 Merge branch 'test-ival' into test 
# Conflicts:
#	src/permission.js
#	src/views/demo/index.vue
#	src/views/newMap/displayNew/demoTraining/index.vue
#	src/views/newMap/displayNew/lesson/index.vue
 2021-03-19 10:15:43 +08:00
ival
a1b6201f9b 新增文件 2021-03-19 10:11:33 +08:00
ival
d03315f8fd 重构运行图解析代码逻辑 2021-03-19 10:10:51 +08:00
joylink_cuiweidong
1383dfbee3 运行图 代码调整 2021-03-18 18:46:52 +08:00
joylink_cuiweidong
e603837d9c 运行图代码调整 2021-03-18 17:52:19 +08:00
joylink_cuiweidong
e49d7c8ef8 代码调整 2021-03-18 16:30:28 +08:00
joylink_cuiweidong
f8860eba00 demo 代码调整 2021-03-18 15:58:27 +08:00
joylink_cuiweidong
07f477ae54 运行图代码调整 2021-03-18 15:05:56 +08:00
joylink_cuiweidong
b0a04a9dec Merge remote-tracking branch 'remotes/origin/test_newRunplan' into test 2021-03-18 15:02:03 +08:00
joylink_cuiweidong
f3c5feefcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-18 15:01:30 +08:00
joylink_cuiweidong
d4a6aa1cb2 demo 代码调整 2021-03-18 15:01:13 +08:00
fan
700928ed22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-18 11:21:17 +08:00
fan
23d8feb8b7 按钮顺序调整 2021-03-18 11:21:00 +08:00
joylink_cuiweidong
816fa77d79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-18 11:13:01 +08:00
joylink_cuiweidong
5336a1899e demo 修改 2021-03-18 11:12:31 +08:00
fan
36aee735a8 设备检测登录调整 2021-03-18 10:57:33 +08:00
fan
12698a808b 设备检测登录调整 2021-03-18 10:25:41 +08:00
fan
52898a24ac 仿真按钮样式调整 2021-03-18 09:35:45 +08:00
fan
e875fa92fc 教学管理暂提 2021-03-18 09:03:15 +08:00
ival
b4bf5114c6 demo 2021-03-17 18:07:49 +08:00
ival
43b6ebaa37 demo 2021-03-17 18:06:45 +08:00
ival
520c95a00c 增加demo 2021-03-17 17:51:22 +08:00
ival
666ad3f7d9 增加demo 2021-03-17 17:50:17 +08:00
ival
e183f40611 提交代码 2021-03-17 13:35:15 +08:00
ival
94bb1a0395 修改运行图代码代码 2021-03-17 10:15:21 +08:00
joylink_cuiweidong
df2ff455d3 运行图代码调整 2021-03-17 09:36:00 +08:00
joylink_cuiweidong
f21d270cf5 地图数据 交路预览页面调整 2021-03-17 09:33:19 +08:00
ival
e38bca7ff8 运行图 任务修改弹窗，显示描述的问题 2021-03-17 09:13:19 +08:00
ival
01d166a9c9 修改定位偏差的问题 2021-03-17 09:05:28 +08:00
fan
7da708858d 教学管理暂提 2021-03-16 19:06:25 +08:00
ival
64f38e7091 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-16 18:24:08 +08:00
ival
2480a8b110 迁移以前的运行图到同济新版 2021-03-16 18:23:56 +08:00
joylink_cuiweidong
e5047e1e16 运行图代码调整 2021-03-16 18:06:31 +08:00
joylink_cuiweidong
553ec75fd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-16 17:43:44 +08:00
joylink_cuiweidong
76dcd271d9 代码调整 2021-03-16 17:43:22 +08:00
ival
0985a6f1df 修改运行图表单名称 2021-03-16 11:14:52 +08:00
ival
1ad9ea0cb7 修改运行图菜单名称 2021-03-16 09:55:28 +08:00
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
walker-sheng
37e98a7d57 89版本问题 2021-03-13 00:20:59 +08:00
walker-sheng
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
fan
661adb9add Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 18:14:34 +08:00
fan
605d60b06c 岔芯添加parentCode 2021-03-10 18:14:12 +08:00
ival
81aa4d12c4 修改电子屏样式 2021-03-10 18:06:25 +08:00
ival
1ee6c29666 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 17:44:30 +08:00
ival
cfe979fce4 线路：宁波3 
问题：调整页面样式
 2021-03-10 17:40:43 +08:00
fan
b05ab63bc6 关联岔芯参数可删除 2021-03-10 17:28:09 +08:00
fan
56c6cebbfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 17:18:51 +08:00
fan
d9d2e9b6cd 道岔计轴添加关联岔芯参数&宁波三排列进路到 2021-03-10 17:18:35 +08:00
joylink_cuiweidong
c986e22d53 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
 2021-03-10 16:50:43 +08:00
ival
9991bf605d 增加确实窗口 2021-03-10 16:48:57 +08:00
joylink_cuiweidong
e8c7fbdfff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
 2021-03-10 16:48:26 +08:00
joylink_cuiweidong
96eef9053e 宁波三号线 菜单操作 代码调整 2021-03-10 16:39:53 +08:00
ival
3759386e1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 15:09:24 +08:00
ival
90bdb12e57 线路：宁波3 
问题：优化初始化操作的事件模型
 2021-03-10 15:09:15 +08:00
fan
0b361fd0fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 13:19:39 +08:00
fan
0bf5e348a0 岔芯不生成车次窗 2021-03-10 13:19:17 +08:00
fan
f9c9e25d08 登录路径错误调整 2021-03-10 10:31:16 +08:00
joylink_cuiweidong
4edb42bbbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 10:25:39 +08:00
joylink_cuiweidong
2146b28b9a 宁波三号线 运行线 代码调整 2021-03-10 10:25:05 +08:00
ival
1aa009075f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 18:37:31 +08:00
ival
0c98c06440 线路：宁波3 
任务：修改带初始化的界面操作
 2021-03-09 18:37:20 +08:00
joylink_cuiweidong
b434824d97 运行图编制 删除重复的页面 2021-03-09 17:11:58 +08:00
joylink_cuiweidong
208041fb24 运行图编制 删除暂时无用的文件 2021-03-09 16:50:38 +08:00
joylink_cuiweidong
e7c89ef4bf 运行图编制 删除暂时无用的文件 2021-03-09 16:35:40 +08:00
joylink_cuiweidong
b7a24387b4 运行图编制 删除无用与重复的文件 2021-03-09 16:11:27 +08:00
joylink_cuiweidong
ffe7214c11 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 15:58:16 +08:00
joylink_cuiweidong
ae948f80cc 删除多余的 运行图编制文件 2021-03-09 15:57:59 +08:00
fan
b2bb43b47f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 15:47:15 +08:00
fan
c9f656c4a7 西安一实训调整 2021-03-09 15:46:54 +08:00
joylink_cuiweidong
0e99302cf3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 15:41:35 +08:00
joylink_cuiweidong
cb8e07863e 运行图代码调整 2021-03-09 15:41:05 +08:00
ival
c28be4acd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:57:24 +08:00
ival
605280e7d5 1.宁波3号线 操作修正 
2.运行图编辑修改数据计算错误的问题
 2021-03-09 14:57:14 +08:00
joylink_cuiweidong
f89d557393 运行图代码调整 2021-03-09 14:55:03 +08:00
joylink_cuiweidong
b3af1646dd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:46:07 +08:00
joylink_cuiweidong
d4aa841077 运行图代码调整 2021-03-09 14:45:50 +08:00
fan
f2a7955bf3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:44:16 +08:00
fan
fd49034b57 南京十一站调整&添加线路配置switchTurnOperationCanRecoverSplitFault 2021-03-09 14:43:40 +08:00
joylink_cuiweidong
0ec4a64f5d 运行图编制 代码调整 2021-03-09 14:30:45 +08:00
joylink_cuiweidong
2afd703938 代码调整 2021-03-09 11:04:40 +08:00
joylink_cuiweidong
5352671383 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/planMonitor/editTool/menus/addTask.vue
 2021-03-09 10:34:16 +08:00
joylink_cuiweidong
2a74ff0c48 运行图编制代码调整 2021-03-09 10:31:56 +08:00
ival
b1552ccba5 Merge remote-tracking branch 'remotes/origin/test-tj' into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
 2021-03-09 10:17:25 +08:00
ival
8febc0c1d1 线路：宁波3 
问题：操作方式调整
 2021-03-09 10:14:16 +08:00
ival
a62248d4a6 优化运行图代码，防止报错 2021-03-09 10:03:21 +08:00
ival
1a1fbbfd69 优化运行图计算 2021-03-09 09:33:05 +08:00
ival
d993771f72 线路：南京2 
问题：修改岔区设限报错问题，以及点击设置store值得优化
 2021-03-09 09:24:08 +08:00
ival
1e881ad0db 线路：南京2 
问题：修改岔区设限报错问题，以及点击设置store值得优化
 2021-03-09 09:20:25 +08:00
fan
ee6d3b41b1 实训调整 2021-03-08 18:03:33 +08:00