Commit Graph

13323 Commits

Author SHA1 Message Date
dong
7c46ad5c62 获取project为null时无法找到页面问题 2023-04-25 16:22:30 +08:00
dong
2d15eee9f8 会话群代码调整 2023-04-25 15:56:18 +08:00
dong
0805383fde 群消息已读 2023-04-25 15:19:30 +08:00
fan
034199ec23 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-25 13:56:24 +08:00
fan
1faf4fadc5 ncc客户端调整 2023-04-25 13:56:09 +08:00
dong
fcae8539d9 NCC行调名称调整成NCC调度 2023-04-25 10:25:56 +08:00
fan
a188121aac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-25 09:42:48 +08:00
fan
7e8fb7cbd1 ncc列车颜色调整 2023-04-25 09:42:28 +08:00
dong
79fbb8d071 会话群代码调整 2023-04-24 18:27:36 +08:00
dong
6d848115b3 添加角色NCC行调 2023-04-24 16:10:50 +08:00
fan
5181b1e98a ncc显示配置 2023-04-24 15:43:04 +08:00
fan
68d0d9c83b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-24 14:33:33 +08:00
fan
e326a18d80 新增同站示意框 2023-04-24 14:32:40 +08:00
dong
775603368d Squashed commit of the following:
commit b5705b12c2
Author: dong <58670809@qq.com>
Date:   Mon Apr 24 13:19:45 2023 +0800

    代码调整

commit 196f8e5306
Author: dong <58670809@qq.com>
Date:   Mon Apr 24 10:42:18 2023 +0800

    线路设计-仿真成员-会话群名称显示调整

commit 4fe929cd37
Author: dong <58670809@qq.com>
Date:   Sun Apr 23 16:24:52 2023 +0800

    代码调整

commit 7dd973c13e
Author: dong <58670809@qq.com>
Date:   Sun Apr 23 15:58:34 2023 +0800

    会话群调整

commit 50e5e92a05
Author: dong <58670809@qq.com>
Date:   Sun Apr 23 15:43:17 2023 +0800

    会话群调整

commit 740e676971
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 15:17:10 2023 +0800

    会话群调整

commit 6d4e28a0dc
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 11:02:38 2023 +0800

    会话群调整

commit 2d2f3e9fdc
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 10:12:14 2023 +0800

    会话群调整

commit 3b21f72e38
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 09:37:56 2023 +0800

    会话群调整

commit baaa8e4bbb
Author: dong <58670809@qq.com>
Date:   Thu Apr 20 15:38:48 2023 +0800

    会话群调整

commit 53ef9b5930
Author: dong <58670809@qq.com>
Date:   Thu Apr 20 11:16:18 2023 +0800

    群组信息接口

commit df2cae5c2b
Author: dong <58670809@qq.com>
Date:   Thu Apr 20 10:57:56 2023 +0800

    Squashed commit of the following:

    commit d0722f229c376afa241441bc91d085f6c6f68d4e
    Author: dong <58670809@qq.com>
    Date:   Thu Apr 20 10:51:28 2023 +0800

        新会话群
2023-04-24 13:38:05 +08:00
fan
933ef9ed82 ncc代码调整4.24 2023-04-24 13:16:07 +08:00
fan
18f67436aa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-23 18:15:36 +08:00
fan
42ef83d302 ncc代码调整4.23 2023-04-23 18:15:13 +08:00
fan
0cdaa7a6ed ncc代码调整 2023-04-21 17:46:58 +08:00
dong
f2039927db Squashed commit of the following:
commit d082dc2fbc
Author: dong <58670809@qq.com>
Date:   Wed Apr 19 10:41:17 2023 +0800

    修改收令单位不显示调度命令问题

commit c52925960c
Merge: a3bc0de08 1f5d891c5
Author: joylink_zhangsai <1021828630@qq.com>
Date:   Tue Apr 18 16:25:03 2023 +0800

    Merge remote-tracking branch 'origin/test' into test

commit a3bc0de08a
Author: joylink_zhangsai <1021828630@qq.com>
Date:   Tue Apr 18 16:24:34 2023 +0800

    处理列车异常显示问题 by fan

commit 1f5d891c55
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 14:40:39 2023 +0800

    修改苏电院交控线路顶部菜单展开后没法收回去问题

commit 0d50ac586b
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 13:26:39 2023 +0800

    修改弹窗没有高度问题

commit 73c9c0777e
Author: dong <58670809@qq.com>
Date:   Fri Apr 14 16:25:38 2023 +0800

    去掉实训管理查询项缓存
