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

2703 Commits

Author SHA1 Message Date
fan
3ba2f8ac5b merge 2021-04-20 17:29:32 +08:00
fan
0226042942 宁波三Bug调整 2021-04-20 17:25:27 +08:00
joylink_cuiweidong
d1a177827d 大铁项目 添加进路 代码调整 2021-04-16 17:21:15 +08:00
joylink_cuiweidong
e554ff45b7 代码调整 2021-04-16 16:36:17 +08:00
joylink_cuiweidong
388f85c3db 代码调整 2021-04-16 16:26:58 +08:00
joylink_cuiweidong
a3dff96e73 大铁 项目 添加进路 代码调整 2021-04-16 15:59:08 +08:00
joylink_cuiweidong
84169141ab 大铁 指示灯 代码调整 2021-04-16 14:22:29 +08:00
ival
14f718ec1a 增加指示器显示 2021-04-15 18:15:12 +08:00
joylink_cuiweidong
16294b6373 代码调整 2021-04-15 17:12:41 +08:00
joylink_cuiweidong
d3b240989b 代码调整 2021-04-15 16:15:18 +08:00
joylink_cuiweidong
bb928cb37b 代码调整 2021-04-15 15:55:30 +08:00
joylink_cuiweidong
4050ddf937 大铁进路添加 代码调整 2021-04-15 15:53:34 +08:00
fan
8575de2bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:09:52 +08:00
fan
0b5cc8e15d 信号按钮调整 2021-04-13 18:09:37 +08:00
ival
68cad1616a 删除无用代码 2021-04-13 15:48:01 +08:00
ival
584852038c 增加大铁仿真display 
# Conflicts:
#	src/iscs_new/plugins/shapeBuilder/entry.vue
 2021-04-13 15:47:49 +08:00
fan
8a363c068a 大铁调整 2021-04-13 14:10:20 +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
a5b3f9cf04 组织管理调整 2021-04-01 16:28:30 +08:00
fan
0253e6e590 组织管理调整 2021-03-31 18:27:29 +08:00
fan
887edee9e6 考试系统按钮位置调整 2021-03-31 09:35:51 +08:00
fan
64a673419b 考试调整 2021-03-29 15:01:43 +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
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
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
d03315f8fd 重构运行图解析代码逻辑 2021-03-19 10:10:51 +08:00
joylink_cuiweidong
b0a04a9dec Merge remote-tracking branch 'remotes/origin/test_newRunplan' into test 2021-03-18 15:02:03 +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
52898a24ac 仿真按钮样式调整 2021-03-18 09:35:45 +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
joylink_cuiweidong
f21d270cf5 地图数据 交路预览页面调整 2021-03-17 09:33:19 +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
2e442e6e8c 清除chrome89版本 windowopen 的noopener参数打不开的问题 2021-03-13 00:10:55 +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
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
659054f1fa 岔芯添加parentCode 2021-03-10 19:03:04 +08:00
fan
605d60b06c 岔芯添加parentCode 2021-03-10 18:14:12 +08:00
fan
b05ab63bc6 关联岔芯参数可删除 2021-03-10 17:28:09 +08:00
fan
d9d2e9b6cd 道岔计轴添加关联岔芯参数&宁波三排列进路到 2021-03-10 17:18:35 +08:00
fan
0bf5e348a0 岔芯不生成车次窗 2021-03-10 13:19:17 +08:00
ival
d993771f72 线路：南京2 
问题：修改岔区设限报错问题，以及点击设置store值得优化
 2021-03-09 09:24:08 +08:00
fan
a6d81b5e3a 实训调整&ibp图片更换 2021-03-08 16:20:29 +08:00
joylink_cuiweidong
ed791a0a2f 地图绘图 目的地码 添加起始区段的字段 2021-03-03 13:21:41 +08:00
ival
ab9a11ef60 线路：西安2 
问题：修改优先折法为侧线优先
 2021-03-02 09:17:35 +08:00
ival
e983194879 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 18:36:45 +08:00
ival
5278c2308a 线路：宁波1号线 
问题：调试 全线取消限速、设置电灯实训过程
 2021-03-01 18:36:33 +08:00
joylink_cuiweidong
561e6633c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 14:19:33 +08:00
joylink_cuiweidong
92cc3d60c0 地图绘图 信号机添加 不生成进路 字段 2021-03-01 14:18:49 +08:00
lVAL
1580a89770 线路：宁波一，南京2 
问题：
a.南京2现地实训进入后，视图有的站没有拆分成两列
b.修改宁波一，设置通过dialog的title提示
c.恢复showStationContent函数的加入位置
d.删除代码中的一些无用注释代码
 2021-02-26 16:23:16 +08:00
joylink_cuiweidong
40b2dceaf9 代码调整 2021-02-25 16:16:43 +08:00
joylink_cuiweidong
279cbc7133 地图绘图数据 目的地码 代码调整 2021-02-25 15:19:22 +08:00
lVAL
52b1a87e9c 线路：成都3 
问题：现地第一次加载，引导按钮没有显示的问题
 2021-02-25 11:18:59 +08:00
