joylink/rtsa-client
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93 Commits 3 Branches 0 Tags 3.2 MiB
local-test
Commit Graph

93 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joylink_zhaoerwei
f50704c476 Squashed commit of the following:
All checks were successful
local-test-CICD / Docker-Build (push) Successful in 1m35s
Details 
commit a4e63a4ab6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Nov 18 17:07:07 2024 +0800

    电子地图管理

commit 2544f5e131
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Nov 14 14:23:30 2024 +0800

    代码调整

commit 5400acf7e3
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Nov 13 17:59:00 2024 +0800

    电子地图绘制备用

commit c06acfd0b8
Merge: 3c41293 fdca6c4
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Nov 12 13:41:21 2024 +0800

    Merge branch 'develop' of https://gitea.joylink.club/joylink/rtsa-client into develop

commit 3c41293f0b
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Nov 12 13:41:17 2024 +0800

    获取用户id调整

commit fdca6c490b
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Nov 12 13:18:57 2024 +0800

    密码去掉加盐

commit b429bf5ce3
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Nov 12 10:51:32 2024 +0800

    登录注册备用

commit 1d2c1c337e
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Nov 11 17:56:21 2024 +0800

    代码调整

commit dee2b5ca7f
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Nov 11 17:30:55 2024 +0800

    烟感设备调整

commit f4812c7187
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Fri Nov 8 09:52:43 2024 +0800

    代码提交

commit 23ed471da1
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Nov 7 17:30:32 2024 +0800

    代码暂提

commit 429d6679f4
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Nov 6 21:12:19 2024 +0800

    问题调整

commit 28859d0fc1
Merge: cffefa0 f76ec13
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Nov 6 20:59:49 2024 +0800

    Merge branch 'develop' of https://gitea.joylink.club/joylink/rtsa-client into develop

commit cffefa06c6
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Nov 6 20:59:43 2024 +0800

    代码暂提

commit f76ec13940
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Nov 6 16:54:44 2024 +0800

    模式控制暂提

commit d353afa5dd
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Nov 5 18:05:09 2024 +0800

    代码暂提

commit 9e5905cb55
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Oct 31 16:58:01 2024 +0800

    更新子模块

commit cac4f38d64
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Oct 31 16:53:45 2024 +0800

    删除旧的子模块

commit a36b425b12
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Oct 30 10:15:47 2024 +0800

    调整

commit 8260753cf7
Merge: 3f240a7 9e0bc3e
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Oct 29 13:29:38 2024 +0800

    Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop

commit 3f240a7b57
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Oct 29 13:29:36 2024 +0800

    代码提交

commit 9e0bc3ea0b
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Oct 28 16:53:12 2024 +0800

    屏蔽门系统图

commit 3c67d4b5b7
Merge: f5d87ac eb9d073
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Oct 24 09:30:11 2024 +0800

    Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop

commit f5d87acd4c
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Oct 24 09:29:44 2024 +0800

    fas设备添加

commit eb9d0734ae
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Oct 23 15:51:18 2024 +0800

    垂直电梯备用

commit afd27d4b3e
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Oct 22 17:52:37 2024 +0800

    消防泵代码提交

commit 61911d9ee5
Merge: 98b1db6 a7968d1
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Oct 22 17:20:47 2024 +0800

    Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop

commit 98b1db6290
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Oct 22 17:16:24 2024 +0800

    设备添加

commit a7968d11da
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Oct 21 18:03:30 2024 +0800

    bas自动扶梯备用

commit d16bedfbf4
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri Oct 18 16:21:27 2024 +0800

    绘制组件调整

commit 124c9a2784
Merge: b451f4f 07b35b5
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Oct 17 17:52:03 2024 +0800

    Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop

commit b451f4fa3e
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Oct 17 17:52:02 2024 +0800

    FAS新增设备

commit 07b35b5360
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Oct 17 14:50:52 2024 +0800

    cctv加分层

commit d03f30d4cc
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Oct 17 13:50:52 2024 +0800

    CCTV设备布局图

commit 31d09306b4
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Oct 17 11:45:40 2024 +0800

    调整icon

commit cfc5adb953
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Oct 17 11:45:18 2024 +0800

    调整警铃icon

