joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
11,118 Commits 20 Branches 0 Tags 448 MiB
6fb7296348
Commit Graph

10750 Commits

Author SHA1 Message Date
fan
7b854e717e 显示配置车次窗设备修正=》判断调整 2021-12-09 14:57:55 +08:00
fan
27a56355dd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-09 13:48:41 +08:00
fan
17e7467edf 显示配置增加车次窗设备修正&加载备用车close时清除数据 2021-12-09 13:48:15 +08:00
joylink_cuiweidong
8b86a8ddeb 运行图编制 添加计划/修改计划号码 代码调整 2021-12-09 13:23:24 +08:00
joylink_cuiweidong
3ee1dd21e5 运行图编制 新增计划 根据配置文件 设置服务号长度 2021-12-09 10:57:28 +08:00
fan
0bbf9667fb merge 2021-12-08 15:43:19 +08:00
fan
fd03433df2 node-sass版本调整 2021-12-08 15:40:38 +08:00
sunzhenyu
32b785280e merge 2021-12-08 15:11:48 +08:00
sunzhenyu
2d6be9aa56 baseurl 2021-12-08 15:11:25 +08:00
sunzhenyu
1ef4810214 修改开发模式下三维模型存储配置，添加沙盘天气图标 2021-12-08 15:09:54 +08:00
fan
e942f94c25 增加线路配置:tripNumberIsUnique:运行图中车次号是否唯一 2021-12-08 14:53:14 +08:00
fan
8c3c7e0f75 车辆翻转 运行时显示调整 2021-12-08 13:18:16 +08:00
fan
5a5dd046eb 仿真右侧列车显示过滤&加载备用车置灰已上线车辆 2021-12-07 14:10:07 +08:00
thesai
9631685998 Merge remote-tracking branch 'origin/test' 2021-12-06 21:19:18 +08:00
fan
2e0ba39171 车头翻转=》 停车状态时调整车头翻转显示 2021-12-06 13:09:17 +08:00
fan
830a630155 停车轨左右停车偏移放开 2021-12-03 17:50:37 +08:00
fan
84c4dd8ca1 批量翻转车头&车辆段仿真开放按计划行车和故障操作 2021-12-03 17:44:02 +08:00
fan
5ca3ca93ab 车辆段调整=》区段增加parkingTrack&列车增加stationCode&联锁配置项增加handleDepot 2021-12-03 13:25:20 +08:00
fan
573a489fea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-02 10:27:24 +08:00
fan
c4226ad607 道岔显示调整 2021-12-02 10:26:53 +08:00
sunzhenyu
8923a888c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-02 10:00:49 +08:00
sunzhenyu
fd10d6532f 修改三维驾驶设备柜 2021-12-02 10:00:41 +08:00
fan
80dbc39850 请求服务调整 2021-12-01 14:17:17 +08:00
fan
2f84cd6482 三方登录调整 2021-12-01 14:06:28 +08:00
fan
cca12938a4 Merge remote-tracking branch 'origin/test_baseUrl' into test 2021-12-01 13:11:26 +08:00
fan
cc9f59de13 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-01 13:11:00 +08:00
fan
46509c1e62 延时解锁字段调整 2021-12-01 13:10:36 +08:00
fan
7cc99b0a08 请求服务器域名调整&增减管理界面 2021-11-30 16:27:35 +08:00
sunzhenyu
1be02437ea 修改徐州三维演示icon 2021-11-30 16:24:31 +08:00
sunzhenyu
a541853b8f merge 2021-11-30 16:23:24 +08:00
sunzhenyu
8bf9d272d5 merge 2021-11-30 16:22:43 +08:00
sunzhenyu
87631b1fdb 修改徐州三维演示Icon 2021-11-30 16:22:06 +08:00
fan
068e0df43c 请求服务器域名调整 2021-11-30 11:13:25 +08:00
fan
c33502b31a 岔芯列车占用显示逻辑调整 2021-11-30 09:36:17 +08:00
yuan
fdae91c6d7 标准线增加PSL盘 2021-11-29 18:15:13 +08:00
fan
e3da721faf baseUrl 2021-11-29 16:31:18 +08:00
fan
4aac8ad03d Revert "Revert "道岔短闪（4次恢复）=》 短闪（转动后恢复）"" 
This reverts commit b69d36a9
 2021-11-29 15:26:53 +08:00
