From e22c093ce2bc41e7e36b572096323c6649887747 Mon Sep 17 00:00:00 2001
From: qianlishi <1432731663@qq.com>
Date: Mon, 26 Jul 2021 10:18:48 +0800
Subject: [PATCH] update

---
 .../designer/widget/widgetFunnel.vue          |  2 -
 .../bigscreen/designer/widget/widgetHref.vue  | 69 ++++++++++--------
 .../bigscreen/designer/widget/widgetImage.vue |  6 --
 .../designer/widget/widgetLinechart.vue       |  1 -
 .../designer/widget/widgetMarquee.vue         | 73 +++++++++----------
 .../designer/widget/widgetPiechart.vue        |  1 -
 .../bigscreen/designer/widget/widgetTable.vue |  1 -
 .../bigscreen/designer/widget/widgetText.vue  | 17 ++---
 .../bigscreen/designer/widget/widgetVideo.vue | 45 ++++++------
 9 files changed, 103 insertions(+), 112 deletions(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetFunnel.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetFunnel.vue
index 3f08bdaa..aeea0e80 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetFunnel.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetFunnel.vue
@@ -37,10 +37,8 @@ export default {
             type: "funnel",
             left: "10%",
             top: 60,
-            // x2: 80,
             bottom: 60,
             width: "80%",
-            // height: {totalHeight} - y - y2,
             min: 0,
             max: 100,
             minSize: "0%",
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetHref.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetHref.vue
index 5c7a04a8..afa18304 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetHref.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetHref.vue
@@ -5,65 +5,74 @@
  * @Last Modified time: 2021-3-13 11:04:24
  !-->
 <template>
-  <a :href="styleColor.linkAdress" :style="styleColor" :target="styleColor.jumpMode">{{ styleColor.text }}</a>
+  <a
+    :href="styleColor.linkAdress"
+    :style="styleColor"
+    :target="styleColor.jumpMode"
+    >{{ styleColor.text }}</a
+  >
 </template>
 
 <script>
 export default {
-  name: 'WidgetHref',
+  name: "WidgetHref",
   components: {},
   props: {
     value: Object,
-    ispreview: Boolean,
+    ispreview: Boolean
   },
   data() {
     return {
-      options: {},
-    }
+      options: {}
+    };
   },
   computed: {
     transStyle() {
-      return this.objToOne(this.options)
+      return this.objToOne(this.options);
     },
     styleColor() {
       return {
-        position: this.ispreview ? 'absolute' : 'static',
-        color: this.transStyle.color || '#fff',
-        'font-weight': this.transStyle.fontWeight || '600',
-        text: this.transStyle.text || '超链接',
-        'font-size': this.transStyle.fontSize + 'px' || '12px',
-        'letter-spacing': this.transStyle.letterSpacing + 'em',
+        position: this.ispreview ? "absolute" : "static",
+        color: this.transStyle.color || "#fff",
+        "font-weight": this.transStyle.fontWeight || "600",
+        text: this.transStyle.text || "超链接",
+        "font-size": this.transStyle.fontSize + "px" || "12px",
+        "letter-spacing": this.transStyle.letterSpacing + "em",
         background: this.transStyle.background,
-        'text-align': this.transStyle.textAlign,
-        display: this.transStyle.hideLayer == undefined ? 'block' : this.transStyle.hideLayer ? 'none' : 'block',
-        width: this.transStyle.width + 'px',
-        height: this.transStyle.height + 'px',
-        left: this.transStyle.left + 'px',
-        top: this.transStyle.top + 'px',
-        right: this.transStyle.right + 'px',
-
+        "text-align": this.transStyle.textAlign,
+        display:
+          this.transStyle.hideLayer == undefined
+            ? "block"
+            : this.transStyle.hideLayer
+            ? "none"
+            : "block",
+        width: this.transStyle.width + "px",
+        height: this.transStyle.height + "px",
+        left: this.transStyle.left + "px",
+        top: this.transStyle.top + "px",
+        right: this.transStyle.right + "px",
         linkAdress: this.transStyle.linkAdress,
-        jumpMode: this.transStyle.jumpMode == 'other' ? '_blank' : '_self',
-      }
-    },
+        jumpMode: this.transStyle.jumpMode == "other" ? "_blank" : "_self"
+      };
+    }
   },
   watch: {
     value: {
       handler(val) {
-        this.options = val
+        this.options = val;
       },
-      deep: true,
-    },
+      deep: true
+    }
   },
   mounted() {
-    this.options = this.value
+    this.options = this.value;
   },