fan
4b0320061e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 18:17:23 +08:00
fan
f0cd6ff07c 问题调整 2021-02-23 18:17:15 +08:00
joylink_cuiweidong
908cf9dddf 宁波三号线 控制权 状态调整 2021-02-23 18:12:12 +08:00
fan
dc3e3d7b7e 宁波一 计轴复位按钮操作 2021-02-22 10:27:32 +08:00
joylink_cuiweidong
466d57b4be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 15:05:36 +08:00
joylink_cuiweidong
858c7dd7a7 宁波三号线（泰雷兹线路） 系统扣车设置/取消 操作添加 2021-02-20 15:03:44 +08:00
fan
7483b1be46 调整综合演练现地设备显示 2021-02-20 13:28:11 +08:00
fan
37d44bf6d2 现地 设备显示调整 2021-02-20 10:42:25 +08:00
joylink_cuiweidong
7d3dfc2d31 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 13:28:53 +08:00
joylink_cuiweidong
414aa1a3ca 地图绘制 列车数据模型更改 2021-02-19 13:28:19 +08:00
lVAL
2aff2be8b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 09:26:36 +08:00
lVAL
1030f13d37 修改宁波3号线，二次确认 锁闭标题问题； 
修改西安2号线，定操、反操实训第一步描述错误。
 2021-02-19 09:26:26 +08:00
fan
731c8e7fc3 宁波一 设置/取消强制点灯 2021-02-18 15:38:20 +08:00
joylink_cuiweidong
70556faea6 北交大 客流系统 代码调整 2021-02-05 17:29:25 +08:00
joylink_cuiweidong
7a949cd5e2 北交大 客流系统 大客流策略 代码调整 2021-02-05 17:23:09 +08:00
joylink_cuiweidong
f94f3deadf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 17:06:18 +08:00
joylink_cuiweidong
a429f53015 北交大 客流系统 大客流策略 页面代码调整 2021-02-05 17:05:42 +08:00
fan
f3ec3a1476 南京二号线折行显示调整 2021-02-05 15:12:57 +08:00
fan
88683b3763 代码调整 2021-02-05 09:19:18 +08:00
joylink_cuiweidong
3233ce39f0 北交大 客流代码调整 2021-02-04 18:34:31 +08:00
joylink_cuiweidong
e0f2d0a288 北交大 客流 代码调整 2021-02-04 18:30:02 +08:00
joylink_cuiweidong
68d2ecd6db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 17:18:25 +08:00
joylink_cuiweidong
61fb768bdc 北交大客流项目 大客流策略 2021-02-04 17:17:45 +08:00
sunzhenyu
8cb4ef4bdc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 11:03:57 +08:00
sunzhenyu
67d8c9467c 修改三维客流订阅连接，增加三维车站管理界面 2021-02-04 11:03:48 +08:00
joylink_cuiweidong
2de373dd24 北交大 客流系统 退出系统 关闭其他窗口 2021-02-03 15:44:18 +08:00
joylink_cuiweidong
3a91ccfa0a 北交大 客流策略 代码调整 2021-02-03 14:08:58 +08:00
joylink_cuiweidong
acbbf14d1c 北交大 代码调整 2021-02-03 13:45:11 +08:00
joylink_cuiweidong
2968b1ddfb 北交大客流策略 添加 2021-02-03 13:40:11 +08:00
joylink_cuiweidong
eeb7e3afad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/stationControl.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
 2021-02-02 18:16:51 +08:00
joylink_cuiweidong
c149f33a99 删除无用的代码 2021-02-02 18:06:02 +08:00
fan
8aaaf9f9df 国赛提交试卷后初始化结果 2021-02-02 17:23:29 +08:00
fan
c7e0bdc1e7 国赛理论测试显示结果调整 2021-02-02 17:03:39 +08:00
fan
7d60412e96 国赛试题调整 2021-02-02 16:34:55 +08:00
lVAL
7b11378443 修改 宁波 selected报错问题 2021-02-02 09:41:35 +08:00
lVAL
f0e3ee1f49 线路：南京2 
问题：修改现地 强制站控，交出控制权，接受控制的实训流程。
 2021-02-01 13:43:48 +08:00
fan
22ac51f595 国赛购买调整描述 2021-01-29 16:20:18 +08:00
fan
216e8f0f19 国赛购买调整 2021-01-29 16:15:24 +08:00
fan
c53000186a 调整国赛购买位置 2021-01-29 15:28:51 +08:00
fan
e77ce189d1 放开国赛购买注释 2021-01-29 15:09:12 +08:00
joylink_cuiweidong
3175321085 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 11:24:07 +08:00
joylink_cuiweidong
2e3d576614 生成联锁添加配置项：信号机接近区段不跨过前方同向信号机 2021-01-29 11:23:01 +08:00
lVAL
4d3d92e18b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 09:46:05 +08:00
lVAL
e28047773d 线路：福州1 
问题：设置运行等级实训提示运行时间未提示的问题
 2021-01-29 09:45:43 +08:00