fan
49e9353673 项目登录 增加三方登录配置 2021-11-29 15:26:36 +08:00
fan
6811cbcb75 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-29 14:41:12 +08:00
fan
690989cf75 南京二号线道岔问题调整 2021-11-29 14:41:03 +08:00
yuan
6380c3d11b 标准线增加PSL盘 2021-11-29 14:12:35 +08:00
fan
054db072cf Merge remote-tracking branch 'origin/test' 2021-11-29 13:38:44 +08:00
fan
b69d36a963 Revert "道岔短闪（4次恢复）=》 短闪（转动后恢复）" 
This reverts commit f44bcfab
 2021-11-29 13:37:35 +08:00
fan
7d4ef8048b 扬州工业项目登录参数调整 2021-11-29 13:20:10 +08:00
fan
6014c6253e 扬州工业项目登录参数调整 2021-11-29 13:15:52 +08:00
fan
4c9d9b6705 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-26 17:38:32 +08:00
fan
0788172481 南京二号线问题调整 2021-11-26 17:37:22 +08:00
sunzhenyu
fc0393ff08 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-26 17:24:05 +08:00
sunzhenyu
7d734bc554 修改展示线路三维车站加载，修改徐州三维课程 2021-11-26 17:23:56 +08:00
fan
f44bcfabcb 道岔短闪（4次恢复）=》 短闪（转动后恢复） 2021-11-26 09:30:22 +08:00
fan
27914f3334 南京二 岔心操作调整 2021-11-25 17:53:13 +08:00
fan
07025e79e5 岔芯=》岔心&南京二岔芯实训增加强行消限、预复位&南二日记报错处理 2021-11-25 16:37:44 +08:00
fan
04ed7005e1 挤岔恢复实训提示调整&岔心灰显、故障锁闭显示调整 2021-11-25 15:44:53 +08:00
fan
909bb2d9a0 南京二号线生成进路实训配置调整 2021-11-25 14:25:33 +08:00
fan
2ecb963027 调整实训中传输信号机的替代问题 2021-11-25 14:16:37 +08:00
fan
2286a66766 调低区段故障锁闭优先级 2021-11-25 13:55:18 +08:00
fan
eee7c9fae4 南京二号线设置车站中心增加偏移 2021-11-25 13:48:50 +08:00
thesai
a09ec3dd13 Merge remote-tracking branch 'origin/test' 2021-11-25 12:11:19 +08:00
fan
a5e0e4b671 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-25 10:47:32 +08:00
fan
034bb7e185 南京二号线列车右键操作不出列监 2021-11-25 10:47:12 +08:00
fan
d39a551142 南京二连续扣车参数调整&&南京二troDetail禁止拖动&&增加南京二行调故障按钮 2021-11-25 10:41:43 +08:00
joylink_cuiweidong
22a23ba70a 南京二号线 计轴受扰 区段编号 红闪 2021-11-24 17:47:13 +08:00
joylink_cuiweidong
776a19406e 南京二号线 
区段 添加 无数据故障
区段故障 修改 红光带/通信车占用/橙光带 为 紫光带故障/红光带故障/计轴受扰
 2021-11-24 15:55:50 +08:00
