joylink/xian-ncc-da-client
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
948 Commits 7 Branches 0 Tags 3.7 MiB
1f8b5552c7
Commit Graph

948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joylink_fanyuhong
1f8b5552c7 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m50s
Details 
# Conflicts:
#	src/drawApp/lineNetApp.ts
 2024-11-12 18:02:55 +08:00
joylink_zhaoerwei
52fbdba1af 故障查询调整 2024-11-12 17:28:58 +08:00
joylink_zhaoerwei
9ac2c2dc59 故障查询调整 2024-11-12 16:44:22 +08:00
joylink_fanyuhong
cfcf0e06d1 添加链接提示 2024-11-12 15:18:07 +08:00
joylink_zhaoerwei
158aed62e6 Squashed commit of the following:
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m53s
Details 
commit 33292ca9b8
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Nov 12 09:17:32 2024 +0800

    订阅处理

commit cdcad825f7
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Nov 12 09:13:54 2024 +0800

    取消订阅调整

commit 44f7389132
Merge: 425d8e9 a2ae992
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Nov 11 18:18:43 2024 +0800

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

commit 425d8e986b
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Nov 11 18:16:10 2024 +0800

    处理订阅

commit a2ae99209f
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Nov 11 17:48:52 2024 +0800

    订阅调整
 2024-11-12 09:49:53 +08:00
joylink_fanyuhong
33292ca9b8 订阅处理 2024-11-12 09:17:32 +08:00
joylink_fanyuhong
cdcad825f7 取消订阅调整 2024-11-12 09:13:54 +08:00
joylink_fanyuhong
44f7389132 Merge remote-tracking branch 'origin/develop' into develop 2024-11-11 18:18:43 +08:00
joylink_fanyuhong
425d8e986b 处理订阅 2024-11-11 18:18:29 +08:00
joylink_zhaoerwei
40e11e0d67 Squashed commit of the following:
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m51s
Details 
commit a2ae99209f
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Nov 11 17:48:52 2024 +0800

    订阅调整
 2024-11-11 17:49:53 +08:00
joylink_zhaoerwei
a2ae99209f 订阅调整 2024-11-11 17:48:52 +08:00
joylink_fanyuhong
bdaa3507e9 merge
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m57s
Details
2024-11-11 09:17:57 +08:00
joylink_zhaoerwei
2f815a0707 微调 2024-11-08 18:02:40 +08:00
joylink_zhaoerwei
f10e55ce0d 故障查询调整 2024-11-08 17:59:50 +08:00
joylink_zhaoerwei
7971887d2c 故障查询相关调整 2024-11-08 17:47:19 +08:00
joylink_zhaoerwei
4adeedb4d5 音频根据线路播放 2024-11-08 15:57:53 +08:00
joylink_zhaoerwei
a57d89a7f3 故障指导与退出服务 2024-11-08 15:06:07 +08:00
joylink_fanyuhong
50b80fef68 Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop 2024-11-08 13:55:25 +08:00
joylink_fanyuhong
b00010901a 保留app 2024-11-08 13:55:21 +08:00
joylink_zhaoerwei
7cd0df6b1b 故障查询过滤 2024-11-08 10:45:03 +08:00
joylink_zhaoerwei
0ecd9aac7c 增加故障查询 2024-11-08 10:19:57 +08:00
joylink_zhaoerwei
fbb08bb9e3 代码备用 2024-11-07 17:28:33 +08:00
joylink_zhaoerwei
f8e36732d8 增加道岔挤岔 2024-11-05 10:45:15 +08:00
joylink_zhaoerwei
a04ca22f4f Squashed commit of the following:
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m55s
Details 
commit ae81b3f4f8
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Nov 4 10:49:37 2024 +0800

    新建决策信息调整

commit 586e920216
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri Nov 1 11:23:40 2024 +0800

    应急触发

commit 25b89e8d34
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri Nov 1 09:46:21 2024 +0800

    增加设备类型

commit 3fc1f4deb7
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri Nov 1 09:25:39 2024 +0800

    故障测试加应急触发

commit d75c48a011
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Oct 31 17:27:00 2024 +0800

    应急触发

commit 26f8581f55
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Oct 31 16:20:21 2024 +0800

    增加应急触发

commit f0495153e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Oct 30 13:45:15 2024 +0800

    计轴配置
 2024-11-05 09:07:59 +08:00