fan
012fdd117f 注释国赛系统购买 2021-01-28 20:05:45 +08:00
fan
f4e3deaabc 仿真异常不清除订阅 2021-01-28 18:54:48 +08:00
fan
5bf8ffe9ac BUG 149:浙大网新：现地仿真系统中车站切换显示有误; 2021-01-28 18:22:13 +08:00
fan
3f70632b84 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 17:47:56 +08:00
fan
b1d944c52f 国赛购买成功调整 2021-01-28 17:47:43 +08:00
lVAL
6a033b2a9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:28:14 +08:00
lVAL
590fb34edf 修改 宁波线操作 2021-01-28 16:27:44 +08:00
fan
18dee86d9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:20:30 +08:00
fan
f07981ce64 国赛购买权限 --暂提 2021-01-28 16:20:18 +08:00
sunzhenyu
84e77d7fbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:10:45 +08:00
sunzhenyu
e45e933436 修改三维驾驶中cctv视角按钮 2021-01-28 16:10:36 +08:00
fan
87ca64e33b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 10:30:08 +08:00
fan
9c341fed70 退出仿真时清除requestList请求栈堆数据 2021-01-28 10:29:38 +08:00
lVAL
369c5446cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-27 18:39:11 +08:00
lVAL
ba5de90773 配置 南京2实训 2021-01-27 18:32:16 +08:00
joylink_cuiweidong
8f82b0fdd5 北交大客流 车站人数代码调整 
地图绘图代码调整
 2021-01-27 15:39:53 +08:00
lVAL
ad0590dfe4 修改南京2 登录密码为1 以及限制普通站不能登录 2021-01-27 09:27:44 +08:00
lVAL
be6610a850 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 17:45:39 +08:00
lVAL
4efca07ac8 配置 宁波3 设置跳停和取消跳停配置 2021-01-26 17:45:24 +08:00
fan
98488d3095 BUG 106:浙大网新线路点击剧本加载再退出后，车站切换框显示无数据 2021-01-26 17:13:00 +08:00
fan
abed3ef7c1 BUG108: 浙大网新仿真：道岔单解时出现字母“E”后，右键点击出现“使能”，此时不点击使能，而点击空白处，再点击字母E，没有反应，并且初始化后E还在闪烁 && 南京二排列进路后封锁区段显示调整 2021-01-26 16:19:29 +08:00
fan
76f0fa96ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:21:40 +08:00
fan
4fb1cd1bed 南京二号线行值折行显示 2021-01-25 17:21:24 +08:00
lVAL
32304d294e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 15:46:29 +08:00
lVAL
b5788f01d4 增加 现地车站登录功能 2021-01-25 15:46:18 +08:00
joylink_cuiweidong
e49cce6b8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 13:51:23 +08:00
joylink_cuiweidong
d3546c5de2 岔心鼠标事件 绘图代码调整 2021-01-25 13:48:37 +08:00
fan
3b6563351b 运行图层级调整 2021-01-25 10:30:43 +08:00
joylink_cuiweidong
8eee00f454 代码调整 2021-01-22 19:18:16 +08:00
fan
c80e08292c 调整实际长度 小数计算 2021-01-22 14:51:37 +08:00
fan
420163ec07 逻辑区段实际长度设置调整&实训平台二级主页 2021-01-22 14:47:49 +08:00
fan
4a0c7e1e95 逻辑区段实际长度设置调整 2021-01-22 13:59:32 +08:00
fan
258796555e 车队进路调整 2021-01-21 19:11:50 +08:00
lVAL
f0829b768b 增加佛州线实训配置 2021-01-21 10:42:17 +08:00
fan
295ddee738 调整showMode初始值 2021-01-20 16:47:20 +08:00
joylink_cuiweidong
88234d9154 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:20:58 +08:00
joylink_cuiweidong
fe81a31883 佛山有轨电车 线路 暂时隐藏 iscs ibp 数据 2021-01-20 16:20:20 +08:00
fan
25b6ad4ca8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:53:23 +08:00
fan
34aca8de12 现地行调条件显示调整 2021-01-20 15:53:13 +08:00
joylink_cuiweidong
c8c4264be9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:32:08 +08:00
joylink_cuiweidong
057d7a7d75 北交大项目 运行图预览打不开 bug 处理 2021-01-20 15:31:41 +08:00
fan
330f58eba4 右键选择 进路快捷操作盘 2021-01-20 13:50:37 +08:00
fan
49405666df 传输信号机参数调整 2021-01-19 11:18:24 +08:00
fan
145259d3b5 传输信号机 && 佛山进路预览调整 2021-01-19 11:09:53 +08:00
lVAL
aed7f034b1 南京2车站操作设备并且状态刷新后，页面操作菜单disabled刷新问题 2021-01-18 17:32:20 +08:00
lVAL
198602923c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 15:49:00 +08:00
lVAL
7d61451fa9 修改 应答器 创建的几个优化问题，以及南京线路中心左键弹窗，右键不弹 2021-01-18 15:48:05 +08:00
fan
5f3300e889 信号机添加所属车站&批量设置 2021-01-18 15:41:28 +08:00
fan
f60054ccad 现地切行调后 车站显示问题调整 2021-01-18 11:29:03 +08:00
lVAL
dd7f4d2aeb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 17:23:37 +08:00
lVAL
0ee148437b 增加应答器 创建时必须选择信号机以及校验 2021-01-15 17:23:27 +08:00
joylink_cuiweidong
f61df9b1e8 岔心状态 绘图代码调整 2021-01-15 17:17:17 +08:00
joylink_cuiweidong
39da2a712d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 16:44:55 +08:00
joylink_cuiweidong
9aef723b3f bug修改： 
逻辑区段修改 导致逻辑区段起终点坐标出现错误问题
逻辑区段修改坐标 导致相邻物理区段坐标出现问题
功能：
增加线路配置：信号封锁下进路是否可以办理
 2021-01-15 16:44:22 +08:00
