114 Commits

Author SHA1 Message Date
zhitan-ems
347746733d
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-12-04 09:20:52 +00:00
zhitan-ems
3b1cbdb654
update
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-12-01 10:09:24 +00:00
zhitan-ems
97d6409d50
!24 更新sql
Merge pull request !24 from zhitan-ems/dev_from_master
2025-11-24 08:11:44 +00:00
wt
4ac642bb16 更新sql 2025-11-24 16:10:55 +08:00
zhitan-ems
27b870fdec
!23 更新
Merge pull request !23 from zhitan-ems/dev_from_master
2025-11-24 08:09:49 +00:00
wt
2e92775af2 提交 2025-11-24 16:06:37 +08:00
wt
b69da4795e Merge branch 'zhitan_master' into dev_from_master
# Conflicts:
#	README.md
2025-11-24 16:05:27 +08:00
wt
af8209a781 更新 2025-11-24 16:00:43 +08:00
ustcyc
a07b623c92 更新readme 2025-11-22 21:56:58 +08:00
zhitan-ems
f65598c216
update zhitan-vue/src/store/modules/permission.js.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-11-21 02:38:56 +00:00
zhitan-ems
4240ef5868
update zhitan-vue/src/components/Avatar/index.vue.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-11-21 02:37:10 +00:00
zhitan-ems
f29ae439df
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-11-07 03:25:12 +00:00
zhitan-ems
099a56131a
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-11-03 08:37:55 +00:00
zhitan-ems
f078b3b831
update
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-11-03 08:36:39 +00:00
sdxt0802
9f33fd4066
!22 update README.md
Merge pull request !22 from sdxt0802/dev_from_master
2025-10-29 04:39:11 +00:00
wt
5478daebc5 Merge branch 'zhitan_master' into dev_from_master
# Conflicts:
#	README.md
2025-10-29 12:37:42 +08:00
wt
f389efe4aa update README.md 2025-10-29 10:29:26 +08:00
sdxt0802
bc985f8745
update README.md.
Signed-off-by: sdxt0802 <16249625+sdxt0802@user.noreply.gitee.com>
2025-10-27 06:37:08 +00:00
wt
de0babc2f5 update README.md 2025-10-27 14:21:41 +08:00
zhitan-ems
54b2ab2c06
!20 update zhitan-system/src/main/resources/mapper/comprehensivestatistics/DailyComprehensiveMapper.xml.
Merge pull request !20 from znonymous/N/A
2025-10-23 06:11:21 +00:00
znonymous
1b114707b3
update zhitan-system/src/main/resources/mapper/comprehensivestatistics/DailyComprehensiveMapper.xml.
/comprehensive/dailyComprehensive/list接口报错

Signed-off-by: znonymous <fly1029@yeah.net>
2025-10-21 08:47:33 +00:00
ustcyc
0fa821a3f6 Merge remote-tracking branch 'origin/zhitan_master' into zhitan_master 2025-09-27 14:20:46 +08:00
ustcyc
e3c0cf7966 增加告警看板 2025-09-27 14:19:41 +08:00
ustcyc
212ba47e71 增加告警看板 2025-09-27 14:10:34 +08:00
DYL0109
72568e95a8
!19 成本趋势分析接口默认值问题修改
Merge pull request !19 from DYL0109/dev_from_master
2025-09-25 07:43:38 +00:00
DYL0109
ce606cb145 成本趋势分析接口默认值问题修改 2025-09-25 15:42:45 +08:00
ustcyc
023b9e2d58 增加告警看板 2025-09-19 18:24:35 +08:00
ustcyc
38bf4f6dac 完善readme 2025-09-19 15:38:35 +08:00
ustcyc
33335c9bbf 完善readme 2025-09-19 13:15:12 +08:00
ustcyc
b7760d6908 完善readme 2025-09-19 13:14:07 +08:00
ustcyc
63e72541fe 增加首页两个看板的介绍 2025-09-19 13:03:26 +08:00
zhitan-ems
70c2b3c2a3
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-09-16 10:01:21 +00:00
DYL0109
d76c738a4b
!18 能耗对比分析-设备能耗分析-导出问题修复
Merge pull request !18 from DYL0109/dev_from_master
2025-09-15 08:50:44 +00:00
DYL0109
1c0c714ba0 能耗对比分析-设备能耗分析-导出问题修复 2025-09-15 16:48:57 +08:00
zhitan-ems
3e95a9d8a9
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-09-10 08:45:47 +00:00
zhitan-ems
196b8cb789
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-09-10 08:42:21 +00:00
zhitan-ems
7785ff17dc
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-09-10 08:40:55 +00:00
zhitan-ems
15645fd3c7
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-09-10 08:35:01 +00:00
zhitan-ems
546bb731f5
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-09-10 08:32:57 +00:00
zhitan-ems
83f94ef8ee
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-09-05 12:29:04 +00:00
zhitan-ems
3dfe88ef55
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-09-05 12:24:58 +00:00
DYL0109
c77e97a9f4
!17 新增计量器具问题修复
Merge pull request !17 from DYL0109/dev_from_master
2025-09-01 03:29:34 +00:00
DYL0109
4ee5719765 新增计量器具问题修复 2025-09-01 11:29:05 +08:00
DYL0109
ce3ef6f3bc
!16 新增计量器具问题修复
Merge pull request !16 from DYL0109/dev_from_master
2025-09-01 03:23:14 +00:00
DYL0109
2e33ceb225 新增计量器具问题修复 2025-09-01 11:18:40 +08:00
zt1_23
bb1defb24d
update README.md.
Signed-off-by: zt1_23 <1903964620@qq.com>
2025-07-24 03:46:41 +00:00
zt1_23
4096304743
update README.md.
Signed-off-by: zt1_23 <1903964620@qq.com>
2025-07-24 03:44:48 +00:00
zhitan-ems
6305d4ce7b
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-07-23 08:43:15 +00:00
zhitan-ems
5ff8f32371
update README.md.
Signed-off-by: zhitan-ems <yincun7@gmail.com>
2025-07-23 08:40:00 +00:00
DYL0109
83c02f755f
!15 分项能耗分析修改抛异常
Merge pull request !15 from zt1_23/dev_from_master
2025-07-18 06:06:50 +00:00