Commit Graph

999 Commits

Author SHA1 Message Date
joylink_fanyuhong
dd6fd1ed80 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m53s
2024-11-20 17:22:47 +08:00
joylink_fanyuhong
dd7cb75ceb Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop 2024-11-20 16:03:28 +08:00
joylink_fanyuhong
6252bf426c 故障时间展示调整 2024-11-20 16:03:25 +08:00
joylink_zhaoerwei
342aff6ebd 去掉手机列 2024-11-20 13:37:49 +08:00
joylink_fanyuhong
ca8a2fb279 报错调整 2024-11-20 10:53:36 +08:00
joylink_fanyuhong
718835302e 提示按钮调整 2024-11-20 10:42:51 +08:00
joylink_zhaoerwei
59ffd45dfb btn提示 2024-11-20 10:32:18 +08:00
joylink_fanyuhong
2070142e56 故障统计调整 2024-11-20 10:27:36 +08:00
joylink_fanyuhong
48c9adc9dc Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop 2024-11-20 10:17:35 +08:00
joylink_fanyuhong
d02295b206 跳转ats判断逻辑调整 2024-11-20 10:17:32 +08:00
joylink_zhaoerwei
5c9f6c4a43 双button bug
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m54s
2024-11-20 10:00:20 +08:00
joylink_zhaoerwei
a2b80e131f Squashed commit of the following:
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m48s
commit d142917797
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Nov 20 09:53:19 2024 +0800

    微调

commit c514486354
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Nov 20 09:49:50 2024 +0800

    语音报警btn加提示
2024-11-20 09:54:47 +08:00
joylink_zhaoerwei
d142917797 微调 2024-11-20 09:53:19 +08:00
joylink_zhaoerwei
c514486354 语音报警btn加提示 2024-11-20 09:49:50 +08:00
joylink_fanyuhong
eafdc7b870 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m52s
2024-11-20 09:21:14 +08:00
joylink_fanyuhong
9a6d4efedb merge
Some checks failed
local-test分支构建发布 / Docker-Build (push) Failing after 56s
2024-11-20 09:19:18 +08:00
joylink_fanyuhong
e6f6ac2b7e 账号格式校验调整 2024-11-20 09:15:10 +08:00
joylink_fanyuhong
da04217a08 登录页注释注册按钮 2024-11-20 09:10:25 +08:00
joylink_fanyuhong
de64a23eb8 故障提示超宽调整 2024-11-20 09:08:19 +08:00
joylink_fanyuhong
2e19a66a6b Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop 2024-11-19 14:05:54 +08:00
joylink_fanyuhong
fac62de1ae 等待时间调整 2024-11-19 14:05:48 +08:00
joylink_zhaoerwei
bfebe3e28d 列车报点 2024-11-19 10:50:42 +08:00
joylink_fanyuhong
e2faeb2d05 根据状态判断是否显示故障时间 2024-11-18 17:29:46 +08:00
joylink_fanyuhong
109a19527d protoc 2024-11-18 17:12:23 +08:00
joylink_fanyuhong
09b6dcbb19 Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop 2024-11-18 16:59:55 +08:00
joylink_fanyuhong
539e8b7d01 代码调整 2024-11-18 16:59:39 +08:00
joylink_zhaoerwei
1cd4cb815c 告警弹框 2024-11-18 15:50:46 +08:00
joylink_zhaoerwei
a37e33d7d8 故障类型查询调整 2024-11-18 15:05:46 +08:00
joylink_zhaoerwei
f7634d7672 同步proto 2024-11-18 09:47:55 +08:00
joylink_zhaoerwei
550bd752f8 ncc应急处置 2024-11-15 16:47:08 +08:00
joylink_zhaoerwei
67bfc01f6e toolTip调整 2024-11-15 13:32:13 +08:00
joylink_zhaoerwei
35f41df852 微调 2024-11-15 11:29:34 +08:00
joylink_zhaoerwei
6888e20634 微调 2024-11-15 11:09:15 +08:00
joylink_fanyuhong
4a3c2fafbf 代码提交 2024-11-15 10:11:12 +08:00
joylink_zhaoerwei
2aad7d4139 流程表调整 2024-11-15 09:18:14 +08:00
joylink_fanyuhong
02e49ec6fa 报警调整 2024-11-15 09:08:22 +08:00
joylink_fanyuhong
2b3673485c Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop 2024-11-15 09:03:41 +08:00
joylink_fanyuhong
0c1471f651 报警记录调整 2024-11-15 09:03:37 +08:00
joylink_zhaoerwei
f699666f96 Squashed commit of the following:
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m53s
commit e932e7d0ae
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Nov 14 18:14:13 2024 +0800

    增加是否播报语音

commit 05896cb241
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Nov 14 17:51:50 2024 +0800

    添加应急处置流程表

commit debaf97510
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Nov 14 15:59:51 2024 +0800

    菜单调整

commit 99b7cba025
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Nov 14 14:50:39 2024 +0800

    卡斯柯=》同方

commit 41e59960ee
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Nov 14 14:46:13 2024 +0800

    公里表显示调整

commit 0da7654efa
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Nov 14 11:14:19 2024 +0800

    增加5个故障
2024-11-14 18:15:56 +08:00
joylink_zhaoerwei
e932e7d0ae 增加是否播报语音 2024-11-14 18:14:13 +08:00
joylink_zhaoerwei
05896cb241 添加应急处置流程表 2024-11-14 17:51:50 +08:00
joylink_fanyuhong
debaf97510 菜单调整 2024-11-14 15:59:51 +08:00
joylink_fanyuhong
99b7cba025 卡斯柯=》同方 2024-11-14 14:50:39 +08:00
joylink_fanyuhong
41e59960ee 公里表显示调整 2024-11-14 14:46:13 +08:00
joylink_zhaoerwei
0da7654efa 增加5个故障 2024-11-14 11:14:19 +08:00
joylink_fanyuhong
5269e91153 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m49s
# Conflicts:
#	src/components/dialog/FaultQueryDialog.vue
2024-11-13 10:09:51 +08:00
joylink_zhaoerwei
de94896fd7 切换路由自动关闭弹框 2024-11-13 10:05:24 +08:00
joylink_zhaoerwei
4d65590ad1 Squashed commit of the following:
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m49s
commit 1333a0ec6f
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Nov 13 09:33:09 2024 +0800

    查询无数据调整
2024-11-13 09:34:33 +08:00
joylink_fanyuhong
84fac01c7a Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop 2024-11-13 09:34:00 +08:00
joylink_fanyuhong
b26d213a0e 链接提示调整 2024-11-13 09:33:57 +08:00