qianlishi 4 年之前
父节点
当前提交
922feca18d

+ 26 - 3
report-ui/src/assets/iconfont/demo_index.html

@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe625;</span>
+                <div class="name">表格</div>
+                <div class="code-name">&amp;#xe625;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe646;</span>
                 <div class="name">个性装扮</div>
@@ -684,9 +690,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1624957634973') format('woff2'),
-       url('iconfont.woff?t=1624957634973') format('woff'),
-       url('iconfont.ttf?t=1624957634973') format('truetype');
+  src: url('iconfont.woff2?t=1625020835610') format('woff2'),
+       url('iconfont.woff?t=1625020835610') format('woff'),
+       url('iconfont.ttf?t=1625020835610') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -712,6 +718,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont iconbiaoge"></span>
+            <div class="name">
+              表格
+            </div>
+            <div class="code-name">.iconbiaoge
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icongexingzhuangban"></span>
             <div class="name">
@@ -1657,6 +1672,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconbiaoge"></use>
+                </svg>
+                <div class="name">表格</div>
+                <div class="code-name">#iconbiaoge</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icongexingzhuangban"></use>

+ 7 - 3
report-ui/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1513211 */
-  src: url('iconfont.woff2?t=1624957634973') format('woff2'),
-       url('iconfont.woff?t=1624957634973') format('woff'),
-       url('iconfont.ttf?t=1624957634973') format('truetype');
+  src: url('iconfont.woff2?t=1625020835610') format('woff2'),
+       url('iconfont.woff?t=1625020835610') format('woff'),
+       url('iconfont.ttf?t=1625020835610') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconbiaoge:before {
+  content: "\e625";
+}
+
 .icongexingzhuangban:before {
   content: "\e646";
 }

文件差异内容过多而无法显示
+ 0 - 0
report-ui/src/assets/iconfont/iconfont.js


+ 7 - 0
report-ui/src/assets/iconfont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "21338828",
+      "name": "表格",
+      "font_class": "biaoge",
+      "unicode": "e625",
+      "unicode_decimal": 58917
+    },
     {
       "icon_id": "13087633",
       "name": "个性装扮",

二进制
report-ui/src/assets/iconfont/iconfont.ttf


二进制
report-ui/src/assets/iconfont/iconfont.woff


二进制
report-ui/src/assets/iconfont/iconfont.woff2


+ 64 - 12
report-ui/src/views/report/bigscreen/designer/tools.js

@@ -848,12 +848,17 @@ const widgetTools = [
       ],
     },
   },
-  // {
-  //   code: 'widget-table',
-  //   type: 'html',
-  //   label: '表格',
-  //   icon: 'table',
-  // },
+  {
+    code: 'widget-table',
+    type: 'html',
+    label: '表格',
+    icon: 'iconbiaoge',
+    options: {
+      setup: [],
+      data: [],
+      position: []
+    }
+  },
   {
     code: 'widget-iframe',
     type: 'html',
@@ -4559,12 +4564,59 @@ const widgetTools = [
       ],
     },
   },
