Commit Graph

15 Commits

Author SHA1 Message Date
aixianling
da8e8f0d65 Merge branch 'dev' into vite
# Conflicts:
#	examples/main.js
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/AppDesigner.vue
#	packages/bigscreen/designer/components/Add.vue
#	packages/bigscreen/designer/components/Layout.vue
#	packages/bigscreen/designer/components/List.vue
#	packages/bigscreen/designer/components/SourceData.vue
#	packages/bigscreen/designer/components/form/DataConfig.vue
#	packages/bigscreen/designer/config.js
#	packages/bigscreen/viewer/AppGigscreenViewer.vue
#	packages/conv/creditScore/scoreManage/scoreChange.vue
#	packages/index.js
#	project/dv/apps/AppGridDV.vue
#	project/dvui/components/AiMonitor/dhVideo.vue
#	project/dvui/components/AiSwiper.vue
#	project/dvui/layout/AiDvBackground.vue
#	project/dvui/layout/AiDvSummary/AiDvSummary.vue
#	project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
#	project/dvui/package.json
#	public/index.html
#	vue.config.js
2022-07-07 09:01:40 +08:00
aixianling
361792c48d 集中升级 2022-06-28 15:37:13 +08:00
aixianling
d51918b713 升级大屏组件 2022-06-28 14:25:12 +08:00
liuye
6896dfd197 fix 2022-06-28 09:14:39 +08:00
yanran200730
1f7e2b4d84 党建大屏 2022-05-13 14:55:13 +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
aixianling
2f79210970 Merge branch 'dev' into vite
# Conflicts:
#	package.json
#	packages/bigscreen/designer/AppDesigner.vue
#	packages/bigscreen/designer/components/Add.vue
#	packages/bigscreen/designer/components/Layout.vue
#	packages/bigscreen/designer/components/RenderElement.vue
#	packages/bigscreen/viewer/AppGigscreenViewer.vue
#	project/dvui/layout/AiDvPanel/AiDvPanel.vue
#	project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
2022-05-09 14:36:16 +08:00
yanran200730
39f6cb1ff2 党建大屏 2022-05-06 16:26:11 +08:00
yanran200730
a0c2bf8f67 党建大屏 2022-05-05 18:00:21 +08:00
aixianling
4f0178c627 web端产品库 vite版本 2022-04-27 18:18:57 +08:00
yanran200730
a184ca666e 需求变更 2022-04-13 18:57:54 +08:00
yanran200730
49a2d392ad bug 2022-03-31 16:03:46 +08:00
aixianling
cc87206dbc 迁移大屏UI库和应用 2022-03-25 11:09:26 +08:00