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

12586 Commits

Author SHA1 Message Date
dong
75d2ea8aed 代码调整 2022-12-16 17:05:44 +08:00
fan
e2bdc4d5ed 南京二调整 2022-12-16 16:04:56 +08:00
fan
cbcd66a9ab 线路调整 2022-12-16 15:56:30 +08:00
fan
81811cb0db Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-16 10:23:44 +08:00
fan
687ffa563a 【北京一号线】这个提示位置修改下，11G是那个圆弧 2022-12-16 10:23:31 +08:00
dong
18ecffd06a 代码调整 2022-12-15 22:48:55 +08:00
fan
66153cc09d 哈尔滨一号线CR1或CR2未及时操作时清除operations 2022-12-15 16:23:36 +08:00
fan
39a2e0cdc3 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-15 14:58:06 +08:00
fan
0f2a40b6cb 【标准一号线】强制站控提示位置有问题 2022-12-15 14:47:40 +08:00
joylink_cuiweidong
c4d21c6e24 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-14 16:23:54 +08:00
joylink_cuiweidong
43120ef0a9 注册代码调整 2022-12-14 16:23:39 +08:00
dong
e8a8f12db1 代码调整 2022-12-14 15:44:48 +08:00
joylink_cuiweidong
c2b9c3c2aa Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-14 15:23:05 +08:00
joylink_cuiweidong
c0f9ce0572 注册 添加拼图 人机验证 2022-12-14 15:22:47 +08:00
fan
2339cbc8c7 【系统管理-线路功能】实训室配置了成员管理，但登录教员机后没有显示 2022-12-14 13:58:56 +08:00
fan
261b1296bb 【哈尔滨一号线】哈尔滨轨区设限选择速度的步骤没有生成操作 2022-12-14 13:50:11 +08:00
fan
294e9d61fe subType调整 2022-12-14 13:25:43 +08:00
fan
7e2ce3c8b0 前端配置项trainingType为空串时删除 2022-12-14 10:22:27 +08:00
fan
3fd4aa63f4 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-14 09:43:35 +08:00
fan
0cf34a6aeb 【【哈尔滨一号线】这里原本的步骤是点击字母E，现在点了站台门也触发下一步了，会导致实训无法继续】需重新进路录制 2022-12-14 09:36:33 +08:00
joylink_cuiweidong
4985423186 代码调整 2022-12-13 17:28:57 +08:00
joylink_cuiweidong
6a89850696 代码调整 2022-12-13 17:20:52 +08:00
joylink_cuiweidong
7c1691d774 注册接口 调整 2022-12-13 17:12:19 +08:00
joylink_cuiweidong
4ec18c3731 代码调整 2022-12-13 15:59:42 +08:00
fan
684199abd1 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-13 15:50:44 +08:00
fan
83d1342110 监管仿真增加进入仿真 2022-12-13 15:50:27 +08:00
joylink_cuiweidong
81152cb252 用户注册 代码调整 2022-12-13 15:32:32 +08:00
joylink_cuiweidong
8e498c45f6 代码调整 2022-12-13 14:06:58 +08:00
joylink_cuiweidong
ef8fab3f7b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-13 14:01:04 +08:00
joylink_cuiweidong
8233ea0568 佛山线路代码调整 2022-12-13 14:00:43 +08:00
dong
2f0b44fb06 代码调整 2022-12-13 13:59:47 +08:00
fan
15226a3406 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-13 13:57:20 +08:00
fan
8fbe18c9a4 【【哈尔滨一号线】实训结束的文字提示这个层级需要调一下，被遮住了】&客户端初始值设置调整 2022-12-13 13:57:09 +08:00
joylink_cuiweidong
d1e41fe25c Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-13 13:49:19 +08:00
joylink_cuiweidong
03ef312683 删除微信二维码登录，添加注册功能 2022-12-13 13:49:02 +08:00
dong
c1128f992b 代码调整 2022-12-13 13:41:10 +08:00
dong
fe4b04fb70 代码调整 2022-12-13 13:09:14 +08:00
fan
8850460a0f 设计控制台组织冒泡 2022-12-13 11:13:23 +08:00
fan
5aaf79eeb7 北京站遥控清除数据 2022-12-13 10:56:31 +08:00
fan
8c8772c3d9 【【哈尔滨一号线】关区信号实训提示位置需要调整】 2022-12-13 10:41:26 +08:00
fan
b0453fda2d 是否综合演练isJoint => joint 2022-12-13 10:15:33 +08:00
fan
4fbc45780c Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-13 09:31:46 +08:00
fan
3ab928d7df 【标准一号线】，车站勾选错误再重新选择后，强制站控按钮就无法点击了&清除日志 2022-12-13 09:31:34 +08:00
dong
611e3902e5 代码调整 2022-12-12 17:56:36 +08:00
fan
f6cdf07b06 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-12 17:00:38 +08:00
fan
1fbd8b5824 【【北京一号线】站控时，车站应无法操作设备】&创建实训校验调整 2022-12-12 17:00:23 +08:00
dong
c814592f73 ningbo_03组件拆分 2022-12-12 16:38:34 +08:00
fan
a3791a0cbf Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-12 16:27:40 +08:00
fan
19c6087141 【【哈尔滨一号线】点击车站名无法切换车站】&&切换实训是因角色变化导致定位丢失问题处理 2022-12-12 16:27:28 +08:00
joylink_cuiweidong
132de532a9 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-12 15:42:26 +08:00
joylink_cuiweidong
addecd294f 代码调整 2022-12-12 15:42:09 +08:00
fan
9c9ac662c8 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-12 15:23:53 +08:00
fan
37f149446d 南京二客户端调整 2022-12-12 15:23:42 +08:00
joylink_cuiweidong
f06ba54b56 代码调整 2022-12-12 14:48:59 +08:00
joylink_cuiweidong
8db9f95ade Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-12 13:18:05 +08:00
joylink_cuiweidong
7a3a3db7b4 代码调整 2022-12-12 13:17:08 +08:00
fan
abf2aef82d Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-12 11:16:57 +08:00
fan
1b7ecb0aad 实训调整 2022-12-12 11:16:07 +08:00
dong
e0bee230d9 代码调整 2022-12-12 11:04:13 +08:00
dong
835ff2219f 代码调整 2022-12-12 09:53:00 +08:00
dong
7dbf9e5374 ningbo_01组件拆分 2022-12-12 09:30:46 +08:00
joylink_cuiweidong
3235f801a8 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-09 17:27:21 +08:00
joylink_cuiweidong
c359db3ac3 代码调整 2022-12-09 17:27:01 +08:00
dong
cb236000e1 代码调整 2022-12-09 16:54:58 +08:00
fan
2589141b4b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-09 16:45:18 +08:00
fan
5f0816c2d6 南京二号线菜单调整 2022-12-09 16:44:58 +08:00
joylink_cuiweidong
5eeb655b39 代码调整 2022-12-09 16:40:32 +08:00
joylink_cuiweidong
ce983bc448 代码调整 2022-12-09 16:27:47 +08:00
joylink_cuiweidong
1832e71264 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-09 15:39:49 +08:00
joylink_cuiweidong
2e0105c390 代码调整 2022-12-09 15:39:30 +08:00
Yuan
9370621c62 Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly 2022-12-09 15:12:02 +08:00
dong
1f5a6bce26 代码调整 2022-12-09 15:12:33 +08:00
Yuan
0fce737944 考试管理 - 成绩查询&成绩统计 2022-12-09 15:11:59 +08:00
dong
071506619b 代码调整 2022-12-09 11:18:10 +08:00
dong
ec2d7e7d5c 代码调整 2022-12-09 10:23:54 +08:00
dong
0f8643591c 代码调整 2022-12-09 09:52:51 +08:00
dong
bae7270755 代码调整 2022-12-09 09:44:50 +08:00
dong
68dd872c41 chengdou_01拆分 2022-12-08 18:43:00 +08:00
Yuan
388803eed5 成绩统计改为柱状图 2022-12-08 18:39:02 +08:00
dong
8ca90b1003 代码调整 2022-12-08 18:06:24 +08:00
joylink_cuiweidong
99e6065ba7 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 17:24:06 +08:00
joylink_cuiweidong
1555c0ccd5 代码调整 2022-12-08 17:23:53 +08:00
fan
3f4da53695 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-08 17:19:46 +08:00
fan
9cbfd0068b 个人信息显示组织 2022-12-08 17:19:36 +08:00
joylink_cuiweidong
f6145d9ad8 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 17:04:10 +08:00
joylink_cuiweidong
bd5b154883 代码调整 2022-12-08 17:03:55 +08:00
dong
801d2186cc 代码调整 2022-12-08 16:40:42 +08:00
fan
a4b77f0e86 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-08 16:37:11 +08:00
fan
c44053ec54 北京一问题调整 2022-12-08 16:37:00 +08:00
joylink_cuiweidong
65af81491c Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 16:28:39 +08:00
joylink_cuiweidong
bbcf5b3fec 代码调整 2022-12-08 16:28:22 +08:00
Yuan
e621200bca Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly 2022-12-08 16:16:36 +08:00
Yuan
e9f4d286d1 bugfix 考试管理封存试卷未确认 2022-12-08 16:16:32 +08:00
dong
ea6ebc0bc3 代码调整 2022-12-08 16:14:01 +08:00
fan
63f5bac82a Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-08 16:09:16 +08:00
fan
c222cf19a8 南京二调整 2022-12-08 16:08:58 +08:00
fan
f96368b2ec 北京一调整 2022-12-08 16:07:58 +08:00
joylink_cuiweidong
d06d0eec15 代码调整 2022-12-08 16:01:28 +08:00
joylink_cuiweidong
cf693b6d59 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 15:51:45 +08:00
joylink_cuiweidong
a1fd19f78f 成都三号线 代码调整 2022-12-08 15:51:30 +08:00
fan
47ee96f339 0级报警信息关闭未接入操作调整&福州一添加0级报警信息 2022-12-08 15:29:49 +08:00
dong
013ecae2e3 代码调整 2022-12-08 14:44:56 +08:00
joylink_cuiweidong
f45b1b9b05 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 14:28:41 +08:00
joylink_cuiweidong
0346f672bf 成都三号线 站台代码调整 2022-12-08 14:28:19 +08:00
fan
7029394ea8 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 
 Conflicts:
	src/jmapNew/theme/factory.js
 2022-12-08 14:17:38 +08:00
