feat--地图系列更新

report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js

@@ -11,7 +11,7 @@ export const widgetAirbubbleMap = {
   type: 'mapChart',
   tabName: '地图',
   label: '气泡地图',
-  icon: 'iconzhongguoditu',
+  icon: 'icon-ditu1',
   options: {
     // 配置
     setup: [
@@ -38,42 +38,42 @@ export const widgetAirbubbleMap = {
         required: false,
         placeholder: '',
         selectOptions: [
-          { code: 'world', name: '世界' },
-          { code: 'china', name: '中国' },
-          { code: '安徽', name: '安徽' },
-          { code: '澳门', name: '澳门' },
-          { code: '北京', name: '北京' },
-          { code: '重庆', name: '重庆' },
-          { code: '福建', name: '福建' },
-          { code: '甘肃', name: '甘肃' },
-          { code: '广东', name: '广东' },
-          { code: '广西', name: '广西' },
-          { code: '贵州', name: '贵州' },
-          { code: '海南', name: '海南' },
-          { code: '河北', name: '河北' },
-          { code: '黑龙江', name: '黑龙江' },
-          { code: '河南', name: '河南' },
-          { code: '湖北', name: '湖北' },
-          { code: '湖南', name: '湖南' },
-          { code: '江苏', name: '江苏' },
-          { code: '江西', name: '江西' },
-          { code: '吉林', name: '吉林' },
-          { code: '辽宁', name: '辽宁' },
-          { code: '内蒙古', name: '内蒙古' },
-          { code: '宁夏', name: '宁夏' },
-          { code: '青海', name: '青海' },
-          { code: '山东', name: '山东' },
-          { code: '上海', name: '上海' },
-          { code: '山西', name: '山西' },
-          { code: '陕西', name: '陕西' },
-          { code: '四川', name: '四川' },
-          { code: '台湾', name: '台湾' },
-          { code: '天津', name: '天津' },
-          { code: '香港', name: '香港' },
-          { code: '新疆', name: '新疆' },
-          { code: '西藏', name: '西藏' },
-          { code: '云南', name: '云南' },
-          { code: '浙江', name: '浙江' },
+          {code: 'world', name: '世界'},
+          {code: 'china', name: '中国'},
+          {code: '安徽', name: '安徽'},
+          {code: '澳门', name: '澳门'},
+          {code: '北京', name: '北京'},
+          {code: '重庆', name: '重庆'},
+          {code: '福建', name: '福建'},
+          {code: '甘肃', name: '甘肃'},
+          {code: '广东', name: '广东'},
+          {code: '广西', name: '广西'},
+          {code: '贵州', name: '贵州'},
+          {code: '海南', name: '海南'},
+          {code: '河北', name: '河北'},
+          {code: '黑龙江', name: '黑龙江'},
+          {code: '河南', name: '河南'},
+          {code: '湖北', name: '湖北'},
+          {code: '湖南', name: '湖南'},
+          {code: '江苏', name: '江苏'},
+          {code: '江西', name: '江西'},
+          {code: '吉林', name: '吉林'},
+          {code: '辽宁', name: '辽宁'},
+          {code: '内蒙古', name: '内蒙古'},
+          {code: '宁夏', name: '宁夏'},
+          {code: '青海', name: '青海'},
+          {code: '山东', name: '山东'},
+          {code: '上海', name: '上海'},
+          {code: '山西', name: '山西'},
+          {code: '陕西', name: '陕西'},
+          {code: '四川', name: '四川'},
+          {code: '台湾', name: '台湾'},
+          {code: '天津', name: '天津'},
+          {code: '香港', name: '香港'},
+          {code: '新疆', name: '新疆'},
+          {code: '西藏', name: '西藏'},
+          {code: '云南', name: '云南'},
+          {code: '浙江', name: '浙江'},
         ],
         value: 'china'
       },
@@ -284,10 +284,10 @@ export const widgetAirbubbleMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -318,6 +318,22 @@ export const widgetAirbubbleMap = {
               ],
               value: 'sans-serif'
             },
+            {
+              type: 'vue-color',
+              label: '0%渐变色',
+              name: 'fontColor0',
+              required: false,
+              placeholder: '',
+              value: '#073684'
+            },
+            {
+              type: 'vue-color',
+              label: '100%渐变色',
+              name: 'fontColor100',
+              required: false,
+              placeholder: '',
+              value: '#061E3D'
+            },
             {
               type: 'el-input-number',
               label: '边界线宽度',
@@ -334,6 +350,129 @@ export const widgetAirbubbleMap = {
               placeholder: '',
               value: '#fff'
             },
+            {
+              type: 'el-select',
+              label: '边界线类型',
+              name: 'borderType',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'solid', name: '实线'},
+                {code: 'dashed', name: '虚线'},
+                {code: 'dotted', name: '斑点'},
+              ],
+              value: 'solid'
+            },
+            {
+              type: 'vue-color',
+              label: '阴影颜色',
+              name: 'shadowColor',
+              required: false,
+              placeholder: '',
+              value: 'rgba(10,76,139,1)'
+            },
+            {
+              type: 'el-input-number',
+              label: '阴影模糊系数',
+              name: 'shadowBlur',
+              required: false,
+              placeholder: '',
+              value: 10
+            },
+            {
+              type: 'el-slider',
+              label: '透明度',
+              name: 'opacity',
+              required: false,
+              placeholder: '',
+              value: 100
+            },
+          ]
+        },
+        {
+          name: '地图高亮设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '文字显示',
+              name: 'isShowEmphasisLabel',
+              required: false,
+              placeholder: '',
+              value: true
+            },
+            {
+              type: 'el-input-number',
+              label: '文字大小',
+              name: 'emphasisLabelFontSize',
+              required: false,
+              placeholder: '',
+              value: 12,
+            },
+            {
+              type: 'vue-color',
+              label: '文字颜色',
+              name: 'emphasisLabelFontColor',
+              required: false,
+              placeholder: '',
+              value: '#D4EEFF'
+            },
+            {
+              type: 'el-select',
+              label: '文字粗细',
+              name: 'emphasisLabelFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '文字风格',
+              name: 'emphasisLabelFontStyle',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '文字字体',
+              name: 'emphasisLabelFontFamily',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'sans-serif', name: 'sans-serif'},
+                {code: 'serif', name: 'serif'},
+                {code: 'Arial', name: 'Arial'},
+                {code: 'Courier New', name: 'Courier New'},
+              ],
+              value: 'sans-serif'
+            },
+            {
+              type: 'vue-color',
+              label: '0%渐变色',
+              name: 'emphasisLabelFontColor0',
+              required: false,
+              placeholder: '',
+              value: '#073684'
+            },
+            {
+              type: 'vue-color',
+              label: '100%渐变色',
+              name: 'emphasisLabelFontColor100',
+              required: false,
+              placeholder: '',
+              value: 'rgba(199, 21, 133, 1)'
+            },
           ]
         },
         {
@@ -399,10 +538,10 @@ export const widgetAirbubbleMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -435,35 +574,6 @@ export const widgetAirbubbleMap = {
             },
           ],
         },
