feat--地图系列更新

2026-03-24 09:48:34 +08:00 · 2023-12-14 16:46:13 +08:00
parent 219f301ec0
commit 0eb06744fd
9 changed files with 264 additions and 344 deletions
--- a/report-ui/src/assets/iconfont2/demo_index.html
+++ b/report-ui/src/assets/iconfont2/demo_index.html
@@ -55,15 +55,9 @@
          <ul class="icon_lists dib-box">
          
            <li class="dib">
-              <span class="icon iconfont">&#xe60e;</span>
+              <span class="icon iconfont">&#xe627;</span>
                <div class="name">地图</div>
-                <div class="code-name">&amp;#xe60e;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe884;</span>
-                <div class="name">地图</div>
-                <div class="code-name">&amp;#xe884;</div>
+                <div class="code-name">&amp;#xe627;</div>
              </li>
          
          </ul>
@@ -84,9 +78,9 @@
 <pre><code class="language-css"
 >@font-face {
  font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1702535676905') format('woff2'),
-       url('iconfont.woff?t=1702535676905') format('woff'),
-       url('iconfont.ttf?t=1702535676905') format('truetype');
+  src: url('iconfont.woff2?t=1702540060096') format('woff2'),
+       url('iconfont.woff?t=1702540060096') format('woff'),
+       url('iconfont.ttf?t=1702540060096') format('truetype');
 }
 </code></pre>
          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -113,20 +107,11 @@
        <ul class="icon_lists dib-box">
          
          <li class="dib">
-            <span class="icon iconfont icon-03"></span>
+            <span class="icon iconfont icon-ditu1"></span>
            <div class="name">
              地图
            </div>
-            <div class="code-name">.icon-03
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-ditu"></span>
-            <div class="name">
-              地图
-            </div>
-            <div class="code-name">.icon-ditu
+            <div class="code-name">.icon-ditu1
            </div>
          </li>
          
@@ -159,18 +144,10 @@
          
            <li class="dib">
                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-03"></use>
+                  <use xlink:href="#icon-ditu1"></use>
                </svg>
                <div class="name">地图</div>
-                <div class="code-name">#icon-03</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-ditu"></use>
-                </svg>
-                <div class="name">地图</div>
-                <div class="code-name">#icon-ditu</div>
+                <div class="code-name">#icon-ditu1</div>
            </li>
          
          </ul>
--- a/report-ui/src/assets/iconfont2/iconfont.css
+++ b/report-ui/src/assets/iconfont2/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
  font-family: "iconfont"; /* Project id 4369261 */
-  src: url('iconfont.woff2?t=1702535676905') format('woff2'),
-       url('iconfont.woff?t=1702535676905') format('woff'),
-       url('iconfont.ttf?t=1702535676905') format('truetype');
+  src: url('iconfont.woff2?t=1702540060096') format('woff2'),
+       url('iconfont.woff?t=1702540060096') format('woff'),
+       url('iconfont.ttf?t=1702540060096') format('truetype');
 }

 .iconfont {
@@ -13,11 +13,7 @@
  -moz-osx-font-smoothing: grayscale;
 }