fan
1018592080 哈尔滨一号线菜单调整 2022-12-08 14:16:36 +08:00
dong
88c2ab5047 代码调整 2022-12-08 11:24:42 +08:00
joylink_cuiweidong
865a770141 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 11:15:06 +08:00
joylink_cuiweidong
6e986d51bb 代码调整 2022-12-08 11:14:32 +08:00
dong
05e7798454 代码调整 2022-12-08 10:33:32 +08:00
joylink_cuiweidong
14f0113b3b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 
# Conflicts:
#	src/jmapNew/theme/factory.js
 2022-12-08 10:03:54 +08:00
fan
361d6d9c43 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 
 Conflicts:
	src/jmapNew/theme/factory.js
 2022-12-08 09:58:02 +08:00
joylink_cuiweidong
76096647fb 代码调整 2022-12-08 09:57:56 +08:00
fan
2a593facb1 北京一号线菜单调整&线路页面调整 2022-12-08 09:56:53 +08:00
dong
9b1dac9b2b xian_02拆分 2022-12-07 18:37:44 +08:00
joylink_cuiweidong
825d1a1e15 佛山有轨电车 代码调整 2022-12-07 18:09:22 +08:00
joylink_cuiweidong
cd282093b6 代码调整 2022-12-07 17:30:48 +08:00
joylink_cuiweidong
27c3dd3517 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-07 16:57:47 +08:00
joylink_cuiweidong
2b52da78bf 代码调整 2022-12-07 16:57:30 +08:00
fan
80af34fee0 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-07 16:37:17 +08:00
fan
ffb47289e7 北京一号线菜单调整 2022-12-07 16:36:55 +08:00
Yuan
60cf75f3c0 考试管理标签bug修改 && 试卷状态改动 2022-12-07 16:28:35 +08:00
joylink_cuiweidong
d7962674cd Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-07 15:19:00 +08:00
joylink_cuiweidong
e5869a3ce0 佛山有轨电车 信号机代码调整 2022-12-07 15:18:44 +08:00
fan
cf02840100 控制权判断调整1 2022-12-07 14:38:53 +08:00
fan
16ee7692b2 控制权判断调整 2022-12-07 14:37:46 +08:00
fan
57b4eedfe6 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-07 14:02:43 +08:00
fan
45fd0327b8 线路菜单调整 2022-12-07 14:02:25 +08:00
joylink_cuiweidong
941dd2d24a Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-07 13:57:45 +08:00
joylink_cuiweidong
72b191a660 佛山有轨电车 道岔操作 代码调整 2022-12-07 13:57:29 +08:00
fan
f8387fd3fa Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-07 10:17:54 +08:00
fan
2ef24a51e2 实训列表调整2 2022-12-07 10:15:21 +08:00
dong
d4642b76e8 代码调整 2022-12-07 09:57:42 +08:00
fan
75e70ef63f Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-07 09:42:52 +08:00
fan
8856586404 实训列表调整1 2022-12-07 09:42:35 +08:00
joylink_cuiweidong
c6b6b4ca24 佛山有轨电车 代码调整 2022-12-06 18:17:52 +08:00
joylink_cuiweidong
2df2af557f Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-06 17:32:10 +08:00
joylink_cuiweidong
c80efac6b1 佛山有轨电车 行调工作站 菜单代码调整 2022-12-06 17:31:53 +08:00
fan
48b02ae784 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-06 17:28:39 +08:00
fan
e6f62a87d8 实训列表调整 2022-12-06 17:28:22 +08:00
dong
d2453394c8 代码调整 2022-12-06 17:19:32 +08:00
dong
e7b6014974 代码调整 2022-12-06 16:42:41 +08:00
dong
f7679a4cb1 代码调整 2022-12-06 15:59:46 +08:00
joylink_cuiweidong
08daa72298 代码调整 2022-12-06 15:15:15 +08:00
joylink_cuiweidong
1b549ce480 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-06 15:06:06 +08:00
joylink_cuiweidong
6d7ef0d42b 代码调整 2022-12-06 15:05:53 +08:00
fan
e056455e5e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-06 14:05:38 +08:00
fan
d73bc4d577 发送文字替换发送语音 2022-12-06 14:05:07 +08:00
joylink_cuiweidong
e727a1c338 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-06 11:19:53 +08:00
joylink_cuiweidong
9c1a7e129f 代码调整 2022-12-06 11:19:40 +08:00
dong
8b1365561e 代码调整 2022-12-06 10:14:42 +08:00
joylink_cuiweidong
2edf28636f pis设备登录代码调整 2022-12-05 18:12:46 +08:00
joylink_cuiweidong
cb2168abd6 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-05 18:06:20 +08:00
joylink_cuiweidong
09c583ee79 设备管理 pis 代码调整 2022-12-05 18:06:00 +08:00
dong
68f730da24 代码调整 2022-12-05 18:04:57 +08:00
joylink_cuiweidong
a10ef8fa1b 代码调整 2022-12-05 17:45:36 +08:00
joylink_cuiweidong
1776eae6d3 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-05 17:09:20 +08:00
joylink_cuiweidong
df453fd676 代码调整 2022-12-05 17:09:07 +08:00
dong
b0e8ac00fa 西安01组件拆分 2022-12-05 17:01:49 +08:00
joylink_cuiweidong
39b4b0b49a 代码调整 2022-12-05 16:50:07 +08:00
joylink_cuiweidong
a19c95516d 代码调整 2022-12-05 14:08:21 +08:00
joylink_cuiweidong
fd61b8e038 代码调整 2022-12-02 18:17:50 +08:00
joylink_cuiweidong
3a7babb483 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-02 18:09:00 +08:00
joylink_cuiweidong
6195d4659e 代码调整 2022-12-02 18:08:43 +08:00
fan
2f5444e27f 会话问题调整 2022-12-02 17:53:10 +08:00
fan
4dff079c60 删除聊天室老代码 2022-12-02 17:24:41 +08:00
fan
c66d3e6d5f Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-02 17:23:13 +08:00
fan
42d8e9fe60 聊天室调整 2022-12-02 17:22:51 +08:00
joylink_cuiweidong
6bd2857e0b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-02 17:06:49 +08:00
joylink_cuiweidong
31f5db5592 代码调整 2022-12-02 17:06:31 +08:00
dong
79514913bd 代码调整 2022-12-02 16:03:51 +08:00
dong
9f205b7766 运行图编制 2022-12-02 15:08:58 +08:00
fan
fe5ce61325 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-02 14:47:02 +08:00
fan
055f39b070 仿真订阅未清除调整 2022-12-02 14:45:58 +08:00
joylink_cuiweidong
2d9117d11d Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-02 14:01:37 +08:00
joylink_cuiweidong
d6e672270c 代码调整 2022-12-02 14:00:27 +08:00
fan
1e241b3460 行调状态下点击车站报错调整 2022-12-02 10:53:39 +08:00
fan
0612de521f common前缀接口调整&监管仿真接口调整 2022-12-02 10:45:39 +08:00
fan
f02e7e1160 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-02 09:54:42 +08:00
fan
a0fb408690 现在实训得分只有步骤分，缺少总分统计 && 实训测验模式得分有问题，没做也有得分 2022-12-02 09:54:32 +08:00
dong
49881dcbb0 代码调整 2022-12-01 18:20:25 +08:00
fan
0ffb424484 无试卷规则时判断&销毁仿真接口delete 2022-12-01 18:01:26 +08:00
fan
8d45eae494 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-01 16:58:29 +08:00
fan
c4ee6b0350 仿真调整 2022-12-01 16:58:12 +08:00
dong
7a84b23cdc 代码调整 2022-12-01 16:26:18 +08:00
fan
c2e0182d53 仿真调整 2022-12-01 15:41:23 +08:00
fan
3acaf45b5d Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-01 15:38:31 +08:00
fan
b15806dca7 仿真调整 2022-12-01 15:38:18 +08:00
dong
50da21af0c 代码调整 2022-12-01 15:01:06 +08:00
fan
a52872de5c 综合演练问题调整2 2022-12-01 14:09:09 +08:00
fan
fc67b87883 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-01 10:58:34 +08:00
fan
797afc7258 综合演练问题调整 2022-12-01 10:58:16 +08:00
joylink_cuiweidong
692b8b97c6 代码调整 2022-11-30 18:35:10 +08:00
joylink_cuiweidong
0fd74b6172 代码调整 2022-11-30 18:24:41 +08:00
joylink_cuiweidong
fbf796b151 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-30 17:56:29 +08:00
joylink_cuiweidong
ece72fb110 设备管理代码调整 2022-11-30 17:55:22 +08:00
dong
d6de03836c 代码调整 2022-11-30 15:42:32 +08:00
fan
ad1ba2efd4 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-30 14:49:30 +08:00
fan
e166f6b732 仿真问题调整 2022-11-30 14:49:09 +08:00
dong
75a4d03ae9 代码调整 2022-11-30 10:14:54 +08:00
fan
af094314d4 singleManage前端配置生效 2022-11-30 10:06:17 +08:00
fan
725708fe34 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-30 09:35:06 +08:00
fan
db8793365f 大铁仿真 报运行图未加载调整 2022-11-30 09:34:45 +08:00
joylink_cuiweidong
8aa8c27803 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-29 18:26:03 +08:00
joylink_cuiweidong
72e9a4535f 代码调整 2022-11-29 18:25:50 +08:00
dong
8a559b4296 代码调整 2022-11-29 18:05:49 +08:00
fan
a274f4ef3b 代码调整 2022-11-29 17:09:04 +08:00
fan
a1e852fed3 operationId&成员管理调整 2022-11-29 16:16:21 +08:00
fan
2e195abb8f 实训调整 2022-11-29 15:08:40 +08:00
fan
b71e2d959b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-29 10:36:36 +08:00
fan
bd9c837d29 增加一键删除线路功能 2022-11-29 10:36:19 +08:00
joylink_cuiweidong
611d5a4e59 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-28 18:34:27 +08:00
joylink_cuiweidong
f4fb2d7cbf 代码调整 2022-11-28 18:34:08 +08:00
fan
4f7476c540 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-28 17:59:23 +08:00
fan
9ffd70de63 菜单调整 2022-11-28 17:59:12 +08:00
joylink_cuiweidong
fd99287e10 项目设备绑定角色 2022-11-28 17:06:39 +08:00
dong
e7db5f7173 代码调整 2022-11-28 16:41:36 +08:00
joylink_cuiweidong
6a1bf40183 代码调整 2022-11-28 15:57:36 +08:00
joylink_cuiweidong
98e1a75705 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-28 15:17:58 +08:00
joylink_cuiweidong
98ed313a1d 代码调整 2022-11-28 15:17:43 +08:00
dong
dc9e7972e2 代码调整 2022-11-28 13:37:04 +08:00
dong
19b90ab854 代码调整 2022-11-28 13:31:06 +08:00
fan
a69ef7590e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-28 10:46:30 +08:00
fan
15dafc301d 新增路票簿册客户端 2022-11-28 10:46:04 +08:00
joylink_cuiweidong
751ff10406 代码调整 2022-11-28 10:45:31 +08:00
dong
e8b8147aee 代码调整 2022-11-25 18:33:55 +08:00
joylink_cuiweidong
ace5268922 代码调整 2022-11-24 18:15:46 +08:00
joylink_cuiweidong
60d16a2c33 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-24 17:37:46 +08:00
joylink_cuiweidong
92e26e06f1 后端项目配置添加 实习室关联的功能 2022-11-24 17:37:29 +08:00
dong
602184feaf 代码调整 2022-11-24 11:27:16 +08:00
dong
d1bfbe0aad 代码调整 2022-11-23 18:08:17 +08:00
fan
7a66fd7416 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-23 18:04:43 +08:00
fan
aaf5912a2e 实训调整 2022-11-23 18:04:35 +08:00
joylink_cuiweidong
fbf5ab2e33 代码调整 2022-11-23 17:39:38 +08:00
joylink_cuiweidong
e5ff37427d 设备登录 教研机登录 代码调整 2022-11-23 16:57:15 +08:00
joylink_cuiweidong
879719ed4b 项目前端配置 添加 关联地图 设备功能 2022-11-23 14:56:59 +08:00
dong
08dbe1c7b4 调整组织关系管理路由 2022-11-23 11:26:59 +08:00
fan
20d4c147f6 指令发送调整 2022-11-23 11:15:13 +08:00
fan
4c5e694c9a 查询进路控制模式调整 2022-11-23 11:01:50 +08:00
fan
206dbd1219 11.22修改意见部分调整 2022-11-23 10:37:52 +08:00
fan
32d97e6648 场景设计中切了司机角色后，切不了行调 2022-11-22 17:11:54 +08:00
fan
2825615114 动态计算仿真操作模式 2022-11-22 16:36:53 +08:00
fan
00e2b3231a 实训设计盘高度调整 2022-11-22 16:24:35 +08:00
fan
d0d77bd350 取消进路调整 2022-11-22 16:02:36 +08:00
fan
fbeef9c6b5 仿真重置 & 实训重置接口调整 2022-11-22 15:41:31 +08:00
fan
1ea7343267 问题调整 2022-11-22 15:30:51 +08:00
fan
2b0ec10e81 暂替 2022-11-22 13:30:32 +08:00
fan
e2d6307efc menuBarConvert递归调整 2022-11-22 10:55:52 +08:00
fan
6601bdac1b 福州一menuBar 调整 2022-11-22 09:50:53 +08:00
fan
00c2dfc377 发送指令后清除operations 2022-11-22 09:28:35 +08:00
fan
47c2dffec9 问题调整 2022-11-18 17:35:56 +08:00
fan
e0dd6ae248 问题调整 2022-11-18 16:50:41 +08:00
fan
d3be671ad9 应急调度仿真调整 2022-11-17 10:13:15 +08:00
fan
50dbd0bdae Merge remote-tracking branch 'origin/test' into test_dispaly1 
# Conflicts:
#	src/App.vue
#	src/jmapNew/shape/graph/Train/EMouse.js
#	src/views/demonstration/detail/index.vue
#	src/views/trainingPlatform/demonList.vue
 2022-11-16 14:56:09 +08:00