-        {
-          name: '地图块颜色',
-          list: [
-            {
-              type: 'vue-color',
-              label: '0%处颜色',
-              name: 'font0PreColor',
-              required: false,
-              placeholder: '',
-              value: '#073684'
-            },
-            {
-              type: 'vue-color',
-              label: '100%颜色',
-              name: 'font100PreColor',
-              required: false,
-              placeholder: '',
-              value: '#061E3D'
-            },
-            {
-              type: 'vue-color',
-              label: '高亮渐变色',
-              name: 'fontHighlightColor',
-              required: false,
-              placeholder: '',
-              value: '#2B91B7'
-            },
-          ],
-        },
         {
           name: '提示语设置',
           list: [
@@ -573,41 +683,41 @@ export const widgetAirbubbleMap = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          { "name": "南海诸岛", "value": 1 },
-          { "name": "北京市", "value": 524 },
-          { "name": "天津市", "value": 14 },
-          { "name": "上海市", "value": 150 },
-          { "name": "重庆市", "value": 75 },
-          { "name": "河北省", "value": 13 },
-          { "name": "河南省", "value": 83 },
-          { "name": "云南省", "value": 11 },
-          { "name": "辽宁省", "value": 19 },
-          { "name": "黑龙江省", "value": 15 },
-          { "name": "湖南省", "value": 69 },
-          { "name": "安徽省", "value": 260 },
-          { "name": "山东省", "value": 39 },
-          { "name": "新疆维吾尔自治区", "value": 4 },
-          { "name": "江苏省", "value": 31 },
-          { "name": "浙江省", "value": 104 },
-          { "name": "江西省", "value": 36 },
-          { "name": "湖北省", "value": 1052 },
-          { "name": "广西壮族自治区", "value": 33 },
-          { "name": "甘肃省", "value": 347 },
-          { "name": "山西省", "value": 8 },
-          { "name": "内蒙古自治区", "value": 157 },
-          { "name": "陕西省", "value": 22 },
-          { "name": "吉林省", "value": 4 },
-          { "name": "福建省", "value": 36 },
-          { "name": "贵州省", "value": 39 },
-          { "name": "广东省", "value": 996 },
-          { "name": "青海省", "value": 27 },
-          { "name": "西藏自治区", "value": 31 },
-          { "name": "四川省", "value": 46 },
-          { "name": "宁夏回族自治区", "value": 16 },
-          { "name": "海南省", "value": 22 },
-          { "name": "台湾省", "value": 6 },
-          { "name": "香港", "value": 2 },
-          { "name": "澳门", "value": 9 }],
+          {"name": "南海诸岛", "value": 1},
+          {"name": "北京市", "value": 524},
+          {"name": "天津市", "value": 14},
+          {"name": "上海市", "value": 150},
+          {"name": "重庆市", "value": 75},
+          {"name": "河北省", "value": 13},
+          {"name": "河南省", "value": 83},
+          {"name": "云南省", "value": 11},
+          {"name": "辽宁省", "value": 19},
+          {"name": "黑龙江省", "value": 15},
+          {"name": "湖南省", "value": 69},
+          {"name": "安徽省", "value": 260},
+          {"name": "山东省", "value": 39},
+          {"name": "新疆维吾尔自治区", "value": 4},
+          {"name": "江苏省", "value": 31},
+          {"name": "浙江省", "value": 104},
+          {"name": "江西省", "value": 36},
+          {"name": "湖北省", "value": 1052},
+          {"name": "广西壮族自治区", "value": 33},
+          {"name": "甘肃省", "value": 347},
+          {"name": "山西省", "value": 8},
+          {"name": "内蒙古自治区", "value": 157},
+          {"name": "陕西省", "value": 22},
+          {"name": "吉林省", "value": 4},
+          {"name": "福建省", "value": 36},
+          {"name": "贵州省", "value": 39},
+          {"name": "广东省", "value": 996},
+          {"name": "青海省", "value": 27},
+          {"name": "西藏自治区", "value": 31},
+          {"name": "四川省", "value": 46},
+          {"name": "宁夏回族自治区", "value": 16},
+          {"name": "海南省", "value": 22},
+          {"name": "台湾省", "value": 6},
+          {"name": "香港", "value": 2},
+          {"name": "澳门", "value": 9}],
       },
       {
         type: 'dycustComponents',

report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js

@@ -11,7 +11,7 @@ export const widgetLineMap = {
   type: 'mapChart',
   tabName: '地图',
   label: '路线地图',
-  icon: 'iconzhongguoditu',
+  icon: 'icon-ditu1',
   options: {
     setup: [
       {
@@ -37,42 +37,42 @@ export const widgetLineMap = {
         required: false,
         placeholder: '',
         selectOptions: [
-          { code: 'world', name: '世界' },
-          { code: 'china', name: '中国' },
-          { code: '安徽', name: '安徽' },
-          { code: '澳门', name: '澳门' },
-          { code: '北京', name: '北京' },
-          { code: '重庆', name: '重庆' },
-          { code: '福建', name: '福建' },
-          { code: '甘肃', name: '甘肃' },
-          { code: '广东', name: '广东' },
-          { code: '广西', name: '广西' },
-          { code: '贵州', name: '贵州' },
-          { code: '海南', name: '海南' },
-          { code: '河北', name: '河北' },
-          { code: '黑龙江', name: '黑龙江' },
-          { code: '河南', name: '河南' },
-          { code: '湖北', name: '湖北' },
-          { code: '湖南', name: '湖南' },
-          { code: '江苏', name: '江苏' },
-          { code: '江西', name: '江西' },
-          { code: '吉林', name: '吉林' },
-          { code: '辽宁', name: '辽宁' },
-          { code: '内蒙古', name: '内蒙古' },
-          { code: '宁夏', name: '宁夏' },
-          { code: '青海', name: '青海' },
-          { code: '山东', name: '山东' },
-          { code: '上海', name: '上海' },
-          { code: '山西', name: '山西' },
-          { code: '陕西', name: '陕西' },
-          { code: '四川', name: '四川' },
-          { code: '台湾', name: '台湾' },
-          { code: '天津', name: '天津' },
-          { code: '香港', name: '香港' },
-          { code: '新疆', name: '新疆' },
-          { code: '西藏', name: '西藏' },
-          { code: '云南', name: '云南' },
-          { code: '浙江', name: '浙江' },
+          {code: 'world', name: '世界'},
+          {code: 'china', name: '中国'},
+          {code: '安徽', name: '安徽'},
+          {code: '澳门', name: '澳门'},
+          {code: '北京', name: '北京'},
+          {code: '重庆', name: '重庆'},
+          {code: '福建', name: '福建'},
+          {code: '甘肃', name: '甘肃'},
+          {code: '广东', name: '广东'},
+          {code: '广西', name: '广西'},
+          {code: '贵州', name: '贵州'},
+          {code: '海南', name: '海南'},
+          {code: '河北', name: '河北'},
+          {code: '黑龙江', name: '黑龙江'},
+          {code: '河南', name: '河南'},
+          {code: '湖北', name: '湖北'},
+          {code: '湖南', name: '湖南'},
+          {code: '江苏', name: '江苏'},
+          {code: '江西', name: '江西'},
+          {code: '吉林', name: '吉林'},
+          {code: '辽宁', name: '辽宁'},
+          {code: '内蒙古', name: '内蒙古'},
+          {code: '宁夏', name: '宁夏'},
+          {code: '青海', name: '青海'},
+          {code: '山东', name: '山东'},
+          {code: '上海', name: '上海'},
+          {code: '山西', name: '山西'},
+          {code: '陕西', name: '陕西'},
+          {code: '四川', name: '四川'},
+          {code: '台湾', name: '台湾'},
+          {code: '天津', name: '天津'},
+          {code: '香港', name: '香港'},
+          {code: '新疆', name: '新疆'},
+          {code: '西藏', name: '西藏'},
+          {code: '云南', name: '云南'},
+          {code: '浙江', name: '浙江'},
         ],
         value: 'china'
       },
@@ -283,10 +283,10 @@ export const widgetLineMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -317,6 +317,22 @@ export const widgetLineMap = {
               ],
               value: 'sans-serif'
             },
+            {
+              type: 'vue-color',
+              label: '0%渐变色',
+              name: 'fontColor0',
+              required: false,
+              placeholder: '',
+              value: '#073684'
+            },
+            {
+              type: 'vue-color',
+              label: '100%渐变色',
+              name: 'fontColor100',
+              required: false,
+              placeholder: '',
+              value: '#061E3D'
+            },
             {
               type: 'el-input-number',
               label: '边界线宽度',
@@ -333,6 +349,129 @@ export const widgetLineMap = {
               placeholder: '',
               value: '#fff'
             },
+            {
+              type: 'el-select',
+              label: '边界线类型',
+              name: 'borderType',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'solid', name: '实线'},
+                {code: 'dashed', name: '虚线'},
+                {code: 'dotted', name: '斑点'},
+              ],
+              value: 'solid'
+            },
+            {
+              type: 'vue-color',
+              label: '阴影颜色',
+              name: 'shadowColor',
+              required: false,
+              placeholder: '',
+              value: 'rgba(10,76,139,1)'
+            },
+            {
+              type: 'el-input-number',
+              label: '阴影模糊系数',
+              name: 'shadowBlur',
+              required: false,
+              placeholder: '',
+              value: 10
+            },
+            {
+              type: 'el-slider',
+              label: '透明度',
+              name: 'opacity',
+              required: false,
+              placeholder: '',
+              value: 100
+            },
+          ]
+        },
+        {
+          name: '地图高亮设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '文字显示',
+              name: 'isShowEmphasisLabel',
+              required: false,
+              placeholder: '',
+              value: true
+            },
+            {
+              type: 'el-input-number',
+              label: '文字大小',
+              name: 'emphasisLabelFontSize',
+              required: false,
+              placeholder: '',
+              value: 12,
+            },
+            {
+              type: 'vue-color',
+              label: '文字颜色',
+              name: 'emphasisLabelFontColor',
+              required: false,
+              placeholder: '',
+              value: '#D4EEFF'
+            },
+            {
+              type: 'el-select',
+              label: '文字粗细',
+              name: 'emphasisLabelFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '文字风格',
+              name: 'emphasisLabelFontStyle',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '文字字体',
+              name: 'emphasisLabelFontFamily',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'sans-serif', name: 'sans-serif'},
+                {code: 'serif', name: 'serif'},
+                {code: 'Arial', name: 'Arial'},
+                {code: 'Courier New', name: 'Courier New'},
+              ],
+              value: 'sans-serif'
+            },
+            {
+              type: 'vue-color',
+              label: '0%渐变色',
+              name: 'emphasisLabelFontColor0',
+              required: false,
+              placeholder: '',
+              value: '#073684'
+            },
+            {
+              type: 'vue-color',
+              label: '100%渐变色',
+              name: 'emphasisLabelFontColor100',
+              required: false,
+              placeholder: '',
+              value: 'rgba(199, 21, 133, 1)'
+            },
           ]
         },
         {
@@ -345,8 +484,8 @@ export const widgetLineMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'arrow', name: '箭头' },
-                { code: 'plane', name: '飞机' },
+                {code: 'arrow', name: '箭头'},
+                {code: 'plane', name: '飞机'},
               ],
               value: 'arrow'
             },