-  // {
-  //   code: 'widget-china-map',
-  //   type: 'chart',
-  //   label: '中国地图',
-  //   icon: 'chinaMapChart',
-  // },
+  {
+    code: 'widget-map',
+    type: 'chart',
+    label: '中国地图',
+    icon: 'chinaMapChart',
+    options: {
+      setup: [
+        {
+          type: 'el-input-text',
+          label: '图层名称',
+          name: 'layerName',
+          required: false,
+          placeholder: '',
+          value: '迁徙图',
+        },
+      ],
+      data: [],
+      position: [
+        {
+          type: 'el-input-number',
+          label: '左边距',
+          name: 'left',
+          required: false,
+          placeholder: 'px',
+          value: 0,
+        },
+        {
+          type: 'el-input-number',
+          label: '上边距',
+          name: 'top',
+          required: false,
+          placeholder: 'px',
+          value: 0,
+        },
+        {
+          type: 'el-input-number',
+          label: '宽度',
+          name: 'width',
+          required: false,
+          placeholder: '该容器在1920px大屏中的宽度',
+          value: 600,
+        },
+        {
+          type: 'el-input-number',
+          label: '高度',
+          name: 'height',
+          required: false,
+          placeholder: '该容器在1080px大屏中的高度',
+          value: 400,
+        },
+      ]
+    }
+  },
   {
     code: 'WidgetPieNightingaleRoseArea',
     type: 'chart',

+ 26 - 24
report-ui/src/views/report/bigscreen/designer/widget/temp.vue

@@ -11,25 +11,26 @@
 </template>
 
 <script>
-import widgetHref from './widgetHref.vue'
-import widgetText from './widgetText.vue'
-import WidgetMarquee from './widgetMarquee.vue'
-import widgetTime from './widgetTime.vue'
-import widgetImage from './widgetImage.vue'
-import widgetSlider from './widgetSlider.vue'
-import widgetVideo from './widgetVideo.vue'
-import WidgetIframe from './widgetIframe.vue'
-import widgetBarchart from './widgetBarchart.vue'
-import widgetLinechart from './widgetLinechart.vue'
-import widgetBarlinechart from './widgetBarlinechart'
+import widgetHref from "./widgetHref.vue";
+import widgetText from "./widgetText.vue";
+import WidgetMarquee from "./widgetMarquee.vue";
+import widgetTime from "./widgetTime.vue";
+import widgetImage from "./widgetImage.vue";
+import widgetSlider from "./widgetSlider.vue";
+import widgetVideo from "./widgetVideo.vue";
+import WidgetIframe from "./widgetIframe.vue";
+import widgetBarchart from "./widgetBarchart.vue";
+import widgetLinechart from "./widgetLinechart.vue";
+import widgetBarlinechart from "./widgetBarlinechart";
 import widgetGradientColorBarchart from "./bar/widgetGradientColorBarchart.vue";
-import WidgetPiechart from './widgetPiechart.vue'
-import WidgetHollowPiechart from './widgetHollowPiechart.vue'
-import WidgetFunnel from './widgetFunnel.vue'
-import WidgetGauge from './widgetGauge.vue'
+import WidgetPiechart from "./widgetPiechart.vue";
+import WidgetHollowPiechart from "./widgetHollowPiechart.vue";
+import WidgetFunnel from "./widgetFunnel.vue";
+import WidgetGauge from "./widgetGauge.vue";
 import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRoseArea";
+import widgetTable from "./widgetTable.vue";
 export default {
-  name: 'WidgetTemp',
+  name: "WidgetTemp",
   components: {
     widgetHref,
     widgetText,
@@ -47,25 +48,26 @@ export default {
     WidgetHollowPiechart,
     WidgetFunnel,
     WidgetGauge,
-    WidgetPieNightingaleRoseArea
+    WidgetPieNightingaleRoseArea,
+    widgetTable
   },
   model: {
-    prop: 'value',
-    event: 'input',
+    prop: "value",
+    event: "input"
   },
   props: {
     type: String,
     value: {
       type: [Object],
-      default: () => {},
-    },
+      default: () => {}
+    }
   },
   data() {
-    return {}
+    return {};
   },
   mounted() {},
-  methods: {},
-}
+  methods: {}
+};
 </script>
 
 <style scoped lang="scss"></style>

+ 6 - 3
report-ui/src/views/report/bigscreen/designer/widget/widget.vue

@@ -37,6 +37,8 @@ import WidgetHollowPiechart from "./widgetHollowPiechart.vue";
 import WidgetFunnel from "./widgetFunnel.vue";
 import WidgetGauge from "./widgetGauge.vue";
 import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRoseArea";