-  methods: {},
-}
+  methods: {}
+};
 </script>
 
 <style scoped lang="scss">
-a{
+a {
   width: 100%;
   height: 100%;
   overflow: hidden;
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetImage.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetImage.vue
index 0e8aa999..afbd2eab 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetImage.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetImage.vue
@@ -9,12 +9,6 @@
   </div>
 </template>
 <script>
-// http://pic.ik123.com/uploads/allimg/190813/12-1ZQ3095508.jpg
-// http://pic.ik123.com/uploads/allimg/190813/12-1ZQ3095500.jpg
-// http://pic.ik123.com/uploads/allimg/190813/12-1ZQ3095502.jpg
-// http://pic.ik123.com/uploads/allimg/190813/12-1ZQ3095503.jpg
-// http://pic.ik123.com/uploads/allimg/190813/12-1ZQ3095504.jpg
-// http://pic.ik123.com/uploads/allimg/190813/12-1ZQ3095506.jpg
 export default {
   name: "WidgetImage",
   components: {},
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue
index 313ddd5d..12ff88fd 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue
@@ -126,7 +126,6 @@ export default {
         fontWeight: optionsCollapse.subTextFontWeight,
         fontSize: optionsCollapse.subTextFontSize
       };
-
       this.options.title = title;
     },
     // X轴设置
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetMarquee.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetMarquee.vue
index 653f458d..7ba0eb76 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetMarquee.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetMarquee.vue
@@ -1,64 +1,65 @@
 <template>
   <div class="text" :style="styleColor">
-    <marquee behavior="" :direction="styleColor.direction">{{ styleColor.text }}</marquee>
+    <marquee behavior="" :direction="styleColor.direction">{{
+      styleColor.text
+    }}</marquee>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'WidgetMarquee',
+  name: "WidgetMarquee",
   components: {},
   props: {
     value: Object,
-    ispreview: Boolean,
+    ispreview: Boolean
   },
   data() {
     return {
-      options: {},
-    }
+      options: {}
+    };
   },
   computed: {
     transStyle() {
-      return this.objToOne(this.options)
+      return this.objToOne(this.options);
     },
     styleColor() {
       return {
-        position: this.ispreview ? 'absolute' : 'static',
+        position: this.ispreview ? "absolute" : "static",
         color: this.transStyle.color,
-        'font-weight': this.transStyle.fontWeight,
+        "font-weight": this.transStyle.fontWeight,
         text: this.transStyle.text,
-        'font-size': this.transStyle.fontSize + 'px',
-        'letter-spacing': this.transStyle.letterSpacing + 'em',
+        "font-size": this.transStyle.fontSize + "px",
+        "letter-spacing": this.transStyle.letterSpacing + "em",
         background: this.transStyle.background,
-        'text-align': this.transStyle.textAlign,
-        width: this.transStyle.width + 'px',
-        height: this.transStyle.height + 'px',
-        left: this.transStyle.left + 'px',
-        top: this.transStyle.top + 'px',
-        right: this.transStyle.right + 'px',
-
+        "text-align": this.transStyle.textAlign,
+        width: this.transStyle.width + "px",
+        height: this.transStyle.height + "px",
+        left: this.transStyle.left + "px",
+        top: this.transStyle.top + "px",
+        right: this.transStyle.right + "px",
         marqueeSet: this.transStyle.marqueeSet,
-        styleColor: this.transStyle.marqueeQuit,
-      }
+        styleColor: this.transStyle.marqueeQuit
+      };
     },
     isBehavior() {
-      return this.styleColor.marqueeSet ? 'start()' : 'stop()'
-    },
+      return this.styleColor.marqueeSet ? "start()" : "stop()";
+    }
   },
   watch: {
     value: {
       handler(val) {
-        this.options = val
-        this.optionsData = val.data
-        this.setOptionsData()
+        this.options = val;
+        this.optionsData = val.data;
+        this.setOptionsData();
       },
-      deep: true,
-    },
+      deep: true
+    }
   },
   mounted() {
-    this.options = this.value
-    this.optionsData = this.value.data
-    this.setOptionsData()
+    this.options = this.value;
+    this.optionsData = this.value.data;
+    this.setOptionsData();
   },
   methods: {
     // 数据解析
@@ -66,13 +67,9 @@ export default {
       const optionsData = this.optionsData; // 数据类型 静态 or 动态
       optionsData.dataType == "staticData"
         ? this.staticDataFn(optionsData.staticData)
-        : this.dynamicDataFn(
-        optionsData.dynamicData,
-        optionsData.refreshTime
-        );
-    },
-    staticDataFn(val) {
+        : this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime);
     },
