Commit Graph

123 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
f239508b87 BUG 30358 2022-06-28 11:19:02 +08:00
liuye
b9964d64b0 fix 2022-06-28 09:15:10 +08:00
aixianling
318b7d7748 BUG 30199 2022-06-15 09:48:53 +08:00
aixianling
b35314bf83 优化开发展示 2022-06-13 10:46:55 +08:00
aixianling
6d338b8324 BUG 30066 2022-06-08 19:20:02 +08:00
aixianling
0b89f4c0a1 BUG 30044 2022-06-07 17:46:19 +08:00
aixianling
3a39248f9c BUG 29992 2022-06-06 11:36:12 +08:00
aixianling
a09048af63 BUG 29970 2022-05-31 16:51:23 +08:00
aixianling
c17018ae9d BUG 29777 2022-05-30 15:07:25 +08:00
aixianling
6835f1da50 BUG 29587 2022-05-12 18:26:57 +08:00
aixianling
2004368c90 BUG 29594 2022-05-12 18:14:24 +08:00
aixianling
e8c8c1cba6 BUG 29560 2022-05-10 09:56:08 +08:00
aixianling
92890111ee BUG 29560 2022-05-10 09:36:35 +08:00
aixianling
9b35506181 Merge branch 'dev' into vite 2022-05-10 09:21:34 +08:00
yanran200730
3dd57db73b Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-05-09 16:07:17 +08:00
yanran200730
a2925da21b 网格bug 2022-05-09 16:07:07 +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
aixianling
ae24b4d6b4 BUG 29559 2022-05-09 14:32:42 +08:00
aixianling
70557adefd 地图标绘调整 2022-05-07 19:31:07 +08:00
aixianling
7894fb68f8 Merge remote-tracking branch 'origin/dev' into dev 2022-05-07 18:14:56 +08:00
aixianling
409fcd6f44 标绘重新调整 2022-05-07 18:14:37 +08:00
yanran200730
61fed1f99f bug 2022-05-07 15:58:00 +08:00
yanran200730
32aae8fe4f 29536 2022-05-07 09:17:23 +08:00
yanran200730
74e34e52e8 2 2022-05-06 20:10:09 +08:00
yanran200730
4b9bd8ffa8 bug 2022-05-06 19:55:29 +08:00
yanran200730
018b926c6c bug 2022-05-06 19:54:02 +08:00
yanran200730
1355ef7509 29511 2022-05-06 19:20:36 +08:00
yanran200730
a076c7b331 29513 2022-05-06 19:08:34 +08:00
yanran200730
195c6e3aa6 29512 2022-05-06 19:06:42 +08:00
yanran200730
046b1d0c5a bug 2022-05-06 18:54:19 +08:00
yanran200730
b6a686a021 bug 2022-05-06 18:53:49 +08:00
yanran200730
bc8cc63d17 bug 2022-05-06 18:47:16 +08:00
yanran200730
db406eb8fa 29519 2022-05-06 17:49:34 +08:00
yanran200730
c1010119aa 29520 2022-05-06 17:47:43 +08:00
yanran200730
a0cc85027c 29522 2022-05-06 17:36:13 +08:00
aixianling
55e3ab0612 BUG 29505 2022-05-05 18:22:27 +08:00
aixianling
bd2b066e9a BUG 29508 2022-05-05 16:45:19 +08:00
aixianling
7d99c2fb5f BUG 29505 2022-05-05 16:25:17 +08:00
aixianling
6d3984654c BUG 29503 2022-05-05 16:21:13 +08:00
aixianling
64202161dd BUG 29507 2022-05-05 16:02:58 +08:00
aixianling
f38eff6564 BUG 29501 2022-05-05 15:26:44 +08:00
aixianling
8744f115cf Merge branch 'dev' into vite
# Conflicts:
#	packages/IntelligentSecurity/AppISManage/AppISManage.vue
#	vue.config.js
2022-04-28 18:42:05 +08:00
aixianling
4cb734cbe0 网格管理调整完毕 2022-04-28 18:39:32 +08:00
aixianling
38f3ecc288 saas研发配置及网格调整 2022-04-28 16:25:30 +08:00
aixianling
97759ee9d2 调整一下名字 2022-04-28 14:30:20 +08:00
aixianling
0a815cbb35 调整一下名字 2022-04-28 11:49:23 +08:00
aixianling
4f0178c627 web端产品库 vite版本 2022-04-27 18:18:57 +08:00
aixianling
506e4d5dac 区分下应用 2022-04-18 17:57:22 +08:00
yanran200730
a6dafbff38 28368 2022-03-22 14:37:11 +08:00