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 |
|
liuye
|
b9964d64b0
|
fix
|
2022-06-28 09:15:10 +08:00 |
|
yanran200730
|
db8b9b82da
|
监控视频样式bug
|
2022-06-14 09:11:57 +08:00 |
|
aixianling
|
e91d1f73dc
|
Merge branch 'dev' into vite
# Conflicts:
# examples/App.vue
# examples/router/autoRoutes.js
# examples/utils/index.js
# package.json
# packages/wechat/AppProjectActivities/components/Event.vue
# project/dv/apps/AppHomesteadDV.vue
# vue.config.js
|
2022-05-10 20:06:15 +08:00 |
|
aixianling
|
036ee91533
|
目录代码整合
|
2022-05-10 20:02:37 +08:00 |
|