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
|
9c1a7e129f
|
代码调整
|
2022-12-06 11:19:40 +08:00 |
|
joylink_cuiweidong
|
2edf28636f
|
pis设备登录代码调整
|
2022-12-05 18:12:46 +08:00 |
|
joylink_cuiweidong
|
09c583ee79
|
设备管理 pis 代码调整
|
2022-12-05 18:06:00 +08:00 |
|
joylink_cuiweidong
|
a10ef8fa1b
|
代码调整
|
2022-12-05 17:45:36 +08:00 |
|
joylink_cuiweidong
|
df453fd676
|
代码调整
|
2022-12-05 17:09:07 +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
|
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 |
|
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 |
|
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
|
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
|
1ea7343267
|
问题调整
|
2022-11-22 15:30:51 +08:00 |
|
fan
|
2b0ec10e81
|
暂替
|
2022-11-22 13:30:32 +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 |
|