joylink_cuiweidong
8fcc22cb6f 屏蔽门开关影响 车站颜色灰显 bug 调整 2021-11-24 15:13:36 +08:00
joylink_cuiweidong
99e846b593 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-24 13:58:33 +08:00
joylink_cuiweidong
68d85d3dc6 ATP重启 由故障 变为操作 2021-11-24 13:58:14 +08:00
fan
064c7c74f6 南京二实训调整 2021-11-23 18:09:26 +08:00
fan
79591e1339 南京二实训调整 2021-11-23 17:53:34 +08:00
fan
c65049a84d 重启联锁机后禁止大部分操作&信号机故障编号闪和机头闪显示调整 2021-11-23 16:34:50 +08:00
fan
cdb907819f 南京二故障显示调整& 实训调整 2021-11-23 15:21:08 +08:00
fan
15cf2838da 南京二故障显示调整& 实训调整 2021-11-23 14:04:11 +08:00
fan
c59d1c4103 终止站停 上下合并 2021-11-22 16:27:32 +08:00
fan
a0e6c1c70a 南二虚拟传输信号机显示调整 2021-11-22 16:17:01 +08:00
fan
b4107c89de 调整南京二实训调整&南二虚拟信号机显示调整 2021-11-22 16:02:54 +08:00
fan
5412bb8ff0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-22 14:09:42 +08:00
fan
a617144386 调整南京二实训配置 2021-11-22 14:08:47 +08:00
thesai
d2217734e0 Merge remote-tracking branch 'origin/test' 2021-11-19 21:04:03 +08:00
sunzhenyu
94de3ba762 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-19 15:05:23 +08:00
sunzhenyu
343d71fdab 增加徐州三维课程案例 2021-11-19 15:05:16 +08:00
joylink_cuiweidong
a0cdca405a 代码调整 2021-11-15 18:13:35 +08:00
joylink_cuiweidong
b2a5e3723c 指令字典 添加 指令 2021-11-15 17:29:10 +08:00
fan
35ee7a245b 进路自排开自排关问题调整 2021-11-15 13:22:50 +08:00
fan
dd83568d04 地图绘制设置运行等级激活起始区段调整 2021-11-15 09:50:37 +08:00
fan
ab87adabb3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-15 09:41:17 +08:00
fan
99088c9c4f 地图绘制设置运行等级报错调整 2021-11-15 09:41:00 +08:00
thesai
36630fd2ce Merge branch 'test' 2021-11-13 20:46:59 +08:00
sunzhenyu
c1ef47929a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-12 14:40:02 +08:00
sunzhenyu
beb96905e5 修改三维课程组件，增加点击提示音 2021-11-12 14:39:43 +08:00
fan
fa9d0bb152 上饶沙盘&江西工贸 行调界面 不展示 chatView 2021-11-12 09:46:51 +08:00
fan
f5cca2da38 上饶沙盘&江西工贸 行调界面 不展示 chatView 2021-11-12 09:43:16 +08:00
fan
f270cbfb3b 道岔钩锁操作结束清除operation 2021-11-11 15:08:13 +08:00
fan
ba7b9f39eb 增加江西工贸登录页面 2021-11-11 14:32:58 +08:00
fan
71270fbb43 和利时项目仿真报错调整&上饶列车操作调整 2021-11-10 13:45:12 +08:00
thesai
dcdff0dfdf Merge remote-tracking branch 'origin/test' into test 2021-11-09 19:44:59 +08:00
thesai
7cdf99a699 修改列车控制bug、添加列车识别号只有人工车 2021-11-09 19:44:48 +08:00
sunzhenyu
a46018cdbe 修改三维驾驶托管 2021-11-09 18:11:15 +08:00
sunzhenyu
f443d0031b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-09 17:52:41 +08:00
sunzhenyu
6766df5693 恢复三维驾驶托管接口 2021-11-09 17:52:33 +08:00
fan
b84e54591c 车次窗显示调整 2021-11-09 16:20:13 +08:00
fan
8b9e1876e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-09 15:28:30 +08:00
fan
87a9235304 添加列车识别号&删除列车识别号 2021-11-09 15:28:17 +08:00
joylink_cuiweidong
0505d5d4d3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-09 10:22:21 +08:00
joylink_cuiweidong
7e9259be88 运行图 
修改表号的时候 自动补零位数调整
修改任务的时候，没选交路不允许提交
 2021-11-09 10:22:02 +08:00
