diff --git a/examples/entries.js b/examples/entries.js index 52683155..3d7290b4 100644 --- a/examples/entries.js +++ b/examples/entries.js @@ -2,7 +2,7 @@ const install = function(Vue) { if (install.installed) return Promise.resolve(); else { - let contexts = require.context('../project/shandong10086/apps', true, /(\/.+)\/App[^\/]+\.vue$/); + let contexts = require.context('../packages', true, /(\/.+)\/App[^\/]+\.vue$/); if (contexts) { contexts.keys().map((e) => { if (contexts(e).default) { diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue index d9afd889..72409299 100644 --- a/packages/bigscreen/designer/components/Layout.vue +++ b/packages/bigscreen/designer/components/Layout.vue @@ -461,7 +461,11 @@ return this.$message.error('请上传图片') } - this.images.push(this.form.images) + this.images = [ + ...this.images, + ...this.form.images + ] + this.form.images = [] this.isShowAddImg = false }, diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js index c152dbf6..14e6add3 100644 --- a/packages/bigscreen/designer/config.js +++ b/packages/bigscreen/designer/config.js @@ -620,7 +620,7 @@ const components = [ title: '', moniterId: '', monitorType: 'cmcc', - api: '/app/appzyvideoequipment/list', + api: '/app/appzyvideoequipment/list2', border: 'border2', sourceDataId: '', dataType: 'staticData', diff --git a/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue b/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue index 45e80022..31ff5d6b 100644 --- a/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue +++ b/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue @@ -1,7 +1,7 @@