Merge branch 'master' of https://gitee.com/anji-plus/report

report-ui/src/views/report/bigscreen/designer/tools.js

@@ -144,7 +144,6 @@ const widgetTools = [
           value: 'center'
         },
       ],
-
       // 数据
       data: [
         {
@@ -194,7 +193,7 @@ const widgetTools = [
           relactiveDomValue: 'dynamicData',
           chartType: 'widget-text',
           value: '',
-        },
+        }
       ],
 
       // 坐标
@@ -304,37 +303,66 @@ const widgetTools = [
           ],
           value: 'normal'
         },
-        {
+/*        {
-          type: 'el-select',
+          type: 'el-input-number',
-          label: '对齐方式',
+          label: '滚动速度',
-          name: 'textAlign',
+          name: 'marqueeQuit',
           required: false,
           placeholder: '',
+          value: '1',
+        }*/
+      ],
+      // 数据
+      data: [
+        {
+          type: 'el-radio-group',
+          label: '数据类型',
+          name: 'dataType',
+          require: false,
+          placeholder: '',
+          selectValue: true,
           selectOptions: [
-            {code: 'center', name: '居中'},
+            {
-            {code: 'left', name: '左对齐'},
+              code: 'staticData',
-            {code: 'right', name: '右对齐'},
+              name: '静态数据',
+            },
+            {
+              code: 'dynamicData',
+              name: '动态数据',
+            },
           ],
-          value: 'center'
+          value: 'staticData',
         },
         {
-          type: 'el-switch',
+          type: 'el-input-number',
-          label: '开启滚动',
+          label: '刷新时间(毫秒)',
-          name: 'marqueeSet',
+          name: 'refreshTime',
-          required: false,
+          relactiveDom: 'dataType',
-          placeholder: '',
+          relactiveDomValue: 'dynamicData',
-          value: true,
+          value: 5000
         },
         {
-          type: 'el-input-text',
+          type: 'el-button',
-          label: '滚动速度',
+          label: '静态数据',
-          name: 'marqueeQuit',
+          name: 'staticData',
           required: false,
-          placeholder: '',
+          placeholder: 'px',
+          relactiveDom: 'dataType',
+          relactiveDomValue: 'staticData',
+          value: '文本框',
         },
+        {
+          type: 'dycustComponents',
+          label: '',
+          name: 'dynamicData',
+          required: false,
+          placeholder: 'px',
+          relactiveDom: 'dataType',
+          relactiveDomValue: 'dynamicData',
+          chartType: 'widget-text',
+          value: '',
+        }
       ],
-      // 数据
-      data: [],
       // 坐标
       position: [
         {

report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPiePercentageChart.vue

@@ -474,9 +474,7 @@ export default {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       data.then(res => {
-        this.options.title.text = '{nums|' + res[0].value + '}{percent|%}'
+        this.options.title.text = '{nums|' + res[0].value + '}{percent|%}';
-        //this.$forceUpdate();
-        console.log(res[0].value)
       });
     }
   }

report-ui/src/views/report/bigscreen/designer/widget/widgetMarquee.vue

@@ -49,14 +49,49 @@ export default {
     value: {
       handler(val) {
         this.options = val
+        this.optionsData = val.data
+        this.setOptionsData()
       },
       deep: true,
     },
   },
   mounted() {
     this.options = this.value
+    this.optionsData = this.value.data
+    this.setOptionsData()
+  },
+  methods: {
+    // 数据解析
+    setOptionsData() {
+      const optionsData = this.optionsData; // 数据类型 静态 or 动态
+      optionsData.dataType == "staticData"
+        ? this.staticDataFn(optionsData.staticData)
+        : this.dynamicDataFn(
+        optionsData.dynamicData,
+        optionsData.refreshTime
+        );
+    },
+    staticDataFn(val) {
+    },
+    dynamicDataFn(val, refreshTime) {
+      if (!val) return;
+      if (this.ispreview) {
+        this.getEchartData(val);
+        this.flagInter = setInterval(() => {
+          this.getEchartData(val);
+        }, refreshTime);
+      } else {
+        this.getEchartData(val);
+      }
+    },
+    getEchartData(val) {
+      const data = this.queryEchartsData(val);
+      data.then(res => {
+        this.styleColor.text = res[0].value
+        this.$forceUpdate();
+      });
+    }
   },
-  methods: {},
 }
 </script>
 

report-ui/src/views/report/bigscreen/designer/widget/widgetText.vue

@@ -89,7 +89,7 @@ export default {
         this.styleColor.text = res[0].value
         this.$forceUpdate();
       });
-    },
+    }
   }
 };
 </script>