From 77e78622460aa63574a138d3e94096ad68aaf55a Mon Sep 17 00:00:00 2001
From: qianbao <qianbaoqianbao>
Date: Wed, 7 Dec 2022 22:38:48 +0800
Subject: [PATCH] 1、添加环形图。 2、一些已知问题修复

---
 src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-active-ring-chart.js | 233 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-active-ring-chart.js     | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/bigscreenDesigner/designer/tools/main.js                                             |   2 +-
 src/views/bigscreenDesigner/designer/widget/percent/widgetActiveRingChart.vue                  | 155 -----------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue                      | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/bigscreenDesigner/designer/widget/temp.vue                                           |   2 +-
 src/views/bigscreenDesigner/designer/widget/widget.vue                                         |   2 +-
 7 files changed, 400 insertions(+), 391 deletions(-)
 delete mode 100644 src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-active-ring-chart.js
 create mode 100644 src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-active-ring-chart.js
 delete mode 100644 src/views/bigscreenDesigner/designer/widget/percent/widgetActiveRingChart.vue
 create mode 100644 src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue

diff --git a/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-active-ring-chart.js b/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-active-ring-chart.js
deleted file mode 100644
index 075c2b3..0000000
--- a/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-active-ring-chart.js
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * @Descripttion: 动态环图
- */
-export const widgetActiveRingChart=  {
-  code: 'widget-active-ring-chart',
-  type: 'percent',
-  tabName: '百分比',
-  label: '动态环图',
-  icon: 'iconicon_tubiao_bingtu',
-  options: {
-    // 配置
-    setup: [
-      {
-        type: 'el-input-text',
-        label: '图层名称',
-        name: 'layerName',
-        required: false,
-        placeholder: '',
-        value: '动态环图',
-      },
-      {
-        type: 'el-slider',
-        label: '环半径(%)',
-        name: 'radius',
-        required: false,
-        placeholder: '',
-        value: 50,
-      },
-      {
-        type: 'el-slider',
-        label: '环半径(动态)(%)',
-        name: 'activeRadius',
-        required: false,
-        placeholder: '',
-        value: 55,
-      },
-      {
-        type: 'el-input-number',
-        label: '环线条宽度',
-        name: 'lineWidth',
-        required: false,
-        placeholder: '',
-        value: 20,
-      },
-      {
-        type: 'el-input-number',
-        label: '切换间隔(ms)',
-        name: 'activeTimeGap',
-        required: false,
-        placeholder: '',
-        value: 3000,
-      },
-      {
-        type: 'el-input-number',
-        label: '小数位数',
-        name: 'digitalFlopToFixed',
-        required: false,
-        placeholder: '',
-        value: 0,
-      },
-      {
-        type: 'el-input-text',
-        label: '数字翻牌器单位',
-        name: 'digitalFlopUnit',
-        required: false,
-        placeholder: '单位',
-        value: '',
-      },
-      {
-        type: 'el-input-number',
-        label: '动画帧数',
-        name: 'animationFrame',
-        required: false,
-        placeholder: '',
-        value: 50,
-      },
-      {
-        type: 'el-switch',
-        label: '显示原始值',
-        name: 'showOriginValue',
-        required: false,
-        placeholder: '',
-        value: false,
-      },
-      {
-        type: 'vue-color',
-        label: '背景颜色',
-        name: 'background',
-        required: false,
-        placeholder: '',
-        value: ''
-      },
-      [{
-        name: '环颜色',
-        list: [
-          {
-            type: 'customColor',
-            label: '',
-            name: 'customColor',
-            required: false,
-            value: [{ color: '#1E90FF'},{ color: '#77FF00' },{ color: '#7700BB' },{ color: '#FF0088' },{ color: '#CC00CC' }],
-          },
-        ],
-      }],
-      [
-        {
-          name: '数字翻牌器样式',
-          list: [
-            {
-              type: 'vue-color',
-              label: '颜色',
-              name: 'fill',
-              required: false,
-              placeholder: '',
-              value: '#3de7c9'
-            },
-            {
-              type: 'el-input-number',
-              label: '字体大小',
-              name: 'fontSize',
-              required: false,
-              placeholder: '',
-              value: 30,
-            },
-            {
-              type: 'el-select',
-              label: '字体粗细',
-              name: 'fontWeight',
-              required: false,
-              placeholder: '',
-              selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '更粗'},
-                {code: 'lighter', name: '更细'},
-              ],
-              value: 'normal'
-            },
-          ],
-        }
-      ]
-
-    ],
-    // 数据
-    // 数据
-    data: [
-      {
-        type: 'el-radio-group',
-        label: '数据类型',
-        name: 'dataType',
-        require: false,
-        placeholder: '',
-        selectValue: true,
-        selectOptions: [
-          {
-            code: 'staticData',
-            name: '静态数据',
-          },
-          {
-            code: 'dynamicData',
-            name: '动态数据',
-          },
-        ],
-        value: 'staticData',
-      },
-      {
-        type: 'el-input-number',
-        label: '刷新时间(毫秒)',
-        name: 'refreshTime',
-        relactiveDom: 'dataType',
-        relactiveDomValue: 'dynamicData',
-        value: 5000
-      },
-      {
-        type: 'el-button',
-        label: '静态数据',
-        name: 'staticData',
-        required: false,
-        placeholder: '',
-        relactiveDom: 'dataType',
-        relactiveDomValue: 'staticData',
-        value: [{ value: 1048, name: "引擎" }, { value: 735, name: "访问" }, { value: 580, name: "邮件" }, { value: 484, name: "广告" }, { value: 300, name: "视频" }]
-      },
-      {
-        type: 'dycustComponents',
-        label: '',
-        name: 'dynamicData',
-        required: false,
-        placeholder: '',
-        relactiveDom: 'dataType',
-        relactiveDomValue: 'dynamicData',
-        chartType: 'widget-active-ring-chart',
-        dictKey: 'TEXT_PROPERTIES',
-        value: '',
-      },
-    ],
-    // 坐标
-    position: [
-      {
-        type: 'el-input-number',
-        label: '左边距',
-        name: 'left',
-        required: false,
-        placeholder: '',
-        value: 10,
-      },
-      {
-        type: 'el-input-number',
-        label: '上边距',
-        name: 'top',
-        required: false,
-        placeholder: '',
-        value: 10,
-      },
-      {
-        type: 'el-input-number',
-        label: '宽度',
-        name: 'width',
-        required: false,
-        placeholder: '该容器在1920px大屏中的宽度',
-        value: 300,
-      },
-      {
-        type: 'el-input-number',
-        label: '高度',
-        name: 'height',
-        required: false,
-        placeholder: '该容器在1080px大屏中的高度',
-        value: 300,
-      },
-    ],
-  }
-}
diff --git a/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-active-ring-chart.js b/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-active-ring-chart.js
new file mode 100644
index 0000000..b8e06f2
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-active-ring-chart.js
@@ -0,0 +1,233 @@
+/*
+ * @Descripttion: 动态环图
+ */
+export const widgetActiveRingChart=  {
+  code: 'widget-active-ring-chart',
+  type: 'pieChart',
+  tabName: '百分比',
+  label: '动态环图',
+  icon: 'iconicon_tubiao_bingtu',
+  options: {
+    // 配置
+    setup: [
+      {
+        type: 'el-input-text',
+        label: '图层名称',
+        name: 'layerName',
+        required: false,
+        placeholder: '',
+        value: '动态环图',
+      },
+      {
+        type: 'el-slider',
+        label: '环半径(%)',
+        name: 'radius',
+        required: false,
+        placeholder: '',
+        value: 75,
+      },
+      {
+        type: 'el-slider',
+        label: '环半径(动态)(%)',
+        name: 'activeRadius',
+        required: false,
+        placeholder: '',
+        value: 85,
+      },
+      {
+        type: 'el-input-number',
+        label: '环线条宽度',
+        name: 'lineWidth',
+        required: false,
+        placeholder: '',
+        value: 40,
+      },
+      {
+        type: 'el-input-number',
+        label: '切换间隔(ms)',
+        name: 'activeTimeGap',
+        required: false,
+        placeholder: '',
+        value: 3000,
+      },
+      {
+        type: 'el-input-number',
+        label: '小数位数',
+        name: 'digitalFlopToFixed',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-text',
+        label: '数字翻牌器单位',
+        name: 'digitalFlopUnit',
+        required: false,
+        placeholder: '单位',
+        value: '',
+      },
+      {
+        type: 'el-input-number',
+        label: '动画帧数',
+        name: 'animationFrame',
+        required: false,
+        placeholder: '',
+        value: 50,
+      },
+      {
+        type: 'el-switch',
+        label: '显示原始值',
+        name: 'showOriginValue',
+        required: false,
+        placeholder: '',
+        value: false,
+      },
+      {
+        type: 'vue-color',
+        label: '背景颜色',
+        name: 'background',
+        required: false,
+        placeholder: '',
+        value: ''
+      },
+      [{
+        name: '环颜色',
+        list: [
+          {
+            type: 'customColor',
+            label: '',
+            name: 'customColor',
+            required: false,
+            value: [{ color: '#0CD2E6' }, { color: '#00BFA5' }, { color: '#FFC722' }, { color: '#886EFF' }, { color: '#008DEC' }],
+          },
+        ],
+      }],
+      [
+        {
+          name: '数字翻牌器样式',
+          list: [
+            {
+              type: 'vue-color',
+              label: '颜色',
+              name: 'fill',
+              required: false,
+              placeholder: '',
+              value: '#3de7c9'
+            },
+            {
+              type: 'el-input-number',
+              label: '字体大小',
+              name: 'fontSize',
+              required: false,
+              placeholder: '',
+              value: 30,
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'fontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '更粗'},
+                {code: 'lighter', name: '更细'},
+              ],
+              value: 'normal'
+            },
+          ],
+        }
+      ]
+
+    ],
+    // 数据
+    // 数据
+    data: [
+      {
+        type: 'el-radio-group',
+        label: '数据类型',
+        name: 'dataType',
+        require: false,
+        placeholder: '',
+        selectValue: true,
+        selectOptions: [
+          {
+            code: 'staticData',
+            name: '静态数据',
+          },
+          {
+            code: 'dynamicData',
+            name: '动态数据',
+          },
+        ],
+        value: 'staticData',
+      },
+      {
+        type: 'el-input-number',
+        label: '刷新时间(毫秒)',
+        name: 'refreshTime',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'dynamicData',
+        value: 5000
+      },
+      {
+        type: 'el-button',
+        label: '静态数据',
+        name: 'staticData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'staticData',
+        value: [{ value: 1048, name: "引擎" }, { value: 735, name: "访问" }, { value: 580, name: "邮件" }, { value: 484, name: "广告" }, { value: 300, name: "视频" }]
+      },
+      {
+        type: 'dycustComponents',
+        label: '',
+        name: 'dynamicData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'dynamicData',
+        chartType: 'widget-active-ring-chart',
+        dictKey: 'PIE_PROPERTIES',
+        value: '',
+      },
+    ],
+    // 坐标
+    position: [
+      {
+        type: 'el-input-number',
+        label: '左边距',
+        name: 'left',
+        required: false,
+        placeholder: '',
+        value: 10,
+      },
+      {
+        type: 'el-input-number',
+        label: '上边距',
+        name: 'top',
+        required: false,
+        placeholder: '',
+        value: 10,
+      },
+      {
+        type: 'el-input-number',
+        label: '宽度',
+        name: 'width',
+        required: false,
+        placeholder: '该容器在1920px大屏中的宽度',
+        value: 300,
+      },
+      {
+        type: 'el-input-number',
+        label: '高度',
+        name: 'height',
+        required: false,
+        placeholder: '该容器在1080px大屏中的高度',
+        value: 300,
+      },
+    ],
+  }
+}
diff --git a/src/views/bigscreenDesigner/designer/tools/main.js b/src/views/bigscreenDesigner/designer/tools/main.js
index 1b06b2a..1ba0daf 100644
--- a/src/views/bigscreenDesigner/designer/tools/main.js
+++ b/src/views/bigscreenDesigner/designer/tools/main.js
@@ -46,7 +46,7 @@ import { widgetProgress } from "./configure/percentCharts/widget-progress";
 import {widgetWaterLevelPond} from "./configure/texts/widget-water-level-pond";
 import {widgetDigitalFlop} from "./configure/texts/widget-digital-flop";
 import {widgetScrollRankingBoard} from "./configure/texts/widget-scroll-ranking-board";
