fan
|
ecc7f73d5b
|
Merge remote-tracking branch 'origin/test' into test_dispaly
# Conflicts:
# src/utils/stomp.js
# src/views/jlmap3d/passflow/jl3dpassflow.vue
# src/views/login/index.vue
|
2022-10-09 11:02:09 +08:00 |
|
fan
|
18c08018c6
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-09 10:56:01 +08:00 |
|
fan
|
2bf3ce2e2a
|
客户端代码调整
|
2022-10-09 10:55:53 +08:00 |
|
fan
|
bc56e72414
|
Revert "Revert "调度命令调整""
This reverts commit 802f4abbc0.
|
2022-10-09 09:13:49 +08:00 |
|
fan
|
802f4abbc0
|
Revert "调度命令调整"
This reverts commit 062a5f2d73.
|
2022-10-08 18:25:12 +08:00 |
|
fan
|
6704c4ef4d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-10-08 18:14:10 +08:00 |
|
fan
|
a6917c1d17
|
实训调整
|
2022-10-08 18:12:28 +08:00 |
|
dong
|
623b42332e
|
代码调整
|
2022-10-08 16:58:18 +08:00 |
|
dong
|
062a5f2d73
|
调度命令调整
|
2022-10-08 16:57:48 +08:00 |
|
fan
|
3c1bc4e700
|
Revert "登录页面增加组织选择"
This reverts commit b2acf8dc27.
|
2022-10-08 16:37:37 +08:00 |
|
fan
|
5ec62c7e18
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-10-08 16:33:49 +08:00 |
|
fan
|
2d772bed22
|
实训调整
|
2022-10-08 16:33:14 +08:00 |
|
fan
|
63962a1f7e
|
暂提
|
2022-10-08 15:35:35 +08:00 |
|
joylink_cuiweidong
|
ba3e306211
|
代码调整
|
2022-10-08 14:04:25 +08:00 |
|
joylink_cuiweidong
|
89e5543aae
|
代码调整
|
2022-10-08 13:29:10 +08:00 |
|
dong
|
5da594ec55
|
代码调整
|
2022-10-08 10:34:32 +08:00 |
|
Yuan
|
6db5926156
|
baseurl
|
2022-09-30 17:59:36 +08:00 |
|
Yuan
|
87b50ba37c
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2022-09-30 17:52:18 +08:00 |
|
joylink_cuiweidong
|
3ae2b5acd5
|
代码调整
|
2022-09-30 17:52:16 +08:00 |
|
Yuan
|
2dab07eb44
|
登录页面增加组织选择
|
2022-09-30 17:51:45 +08:00 |
|
Yuan
|
b2acf8dc27
|
登录页面增加组织选择
|
2022-09-30 17:51:38 +08:00 |
|
fan
|
97670ddb63
|
去除日志
|
2022-09-30 17:37:59 +08:00 |
|
fan
|
c73cb667ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-30 17:34:41 +08:00 |
|
fan
|
79e27bf5dc
|
实训画面位置切换调整
|
2022-09-30 17:34:23 +08:00 |
|
dong
|
f9fe3ab615
|
添加调度台code
|
2022-09-30 17:26:53 +08:00 |
|
fan
|
bc5b837d22
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-09-30 16:59:04 +08:00 |
|
fan
|
63674aba5b
|
暂提
|
2022-09-30 16:58:53 +08:00 |
|
fan
|
ace0f3d0ae
|
大铁实训配置调整
|
2022-09-30 15:58:50 +08:00 |
|
joylink_cuiweidong
|
91c804b2ff
|
代码调整
|
2022-09-30 14:46:02 +08:00 |
|
fan
|
d8686ec6af
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-09-30 13:12:57 +08:00 |
|
fan
|
26062f736c
|
暂提
|
2022-09-30 13:11:55 +08:00 |
|
joylink_cuiweidong
|
1fa85333ad
|
代码调整
|
2022-09-30 10:34:12 +08:00 |
|
joylink_cuiweidong
|
dcfbe22510
|
代码调整
|
2022-09-29 16:59:38 +08:00 |
|
joylink_cuiweidong
|
c2c746406e
|
校验 项目和前端项目配置 是否存在
|
2022-09-29 16:50:22 +08:00 |
|
joylink_cuiweidong
|
e29fdb0cb3
|
代码调整
|
2022-09-29 16:30:20 +08:00 |
|
joylink_cuiweidong
|
3ed2c52a73
|
前端项目配置信息 添加修改操作 代码调整
|
2022-09-29 15:56:17 +08:00 |
|
fan
|
1f8bb3c80b
|
iscs 闸机调整
|
2022-09-29 15:54:18 +08:00 |
|
fan
|
eafd1634f5
|
暂提
|
2022-09-29 14:36:01 +08:00 |
|
joylink_cuiweidong
|
25697b67c9
|
前端项目配置信息 查询删除操作 代码调整
|
2022-09-29 13:45:46 +08:00 |
|
fan
|
e2b51b6737
|
iscs闸机调整
|
2022-09-28 17:38:30 +08:00 |
|
joylink_cuiweidong
|
5587a3e312
|
代码调整
|
2022-09-28 17:37:22 +08:00 |
|
joylink_cuiweidong
|
ae3c42ab29
|
项目 增删改查 接口调整
|
2022-09-28 17:22:25 +08:00 |
|
fan
|
9f792f2667
|
iscs闸机调整
|
2022-09-28 17:08:29 +08:00 |
|
fan
|
0967f30d1a
|
暂提
|
2022-09-28 17:06:15 +08:00 |
|
fan
|
f68f1ce275
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-28 16:57:53 +08:00 |
|
fan
|
4217b149df
|
ISCS闸机状态变化
|
2022-09-28 16:57:35 +08:00 |
|
joylink_cuiweidong
|
a9fbdec815
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-09-28 16:01:04 +08:00 |
|
joylink_cuiweidong
|
178c9f63a4
|
添加项目配置接口
|
2022-09-28 16:00:53 +08:00 |
|
fan
|
307a6e66d0
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
Conflicts:
src/views/newMap/display/index.vue
|
2022-09-28 15:47:54 +08:00 |
|
fan
|
0cc9eded9f
|
仿真结构调整
|
2022-09-28 15:46:07 +08:00 |
|