路线图调整优化

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

@@ -146,7 +146,7 @@ export const widgetMap = {
             {
               type: 'el-input-number',
               label: '点大小级别',
-              name: 'sourcePointSize',
+              name: 'sourcePointLevel',
               required: false,
               placeholder: '',
               value: 5,
@@ -205,7 +205,7 @@ export const widgetMap = {
             {
               type: 'el-input-number',
               label: '点大小',
-              name: 'targetPointSize',
+              name: 'targetPointLevel',
               required: false,
               placeholder: '',
               value: 5,
@@ -380,7 +380,7 @@ export const widgetMap = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          /*{source: '北京市', target: '上海市', value: 95},
+          {source: '北京市', target: '上海市', value: 95},
           {source: '北京市', target: '广州市', value: 90},
           {source: '北京市', target: '大连市', value: 80},
           {source: '北京市', target: '南宁市', value: 70},
@@ -409,194 +409,7 @@ export const widgetMap = {
           {source: '广州市', target: '常州市', value: 40},
           {source: '广州市', target: '北京市', value: 30},
           {source: '广州市', target: '北海市', value: 20},
-          {source: '广州市', target: '海口市', value: 10},*/
-
-            {
-              "target": "南京市",
-              "value": 1,
-              "source": "乐山市"
-            },
-            {
-              "target": "丽江市",
-              "value": 3,
-              "source": "丽江市"
-            },
-            {
-              "target": "洛阳市",
-              "value": 4,
-              "source": "深圳市"
-            },
-            {
-              "target": "佛山市",
-              "value": 1,
-              "source": "北京市"
-            },
-            {
-              "target": "南阳市",
-              "value": 2,
-              "source": "上海市"
-            },
-            {
-              "target": "平顶山市",
-              "value": 4,
-              "source": "平顶山市"
-            },
-            {
-              "target": "郑州市",
-              "value": 2,
-              "source": "银川市"
-            },
-            {
-              "target": "淄博市",
-              "value": 2,
-              "source": "合肥市"
-            },
-            {
-              "target": "安庆市",
-              "value": 1,
-              "source": "安庆市"
-            },
-            {
-              "target": "杭州市",
-              "value": 2,
-              "source": "台州市"
-            },
-            {
-              "target": "塔城地区",
-              "value": 1,
-              "source": "漯河市"
-            },
-            {
-              "target": "塔城地区",
-              "value": 3,
-              "source": "塔城地区"
-            },
-            {
-              "target": "乐山市",
-              "value": 1,
-              "source": "巴中市"
-            },
-            {
-              "target": "佛山市",
-              "value": 1,
-              "source": "深圳市"
-            },
-            {
-              "target": "商洛市",
-              "value": 1,
-              "source": "平顶山市"
-            },
-            {
-              "target": "苏州市",
-              "value": 1,
-              "source": "上海市"
-            },
-            {
-              "target": "合肥市",
-              "value": 2,
-              "source": "平顶山市"
-            },
-            {
-              "target": "衡阳市",
-              "value": 3,
-              "source": "平顶山市"
-            },
-            {
-              "target": "佛山市",
-              "value": 3,
-              "source": "佛山市"
-            },
-            {
-              "target": "无锡市",
-              "value": 1,
-              "source": "宁波市"
-            },
-            {
-              "target": "上海市",
-              "value": 5,
-              "source": "上海市"
-            },
-            {
-              "target": "洛阳市",
-              "value": 3,
-              "source": "洛阳市"
-            },
-            {
-              "target": "漯河市",
-              "value": 3,
-              "source": "平顶山市"
-            },
-            {
-              "target": "上海市",
-              "value": 1,
-              "source": "呼和浩特市"
-            },
-            {
-              "target": "广州市",
-              "value": 1,
-              "source": "深圳市"
-            },
-            {
-              "target": "台州市",
-              "value": 1,
-              "source": "佛山市"
-            },
-            {
-              "target": "乌鲁木齐市",
-              "value": 4,
-              "source": "深圳市"
-            },
-            {
-              "target": "洛阳市",
-              "value": 2,
-              "source": "鹤岗市"
-            },
-            {
-              "target": "淄博市",
-              "value": 1,
-              "source": "商洛市"
-            },
-            {
-              "target": "南阳市",
-              "value": 1,
-              "source": "呼和浩特市"
-            },
-            {
-              "target": "杭州市",
-              "value": 1,
-              "source": "杭州市"
-            },
-            {
-              "target": "佛山市",
-              "value": 1,
-              "source": "台州市"
-            },
-            {
-              "target": "普洱市",
-              "value": 2,
-              "source": "丽江市"
-            },
-            {
-              "target": "深圳市",
-              "value": 1,
-              "source": "上海市"
-            },
-            {
-              "target": "衡阳市",
-              "value": 1,
-              "source": "深圳市"
-            },
-            {
-              "target": "平顶山市",
-              "value": 2,
-              "source": "商洛市"
-            },
-            {
-              "target": "安阳市",
-              "value": 1,
-              "source": "南阳市"
-            }
-
+          {source: '广州市', target: '海口市', value: 10},
         ],
       },
       {

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

@@ -124,7 +124,7 @@ import {conversionCity} from '@/utils/china';
   韶关市: [113.7964, 24.7028]
 };*/
 let geoCoordMap = conversionCity;
-let pointSize = 3;
+let pointLevel = 3;
 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";
 export default {
@@ -247,7 +247,7 @@ export default {
             },
             // 点的大小
             symbolSize: function (val) {
-              return val[2] / pointSize;
+              return val[2] / pointLevel;
             },
             itemStyle: {
               normal: {
@@ -276,7 +276,7 @@ export default {
             },
             // 点的大小
             symbolSize: function (val) {
-              return val[2] / pointSize;
+              return val[2] / pointLevel;
             },
             itemStyle: {
               normal: {
@@ -344,12 +344,10 @@ export default {
     },
     editorOptions() {
       this.setOptionsTitle();
-      //this.setOptionsText();
-      this.setOptionsSymbol();
-      //this.setOptionsPoint();
-      this.setOptionsLine();
       this.setOptionsSource();
       this.setOptionsTarget();
+      this.setOptionsSymbol();
+      this.setOptionsLine();
       this.setOptionsColor();
       this.setOptionsData();
     },
@@ -389,7 +387,7 @@ export default {
           color: optionsSetup.sourcePointColor,
         }
       };
-      pointSize = optionsSetup.sourcePointSize;
+      pointLevel = optionsSetup.sourcePointLevel;
       series.label.normal = normal;
       series.itemStyle = itemStyle;
     },
@@ -409,24 +407,10 @@ export default {
           color: optionsSetup.targetPointColor,
         }
       };
-      pointSize = optionsSetup.targetPointSize;
+      pointLevel = optionsSetup.targetPointLevel;
       series.label.normal = normal;
       series.itemStyle = itemStyle;
     },
-    // 地图字体设置
-    setOptionsText() {
-      const optionsSetup = this.optionsSetup;
-      const series = this.options.series;
-      const normal = {
-        show: true,
-        position: 'right',
-        color: optionsSetup.fontTextColor,
-        fontSize: optionsSetup.fontTextSize,
-        fontWeight: optionsSetup.fontTextWeight,
-      }
-      series[2].label["normal"] = normal;
-      series[3].label["normal"] = normal;
-    },
     // 图标设置
     setOptionsSymbol(){
       const optionsSetup = this.optionsSetup;
@@ -459,19 +443,6 @@ export default {
       }
       return period;
     },
-    // 点设置
-    setOptionsPoint() {
-      const optionsSetup = this.optionsSetup;
-      const series = this.options.series;
-      pointSize = optionsSetup.pointSize
-      const itemStyle = {
-        normal: {
-          color: optionsSetup.pointColor,
-        }
-      };
-      series[2]["itemStyle"] = itemStyle;
-      series[3]["itemStyle"] = itemStyle;
-    },
     // 线设置
     setOptionsLine() {
       const optionsSetup = this.optionsSetup;