-.icon-03:before {
-  content: "\e60e";
-}
-
-.icon-ditu:before {
-  content: "\e884";
+.icon-ditu1:before {
+  content: "\e627";
 }

--- a/report-ui/src/assets/iconfont2/iconfont.js
+++ b/report-ui/src/assets/iconfont2/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4369261='<svg><symbol id="icon-03" viewBox="0 0 1026 1024"><path d="M722.876882 192.283437L355.542958 12.697963 329.240035 0l-41.721877 22.674934L0 192.283437v831.716563l335.589017-192.283437 336.496014 173.236493 41.721878 19.046944 25.395925-16.325952 287.518158-175.957485V0L722.876882 192.283437zM67.117803 226.749336l224.028344-130.607618v687.503986L67.117803 911.532329V226.749336z m301.123118 547.826395l-12.697963-6.348982V83.443756l319.263065 156.91054v691.131975L368.240921 774.575731z m594.990257 21.767936l-224.028344 137.863596V255.773251l19.046945-12.697963 204.981399-131.514615v684.782994z" fill="#2c2c2c" ></path></symbol><symbol id="icon-ditu" viewBox="0 0 1024 1024"><path d="M512 621.696l-150.848-150.826667 30.165333-30.186666L512 561.365333l120.682667-120.682666 30.165333 30.165333L512 621.696z m150.848-150.826667l-30.165333-30.186666a170.666667 170.666667 0 1 0-241.365334 0L361.173333 470.826667c-83.306667-83.306667-83.306667-218.389333 0-301.696 83.306667-83.306667 218.389333-83.306667 301.696 0 83.306667 83.306667 83.306667 218.389333 0 301.696zM512 362.666667a42.666667 42.666667 0 1 1 0-85.333334 42.666667 42.666667 0 0 1 0 85.333334z m-134.186667 365.290666a21.333333 21.333333 0 1 1 30.144-30.165333l110.634667 110.613333L857.664 469.333333H768v-42.666666h106.538667A63.936 63.936 0 0 1 938.666667 490.474667V874.88A64 64 0 0 1 874.602667 938.666667H149.397333A63.914667 63.914667 0 0 1 85.333333 874.858667V490.453333A63.808 63.808 0 0 1 149.461333 426.666667H256v42.666666H149.461333A21.141333 21.141333 0 0 0 128 490.474667v302.208l200.042667-200.042667a21.205333 21.205333 0 0 1 30.058666 0.128c8.32 8.32 8.192 21.973333 0.106667 30.037333L130.474667 850.56a21.333333 21.333333 0 0 1-2.474667 2.133333v22.186667c0 11.669333 9.536 21.141333 21.397333 21.141333h396.437334l-168.042667-168.042666zM874.581333 896A21.333333 21.333333 0 0 0 896 874.858667V491.050667a21.973333 21.973333 0 0 1-1.984 2.261333L548.757333 838.592l54.186667 54.186667c1.002667 1.002667 1.898667 2.090667 2.666667 3.221333h269.013333z" fill="#3D3D3D" ></path></symbol></svg>',function(n){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var i,o,l,c,d,a=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}i=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_4369261,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?a(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),i()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(l=i,c=n.document,d=!1,r(),c.onreadystatechange=function(){"complete"==c.readyState&&(c.onreadystatechange=null,s())})}function s(){d||(d=!0,l())}function r(){try{c.documentElement.doScroll("left")}catch(t){return void setTimeout(r,50)}s()}}(window);
+window._iconfont_svg_string_4369261='<svg><symbol id="icon-ditu1" viewBox="0 0 1024 1024"><path d="M537.972364 826.228364L512 855.179636l-25.972364-28.951272a2274.606545 2274.606545 0 0 1-44.520727-52.084364 2336.116364 2336.116364 0 0 1-97.489454-125.742545 1516.218182 1516.218182 0 0 1-68.072728-102.516364C225.908364 462.731636 197.818182 392.913455 197.818182 337.454545 197.818182 163.933091 338.478545 23.272727 512 23.272727s314.181818 140.660364 314.181818 314.181818c0 55.458909-28.090182 125.277091-78.126545 208.430546a1516.218182 1516.218182 0 0 1-68.072728 102.516364 2336.116364 2336.116364 0 0 1-97.466181 125.742545 2274.606545 2274.606545 0 0 1-44.544 52.084364z m-9.216-96.628364a2267.461818 2267.461818 0 0 0 94.533818-121.949091 1447.726545 1447.726545 0 0 0 64.930909-97.745454c43.985455-73.076364 68.142545-133.166545 68.142545-172.45091C756.363636 202.496 646.958545 93.090909 512 93.090909S267.636364 202.496 267.636364 337.454545c0 39.284364 24.180364 99.374545 68.142545 172.45091a1447.726545 1447.726545 0 0 0 64.930909 97.745454A2267.461818 2267.461818 0 0 0 512 749.591273c5.352727-6.283636 10.938182-12.986182 16.756364-20.014546zM888.226909 605.090909H861.090909a34.909091 34.909091 0 0 1 0-69.818182h58.181818c17.687273 0 32.581818 13.265455 34.676364 30.836364l46.545454 395.636364A34.909091 34.909091 0 0 1 965.818182 1000.727273h-907.636364a34.909091 34.909091 0 0 1-34.676363-38.981818l46.545454-395.636364A34.909091 34.909091 0 0 1 104.727273 535.272727H162.909091a34.909091 34.909091 0 0 1 0 69.818182H135.773091L97.442909 930.909091h829.114182l-38.330182-325.818182zM512 453.818182a128 128 0 1 1 0-256 128 128 0 0 1 0 256z m0-69.818182a58.181818 58.181818 0 1 0 0-116.363636 58.181818 58.181818 0 0 0 0 116.363636z" fill="#888888" ></path></symbol></svg>',function(n){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var i,o,c,a,d,s=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}i=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_4369261,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?s(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),i()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(c=i,a=n.document,d=!1,r(),a.onreadystatechange=function(){"complete"==a.readyState&&(a.onreadystatechange=null,l())})}function l(){d||(d=!0,c())}function r(){try{a.documentElement.doScroll("left")}catch(t){return void setTimeout(r,50)}l()}}(window);
--- a/report-ui/src/assets/iconfont2/iconfont.json
+++ b/report-ui/src/assets/iconfont2/iconfont.json
@@ -6,18 +6,11 @@
  "description": "",
  "glyphs": [
    {
-      "icon_id": "1236837",
+      "icon_id": "7463933",
      "name": "地图",
-      "font_class": "03",
-      "unicode": "e60e",
-      "unicode_decimal": 58894
-    },
-    {
-      "icon_id": "2076231",
-      "name": "地图",
-      "font_class": "ditu",
-      "unicode": "e884",
-      "unicode_decimal": 59524
+      "font_class": "ditu1",
+      "unicode": "e627",
+      "unicode_decimal": 58919
    }
  ]
 }