@@ -460,10 +599,10 @@ export const widgetLineMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -564,10 +703,10 @@ export const widgetLineMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -601,31 +740,72 @@ export const widgetLineMap = {
           ],
         },
         {
-          name: '地图块颜色',
+          name: '提示语设置',
           list: [
             {
-              type: 'vue-color',
-              label: '0%处颜色',
-              name: 'font0PreColor',
+              type: 'el-switch',
+              label: '显示',
+              name: 'isShowTooltip',
               required: false,
               placeholder: '',
-              value: '#073684'
+              value: true
             },
             {
-              type: 'vue-color',
-              label: '100%颜色',
-              name: 'font100PreColor',
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'tooltipFontSize',
               required: false,
               placeholder: '',
-              value: '#061E3D'
+              value: 16
             },
             {
               type: 'vue-color',
-              label: '高亮渐变色',
-              name: 'fontHighlightColor',
+              label: '字体颜色',
+              name: 'tooltipColor',
               required: false,
               placeholder: '',
-              value: '#2B91B7'
+              value: '#00FEFF'
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'tooltipFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '字体风格',
+              name: 'tooltipFontStyle',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '字体系列',
+              name: 'tooltipFontFamily',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'sans-serif', name: 'sans-serif'},
+                {code: 'serif', name: 'serif'},
+                {code: 'Arial', name: 'Arial'},
+                {code: 'Courier New', name: 'Courier New'},
+              ],
+              value: 'sans-serif'
             },
           ],
         },