commit 083c17edd1
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Oct 17 11:31:38 2024 +0800

    添加火灾警铃设备

commit dbed83df26
Merge: 5bddef1 259d351
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Oct 17 09:34:31 2024 +0800

    Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop

commit 5bddef10cd
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Oct 17 09:32:55 2024 +0800

    添加火灾报警主机

commit 259d3518bb
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Oct 16 17:25:10 2024 +0800

    增加button label颜色

commit 3c91608189
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Oct 16 17:09:36 2024 +0800

    通用的button-类似组件button

commit f5bc7c9aa9
Author: fan <fanyuhong@joylink.club>
Date:   Wed Oct 16 16:55:57 2024 +0800

    protoc

commit 7ab75c722e
Author: fan <fanyuhong@joylink.club>
Date:   Wed Oct 16 16:54:53 2024 +0800

    fas数据调整

commit d8c55a011b
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Oct 16 14:01:58 2024 +0800

    添加FAS平面图分区

commit 9948e87fa0
Author: fan <fanyuhong@joylink.club>
Date:   Wed Oct 16 09:39:34 2024 +0800

    protoc

commit 702cc229a3
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Oct 15 18:16:18 2024 +0800

    加滚动条

commit ed3392d378
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Oct 15 17:37:56 2024 +0800

    绘制加组件显示

commit 1891981a23
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Oct 15 16:50:36 2024 +0800

    抽屉调整
 2024-11-18 17:10:59 +08:00
joylink_fanyuhong
ca12e4d1a9 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test-CICD / Docker-Build (push) Successful in 2m20s
Details
2024-10-15 09:56:05 +08:00
joylink_fanyuhong
391863ee21 修改icon图标 2024-10-15 09:55:43 +08:00
joylink_zhaoerwei
901f38be6c Squashed commit of the following:
All checks were successful
local-test-CICD / Docker-Build (push) Successful in 2m41s
Details 
commit 16230d77e4
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Oct 14 17:12:22 2024 +0800

    ISCS底部报警

commit 0787c7419e
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Oct 14 15:36:57 2024 +0800

    代码调整

commit aacfdf8b2d
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Sat Oct 12 17:02:24 2024 +0800

    完善绘制风格配置

commit 975a8a89aa
Merge: 37c56e2 38bc44f
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Fri Oct 11 17:14:10 2024 +0800

    Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop

commit 37c56e2962
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Fri Oct 11 17:14:08 2024 +0800

    删除fas遗留文件

commit 38bc44f2f9
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri Oct 11 17:07:53 2024 +0800

    绘制选择bug赞提（粗处理）

commit 8dc7214ceb
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri Oct 11 15:16:31 2024 +0800

    公共的图形——圆

commit c5beb9fbfd
Merge: fd0bfb0 63eff00
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Fri Oct 11 09:57:41 2024 +0800

    Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop

commit fd0bfb0ab2
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Fri Oct 11 09:52:46 2024 +0800

    同步数据调整

commit 63eff006b0
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Oct 10 17:19:36 2024 +0800

    修改矩形碰撞检测+动态加载绘制工具
 2024-10-14 17:14:32 +08:00