lVAL
c63d475d57 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 15:11:24 +08:00
lVAL
3c37037558 增加应答器关联信号机，以及绘图信号机，区段激活选择 2021-01-15 15:11:13 +08:00
joylink_cuiweidong
0f4f6ef5f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 13:27:09 +08:00
joylink_cuiweidong
53b51a7b63 道岔 生成逻辑代码调整 2021-01-15 13:26:42 +08:00
lVAL
ec30635c02 修改应答器图层以及回车修改属性的问题 2021-01-15 10:59:58 +08:00
joylink_cuiweidong
4e28468ad9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 10:33:15 +08:00
joylink_cuiweidong
a86c76422f 岔心绘图代码调整 
区段绘图（左右关联区段 关系）调整
 2021-01-15 10:32:57 +08:00
lVAL
48955258ea 修改应答器 绘制card css 2021-01-15 09:54:56 +08:00
lVAL
c6c59f48b7 修改代码 2021-01-15 09:53:37 +08:00
lVAL
284899599c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-14 18:38:29 +08:00
lVAL
b5c2202114 增加 南京线增加参数选择的步骤功能 2021-01-14 18:37:31 +08:00
joylink_cuiweidong
28babc78f9 岔心 绘图调整 2021-01-14 16:03:48 +08:00
joylink_cuiweidong
cadda00719 区段 物理区段 实际长度修改 bug调整 2021-01-14 14:58:42 +08:00
joylink_cuiweidong
845f10caf6 岔心绘图代码调整 
bug调整：新建完一个信号机 三个状态不发生改变
 2021-01-14 13:04:04 +08:00
joylink_cuiweidong
becb6a03df 岔心代码调整 2021-01-13 18:33:07 +08:00
lVAL
9f4155b70d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 17:45:49 +08:00
lVAL
15f94a7d1d 优化 应答器创建 选择关联区段类型 以及优化绘制显示位置 2021-01-13 17:45:38 +08:00
joylink_cuiweidong
752b4e9a26 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/utils/parser.js
 2021-01-13 17:43:15 +08:00
joylink_cuiweidong
99644039d3 新建车站以后 无法点击其他的东西 bug 调整 2021-01-13 17:34:57 +08:00
joylink_cuiweidong
ac6f3673d4 Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client 2021-01-13 17:02:31 +08:00
joylink_cuiweidong
7599458c8f 岔心 元素绘图代码调整 2021-01-13 17:01:53 +08:00
lVAL
006d784178 修改应答器bug 2021-01-13 10:26:52 +08:00
thesai
032ec93af4 Merge remote-tracking branch 'origin/test' 2021-01-12 23:46:38 +08:00
thesai
2d154f1611 设备登录行值显示 2021-01-12 23:46:07 +08:00
thesai
8eb293f074 Merge remote-tracking branch 'origin/test' 2021-01-12 23:14:34 +08:00
thesai
4adc474b54 设备登录行值显示 2021-01-12 23:13:05 +08:00
joylink_cuiweidong
cb35140942 Merge remote-tracking branch 'remotes/origin/test' 2021-01-12 19:01:29 +08:00
fan
35790f6693 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 18:27:05 +08:00
fan
21e2455472 项目登录行调 运行图预览跳转新页面 2021-01-12 18:26:55 +08:00
sunzhenyu
646836ecb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 17:58:12 +08:00
sunzhenyu
057a6e41f8 删除无用注释 2021-01-12 17:57:59 +08:00
sunzhenyu
d257bf254b 修改sdy行调沙盘，现地cctv 2021-01-12 17:57:04 +08:00
joylink_cuiweidong
1e2e8c2609 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/shape/Responder/index.js
 2021-01-12 17:27:25 +08:00