--- a/report-ui/src/assets/iconfont2/iconfont.ttf
+++ b/report-ui/src/assets/iconfont2/iconfont.ttf
--- a/report-ui/src/assets/iconfont2/iconfont.woff
+++ b/report-ui/src/assets/iconfont2/iconfont.woff
--- a/report-ui/src/assets/iconfont2/iconfont.woff2
+++ b/report-ui/src/assets/iconfont2/iconfont.woff2
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-bar-map.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-bar-map.js
@@ -3,7 +3,7 @@ export const widgetBarMap = {
  type: 'mapChart',
  tabName: '地图',
  label: '柱形地图',
-  icon: 'iconzhongguoditu',
+  icon: 'icon-ditu1',
  options: {
    // 配置
    setup: [
@@ -30,42 +30,42 @@ export const widgetBarMap = {
        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'
      },
@@ -276,10 +276,10 @@ export const widgetBarMap = {
              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'
            },
@@ -310,6 +310,22 @@ export const widgetBarMap = {
              ],
              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: '边界线宽度',
@@ -326,6 +342,129 @@ export const widgetBarMap = {
              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)'
+            },
          ]
        },
        {
@@ -397,9 +536,9 @@ export const widgetBarMap = {
              required: false,
              placeholder: '',
              selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
              ],
              value: 'normal'
            },
@@ -454,9 +593,9 @@ export const widgetBarMap = {
              required: false,
              placeholder: '',
              selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
              ],
              value: 'normal'
            },
@@ -476,105 +615,6 @@ export const widgetBarMap = {
            },
          ],
        },
-        {
-          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: [
-            {
-              type: 'el-switch',
-              label: '显示',
-              name: 'isShowTooltip',
-              required: false,
-              placeholder: '',
-              value: true
-            },
-            {
-              type: 'el-input-number',
-              label: '字体字号',
-              name: 'tooltipFontSize',
-              required: false,
-              placeholder: '',
-              value: 16
-            },
-            {
-              type: 'vue-color',
-              label: '字体颜色',
-              name: 'tooltipColor',
-              required: false,
-              placeholder: '',
-              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'
-            },
-          ],
-        },
        {
          name: '自定义配色',
          list: [
@@ -583,7 +623,7 @@ export const widgetBarMap = {
              label: '',
              name: 'customColor',
              required: false,
-              value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
+              value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
            },
          ],
        },
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetBarMap.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetBarMap.vue
@@ -79,7 +79,7 @@ export default {
        geo: {
          map: "china",
          show: true,
-          roam: false,
+          roam: true,
          layoutSize: "80%",
          label: {
            emphasis: {
@@ -114,75 +114,6 @@ export default {
          },
        },
        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: []
-          },
          // 柱状体的主干
          {
            type: 'lines',
@@ -351,8 +282,6 @@ export default {
    editorOptions() {
      this.setOptionsTitle();
      this.setOptionsGeo();
-      this.setOptionsTooltip();
-      this.setOptionsMap();
      this.setOptionsData();
    },
    // 标题设置
@@ -382,40 +311,15 @@ export default {
      };
      this.options.title = title;
    },
-    // tooltip 设置
-    setOptionsTooltip() {
-      const optionsSetup = this.optionsSetup;
-      const tooltip = {
-        trigger: "item",
-        show: optionsSetup.isShowTooltip,
-        textStyle: {
-          color: optionsSetup.tooltipColor,
-          fontSize: optionsSetup.tooltipFontSize,
-          fontWeight: optionsSetup.tooltipFontWeight,
-          fontStyle: optionsSetup.tooltipFontStyle,
-          fontFamily: optionsSetup.tooltipFontFamily,
-        },
-        formatter: function (params) {
-          if (params.seriesType == 'scatter') {
-            return params.data.name + "" + params.data.value[2];
-          } else {
-            return params.name;
-          }
-        },
-      };
-      this.options.tooltip = tooltip;
-    },
    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() {
      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,
@@ -424,54 +328,64 @@ export default {
          fontStyle: optionsSetup.fontStyle,
          fontFamily: optionsSetup.fontFamily,
        },
-        emphasis: {
-          show: false,
-        },
-      }
-      const itemStyle = {
-        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,
        },
        //鼠标放置颜色加深
        emphasis: {
-          areaColor: {
-            x: 0,
-            y: 0,
-            x2: 0,
-            y2: 1,
-            colorStops: [
-              {
-                offset: 0,
-                color: "#073684", // 0% 处的颜色
-              },
-              {
-                offset: 1,
-                color: optionsSetup.fontHighlightColor, // 100% 处的颜色
-              },
-            ],
+          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.series[0]['itemStyle'] = itemStyle;
+      this.options.geo = geo;
    },
    // 计算柱图的高度比例
    calMaxHeight(val, heightRate) {