fan
9edb55d72c 应急调度仿真 2022-11-16 14:49:46 +08:00
fan
4dc10f4377 代码调整 2022-11-16 11:06:57 +08:00
fan
b3d62115ec 实训校验调整 2022-11-15 13:20:44 +08:00
fan
c1f0bd6fa7 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 
 Conflicts:
	src/store/modules/trainingNew.js
	src/views/newMap/display/terminals/localWork.vue
 2022-11-09 15:08:32 +08:00
fan
92a3e85f93 实训校验暂提 2022-11-09 15:06:47 +08:00
fan
64c58f511b 实训调整 2022-11-09 14:47:42 +08:00
fan
42592522bb 实训调整 2022-11-08 17:55:22 +08:00
fan
ecd1fe83d7 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-08 10:53:23 +08:00
fan
4438debc22 项目登录仿真里的返回按钮点击无效&prdType转换 2022-11-08 10:53:07 +08:00
dong
8b45548a55 代码调整 2022-11-07 18:17:22 +08:00
fan
fe68d15acf 大客流订阅调整 2022-11-07 18:00:26 +08:00
fan
2caebf5d20 线路功能批量生成提示 2022-11-07 16:37:26 +08:00
fan
19bb41b0d8 大铁实训设计没有根据角色切换显示&语音指令 2022-11-07 16:15:22 +08:00
fan
deeaba2690 大铁控制条被遮盖&大铁综合演练成员管理切换角色后画面没有切换 2022-11-07 13:40:59 +08:00
fan
9b3562b861 权限调接口错误 2022-11-07 10:38:55 +08:00
fan
6a03ce8a11 画面管理副标题bug 调整 2022-11-07 10:32:45 +08:00
fan
078b07f863 线路功能 无itemMap属性导致报错调整 2022-11-07 10:14:32 +08:00
dong
2a9e230ff9 代码调整 2022-11-04 15:58:14 +08:00
dong
15effd12f4 代码调整 2022-11-04 15:42:52 +08:00
dong
cb5da8a7b2 代码调整 2022-11-03 18:32:36 +08:00
fan
1443d7d2fa 画面调整 2022-11-03 17:46:57 +08:00
fan
0d6f548e6e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-03 16:27:47 +08:00
fan
32ea838b58 画面调整 2022-11-03 16:27:38 +08:00
dong
c363127e9a 代码调整 2022-11-03 16:23:52 +08:00
fan
551ebe9fc7 画面调整 2022-11-03 15:38:55 +08:00
fan
f86a8f20c5 调整 2022-11-03 14:26:17 +08:00
fan
29dd0c4c8b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-02 18:05:45 +08:00
fan
74dbc5cff3 调整 2022-11-02 18:05:37 +08:00
dong
8794db68f2 代码调整 2022-11-02 17:56:27 +08:00
fan
c92c66f17c Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 
 Conflicts:
	src/store/modules/training.js
	src/views/newMap/display/index.vue
	src/views/newMap/display/simulationControl.vue
	src/views/publish/publishMap/editSubsystem.vue
 2022-11-02 17:25:45 +08:00