joylink_cuiweidong
85a88a9431 岔心 绘图代码调整 2021-01-12 17:25:32 +08:00
lVAL
64df012fc3 设置应答器 绘图显示 仿真不显示 2021-01-12 11:32:39 +08:00
joylink_cuiweidong
54a312c20f 岔心 地图绘图 代码调整 2021-01-12 10:11:16 +08:00
lVAL
7bacd3c49f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 10:07:50 +08:00
lVAL
9bd12bb82e 增加应答器配置 2021-01-12 10:07:31 +08:00
sunzhenyu
96e2179bd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:55:57 +08:00
sunzhenyu
b2ab6d4fd1 修改综合演练中三维驾驶不显示选择司机 2021-01-11 15:55:48 +08:00
joylink_cuiweidong
e1af8e878e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:40:15 +08:00
joylink_cuiweidong
6ef0498ffd 添加 岔心 地图绘制页面 2021-01-11 15:39:06 +08:00
fan
b248e69ffe 导入学生信息添加校验&哈尔滨打包不再区分路由文件 2021-01-11 10:55:07 +08:00
zyy
bb22ed66ed 调整大屏预览显示流程 2021-01-08 16:50:50 +08:00
fan
4d3991f3e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_lesson 2021-01-08 11:13:16 +08:00
fan
dfa815fe6d 课程创建迁移&调度电话调整 2021-01-08 11:12:58 +08:00
joylink_cuiweidong
4d8932e155 触发故障管理 布局代码调整 2021-01-07 11:13:03 +08:00
joylink_cuiweidong
5469afd2ec 调度电话 代码调整 
（现地工作站去掉 所有车站）
（呼叫 已经通话的人 会话逻辑处理）
 2021-01-07 10:31:26 +08:00
fan
e94ffd235a 故障模式快捷键&ISCS返回（退出）调整 2021-01-06 18:17:40 +08:00
fan
43f039e5c6 浙大网新 发送请求提示调整 2021-01-04 17:52:38 +08:00
lVAL
cfa739338b Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client 2020-12-31 18:12:07 +08:00
fan
48b165e11c 国赛权限调整 2020-12-30 15:30:24 +08:00
joylink_cuiweidong
3329053207 仿真 综合演练 添加 联系方式 2020-12-29 16:15:10 +08:00
fan
56a47f48f9 Merge branch 'test' 2020-12-29 16:14:16 +08:00
sunzhenyu
f45262c245 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 11:07:41 +08:00
fan
855936a5db 调整功能按钮 2020-12-29 10:16:27 +08:00
fan
62f4695c50 Merge remote-tracking branch 'origin/test' 2020-12-29 10:08:38 +08:00
sunzhenyu
ec1f215104 merge 2020-12-29 10:00:44 +08:00
sunzhenyu
0eedf1bd6b merge 2020-12-29 10:00:29 +08:00
sunzhenyu
e857d580ac 修改客流车站模型 2020-12-29 09:59:43 +08:00
fan
8b2291e18b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 09:59:26 +08:00
fan
fda2e940a5 调整路径 2020-12-29 09:59:11 +08:00
lVAL
f97a98da21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:59:57 +08:00
lVAL
44e42bf5e5 调整宁波3号线操作 2020-12-28 16:59:29 +08:00
fan
8028103feb 综合演练行调添加ISCS&ISCS列车时刻表&ISCS信号系统 2020-12-28 11:20:36 +08:00
fan
48e37e44f8 indexedDb调整 2020-12-24 15:33:06 +08:00
joylink_cuiweidong
623cbd2143 北交大 客流 代码调整 2020-12-22 18:42:27 +08:00
joylink_cuiweidong
d5fcc4bd36 北交大 客流数据 代码调整 2020-12-22 18:26:31 +08:00
fan
e38833b119 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 17:27:31 +08:00
fan
8b2cd16fe9 运行图调整 2020-12-22 17:27:04 +08:00
sunzhenyu
af7e9d8dbf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 14:08:33 +08:00
sunzhenyu
e3b9c2f682 修改北交大客流人数颜色图示 2020-12-22 14:08:25 +08:00
fan
1bc7da3c53 哈尔滨 联锁机故障&重启令解 2020-12-21 16:09:43 +08:00
zyy
baffbf36c8 调整南京二号线线路点击选择 2020-12-20 10:55:34 +08:00
joylink_cuiweidong
ceb288d960 Merge remote-tracking branch 'remotes/origin/test' 2020-12-18 19:09:24 +08:00
zyy
2884d0f02c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 15:37:53 +08:00
zyy
901fa60bc4 调整道岔生成流程 2020-12-18 15:37:35 +08:00
fan
941e0a791a 留言板调整 2020-12-18 13:38:13 +08:00
joylink_fanyuhong
e534232f2d 留言板调整 
(cherry picked from commit 0dbc19027a)
 2020-12-18 09:18:43 +08:00
