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

918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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_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
joylink_fanyuhong
b8d08b40bb Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop 2024-10-21 14:56:07 +08:00
joylink_fanyuhong
2676d4d1d8 登录流程调整 2024-10-21 14:56:05 +08:00
joylink_zhaoerwei
5044db830b 修改报警接口 2024-10-21 11:19:08 +08:00
joylink_fanyuhong
31ae2f378d 记录调整添加接口入参 2024-10-21 10:57:15 +08:00
joylink_fanyuhong
c7d5464276 刷新token调整 2024-10-21 10:24:35 +08:00
joylink_fanyuhong
c77612e4dc 代码调整 2024-10-21 10:20:43 +08:00
joylink_fanyuhong
199e775f81 Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop 2024-10-18 17:19:42 +08:00
joylink_fanyuhong
e90c25523e 接口调整暂时提交 2024-10-18 17:19:40 +08:00
joylink_zhaoerwei
00da31059b 决策信息暂提 2024-10-18 17:04:11 +08:00
joylink_zhaoerwei
012340628a 移动报警列表+去掉接口管理 2024-10-17 09:33:01 +08:00
shengxuqiang
8efecc78d7 Merge pull request '修改cicd设置node环境更新使用版本' (#1) from develop into local-test
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 2m47s
Details 
Reviewed-on: #1
 2024-09-24 09:22:57 +08:00
soul-walker
a3a5a18fc4 修改cicd设置node环境更新使用版本 2024-09-24 09:18:34 +08:00
joylink_fanyuhong
a828c47e49 Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布 / Docker-Build (push) Failing after 7m1s
Details
2024-09-23 13:55:28 +08:00
joylink_fanyuhong
7b06dee5be 构建关联关系调整 2024-09-23 13:55:11 +08:00
joylink_fanyuhong
aaf8b932a5 区段放开目的地吗位置偏移 2024-09-23 09:12:28 +08:00
joylink_fanyuhong
49b94329f7 三个记录页面雏形（待接口完善） 2024-09-09 10:01:20 +08:00
joylink_fanyuhong
181a3dae51 合并代码
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 2m20s
Details
2024-09-06 15:06:06 +08:00
joylink_zhaoerwei
acaf3d1f11 权限调整+绘制吸附同步 2024-09-06 14:39:48 +08:00
joylink_zhaoerwei
076b366137 Squashed commit of the following:
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 2m36s
Details 
commit 6296877798
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri Sep 6 11:08:37 2024 +0800

    权限代码备用

commit be4df53219
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jul 15 16:10:30 2024 +0800

    同步北京部分计轴

commit 20d39f9f4a
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jul 15 15:41:09 2024 +0800

    同步区段复制控制-A键直接复制到端点

commit d345a1dc87
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jul 15 15:17:30 2024 +0800

    前端框架版本升级+同步北京区段道岔移动时端点吸附
 2024-09-06 11:11:04 +08:00
joylink_zhaoerwei
6296877798 权限代码备用 2024-09-06 11:08:37 +08:00
joylink_zhaoerwei
be4df53219 同步北京部分计轴 2024-07-15 16:10:30 +08:00
joylink_zhaoerwei
20d39f9f4a 同步区段复制控制-A键直接复制到端点 2024-07-15 15:41:09 +08:00
joylink_zhaoerwei
d345a1dc87 前端框架版本升级+同步北京区段道岔移动时端点吸附 2024-07-15 15:17:30 +08:00
soul-walker
45b34cb3b9 submodule url更新
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 2m18s
Details 
依赖的graphic-pixi git路径更新
添加local-test构建发布工作流
 2024-03-28 10:57:47 +08:00
fan
e1c4cd8a1a 删除lamp 2024-01-25 14:45:54 +08:00
fan
3aa3038504 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2024-01-25 10:15:39 +08:00
fan
ea84c6ecdd 信号机实现逻辑调整 2024-01-25 10:15:32 +08:00
joylink_zhaoerwei
12f0bdf6d2 区段吸附点修改 2024-01-10 16:30:37 +08:00
joylink_zhaoerwei
e699ac3ef3 测试微调 2023-12-28 15:10:41 +08:00
joylink_zhaoerwei
c8580b9d42 微调 2023-12-27 17:37:35 +08:00