@@ -668,36 +848,36 @@ export const widgetLineMap = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          { source: '北京市', target: '上海市', value: 95 },
-          { source: '北京市', target: '广州市', value: 90 },
-          { source: '北京市', target: '大连市', value: 80 },
-          { source: '北京市', target: '南宁市', value: 70 },
-          { source: '北京市', target: '南昌市', value: 60 },
-          { source: '北京市', target: '拉萨市', value: 50 },
-          { source: '北京市', target: '长春市', value: 40 },
-          { source: '北京市', target: '包头市', value: 30 },
-          { source: '北京市', target: '重庆市', value: 20 },
-          { source: '北京市', target: '常州市', value: 10 },
-          { source: '上海市', target: '包头市', value: 95 },
-          { source: '上海市', target: '昆明市', value: 90 },
-          { source: '上海市', target: '广州市', value: 80 },
-          { source: '上海市', target: '郑州市', value: 70 },
-          { source: '上海市', target: '长春市', value: 60 },
-          { source: '上海市', target: '重庆市', value: 50 },
-          { source: '上海市', target: '长沙市', value: 40 },
-          { source: '上海市', target: '北京市', value: 30 },
-          { source: '上海市', target: '丹东市', value: 20 },
-          { source: '上海市', target: '大连市', value: 10 },
-          { source: '广州市', target: '福州市', value: 95 },
-          { source: '广州市', target: '太原市', value: 90 },
-          { source: '广州市', target: '长春市', value: 80 },
-          { source: '广州市', target: '重庆市', value: 70 },
-          { source: '广州市', target: '西安市', value: 60 },
-          { source: '广州市', target: '成都市', value: 50 },
-          { source: '广州市', target: '常州市', value: 40 },
-          { source: '广州市', target: '北京市', value: 30 },
-          { source: '广州市', target: '北海市', value: 20 },
-          { source: '广州市', target: '海口市', value: 10 },
+          {source: '北京市', target: '上海市', value: 95},
+          {source: '北京市', target: '广州市', value: 90},
+          {source: '北京市', target: '大连市', value: 80},
+          {source: '北京市', target: '南宁市', value: 70},
+          {source: '北京市', target: '南昌市', value: 60},
+          {source: '北京市', target: '拉萨市', value: 50},
+          {source: '北京市', target: '长春市', value: 40},
+          {source: '北京市', target: '包头市', value: 30},
+          {source: '北京市', target: '重庆市', value: 20},
+          {source: '北京市', target: '常州市', value: 10},
+          {source: '上海市', target: '包头市', value: 95},
+          {source: '上海市', target: '昆明市', value: 90},
+          {source: '上海市', target: '广州市', value: 80},
+          {source: '上海市', target: '郑州市', value: 70},
+          {source: '上海市', target: '长春市', value: 60},
+          {source: '上海市', target: '重庆市', value: 50},
+          {source: '上海市', target: '长沙市', value: 40},
+          {source: '上海市', target: '北京市', value: 30},
+          {source: '上海市', target: '丹东市', value: 20},
+          {source: '上海市', target: '大连市', value: 10},
+          {source: '广州市', target: '福州市', value: 95},
+          {source: '广州市', target: '太原市', value: 90},
+          {source: '广州市', target: '长春市', value: 80},
+          {source: '广州市', target: '重庆市', value: 70},
+          {source: '广州市', target: '西安市', value: 60},
+          {source: '广州市', target: '成都市', value: 50},
+          {source: '广州市', target: '常州市', value: 40},
+          {source: '广州市', target: '北京市', value: 30},
+          {source: '广州市', target: '北海市', value: 20},
+          {source: '广州市', target: '海口市', value: 10},
         ],
       },
       {

report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue

@@ -264,7 +264,7 @@ export default {
         geo: {
           map: "china",
           show: true,
-          roam: false,
+          roam: true,
           label: {
             emphasis: {
               show: false,
@@ -290,7 +290,7 @@ export default {
                 ],
                 false
               ),
-              borderWidth: 0,
+              borderWidth: 1,
               shadowColor: "rgba(10,76,139,1)",
               shadowOffsetY: 0,
               shadowBlur: 60,
@@ -298,66 +298,6 @@ export default {
           },
         },
         series: [
-          {
-            type: "map",
-            map: "china",
-            aspectScale: 0.75,
-            label: {
-              normal: {
-                //调整数值
-                position: "right",
-                show: true,
-                color: "#53D9FF",
-                fontSize: 20,
-              },
-              emphasis: {
-                show: true,
-              },
-            },
-            itemStyle: {
-              normal: {
-                //地图块颜色
-                areaColor: {
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#073684", // 0% 处的颜色
-                    },
-                    {
-                      offset: 1,
-                      color: "#061E3D", // 100% 处的颜色
-                    },
-                  ],
-                },
-                borderColor: "#215495",
-                borderWidth: 1,
-              },
-              //鼠标放置颜色加深
-              emphasis: {
-                areaColor: {
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#073684", // 0% 处的颜色
-                    },
-                    {
-                      offset: 1,
-                      color: "#2B91B7", // 100% 处的颜色
-                    },
-                  ],
-                },
-              },
-            },
-            data: data,
-          },
           {
             type: "effectScatter",
             coordinateSystem: "geo",
@@ -469,7 +409,6 @@ export default {
       this.optionsSetup,
       this.optionsData,
       (dynamicData, optionsSetup) => {
-        console.log("dynamicData", dynamicData);
         this.getEchartData(dynamicData, optionsSetup);
       }
     );
@@ -480,14 +419,10 @@ export default {
     editorOptions() {
       this.setOptionsTitle();
       this.setOptionsGeo();
-      this.setOptionTextValue();
-      //this.setOptionDataValue();
       this.setOptionsData();
       this.setOptionAirSize();
       this.setOptionsTooltip();
-      this.setOptionMapBlock();
     },
-
     // 标题设置
     setOptionsTitle() {
       const optionsSetup = this.optionsSetup;
@@ -515,15 +450,16 @@ export default {
       };
       this.options.title = title;
     },
-    setOptionsGeo(){
-      this.options.geo['map'] = this.optionsSetup.mapName == ''? "china" : this.optionsSetup.mapName;
-      this.options.series[0]['map'] = this.optionsSetup.mapName == ''? "china" : this.optionsSetup.mapName;
-    },
-    setOptionTextValue() {
+    setOptionsGeo() {
       const optionsSetup = this.optionsSetup;
-      const label = {
-        normal: {
-          position: "right",
+      const geo = {
+        map: this.optionsSetup.mapName == '' ? "china" : this.optionsSetup.mapName,
+        show: true,
+        roam: true,
+        layoutSize: "80%",
+        label: {
+          //调整数值
+          // 地图省市区显隐
           show: optionsSetup.isShowMap,
           color: optionsSetup.fontColor,
           fontSize: optionsSetup.fontSize,
@@ -531,58 +467,64 @@ export default {
           fontStyle: optionsSetup.fontStyle,
           fontFamily: optionsSetup.fontFamily,
         },
-        emphasis: {
-          show: false,
-          color: '#fff',
-        },
-      };
-      this.options.series[0]["label"] = label;
-    },
-    setOptionMapBlock() {
-      const optionsSetup = this.optionsSetup;
-      const itemStyle = this.options.series[0]["itemStyle"];
-      const normal = {
-        //地图块颜色
-        areaColor: {
-          x: 0,
-          y: 0,
-          x2: 0,
-          y2: 1,
-          colorStops: [
-            {
-              offset: 0,
-              color: optionsSetup.font0PreColor, // 0% 处的颜色
-            },
-            {
-              offset: 1,
-              color: optionsSetup.font100PreColor, // 100% 处的颜色
+        itemStyle: {
+          normal: {
+            //地图块颜色
+            areaColor: {
+              x: 0,
+              y: 0,
+              x2: 0,
+              y2: 1,
+              colorStops: [
+                {
+                  offset: 0,
+                  color: optionsSetup.fontColor0, // 0% 处的颜色
+                },
+                {
+                  offset: 1,
+                  color: optionsSetup.fontColor100, // 100% 处的颜色
+                },
+              ],
             },
-          ],
+            borderType: optionsSetup.borderType,
+            borderColor: optionsSetup.borderColor,
+            borderWidth: optionsSetup.borderWidth,
+            shadowColor: optionsSetup.shadowColor,
+            shadowBlur: optionsSetup.shadowBlur,
+            opacity: optionsSetup.opacity / 100,
+          },
         },
-        borderColor: optionsSetup.borderColor,
-        borderWidth: optionsSetup.borderWidth,
-      };
-      //鼠标放置颜色加深
-      const emphasis = {
-        areaColor: {
-          x: 0,
-          y: 0,
-          x2: 0,
-          y2: 1,
-          colorStops: [
-            {
-              offset: 0,
-              color: "#073684", // 0% 处的颜色
-            },
-            {
-              offset: 1,
-              color: optionsSetup.fontHighlightColor, // 100% 处的颜色
+        //鼠标放置颜色加深
+        emphasis: {
+          label: {
+            show: optionsSetup.isShowEmphasisLabel,
+            color: optionsSetup.emphasisLabelFontColor,
+            fontSize: optionsSetup.emphasisLabelFontSize,
+            fontWeight: optionsSetup.emphasisLabelFontWeight,
+            fontStyle: optionsSetup.emphasisLabelFontStyle,
+            fontFamily: optionsSetup.emphasisLabelFontFamily,
+          },
+          itemStyle: {
+            areaColor: {
+              x: 0,
+              y: 0,
+              x2: 0,
+              y2: 1,
+              colorStops: [
+                {
+                  offset: 0,
+                  color: optionsSetup.emphasisLabelFontColor0, // 0% 处的颜色
+                },
+                {
+                  offset: 1,
+                  color: optionsSetup.emphasisLabelFontColor100, // 100% 处的颜色
+                },
+              ],
             },
-          ],
+          },
         },
-      };
-      itemStyle["normal"] = normal;
-      itemStyle["emphasis"] = emphasis;
+      }
+      this.options.geo = geo;
     },
     setOptionAirSize() {
       maxSize4Pin = this.optionsSetup.fontmaxSize4Pin;
@@ -603,7 +545,7 @@ export default {
         },
         formatter: function (params) {
           if (params.value.length > 1) {
-            return params.data.name + "" + params.data.value[2];
+            return params.data.name + " " + params.data.value[2];
           } else {
             return params.name;
           }
@@ -636,9 +578,8 @@ export default {
         : this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime);
     },
     staticDataFn(val) {
-      this.options.series[0]["data"] = val;
       const optionsSetup = this.optionsSetup;
-      const label = this.options.series[1]["label"];
+      const label = this.options.series[0]["label"];
       const normal = {
         show: optionsSetup.isShowData,
         color: "#fff",
@@ -658,7 +599,7 @@ export default {
         },
       };
       const data = convertData(val);
-      this.options.series[1]["data"] = data;
+      this.options.series[0]["data"] = data;
       label["normal"] = normal;
     },
     dynamicDataFn(val, refreshTime) {
@@ -679,9 +620,8 @@ export default {
       });
     },
     renderingFn(val) {
-      this.options.series[0]["data"] = val;
       const optionsSetup = this.optionsSetup;
-      const label = this.options.series[1]["label"];
+      const label = this.options.series[0]["label"];
       const normal = {
         show: optionsSetup.isShowData,
         color: "#fff",
@@ -701,7 +641,7 @@ export default {
         },
       };
       const data = convertData(val);
-      this.options.series[1]["data"] = data;
+      this.options.series[0]["data"] = data;
       label["normal"] = normal;
     },
   },

report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue

@@ -1,6 +1,6 @@
 <template>
   <div :style="styleObj">
-    <v-chart ref="myVChart" :options="options" autoresize />
+    <v-chart ref="myVChart" :options="options" autoresize/>
   </div>
 </template>
 <script>
@@ -42,7 +42,8 @@ import "../../../../../../node_modules/echarts/map/js/province/yunnan";
 import "../../../../../../node_modules/echarts/map/js/province/zhejiang";
 import "echarts/map/js/china.js";
 import echarts from "echarts";
-import { conversionCity } from "@/utils/china";
+import {conversionCity} from "@/utils/china";
+
 let geoCoordMap = conversionCity;
 let 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";
@@ -100,87 +101,32 @@ export default {
           roam: true,
           itemStyle: {
             normal: {
-              areaColor: "#323c48",
-              borderColor: "#404a59",
+              borderColor: new echarts.graphic.LinearGradient(
+                0,
+                0,
+                0,
+                1,
+                [
+                  {
+                    offset: 0,
+                    color: "#00F6FF",
+                  },
+                  {
+                    offset: 1,
+                    color: "#53D9FF",
+                  },
+                ],
+                false
+              ),
               borderWidth: 1,
-            },
-            emphasis: {
-              areaColor: "#2a333d",
+              shadowColor: "rgba(10,76,139,1)",
+              shadowOffsetY: 0,
+              shadowBlur: 60,
             },
           },
         },
         series: [
           {
-            aspectScale: 0.75,
-            type: 'map',
-            map: 'china',
-            //roam: true,
-            effect: {
-              show: false,
-              period: 6,
-              trailLength: 0.7,
-              color: "#fff",
-              symbolSize: 3,
-            },
-            label: {
-              normal: {
-                //调整数值
-                position: "right",
-                // 地图省市区显隐
-                show: false,
-                color: "#53D9FF",
-                fontSize: 20,
-              },
-              emphasis: {
-                show: true,
-              },
-            },
-            itemStyle: {
-              normal: {
-                //地图块颜色
-                areaColor: {
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#073684", // 0% 处的颜色
-                    },
-                    {
-                      offset: 1,
-                      color: "#061E3D", // 100% 处的颜色
-                    },
-                  ],
-                },
-                borderColor: "#215495",
-                borderWidth: 1,
-              },
-              //鼠标放置颜色加深
-              emphasis: {
-                areaColor: {
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#073684", // 0% 处的颜色
-                    },
-                    {
-                      offset: 1,
-                      color: "#2B91B7", // 100% 处的颜色
-                    },
-                  ],
-                },
-              },
-            },
-            data: []
-          },
-          {
-            //name: tempData[0],
             type: "lines",
             zlevel: 1,
             effect: {
@@ -224,7 +170,6 @@ export default {
           },
           {
             // 起点
-            //name: tempData[0],
             type: "effectScatter",
             coordinateSystem: "geo",
             zlevel: 2,
@@ -251,7 +196,6 @@ export default {
           },
           {
             // 终点
-            //name: tempData[0],
             type: "effectScatter",
             coordinateSystem: "geo",
             zlevel: 2,
@@ -340,10 +284,9 @@ export default {
       this.setOptionsGeo();
       this.setOptionsSource();
       this.setOptionsTarget();
-      this.setOptionsMap();
       this.setOptionsSymbol();
       this.setOptionsLine();
-      this.setOptionsColor();
+      this.setOptionsTooltip();
       this.setOptionsData();
     },
     // 标题设置
@@ -373,17 +316,16 @@ export default {
       };
       this.options.title = title;
     },
-    setOptionsGeo(){
-      this.options.geo['map'] = this.optionsSetup.mapName == ''? "china" : this.optionsSetup.mapName;
-      this.options.series[0]['map'] = this.optionsSetup.mapName == ''? "china" : this.optionsSetup.mapName;
-    },
     // 地图设置
-    setOptionsMap() {
+    setOptionsGeo() {
       const optionsSetup = this.optionsSetup;
-      const label = {
-        normal: {
+      const geo = {
+        map: this.optionsSetup.mapName == '' ? "china" : this.optionsSetup.mapName,
+        show: true,
+        roam: true,
+        layoutSize: "80%",
+        label: {
           //调整数值
-          position: "right",
           // 地图省市区显隐
           show: optionsSetup.isShowMap,
           color: optionsSetup.fontColor,
@@ -392,16 +334,69 @@ export default {
           fontStyle: optionsSetup.fontStyle,
           fontFamily: optionsSetup.fontFamily,
         },
+        itemStyle: {
+          normal: {
+            //地图块颜色
+            areaColor: {
+              x: 0,
+              y: 0,
+              x2: 0,
+              y2: 1,
+              colorStops: [
+                {
+                  offset: 0,
+                  color: optionsSetup.fontColor0, // 0% 处的颜色
+                },
+                {
+                  offset: 1,
+                  color: optionsSetup.fontColor100, // 100% 处的颜色
+                },
+              ],
+            },
+            borderType: optionsSetup.borderType,
+            borderColor: optionsSetup.borderColor,
+            borderWidth: optionsSetup.borderWidth,
+            shadowColor: optionsSetup.shadowColor,
+            shadowBlur: optionsSetup.shadowBlur,
+            opacity: optionsSetup.opacity / 100,
+          },
+        },
+        //鼠标放置颜色加深
         emphasis: {
-          show: false,
+          label: {
+            show: optionsSetup.isShowEmphasisLabel,
+            color: optionsSetup.emphasisLabelFontColor,
+            fontSize: optionsSetup.emphasisLabelFontSize,
+            fontWeight: optionsSetup.emphasisLabelFontWeight,
+            fontStyle: optionsSetup.emphasisLabelFontStyle,
+            fontFamily: optionsSetup.emphasisLabelFontFamily,
+          },
+          itemStyle: {
+            areaColor: {
+              x: 0,
+              y: 0,
+              x2: 0,
+              y2: 1,
+              colorStops: [
+                {
+                  offset: 0,
+                  color: optionsSetup.emphasisLabelFontColor0, // 0% 处的颜色
+                },
+                {
+                  offset: 1,
+                  color: optionsSetup.emphasisLabelFontColor100, // 100% 处的颜色
+                },
+              ],
+            },
+          },
         },
       }
-      this.options.series[0]['label'] = label;
+      this.options.geo = geo;
     },
     // 起点设置
     setOptionsSource() {
       const optionsSetup = this.optionsSetup;
-      const series = this.options.series[3];
+      const series = this.options.series[2];
       const normal = {
         show: optionsSetup.isShowSource,
         position: optionsSetup.sourceFontPosition,
@@ -423,7 +418,7 @@ export default {
     // 终点设置
     setOptionsTarget() {
       const optionsSetup = this.optionsSetup;
-      const series = this.options.series[4];
+      const series = this.options.series[3];
       const normal = {
         show: optionsSetup.isShowTarget,
         position: optionsSetup.targetFontPosition,
@@ -445,7 +440,7 @@ export default {
     // 图标设置
     setOptionsSymbol() {
       const optionsSetup = this.optionsSetup;
-      const series = this.options.series[2];
+      const series = this.options.series[1];
       const effect = {
         show: true,
         period: this.setPeriod(optionsSetup),
@@ -477,7 +472,7 @@ export default {
     // 线设置
     setOptionsLine() {
       const optionsSetup = this.optionsSetup;
-      const series = this.options.series[2];
+      const series = this.options.series[1];
       const lineStyle = {
         normal: {
           // 线条颜色
@@ -489,52 +484,36 @@ export default {
       };
       series["lineStyle"] = lineStyle;
     },
-    // 地图颜色设置
-    setOptionsColor() {
+    // tooltip 设置
+    setOptionsTooltip() {
       const optionsSetup = this.optionsSetup;
-      const itemStyle = this.options.series[0]["itemStyle"];
-      const normal = {
-        //地图块颜色
-        areaColor: {
-          x: 0,
-          y: 0,
-          x2: 0,
-          y2: 1,
-          colorStops: [
-            {
-              offset: 0,
-              color: optionsSetup.font0PreColor, // 0% 处的颜色
-            },
-            {
-              offset: 1,
-              color: optionsSetup.font100PreColor, // 100% 处的颜色
-            },
-          ],
+      const tooltip = {
+        trigger: "item",
+        show: optionsSetup.isShowTooltip,
+        textStyle: {
+          color: optionsSetup.tooltipColor,
+          fontSize: optionsSetup.tooltipFontSize,
+          fontWeight: optionsSetup.tooltipFontWeight,
+          fontStyle: optionsSetup.tooltipFontStyle,
+          fontFamily: optionsSetup.tooltipFontFamily,
         },
-        borderColor: optionsSetup.borderColor,
-        borderWidth: optionsSetup.borderWidth,
-      };
-      //鼠标放置颜色加深
-      const emphasis = {
-        areaColor: {
-          x: 0,
-          y: 0,
-          x2: 0,
-          y2: 1,
-          colorStops: [
-            {
-              offset: 0,
-              color: "#073684", // 0% 处的颜色
-            },
-            {
-              offset: 1,
-              color: optionsSetup.fontHighlightColor, // 100% 处的颜色
-            },
-          ],
+        formatter: function (params, ticket, callback) {
+          if (params.seriesType == "effectScatter") {
+            return "线路：" + params.data.name + "" + params.data.value[2];
+          } else if (params.seriesType == "lines") {
+            return (
+              params.data.fromName +
+              ">" +
+              params.data.toName +
+              "<br />" +
+              params.data.value
+            );
+          } else {
+            return params.name;
+          }
         },
       };
-      itemStyle["normal"] = normal;
-      itemStyle["emphasis"] = emphasis;
+      this.options.tooltip = tooltip;
     },
     //数据解析
     setOptionsData(e, paramsConfig) {
@@ -562,9 +541,9 @@ export default {
     },
     staticDataFn(val) {
       const series = this.options.series;
+      series[0]["data"] = this.convertData(val);
       series[1]["data"] = this.convertData(val);
-      series[2]["data"] = this.convertData(val);
-      series[3]["data"] = val.map(function (dataItem) {
+      series[2]["data"] = val.map(function (dataItem) {
         if (geoCoordMap[dataItem.source] && geoCoordMap[dataItem.target]) {
           return {
             name: dataItem.source,
@@ -572,7 +551,7 @@ export default {
           };
         }
       });
-      series[4]["data"] = val.map(function (dataItem) {
+      series[3]["data"] = val.map(function (dataItem) {
         if (geoCoordMap[dataItem.source] && geoCoordMap[dataItem.target]) {
           return {
             name: dataItem.target,
@@ -600,9 +579,9 @@ export default {
     },
     renderingFn(val) {
       const series = this.options.series;
+      series[0]["data"] = this.convertData(val);
       series[1]["data"] = this.convertData(val);
-      series[2]["data"] = this.convertData(val);
-      series[3]["data"] = val.map(function (dataItem) {
+      series[2]["data"] = val.map(function (dataItem) {
         if (geoCoordMap[dataItem.source] && geoCoordMap[dataItem.target]) {
           return {
             name: dataItem.source,
@@ -610,7 +589,7 @@ export default {
           };
         }
       });
-      series[4]["data"] = val.map(function (dataItem) {
+      series[3]["data"] = val.map(function (dataItem) {
         if (geoCoordMap[dataItem.source] && geoCoordMap[dataItem.target]) {
           return {
             name: dataItem.target,