fan
5740b863b3 text、line、outFrame添加参数&报错提示调整 2020-12-18 09:17:18 +08:00
joylink_fanyuhong
0dbc19027a 留言板调整 2020-12-17 22:46:09 +08:00
joylink_fanyuhong
1e9bc8adb5 Merge remote-tracking branch 'origin/test' 2020-12-17 20:56:05 +08:00
fan
ca8da79986 merge 2020-12-17 13:20:47 +08:00
fan
855295ca75 通用ibp&留言板管理&贵装备课程发布调整 2020-12-17 13:19:12 +08:00
joylink_cuiweidong
fdfd54f452 北交大客流项目 代码调整 2020-12-17 09:59:06 +08:00
zyy
f7703476e8 Merge branch 'test' 2020-12-16 18:23:21 +08:00
zyy
34bff76eb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 15:37:22 +08:00
zyy
c2f6c3461b 调整宁波三，增加字段 2020-12-16 15:37:09 +08:00
joylink_cuiweidong
90f0b4e918 运行图编制代码调整 2020-12-16 14:51:59 +08:00
fan
3aadd5d682 Merge remote-tracking branch 'origin/test' 2020-12-16 14:00:49 +08:00
fan
bd0aac34fe 综合演练现地显示调整 2020-12-16 13:25:55 +08:00
fan
d5b0508467 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 10:55:25 +08:00
fan
eebb034208 现地增加ibp& 现地切换值班员角色调整 2020-12-16 10:54:55 +08:00
joylink_cuiweidong
1715dcad32 北交大 客流数据代码调整 2020-12-16 10:18:58 +08:00
joylink_cuiweidong
525fc25469 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 09:42:15 +08:00
joylink_cuiweidong
0a5eb83904 代码调整 2020-12-16 09:41:53 +08:00
joylink_cuiweidong
3f7d5da3b1 代码调整 2020-12-16 09:40:37 +08:00
fan
1faa02cffa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 18:16:04 +08:00
fan
19e9cb7948 缓存运行图数据 2020-12-15 18:15:48 +08:00
joylink_cuiweidong
1453d5538a 北交大客流仿真代码调整 2020-12-15 18:09:10 +08:00
joylink_cuiweidong
845b620e65 北交大仿真 切换客流数据调整 2020-12-15 16:20:11 +08:00
zyy
9e48ca39a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 14:41:36 +08:00
zyy
249bef4802 调整道岔生成逻辑 2020-12-15 14:41:23 +08:00
joylink_cuiweidong
a45374acc3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 13:36:05 +08:00
joylink_cuiweidong
da59fdbed6 代码调整 2020-12-15 13:35:38 +08:00
fan
3c6047d4ad 打包调整 2020-12-15 11:18:15 +08:00
zyy
7ec4a2db59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 11:10:19 +08:00
zyy
b85dcb41dc 调整道岔生成逻辑 2020-12-15 11:10:05 +08:00
fan
91197718c8 Merge branch 'test' 2020-12-14 18:41:55 +08:00
joylink_cuiweidong
c437ac62c1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 17:19:31 +08:00
joylink_cuiweidong
0ecea0aabc 地图绘制代码调整 2020-12-14 17:18:57 +08:00
zyy
e5a51e0d90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2020-12-14 17:07:15 +08:00
zyy
40687fcd5b 调整信号机批量设置偏移量 2020-12-14 17:06:23 +08:00
joylink_cuiweidong
1deaf4defc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 16:54:31 +08:00
joylink_cuiweidong
89b635e24a 地图绘制代码调整 2020-12-14 16:53:43 +08:00
fan
0364fa0f2d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 15:51:29 +08:00
fan
62cba757e6 绘图预览界面 现地行调显示调整 & ibp从发布地图创建调整 & 贵装备信息导入调整 2020-12-14 15:22:47 +08:00
zyy
02a6293d5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 11:29:43 +08:00
zyy
0310ee6c57 调整地图流程 2020-12-14 11:29:26 +08:00
joylink_cuiweidong
c3fc4a1797 Merge remote-tracking branch 'remotes/origin/test' 2020-12-11 20:18:58 +08:00
joylink_cuiweidong
328805ba80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-11 20:17:41 +08:00
joylink_cuiweidong
d8c6a8657b 哈尔滨运行图编制代码调整 2020-12-11 20:17:18 +08:00
fan
70e260cc4f 哈尔滨屏蔽门调整 2020-12-11 19:49:48 +08:00
fan
f9d8bda8b0 宁波三号线延续保护添加箭头 2020-12-11 13:19:34 +08:00
joylink_cuiweidong
1b0ab87020 车站绘图代码调整（去除公里标名称必填） 
文字绘图代码调整（调整文字字体，与车站名称字体一致）
 2020-12-10 18:33:18 +08:00
joylink_cuiweidong
9a7a69201a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 18:03:19 +08:00
joylink_cuiweidong
fd267160b1 信号机绘图代码调整（解决设置信号机归属联锁站bug） 
运行图编制代码调整
 2020-12-10 18:02:59 +08:00
