Commit Graph

1233 Commits

Author SHA1 Message Date
aixianling
945d538bad 大屏预览提升为组件 2022-08-29 08:58:52 +08:00
aixianling
80704876f0 网格员积分应用名称可随菜单变化 2022-08-26 15:13:18 +08:00
aixianling
5bc00ec520 Merge branch 'dev' into build
# Conflicts:
#	project/oms/apps/develop/AppDeployCustom/add.vue
2022-08-25 17:34:56 +08:00
aixianling
20b04d1789 同步整合文件名 2022-08-25 17:30:35 +08:00
aixianling
a75d96561c 系统设置数据结构适应,定制方案增加web端系统信息设置 2022-08-25 11:21:58 +08:00
yanran200730
53aa333967 bug 2022-08-25 09:48:47 +08:00
yanran200730
d2f611623b bug 2022-08-25 09:39:56 +08:00
yanran200730
8fa7e9c083 优化 2022-08-25 09:34:43 +08:00
yanran200730
ff973bf62f bug 2022-08-25 09:19:16 +08:00
yanran200730
c7718b024b Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-24 17:58:14 +08:00
yanran200730
7e52c337c3 优化 2022-08-24 17:56:10 +08:00
shijingjing
3c37b1b4ad css 2022-08-24 17:29:47 +08:00
shijingjing
0538342491 人员类别 2022-08-24 16:53:32 +08:00
aixianling
af298ca17e Merge branch 'dev' into build 2022-08-24 16:35:06 +08:00
yanran200730
883aca74e1 优化网格选择组件 2022-08-24 16:07:00 +08:00
aixianling
c112e7cde8 允许一级菜单为应用且可设置图标 2022-08-24 15:13:23 +08:00
yanran200730
64d2edd2cd bug 2022-08-24 15:11:43 +08:00
aixianling
0d7c0a9671 工作台入库 2022-08-24 11:46:01 +08:00
aixianling
7bbdaee6d3 Merge branch 'dev' into build
# Conflicts:
#	components/AiOkrTree/AiOkrTree.vue
#	project/dv/apps/AppGridDV.vue
2022-08-23 11:04:07 +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
shijingjing
8312807917 30953 2022-08-22 17:51:57 +08:00
yanran200730
b52c178051 bug 2022-08-22 17:06:11 +08:00
aixianling
e7fb16bd70 修复状态显示异常 2022-08-22 15:24:36 +08:00
aixianling
4bb6e3be77 Merge branch 'dev' into build 2022-08-22 15:23:01 +08:00
liuye
41810a8b80 宣发统计 2022-08-22 15:03:55 +08:00
aixianling
425cb93e8d 兼容判断 2022-08-22 14:20:06 +08:00
liuye
fbfa584d55 30710 2022-08-22 11:30:27 +08:00
aixianling
f18a7fd85c 调整目录结构使其能够被引用 2022-08-22 11:27:05 +08:00
aixianling
e67a8c4ac2 Merge branch 'dev' into build 2022-08-22 11:17:02 +08:00
aixianling
dbbd384221 调整目录结构使其能够被引用 2022-08-22 11:16:34 +08:00
liuye
2d834a57d5 宣发统计 2022-08-22 10:44:41 +08:00
aixianling
58ec778b3e Merge branch 'dev' into build 2022-08-19 13:55:42 +08:00
aixianling
a8041026a9 临时处理一下 2022-08-19 13:55:13 +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
aixianling
37df0942ff BUG 30868 2022-08-19 11:03:44 +08:00
yanran200730
8aae3b84a5 bug 2022-08-18 18:33:01 +08:00
yanran200730
238a6807ac Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-18 18:25:09 +08:00
yanran200730
49bd61c376 bug 2022-08-18 18:24:59 +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
5dac5a8829 Merge remote-tracking branch 'origin/dev' into dev 2022-08-18 17:28:04 +08:00
aixianling
35e612d35c 特制化,使标题跟随菜单目录变化 2022-08-18 17:27:50 +08:00
yanran200730
21fcd206db Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-18 17:14:18 +08:00
yanran200730
dd81c894e0 协同宣发 2022-08-18 17:14:11 +08:00
aixianling
bdc0f0861f BUG 30925 2022-08-18 16:10:11 +08:00
shijingjing
8fbdee3a22 分页和日期 2022-08-18 13:49:16 +08:00
shijingjing
583b210687 去掉echerts背景色 2022-08-18 12:21:45 +08:00