Commit Graph

842 Commits

Author SHA1 Message Date
aixianling
5d656a9e65 积分整合 2022-05-13 16:14:55 +08:00
yanran200730
e04acbcf5b Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-05-13 14:55:21 +08:00
yanran200730
1f7e2b4d84 党建大屏 2022-05-13 14:55:13 +08:00
aixianling
d6d2e7b909 BUG 29578 2022-05-12 18:42:30 +08:00
aixianling
7de09aa195 BUG 29580 2022-05-12 18:28:58 +08:00
aixianling
ec41626868 整合积分integralDetailBizType 2022-05-12 16:25:22 +08:00
aixianling
d1acd1de71 Merge remote-tracking branch 'origin/dev' into dev 2022-05-12 16:22:50 +08:00
aixianling
f6d8a737df 整合积分等报错 2022-05-12 16:22:31 +08:00
yanran200730
d5d5fa6055 党建大屏 2022-05-12 15:25:35 +08:00
yanran200730
7453962f52 党建大屏 2022-05-11 18:07:04 +08:00
yanran200730
f9d5e51222 大屏 环形图组件 2022-05-11 16:47:15 +08:00
yanran200730
e4d1e85156 echart 组件 2022-05-11 11:37:44 +08:00
yanran200730
8998e9a664 bug 2022-05-11 10:20:59 +08:00
yanran200730
97d29d0d7e Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-05-11 09:47:29 +08:00
yanran200730
a4d48f643b 新增饼图组件 2022-05-11 09:47:09 +08:00
shijingjing
5d4a8af8d7 28735 28741 2022-05-11 09:33:32 +08:00
aixianling
036ee91533 目录代码整合 2022-05-10 20:02:37 +08:00
aixianling
f39746e303 调整界面和底座风格基本保持一致 2022-05-10 18:46:57 +08:00
liuye
61de1da32d 29553 2022-05-09 08:43:37 +08:00
yanran200730
1db79c53a0 党建大屏 2022-05-06 16:31:28 +08:00
yanran200730
39f6cb1ff2 党建大屏 2022-05-06 16:26:11 +08:00
yanran200730
a0c2bf8f67 党建大屏 2022-05-05 18:00:21 +08:00
yanran200730
f757852ac4 大屏组件 2022-05-05 15:28:56 +08:00
aixianling
890cbaa0b9 BUG 29468 2022-04-29 19:47:51 +08:00
aixianling
376a4778b8 BUG 29467 2022-04-29 19:39:17 +08:00
aixianling
cc46a5a9c8 BUG 29441 2022-04-29 17:53:10 +08:00
aixianling
e8439fe40a BUG 29454 2022-04-29 16:47:21 +08:00
aixianling
3464798fd9 BUG 29452 2022-04-29 16:44:14 +08:00
aixianling
5a730afb99 BUG 29451 2022-04-29 16:42:40 +08:00
aixianling
46596b6d57 BUG 29451 2022-04-29 16:42:26 +08:00
aixianling
8a0141bf2d BUG 29450 2022-04-29 16:39:37 +08:00
aixianling
869d9a4635 BUG 29446 2022-04-29 16:24:13 +08:00
aixianling
6eb9dd2ee6 BUG 29441 2022-04-29 16:13:28 +08:00
aixianling
47024dde2a BUG 29439 2022-04-29 16:11:09 +08:00
aixianling
f764b37c8a BUG 29436 2022-04-29 16:08:43 +08:00
aixianling
85324959a0 BUG 29420 2022-04-29 16:04:32 +08:00
aixianling
6298eeaae3 BUG 29306 2022-04-29 15:53:42 +08:00
aixianling
c398a354b9 BUG 29286 2022-04-29 15:44:01 +08:00
aixianling
abe2f9892e 合并网格管理员并权限控制 2022-04-29 14:32:08 +08:00
liuye
a4e7a9ff30 29412 2022-04-28 18:08:34 +08:00
liuye
572f155bf5 29411 2022-04-28 17:39:07 +08:00
liuye
99ef026ff0 bug 2022-04-28 17:23:10 +08:00
liuye
ec29f1dc11 29370 2022-04-28 15:41:43 +08:00
yanran200730
c186b95ae7 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-04-28 15:18:53 +08:00
yanran200730
d5fa92d90f bug 2022-04-28 15:18:36 +08:00
aixianling
6f5a918bd1 BUG 29401 2022-04-28 15:16:32 +08:00
aixianling
96ad4ac999 Merge remote-tracking branch 'origin/dev' into dev 2022-04-28 15:01:07 +08:00
aixianling
efc3252c1b BUG 29400 2022-04-28 15:00:51 +08:00
liuye
197201d923 29399 2022-04-28 14:49:04 +08:00
liuye
8baf806758 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-04-28 14:32:43 +08:00