fan
80ebd84062 宁波三号线调整 2020-12-10 17:34:13 +08:00
joylink_cuiweidong
a22445552a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 13:54:13 +08:00
joylink_cuiweidong
3f7eccdc2f 运行图编制代码调整 2020-12-10 13:53:34 +08:00
sunzhenyu
72abaf9643 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 11:29:23 +08:00
sunzhenyu
dae99ee4ad 修改综合演练三维驾驶初始样式 2020-12-10 11:29:12 +08:00
zyy
1a093e6594 调整交控皮肤显示条件，增加自动折返进路显示 2020-12-09 17:08:36 +08:00
zyy
4361d503f3 调整信号机联锁站设置搜索 2020-12-09 15:03:46 +08:00
zyy
7ce6cf6e8a 调整修改区段bug 2020-12-08 18:41:18 +08:00
zyy
9ede8ad97d 增加删除范围，调整退出仿真发送取消订阅 2020-12-08 13:56:36 +08:00
zyy
085990f755 增加站台紧急按钮批量删除，增加区段批量删除范围 2020-12-08 11:09:02 +08:00
zyy
4362eef88b 增加删除范围 2020-12-07 18:36:53 +08:00
zyy
ed93c3159e 删除元素补充 2020-12-07 18:19:31 +08:00
zyy
c97074f585 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-07 18:00:42 +08:00
zyy
b0234db4a2 调整道岔生成逻辑 2020-12-07 18:00:26 +08:00
sunzhenyu
ce7a3de96f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-07 17:14:15 +08:00
sunzhenyu
d973dbc46e 修改三维设备界面隐藏显示 2020-12-07 17:14:06 +08:00
zyy
6b53bc55d6 调整删除区段关联车次窗 2020-12-07 16:10:03 +08:00
zyy
6995a8a962 增加以区段为目标删除左右所有元素 2020-12-07 15:09:53 +08:00
zyy
cbe5307f98 Merge remote-tracking branch 'remotes/origin/test' 2020-12-06 21:56:35 +08:00
joylink_cuiweidong
cd39147257 实训平台代码调整 2020-12-04 18:10:07 +08:00
zyy
7054f6c1e6 增加运行图编辑 2020-12-04 17:10:03 +08:00
joylink_cuiweidong
23cbc94c78 代码调整 2020-12-02 18:37:32 +08:00
joylink_cuiweidong
95c685bfab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/displayNew/demonMenu.vue
 2020-12-02 17:49:08 +08:00
joylink_cuiweidong
b51ebde280 北交大客流仿真系统代码调整 2020-12-02 17:45:19 +08:00
fan
d96df1ce68 个人信息关闭后终止状态&贵装备展示留言板 2020-12-02 15:23:23 +08:00
zyy
de081382fa 增加运行图交路设置 2020-12-02 09:31:23 +08:00
zyy
b93af93af3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-01 10:21:06 +08:00
zyy
20e774c8b8 删除多余配置 2020-12-01 10:20:54 +08:00
fan
388f9a14ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-30 18:25:41 +08:00
fan
97a373b9d9 代码调整 2020-11-30 18:22:22 +08:00
joylink_cuiweidong
888001c65e 删除暂时无用代码 2020-11-30 16:12:24 +08:00
joylink_cuiweidong
f9bac6886a 删除暂时无用代码 2020-11-30 10:23:32 +08:00
sunzhenyu
dda3cedf30 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 17:50:39 +08:00
sunzhenyu
7491a63b42 三维客流退出样式 2020-11-27 17:50:33 +08:00
joylink_cuiweidong
6a9406054d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 17:37:30 +08:00
joylink_cuiweidong
c1507b01e1 地图数据加载到缓存store里（刷新之后数据会丢失） 
删除暂时无用的代码
 2020-11-27 17:37:13 +08:00
sunzhenyu
7068b73585 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 17:25:02 +08:00
sunzhenyu
c8cdf34397 修改三维客流退出页面取消订阅 2020-11-27 17:24:52 +08:00
joylink_cuiweidong
b3f538fa09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 15:04:15 +08:00
joylink_cuiweidong
93e936a766 北交大 客流项目代码调整 2020-11-27 15:03:55 +08:00
fan
056570c096 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:18:42 +08:00
fan
76f9db3eb6 留言板添加至新标签页 
(cherry picked from commit a509af1e09)
 2020-11-27 14:17:54 +08:00
joylink_cuiweidong
90ec120603 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:05:28 +08:00
joylink_cuiweidong
c2cd9e73d5 考试系统代码调整 2020-11-27 14:05:10 +08:00
sunzhenyu
c2f2698092 修改三维客流窗口操作 2020-11-27 13:59:54 +08:00
joylink_cuiweidong
c6ec7c9049 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 11:15:42 +08:00
joylink_cuiweidong
e1ab504ddb 屏蔽门绘图调整 2020-11-26 11:15:25 +08:00
fan
a84120c2e5 语音路径调整 2020-11-26 09:33:30 +08:00
joylink_cuiweidong
a5dad072ca 实训平台代码调整 2020-11-25 18:28:20 +08:00
joylink_cuiweidong
2732e60a94 教学系统 实训代码调整 2020-11-25 15:52:52 +08:00
joylink_cuiweidong
8c054f492f 实训平台 代码调整 2020-11-25 13:31:36 +08:00
joylink_cuiweidong
e355191291 教学系统 实训代码调整 2020-11-25 09:45:59 +08:00
joylink_cuiweidong
c7a98096a2 教学系统 代码调整 2020-11-24 19:17:10 +08:00
zyy
e249c344eb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 17:35:27 +08:00
zyy
9ba73cbb77 调整哈尔滨综合监控数据 2020-11-24 17:35:14 +08:00
sunzhenyu
6ce808b8f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 17:32:43 +08:00
sunzhenyu
7ef4994a09 修改三维客流视窗跳转方式 2020-11-24 17:32:37 +08:00
joylink_cuiweidong
465e0e5860 北交大系统 仿真页面代码调整 
教学 实训列表文字调整
 2020-11-24 17:11:00 +08:00
