fan
|
da4020e8c6
|
Merge remote-tracking branch 'origin/test'
|
2023-01-13 18:48:27 +08:00 |
|
fan
|
9700682a26
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-01-13 18:48:10 +08:00 |
|
fan
|
da4e5911fd
|
thirdJump 中路由跳转换成replace
|
2023-01-13 18:47:45 +08:00 |
|
fan
|
bf1d744b34
|
Merge remote-tracking branch 'origin/test'
|
2023-01-13 18:14:05 +08:00 |
|
fan
|
aee86e8024
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-01-13 18:12:59 +08:00 |
|
fan
|
ab55f2b1ad
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-13 18:10:57 +08:00 |
|
joylink_cuiweidong
|
0c7f55c911
|
bug 修复 【大铁标准站】大铁车务终端的操作：总取消、信号重开、总人解等报错
|
2023-01-13 16:53:51 +08:00 |
|
fan
|
2af7b5cc16
|
成工业iframe嵌入退出调整
|
2023-01-13 16:48:41 +08:00 |
|
dong
|
c9dd8752c1
|
Merge remote-tracking branch 'remotes/origin/test'
|
2023-01-13 16:09:21 +08:00 |
|
dong
|
36adbaeda1
|
Merge remote-tracking branch 'remotes/origin/test_dispaly' into test
|
2023-01-13 16:07:33 +08:00 |
|
dong
|
b0d80ac49e
|
添加权限分发到组织和项目
|
2023-01-13 15:54:06 +08:00 |
|
joylink_cuiweidong
|
9c3cdd31d5
|
bug 修复 【佛山有轨电车仿真线路】区段操作有两个权限取消限速
|
2023-01-13 15:45:01 +08:00 |
|
fan
|
dca3d00d50
|
修复：哈尔滨在正式不显示下面button组件
|
2023-01-13 14:28:34 +08:00 |
|
dong
|
22064af280
|
Merge remote-tracking branch 'remotes/origin/test'
|
2023-01-13 13:30:50 +08:00 |
|
dong
|
e28b1f3337
|
Merge remote-tracking branch 'remotes/origin/test_dispaly' into test
|
2023-01-13 13:15:38 +08:00 |
|
fan
|
d9a06f3f1e
|
Merge remote-tracking branch 'origin/test'
|
2023-01-13 13:11:24 +08:00 |
|
fan
|
3054160b14
|
Merge remote-tracking branch 'origin/test_dispaly' into test
# Conflicts:
# src/views/newMap/displayNew/demonMenu.vue
# src/views/newMap/displayNew/dispatherContest/index.vue
# src/views/newMap/displayNew/index.vue
# src/views/newMap/displayNew/menuSchema.vue
# src/views/newMap/jointTrainingNew/index.vue
|
2023-01-13 13:10:52 +08:00 |
|
dong
|
816c0d01f5
|
调度命令socket调整
|
2023-01-13 11:28:12 +08:00 |
|
dong
|
4778a3c909
|
代码调整
|
2023-01-13 11:16:25 +08:00 |
|
fan
|
c3c29d6724
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-13 10:36:49 +08:00 |
|
fan
|
2c68be07a3
|
调整： 路票簿册客户端显示条件修改
|
2023-01-13 10:36:30 +08:00 |
|
dong
|
2da7b23638
|
代码调整
|
2023-01-13 10:25:48 +08:00 |
|
fan
|
211ea96d07
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-13 10:11:22 +08:00 |
|
fan
|
164d34ad09
|
Bug:【大铁标准站】综合演练时，路票无法给与别的车站
|
2023-01-13 10:11:13 +08:00 |
|
joylink_cuiweidong
|
8eff828381
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-13 09:48:19 +08:00 |
|
joylink_cuiweidong
|
50b0358541
|
bug修复 【大铁标准站】车务终端点击信号机按钮报错，无法排列进路
|
2023-01-13 09:47:52 +08:00 |
|
fan
|
48cdf34b32
|
Bug:【大铁标准站】车站路票功能无法使用
|
2023-01-13 09:20:36 +08:00 |
|
fan
|
3e6d8941c1
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-13 09:12:08 +08:00 |
|
fan
|
759154757b
|
旧代码删除
|
2023-01-13 09:09:25 +08:00 |
|
joylink_cuiweidong
|
49fb5e5643
|
bug修改 【大铁标准站】工具里列车固定径路无法打开
|
2023-01-12 18:15:01 +08:00 |
|
joylink_cuiweidong
|
873af94199
|
bug调整 【大铁线路】调度台和综合演练一直加载，刷新后可以进去，但是再次进入又一直加载了
|
2023-01-12 17:50:20 +08:00 |
|
joylink_cuiweidong
|
97c7f73c3c
|
代码调整
|
2023-01-12 10:58:45 +08:00 |
|
fan
|
a03b16e60a
|
Merge remote-tracking branch 'origin/test'
|
2023-01-11 17:49:25 +08:00 |
|
fan
|
c3db4d4c22
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-01-11 17:48:50 +08:00 |
|
fan
|
62adae7f00
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-11 17:45:51 +08:00 |
|
fan
|
fed3a0430e
|
仿真退出跳转调整
|
2023-01-11 17:45:33 +08:00 |
|
joylink_cuiweidong
|
f22fac82a0
|
代码调整
|
2023-01-11 17:22:12 +08:00 |
|
joylink_cuiweidong
|
eb9829234d
|
代码调整
|
2023-01-11 17:06:29 +08:00 |
|
dong
|
03afd57f78
|
实训管理界面添加分页
|
2023-01-11 16:10:25 +08:00 |
|
fan
|
bf1f420423
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-11 14:20:45 +08:00 |
|
fan
|
082bf8cd65
|
应急调度指挥调整
|
2023-01-11 14:20:27 +08:00 |
|
dong
|
f06a5c09ea
|
代码调整
|
2023-01-11 13:35:50 +08:00 |
|
fan
|
b1fadb3671
|
成员管理 信号楼调整
|
2023-01-11 11:00:02 +08:00 |
|
fan
|
6897cb6c0b
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/scripts/ProjectConfig.js
# src/utils/baseUrl.js
# src/views/login/index.vue
# src/views/newMap/displayBaSiDi/index.vue
# src/views/newMap/displayCity/demonMenu.vue
# src/views/newMap/displayCity/index.vue
# src/views/system/deviceManage/index.vue
# src/views/trainingPlatform/demonList.vue
|
2023-01-10 18:01:34 +08:00 |
|
fan
|
58bcd7223d
|
Merge remote-tracking branch 'origin/test_dispaly' into test
# Conflicts:
# src/utils/baseUrl.js
# src/views/login/index.vue
# src/views/newMap/displayBaSiDi/index.vue
# src/views/newMap/displayCity/demonMenu.vue
# src/views/newMap/displayCity/index.vue
|
2023-01-10 18:00:10 +08:00 |
|
fan
|
de3d60a21e
|
大铁线路 变更客户端名称 联锁操作终端
|
2023-01-10 17:31:16 +08:00 |
|
fan
|
849a0be87c
|
线路功能内容调整
|
2023-01-10 17:08:35 +08:00 |
|
fan
|
49b7cc1eb3
|
分组功能调整
|
2023-01-10 16:45:55 +08:00 |
|
fan
|
140a058f90
|
线路功能滚动调整
|
2023-01-10 16:20:04 +08:00 |
|
fan
|
91bdf79bef
|
resourcesUrl => ossUrl
|
2023-01-10 16:09:04 +08:00 |
|