+    staticDataFn(val) {},
     dynamicDataFn(val, refreshTime) {
       if (!val) return;
       if (this.ispreview) {
@@ -87,12 +84,12 @@ export default {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       data.then(res => {
-        this.styleColor.text = res[0].value
+        this.styleColor.text = res[0].value;
         this.$forceUpdate();
       });
     }
-  },
-}
+  }
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetPiechart.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetPiechart.vue
index 9e635060..aba4e5ed 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetPiechart.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetPiechart.vue
@@ -109,7 +109,6 @@ export default {
         fontWeight: optionsCollapse.subTextFontWeight,
         fontSize: optionsCollapse.subTextFontSize
       };
-
       this.options.title = title;
     },
     // 数值设定
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue
index e1bc35d9..7297f22d 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue
@@ -132,7 +132,6 @@ export default {
         : this.handlerDymaicData(tableData.dynamicData, tableData.refreshTime);
     },
     handlerStaticData(data) {
-      console.log(data);
       this.list = data;
     },
     handlerDymaicData(data, refreshTime) {
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetText.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetText.vue
index d5ff935e..d819cdfc 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetText.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetText.vue
@@ -48,16 +48,16 @@ export default {
     value: {
       handler(val) {
         this.options = val;
-        this.optionsData = val.data
-        this.setOptionsData()
+        this.optionsData = val.data;
+        this.setOptionsData();
       },
       deep: true
     }
   },
   mounted() {
     this.options = this.value;
-    this.optionsData = this.value.data
-    this.setOptionsData()
+    this.optionsData = this.value.data;
+    this.setOptionsData();
   },
   methods: {
     // 数据解析
@@ -65,12 +65,7 @@ export default {
       const optionsData = this.optionsData; // 数据类型 静态 or 动态
       optionsData.dataType == "staticData"
         ? this.staticDataFn(optionsData.staticData)
-        : this.dynamicDataFn(
-        optionsData.dynamicData,
-        optionsData.refreshTime
-        );
-    },
-    staticDataFn(val) {
+        : this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime);
     },
     dynamicDataFn(val, refreshTime) {
       if (!val) return;
@@ -86,7 +81,7 @@ export default {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       data.then(res => {
-        this.styleColor.text = res[0].value
+        this.styleColor.text = res[0].value;
         this.$forceUpdate();
       });
     }
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetVideo.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetVideo.vue
index d416eff2..b6569c25 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetVideo.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetVideo.vue
@@ -1,50 +1,51 @@
 <template>
-  <video :style="styleColor" :src="styleColor.videoAdress" controls="controls">您的浏览器不支持 video 标签。</video>
+  <video :style="styleColor" :src="styleColor.videoAdress" controls="controls">
+    您的浏览器不支持 video 标签。
+  </video>
 </template>
 
 <script>
-// https://www.w3school.com.cn//i/movie.ogg
 export default {
-  name: 'WidgetVideo',
+  name: "WidgetVideo",
   components: {},
   props: {
     value: Object,
-    ispreview: Boolean,
+    ispreview: Boolean
   },
   data() {
     return {
-      options: {},
-    }
+      options: {}
+    };
   },
   computed: {
     transStyle() {
-      return this.objToOne(this.options)
+      return this.objToOne(this.options);
     },
     styleColor() {
       return {
-        position: this.ispreview ? 'absolute' : 'static',
-        width: this.transStyle.width + 'px',
-        height: this.transStyle.height + 'px',
-        left: this.transStyle.left + 'px',
-        top: this.transStyle.top + 'px',
-        right: this.transStyle.right + 'px',
-        videoAdress: this.transStyle.videoAdress,
-      }
-    },
+        position: this.ispreview ? "absolute" : "static",
+        width: this.transStyle.width + "px",
+        height: this.transStyle.height + "px",
+        left: this.transStyle.left + "px",
+        top: this.transStyle.top + "px",
+        right: this.transStyle.right + "px",
+        videoAdress: this.transStyle.videoAdress
+      };
+    }
   },
   watch: {
     value: {
       handler(val) {
-        this.options = val
+        this.options = val;
       },
-      deep: true,
-    },
+      deep: true
+    }
   },
   mounted() {
-    this.options = this.value
+    this.options = this.value;
   },
-  methods: {},
-}
+  methods: {}
+};
 </script>
 
 <style scoped lang="scss">