Commit Graph

1191 Commits

Author SHA1 Message Date
aixianling
3c499a1f8d Merge remote-tracking branch 'origin/dev' into dev 2022-08-23 10:39:04 +08:00
aixianling
df498efd2f 重新构建一遍okr-tree 2022-08-23 10:38:33 +08:00
liuye
6561f31e2d css 2022-08-23 08:58:46 +08:00
aixianling
59542c73b3 Merge branch 'dev' into build
# Conflicts:
#	package.json
#	project/dv/apps/AppGridDV.vue
2022-08-22 18:07:04 +08:00
aixianling
37e37540f8 okrtree改成cdn加载 2022-08-22 18:03:06 +08:00
yanran200730
0a262cbb25 郫都大屏 2022-08-22 16:00:09 +08:00
aixianling
4bb6e3be77 Merge branch 'dev' into build 2022-08-22 15:23:01 +08:00
liuye
53ee346ba0 上架宣发 2022-08-22 11:42:30 +08:00
aixianling
bca314e635 增加web端埋点 2022-08-22 11:09:55 +08:00
aixianling
c04bcbf90e 大屏组件做一下切割 2022-08-19 13:54:37 +08:00
aixianling
b388d03536 Merge branch 'dev' into build 2022-08-19 11:54:33 +08:00
aixianling
e6c3c1c857 BUG 30939 2022-08-19 11:12:07 +08:00
liuye
329f7562db 回调 2022-08-19 10:24:51 +08:00
yanran200730
a80efb09c0 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-19 09:42:59 +08:00
yanran200730
122d12fec0 bug 2022-08-19 09:42:46 +08:00
liuye
17bc8ad651 30941 2022-08-19 09:15:46 +08:00
liuye
79bfd71a8e fix 2022-08-19 09:00:10 +08:00
aixianling
097b434712 更换列表上标绘接口 2022-08-18 17:36:39 +08:00
aixianling
392ffee1ea Merge branch 'dev' into build
# Conflicts:
#	package.json
#	vue.config.js
2022-08-18 17:33:48 +08:00
aixianling
a92123566d 秀山需求变更调整完毕 2022-08-18 15:36:24 +08:00
aixianling
e3937d2ed6 企微定制方案新增埋点 2022-08-17 13:52:27 +08:00
aixianling
f3b799c56f 企微定制方案新增埋点 2022-08-17 11:52:38 +08:00
aixianling
84299df63e Merge branch 'dev' into build 2022-08-15 13:51:24 +08:00
yanran200730
fc7f522524 郫都大屏 2022-08-15 11:30:32 +08:00
aixianling
2d76c3fee4 Merge branch 'dev' into build 2022-08-12 17:06:29 +08:00
yanran200730
ab2207b109 郫都大屏 2022-08-12 16:11:03 +08:00
aixianling
d7d6f12142 Merge branch 'dev' into build 2022-08-12 15:02:57 +08:00
yanran200730
1f1dc5eec8 bug 2022-08-12 14:07:46 +08:00
aixianling
6a39364b03 Merge remote-tracking branch 'origin/dev' into build 2022-08-12 11:50:33 +08:00
aixianling
98946c1e28 构建版本修改 2022-08-12 11:20:51 +08:00
yanran200730
347bd16bb1 bug 2022-08-12 09:47:34 +08:00
yanran200730
bad3028a83 郫都大屏 2022-08-11 16:36:36 +08:00
yanran200730
86dbba831f Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-11 16:14:34 +08:00
yanran200730
52d60210c7 郫都大屏 2022-08-11 16:14:28 +08:00
aixianling
84aa2f5f62 Merge remote-tracking branch 'origin/dev' into dev 2022-08-11 10:45:35 +08:00
aixianling
277029ad85 上架直接使用标准版居民档案 2022-08-11 10:45:21 +08:00
yanran200730
5132d41b14 郫都大屏 2022-08-11 10:31:35 +08:00
yanran200730
bcec48bdbf Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-11 09:28:51 +08:00
yanran200730
188d0ed258 郫都大屏 2022-08-11 09:28:44 +08:00
liuye
a9a466cca5 选择部门 2022-08-11 09:15:22 +08:00
yanran200730
ff8120d1b5 30786 2022-08-11 08:21:56 +08:00
yanran200730
e4707cb090 30798 2022-08-11 08:14:04 +08:00
yanran200730
9c47fb9a16 郫都大屏 2022-08-10 18:01:19 +08:00
yanran200730
bd67f05f91 郫都大屏 2022-08-10 17:26:44 +08:00
yanran200730
f871cefbad 郫都大屏 2022-08-10 17:25:31 +08:00
yanran200730
83b7bdef8d 郫都大屏 2022-08-10 17:19:01 +08:00
yanran200730
97181c4e8d 30796 2022-08-10 17:03:18 +08:00
yanran200730
43976b674a bug 2022-08-10 16:49:32 +08:00
yanran200730
7b0a7bf741 郫都大屏 2022-08-10 15:19:57 +08:00
yanran200730
1c41f96f04 郫都大屏 2022-08-10 14:54:19 +08:00