fan
b0398df85a 列车操作弹框可拖拽 2021-11-08 16:53:50 +08:00
fan
92e76e3af0 西安一三 增加 换NRM模式 2021-11-08 16:48:49 +08:00
fan
69351511c4 修改上饶沙盘icon & 增加 换NRM模式操作 2021-11-08 16:17:06 +08:00
fan
de55f13b9f 上饶沙盘 列车操作 socket同步调整 2021-11-08 15:57:23 +08:00
fan
2cc79466b4 上饶沙盘 列车操作 刹车调整 2021-11-08 15:36:16 +08:00
fan
166ce2d75a 上饶沙盘 列车操作 问题调整（速度方向会重置） 2021-11-08 15:31:19 +08:00
fan
3ba20ae75c 上饶沙盘 列车操作 2021-11-08 14:55:03 +08:00
fan
ff5f9e0a00 修改列车文字大小 2021-11-05 15:44:03 +08:00
jade
2fd498aaf6 Merge remote-tracking branch 'origin/test' 2021-11-04 18:18:38 +08:00
fan
d18bd5ea6c 删除设备管理多余接口&线路配置signalForceCancelRoute=》singleApproachLockCancelRoute 2021-11-04 16:38:39 +08:00
fan
c4d754f1b9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-03 15:50:06 +08:00
fan
47eda59ad3 不展示计划车问题调整 2021-11-03 15:49:47 +08:00
joylink_cuiweidong
980f06ecb9 剧本编制代码调整 2021-11-03 14:45:28 +08:00
joylink_cuiweidong
cf18a2dae2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-11-03 14:24:15 +08:00
joylink_cuiweidong
626ff900f5 代码调整 2021-11-03 14:23:52 +08:00
fan
1f7b6f5dc1 取消设备登录鼠标悬浮车次窗会展示&上饶项目登录不展示按计划行车 2021-11-03 14:06:00 +08:00
fan
a4172815ca 设备管理添加新的设备类型，修改设备配置接口 2021-11-03 13:48:35 +08:00
fan
2e0449bb43 国赛设计平台登录 调整 2021-11-01 13:37:43 +08:00
fan
24473bb1f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_nanjing 2021-10-29 10:37:15 +08:00
fan
6dc6e9725b 增加 城轨国赛竞赛系统（和利时）页面 2021-10-29 10:37:02 +08:00
sunzhenyu
fe156c28bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-28 18:04:32 +08:00
sunzhenyu
7984983f12 增加三维沙盘天气模块 2021-10-28 18:04:25 +08:00
fan
d8a377dd69 删除上次提交带的日志 2021-10-28 17:17:45 +08:00
fan
92dc2798cd 教学管理增加导入学生模板校验 2021-10-28 17:16:44 +08:00
fan
95d2200907 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_nanjing 2021-10-28 17:02:58 +08:00
fan
164386c9a1 南京二综合演练行调仿真调整 2021-10-28 16:02:26 +08:00
fan
db682c319b Merge remote-tracking branch 'origin/test' 2021-10-27 18:02:58 +08:00
fan
ba38a19309 现地仿真实训显示问题调整 2021-10-27 17:51:27 +08:00
fan
36e4e72adf 现地仿真实训不展示停车场车辆段 2021-10-27 17:09:30 +08:00
fan
32a31a1eed Merge remote-tracking branch 'origin/test' 
# Conflicts:
#	src/views/newMap/jointTrainingNew/menuDemon.vue
 2021-10-27 13:09:12 +08:00