joylink_zhaoerwei
16230d77e4 ISCS底部报警 2024-10-14 17:12:22 +08:00
joylink_fanyuhong
0787c7419e 代码调整 2024-10-14 15:36:57 +08:00
joylink_zhaoerwei
aacfdf8b2d 完善绘制风格配置 2024-10-12 17:02:24 +08:00
joylink_fanyuhong
975a8a89aa Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop 2024-10-11 17:14:10 +08:00
joylink_fanyuhong
37c56e2962 删除fas遗留文件 2024-10-11 17:14:08 +08:00
joylink_zhaoerwei
38bc44f2f9 绘制选择bug赞提（粗处理） 2024-10-11 17:07:53 +08:00
joylink_zhaoerwei
8dc7214ceb 公共的图形——圆 2024-10-11 15:16:31 +08:00
joylink_fanyuhong
c5beb9fbfd Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop 2024-10-11 09:57:41 +08:00
joylink_fanyuhong
fd0bfb0ab2 同步数据调整 2024-10-11 09:52:46 +08:00
joylink_zhaoerwei
63eff006b0 修改矩形碰撞检测+动态加载绘制工具 2024-10-10 17:19:36 +08:00
joylink_fanyuhong
afcd3954e1 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test-CICD / Docker-Build (push) Successful in 2m35s
Details
2024-10-10 16:04:33 +08:00
joylink_fanyuhong
f6e0785633 代码调整 2024-10-10 16:04:18 +08:00
joylink_zhaoerwei
c0cc5fac14 修改protoc结构 2024-10-10 15:11:28 +08:00
joylink_fanyuhong
20094bd584 merge
All checks were successful
local-test-CICD / Docker-Build (push) Successful in 2m47s
Details
2024-10-10 11:04:31 +08:00
joylink_fanyuhong
9d8a8b5b14 Merge remote-tracking branch 'origin/develop' into local-test 2024-10-10 10:49:20 +08:00
joylink_fanyuhong
382b462880 Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop 2024-10-10 10:46:56 +08:00
joylink_fanyuhong
e8eb0f5ef7 非编辑数据调整 2024-10-10 10:46:54 +08:00
joylink_zhaoerwei
0d66c5c89f 绘制bug修复 2024-10-10 10:05:48 +08:00
joylink_zhaoerwei
662d7260ca 公共的线条备用 2024-10-09 18:52:48 +08:00
joylink_fanyuhong
04caf21f2f 相同用户操作判断调整 2024-10-08 18:04:32 +08:00
joylink_fanyuhong
53335d35ba Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop 2024-10-08 17:40:25 +08:00
joylink_fanyuhong
b22e2393d6 同步调整 2024-10-08 17:38:42 +08:00
fan
cbed606d65 同步数据 2024-10-08 17:36:48 +08:00
joylink_zhaoerwei
f64bea41e2 增加icon 2024-10-08 17:32:17 +08:00
joylink_zhaoerwei
8afe793ea5 绘制调整 2024-09-29 18:43:11 +08:00
fan
d0f4d09591 执行protoc 2024-09-29 14:30:26 +08:00
fan
e6e79b7004 同步数据 2024-09-29 14:21:16 +08:00
joylink_zhaoerwei
c81a7db6cd 校验name 2024-09-27 14:42:53 +08:00
joylink_zhaoerwei
5c2bca34ee 同步proto 2024-09-27 14:22:11 +08:00
joylink_zhaoerwei
f7840ff0f3 绘制备用 2024-09-26 18:20:59 +08:00
joylink_zhaoerwei
6eb65ce531 Squashed commit of the following:
All checks were successful
local-test-CICD / Docker-Build (push) Successful in 2m29s
Details 
commit 888bbc83d6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Sep 26 13:08:07 2024 +0800

    用户管理+绘制管理的userName

commit 320c1e92cc
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Sep 25 14:54:46 2024 +0800

    新的ISCS数据结构实现加载赞提

commit dede7f400f
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Sep 25 10:37:26 2024 +0800

    绘图工具调整

commit 4adcfacc12
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Sep 24 16:42:11 2024 +0800

    增加更多筛选项