joylink_zhaoerwei
ae81b3f4f8 新建决策信息调整 2024-11-04 10:49:37 +08:00
joylink_zhaoerwei
586e920216 应急触发 2024-11-01 11:23:40 +08:00
joylink_zhaoerwei
25b89e8d34 增加设备类型 2024-11-01 09:46:21 +08:00
joylink_zhaoerwei
3fc1f4deb7 故障测试加应急触发 2024-11-01 09:25:39 +08:00
joylink_zhaoerwei
d75c48a011 应急触发 2024-10-31 17:27:00 +08:00
joylink_zhaoerwei
5181c897e7 Squashed commit of the following:
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 2m2s
Details 
commit 26f8581f55
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Oct 31 16:20:21 2024 +0800

    增加应急触发

commit f0495153e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Oct 30 13:45:15 2024 +0800

    计轴配置
 2024-10-31 16:21:49 +08:00
joylink_zhaoerwei
26f8581f55 增加应急触发 2024-10-31 16:20:21 +08:00
joylink_zhaoerwei
425da8f1af Squashed commit of the following:
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m55s
Details 
commit f0495153e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Oct 30 13:45:15 2024 +0800

    计轴配置
 2024-10-30 13:48:30 +08:00
joylink_zhaoerwei
f0495153e6 计轴配置 2024-10-30 13:45:15 +08:00
joylink_fanyuhong
328e70e188 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 2m2s
Details
2024-10-30 13:27:41 +08:00
joylink_zhaoerwei
fb6c01dbfd 生成计轴配置 2024-10-30 11:45:19 +08:00
joylink_fanyuhong
9c7af7e256 页面查询按钮添加函数 2024-10-25 16:31:05 +08:00
joylink_fanyuhong
670e9c14db 添加查询按钮 2024-10-25 14:48:46 +08:00
joylink_fanyuhong
ca75a70a0f 登录记录&操作记录入参提交 2024-10-25 10:57:33 +08:00
joylink_fanyuhong
5d6283daa6 登录记录&操作记录入参提交
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m54s
Details
2024-10-25 10:44:35 +08:00
joylink_zhaoerwei
37835ed2d6 报警记录增加查询 2024-10-24 15:33:14 +08:00
joylink_zhaoerwei
a486e97e5a 微调 2024-10-24 15:13:57 +08:00
joylink_zhaoerwei
c06c626d52 决策信息查询修改 2024-10-24 15:11:25 +08:00
joylink_fanyuhong
40d57a3fc8 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 1m55s
Details 
# Conflicts:
#	src/components/SysMenu.vue
#	src/layouts/MainLayout.vue
#	src/pages/RoleManage.vue
#	src/pages/UserLogin.vue
#	src/router/routes.ts
 2024-10-23 15:23:23 +08:00
joylink_zhaoerwei
c5cee6ee5c 调整编辑角色 2024-10-23 14:44:03 +08:00
joylink_zhaoerwei
3ecc0558b1 报警弹框操作增加禁用逻辑和禁选逻辑 2024-10-22 16:11:24 +08:00
joylink_zhaoerwei
330f7cc809 订阅路径修改 2024-10-22 11:30:53 +08:00
joylink_zhaoerwei
2a7cf2e186 添加角色配置 2024-10-22 10:32:37 +08:00
joylink_zhaoerwei
c4ee11a520 Squashed commit of the following:
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 2m1s
Details 
commit fb18c04248
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Oct 21 17:18:51 2024 +0800

    权限角色调整

commit b6d345426f
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Oct 21 16:37:58 2024 +0800

    弹框不弹--改路由

commit b8d08b40bb
Merge: 2676d4d 5044db8
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Oct 21 14:56:07 2024 +0800

    Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop

commit 2676d4d1d8
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Oct 21 14:56:05 2024 +0800

    登录流程调整

commit 5044db830b
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Oct 21 11:19:08 2024 +0800

    修改报警接口

commit 31ae2f378d
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Oct 21 10:57:15 2024 +0800

    记录调整添加接口入参

commit c7d5464276
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Oct 21 10:24:35 2024 +0800

    刷新token调整

commit c77612e4dc
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Oct 21 10:20:43 2024 +0800

    代码调整

commit 199e775f81
Merge: e90c255 00da310
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Fri Oct 18 17:19:42 2024 +0800

    Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop

commit e90c25523e
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Fri Oct 18 17:19:40 2024 +0800

    接口调整暂时提交

commit 00da31059b
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri Oct 18 17:04:11 2024 +0800

    决策信息暂提

commit 012340628a
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Oct 17 09:33:01 2024 +0800

    移动报警列表+去掉接口管理
 2024-10-21 17:20:24 +08:00
joylink_zhaoerwei
fb18c04248 权限角色调整 2024-10-21 17:18:51 +08:00
joylink_zhaoerwei
b6d345426f 弹框不弹--改路由 2024-10-21 16:37:58 +08:00