-import {widgetActiveRingChart} from "./configure/percentCharts/widget-active-ring-chart";
+import {widgetActiveRingChart} from "./configure/pieCharts/widget-active-ring-chart";
 
 
 export const widgetTool = [
diff --git a/src/views/bigscreenDesigner/designer/widget/percent/widgetActiveRingChart.vue b/src/views/bigscreenDesigner/designer/widget/percent/widgetActiveRingChart.vue
deleted file mode 100644
index e47528a..0000000
--- a/src/views/bigscreenDesigner/designer/widget/percent/widgetActiveRingChart.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<!--
-动态环图
--->
-<template>
-<!--  <div id="widget-active-ring-chart" :style="styleObj">-->
-    <dv-active-ring-chart :config="options" :style="styleObj"/>
-<!--  </div>-->
-</template>
-<script>
-import Vue from "vue";
-import activeRingChart from "@jiaminghi/data-view/lib/components/activeRingChart";
-Vue.use(activeRingChart)
-export default {
-  name: "WidgetActiveRingChart",
-  props: {
-    value: Object,
-    ispreview: Boolean,
-  },
-  data() {
-    return {
-      //返回图标数据
-      options: {
-        radius:'50%',//环半径
-        activeRadius:'55%',//环半径（动态）
-        data:[],//环数据
-        lineWidth:20,//环数据
-        activeTimeGap:3000,//切换间隔(ms)
-        color:[],//环颜色
-        digitalFlopStyle: {
-            fontSize: 30,
-            fill: '#3de7c9'
-        },//数字翻牌器样式
-        digitalFlopToFixed	:0,//数字翻牌器小数位数
-        digitalFlopUnit	:'',//数字翻牌器单位
-        animationFrame	:50,//动效帧数
-        showOriginValue	:false//显示原始值
-      },
-      optionsStyle: {}, // 样式
-      optionsData: {}, // 数据
-      optionsCollapse: {}, // 图标属性
-      optionsSetup: {}
-    };
-  },
-  computed: {
-    styleObj() {
-      return {
-        position: this.ispreview ? "absolute" : "static",
-        width: this.optionsStyle.width + "px",
-        height: this.optionsStyle.height + "px",
-        left: this.optionsStyle.left + "px",
-        top: this.optionsStyle.top + "px",
-        background: this.optionsSetup.background
-      };
-    },
-  },
-  watch: {
-    value: {
-      handler(val) {
-        this.optionsStyle = val.position;
-        this.optionsData = val.data;
-        this.optionsSetup = val.setup;
-        this.editorOptions();
-      },
-      deep: true
-    }
-  },
-  created() {
-    this.optionsStyle = this.value.position;
-    this.optionsData = this.value.data;
-    this.optionsSetup = this.value.setup;
-    this.editorOptions();
-  },
-  methods: {
-    // 修改图标options属性
-    editorOptions() {
-      //数据修改
-      this.setOptionsData();
-      //环颜色修改
-      this.setOptionsColor();
-      //数字翻牌器样式
-      this.setFontStyle();
-      //基础数据修改
-      this.setOptionsConfig();
-    },
-    // 颜色修改
-    setOptionsColor() {
-      const optionsSetup = this.optionsSetup;
-      const customColor = optionsSetup.customColor;
-      if (!customColor) return;
-      const arrColor = [];
-      for (let i = 0; i < customColor.length; i++) {
-        arrColor.push(customColor[i].color);
-      }
-      this.options.color = arrColor;
-    },
-    //字体修改
-    setFontStyle() {
-      const optionsSetup = this.optionsSetup;
-      const fontStyle = {};
-      fontStyle.fill=optionsSetup.fill;
-      fontStyle.fontSize=optionsSetup.fontSize;
-      fontStyle.fontWeight=optionsSetup.fontWeight;
-      this.options.digitalFlopToFixed = fontStyle;
-    },
-    // 配置修改
-    setOptionsConfig() {
-      const optionsSetup = this.optionsSetup;
-      this.options.radius = optionsSetup.radius+"%";
-      this.options.activeRadius = optionsSetup.activeRadius+"%";
-      this.options.lineWidth = optionsSetup.lineWidth;
-      this.options.activeTimeGap = optionsSetup.activeTimeGap;
-      this.options.digitalFlopToFixed = optionsSetup.digitalFlopToFixed;
-      this.options.digitalFlopUnit = optionsSetup.digitalFlopUnit;
-      this.options.animationFrame = optionsSetup.animationFrame;
-      this.options.showOriginValue = optionsSetup.showOriginValue;
-      //改变options
-      this.options={...this.options};
-    },
-    //数据类型
-    setOptionsData() {
-      const optionsData = this.optionsData; // 数据类型 静态 or 动态
-      optionsData.dataType == "staticData"
-        ? this.staticDataFn(optionsData.staticData)
-        : this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime);
-    },
-    staticDataFn(val) {
-      // console.log("设置静态数据",this.options)
-      const staticData = typeof val == "string" ? JSON.parse(val) : val;
-      this.options.data=staticData;
-    },
-    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.renderingFn(res);
-      });
-    },
-    renderingFn(val) {
-      this.options.data=val;
-    }
-
-  }
-};
-
-</script>
diff --git a/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue b/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue
new file mode 100644
index 0000000..837f6c3
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue
@@ -0,0 +1,164 @@
+<!--
+动态环图
+-->
+<template>
+<!--  <div id="widget-active-ring-chart" :style="styleObj">-->
+    <dv-active-ring-chart :config="options" :style="styleObj"/>
+<!--  </div>-->
+</template>
+<script>
+import Vue from "vue";
+import activeRingChart from "@jiaminghi/data-view/lib/components/activeRingChart";
+Vue.use(activeRingChart)
+export default {
+  name: "WidgetActiveRingChart",
+  props: {
+    value: Object,
+    ispreview: Boolean,
+  },
+  data() {
+    return {
+      //返回图标数据
+      options: {
+        radius:'75%',//环半径
+        activeRadius:'85%',//环半径（动态）
+        data:[],//环数据
+        lineWidth:40,//环数据
+        activeTimeGap:3000,//切换间隔(ms)
+        color:[],//环颜色
+        digitalFlopStyle: {
+            fontSize: 30,
+            fill: '#3de7c9'
+        },//数字翻牌器样式
+        digitalFlopToFixed	:0,//数字翻牌器小数位数
+        digitalFlopUnit	:'',//数字翻牌器单位
+        animationFrame	:50,//动效帧数
+        showOriginValue	:false//显示原始值
+      },
+      optionsStyle: {}, // 样式
+      optionsData: {}, // 数据
+      optionsCollapse: {}, // 图标属性
+      optionsSetup: {}
+    };
+  },
+  computed: {
+    styleObj() {
+      const style ={
+        position: this.ispreview ? "absolute" : "static",
+        width: this.optionsStyle.width + "px",
+        height: this.optionsStyle.height + "px",
+        left: this.optionsStyle.left + "px",
+        top: this.optionsStyle.top + "px",
+        background: this.optionsSetup.background
+      };
+      return style;
+    },
+  },
+  watch: {
+    value: {
+      handler(val) {
+        this.optionsStyle = val.position;
+        this.optionsData = val.data;
+        this.optionsSetup = val.setup;
+        this.editorOptions();
+      },
+      deep: true
+    }
+  },
+  created() {
+    this.optionsStyle = this.value.position;
+    this.optionsData = this.value.data;
+    this.optionsSetup = this.value.setup;
+    this.editorOptions();
+  },
+  methods: {
+    // 修改图标options属性
+    editorOptions() {
+      //数据修改
+      this.setOptionsData();
+      //环颜色修改
+      this.setOptionsColor();
+      //数字翻牌器样式
+      this.setFontStyle();
+      //基础数据修改
+      this.setOptionsConfig();
+    },
+    // 颜色修改
+    setOptionsColor() {
+      const optionsSetup = this.optionsSetup;
+      const customColor = optionsSetup.customColor;
+      if (!customColor) return;
+      const arrColor = [];
+      for (let i = 0; i < customColor.length; i++) {
+        arrColor.push(customColor[i].color);
+      }
+      this.options.color = arrColor;
+    },
+    //字体修改
+    setFontStyle() {
+      const optionsSetup = this.optionsSetup;
+      const fontStyle = {};
+      fontStyle.fill=optionsSetup.fill;
+      fontStyle.fontSize=optionsSetup.fontSize;
+      fontStyle.fontWeight=optionsSetup.fontWeight;
+      this.options.digitalFlopStyle = fontStyle;
+    },
+    // 配置修改
+    setOptionsConfig() {
+      const optionsSetup = this.optionsSetup;
+      this.options.radius = optionsSetup.radius+"%";
+      this.options.activeRadius = optionsSetup.activeRadius+"%";
+      this.options.lineWidth = optionsSetup.lineWidth;
+      this.options.activeTimeGap = optionsSetup.activeTimeGap;
+      this.options.digitalFlopToFixed = optionsSetup.digitalFlopToFixed;
+      this.options.digitalFlopUnit = optionsSetup.digitalFlopUnit;
+      this.options.animationFrame = optionsSetup.animationFrame;
+      this.options.showOriginValue = optionsSetup.showOriginValue;
+      //改变options
+      // console.log("配置修改：",this.styleObj);
+      this.options={...this.options};
+    },
+    //数据类型
+    setOptionsData() {
+      const optionsData = this.optionsData; // 数据类型 静态 or 动态
+      optionsData.dataType == "staticData"
+        ? this.staticDataFn(optionsData.staticData)
+        : this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime);
+    },
+    staticDataFn(val) {
+      // console.log("设置静态数据",this.options)
+      const staticData = typeof val == "string" ? JSON.parse(val) : val;
+      this.options.data=staticData;
+    },
+    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.renderingFn(res);
+      });
+    },
+    renderingFn(val) {
+      this.options.data=val;
+    }
+
+  }
+};
+
+</script>
+<style scoped lang="scss">
+.echarts {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+</style>
diff --git a/src/views/bigscreenDesigner/designer/widget/temp.vue b/src/views/bigscreenDesigner/designer/widget/temp.vue
index 48aab90..8748226 100644
--- a/src/views/bigscreenDesigner/designer/widget/temp.vue
+++ b/src/views/bigscreenDesigner/designer/widget/temp.vue
@@ -50,7 +50,7 @@ import widgetCapsuleChart from "./bar/widgetCapsuleChart";
 import widgetWaterLevelPond from "./text/widgetWaterLevelPond";
 import widgetDigitalFlop from "./text/widgetDigitalFlop";
 import widgetScrollRankingBoard from "./text/widgetScrollRankingBoard";
-import widgetActiveRingChart from "./percent/widgetActiveRingChart";
+import widgetActiveRingChart from "./pie/widgetActiveRingChart";
 
 
 export default {
diff --git a/src/views/bigscreenDesigner/designer/widget/widget.vue b/src/views/bigscreenDesigner/designer/widget/widget.vue
index 61394fe..20c4518 100644
--- a/src/views/bigscreenDesigner/designer/widget/widget.vue
+++ b/src/views/bigscreenDesigner/designer/widget/widget.vue
@@ -55,7 +55,7 @@ import widgetProgress from "./percent/widgetProgress";
 import widgetWaterLevelPond from "./text/widgetWaterLevelPond";
 import widgetDigitalFlop from "./text/widgetDigitalFlop";
 import widgetScrollRankingBoard from "./text/widgetScrollRankingBoard";
-import widgetActiveRingChart from "./percent/widgetActiveRingChart";
+import widgetActiveRingChart from "./pie/widgetActiveRingChart";
 export default {
   name: "Widget",
   components: {
--
libgit2 0.22.2