Commit Graph

2782 Commits

Author SHA1 Message Date
yanran200730
95eb08e8c1 兴义大屏 2022-09-08 18:09:30 +08:00
yanran200730
52d7c20639 兴义大屏 2022-09-08 17:39:57 +08:00
aixianling
9ea39b1386 Merge remote-tracking branch 'origin/dev' into build 2022-09-08 16:17:08 +08:00
yanran200730
3f713a8d15 兴义大屏 2022-09-08 16:06:01 +08:00
aixianling
6e98d28b88 Merge remote-tracking branch 'origin/dev' into build 2022-09-08 13:23:39 +08:00
yanran200730
36f4283374 郫都大屏 2022-09-08 13:18:33 +08:00
yanran200730
a9ae034fcd 兴义大屏 2022-09-08 10:35:13 +08:00
yanran200730
ec379e6b72 兴义大屏 2022-09-08 09:03:41 +08:00
aixianling
cae010c2fc 清除不用的资源 2022-09-07 17:42:46 +08:00
aixianling
1b9c231a08 动效优化 2022-09-07 17:38:57 +08:00
aixianling
8883aaceb1 Merge remote-tracking branch 'origin/dev' into build 2022-09-07 16:01:57 +08:00
yanran200730
85caf086b7 兴义大屏 2022-09-07 14:54:41 +08:00
yanran200730
db431af916 大屏 2022-09-07 14:33:22 +08:00
yanran200730
022a15cc9d 大屏 2022-09-07 14:04:28 +08:00
yanran200730
6dfb287c9f 兴义大屏 2022-09-07 10:09:29 +08:00
aixianling
afeb2ffbec 修复预览界面 2022-09-06 15:19:28 +08:00
aixianling
1d6f9d4928 Merge remote-tracking branch 'origin/dev' into build 2022-09-06 11:47:02 +08:00
aixianling
7b11e728ff BUG 30994 2022-09-05 17:40:26 +08:00
yanran200730
5ed578faa0 30948 2022-09-05 17:35:23 +08:00
aixianling
2e2c38848a BUG 30994 2022-09-05 17:28:27 +08:00
yanran200730
faffbaeafe 协同宣发 2022-09-05 14:31:44 +08:00
aixianling
617ef4b9c9 企业微信设置调整,系统信息科在修改调整 2022-09-05 11:11:10 +08:00
aixianling
efc537a45b 慧治理设置完毕 2022-09-05 11:08:44 +08:00
yanran200730
9cf8ffc5c1 协同宣发 2022-09-05 10:54:11 +08:00
aixianling
1ae777d0d5 兼容登录页做调整 2022-09-05 10:00:38 +08:00
aixianling
dd33829b39 Merge remote-tracking branch 'origin/dev' into build 2022-09-05 09:18:06 +08:00
yanran200730
e2acdacf1f Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-09-02 16:11:50 +08:00
yanran200730
db077cb9d5 协同宣发 2022-09-02 16:11:29 +08:00
aixianling
8edddb8cda 增加手动同步库信息脚本 2022-09-02 15:36:44 +08:00
aixianling
f68fef4012 Merge remote-tracking branch 'origin/dev' into build 2022-09-02 15:34:39 +08:00
aixianling
5a287a627a 增加手动同步库信息脚本 2022-09-02 15:25:46 +08:00
liuye
0aa51096a3 企微配置 2022-09-02 14:16:20 +08:00
aixianling
37c6f38354 Merge remote-tracking branch 'origin/dev' into build 2022-09-02 09:20:59 +08:00
liuye
a863c70ea4 企微应用配置 2022-09-01 17:46:23 +08:00
aixianling
68b8c4f43d Merge remote-tracking branch 'origin/dev' into build 2022-09-01 16:06:13 +08:00
liuye
9f8f035b83 企微配置 2022-09-01 15:58:10 +08:00
liuye
71bebd8048 企微应用配置 2022-09-01 15:31:58 +08:00
yanran200730
4a75301322 协同宣发 2022-09-01 15:08:54 +08:00
yanran200730
ec24628e02 协同宣发 2022-09-01 13:47:14 +08:00
yanran200730
7f51812208 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-09-01 13:45:49 +08:00
yanran200730
9f5b6e10a3 协同宣发 2022-09-01 13:45:42 +08:00
shijingjing
7e918cbf4a 取绝对值 2022-09-01 11:10:02 +08:00
aixianling
422b809a08 BUG 31009 2022-09-01 10:30:07 +08:00
aixianling
d34a69d143 BUG 31009 2022-09-01 10:00:53 +08:00
shijingjing
3383deabd2 31011 2022-09-01 09:30:23 +08:00
aixianling
e8b49517e2 Merge remote-tracking branch 'origin/dev' into build 2022-09-01 09:02:27 +08:00
shijingjing
6c99807d85 size 2022-08-31 17:43:01 +08:00
aixianling
b1d31708da 修复接口代理问题 2022-08-31 17:29:17 +08:00
aixianling
6c44cf5a65 Merge remote-tracking branch 'origin/dev' into build
# Conflicts:
#	packages/bigscreen/designer/components/Add.vue
2022-08-31 16:32:37 +08:00
aixianling
06f02e3435 更换新组件 2022-08-31 16:15:25 +08:00