fan
5be842b664 南京二 综合演练行调界面调整暂提 2021-10-27 13:06:07 +08:00
fan
253408b866 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-26 09:41:40 +08:00
fan
b30ad33dfe 实训密码调整 2021-10-25 16:57:41 +08:00
fan
d2cef46f6e IBP局部控制盘 操作描述更改 2021-10-25 11:13:22 +08:00
sunzhenyu
97d486d450 修改三维课程 2021-10-22 18:07:12 +08:00
sunzhenyu
34efc14cf0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-21 16:59:10 +08:00
sunzhenyu
2792cafd3a 修改三维编辑器 2021-10-21 16:59:03 +08:00
fan
c8570ec853 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-20 15:48:01 +08:00
fan
211f7df03b 设备管理添加设备类型 2021-10-20 15:47:48 +08:00
sunzhenyu
287af31db5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-19 18:10:45 +08:00
sunzhenyu
a2b55b62f6 修改三维课程编辑器 2021-10-19 18:10:32 +08:00
fan
0d5a57fe11 设备管理添加项目 2021-10-19 15:53:04 +08:00
fan
07376fc8b9 上饶项目添加设备管理路由 2021-10-19 15:44:43 +08:00
fan
eb1721e2c2 添加上饶沙盘项目登录页面 2021-10-19 15:28:20 +08:00
fan
ed47671b45 南京二号线列车总览列车详览调整 2021-10-18 17:38:40 +08:00
fan
bb085ecddc 日记调整 2021-10-18 11:11:03 +08:00
fan
4dffdb5aba 连续扣车调整 2021-10-18 10:53:48 +08:00
fan
12c16cb9d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-18 10:14:14 +08:00
fan
6fa514b99e 南京二号线列监创建列车 参数调整 2021-10-18 10:14:02 +08:00
sunzhenyu
27f6f47288 修改三维课程编辑器事件参数 2021-10-15 18:16:16 +08:00
sunzhenyu
2e5b6d6fbf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-15 18:10:53 +08:00
sunzhenyu
3660628203 修改三维课程编辑器，增加动画事件逻辑 2021-10-15 18:10:46 +08:00
fan
a18a0db03f 南京二开启车队信号机状态调整 2021-10-15 15:16:06 +08:00
fan
76c2589c54 ZC创建报错处理 2021-10-15 14:43:38 +08:00
fan
2625b66892 南京二号线atr&tmt调整 2021-10-15 14:15:23 +08:00
fan
f0328df54f 南京二号线atr调整 2021-10-15 11:03:41 +08:00
fan
9960b87c42 绘图调整 区段可以同时为转换轨或折返轨 2021-10-15 10:16:59 +08:00
fan
c81d4301fa 南京二号线列监调整 2021-10-15 09:54:21 +08:00
fan
3271ef15b6 获取车辆段偏移增加限制 2021-10-14 18:05:24 +08:00
fan
6979eaf778 menubutton 增加scope 2021-10-14 16:57:24 +08:00
fan
e02efd15ff iscs订阅调整 2021-10-14 16:12:37 +08:00
fan
a53a4435d6 南京二号线列监操作调整 2021-10-14 15:34:52 +08:00
fan
5498a7e756 司机、通号增加初始化设备显隐 2021-10-14 14:13:55 +08:00
fan
e8fa057adf 福州一号线实训人工折返策略设置调整 2021-10-14 14:04:05 +08:00
fan
c319a73f0c 南京二添加列车后按计划行车列车不消失问题修复 2021-10-14 13:35:43 +08:00
fan
2028a73d19 大屏分屏prdType写死 2021-10-14 09:35:32 +08:00
fan
37aa25a453 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-14 09:18:18 +08:00
fan
e620df092c 南京二号线行调问题调整 2021-10-14 09:18:06 +08:00
yuan
f5f4db14c5 大屏登录后跳转url增加prdType字段用于车辆段显隐处理 2021-10-13 17:16:13 +08:00
yuan
58a2ca0192 综合演练屏蔽掉车辆段显示 2021-10-13 16:31:46 +08:00
fan
b3b5780a27 南京二号线行调调整 2021-10-12 15:50:02 +08:00
fan
720a638720 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-12 14:31:58 +08:00
fan
5768b8d263 南京二号线车站调整 2021-10-12 14:31:49 +08:00
yuan
36bd886cb2 设备管理增加派班工作站,修改车辆段和派班工作站的路径 2021-10-12 11:02:36 +08:00
fan
4acb11fa2d 区段信号机道岔添加字段srCode 沙盘设备编号 2021-10-12 10:52:37 +08:00
fan
414e7f16a4 大屏配置回显 2021-10-12 10:36:25 +08:00
fan
e4d8d5650e 大屏显示调整 （调用行调配置处理设备） 2021-10-12 09:36:52 +08:00
fan
d9c040dbe9 ISCS 订阅调整 2021-10-11 17:45:15 +08:00
fan
48efa2cfb8 车辆段显示位置初始化调整 2021-10-11 16:41:56 +08:00
fan
edc9fee0a7 南京二号线计算行车间隔指令参数调整 2021-10-11 14:24:31 +08:00
fan
2454ed857f Merge remote-tracking branch 'origin/test' 2021-10-09 15:45:42 +08:00
fan
6e5ceeeb66 关闭南京二号线行调显示界面 2021-10-09 15:44:00 +08:00
fan
ee7d8e9300 南京二号线调整行车间隔 2021-10-08 09:53:49 +08:00
fan
4c5bc63030 南京二行调增加日记界面和命令界面 2021-09-30 09:43:10 +08:00
fan
34b156df80 侧防列表显示调整 2021-09-29 17:02:37 +08:00
fan
72bcc0596b 福州一 车联段停车场信号机操作 增加限制条件 2021-09-29 16:22:03 +08:00
fan
fd6e7c9f09 南京二号线 atr 列车信息 2021-09-29 15:35:26 +08:00
fan
869840f0e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-29 13:19:49 +08:00
fan
1e12edd90e 综合演练停车场显示调整 2021-09-29 13:19:29 +08:00
sunzhenyu
d23143a1cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-29 13:18:31 +08:00
sunzhenyu
36fee6efda 其他三维相关内容分拆 2021-09-29 13:18:24 +08:00
fan
969a35eec1 列车初始化时 重新解析数据 以清除残留状态 2021-09-29 10:12:49 +08:00
fan
01732b6b9a 修正： 现地显示配置生成权限的时候未生成车站数据 2021-09-29 09:46:25 +08:00
fan
f1b3b9ab8f Merge remote-tracking branch 'origin/test' 
# Conflicts:
#	src/scripts/ProjectConfig.js
 2021-09-28 18:41:07 +08:00
fan
096e87803d 综合演练列车显示bug调整 2021-09-28 18:16:05 +08:00
fan
8aa97948b6 车辆段联锁工作站 增加初始化 2021-09-28 17:44:25 +08:00
fan
dc2ca8df5a BUG:初始化后切换角色导致列车显示 2021-09-28 15:12:54 +08:00