fan
de0be8d66e 线路功能调整 2022-11-02 17:20:57 +08:00
dong
d79c8986bd 代码调整 2022-11-02 16:25:37 +08:00
dong
c64d2f95a6 代码调整 2022-11-02 16:03:39 +08:00
dong
b623a0734e 代码调整 2022-11-02 15:48:50 +08:00
dong
34a4e92073 代码调整 2022-11-02 15:07:36 +08:00
fan
f7418db43c 代码调整 2022-11-02 14:23:03 +08:00
fan
6c02aba151 实训调整 2022-11-02 14:19:55 +08:00
dong
215fb23f20 代码调整 2022-11-02 13:30:07 +08:00
dong
42112659c5 代码调整 2022-11-02 10:28:22 +08:00
joylink_cuiweidong
a91f0063d0 代码调整 2022-11-01 18:09:16 +08:00
joylink_cuiweidong
45243e1968 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-01 18:09:06 +08:00
fan
b08def49ee Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-01 18:07:52 +08:00
fan
a9b47a5a4a 代码调整 2022-11-01 18:07:26 +08:00
joylink_cuiweidong
ad0f92a0e6 代码调整 2022-11-01 18:03:31 +08:00
joylink_cuiweidong
295e1246ab 代码调整 2022-11-01 18:01:21 +08:00
dong
6fb8812039 实训设计调整 2022-11-01 17:45:36 +08:00