2023-04-19 10:42:38 +08:00
dong
d082dc2fbc 修改收令单位不显示调度命令问题 2023-04-19 10:41:17 +08:00
c52925960c Merge remote-tracking branch 'origin/test' into test 2023-04-18 16:25:03 +08:00
a3bc0de08a 处理列车异常显示问题 by fan 2023-04-18 16:24:34 +08:00
dong
c020d69150 Squashed commit of the following:
commit 1f5d891c55
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 14:40:39 2023 +0800

    修改苏电院交控线路顶部菜单展开后没法收回去问题
2023-04-17 14:51:08 +08:00
dong
1f5d891c55 修改苏电院交控线路顶部菜单展开后没法收回去问题 2023-04-17 14:40:39 +08:00
dong
f27fd63e29 Squashed commit of the following:
commit 0d50ac586b
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 13:26:39 2023 +0800

    修改弹窗没有高度问题
2023-04-17 13:28:06 +08:00
dong
0d50ac586b 修改弹窗没有高度问题 2023-04-17 13:26:39 +08:00
dong
857472ba72 Squashed commit of the following:
commit 73c9c0777e
Author: dong <58670809@qq.com>
Date:   Fri Apr 14 16:25:38 2023 +0800

    去掉实训管理查询项缓存
2023-04-14 16:26:57 +08:00
dong
73c9c0777e 去掉实训管理查询项缓存 2023-04-14 16:25:38 +08:00
fan
1aca150711 Merge remote-tracking branch 'origin/test' 2023-04-14 13:09:38 +08:00
fan
dff6b0f545 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-14 13:07:37 +08:00
fan
4285249458 教学管理实训数据管理调整 2023-04-14 13:07:17 +08:00
dong
d3dd38b883 宁波3排路进路校验字段调整 2023-04-13 18:25:18 +08:00
fan
8593174685 Merge remote-tracking branch 'origin/test' 2023-04-13 16:23:01 +08:00
fan
0e1dcbb5fd 刷新页面baseUrl调用错误调整 2023-04-13 16:04:14 +08:00
fan
f5ffa562ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-13 14:22:55 +08:00
fan
0438f6b183 哈尔滨南京二号线样式调整 2023-04-13 14:22:45 +08:00
dong
482d8ba2bf 事件总线订阅未销毁导致的重复调用问题 2023-04-13 13:29:56 +08:00
fan
47bae5b02c PSL不显示小型站台 2023-04-13 10:16:49 +08:00
fan
0626d81356 非实训设计司机角色跳转司机驾驶客户端 2023-04-13 10:05:11 +08:00
fan
9ea5bef12a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-13 09:35:03 +08:00
fan
3ecf5e4da3 增加综合演练仿真号复制 2023-04-13 09:34:42 +08:00
dong
2bb8c6df92 Squashed commit of the following:
commit 30763300ac
Author: dong <58670809@qq.com>
Date:   Wed Apr 12 18:31:39 2023 +0800

    修改前端配置带id

commit cde33feb22
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 18:07:47 2023 +0800

    宁波三进路选择表示样式不取消

commit 34a94e2c6d
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 17:58:11 2023 +0800

    区域选择界面调整

commit 52af1d994b
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 13:33:03 2023 +0800

    系统管理-教学考试数据管理

commit 6187b449c1
Author: dong <58670809@qq.com>
Date:   Fri Apr 7 15:22:33 2023 +0800

    代码调整

commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date:   Fri Mar 31 16:52:08 2023 +0800

    【删除注释】
2023-04-12 18:34:06 +08:00
dong
30763300ac 修改前端配置带id 2023-04-12 18:31:39 +08:00
fan
cde33feb22 宁波三进路选择表示样式不取消 2023-04-12 18:07:47 +08:00
fan
34a94e2c6d 区域选择界面调整 2023-04-12 17:58:11 +08:00
fan
52af1d994b 系统管理-教学考试数据管理 2023-04-12 13:33:03 +08:00
dong
54fb5eb47a Squashed commit of the following:
commit 6187b449c1
Author: dong <58670809@qq.com>
Date:   Fri Apr 7 15:22:33 2023 +0800

    代码调整

commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date:   Fri Mar 31 16:52:08 2023 +0800

    【删除注释】
2023-04-07 15:27:22 +08:00
dong
6187b449c1 代码调整 2023-04-07 15:22:33 +08:00
fan
95b6d019dd Merge remote-tracking branch 'origin/test' 2023-04-06 17:32:19 +08:00
weizhihong
074453ece7 【删除注释】 2023-03-31 16:52:08 +08:00