diff --git a/src/views/bigscreenDesigner/designer/components/dynamicForm.vue b/src/views/bigscreenDesigner/designer/components/dynamicForm.vue index a3c7204..f1278ae 100644 --- a/src/views/bigscreenDesigner/designer/components/dynamicForm.vue +++ b/src/views/bigscreenDesigner/designer/components/dynamicForm.vue @@ -513,7 +513,6 @@ export default { } } this.formData = Object.assign({}, this.formData); - console.log("🚀 ~ setDefaultValue ~ this.formData :", this.formData ) } }, // 是否显示 那种格式 diff --git a/src/views/bigscreenDesigner/designer/widget/div/widgetDtImage.vue b/src/views/bigscreenDesigner/designer/widget/div/widgetDtImage.vue index 3a83584..a271aa4 100644 --- a/src/views/bigscreenDesigner/designer/widget/div/widgetDtImage.vue +++ b/src/views/bigscreenDesigner/designer/widget/div/widgetDtImage.vue @@ -13,7 +13,8 @@ export default { components: {}, props: { value: Object, - ispreview: Boolean + ispreview: Boolean, + staticData: Object }, data() { return { @@ -64,7 +65,17 @@ export default { this.initData(); }, deep: true - } + }, + staticData: { + handler(newVal) { + if (newVal && Object.keys(newVal).length > 0) { + this.getEchartData(); + } + }, + deep: true, + immediate: true // 立即执行一次 + }, + }, created() { this.options = this.value; @@ -73,6 +84,7 @@ export default { this.options = this.value; this.optionsData = this.value.data; this.setPicValue(); + }, methods: { // vue hack 之强制刷新组件 @@ -98,6 +110,7 @@ export default { this.getEchartData(); } }, + dynamicDataFn(refreshTime) { if (this.ispreview) { this.flagInter = setInterval(() => { @@ -111,17 +124,20 @@ export default { const imageAdressOld =this.imageAdress; const imageAdressNew =this.getShowPic(); //this.imageAdress = this.getShowPic(); - this.imageAdressShow = this.isNotBlank(this.imageAdress); + // console.log("this.imageAdress",imageAdressOld, imageAdressNew,(imageAdressOld!==imageAdressNew) ) if(imageAdressOld!==imageAdressNew){ this.imageAdress = imageAdressNew; this.reload(); } + this.imageAdressShow = this.isNotBlank(this.imageAdress); + }, getShowPic() { const {textPic, slectedDataType} = this.transStyle; const key = this.staticData[slectedDataType] || textPic; const dataPic = this.value.setup.dynamicAddPicAdress; + console.log("🚀 ~ dataPic:", dataPic, this.staticData) // if(this.isBlank(key) || this.isBlankArray(dataPic)){ // return this.transStyle.imageAdress; // } diff --git a/src/views/bigscreenDesigner/designer/widget/widget.vue b/src/views/bigscreenDesigner/designer/widget/widget.vue index d815908..a7c2506 100644 --- a/src/views/bigscreenDesigner/designer/widget/widget.vue +++ b/src/views/bigscreenDesigner/designer/widget/widget.vue @@ -34,7 +34,7 @@ import WidgetFunnel from "./funnel/widgetFunnel.vue"; import WidgetGauge from "./percent/widgetGauge.vue"; import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRose"; import widgetTable from "./table/widgetTable.vue"; -import widgetRotateRanking from "./table/WidgetRotateRanking.vue"; +// import widgetRotateRanking from "./table/WidgetRotateRanking.vue"; import widgetLineMap from "./map/widgetLineMap.vue"; import widgetPiePercentageChart from "./percent/widgetPiePercentageChart"; import widgetAirBubbleMap from "./map/widgetAirBubbleMap"; diff --git a/src/views/bigscreenDesigner/viewer/index.vue b/src/views/bigscreenDesigner/viewer/index.vue index 1b149ea..186460e 100644 --- a/src/views/bigscreenDesigner/viewer/index.vue +++ b/src/views/bigscreenDesigner/viewer/index.vue @@ -10,6 +10,7 @@ v-model="widget.value" :index="index" :type="widget.type" + :value="widget.value" /> @@ -36,6 +37,7 @@ export default { }, mounted() { this.getData(); + }, methods: { ...mapMutations('dataSource', ['SET_STATIC_DATA','SET_REFRESHTIME']), @@ -63,6 +65,7 @@ export default { }; // 赋值到全局变量 this.setMasterData(data.dashboard); + data.dashboard.widgets.forEach((item, index) => { item.value.widgetId = item.value.setup.widgetId item.value.widgetCode = item.value.setup.widgetCode