joylink_cuiweidong
872824dff1 绘图代码调整 2020-11-24 16:53:13 +08:00
fan
906208b236 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-23 18:04:02 +08:00
fan
84ccf357f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-23 18:03:41 +08:00
joylink_cuiweidong
96a57af6fc 代码调整 2020-11-23 18:00:45 +08:00
fan
93f3e485fc 老旧接口调整 2020-11-23 18:00:12 +08:00
joylink_cuiweidong
ce5287964b 删除无效代码 2020-11-23 17:09:27 +08:00
joylink_cuiweidong
0599da13aa 综合演练暂时无用代码删除 2020-11-23 17:05:16 +08:00
joylink_cuiweidong
acd3e5c6ff 删除无效的文件 2020-11-23 10:47:33 +08:00
joylink_cuiweidong
c32dc326c4 北交大 客流站场仿真页面 订阅顺序调整 图例调整 2020-11-20 17:37:17 +08:00
joylink_cuiweidong
a131fd12d7 代码调整 2020-11-20 14:59:24 +08:00
joylink_cuiweidong
fece30a51d 北交大 客流站场仿真界面 代码调整 2020-11-20 14:53:50 +08:00
joylink_cuiweidong
756aca9281 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 14:22:15 +08:00
joylink_cuiweidong
1010df5613 北交大 客流站场仿真界面 代码调整 2020-11-20 14:21:57 +08:00
zyy
a50264a8df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 13:22:19 +08:00
zyy
a6e0808092 调整客流量流程 2020-11-20 13:22:03 +08:00
fan
4ae8979563 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 11:22:42 +08:00
fan
9d4f0d6804 留言板表情包调整 2020-11-20 11:22:21 +08:00
zyy
c10283c256 增加客流量数据渲染 2020-11-20 11:13:47 +08:00
joylink_cuiweidong
99e7abd361 运行图编制代码调整 2020-11-19 17:02:55 +08:00
fan
9b9fcd01e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-19 14:17:46 +08:00
fan
11b54cef43 留言板表情包 2020-11-19 14:17:01 +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
zyy
c098f68702 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-19 09:40:17 +08:00
zyy
648f38e68d 调整运行图间距 2020-11-19 09:40:03 +08:00
joylink_cuiweidong
224ca3785d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-18 13:24:16 +08:00
joylink_cuiweidong
88ac007ebd 运行图代码调整 2020-11-18 13:22:53 +08:00
zyy
6897317693 增加索引 2020-11-18 13:16:47 +08:00
zyy
d8c25dde1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-18 13:15:40 +08:00
zyy
83e74cc53b 增加运行图客流量配置 2020-11-18 13:15:28 +08:00
fan
4c7e601406 调整北交大按钮顺序 2020-11-18 11:01:22 +08:00
fan
c1a357fe28 留言板项目接口调整 2020-11-18 10:55:11 +08:00
fan
dc57a1a82b 北交大添加留言板&联系方式&背景图片压缩 2020-11-18 09:31:10 +08:00
fan
6bd3f751c8 留言板调整 
(cherry picked from commit cd59d4e26e)
 2020-11-17 19:18:31 +08:00
fan
9a470268b2 留言板调整 2020-11-17 19:06:59 +08:00
fan
842c10a3f3 留言板调整 
(cherry picked from commit c53c744edc)
 2020-11-17 18:51:38 +08:00
fan
731a2af939 留言板报错调整 2020-11-17 18:39:11 +08:00
fan
6e35c6446e 展示更多距离调整 2020-11-17 18:33:21 +08:00
fan
d48d2564bc 留言板问题调整 2020-11-17 18:31:29 +08:00
fan
a22dd39077 留言板问题调整 2020-11-17 18:29:03 +08:00
fan
242ca313a0 删除接口调整 2020-11-17 17:17:23 +08:00
fan
19a03ab258 留言板调整 2020-11-17 16:55:05 +08:00
fan
df386dcb75 按钮判断条件调整 
(cherry picked from commit 45bb150440)
 2020-11-16 19:38:37 +08:00
fan
d477f46bc7 调整场景列表高度 2020-11-16 19:35:12 +08:00
fan
2c54e68928 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	src/views/newMap/displayNew/demonMenu.vue
#	src/views/newMap/displayNew/dispatherContest/sceneList.vue
 2020-11-16 19:29:49 +08:00
fan
1de24c5d31 留言板功能部分实现 2020-11-16 19:26:23 +08:00
sunzhenyu
c5212b67ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-16 18:22:36 +08:00
joylink_cuiweidong
79673768f0 竞赛平台 代码调整 2020-11-16 18:22:21 +08:00