+import widgetTable from "./widgetTable.vue";
+import widgetMap from "./widgetMap.vue";
 export default {
   name: "Widget",
   components: {
@@ -56,7 +58,9 @@ export default {
     WidgetHollowPiechart,
     WidgetFunnel,
     WidgetGauge,
-    WidgetPieNightingaleRoseArea
+    WidgetPieNightingaleRoseArea,
+    widgetTable,
+    widgetMap
   },
   model: {
     prop: "value",
@@ -101,8 +105,7 @@ export default {
       return this.value.position.zIndex || 1;
     }
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     handleFocus({ index, left, top, width, height }) {},
     handleBlur({ index, left, top, width, height }) {

+ 468 - 0
report-ui/src/views/report/bigscreen/designer/widget/widgetMap.vue

@@ -0,0 +1,468 @@
+<template>
+  <div :style="styleObj">
+    <v-chart :options="options" autoresize />
+  </div>
+</template>
+<script>
+import "../../../../../../node_modules/echarts/map/js/china.js";
+var GZData = [
+  [
+    {
+      name: "广州"
+    },
+    {
+      name: "福州",
+      value: 95
+    }
+  ],
+  [
+    {
+      name: "广州"
+    },
+    {
+      name: "太原",
+      value: 90
+    }
+  ],
+  [
+    {
+      name: "广州"
+    },
+    {
+      name: "长春",
+      value: 80
+    }
+  ],
+  [
+    {
+      name: "广州"
+    },
+    {
+      name: "重庆",
+      value: 70
+    }
+  ],
+  [
+    {
+      name: "广州"
+    },
+    {
+      name: "西安",
+      value: 60
+    }
+  ],
+  [
+    {
+      name: "广州"
+    },
+    {
+      name: "成都",
+      value: 50
+    }
+  ],
+  [
+    {
+      name: "广州"
+    },
+    {
+      name: "常州",
+      value: 40
+    }
+  ],
+  [
+    {
+      name: "广州"
+    },
+    {
+      name: "北京",
+      value: 30
+    }
+  ],
+  [
+    {
+      name: "广州"
+    },
+    {
+      name: "北海",
+      value: 20
+    }
+  ],
+  [
+    {
+      name: "广州"
+    },
+    {
+      name: "海口",
+      value: 10
+    }
+  ]
+];
+var geoCoordMap = {
+  上海: [121.4648, 31.2891],
+  东莞: [113.8953, 22.901],
+  东营: [118.7073, 37.5513],
+  中山: [113.4229, 22.478],
+  临汾: [111.4783, 36.1615],
+  临沂: [118.3118, 35.2936],
+  丹东: [124.541, 40.4242],
+  丽水: [119.5642, 28.1854],
+  乌鲁木齐: [87.9236, 43.5883],
+  佛山: [112.8955, 23.1097],
+  保定: [115.0488, 39.0948],
+  兰州: [103.5901, 36.3043],
+  包头: [110.3467, 41.4899],
+  北京: [116.4551, 40.2539],
+  北海: [109.314, 21.6211],
+  南京: [118.8062, 31.9208],
+  南宁: [108.479, 23.1152],
+  南昌: [116.0046, 28.6633],
+  南通: [121.1023, 32.1625],
+  厦门: [118.1689, 24.6478],
+  台州: [121.1353, 28.6688],
+  合肥: [117.29, 32.0581],
+  呼和浩特: [111.4124, 40.4901],
+  咸阳: [108.4131, 34.8706],
+  哈尔滨: [127.9688, 45.368],
+  唐山: [118.4766, 39.6826],
+  嘉兴: [120.9155, 30.6354],
+  大同: [113.7854, 39.8035],
+  大连: [122.2229, 39.4409],
+  天津: [117.4219, 39.4189],
+  太原: [112.3352, 37.9413],
+  威海: [121.9482, 37.1393],
+  宁波: [121.5967, 29.6466],
+  宝鸡: [107.1826, 34.3433],
+  宿迁: [118.5535, 33.7775],
+  常州: [119.4543, 31.5582],
+  广州: [113.5107, 23.2196],
+  廊坊: [116.521, 39.0509],
+  延安: [109.1052, 36.4252],
+  张家口: [115.1477, 40.8527],
+  徐州: [117.5208, 34.3268],
+  德州: [116.6858, 37.2107],
+  惠州: [114.6204, 23.1647],
+  成都: [103.9526, 30.7617],
+  扬州: [119.4653, 32.8162],
+  承德: [117.5757, 41.4075],
+  拉萨: [91.1865, 30.1465],
+  无锡: [120.3442, 31.5527],
+  日照: [119.2786, 35.5023],
+  昆明: [102.9199, 25.4663],
+  杭州: [119.5313, 29.8773],
+  枣庄: [117.323, 34.8926],
+  柳州: [109.3799, 24.9774],
+  株洲: [113.5327, 27.0319],
+  武汉: [114.3896, 30.6628],
+  汕头: [117.1692, 23.3405],
+  江门: [112.6318, 22.1484],
+  沈阳: [123.1238, 42.1216],
+  沧州: [116.8286, 38.2104],
+  河源: [114.917, 23.9722],
+  泉州: [118.3228, 25.1147],
+  泰安: [117.0264, 36.0516],
+  泰州: [120.0586, 32.5525],
+  济南: [117.1582, 36.8701],
+  济宁: [116.8286, 35.3375],
+  海口: [110.3893, 19.8516],
+  淄博: [118.0371, 36.6064],
+  淮安: [118.927, 33.4039],
+  深圳: [114.5435, 22.5439],
+  清远: [112.9175, 24.3292],
+  温州: [120.498, 27.8119],
+  渭南: [109.7864, 35.0299],
+  湖州: [119.8608, 30.7782],
+  湘潭: [112.5439, 27.7075],
+  滨州: [117.8174, 37.4963],
+  潍坊: [119.0918, 36.524],
+  烟台: [120.7397, 37.5128],
+  玉溪: [101.9312, 23.8898],
+  珠海: [113.7305, 22.1155],
+  盐城: [120.2234, 33.5577],
+  盘锦: [121.9482, 41.0449],
+  石家庄: [114.4995, 38.1006],
+  福州: [119.4543, 25.9222],
+  秦皇岛: [119.2126, 40.0232],
+  绍兴: [120.564, 29.7565],
+  聊城: [115.9167, 36.4032],
+  肇庆: [112.1265, 23.5822],
+  舟山: [122.2559, 30.2234],
+  苏州: [120.6519, 31.3989],
+  莱芜: [117.6526, 36.2714],
+  菏泽: [115.6201, 35.2057],
+  营口: [122.4316, 40.4297],
+  葫芦岛: [120.1575, 40.578],
+  衡水: [115.8838, 37.7161],
+  衢州: [118.6853, 28.8666],
+  西宁: [101.4038, 36.8207],
+  西安: [109.1162, 34.2004],
+  贵阳: [106.6992, 26.7682],
+  连云港: [119.1248, 34.552],
+  邢台: [114.8071, 37.2821],
+  邯郸: [114.4775, 36.535],
+  郑州: [113.4668, 34.6234],
+  鄂尔多斯: [108.9734, 39.2487],
+  重庆: [107.7539, 30.1904],
+  金华: [120.0037, 29.1028],
+  铜川: [109.0393, 35.1947],
+  银川: [106.3586, 38.1775],
+  镇江: [119.4763, 31.9702],
+  长春: [125.8154, 44.2584],
+  长沙: [113.0823, 28.2568],
+  长治: [112.8625, 36.4746],
+  阳泉: [113.4778, 38.0951],
+  青岛: [120.4651, 36.3373],
+  韶关: [113.7964, 24.7028]
+};
+var type = "流出";
+var color = ["#a6c84c", "#ffa022", "#46bee9"];
+var tempData = ["广州", GZData];
+var planePath =
+  "path://M1705.06,1318.313v-89.254l-319.9-221.799l0.073-208.063c0.521-84.662-26.629-121.796-63.961-121.491c-37.332-0.305-64.482,36.829-63.961,121.491l0.073,208.063l-319.9,221.799v89.254l330.343-157.288l12.238,241.308l-134.449,92.931l0.531,42.034l175.125-42.917l175.125,42.917l0.531-42.034l-134.449-92.931l12.238-241.308L1705.06,1318.313z";
+export default {
+  name: "widgetMap",
+  props: {
+    value: Object,
+    ispreview: Boolean
+  },
+  data() {
+    return {
+      options: {
+        title: {
+          text: "模拟迁徙",
+          subtext: "数据纯属虚构",
+          left: "center",
+          textStyle: {
+            color: "#fff"
+          }
+        },
+        tooltip: {
+          trigger: "item",
+          formatter: function(params) {
+            console.log(params);
+            if (params.seriesType == "effectScatter") {
+              if ("流入" == type) {
+                return (
+                  type +
+                  "<br>" +
+                  params.data.name +
+                  " ---> " +
+                  params.seriesName +
+                  "<br />人数:" +
+                  params.data.value[2] +
+                  "人"
+                );
+              } else {
+                return (
+                  "流出<br>" +
+                  params.seriesName +
+                  " ---> " +
+                  params.data.name +
+                  "<br />人数:" +
+                  params.data.value[2] +
+                  "人"
+                );
+              }
+            } else if (params.seriesType == "lines") {
+              if ("流入" == type) {
+                return (
+                  type +
+                  "<br>" +
+                  params.data.toName +
+                  " ---> " +
+                  params.data.fromName +
+                  "<br />人数:" +
+                  params.data.value +
+                  "人"
+                );
+              } else {
+                return (
+                  type +
+                  "<br>" +
+                  params.data.fromName +
+                  " ---> " +
+                  params.data.toName +
+                  "<br />人数:" +
+                  params.data.value +
+                  "人"
+                );
+              }
+            } else {
+              return params.name;
+            }
+          }
+        },
+        legend: {
+          show: false,
+          orient: "vertical",
+          top: "bottom",
+          left: "right",
+          data: ["广州"],
+          textStyle: {
+            color: "#fff"
+          },
+          selectedMode: "single"
+        },
+        geo: {
+          map: "china",
+          label: {
+            emphasis: {
+              //show: false,
+              show: true,
+              color: "white"
+            }
+          },
+          roam: true,
+          itemStyle: {
+            normal: {
+              areaColor: "#323c48",
+              borderColor: "#404a59"
+            },
+            emphasis: {
+              areaColor: "#2a333d"
+            }
+          }
+        },
+        series: []
+      },
+      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;
+      },
+      deep: true
+    }
+  },
+  created() {
+    this.optionsStyle = this.value.position;
+  },
+  mounted() {
+    this.initData();
+  },
+  methods: {
+    initData() {
+      const options = this.options;
+      options.series.push(
+        {
+          name: tempData[0],
+          type: "lines",
+          zlevel: 1,
+          effect: {
+            show: true,
+            period: 6,
+            trailLength: 0.7,
+            color: "#fff",
+            symbolSize: 3
+          },
+          lineStyle: {
+            normal: {
+              color: color[0],
+              width: 0,
+              curveness: 0.2
+            }
+          },
+          data: this.convertData(tempData[1])
+        },
+        {
+          name: tempData[0],
+          type: "lines",
+          zlevel: 2,
+          effect: {
+            show: true,
+            period: 6,
+            trailLength: 0,
+            symbol: planePath,
+            symbolSize: 15
+          },
+          lineStyle: {
+            normal: {
+              color: color[0],
+              width: 1,
+              opacity: 0.4,
+              curveness: 0.2
+            }
+          },
+          data: this.convertData(tempData[1])
+        },
+        {
+          name: tempData[0],
+          type: "effectScatter",
+          coordinateSystem: "geo",
+          zlevel: 2,
+          rippleEffect: {
+            brushType: "stroke"
+          },
+          label: {
+            normal: {
+              show: true,
+              position: "right",
+              formatter: "{b}"
+            }
+          },
+          symbolSize: function(val) {
+            return val[2] / 8;
+          },
+          itemStyle: {
+            normal: {
+              color: color[0]
+            }
+          },
+          data: tempData[1].map(function(dataItem) {
+            return {
+              name: dataItem[1].name,
+              value: geoCoordMap[dataItem[1].name].concat([dataItem[1].value])
+            };
+          })
+        }
+      );
+      this.options = options;
+    },
+    convertData(data) {
+      var res = [];
+      for (var i = 0; i < data.length; i++) {
+        var dataItem = data[i];
+        var fromCoord = geoCoordMap[dataItem[0].name];
+        var toCoord = geoCoordMap[dataItem[1].name];
+        if ("流入" == type) {
+          fromCoord = geoCoordMap[dataItem[1].name];
+          toCoord = geoCoordMap[dataItem[0].name];
+        }
+        if (fromCoord && toCoord) {
+          res.push({
+            fromName: dataItem[0].name,
+            toName: dataItem[1].name,
+            coords: [fromCoord, toCoord],
+            value: dataItem[1].value
+          });
+        }
+      }
+      return res;
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.echartMap {
+  width: 100%;
+  height: 100%;
+}
+.echarts {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+</style>

+ 3 - 0
report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue

@@ -0,0 +1,3 @@
+<template>
+  <div>表格</div>
+</template>

部分文件因为文件数量过多而无法显示