12459 Commits

Author	SHA1	Message	Date
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
joylink_cuiweidong	ae09b3b073	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly ... # Conflicts: # src/views/trainingPlatform/simulation.vue	2022-11-01 17:33:12 +08:00
joylink_cuiweidong	49d15b50a1	代码调整	2022-11-01 17:31:49 +08:00
dong	8c924507bc	代码调整	2022-11-01 14:11:22 +08:00
dong	e67179c3c6	代码调整	2022-11-01 14:07:24 +08:00
dong	002a2fddd2	代码调整	2022-11-01 14:02:40 +08:00
dong	88aec8f6dd	代码调整	2022-11-01 10:55:17 +08:00
fan	071143992e	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-11-01 09:29:33 +08:00
fan	fe500964e3	客户端调整	2022-11-01 09:29:21 +08:00
dong	64dd376229	调整权限管理	2022-10-31 18:24:47 +08:00
joylink_cuiweidong	56b2885fba	代码调整	2022-10-31 17:05:17 +08:00
joylink_cuiweidong	88cec5d2b0	项目客户端前端配置 logo图片更换 代码调整	2022-10-31 16:50:12 +08:00
joylink_cuiweidong	e9fc041b03	代码调整	2022-10-31 16:32:54 +08:00
fan	e67d26ddf9	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly ... Conflicts: src/views/publish/publishMap/editSubsystem.vue	2022-10-31 14:34:14 +08:00
fan	ce6781e1d9	线路功能调整	2022-10-31 14:31:34 +08:00
joylink_cuiweidong	863448fb4a	代码调整	2022-10-28 18:34:09 +08:00
joylink_cuiweidong	93cfeffbc5	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-28 18:17:39 +08:00
joylink_cuiweidong	a8e2683693	实训预览 代码调整	2022-10-28 18:17:28 +08:00
dong	838b43e54d	代码调整	2022-10-28 18:11:34 +08:00
joylink_cuiweidong	2156ac1880	代码调整	2022-10-28 17:49:51 +08:00
joylink_cuiweidong	5496469a37	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-28 17:47:09 +08:00
Yuan	6ccfbdd70f	考试管理 mapid 类型转换	2022-10-28 16:35:23 +08:00
Yuan	697a744190	Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly	2022-10-28 16:19:44 +08:00
Yuan	5cc2dbde12	考试规则创建和编辑增加mapid字段	2022-10-28 16:19:39 +08:00
dong	e1f9d6e0c8	理论题目分类只能单选	2022-10-28 16:17:03 +08:00
joylink_cuiweidong	774cf2b2d9	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-28 16:07:21 +08:00
joylink_cuiweidong	c57b4f6814	代码调整	2022-10-28 16:06:21 +08:00
Yuan	8b47049f69	Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly	2022-10-28 16:00:44 +08:00
Yuan	d09e1042c0	考试管理分类修改	2022-10-28 16:00:37 +08:00
dong	6c1903a6a0	实训设计	2022-10-28 15:20:26 +08:00
fan	201456a1d0	解决 调度台不生效	2022-10-28 15:02:58 +08:00
fan	320fa691d5	三方跳转不设置子系统节点	2022-10-28 14:20:56 +08:00
Yuan	f8257cddfe	考试管理 分类改为必选	2022-10-28 11:16:21 +08:00
Yuan	b6830c2cfd	考试管理-规则重复判断条件修改	2022-10-28 10:34:11 +08:00
joylink_cuiweidong	599bf4f722	代码调整	2022-10-28 10:18:00 +08:00
joylink_cuiweidong	6b37a216cb	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-27 18:13:23 +08:00
joylink_cuiweidong	a2c685d6bb	实训管理代码调整	2022-10-27 18:13:03 +08:00
dong	8272afcb13	代码调整	2022-10-27 17:34:57 +08:00
joylink_cuiweidong	44e4673945	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-27 17:30:37 +08:00
joylink_cuiweidong	706ba10aca	代码调整	2022-10-27 17:30:17 +08:00
Yuan	ff7bf2311b	考试管理分类上传字段修改	2022-10-27 17:10:26 +08:00
dong	1cca675506	修改前端显示配置项	2022-10-27 16:57:13 +08:00
fan	386cd20086	京津冀职业发展联盟	2022-10-27 16:53:14 +08:00
Yuan	640f36842f	考试管理-分类改为单选	2022-10-27 15:20:32 +08:00
dong	26370a4c46	代码调整	2022-10-27 11:29:27 +08:00
dong	45922ea9d3	代码调整	2022-10-27 11:25:35 +08:00
dong	5e0146f8da	代码调整	2022-10-27 10:04:20 +08:00
joylink_cuiweidong	b63159ff08	代码调整	2022-10-27 09:58:53 +08:00
fan	d2050dacd8	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-27 09:48:51 +08:00
fan	4a6fe5bc87	发布内容管理调整	2022-10-27 09:48:25 +08:00
dong	18c07ff9a2	代码调整	2022-10-27 09:13:01 +08:00
joylink_cuiweidong	1381bd8a9c	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-26 18:17:36 +08:00
joylink_cuiweidong	75f7165750	实训管理代码调整	2022-10-26 18:16:54 +08:00
dong	a163ba51db	代码调整	2022-10-26 17:25:48 +08:00
dong	48fe57cde1	代码调整	2022-10-26 17:08:09 +08:00
dong	df9e1f4132	权限分发和用户权限管理	2022-10-26 15:31:55 +08:00
dong	0936e40deb	代码调整	2022-10-26 14:48:10 +08:00
Yuan	157e1ed45b	考试管理 题目数量校验	2022-10-26 11:25:40 +08:00
Yuan	491b28125b	考试管理 题目数量校验	2022-10-26 09:39:00 +08:00
fan	9e4576d30c	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-25 18:02:42 +08:00
fan	c8d71db508	代码调整	2022-10-25 18:02:23 +08:00
joylink_cuiweidong	7dee28ea8e	代码调整	2022-10-25 17:23:44 +08:00
joylink_cuiweidong	e308f3acb8	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-25 15:18:38 +08:00
joylink_cuiweidong	21b526bce0	代码调整	2022-10-25 15:18:22 +08:00
dong	f4a53f6404	代码调整	2022-10-25 11:01:28 +08:00
fan	205fce9512	代码调整	2022-10-25 10:45:23 +08:00
joylink_cuiweidong	6d20dcb132	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-24 18:21:16 +08:00
joylink_cuiweidong	1475848fea	综合演练代码调整	2022-10-24 18:20:45 +08:00
Yuan	d4538b441d	Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly	2022-10-24 18:13:47 +08:00
Yuan	90a1c03bd4	考试面板样式修改	2022-10-24 18:13:43 +08:00
fan	67492c4e90	代码调整	2022-10-24 17:34:14 +08:00
fan	20354a0389	语音指令识别错误提示	2022-10-24 16:44:15 +08:00
fan	cb61f11753	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-24 16:41:53 +08:00
fan	18f1c6231b	大铁菜单调整	2022-10-24 16:41:38 +08:00
joylink_cuiweidong	1d565398e9	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-24 16:21:52 +08:00
joylink_cuiweidong	63c362635a	代码调整	2022-10-24 16:21:38 +08:00
Yuan	4e0635b7ad	考试-理论	2022-10-24 15:31:54 +08:00
Yuan	8976cfd474	Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly	2022-10-24 13:47:44 +08:00
Yuan	a11c8d8829	理论考试提交	2022-10-24 13:47:36 +08:00
dong	9cd804e2b7	代码调整	2022-10-24 13:24:40 +08:00
Yuan	0fe83a4f31	考试-理论	2022-10-24 13:16:01 +08:00
Yuan	44fcdee7cf	WIP:考试面板	2022-10-24 13:12:14 +08:00
joylink_cuiweidong	b1b00fd57b	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-24 10:42:52 +08:00
joylink_cuiweidong	2e492ad27f	CCTV去掉删除按钮	2022-10-24 10:41:36 +08:00
fan	32409d4baf	代码调整	2022-10-24 10:03:46 +08:00
fan	bcca6e1db0	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-21 18:03:45 +08:00
fan	fb0d06a491	代码调整	2022-10-21 18:03:36 +08:00
joylink_cuiweidong	bc48d4c82e	代码调整	2022-10-21 16:53:24 +08:00
joylink_cuiweidong	16beaf8f94	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly ... # Conflicts: # src/views/newMap/display/terminals/index.vue # src/views/newMap/display/terminals/terminalMenu.vue	2022-10-21 16:49:14 +08:00
joylink_cuiweidong	42dc17d87e	大客流视图代码调整	2022-10-21 16:46:35 +08:00
fan	afa5a9aeab	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly ... Conflicts: src/views/newMap/display/terminals/index.vue src/views/newMap/display/terminals/terminalMenu.vue	2022-10-21 16:12:55 +08:00
fan	354192e953	代码调整	2022-10-21 16:10:05 +08:00
joylink_cuiweidong	363cd1fda9	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-21 15:52:37 +08:00
joylink_cuiweidong	baf089d889	大客流策略客户端 代码调整	2022-10-21 15:52:20 +08:00
dong	a97d34d3f3	功能管理和权限管理调整	2022-10-21 15:21:15 +08:00
joylink_cuiweidong	583830d573	修改三维图片和数据的地址	2022-10-21 14:15:58 +08:00
joylink_cuiweidong	b0431f00f8	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly ... # Conflicts: # src/views/newMap/display/simulationMenu.vue	2022-10-21 11:30:35 +08:00
joylink_cuiweidong	34ff82d6e9	菜单添加实训按钮 代码调整	2022-10-21 10:38:36 +08:00
fan	f2ac931350	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-21 09:52:46 +08:00
fan	1b90935de6	代码调整	2022-10-21 09:52:27 +08:00
Yuan	2601028c19	WIP: 考试	2022-10-20 18:22:56 +08:00
fan	812ef04cbd	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-20 17:57:52 +08:00
fan	c8c9ec4b43	代码调整	2022-10-20 17:57:41 +08:00
joylink_cuiweidong	090b07bb41	代码调整	2022-10-20 17:56:55 +08:00
joylink_cuiweidong	85e0abea4a	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-20 16:23:16 +08:00
joylink_cuiweidong	77d0488450	代码调整	2022-10-20 16:22:56 +08:00
fan	f1ab35ce4b	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-20 15:12:02 +08:00
fan	d0eed68a4b	代码调整	2022-10-20 15:11:40 +08:00
joylink_cuiweidong	63e86119ef	代码调整	2022-10-20 14:29:18 +08:00
dong	66b6a7fbf9	代码调整	2022-10-20 11:15:58 +08:00
joylink_cuiweidong	8dbc06409e	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-20 11:01:28 +08:00
joylink_cuiweidong	abfde166ba	代码调整	2022-10-20 11:01:12 +08:00
dong	b06248a366	理论题目添加清空操作	2022-10-20 10:17:38 +08:00
fan	42b17a0217	列车信息缩放调整	2022-10-20 09:42:47 +08:00
dong	2754e14bff	代码调整	2022-10-19 18:46:22 +08:00
fan	eb3a39aee9	武汉8号线调整	2022-10-19 18:17:03 +08:00
dong	0d6f6dda1c	理论题目导入调整	2022-10-19 18:15:17 +08:00
fan	5d810116c7	武汉8号线调整	2022-10-19 18:07:12 +08:00
joylink_cuiweidong	daa05eb67b	数字沙盘代码调整	2022-10-19 17:11:28 +08:00
joylink_cuiweidong	ae5f211154	代码调整	2022-10-19 16:43:42 +08:00
joylink_cuiweidong	a1035a4e1f	代码调整	2022-10-19 15:35:53 +08:00
fan	19db91123c	设备右键菜单暂提	2022-10-19 15:32:56 +08:00
fan	c170f8fa74	应急指挥调度图标更换	2022-10-19 14:02:11 +08:00
fan	159ff15ace	仿真系统创建生成调整	2022-10-19 11:04:49 +08:00
fan	0cbf642586	Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly	2022-10-19 09:30:36 +08:00
fan	a7e21bbfae	增加一键生成仿真系统	2022-10-19 09:30:23 +08:00
joylink_cuiweidong	cd11ff9988	iscs 代码调整	2022-10-18 17:37:18 +08:00
fan	74c1005a8a	武汉8号线调整	2022-10-18 17:31:58 +08:00