Commit Graph

46 Commits

Author SHA1 Message Date
xiaozhiyong
afcb0228f8 更新 2026-06-12 16:59:17 +08:00
xiaozhiyong
08156379e5 gengxin 2026-06-12 14:26:20 +08:00
xiaozhiyong
9b9bf3739e 更新 2026-06-12 14:13:38 +08:00
xiaozhiyong
90263c679e 更新 2026-06-12 14:10:01 +08:00
xiaozhiyong
57375c9136 更新 2026-06-12 14:01:37 +08:00
xiaozhiyong
47b6351492 更新 2026-06-12 13:40:28 +08:00
xiaozhiyong
286ba122b3 Merge remote-tracking branch 'origin/大屏' into 第一次美化 2026-06-12 11:24:03 +08:00
kongduo
9502d4623a Merge branch '删除无用页面' of http://121.196.213.68:3000/xiaozhiyong/safePower into 大屏
# Conflicts:
#	src/utils/date.js
2026-06-12 11:18:12 +08:00
kongduo
e9594b65e4 美化 2026-06-12 11:16:10 +08:00
xiaozhiyong
a02b0d7678 Merge branch '删除无用页面' into 第一次美化 2026-06-12 11:09:36 +08:00
kongduo
175be2c949 Merge branch '第一次美化' of http://121.196.213.68:3000/xiaozhiyong/safePower into 大屏
# Conflicts:
#	src/style/main.scss
#	src/view/equipment/alarmRecord/index.vue
#	src/view/equipment/gateway/index.vue
#	src/view/equipment/list/index.vue
#	src/view/equipment/particulars/index.vue
#	src/view/systemTools/autoCode/picture.vue
2026-06-12 09:43:12 +08:00
kongduo
2c816a13df 代码更新 2026-06-12 09:29:42 +08:00
kongduo
06dfe98cb6 第一次美化 2026-06-11 19:18:48 +08:00
xiaozhiyong
aa8368e4fb 更新 2026-06-11 19:10:33 +08:00
xiaozhiyong
bfd9878597 更新 2026-06-11 19:06:55 +08:00
xiaozhiyong
b64aa13a65 更新 2026-06-11 19:02:18 +08:00
kongduo
57b0a46183 Merge branch '删除无用页面' of http://121.196.213.68:3000/xiaozhiyong/safePower into 三次修改
# Conflicts:
#	src/utils/format.js
#	src/view/layout/header/index.vue
#	src/view/securityControl/alarmList/index.vue
2026-06-11 18:46:37 +08:00
kongduo
ca23283c6e 暂存 2026-06-11 18:45:44 +08:00
xiaozhiyong
0ae8ba168b 更新 2026-06-11 18:39:29 +08:00
xiaozhiyong
987b2c8f90 更新 2026-06-11 18:32:58 +08:00
xiaozhiyong
18883cbb03 更新 2026-06-11 18:19:47 +08:00
xiaozhiyong
3b3253652f 更新 2026-06-11 17:54:40 +08:00
xiaozhiyong
082b766349 更新 2026-06-11 17:09:20 +08:00
xiaozhiyong
abe40c5ae9 更新 2026-06-11 17:09:09 +08:00
xiaozhiyong
565cd2921a 更新 2026-06-11 08:40:18 +08:00
kongduo
f3fec263bf 保存 2026-06-10 11:12:35 +08:00
xiaozhiyong
f006955a77 更新 2026-06-10 09:39:21 +08:00
xiaozhiyong
93ccdace0f 更新 2026-06-08 13:59:43 +08:00
xiaozhiyong
14906a83d2 更新 2026-06-08 09:19:44 +08:00
xiaozhiyong
f182a7d736 更新 2026-06-08 09:19:34 +08:00
xiaozhiyong
b8d29b5006 更新 2026-06-08 09:06:45 +08:00
xiaozhiyong
d3e9fcce4c 更新 2026-06-05 09:52:51 +08:00
xiaozhiyong
1890cca75f 更新 2026-06-04 16:54:46 +08:00
KongZhengMing
85520b0978 去除授权 2026-06-01 11:19:14 +08:00
xiaozhiyong
08f0e41baa 更新 2026-06-01 10:59:15 +08:00
xiaozhiyong
4f6dad3599 更新 2026-05-27 15:28:27 +08:00
xiaozhiyong
2b87179c9f 更新 2026-05-27 15:00:38 +08:00
xiaozhiyong
808f2a8e18 更新 2026-05-27 11:25:13 +08:00
xiaozhiyong
41592fd761 chore: 忽略 dist 打包文件 2026-05-26 08:50:37 +08:00
xiaozhiyong
3f0e3f75cf 更新 2026-05-25 15:46:04 +08:00
xiaozhiyong
5024bd495c gengxin 2026-05-25 11:10:47 +08:00
xiaozhiyong
4c5456bbcf 更新 2026-05-25 10:18:54 +08:00
xiaozhiyong
4d39de6299 更新 2026-05-06 10:23:04 +08:00
xiaozhiyong
a54a3bd1a9 更新 2026-05-06 10:00:13 +08:00
xiaozhiyong
9c5961efe9 更新 2026-04-29 09:15:49 +08:00
eae5d5f1b4 添加 test.js 2026-04-29 09:13:55 +08:00