commit 5888422322
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Sep 24 14:22:31 2024 +0800

    Squashed commit of the following:

    commit 27fb1ee4ea
    Author: joylink_fanyuhong <18706759286@163.com>
    Date:   Tue Sep 24 14:05:41 2024 +0800

        报错调整

    commit 069615d05d
    Author: joylink_fanyuhong <18706759286@163.com>
    Date:   Tue Sep 24 14:04:30 2024 +0800

        代码调整

    commit 66c4ac33b3
    Merge: 107d8a5 b267859
    Author: shengxuqiang <shengxuqiang@joylink.club>
    Date:   Tue Sep 24 12:09:11 2024 +0800

        Merge pull request '修改打包目录配置' (#3) from develop into local-test

        Reviewed-on: joylink/rtss-simulation-app-client#3

    commit 107d8a50f1
    Merge: 75797eb b01ee7c
    Author: shengxuqiang <shengxuqiang@joylink.club>
    Date:   Tue Sep 24 11:59:24 2024 +0800

        Merge pull request '添加local-test环境打包配置' (#2) from develop into local-test

        Reviewed-on: joylink/rtss-simulation-app-client#2

    commit 75797ebc40
    Merge: ff65d38 1a4ae38
    Author: shengxuqiang <shengxuqiang@joylink.club>
    Date:   Tue Sep 24 11:52:28 2024 +0800

        Merge pull request '添加local-test分支CICD配置' (#1) from develop into local-test

        Reviewed-on: joylink/rtss-simulation-app-client#1

commit 4f7ba40f3e
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Sep 24 13:21:29 2024 +0800

    目录调整
 2024-09-26 13:15:16 +08:00
joylink_zhaoerwei
888bbc83d6 用户管理+绘制管理的userName 2024-09-26 13:08:07 +08:00
joylink_zhaoerwei
320c1e92cc 新的ISCS数据结构实现加载赞提 2024-09-25 14:54:46 +08:00
joylink_fanyuhong
dede7f400f 绘图工具调整 2024-09-25 10:37:26 +08:00
joylink_zhaoerwei
4adcfacc12 增加更多筛选项 2024-09-24 16:42:11 +08:00
joylink_zhaoerwei
5888422322 Squashed commit of the following: 
commit 27fb1ee4ea
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Sep 24 14:05:41 2024 +0800

    报错调整

commit 069615d05d
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue Sep 24 14:04:30 2024 +0800

    代码调整

commit 66c4ac33b3
Merge: 107d8a5 b267859
Author: shengxuqiang <shengxuqiang@joylink.club>
Date:   Tue Sep 24 12:09:11 2024 +0800

    Merge pull request '修改打包目录配置' (#3) from develop into local-test

    Reviewed-on: joylink/rtss-simulation-app-client#3

commit 107d8a50f1
Merge: 75797eb b01ee7c
Author: shengxuqiang <shengxuqiang@joylink.club>
Date:   Tue Sep 24 11:59:24 2024 +0800

    Merge pull request '添加local-test环境打包配置' (#2) from develop into local-test

    Reviewed-on: joylink/rtss-simulation-app-client#2

commit 75797ebc40
Merge: ff65d38 1a4ae38
Author: shengxuqiang <shengxuqiang@joylink.club>
Date:   Tue Sep 24 11:52:28 2024 +0800

    Merge pull request '添加local-test分支CICD配置' (#1) from develop into local-test

    Reviewed-on: joylink/rtss-simulation-app-client#1
 2024-09-24 14:22:31 +08:00
joylink_fanyuhong
27fb1ee4ea 报错调整
All checks were successful
local-test-CICD / Docker-Build (push) Successful in 2m25s
Details
2024-09-24 14:05:41 +08:00
joylink_fanyuhong
069615d05d 代码调整
Some checks failed
local-test-CICD / Docker-Build (push) Failing after 56s
Details
2024-09-24 14:04:30 +08:00
joylink_zhaoerwei
4f7ba40f3e 目录调整 2024-09-24 13:21:29 +08:00
shengxuqiang
66c4ac33b3 Merge pull request '修改打包目录配置' (#3) from develop into local-test
All checks were successful
local-test-CICD / Docker-Build (push) Successful in 2m20s
Details 
Reviewed-on: joylink/rtss-simulation-app-client#3
 2024-09-24 12:09:11 +08:00
soul-walker
b267859368 修改打包目录配置 2024-09-24 12:08:38 +08:00
shengxuqiang
107d8a50f1 Merge pull request '添加local-test环境打包配置' (#2) from develop into local-test
All checks were successful
local-test-CICD / Docker-Build (push) Successful in 2m40s
Details 
Reviewed-on: joylink/rtss-simulation-app-client#2
 2024-09-24 11:59:24 +08:00
soul-walker
b01ee7c0b6 添加local-test环境打包配置 2024-09-24 11:58:50 +08:00
shengxuqiang
75797ebc40 Merge pull request '添加local-test分支CICD配置' (#1) from develop into local-test
Some checks failed
local-test-CICD / Docker-Build (push) Failing after 1m14s
Details 
Reviewed-on: joylink/rtss-simulation-app-client#1
 2024-09-24 11:52:28 +08:00
soul-walker
1a4ae38e56 Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop 2024-09-24 11:50:30 +08:00
soul-walker
6b4607088c 修改打包路径配置 
修改graphic-pixi依赖url
添加local-test分支CICD配置
 2024-09-24 11:50:24 +08:00